Merge branch 'master' of github.com:atlarge-research/opendc-dev

8 files changed, 127 insertions, 119 deletions

diff --git a/web-server/opendc/api/v2/projects/endpoint.py b/web-server/opendc/api/v2/projects/endpoint.py
index 10954cdd..bf031382 100644
--- a/web-server/opendc/api/v2/projects/endpoint.py
+++ b/web-server/opendc/api/v2/projects/endpoint.py
@@ -19,7 +19,7 @@ def POST(request):
     project.set_property('datetimeCreated', Database.datetime_to_string(datetime.now()))
     project.set_property('datetimeLastEdited', Database.datetime_to_string(datetime.now()))
     project.set_property('topologyIds', [topology.get_id()])
-    project.set_property('experimentIds', [])
+    project.set_property('portfolioIds', [])
     project.insert()
 
     topology.set_property('projectId', project.get_id())
diff --git a/web-server/opendc/api/v2/projects/projectId/endpoint.py b/web-server/opendc/api/v2/projects/projectId/endpoint.py
index 6f80f827..77b66d75 100644
--- a/web-server/opendc/api/v2/projects/projectId/endpoint.py
+++ b/web-server/opendc/api/v2/projects/projectId/endpoint.py
@@ -1,6 +1,6 @@
 from datetime import datetime
 
-from opendc.models.experiment import Experiment
+from opendc.models.portfolio import Portfolio
 from opendc.models.project import Project
 from opendc.models.topology import Topology
 from opendc.models.user import User
@@ -52,9 +52,9 @@ def DELETE(request):
         topology = Topology.from_id(topology_id)
         topology.delete()
 
