Add traces endpoint

11 files changed, 37 insertions, 109 deletions

diff --git a/web-server/format.sh b/web-server/format.sh
index 18cba452..18cba452 100644..100755
--- a/web-server/format.sh
+++ b/web-server/format.sh
diff --git a/web-server/opendc/api/v2/schedulers/endpoint.py b/web-server/opendc/api/v2/schedulers/endpoint.py
index 0bbc3322..a96fdd88 100644
--- a/web-server/opendc/api/v2/schedulers/endpoint.py
+++ b/web-server/opendc/api/v2/schedulers/endpoint.py
@@ -1,6 +1,5 @@
 from opendc.util.rest import Response
 
-
 SCHEDULERS = ['DEFAULT']
 
 
diff --git a/web-server/opendc/api/v2/simulations/simulationId/test_endpoint.py b/web-server/opendc/api/v2/simulations/simulationId/test_endpoint.py
index a0586aab..7038f1b0 100644
--- a/web-server/opendc/api/v2/simulations/simulationId/test_endpoint.py
+++ b/web-server/opendc/api/v2/simulations/simulationId/test_endpoint.py
@@ -85,13 +85,33 @@ def test_delete_simulation_non_existing(client, mocker):
 
 
 def test_delete_simulation_different_user(client, mocker):
-    mocker.patch.object(DB, 'fetch_one', return_value={'_id': '1', 'googleId': 'other_test', 'authorizations': [{'simulationId': '1', 'authorizationLevel': 'VIEW'}], 'topologyIds': []})
+    mocker.patch.object(DB,
+                        'fetch_one',
+                        return_value={
+                            '_id': '1',
+                            'googleId': 'other_test',
+                            'authorizations': [{
+                                'simulationId': '1',
+                                'authorizationLevel': 'VIEW'
+                            }],
+                            'topologyIds': []
+                        })
     mocker.patch.object(DB, 'delete_one', return_value=None)
     assert '403' in client.delete('/api/v2/simulations/1').status
 
 
 def test_delete_simulation(client, mocker):
-    mocker.patch.object(DB, 'fetch_one', return_value={'_id': '1', 'googleId': 'test', 'authorizations': [{'simulationId': '1', 'authorizationLevel': 'OWN'}], 'topologyIds': []})
+    mocker.patch.object(DB,
+                        'fetch_one',
+                        return_value={
+                            '_id': '1',
+                            'googleId': 'test',
+                            'authorizations': [{
+                                'simulationId': '1',
+                                'authorizationLevel': 'OWN'
+                            }],
+                            'topologyIds': []
+                        })
     mocker.patch.object(DB, 'delete_one', return_value={'googleId': 'test'})
     res = client.delete('/api/v2/simulations/1')
     assert '200' in res.status
diff --git a/web-server/opendc/api/v2/topologies/topologyId/rooms/__init__.py b/web-server/opendc/api/v2/topologies/topologyId/rooms/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/web-server/opendc/api/v2/topologies/topologyId/rooms/__init__.py
+++ /dev/null
diff --git a/web-server/opendc/api/v2/topologies/topologyId/rooms/endpoint.py b/web-server/opendc/api/v2/topologies/topologyId/rooms/endpoint.py
deleted file mode 100644
index 96ee7028..00000000
--- a/web-server/opendc/api/v2/topologies/topologyId/rooms/endpoint.py
+++ /dev/null
@@ -1,93 +0,0 @@
-from opendc.models_old.datacenter import Datacenter
-from opendc.models_old.room import Room
-from opendc.util import exceptions
-from opendc.util.rest import Response
-
-
-def GET(request):
-    """Get this Datacenter's Rooms."""
-
-    # Make sure required parameters are there
-
-    try:
-        request.check_required_parameters(path={'datacenterId': 'int'})
-    except exceptions.ParameterError as e:
-        return Response(400, str(e))
-
-    # Instantiate a Datacenter from the database
-
-    datacenter = Datacenter.from_primary_key((request.params_path['datacenterId'], ))
-
-    # Make sure this Datacenter exists
-
-    if not datacenter.exists():
-        return Response(404, '{} not found.'.format(datacenter))
-
-    # Make sure this user is authorized to view this Datacenter's Rooms
-
-    if not datacenter.google_id_has_at_least(request.google_id, 'VIEW'):
-        return Response(403, 'Forbidden from viewing Rooms for {}.'.format(datacenter))
-
-    # Get and return the Rooms
-
-    rooms = Room.query('datacenter_id', datacenter.id)
-
-    return Response(200, 'Successfully retrieved Rooms for {}.'.format(datacenter), [x.to_JSON() for x in rooms])
-
-
-def POST(request):
-    """Add a Room."""
-
-    # Make sure required parameters are there
-
-    try:
-        request.check_required_parameters(path={'datacenterId': 'int'},
-                                          body={'room': {
-                                              'id': 'int',
-                                              'datacenterId': 'int',
-                                              'roomType': 'string'
-                                          }})
-    except exceptions.ParameterError as e:
-        return Response(400, str(e))
-
-    # Make sure the passed object's datacenter id matches the path datacenter id
-
-    if request.params_path['datacenterId'] != request.params_body['room']['datacenterId']:
-        return Response(400, 'ID mismatch.')
-
-    # Instantiate a Datacenter from the database
-
-    datacenter = Datacenter.from_primary_key((request.params_path['datacenterId'], ))
-
-    # Make sure this Datacenter exists
-
-    if not datacenter.exists():
-        return Response(404, '{} not found.'.format(datacenter))
-
-    # Make sure this user is authorized to edit this Datacenter's Rooms
-
-    if not datacenter.google_id_has_at_least(request.google_id, 'EDIT'):
-        return Response(403, 'Forbidden from adding a Room to {}.'.format(datacenter))
-
-    # Add a name if not provided
-
-    if 'name' not in request.params_body['room']:
-        room_count = len(Room.query('datacenter_id', datacenter.id))
-        request.params_body['room']['name'] = 'Room {}'.format(room_count)
-
-    # Instantiate a Room
-
-    room = Room.from_JSON(request.params_body['room'])
-
-    # Try to insert this Room
-
-    try:
-        room.insert()
-    except:
-        return Response(400, 'Invalid `roomType` or existing `name`.')
-
-    # Return this Room
-
-    room.read()
-
-    return Response(200, 'Successfully added {}.'.format(room), room.to_JSON())
diff --git a/web-server/opendc/api/v2/traces/endpoint.py b/web-server/opendc/api/v2/traces/endpoint.py
index 58cc6153..720c6a1e 100644
--- a/web-server/opendc/api/v2/traces/endpoint.py
+++ b/web-server/opendc/api/v2/traces/endpoint.py
@@ -1,14 +1,10 @@
-from opendc.models_old.trace import Trace
+from opendc.models.trace import Trace
 from opendc.util.rest import Response
 
 
 def GET(request):
     """Get all available Traces."""
 
