Merge "Apex,Functest: Updates env detection"

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

diff --git a/utils/test/testapi/opnfv_testapi/resources/models.py b/utils/test/testapi/opnfv_testapi/resources/models.py
index c85c1d5..f518c97 100644 (file)
--- a/utils/test/testapi/opnfv_testapi/resources/models.py
+++ b/utils/test/testapi/opnfv_testapi/resources/models.py
@@ -24,7 +24,6 @@ class ModelBase(object):
     def _format(self, excludes):\r
         new_obj = copy.deepcopy(self)\r
         dicts = new_obj.__dict__\r
-        print self, self.__class__\r
         for k in dicts.keys():\r
             if k in excludes:\r
                 del dicts[k]\r
@@ -32,9 +31,9 @@ class ModelBase(object):
                 if hasattr(dicts[k], 'format'):\r
                     dicts[k] = dicts[k].format()\r
                 elif isinstance(dicts[k], list):\r
-                    hs = []\r
-                    for h in dicts[k]:\r
-                        hs.append(h.format())\r
+                    hs = list()\r
+                    [hs.append(h.format() if hasattr(h, 'format') else str(h))\r
+                     for h in dicts[k]]\r
                     dicts[k] = hs\r
                 elif not isinstance(dicts[k], (str, int, float, dict)):\r
                     dicts[k] = str(dicts[k])\r
@@ -71,6 +70,7 @@ class ModelBase(object):
         return t\r
 \r
 \r
+@swagger.model()\r
 class CreateResponse(ModelBase):\r
     def __init__(self, href=''):\r
         self.href = href\r