-    for experiment_id in project.obj['experimentIds']:
-        experiment = Experiment.from_id(experiment_id)
-        experiment.delete()
+    for portfolio_id in project.obj['portfolioIds']:
+        portfolio = Portfolio.from_id(portfolio_id)
+        portfolio.delete()
 
     user = User.from_google_id(request.google_id)
     user.obj['authorizations'] = list(
diff --git a/web-server/opendc/api/v2/projects/projectId/experiments/endpoint.py b/web-server/opendc/api/v2/projects/projectId/experiments/endpoint.py
deleted file mode 100644
index 2e5b93df..00000000
--- a/web-server/opendc/api/v2/projects/projectId/experiments/endpoint.py
+++ /dev/null
@@ -1,35 +0,0 @@
-from opendc.models.experiment import Experiment
-from opendc.models.project import Project
-from opendc.util.rest import Response
-
-
-def POST(request):
-    """Add a new Experiment for this Project."""
-
-    request.check_required_parameters(path={'projectId': 'string'},
-                                      body={
-                                          'experiment': {
-                                              'topologyId': 'string',
-                                              'traceId': 'string',
-                                              'schedulerName': 'string',
-                                              'name': 'string',
-                                          }
-                                      })
-
-    project = Project.from_id(request.params_path['projectId'])
-
-    project.check_exists()
-    project.check_user_access(request.google_id, True)
-
-    experiment = Experiment(request.params_body['experiment'])
-
-    experiment.set_property('projectId', request.params_path['projectId'])
-    experiment.set_property('state', 'QUEUED')
-    experiment.set_property('lastSimulatedTick', 0)
-
-    experiment.insert()
-
-    project.obj['experimentIds'].append(experiment.get_id())
-    project.update()
-
-    return Response(200, 'Successfully added Experiment.', experiment.obj)
diff --git a/web-server/opendc/api/v2/projects/projectId/experiments/test_endpoint.py b/web-server/opendc/api/v2/projects/projectId/experiments/test_endpoint.py
deleted file mode 100644
index 11b79154..00000000
--- a/web-server/opendc/api/v2/projects/projectId/experiments/test_endpoint.py
+++ /dev/null
@@ -1,78 +0,0 @@
-from opendc.util.database import DB
-
-
-def test_add_experiment_missing_parameter(client):
-    assert '400' in client.post('/api/v2/projects/1/experiments').status
-
-
-def test_add_experiment_non_existing_project(client, mocker):
-    mocker.patch.object(DB, 'fetch_one', return_value=None)
-    assert '404' in client.post('/api/v2/projects/1/experiments',
-                                json={
-                                    'experiment': {
-                                        'topologyId': '1',
-                                        'traceId': '1',
-                                        'schedulerName': 'default',
-                                        'name': 'test',
-                                    }
-                                }).status
-
-
-def test_add_experiment_not_authorized(client, mocker):
-    mocker.patch.object(DB,
-                        'fetch_one',
-                        return_value={
-                            '_id': '1',
-                            'projectId': '1',
-                            'authorizations': [{
-                                'projectId': '1',
-                                'authorizationLevel': 'VIEW'
-                            }]
-                        })
-    assert '403' in client.post('/api/v2/projects/1/experiments',
-                                json={
-                                    'experiment': {
-                                        'topologyId': '1',
-                                        'traceId': '1',
-                                        'schedulerName': 'default',
-                                        'name': 'test',
-                                    }
-                                }).status
-
-
-def test_add_experiment(client, mocker):
-    mocker.patch.object(DB,
-                        'fetch_one',
-                        return_value={
-                            '_id': '1',
-                            'projectId': '1',
-                            'experimentIds': ['1'],
-                            'authorizations': [{
-                                'projectId': '1',
-                                'authorizationLevel': 'EDIT'
-                            }]
-                        })
-    mocker.patch.object(DB,
-                        'insert',
-                        return_value={
-                            '_id': '1',
-                            'topologyId': '1',
-                            'traceId': '1',
-                            'schedulerName': 'default',
-                            'name': 'test',
-                            'state': 'QUEUED',
-                            'lastSimulatedTick': 0,
-                        })
-    mocker.patch.object(DB, 'update', return_value=None)
-    res = client.post(
-        '/api/v2/projects/1/experiments',
-        json={'experiment': {
-            'topologyId': '1',
-            'traceId': '1',
-            'schedulerName': 'default',
-            'name': 'test',
-        }})
-    assert 'topologyId' in res.json['content']
-    assert 'state' in res.json['content']
-    assert 'lastSimulatedTick' in res.json['content']
-    assert '200' in res.status
diff --git a/web-server/opendc/api/v2/projects/projectId/experiments/__init__.py b/web-server/opendc/api/v2/projects/projectId/portfolios/__init__.py
index e69de29b..e69de29b 100644
--- a/web-server/opendc/api/v2/projects/projectId/experiments/__init__.py
+++ b/web-server/opendc/api/v2/projects/projectId/portfolios/__init__.py
diff --git a/web-server/opendc/api/v2/projects/projectId/portfolios/endpoint.py b/web-server/opendc/api/v2/projects/projectId/portfolios/endpoint.py
new file mode 100644
index 00000000..c51dee14
--- /dev/null
+++ b/web-server/opendc/api/v2/projects/projectId/portfolios/endpoint.py
@@ -0,0 +1,36 @@
+from opendc.models.portfolio import Portfolio
+from opendc.models.project import Project
+from opendc.util.rest import Response
+
+
+def POST(request):
+    """Add a new Portfolio for this Project."""
+
+    request.check_required_parameters(path={'projectId': 'string'},
+                                      body={
+                                          'portfolio': {
+                                              'name': 'string',
+                                              'targets': {
+                                                  'enabledMetrics': 'list',
+                                                  'repeatsPerScenario': 'int',
+                                              },
+                                          }
+                                      })
+
+    project = Project.from_id(request.params_path['projectId'])
+
+    project.check_exists()
+    project.check_user_access(request.google_id, True)
+
+    portfolio = Portfolio(request.params_body['portfolio'])
+
+    portfolio.set_property('projectId', request.params_path['projectId'])
+    portfolio.set_property('scenarioIds', [])
+    portfolio.set_property('baseScenarioId', '-1')
+
+    portfolio.insert()
+
+    project.obj['portfolioIds'].append(portfolio.get_id())
+    project.update()
+
+    return Response(200, 'Successfully added Portfolio.', portfolio.obj)
diff --git a/web-server/opendc/api/v2/projects/projectId/portfolios/test_endpoint.py b/web-server/opendc/api/v2/projects/projectId/portfolios/test_endpoint.py
new file mode 100644
index 00000000..5b4d9043
--- /dev/null
+++ b/web-server/opendc/api/v2/projects/projectId/portfolios/test_endpoint.py
@@ -0,0 +1,85 @@
+from opendc.util.database import DB
+
+
+def test_add_portfolio_missing_parameter(client):
+    assert '400' in client.post('/api/v2/projects/1/portfolios').status
+
+
+def test_add_portfolio_non_existing_project(client, mocker):
+    mocker.patch.object(DB, 'fetch_one', return_value=None)
+    assert '404' in client.post('/api/v2/projects/1/portfolios',
+                                json={
+                                    'portfolio': {
+                                        'name': 'test',
+                                        'targets': {
+                                            'enabledMetrics': ['test'],
+                                            'repeatsPerScenario': 2
+                                        }
+                                    }
+                                }).status
+
+
+def test_add_portfolio_not_authorized(client, mocker):
+    mocker.patch.object(DB,
+                        'fetch_one',
+                        return_value={
+                            '_id': '1',
+                            'projectId': '1',
+                            'authorizations': [{
+                                'projectId': '1',
+                                'authorizationLevel': 'VIEW'
+                            }]
+                        })
+    assert '403' in client.post('/api/v2/projects/1/portfolios',
+                                json={
+                                    'portfolio': {
+                                        'name': 'test',
+                                        'targets': {
+                                            'enabledMetrics': ['test'],
+                                            'repeatsPerScenario': 2
+                                        }
+                                    }
+                                }).status
+
+
+def test_add_portfolio(client, mocker):
+    mocker.patch.object(DB,
+                        'fetch_one',
+                        return_value={
+                            '_id': '1',
+                            'projectId': '1',
+                            'portfolioIds': ['1'],
+                            'authorizations': [{
+                                'projectId': '1',
+                                'authorizationLevel': 'EDIT'
+                            }]
+                        })
+    mocker.patch.object(DB,
+                        'insert',
+                        return_value={
+                            '_id': '1',
+                            'name': 'test',
+                            'targets': {
+                                'enabledMetrics': ['test'],
+                                'repeatsPerScenario': 2
+                            },
+                            'projectId': '1',
+                            'scenarioIds': [],
+                            'baseScenarioId': '-1',
+                        })
+    mocker.patch.object(DB, 'update', return_value=None)
+    res = client.post(
+        '/api/v2/projects/1/portfolios',
+        json={
+            'portfolio': {
+                'name': 'test',
+                'targets': {
+                    'enabledMetrics': ['test'],
+                    'repeatsPerScenario': 2
+                }
+            }
+        })
+    assert 'projectId' in res.json['content']
+    assert 'scenarioIds' in res.json['content']
+    assert 'baseScenarioId' in res.json['content']
+    assert '200' in res.status
diff --git a/web-server/opendc/api/v2/projects/projectId/test_endpoint.py b/web-server/opendc/api/v2/projects/projectId/test_endpoint.py
index c7450b5a..7a862e8d 100644
--- a/web-server/opendc/api/v2/projects/projectId/test_endpoint.py
+++ b/web-server/opendc/api/v2/projects/projectId/test_endpoint.py
@@ -111,7 +111,7 @@ def test_delete_project(client, mocker):
                                 'authorizationLevel': 'OWN'
                             }],
                             'topologyIds': [],
-                            'experimentIds': [],
+                            'portfolioIds': [],
                         })
     mocker.patch.object(DB, 'update', return_value=None)
     mocker.patch.object(DB, 'delete_one', return_value={'googleId': 'test'})