Problem with rally_sanity results

after refactor, details in rally_sanity became 'unicode',
which contains built-in 'format' method, which is not processed correctly
error message:
File
"/usr/local/lib/python2.7/dist-packages/opnfv_testapi/resources/models.py",
  line 36, in _format
    for h in dicts[k]]
        KeyError: u"u'details'"

JIRA: FUNCTEST-723

Change-Id: If35e55f542fbbae8bd1a534938b7279b7a634880
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>

1 files changed, 116 insertions, 98 deletions

diff --git a/utils/test/testapi/opnfv_testapi/resources/models.py b/utils/test/testapi/opnfv_testapi/resources/models.py
index f518c97a0..0ea482fd2 100644
--- a/utils/test/testapi/opnfv_testapi/resources/models.py
+++ b/utils/test/testapi/opnfv_testapi/resources/models.py
@@ -1,98 +1,116 @@
-##############################################################################

-# Copyright (c) 2015 Orange

-# guyrodrigue.koffi@orange.com / koffirodrigue@gmail.com

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Apache License, Version 2.0

-# which accompanies this distribution, and is available at

-# http://www.apache.org/licenses/LICENSE-2.0

-# feng.xiaowei@zte.com.cn  mv Pod to pod_models.py                 5-18-2016

-# feng.xiaowei@zte.com.cn  add MetaCreateResponse/MetaGetResponse  5-18-2016

-# feng.xiaowei@zte.com.cn  mv TestProject to project_models.py     5-19-2016

-# feng.xiaowei@zte.com.cn  delete meta class                       5-19-2016

-# feng.xiaowei@zte.com.cn  add CreateResponse                      5-19-2016

-# feng.xiaowei@zte.com.cn  mv TestCase to testcase_models.py       5-20-2016

-# feng.xiaowei@zte.com.cn  mv TestResut to result_models.py        5-23-2016

-# feng.xiaowei@zte.com.cn  add ModelBase                           12-20-2016

-##############################################################################

-import copy

-

-from opnfv_testapi.tornado_swagger import swagger

-

-

-class ModelBase(object):

-

-    def _format(self, excludes):

-        new_obj = copy.deepcopy(self)

-        dicts = new_obj.__dict__

-        for k in dicts.keys():

-            if k in excludes:

-                del dicts[k]

-            elif dicts[k]:

-                if hasattr(dicts[k], 'format'):

-                    dicts[k] = dicts[k].format()

-                elif isinstance(dicts[k], list):

-                    hs = list()

-                    [hs.append(h.format() if hasattr(h, 'format') else str(h))

-                     for h in dicts[k]]

-                    dicts[k] = hs

-                elif not isinstance(dicts[k], (str, int, float, dict)):

-                    dicts[k] = str(dicts[k])

-        return dicts

-

-    def format(self):

-        return self._format(['_id'])

-

-    def format_http(self):

-        return self._format([])

-

-    @staticmethod

-    def attr_parser():

-        return {}

-

-    @classmethod

-    def from_dict(cls, a_dict):

-        if a_dict is None:

-            return None

-

-        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)

-

-        return t

-

-

-@swagger.model()

-class CreateResponse(ModelBase):

-    def __init__(self, href=''):

-        self.href = href

-

-

-@swagger.model()

-class Versions(ModelBase):

-    """

-        @property versions:

-        @ptype versions: C{list} of L{Version}

-    """

-

-    def __init__(self):

-        self.versions = list()

-

-    @staticmethod

-    def attr_parser():

-        return {'versions': Version}

-

-

-@swagger.model()

-class Version(ModelBase):

-    def __init__(self, version=None, description=None):

-        self.version = version

-        self.description = description

+##############################################################################
+# Copyright (c) 2015 Orange
+# guyrodrigue.koffi@orange.com / koffirodrigue@gmail.com
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+# feng.xiaowei@zte.com.cn  mv Pod to pod_models.py                 5-18-2016
+# feng.xiaowei@zte.com.cn  add MetaCreateResponse/MetaGetResponse  5-18-2016
+# feng.xiaowei@zte.com.cn  mv TestProject to project_models.py     5-19-2016
+# feng.xiaowei@zte.com.cn  delete meta class                       5-19-2016
+# feng.xiaowei@zte.com.cn  add CreateResponse                      5-19-2016
+# feng.xiaowei@zte.com.cn  mv TestCase to testcase_models.py       5-20-2016
+# feng.xiaowei@zte.com.cn  mv TestResut to result_models.py        5-23-2016
+# feng.xiaowei@zte.com.cn  add ModelBase                           12-20-2016
+##############################################################################
+import copy
+import ast
+
+
+from opnfv_testapi.tornado_swagger import swagger
+
+
+class ModelBase(object):
+
+    def format(self):
+        return self._format(['_id'])
+
+    def format_http(self):
+        return self._format([])
+
+    @classmethod
+    def from_dict(cls, a_dict):
+        if a_dict is None:
+            return None
+
+        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)
+
+        return t
+
+    @staticmethod
+    def attr_parser():
+        return {}
+
+    def _format(self, excludes):
+        new_obj = copy.deepcopy(self)
+        dicts = new_obj.__dict__
+        for k in dicts.keys():
+            if k in excludes:
+                del dicts[k]
+            elif dicts[k]:
+                dicts[k] = self._obj_format(dicts[k])
+        return dicts
+
+    def _obj_format(self, obj):
+        if self._has_format(obj):
+            obj = obj.format()
+        elif isinstance(obj, unicode):
+            try:
+                obj = self._obj_format(ast.literal_eval(obj))
+            except:
+                try:
+                    obj = str(obj)
+                except:
+                    obj = obj
+        elif isinstance(obj, list):
+            hs = list()
+            for h in obj:
+                hs.append(self._obj_format(h))
+            obj = hs
+        elif not isinstance(obj, (str, int, float, dict)):
+            obj = str(obj)
+        return obj
+
+    @staticmethod
+    def _has_format(obj):
+        return not isinstance(obj, (str, unicode)) and hasattr(obj, 'format')
+
+
+@swagger.model()
+class CreateResponse(ModelBase):
+    def __init__(self, href=''):
+        self.href = href
+
+
+@swagger.model()
+class Versions(ModelBase):
+    """
+        @property versions:
+        @ptype versions: C{list} of L{Version}
+    """
+
+    def __init__(self):
+        self.versions = list()
+
+    @staticmethod
+    def attr_parser():
+        return {'versions': Version}
+
+
+@swagger.model()
+class Version(ModelBase):
+    def __init__(self, version=None, description=None):
+        self.version = version
+        self.description = description