diff options
| -rw-r--r-- | lcm/lcm/nf/biz/instantiate_vnf.py | 9 | ||||
| -rw-r--r-- | lcm/lcm/nf/tests/test_instantiate_vnf.py | 68 | ||||
| -rw-r--r-- | lcm/lcm/pub/msapi/gvnfmdriver.py | 46 | ||||
| -rw-r--r-- | lcm/lcm/pub/utils/notificationsutil.py | 1 | ||||
| -rw-r--r-- | lcm/lcm/pub/utils/tests.py | 2 |
5 files changed, 86 insertions, 40 deletions
diff --git a/lcm/lcm/nf/biz/instantiate_vnf.py b/lcm/lcm/nf/biz/instantiate_vnf.py index 56e9c146..f86baab4 100644 --- a/lcm/lcm/nf/biz/instantiate_vnf.py +++ b/lcm/lcm/nf/biz/instantiate_vnf.py @@ -21,10 +21,12 @@ from threading import Thread from lcm.pub.database.models import NfInstModel, VmInstModel, NetworkInstModel, \ SubNetworkInstModel, PortInstModel, StorageInstModel, FlavourInstModel, VNFCInstModel from lcm.pub.exceptions import NFLCMException -from lcm.pub.msapi.gvnfmdriver import notify_lcm_to_nfvo, prepare_notification_data +from lcm.pub.msapi.gvnfmdriver import prepare_notification_data +# from lcm.pub.msapi.gvnfmdriver import notify_lcm_to_nfvo from lcm.pub.msapi.sdc_run_catalog import query_vnfpackage_by_id from lcm.pub.utils.jobutil import JobUtil from lcm.pub.utils.timeutil import now_time +from lcm.pub.utils.notificationsutil import NotificationsUtil from lcm.pub.utils.values import ignore_case_get, get_none, get_boolean, get_integer from lcm.pub.vimapi import adaptor from lcm.nf.biz.grant_vnf import grant_resource @@ -131,8 +133,9 @@ class InstantiateVnf(Thread): def lcm_notify(self): notification_content = prepare_notification_data(self.nf_inst_id, self.job_id, "ADDED") logger.info('Notify request data = %s' % notification_content) - resp = notify_lcm_to_nfvo(json.dumps(notification_content)) - logger.info('Lcm notify end, response %s' % resp) + # resp = notify_lcm_to_nfvo(json.dumps(notification_content)) + # logger.info('Lcm notify end, response %s' % resp) + NotificationsUtil().send_notification(notification_content) def vnf_inst_failed_handle(self, error_msg): logger.error('VNF instantiation failed, detail message: %s' % error_msg) diff --git a/lcm/lcm/nf/tests/test_instantiate_vnf.py b/lcm/lcm/nf/tests/test_instantiate_vnf.py index e698c4db..4784fa29 100644 --- a/lcm/lcm/nf/tests/test_instantiate_vnf.py +++ b/lcm/lcm/nf/tests/test_instantiate_vnf.py @@ -24,10 +24,11 @@ from lcm.nf.biz.instantiate_vnf import InstantiateVnf from lcm.nf.const import c1_data_get_tenant_id, c4_data_create_network, c2_data_create_volume, \
c5_data_create_subnet, c3_data_get_volume, c6_data_create_port, c7_data_create_flavor, c8_data_list_image, \
c9_data_create_vm, c10_data_get_vm, inst_req_data, vnfpackage_info
-from lcm.pub.database.models import NfInstModel, JobStatusModel
+from lcm.pub.database.models import NfInstModel, JobStatusModel, SubscriptionModel
from lcm.pub.utils import restcall
from lcm.pub.utils.jobutil import JobUtil
from lcm.pub.utils.timeutil import now_time
+from lcm.pub.utils.notificationsutil import NotificationsUtil
from lcm.pub.vimapi import api
@@ -68,22 +69,22 @@ class TestNFInstantiate(TestCase): @mock.patch.object(InstantiateVnf, 'run')
def test_instantiate_vnf(self, mock_run):
- NfInstModel(nfinstid='12', nf_name='VNF1', status="UN_INSTANTIATED").save()
+ NfInstModel(nfinstid='12', nf_name='VNF1', status='UN_INSTANTIATED').save()
mock_run.re.return_value = None
- response = self.client.post("/api/vnflcm/v1/vnf_instances/12/instantiate", data=inst_req_data, format='json')
+ response = self.client.post('/api/vnflcm/v1/vnf_instances/12/instantiate', data=inst_req_data, format='json')
self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code)
def test_instantiate_vnf_when_inst_id_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")
+ JobUtil.add_job_status(self.job_id, 0, 'INST_VNF_READY')
jobs = JobStatusModel.objects.filter(jobid=self.job_id,
progress=0,
- descp="INST_VNF_READY")
+ descp='INST_VNF_READY')
self.assertEqual(1, len(jobs))
data = inst_req_data
InstantiateVnf(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.")
+ self.assert_job_result(self.job_id, 255, 'VNF nf_inst_id is not exist.')
def test_instantiate_vnf_when_already_instantiated(self):
NfInstModel.objects.create(nfinstid='1111',
@@ -99,14 +100,14 @@ class TestNFInstantiate(TestCase): create_time=now_time())
self.nf_inst_id = '1111'
self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)
- JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY")
+ JobUtil.add_job_status(self.job_id, 0, 'INST_VNF_READY')
jobs = JobStatusModel.objects.filter(jobid=self.job_id,
progress=0,
- descp="INST_VNF_READY")
+ descp='INST_VNF_READY')
self.assertEqual(1, len(jobs))
data = inst_req_data
InstantiateVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()
- self.assert_job_result(self.job_id, 255, "VNF instantiationState is not NOT_INSTANTIATED.")
+ self.assert_job_result(self.job_id, 255, 'VNF instantiationState is not NOT_INSTANTIATED.')
@mock.patch.object(restcall, 'call_req')
def test_instantiate_vnf_when_get_packageinfo_by_csarid_failed(self, mock_call_req):
@@ -125,10 +126,10 @@ class TestNFInstantiate(TestCase): mock_call_req.side_effect = [r1_get_vnfpackage_by_vnfdid]
self.nf_inst_id = '1111'
self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)
- JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY")
+ JobUtil.add_job_status(self.job_id, 0, 'INST_VNF_READY')
data = inst_req_data
InstantiateVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()
- self.assert_job_result(self.job_id, 255, "Failed to query vnf CSAR(111) from catalog.")
+ self.assert_job_result(self.job_id, 255, 'Failed to query vnf CSAR(111) from catalog.')
@mock.patch.object(restcall, 'call_req')
def test_instantiate_vnf_when_applay_grant_failed(self, mock_call_req):
@@ -148,10 +149,10 @@ class TestNFInstantiate(TestCase): mock_call_req.side_effect = [r1_get_vnfpackage_by_vnfdid, r2_apply_grant_result]
self.nf_inst_id = '1111'
self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)
- JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY")
+ JobUtil.add_job_status(self.job_id, 0, 'INST_VNF_READY')
data = inst_req_data
InstantiateVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()
- self.assert_job_result(self.job_id, 255, "Nf instancing apply grant exception")
+ self.assert_job_result(self.job_id, 255, 'Nf instancing apply grant exception')
@mock.patch.object(restcall, 'call_req')
@mock.patch.object(api, 'call')
@@ -173,14 +174,15 @@ class TestNFInstantiate(TestCase): mock_call.side_effect = [c1_data_get_tenant_id, c2_data_create_volume, c3_data_get_volume]
self.nf_inst_id = '1111'
self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)
- JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY")
+ JobUtil.add_job_status(self.job_id, 0, 'INST_VNF_READY')
data = inst_req_data
InstantiateVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()
- self.assert_job_result(self.job_id, 255, "unexpected exception")
+ self.assert_job_result(self.job_id, 255, 'unexpected exception')
@mock.patch.object(restcall, 'call_req')
@mock.patch.object(api, 'call')
- def test_instantiate_vnf_success(self, mock_call, mock_call_req):
+ @mock.patch.object(NotificationsUtil, 'post_notification')
+ def test_instantiate_vnf_success(self, mock_post_notification, mock_call, mock_call_req):
NfInstModel.objects.create(nfinstid='1111',
nf_name='vFW_01',
package_id='222',
@@ -192,11 +194,36 @@ class TestNFInstantiate(TestCase): nf_desc='vFW in Nanjing TIC Edge',
vnfdid='111',
create_time=now_time())
+ SubscriptionModel.objects.create(
+ subscription_id=str(uuid.uuid4()),
+ callback_uri='api/gvnfmdriver/v1/vnfs/lifecyclechangesnotification',
+ auth_info=json.JSONEncoder().encode({
+ 'authType': ['BASIC'],
+ 'paramsBasic': {
+ 'userName': 'username',
+ 'password': 'password'
+ }
+ }),
+ notification_types=str([
+ 'VnfLcmOperationOccurrenceNotification',
+ 'VnfIdentifierCreationNotification',
+ 'VnfIdentifierDeletionNotification'
+ ]),
+ operation_types=str(['INSTANTIATE']),
+ operation_states=str(['COMPLETED']),
+ vnf_instance_filter=json.JSONEncoder().encode({
+ 'vnfdIds': ['111'],
+ 'vnfProductsFromProviders': [],
+ 'vnfInstanceIds': ['1111'],
+ 'vnfInstanceNames': [],
+ })
+ )
r1_get_vnfpackage_by_vnfdid = [0, json.JSONEncoder().encode(vnfpackage_info), '200']
r2_apply_grant_result = [0, json.JSONEncoder().encode(self.grant_result), '200']
r3_all_aai_result = [1, json.JSONEncoder().encode(''), '404']
- r4_lcm_notify_result = [0, json.JSONEncoder().encode(''), '200']
- mock_call_req.side_effect = [r1_get_vnfpackage_by_vnfdid, r2_apply_grant_result, r3_all_aai_result, r4_lcm_notify_result]
+ # r4_lcm_notify_result = [0, json.JSONEncoder().encode(''), '200']
+ # mock_call_req.side_effect = [r1_get_vnfpackage_by_vnfdid, r2_apply_grant_result, r3_all_aai_result, r4_lcm_notify_result]
+ mock_call_req.side_effect = [r1_get_vnfpackage_by_vnfdid, r2_apply_grant_result, r3_all_aai_result]
mock_call.side_effect = [c1_data_get_tenant_id,
c2_data_create_volume, c3_data_get_volume,
c4_data_create_network,
@@ -204,9 +231,10 @@ class TestNFInstantiate(TestCase): c6_data_create_port,
c7_data_create_flavor,
c8_data_list_image, c9_data_create_vm, c10_data_get_vm]
+ mock_post_notification.side_effect = None
self.nf_inst_id = '1111'
self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)
- JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY")
+ JobUtil.add_job_status(self.job_id, 0, 'INST_VNF_READY')
data = inst_req_data
InstantiateVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()
- self.assert_job_result(self.job_id, 100, "Instantiate Vnf success.")
+ self.assert_job_result(self.job_id, 100, 'Instantiate Vnf success.')
diff --git a/lcm/lcm/pub/msapi/gvnfmdriver.py b/lcm/lcm/pub/msapi/gvnfmdriver.py index 763b1974..a61227f1 100644 --- a/lcm/lcm/pub/msapi/gvnfmdriver.py +++ b/lcm/lcm/pub/msapi/gvnfmdriver.py @@ -1,22 +1,24 @@ # Copyright 2017 ZTE Corporation. # -# Licensed under the Apache License, Version 2.0 (the "License"); +# Licensed under the Apache License, Version 2.0 (the 'License'); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, +# distributed under the License is distributed on an 'AS IS' BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. import json import logging +import uuid from lcm.pub.exceptions import NFLCMException from lcm.pub.utils.restcall import req_by_msb +from lcm.pub.utils.timeutil import now_time from lcm.pub.database.models import ( NfInstModel, VmInstModel, NetworkInstModel, PortInstModel, StorageInstModel, VNFCInstModel @@ -26,26 +28,26 @@ logger = logging.getLogger(__name__) def get_packageinfo_by_vnfdid(vnfdid): - ret = req_by_msb("api/gvnfmdriver/v1/vnfpackages", "GET") + ret = req_by_msb('api/gvnfmdriver/v1/vnfpackages', 'GET') if ret[0] != 0: - logger.error("Status code is %s, detail is %s.", ret[2], ret[1]) - raise NFLCMException("Failed to query package_info of vnfdid(%s) from nslcm." % vnfdid) + logger.error('Status code is %s, detail is %s.', ret[2], ret[1]) + raise NFLCMException('Failed to query package_info of vnfdid(%s) from nslcm.' % vnfdid) return json.JSONDecoder().decode(ret[1]) def apply_grant_to_nfvo(data): - ret = req_by_msb("api/gvnfmdriver/v1/resource/grant", "PUT", data) + ret = req_by_msb('api/gvnfmdriver/v1/resource/grant', 'PUT', data) if ret[0] != 0: - logger.error("Status code is %s, detail is %s.", ret[2], ret[1]) - raise NFLCMException("Nf instancing apply grant exception") + logger.error('Status code is %s, detail is %s.', ret[2], ret[1]) + raise NFLCMException('Nf instancing apply grant exception') return json.JSONDecoder().decode(ret[1]) def notify_lcm_to_nfvo(data): - ret = req_by_msb("api/gvnfmdriver/v1/vnfs/lifecyclechangesnotification", "POST", data) + ret = req_by_msb('api/gvnfmdriver/v1/vnfs/lifecyclechangesnotification', 'POST', data) if ret[0] != 0: - logger.error("Status code is %s, detail is %s.", ret[2], ret[1]) - raise NFLCMException("Nf lcm notify exception") + logger.error('Status code is %s, detail is %s.', ret[2], ret[1]) + raise NFLCMException('Nf lcm notify exception') return ret[1] @@ -113,11 +115,16 @@ def prepare_notification_data(nfinstid, jobid, changetype): } }) notification_content = { - "notificationType": 'VnfLcmOperationOccurrenceNotification', - "notificationStatus": 'RESULT', - "vnfInstanceId": nfinstid, - "operation": 'INSTANTIATE', - "vnfLcmOpOccId": jobid, + 'id': str(uuid.uuid4()), # shall be the same if sent multiple times due to multiple subscriptions. + 'notificationType': 'VnfLcmOperationOccurrenceNotification', + # set 'subscriptionId' after filtering for subscribers + 'timeStamp': now_time(), + 'notificationStatus': 'RESULT', + 'operationState': 'COMPLETED', + 'vnfInstanceId': nfinstid, + 'operation': 'INSTANTIATE', + 'isAutomaticInvocation': False, + 'vnfLcmOpOccId': jobid, 'affectedVnfcs': affected_vnfcs, 'affectedVirtualLinks': affected_vls, 'affectedVirtualStorages': affected_vss, @@ -125,7 +132,12 @@ def prepare_notification_data(nfinstid, jobid, changetype): 'id': None, # TODO 'resourceHandle': None, # TODO 'extLinkPorts': ext_link_ports - }] + }], + '_links': { + 'vnfInstance': {'href': '/api/vnflcm/v1/vnf_instances/%s' % nfinstid}, + # set 'subscription' link after filtering for subscribers + 'vnfLcmOpOcc': {'href': '/api/vnflcm/v1/vnf_lcm_op_occs/%s' % jobid} + } } nfInsts = NfInstModel.objects.filter(nfinstid=nfinstid) notification_content['vnfmInstId'] = nfInsts[0].vnfminstid diff --git a/lcm/lcm/pub/utils/notificationsutil.py b/lcm/lcm/pub/utils/notificationsutil.py index 3af8f22a..5327dc16 100644 --- a/lcm/lcm/pub/utils/notificationsutil.py +++ b/lcm/lcm/pub/utils/notificationsutil.py @@ -46,6 +46,7 @@ class NotificationsUtil(object): for subscription in subscriptions: # set subscription id notification["subscriptionId"] = subscription.subscription_id + notification['_links']['subscription'] = {'href': '/api/vnflcm/v1/subscriptions/%s' % subscription.subscription_id} callbackUri = subscription.callback_uri auth_info = json.loads(subscription.auth_info) if auth_info["authType"] == const.OAUTH2_CLIENT_CREDENTIALS: diff --git a/lcm/lcm/pub/utils/tests.py b/lcm/lcm/pub/utils/tests.py index 16210db6..9bed37c0 100644 --- a/lcm/lcm/pub/utils/tests.py +++ b/lcm/lcm/pub/utils/tests.py @@ -277,6 +277,7 @@ class TestNotificationUtils(unittest.TestCase): "vnfInstanceId": "99442b18-a5c7-11e8-998c-bf1755941f13", "operationState": "STARTING", "operation": "INSTANTIATE", + "_links": {} } mock_post.return_value.status_code = 204 NotificationsUtil().send_notification(dummy_notification) @@ -288,6 +289,7 @@ class TestNotificationUtils(unittest.TestCase): "vnfInstanceId": "9fe4080c-b1a3-11e8-bb96-645106374fd3", "operationState": "", "operation": "", + "_links": {} } mock_post.return_value.status_code = 204 NotificationsUtil().send_notification(dummy_notification) |