Merge changes with upstream

1 files changed, 0 insertions, 36 deletions

diff --git a/web-server/opendc/models_old/experiment.py b/web-server/opendc/models_old/experiment.py
deleted file mode 100644
index 64b99212..00000000
--- a/web-server/opendc/models_old/experiment.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from opendc.models_old.model import Model
-from opendc.models_old.simulation import Simulation
-from opendc.util import exceptions
-
-
-class Experiment(Model):
-    JSON_TO_PYTHON_DICT = {
-        'Experiment': {
-            'id': 'id',
-            'simulationId': 'simulation_id',
-            'pathId': 'path_id',
-            'traceId': 'trace_id',
-            'schedulerName': 'scheduler_name',
-            'name': 'name',
-            'state': 'state',
-            'lastSimulatedTick': 'last_simulated_tick'
-        }
-    }
-
-    COLLECTION_NAME = 'experiments'
-    COLUMNS = ['id', 'simulation_id', 'path_id', 'trace_id', 'scheduler_name', 'name', 'state', 'last_simulated_tick']
-    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 Experiment."""
-
-        # Get the Simulation
-
-        try:
-            simulation = Simulation.from_primary_key((self.simulation_id, ))
-        except exceptions.RowNotFoundError:
-            return False
-
-        # Check the Simulation's Authorization
-
-        return simulation.google_id_has_at_least(google_id, authorization_level)