3 files changed, 30 insertions, 1 deletions
diff --git a/opendc-web/opendc-web-api/opendc/models/portfolio.py b/opendc-web/opendc-web-api/opendc/models/portfolio.py
index 1643e23e..eb016947 100644
--- a/opendc-web/opendc-web-api/opendc/models/portfolio.py
+++ b/opendc-web/opendc-web-api/opendc/models/portfolio.py
@@ -1,5 +1,7 @@
+from bson import ObjectId
 from marshmallow import Schema, fields
 
+from opendc.exts import db
 from opendc.models.project import Project
 from opendc.models.model import Model
 
@@ -38,3 +40,8 @@ class Portfolio(Model):
         """
         project = Project.from_id(self.obj['projectId'])
         project.check_user_access(user_id, edit_access)
+
+    @classmethod
+    def get_for_project(cls, project_id):
+        """Get all portfolios for the specified project id."""
+        return db.fetch_all({'projectId': ObjectId(project_id)}, cls.collection_name)
diff --git a/opendc-web/opendc-web-api/opendc/models/scenario.py b/opendc-web/opendc-web-api/opendc/models/scenario.py
index 0fb6c453..47771e06 100644
--- a/opendc-web/opendc-web-api/opendc/models/scenario.py
+++ b/opendc-web/opendc-web-api/opendc/models/scenario.py
@@ -1,5 +1,6 @@
 from datetime import datetime
 
+from bson import ObjectId
 from marshmallow import Schema, fields
 
 from opendc.exts import db
@@ -7,6 +8,13 @@ from opendc.models.model import Model
 from opendc.models.portfolio import Portfolio
 
 
+class SimulationSchema(Schema):
+    """
+    Simulation details.
+    """
+    state = fields.String()
+
+
 class TraceSchema(Schema):
     """
     Schema for specifying the trace of a scenario.
@@ -41,6 +49,8 @@ class ScenarioSchema(Schema):
     trace = fields.Nested(TraceSchema)
     topology = fields.Nested(TopologySchema)
     operational = fields.Nested(OperationalSchema)
+    simulation = fields.Nested(SimulationSchema, dump_only=True)
+    results = fields.Dict(dump_only=True)
 
 
 class Scenario(Model):
@@ -65,6 +75,11 @@ class Scenario(Model):
         """
         return cls(db.fetch_all({'simulation.state': 'QUEUED'}, cls.collection_name))
 
+    @classmethod
+    def get_for_portfolio(cls, portfolio_id):
+        """Get all scenarios for the specified portfolio id."""
+        return db.fetch_all({'portfolioId': ObjectId(portfolio_id)}, cls.collection_name)
+
     def update_state(self, new_state, results=None):
         """Atomically update the state of the Scenario.
         """
diff --git a/opendc-web/opendc-web-api/opendc/models/topology.py b/opendc-web/opendc-web-api/opendc/models/topology.py
index 71d2cade..592f82c5 100644
--- a/opendc-web/opendc-web-api/opendc/models/topology.py
+++ b/opendc-web/opendc-web-api/opendc/models/topology.py
@@ -1,5 +1,7 @@
+from bson import ObjectId
 from marshmallow import Schema, fields
 
+from opendc.exts import db
 from opendc.models.project import Project
 from opendc.models.model import Model
 
@@ -73,7 +75,7 @@ class TopologySchema(Schema):
     Schema representing a datacenter topology.
     """
     _id = fields.String(dump_only=True)
-    projectId = fields.String(dump_only=True)
+    projectId = fields.String()
     name = fields.String(required=True)
     rooms = fields.List(fields.Nested(RoomSchema), required=True)
 
@@ -93,3 +95,8 @@ class Topology(Model):
         """
         project = Project.from_id(self.obj['projectId'])
         project.check_user_access(user_id, edit_access)
+
+    @classmethod
+    def get_for_project(cls, project_id):
+        """Get all topologies for the specified project id."""
+        return db.fetch_all({'projectId': ObjectId(project_id)}, cls.collection_name)