-    # Get the Traces
+    traces = Trace.get_all()
 
-    traces = Trace.query()
-
-    # Return the Traces
-
-    return Response(200, 'Successfully retrieved Traces', [x.to_JSON() for x in traces])
+    return Response(200, 'Successfully retrieved Traces', traces.obj)
diff --git a/web-server/opendc/api/v2/traces/test_endpoint.py b/web-server/opendc/api/v2/traces/test_endpoint.py
new file mode 100644
index 00000000..9f806085
--- /dev/null
+++ b/web-server/opendc/api/v2/traces/test_endpoint.py
@@ -0,0 +1,6 @@
+from opendc.util.database import DB
+
+
+def test_get_traces(client, mocker):
+    mocker.patch.object(DB, 'fetch_all', return_value=[])
+    assert '200' in client.get('/api/v2/traces').status
diff --git a/web-server/opendc/models/model.py b/web-server/opendc/models/model.py
index 2505ae61..b2fd1844 100644
--- a/web-server/opendc/models/model.py
+++ b/web-server/opendc/models/model.py
@@ -10,6 +10,10 @@ class Model:
     def from_id(cls, _id):
         return cls(DB.fetch_one({'_id': _id}, Model.collection_name))
 
+    @classmethod
+    def get_all(cls):
+        return cls(DB.fetch_all({}, Model.collection_name))
+
     def __init__(self, obj):
         self.obj = obj
 
diff --git a/web-server/opendc/models/topology.py b/web-server/opendc/models/topology.py
index 6dde3e2a..37b4c5c8 100644
--- a/web-server/opendc/models/topology.py
+++ b/web-server/opendc/models/topology.py
@@ -9,7 +9,7 @@ class Topology(Model):
 
     def check_user_access(self, google_id, edit_access):
         user = User.from_google_id(google_id)
-        authorizations = list(
-            filter(lambda x: str(x['topologyId']) == str(self.obj['_id']), user.obj['authorizations']))
+        authorizations = list(filter(lambda x: str(x['topologyId']) == str(self.obj['_id']),
+                                     user.obj['authorizations']))
         if len(authorizations) == 0 or (edit_access and authorizations[0]['authorizationLevel'] == 'VIEW'):
             raise ClientError(Response(403, "Forbidden from retrieving topology."))
diff --git a/web-server/opendc/models/trace.py b/web-server/opendc/models/trace.py
index 916db073..c18f8ea2 100644
--- a/web-server/opendc/models/trace.py
+++ b/web-server/opendc/models/trace.py
@@ -1,7 +1,4 @@
 from opendc.models.model import Model
-from opendc.models.user import User
-from opendc.util.exceptions import ClientError
-from opendc.util.rest import Response
 
 
 class Trace(Model):
diff --git a/web-server/opendc/util/exceptions.py b/web-server/opendc/util/exceptions.py
index 2563c419..8fb82e4b 100644
--- a/web-server/opendc/util/exceptions.py
+++ b/web-server/opendc/util/exceptions.py
@@ -59,7 +59,6 @@ class MissingParameterError(ParameterError):
 
 class ClientError(Exception):
     """Raised when a 4xx response is to be returned."""
-
     def __init__(self, response):
         super(ClientError, self).__init__(str(response))
         self.response = response