Merge changes with upstream

1 files changed, 0 insertions, 34 deletions

diff --git a/web-server/opendc/models_old/storage.py b/web-server/opendc/models_old/storage.py
deleted file mode 100644
index 9f0f9215..00000000
--- a/web-server/opendc/models_old/storage.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from opendc.models_old.model import Model
-
-
-class Storage(Model):
-    JSON_TO_PYTHON_DICT = {
-        'Storage': {
-            'id': 'id',
-            'manufacturer': 'manufacturer',
-            'family': 'family',
-            'generation': 'generation',
-            'model': 'model',
-            'speedMbPerS': 'speed_mb_per_s',
-            'sizeMb': 'size_mb',
-            'energyConsumptionW': 'energy_consumption_w',
-            'failureModelId': 'failure_model_id'
-        }
-    }
-
-    COLLECTION_NAME = 'storages'
-
-    COLUMNS = [
-        'id', 'manufacturer', 'family', 'generation', 'model', 'speed_mb_per_s', 'size_mb', 'energy_consumption_w',
-        'failure_model_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 Storage."""
-
-        if authorization_level in ['EDIT', 'OWN']:
-            return False
-
-        return True