Merge "change scenario owner"

[releng.git] / utils / test / testapi / opnfv_testapi / resources / scenario_models.py

diff --git a/utils/test/testapi/opnfv_testapi/resources/scenario_models.py b/utils/test/testapi/opnfv_testapi/resources/scenario_models.py
index 467cff2..7d07707 100644 (file)
--- a/utils/test/testapi/opnfv_testapi/resources/scenario_models.py
+++ b/utils/test/testapi/opnfv_testapi/resources/scenario_models.py
@@ -74,7 +74,8 @@ class ScenarioVersion(models.ModelBase):
         @property projects:
         @ptype projects: C{list} of L{ScenarioProject}
     """
-    def __init__(self, version=None, projects=None):
+    def __init__(self, owner=None, version=None, projects=None):
+        self.owner = owner
         self.version = version
         self.projects = list_default(projects)
 
@@ -83,7 +84,9 @@ class ScenarioVersion(models.ModelBase):
         return {'projects': ScenarioProject}
 
     def __eq__(self, other):
-        return [self.version == other.version and self._projects_eq(other)]
+        return [self.version == other.version and
+                self.owner == other.owner and
+                self._projects_eq(other)]
 
     def __ne__(self, other):
         return not self.__eq__(other)
@@ -143,21 +146,6 @@ class ScenarioCreateRequest(models.ModelBase):
         return {'installers': ScenarioInstaller}
 
 
-@swagger.model()
-class ScenarioUpdateRequest(models.ModelBase):
-    """
-        @property field: update field
-        @property op: add/delete/update
-        @property locate: information used to locate the field
-        @property term: new value
-    """
-    def __init__(self, field=None, op=None, locate=None, term=None):
-        self.field = field
-        self.op = op
-        self.locate = dict_default(locate)
-        self.term = dict_default(term)
-
-
 @swagger.model()
 class Scenario(models.ModelBase):
     """