Merge "GET VNF Description"

3 files changed, 90 insertions, 59 deletions

diff --git a/lcm/lcm/nf/vnfs/tests/test_vnf_create.py b/lcm/lcm/nf/vnfs/tests/test_vnf_create.py
index fd35bd80..cefb86d6 100644
--- a/lcm/lcm/nf/vnfs/tests/test_vnf_create.py
+++ b/lcm/lcm/nf/vnfs/tests/test_vnf_create.py
@@ -19,8 +19,59 @@ import mock
 from django.test import TestCase, Client
 from rest_framework import status
 
-from lcm.pub.database.models import NfInstModel
+from lcm.nf.vnfs.views import InstantiateVnf
+from lcm.nf.vnfs.vnf_create.create_vnf_identifier import CreateVnf
+from lcm.nf.vnfs.vnf_create.inst_vnf import InstVnf
+from lcm.pub.database.models import NfInstModel, JobStatusModel
 from lcm.pub.utils import restcall
+from lcm.pub.utils.jobutil import JobUtil
+
+inst_req_data = {
+    "flavourId": "flavour_1",
+    "instantiationLevelId": "instantiationLevel_1",
+    "extVirtualLinks": [
+        {
+            "vlInstanceId": "1",
+            "vim": {
+                "vimInfoId": "1",
+                "vimId": "1",
+                "interfaceInfo": {
+                    "vimType": "vim",
+                    "apiVersion": "v2",
+                    "protocolType": "http"
+                },
+                "accessInfo": {
+                    "tenant": "tenant_vCPE",
+                    "username": "vCPE",
+                    "password": "vCPE_321"
+                },
+                "interfaceEndpoint": "http://10.43.21.105:80/"
+            },
+            "resourceId": "1246",
+            "extCps": [
+                {
+                    "cpdId": "11",
+                    "addresses": [
+                        {
+                            "addressType": "MAC",
+                            "l2AddressData": "00:f3:43:20:a2:a3"
+                        },
+                        {
+                            "addressType": "IP",
+                            "l3AddressData": {
+                                "iPAddressType": "IPv4",
+                                "iPAddress": "192.168.104.2"
+                            }
+                        }
+                    ],
+                    "numDynamicAddresses": 0
+                }
+            ]
+        }
+    ],
+    "localizationLanguage": "en_US",
+    "additionalParams": {}
+}
 
 
 class TestNsInstantiate(TestCase):
@@ -31,11 +82,17 @@ class TestNsInstantiate(TestCase):
     def tearDown(self):
         pass
 
+    def assert_job_result(self, job_id, job_progress, job_detail):
+        jobs = JobStatusModel.objects.filter(
+            jobid=job_id,
+            progress=job_progress,
+            descp=job_detail)
+        self.assertEqual(1, len(jobs))
+
     @mock.patch.object(restcall, 'call_req')
     def test_create_vnf_identifier(self, mock_call_req):
         r1 = [0, json.JSONEncoder().encode(vnfd_model_dict), '200']
         mock_call_req.side_effect = [r1]
