X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=utils%2Ftest%2Ftestapi%2Fopnfv_testapi%2Fresources%2Fscenario_models.py;h=f89a1242898ca604d4a7faee0f591f01f50b08fb;hb=387c212e28b6050a74affbb787c9525e6337ce08;hp=0748a37380182c99d63179ffc7b771443730cb90;hpb=0505449a387df820e765cb0f52028ac5d0ba2e8c;p=releng.git

diff --git a/utils/test/testapi/opnfv_testapi/resources/scenario_models.py b/utils/test/testapi/opnfv_testapi/resources/scenario_models.py
index 0748a3738..f89a12428 100644
--- a/utils/test/testapi/opnfv_testapi/resources/scenario_models.py
+++ b/utils/test/testapi/opnfv_testapi/resources/scenario_models.py
@@ -11,7 +11,7 @@ class ScenarioTI(models.ModelBase):
 
 @swagger.model()
 class ScenarioScore(models.ModelBase):
-    def __init__(self, date=None, score=''):
+    def __init__(self, date=None, score='0'):
         self.date = date
         self.score = score
 
@@ -27,14 +27,19 @@ class ScenarioProject(models.ModelBase):
         @ptype trust_indicators: C{list} of L{ScenarioTI}
     """
     def __init__(self,
-                 name='',
+                 project='',
                  customs=None,
                  scores=None,
                  trust_indicators=None):
-        self.name = name
+        self.project = project
         self.customs = customs
         self.scores = scores
-        self.trust_indicator = trust_indicators
+        self.trust_indicators = trust_indicators
+
+    @staticmethod
+    def attr_parser():
+        return {'scores': ScenarioScore,
+                'trust_indicators': ScenarioTI}
 
 
 @swagger.model()
@@ -43,10 +48,14 @@ class ScenarioVersion(models.ModelBase):
         @property projects:
         @ptype projects: C{list} of L{ScenarioProject}
     """
-    def __init__(self, version, projects=None):
+    def __init__(self, version=None, projects=None):
         self.version = version
         self.projects = projects
 
+    @staticmethod
+    def attr_parser():
+        return {'projects': ScenarioProject}
+
 
 @swagger.model()
 class ScenarioInstaller(models.ModelBase):
@@ -54,11 +63,29 @@ class ScenarioInstaller(models.ModelBase):
         @property versions:
         @ptype versions: C{list} of L{ScenarioVersion}
     """
-    def __init__(self, installer=None, owner=None, versions=None):
+    def __init__(self, installer=None, versions=None):
         self.installer = installer
-        self.owner = owner
         self.versions = versions if versions else list()
 
+    @staticmethod
+    def attr_parser():
+        return {'versions': ScenarioVersion}
+
+
+@swagger.model()
+class ScenarioCreateRequest(models.ModelBase):
+    """
+        @property installers:
+        @ptype installers: C{list} of L{ScenarioInstaller}
+    """
+    def __init__(self, name='', installers=None):
+        self.name = name
+        self.installers = installers if installers else list()
+
+    @staticmethod
+    def attr_parser():
+        return {'installers': ScenarioInstaller}
+
 
 @swagger.model()
 class Scenario(models.ModelBase):
@@ -69,9 +96,13 @@ class Scenario(models.ModelBase):
     def __init__(self, name='', create_date='', _id='', installers=None):
         self.name = name
         self._id = _id
-        self.create_date = create_date
+        self.creation_date = create_date
         self.installers = installers if installers else list()
 
+    @staticmethod
+    def attr_parser():
+        return {'installers': ScenarioInstaller}
+
 
 @swagger.model()
 class Scenarios(models.ModelBase):