X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Ftests%2Ftest_query_vnf_lcm_op.py;h=feabe534c0dfdab9db8a8ff2dd8753fc484cbd96;hb=8f59e8d4426a11ea3f2a16d0c0479786fd02a027;hp=2e1c15a0685e89c3bb8a22838b167023679cfc7e;hpb=5b075b9740c4d57e219df38ae4fb7446fbdf5833;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/nf/tests/test_query_vnf_lcm_op.py b/lcm/lcm/nf/tests/test_query_vnf_lcm_op.py
index 2e1c15a0..feabe534 100644
--- a/lcm/lcm/nf/tests/test_query_vnf_lcm_op.py
+++ b/lcm/lcm/nf/tests/test_query_vnf_lcm_op.py
@@ -25,7 +25,7 @@ class TestVNFLcmOpOccs(TestCase):
         self.client = Client()
         self.vnf_lcm_op_occ_id = "99442b18-a5c7-11e8-998c-bf1755941f16"
         VNFLcmOpOccModel.objects.all().delete()
-        self.test_single_vnf_lcm_op = [{
+        self.test_single_vnf_lcm_op = {
             "id": "99442b18-a5c7-11e8-998c-bf1755941f16",
             "operationState": "STARTING",
             "stateEnteredTime": "2018-07-09",
@@ -45,7 +45,7 @@ class TestVNFLcmOpOccs(TestCase):
                 "self": "demo",
                 "vnfInstance": "demo"
             }
-        }]
+        }
         self.test_vnflcmop_with_exclude_default = [{
             "id": "99442b18-a5c7-11e8-998c-bf1755941f16",
             "operationState": "STARTING",
@@ -85,12 +85,12 @@ class TestVNFLcmOpOccs(TestCase):
             }
         }]
         self.test_multiple_vnf_lcm_op.append(
-            self.test_single_vnf_lcm_op[0])
+            self.test_single_vnf_lcm_op)
 
     def tearDown(self):
         pass
 
-    def test_get_vnflcmopocc(self):
+    def test_get_vnflcmopoccs(self):
         lcm_op_id = "99442b18-a5c7-11e8-998c-bf1755941f16"
         vnf_instance_id = "cd552c9c-ab6f-11e8-b354-236c32aa91a1"
         VNFLcmOpOccModel(id=lcm_op_id, operation_state="STARTING",
@@ -102,9 +102,9 @@ class TestVNFLcmOpOccs(TestCase):
                          links=json.dumps({"self": "demo", "vnfInstance": "demo"})).save()
         response = self.client.get("/api/vnflcm/v1/vnf_lcm_op_occs", format='json')
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(self.test_single_vnf_lcm_op, response.data)
+        self.assertEqual([self.test_single_vnf_lcm_op], response.data)
 
-    def test_get_vnflcmopocc_with_id_not_exist(self):
+    def test_get_vnflcmopoccs_with_id_not_exist(self):
         response = self.client.get("/api/vnflcm/v1/vnf_lcm_op_occs?id=dummy", format='json')
         self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
         expected_data = {
@@ -113,7 +113,7 @@ class TestVNFLcmOpOccs(TestCase):
         }
         self.assertEqual(expected_data, response.data)
 
-    def test_get_vnflcmopocc_with_filters(self):
+    def test_get_vnflcmopoccs_with_filters(self):
         lcm_op_id = "a6b9415c-ab99-11e8-9d37-dbb5e0378955"
         vnf_instance_id = "cd552c9c-ab6f-11e8-b354-236c32aa91a1"
         VNFLcmOpOccModel(id=lcm_op_id, operation_state="STARTING",
@@ -138,13 +138,13 @@ class TestVNFLcmOpOccs(TestCase):
 
         response = self.client.get("/api/vnflcm/v1/vnf_lcm_op_occs?operation=SCALE", format='json')
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(self.test_single_vnf_lcm_op, response.data)
+        self.assertEqual([self.test_single_vnf_lcm_op], response.data)
 
         response = self.client.get("/api/vnflcm/v1/vnf_lcm_op_occs?vnfInstanceId=%s" % vnf_instance_id, format='json')
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(self.test_multiple_vnf_lcm_op, response.data)
 
-    def test_get_vnflcmopocc_with_extra_flags(self):
+    def test_get_vnflcmopoccs_with_extra_flags(self):
         lcm_op_id = "99442b18-a5c7-11e8-998c-bf1755941f16"
         vnf_instance_id = "cd552c9c-ab6f-11e8-b354-236c32aa91a1"
         VNFLcmOpOccModel(id=lcm_op_id, operation_state="STARTING",
@@ -157,3 +157,27 @@ class TestVNFLcmOpOccs(TestCase):
         response = self.client.get("/api/vnflcm/v1/vnf_lcm_op_occs?exclude_default", format='json')
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(self.test_vnflcmop_with_exclude_default, response.data)
+
+    def test_get_vnflcmopocc_with_id(self):
+        lcm_op_id = "99442b18-a5c7-11e8-998c-bf1755941f16"
+        vnf_instance_id = "cd552c9c-ab6f-11e8-b354-236c32aa91a1"
+        VNFLcmOpOccModel(id=lcm_op_id, operation_state="STARTING",
+                         state_entered_time="2018-07-09", start_time="2018-07-09",
+                         vnf_instance_id=vnf_instance_id,
+                         grant_id=None, operation="SCALE", is_automatic_invocation=False,
+                         operation_params='{}', is_cancel_pending=False, cancel_mode=None,
+                         error=None, resource_changes=None, changed_ext_connectivity=None,
+                         links=json.dumps({"self": "demo", "vnfInstance": "demo"})).save()
+        response = self.client.get("/api/vnflcm/v1/vnf_lcm_op_occs/" + lcm_op_id, format='json')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(self.test_single_vnf_lcm_op, response.data)
+
+    def test_single_vnflcmopocc_with_unknown_id(self):
+        lcm_op_id = "99442b18-a5c7-11e8-998c-bf1755941f16"
+        response = self.client.get("/api/vnflcm/v1/vnf_lcm_op_occs/" + lcm_op_id, format='json')
+        self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
+        expected_data = {
+            "status": 500,
+            "detail": "LCM Operation Occurance does not exist"
+        }
+        self.assertEqual(expected_data, response.data)