Update windriver plugin to py3

Change-Id: I7bb1591a31de777d59ad1b96246bbc4d8e1f86f4
Issue-ID: MULTICLOUD-774
Signed-off-by: Bin Yang <bin.yang@windriver.com>

3 files changed, 34 insertions, 22 deletions

diff --git a/share/newton_base/registration/registration.py b/share/newton_base/registration/registration.py
index 5656c6b6..dc595387 100644
--- a/share/newton_base/registration/registration.py
+++ b/share/newton_base/registration/registration.py
@@ -495,7 +495,7 @@ class RegistryHelper(MultiCloudAAIHelper):
                     self._logger.error(traceback.format_exc())
                     return (
                         11,
-                        ex.message
+                        str(ex)
                     )
             else:
                 self._logger.error(
@@ -508,7 +508,7 @@ class RegistryHelper(MultiCloudAAIHelper):
             self._logger.error(traceback.format_exc())
             return (
                 11,
-                e.message
+                str(e)
             )
 
     def _discover_flavors(self, vimid="", session=None, viminfo=None):
@@ -568,7 +568,7 @@ class RegistryHelper(MultiCloudAAIHelper):
         except Exception as e:
             self._logger.error(traceback.format_exc())
             return (
-                11, e.message
+                11, str(e)
             )
 
     def _get_hpa_capabilities(self, flavor, extra_specs, viminfo):
@@ -661,7 +661,7 @@ class RegistryHelper(MultiCloudAAIHelper):
         except Exception as e:
             self._logger.error(traceback.format_exc())
             return (
-                11, e.message
+                11, str(e)
             )
 
         return basic_capability
@@ -1071,7 +1071,7 @@ class RegistryHelper(MultiCloudAAIHelper):
         except Exception as e:
             self._logger.error(traceback.format_exc())
             return (
-                11, e.message
+                11, str(e)
             )
 
     def _discover_availability_zones(self, vimid="", session=None,
@@ -1160,7 +1160,7 @@ class RegistryHelper(MultiCloudAAIHelper):
         except Exception as e:
             self._logger.error(traceback.format_exc())
             return (
-                11, e.message
+                11, str(e)
             )
 
     # def _discover_volumegroups(self, vimid="", session=None, viminfo=None):
@@ -1229,7 +1229,7 @@ class RegistryHelper(MultiCloudAAIHelper):
         except Exception as e:
             self._logger.error(traceback.format_exc())
             return (
-                11, e.message
+                11, str(e)
             )
 
     # def _discover_servergroups(self, vimid="", session=None, viminfo=None):
@@ -1456,7 +1456,7 @@ class RegistryHelper(MultiCloudAAIHelper):
         except Exception as e:
             self._logger.error(traceback.format_exc())
             return (
-                11, e.message
+                11, str(e)
             )
 
     def _update_proxy_identity_endpoint(self, vimid):
@@ -1531,6 +1531,6 @@ class RegistryHelper(MultiCloudAAIHelper):
         except Exception as e:
             self._logger.error(traceback.format_exc())
             return (
-                11, e.message
+                11, str(e)
             )
 
diff --git a/share/newton_base/resource/infra_workload_helper.py b/share/newton_base/resource/infra_workload_helper.py
index f274148b..e6e78130 100644
--- a/share/newton_base/resource/infra_workload_helper.py
+++ b/share/newton_base/resource/infra_workload_helper.py
@@ -228,8 +228,8 @@ class InfraWorkloadHelper(object):
                             self._logger.debug("AAI update %s response: %s" %
                                                (aai_resource['uri'], content))
                     except Exception as e:
-                        self._logger.error(e.message)
-                        return status.HTTP_500_INTERNAL_SERVER_ERROR, "UPDATE_FAILED", e.message
+                        self._logger.error(str(e))
+                        return status.HTTP_500_INTERNAL_SERVER_ERROR, "UPDATE_FAILED", str(e)
 
                     # aai_resource_transactions = {"put": [aai_resource]}
                     # transactions.append(aai_resource_transactions)
@@ -284,8 +284,8 @@ class InfraWorkloadHelper(object):
                             self._logger.debug("AAI update %s response: %s" %
                                                (aai_resource['uri'], content))
                     except Exception as e:
-                        self._logger.error(e.message)
-                        return status.HTTP_500_INTERNAL_SERVER_ERROR, "UPDATE_FAILED", e.message
+                        self._logger.error(str(e))
+                        return status.HTTP_500_INTERNAL_SERVER_ERROR, "UPDATE_FAILED", str(e)
 
                     # aai_resource_transactions = {"put": [aai_resource]}
                     # transactions.append(aai_resource_transactions)
@@ -373,7 +373,7 @@ class InfraWorkloadHelper(object):
 
                         restcall.req_to_aai(vport_delete_url, "DELETE")
                 except Exception as e:
-                    # return 12, "DELETE_FAILED", e.message
+                    # return 12, "DELETE_FAILED", str(e)
                     pass
 
                 try:
@@ -389,8 +389,8 @@ class InfraWorkloadHelper(object):
 
             return 0, "DELETE_COMPLETE", "succeed"
         except Exception as e:
-            self._logger.error(e.message)
-            return status.HTTP_500_INTERNAL_SERVER_ERROR, "DELETE_FAILED", e.message
+            self._logger.error(str(e))
+            return status.HTTP_500_INTERNAL_SERVER_ERROR, "DELETE_FAILED", str(e)
         pass
 
     def workload_status(self, vimid, stack_id=None, stack_name=None, otherinfo=None, project_idorname=None):
@@ -444,8 +444,8 @@ class InfraWorkloadHelper(object):
 
             return retcode, workload_status, content
         except Exception as e:
-            self._logger.error(e.message)
-            return status.HTTP_500_INTERNAL_SERVER_ERROR, "GET_FAILED", e.message
+            self._logger.error(str(e))
+            return status.HTTP_500_INTERNAL_SERVER_ERROR, "GET_FAILED", str(e)
 
 
     def workload_detail(self, vimid, stack_id, nexturi=None, otherinfo=None, project_idorname=None):
@@ -497,5 +497,5 @@ class InfraWorkloadHelper(object):
 
             return 0, workload_status, content
         except Exception as e:
-            self._logger.error(e.message)
-            return status.HTTP_500_INTERNAL_SERVER_ERROR, "GET_FAILED", e.message
+            self._logger.error(str(e))
+            return status.HTTP_500_INTERNAL_SERVER_ERROR, "GET_FAILED", str(e)
diff --git a/share/newton_base/tests/test_base.py b/share/newton_base/tests/test_base.py
index 15160d06..b9923d1c 100644
--- a/share/newton_base/tests/test_base.py
+++ b/share/newton_base/tests/test_base.py
@@ -12,11 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import sys
 import json
-import mock
+# import mock
 from rest_framework import status
 import unittest
 
+if sys.version_info < (3, 0):
+    import mock
+else:
+    from unittest import mock
+
 from abc import ABCMeta
 from django.conf import settings
 from django.test import Client
@@ -35,9 +41,15 @@ class MockResponse(object):
         pass
 
 
+def get_mock_response(return_value=None):
+    mock_response = mock.Mock(spec=MockResponse)
+    mock_response.status_code = status.HTTP_200_OK
+    mock_response.json.return_value = return_value
+    return mock_response
+
 def get_mock_session(http_actions, response_dict={}):
     mock_session = mock.Mock(
-        name='mock_session',spec=http_actions)
+        name='mock_session', spec=http_actions)
     for action in http_actions:
         side_effect = response_dict.get("side_effect")
         if side_effect and isinstance(side_effect, list):