Merge changes with upstream

2 files changed, 23 insertions, 20 deletions

diff --git a/web-server/opendc/api/v2/topologies/topologyId/endpoint.py b/web-server/opendc/api/v2/topologies/topologyId/endpoint.py
index fb7b1c59..05bf27aa 100644
--- a/web-server/opendc/api/v2/topologies/topologyId/endpoint.py
+++ b/web-server/opendc/api/v2/topologies/topologyId/endpoint.py
@@ -1,5 +1,4 @@
 from opendc.models.topology import Topology
-from opendc.util import exceptions
 from opendc.util.rest import Response
 
 
diff --git a/web-server/opendc/api/v2/topologies/topologyId/test_endpoint.py b/web-server/opendc/api/v2/topologies/topologyId/test_endpoint.py
index e8cfdd99..b210479e 100644
--- a/web-server/opendc/api/v2/topologies/topologyId/test_endpoint.py
+++ b/web-server/opendc/api/v2/topologies/topologyId/test_endpoint.py
@@ -1,39 +1,48 @@
 from opendc.util.database import DB
-
 '''
 GET /topologies/{topologyId}
 '''
 
+
 def test_get_topology(client, mocker):
-	mocker.patch.object(DB, 'fetch_one', return_value={
+    mocker.patch.object(DB,
+                        'fetch_one',
+                        return_value={
                             '_id': '1',
+                            'simulationId': '1',
                             'authorizations': [{
-                                'topologyId': '1',
+                                'simulationId': '1',
                                 'authorizationLevel': 'EDIT'
                             }]
                         })
-	res = client.get('/api/v2/topologies/1')
-	assert '200' in res.status
+    res = client.get('/api/v2/topologies/1')
+    assert '200' in res.status
+
 
 def test_get_topology_non_existing(client, mocker):
-	mocker.patch.object(DB, 'fetch_one', return_value=None)
-	assert '404' in client.get('/api/v2/topologies/1').status
+    mocker.patch.object(DB, 'fetch_one', return_value=None)
+    assert '404' in client.get('/api/v2/topologies/1').status
+
 
 def test_get_topology_not_authorized(client, mocker):
-	mocker.patch.object(DB, 'fetch_one', return_value={
+    mocker.patch.object(DB,
+                        'fetch_one',
+                        return_value={
                             '_id': '1',
+                            'simulationId': '1',
                             'authorizations': [{
-                                'topologyId': '2',
+                                'simulationId': '2',
                                 'authorizationLevel': 'OWN'
                             }]
                         })
-	res = client.get('/api/v2/topologies/1')
-	assert '403' in res.status
+    res = client.get('/api/v2/topologies/1')
+    assert '403' in res.status
+
 
 def test_get_topology_no_authorizations(client, mocker):
-	mocker.patch.object(DB, 'fetch_one', return_value={'authorizations': []})
-	res = client.get('/api/v2/topologies/1')
-	assert '403' in res.status
+    mocker.patch.object(DB, 'fetch_one', return_value={'authorizations': []})
+    res = client.get('/api/v2/topologies/1')
+    assert '403' in res.status
 
 
 '''
@@ -44,8 +53,3 @@ PUT /topologies/{topologyId}
 '''
 DELETE /topologies/{topologyId}
 '''
-
-def test_delete_topology(client, mocker):
-    mocker.patch.object(DB, 'fetch_one', return_value={'_id': '1'})
-    res = client.delete('/api/v2/topologies/1')
-    assert '200' in res.status
\ No newline at end of file