Merge "simplify test_pod.py with eq"

2 files changed, 17 insertions, 21 deletions

diff --git a/testapi/opnfv_testapi/models/base_models.py b/testapi/opnfv_testapi/models/base_models.py
index 5017e85..efce0ad 100644
--- a/testapi/opnfv_testapi/models/base_models.py
+++ b/testapi/opnfv_testapi/models/base_models.py
@@ -42,15 +42,16 @@ class ModelBase(object):
         attr_parser = cls.attr_parser()
         t = cls()
         for k, v in a_dict.iteritems():
-            value = v
-            if isinstance(v, dict) and k in attr_parser:
-                value = attr_parser[k].from_dict(v)
-            elif isinstance(v, list) and k in attr_parser:
-                value = []
-                for item in v:
-                    value.append(attr_parser[k].from_dict(item))
-
-            t.__setattr__(k, value)
+            if k in t.__dict__:
+                value = v
+                if isinstance(v, dict) and k in attr_parser:
+                    value = attr_parser[k].from_dict(v)
+                elif isinstance(v, list) and k in attr_parser:
+                    value = []
+                    for item in v:
+                        value.append(attr_parser[k].from_dict(item))
+
+                t.__setattr__(k, value)
 
         return t
 
diff --git a/testapi/opnfv_testapi/models/pod_models.py b/testapi/opnfv_testapi/models/pod_models.py
index 15c2833..0eddfcc 100644
--- a/testapi/opnfv_testapi/models/pod_models.py
+++ b/testapi/opnfv_testapi/models/pod_models.py
@@ -18,7 +18,7 @@ from opnfv_testapi.tornado_swagger import swagger
 
 @swagger.model()
 class PodCreateRequest(base_models.ModelBase):
-    def __init__(self, name, mode='', details='', role=""):
+    def __init__(self, name='', mode='', details='', role=""):
         self.name = name
         self.mode = mode
         self.details = details
@@ -26,17 +26,12 @@ class PodCreateRequest(base_models.ModelBase):
 
 
 @swagger.model()
-class Pod(base_models.ModelBase):
-    def __init__(self,
-                 name='', mode='', details='',
-                 role="", _id='', create_date='', owner=''):
-        self.name = name
-        self.mode = mode
-        self.details = details
-        self.role = role
-        self._id = _id
-        self.creation_date = create_date
-        self.owner = owner
+class Pod(PodCreateRequest):
+    def __init__(self, **kwargs):
+        self._id = kwargs.pop('_id', '')
+        self.creation_date = kwargs.pop('creation_date', '')
+        self.owner = kwargs.pop('owner', '')
+        super(Pod, self).__init__(**kwargs)
 
 
 @swagger.model()