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

3 files changed, 36 insertions, 6 deletions

diff --git a/web-server/opendc/models/model.py b/web-server/opendc/models/model.py
index cab283c9..bcb833ae 100644
--- a/web-server/opendc/models/model.py
+++ b/web-server/opendc/models/model.py
@@ -33,8 +33,12 @@ class Model:
             raise ClientError(Response(404, 'Not found.'))
 
     def set_property(self, key, value):
-        """Sets the given property on the enclosed object."""
-        self.obj[key] = value
+        """Sets the given property on the enclosed object, with support for simple nested access."""
+        if '.' in key:
+            keys = key.split('.')
+            self.obj[keys[0]][keys[1]] = value
+        else:
+            self.obj[key] = value
 
     def insert(self):
         """Inserts the enclosed object and generates a UUID for it."""
diff --git a/web-server/opendc/models/experiment.py b/web-server/opendc/models/portfolio.py
index 46373b99..32961b63 100644
--- a/web-server/opendc/models/experiment.py
+++ b/web-server/opendc/models/portfolio.py
@@ -4,10 +4,10 @@ from opendc.util.exceptions import ClientError
 from opendc.util.rest import Response
 
 
-class Experiment(Model):
-    """Model representing a Experiment."""
+class Portfolio(Model):
+    """Model representing a Portfolio."""
 
-    collection_name = 'experiments'
+    collection_name = 'portfolios'
 
     def check_user_access(self, google_id, edit_access):
         """Raises an error if the user with given [google_id] has insufficient access.
@@ -21,4 +21,4 @@ class Experiment(Model):
         authorizations = list(
             filter(lambda x: str(x['projectId']) == str(self.obj['projectId']), user.obj['authorizations']))
         if len(authorizations) == 0 or (edit_access and authorizations[0]['authorizationLevel'] == 'VIEW'):
-            raise ClientError(Response(403, 'Forbidden from retrieving/editing experiment.'))
+            raise ClientError(Response(403, 'Forbidden from retrieving/editing portfolio.'))
diff --git a/web-server/opendc/models/scenario.py b/web-server/opendc/models/scenario.py
new file mode 100644
index 00000000..d7d959ca
--- /dev/null
+++ b/web-server/opendc/models/scenario.py
@@ -0,0 +1,26 @@
+from opendc.models.model import Model
+from opendc.models.portfolio import Portfolio
+from opendc.models.user import User
+from opendc.util.exceptions import ClientError
+from opendc.util.rest import Response
+
+
+class Scenario(Model):
+    """Model representing a Scenario."""
+
+    collection_name = 'scenarios'
+
+    def check_user_access(self, google_id, edit_access):
+        """Raises an error if the user with given [google_id] has insufficient access.
+
+        Checks access on the parent project.
+
+        :param google_id: The Google ID of the user.
+        :param edit_access: True when edit access should be checked, otherwise view access.
+        """
+        portfolio = Portfolio.from_id(self.obj['portfolioId'])
+        user = User.from_google_id(google_id)
+        authorizations = list(
+            filter(lambda x: str(x['projectId']) == str(portfolio.get_id()), user.obj['authorizations']))
+        if len(authorizations) == 0 or (edit_access and authorizations[0]['authorizationLevel'] == 'VIEW'):
+            raise ClientError(Response(403, 'Forbidden from retrieving/editing scenario.'))