Merge changes with upstream

1 files changed, 0 insertions, 34 deletions

diff --git a/web-server/opendc/models_old/cpu.py b/web-server/opendc/models_old/cpu.py
deleted file mode 100644
index 0f50ce1c..00000000
--- a/web-server/opendc/models_old/cpu.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from opendc.models_old.model import Model
-
-
-class CPU(Model):
-    JSON_TO_PYTHON_DICT = {
-        'CPU': {
-            'id': 'id',
-            'manufacturer': 'manufacturer',
-            'family': 'family',
-            'generation': 'generation',
-            'model': 'model',
-            'clockRateMhz': 'clock_rate_mhz',
-            'numberOfCores': 'number_of_cores',
-            'energyConsumptionW': 'energy_consumption_w',
-            'failureModelId': 'failure_model_id'
-        }
-    }
-
-    COLLECTION_NAME = 'cpus'
-
-    COLUMNS = [
-        'id', 'manufacturer', 'family', 'generation', 'model', 'clock_rate_mhz', 'number_of_cores',
-        '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 CPU."""
-
-        if authorization_level in ['EDIT', 'OWN']:
-            return False
-
-        return True