Merge "Update python2 to python3"

diff --combined lcm/ns/tests/test_ns_instant.py
index 8470659,ab4335c..7dd1f99
--- 1/lcm/ns/tests/test_ns_instant.py
--- 2/lcm/ns/tests/test_ns_instant.py
+++ b/lcm/ns/tests/test_ns_instant.py
@@@ -35,19 -35,10 +35,19 @@@ class TestNsInstant(TestCase)
          NSInstModel.objects.filter().delete()
          self.url = "/api/nslcm/v1/ns/%s/instantiate" % "2"
          NSInstModel(id="2", nspackage_id="7", nsd_id="2", status="active").save()
 +        self._mock_get_auto_id()
  
      def tearDown(self):
          pass
  
 +    def _mock_get_auto_id(self):
 +        fake_auto_id = mock.Mock()
 +        fake_auto_id.return_value = 1
 +        patcher = mock.patch(
 +            'lcm.pub.utils.idutil.get_auto_id',
 +            fake_auto_id)
 +        patcher.start()
 +
      @mock.patch.object(restcall, 'call_req')
      @mock.patch('lcm.pub.msapi.sdc_run_catalog.parse_nsd', MagicMock(return_value=json.dumps({"model": json.dumps(NSD_MODEL_DICT)})))
      @mock.patch.object(BuildInWorkflowThread, 'run')
@@@ -66,7 -57,7 +66,7 @@@
      def test_ns_instantiate_normal(self, mock_do_biz):
          mock_do_biz.return_value = dict(data=JOB_DICT, status=status.HTTP_200_OK)
          resp = self.client.post(self.url, data=INSTANTIATE_NS_DICT, format='json')
-         self.failUnlessEqual(status.HTTP_200_OK, resp.status_code)
+         self.assertEqual(status.HTTP_200_OK, resp.status_code)
          self.assertEqual(JOB_DICT, resp.data)
  
      @mock.patch.object(restcall, 'call_req')