Fix bugs of logic in catalog tst cases

Change-Id: I041a478176ae04650edbf9bca3564e4c1cf239ff
Issue-Id: VFC-244
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>

diff --git a/catalog/packages/nf_package.py b/catalog/packages/nf_package.py
index f2e1df9..448572b 100644 (file)
--- a/catalog/packages/nf_package.py
+++ b/catalog/packages/nf_package.py
@@ -58,7 +58,7 @@ def nf_get_csar(csar_id):
         return [1, str(sys.exc_info())]
     return ret
 
-def parser_vnfmodel(csar_id,inputs):
+def parser_vnfdmodel(csar_id,inputs):
     ret= None
     try:
         nf_pkg = NfPackageModel.objects.filter(nfpackageid=csar_id)
@@ -238,9 +238,9 @@ class NfPackage(object):
 
 
         #vnf_insts = NfInstModel.objects.filter(package_id=csar_id)
-        vnf_insts = nfvolcm.getNfInsts()
-        vnf_inst_info = [{"vnfInstanceId": vnf_inst.nfinstid,
-                          "vnfInstanceName": vnf_inst.nf_name} for vnf_inst in vnf_insts]
+        vnf_insts = nfvolcm.getNfInsts_mock()
+        vnf_inst_info = [{"vnfInstanceId": vnf_inst["vnfInstanceId"],
+                          "vnfInstanceName": vnf_inst["vnfInstanceName"]} for vnf_inst in vnf_insts]
 
         return [0, {"csarId": csar_id,
                     "packageInfo": pkg_info,

diff --git a/catalog/packages/ns_package.py b/catalog/packages/ns_package.py
index 8174b44..7468dbc 100644 (file)
--- a/catalog/packages/ns_package.py
+++ b/catalog/packages/ns_package.py
@@ -180,8 +180,8 @@ class NsPackage(object):
         #nss = NSInstModel.objects.filter(nspackage_id=csar_id)
         nss = nfvolcm.getNsInsts_mock()
         ns_instance_info = [{
-            "nsInstanceId": ns.id, 
-            "nsInstanceName": ns.name} for ns in nss]
+            "nsInstanceId": ns["nsInstanceId"],
+            "nsInstanceName": ns["nsInstanceName"]} for ns in nss]
 
         return [0, {"csarId": csar_id, 
             "packageInfo": package_info, 

diff --git a/catalog/packages/tests.py b/catalog/packages/tests.py
index e046912..e948f9b 100644 (file)
--- a/catalog/packages/tests.py
+++ b/catalog/packages/tests.py
@@ -522,15 +522,16 @@ class PackageTest(unittest.TestCase):
         local_file_name = "/url/local/filename"
         nsd = json.JSONEncoder().encode(self.nsd_json)
         mock_get_nsd.return_value = self.nsd_json,local_file_name,nsd
-        response = self.client.delete("/api/catalog/v1/nspackages/%s" % str(self.ns_csarId))
+        response = self.client.post("/api/catalog/v1/nspackages",self.nsdata)
         self.assertEqual(status.HTTP_202_ACCEPTED, response.status_code, response.content)
-        self.assertEqual("Delete CSAR(123) successfully.", response.data["statusDescription"], response.content)
-        self.assert_nfmodel_result(str(self.ns_csarId), 0)
-        self.assert_nsdmodel_result("VCPE_NS",  0)
+        self.assertEqual("CSAR(123) distributed successfully.", response.data["statusDescription"], response.content)
+        self.assert_nfmodel_result(str(self.nf_csarId), 1)
+        self.assert_nsdmodel_result("VCPE_NS",  1)
 
         # Finally delete ns package
         response = self.client.delete("/api/catalog/v1/nspackages/" + str(self.ns_csarId))
         self.assertEqual(status.HTTP_202_ACCEPTED, response.status_code, response.content)
+        self.assertEqual("Delete CSAR(123) successfully.", response.data["statusDescription"], response.content)
         self.assert_nsdmodel_result("VCPE_NS",  0)
 
     def test_nf_package_delete_error(self):

diff --git a/catalog/packages/views.py b/catalog/packages/views.py
index d4e44cd..3535419 100644 (file)
--- a/catalog/packages/views.py
+++ b/catalog/packages/views.py
@@ -123,7 +123,7 @@ def vnf_model_parser(request, *args, **kwargs):
     csar_id = ignore_case_get(kwargs, "csarId")
     inputs = ignore_case_get(kwargs, "inputs")
     if request.method == 'POST':
-        ret = nf_package.parser_vnfmodel(csar_id,inputs)
+        ret = nf_package.parser_vnfdmodel(csar_id,inputs)
         normal_status = status.HTTP_202_ACCEPTED
 
     logger.info("Leave %s, Return value is %s", fun_name(), str(ret))