-
         data = {
             "vnfdId": "111",
             "vnfInstanceName": "vFW_01",
@@ -46,55 +103,18 @@ class TestNsInstantiate(TestCase):
         self.assertTrue(NfInstModel.objects.filter(nfinstid=context['vnfInstanceId']).exists())
 
     def test_instantiate_vnf(self):
-        data = {
-            "flavourId": "flavour_1",
-            "instantiationLevelId": "instantiationLevel_1",
-            "extVirtualLinks": [
-                {
-                    "vlInstanceId": "1",
-                    "vim": {
-                        "vimInfoId": "1",
-                        "vimId": "1",
-                        "interfaceInfo": {
-                            "vimType": "vim",
-                            "apiVersion": "v2",
-                            "protocolType": "http"
-                        },
-                        "accessInfo": {
-                            "tenant": "tenant_vCPE",
-                            "username": "vCPE",
-                            "password": "vCPE_321"
-                        },
-                        "interfaceEndpoint": "http://10.43.21.105:80/"
-                    },
-                    "resourceId": "1246",
-                    "extCps": [
-                        {
-                            "cpdId": "11",
-                            "addresses": [
-                                {
-                                    "addressType": "MAC",
-                                    "l2AddressData": "00:f3:43:20:a2:a3"
-                                },
-                                {
-                                    "addressType": "IP",
-                                    "l3AddressData": {
-                                        "iPAddressType": "IPv4",
-                                        "iPAddress": "192.168.104.2"
-                                    }
-                                }
-                            ],
-                            "numDynamicAddresses": 0
-                        }
-                    ]
-                }
-            ],
-            "localizationLanguage": "en_US",
-            "additionalParams": {}
-        }
-        response = self.client.post("/gvnfmapi/lcm/v1/vnf_instances/12/instantiate", data=data, format='json')
+        response = self.client.post("/gvnfmapi/lcm/v1/vnf_instances/12/instantiate", data={}, format='json')
         self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code)
 
+    def test_instantiate_vnf_when_instid_not_exist(self):
+        self.nf_inst_id = str(uuid.uuid4())
+        self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)
+        JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY")
+        data = inst_req_data
+        InstVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()
+        self.assert_job_result(self.job_id, 255, "VNF nf_inst_id is not exist.")
+
+
 vnfd_model_dict = {
     'local_storages': [],
     'vdus': [
diff --git a/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py b/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py
index 258b863b..db45fd62 100644
--- a/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py
+++ b/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py
@@ -16,7 +16,11 @@ import logging
 import traceback
 from threading import Thread
 
+import time
+
+from lcm.pub.database.models import NfInstModel, JobStatusModel
 from lcm.pub.exceptions import NFLCMException
+from lcm.pub.utils.jobutil import JobUtil
 
 logger = logging.getLogger(__name__)
 
@@ -30,13 +34,13 @@ class InstVnf(Thread):
 
     def run(self):
         try:
-            args = {}
-            self.inst_pre(args)
-            self.apply_grant(args)
-            self.apply_res(args)
-            self.check_res_status(args)
-            self.wait_inst_finish(args)
-            self.lcm_notify(args)
+            self.inst_pre(self.nf_inst_id)
+
+            # self.apply_grant(args)
+            # self.apply_res(args)
+            # self.check_res_status(args)
+            # self.wait_inst_finish(args)
+            # self.lcm_notify(args)
         except NFLCMException as e:
             self.inst_exception(e.message)
             pass
@@ -47,8 +51,15 @@ class InstVnf(Thread):
     def inst_pre(self, args):
         try:
             logger.info('inst_pre, args=%s' % args)
-            # InstPreTask(args).do_biz()
-            return {'result': '100', 'sessionid': '', 'msg': 'Nf instancing preprocess finish', 'context': {}}
+            is_exist = NfInstModel.objects.filter(nfinstid=self.nf_inst_id).exists()
+            logger.debug("check_ns_inst_name_exist::is_exist=%s" % is_exist)
+            if not is_exist:
+                JobUtil.add_job_status(self.job_id, 255, "VNF nf_inst_id is not exist.")
+                raise NFLCMException('VNF nf_inst_id is not exist.')
+
+            JobUtil.add_job_status(self.job_id, 100, "Instantiate Vnf success.")
+            is_exist = JobStatusModel.objects.filter(jobid=self.job_id).exists()
+            logger.debug("check_ns_inst_name_exist::is_exist=%s" % is_exist)
         except Exception as e:
             logger.error('Nf instancing preprocess exception=%s' % e.message)
             logger.error(traceback.format_exc())
diff --git a/lcm/lcm/pub/exceptions.py b/lcm/lcm/pub/exceptions.py
index 274c0d06..ac7b0c6d 100644
--- a/lcm/lcm/pub/exceptions.py
+++ b/lcm/lcm/pub/exceptions.py
@@ -14,4 +14,4 @@
 
 
 class NFLCMException(Exception):
-    pass
+    pass
\ No newline at end of file