Fix py3 related issue

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

4 files changed, 17 insertions, 15 deletions

diff --git a/fcaps/fcaps/vesagent/tests/tests_tasks.py b/fcaps/fcaps/vesagent/tests/tests_tasks.py
index 23cd182d..1bb1fe23 100644
--- a/fcaps/fcaps/vesagent/tests/tests_tasks.py
+++ b/fcaps/fcaps/vesagent/tests/tests_tasks.py
@@ -64,7 +64,7 @@ class VesTaskTest(unittest.TestCase):
             COUNT_TIME_SLOT2
         ]
         result = tasks.scheduleBacklogs(vimid="fcaps-hudson-dc_RegionOne")
-        self.assertEquals(None, result)
+        self.assertEqual(None, result)
 
     @mock.patch.object(tasks, 'processBacklogsOfOneVIM')
     @mock.patch.object(cache, 'get')
@@ -77,7 +77,7 @@ class VesTaskTest(unittest.TestCase):
             json.dumps(mock_VesAgentBacklogs_vimlist),
         ]
         result = tasks.processBacklogs()
-        self.assertEquals(COUNT_TIME_SLOT_ONE_VIM, result)
+        self.assertEqual(COUNT_TIME_SLOT_ONE_VIM, result)
 
     @mock.patch.object(tasks, 'processOneBacklog')
     @mock.patch.object(cache, 'set')
@@ -105,7 +105,7 @@ class VesTaskTest(unittest.TestCase):
         mock_cache_set.return_value = "mocked cache set"
         result = tasks.processBacklogsOfOneVIM(vimid="fcaps-hudson-dc_RegionOne")
         COUNT_TIME_SLOT = (1, 10)
-        self.assertEquals(COUNT_TIME_SLOT, result)
+        self.assertEqual(COUNT_TIME_SLOT, result)
 
     @mock.patch.object(fault_vm, 'processBacklog_fault_vm')
     def test_tasks_processOneBacklog(
@@ -140,4 +140,4 @@ class VesTaskTest(unittest.TestCase):
             poll_interval_default=10,
             oneBacklog=vesagent_onebacklog)
         COUNT_TIME_SLOT = (1, 10)
-        self.assertEquals(COUNT_TIME_SLOT, result)
+        self.assertEqual(COUNT_TIME_SLOT, result)
diff --git a/fcaps/fcaps/vesagent/tests/tests_vesagent_ctrl.py b/fcaps/fcaps/vesagent/tests/tests_vesagent_ctrl.py
index 760c44d3..73b324cd 100644
--- a/fcaps/fcaps/vesagent/tests/tests_vesagent_ctrl.py
+++ b/fcaps/fcaps/vesagent/tests/tests_vesagent_ctrl.py
@@ -73,7 +73,7 @@ class VesAgentCtrlTest(unittest.TestCase):
         mock_request.data = {"testdatakey": "testdatavalue"}
 
         response = self.view.post(request=mock_request, vimid="fcaps-hudson-dc_RegionOne")
-        self.assertEquals(status.HTTP_201_CREATED, response.status_code)
+        self.assertEqual(status.HTTP_201_CREATED, response.status_code)
 
     @mock.patch.object(vesagent_ctrl.VesAgentCtrl, 'clearBacklogsOneVIM')
     @mock.patch.object(extsys, 'get_vim_by_id')
@@ -84,7 +84,7 @@ class VesAgentCtrlTest(unittest.TestCase):
         mock_request.META = {"testkey": "testvalue"}
 
         response = self.view.delete(request=mock_request, vimid="fcaps-hudson-dc_RegionOne")
-        self.assertEquals(status.HTTP_200_OK, response.status_code)
+        self.assertEqual(status.HTTP_200_OK, response.status_code)
 
     @mock.patch.object(cache, 'get')
     def test_getBacklogsOneVIM(self, mock_get):
@@ -100,7 +100,7 @@ class VesAgentCtrlTest(unittest.TestCase):
         mock_get.return_value = json.dumps(mock_vesagent_config)
 
         vesAgentConfig = self.view.getBacklogsOneVIM(vimid="fcaps-hudson-dc_RegionOne")
-        self.assertEquals(vesAgentConfig, mock_vesagent_config)
+        self.assertEqual(vesAgentConfig, mock_vesagent_config)
 
     @mock.patch.object(cache, 'set')
     @mock.patch.object(cache, 'get')
@@ -129,7 +129,7 @@ class VesAgentCtrlTest(unittest.TestCase):
 
         result = self.view.clearBacklogsOneVIM(
             vimid="fcaps-hudson-dc_RegionOne")
-        self.assertEquals(0, result)
+        self.assertEqual(0, result)
 
     @mock.patch.object(scheduleBacklogs, 'delay')
     @mock.patch.object(cache, 'set')
diff --git a/fcaps/fcaps/vesagent/tests/tests_vespublish.py b/fcaps/fcaps/vesagent/tests/tests_vespublish.py
index 791b0ca8..82f194fa 100644
--- a/fcaps/fcaps/vesagent/tests/tests_vespublish.py
+++ b/fcaps/fcaps/vesagent/tests/tests_vespublish.py
@@ -16,7 +16,8 @@ import mock
 
 import unittest
 # import json
-import urllib2
+# import urllib2
+import urllib
 
 from fcaps.vesagent import vespublish
 
@@ -36,8 +37,8 @@ class VespublishTest(unittest.TestCase):
     def tearDown(self):
         pass
 
-    @mock.patch.object(urllib2, 'urlopen')
-    @mock.patch.object(urllib2, 'Request')
+    @mock.patch.object(urllib.request, 'urlopen')
+    @mock.patch.object(urllib.request, 'Request')
     def test_publishAnyEventToVES(self, mock_Request, mock_urlopen):
         mock_request = mock.Mock()
 
diff --git a/fcaps/fcaps/vesagent/vespublish.py b/fcaps/fcaps/vesagent/vespublish.py
index a53245cc..8fe58ac4 100644
--- a/fcaps/fcaps/vesagent/vespublish.py
+++ b/fcaps/fcaps/vesagent/vespublish.py
@@ -17,7 +17,8 @@ from __future__ import absolute_import, unicode_literals
 import time
 import logging
 import json
-import urllib2
+# import urllib2
+import urllib
 
 logger = logging.getLogger(__name__)
 
@@ -41,11 +42,11 @@ def publishAnyEventToVES(ves_subscription, events):
 
             logger.info("publish event to VES: %s" % endpoint)
             headers = {'Content-Type': 'application/json'}
-            request = urllib2.Request(url=endpoint, headers=headers, data=json.dumps(events))
+            request = urllib.request.Request(url=endpoint, headers=headers, data=json.dumps(events))
             time.sleep(1)
-            response = urllib2.urlopen(request)
+            response = urllib.request.urlopen(request)
             logger.info("VES response is: %s" % response.read())
-        except urllib2.URLError as e:
+        except urllib.error.URLError as e:
             logger.critical("Failed to publish to %s: %s" % (endpoint, e.reason))
         except Exception as e:
             logger.error("exception:%s" % str(e))