Merge changes with upstream

1 files changed, 0 insertions, 35 deletions

diff --git a/web-server/opendc/models_old/room.py b/web-server/opendc/models_old/room.py
deleted file mode 100644
index e0eb7c2f..00000000
--- a/web-server/opendc/models_old/room.py
+++ /dev/null
@@ -1,35 +0,0 @@
-from opendc.models_old.datacenter import Datacenter
-from opendc.models_old.model import Model
-from opendc.util import exceptions
-
-
-class Room(Model):
-    JSON_TO_PYTHON_DICT = {
-        'room': {
-            'id': 'id',
-            'datacenterId': 'datacenter_id',
-            'name': 'name',
-            'roomType': 'type',
-            'topologyId': 'topology_id'
-        }
-    }
-
-    PATH = '/v1/datacenters/{datacenterId}/rooms'
-
-    COLLECTION_NAME = 'rooms'
-    COLUMNS = ['id', 'name', 'datacenter_id', 'type', 'topology_id']
-    COLUMNS_PRIMARY_KEY = ['id']
-
-    def google_id_has_at_least(self, google_id, authorization_level):
-        """Return True if the user has at least the given auth level over this Room."""
-
-        # Get the Datacenter
-
-        try:
-            datacenter = Datacenter.from_primary_key((self.datacenter_id, ))
-        except exceptions.RowNotFoundError:
-            return False
-
-        # Check the Datacenter's Authorization
-
-        return datacenter.google_id_has_at_least(google_id, authorization_level)