diff options
| -rw-r--r-- | docs/release-notes.rst | 31 | ||||
| -rw-r--r-- | lcm/ns/ns_delete.py | 36 | ||||
| -rw-r--r-- | lcm/ns/ns_terminate.py | 4 | ||||
| -rw-r--r-- | lcm/pub/config/config.py | 4 |
4 files changed, 31 insertions, 44 deletions
diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 8a17f412..c78a53fc 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -6,34 +6,29 @@ VF-C Release Notes ================== .. note:: - * This Release Notes must be updated each time the team decides to Release new artifacts. - * The scope of this Release Notes is for this particular component. In other words, each ONAP component has its Release Notes. - * This Release Notes is cumulative, the most recently Released artifact is made visible in the top of this Release Notes. - * Except the date and the version number, all the other sections are optional but there must be at least one section describing the purpose of this new release. - * This note must be removed after content has been added. - -VF-C includes two main component:NFV-O and GVNFM, can implement life cycle management and FCAPS of VNF and NS. VF-C takes part in end2end service orchestration and close loop automatiion by working with SO,DCAE and Policy. -VF-C also provides standard south bound interface to VNFMs and can integration with multi vendor VNFMs via drivers. - +.. * This Release Notes must be updated each time the team decides to Release new artifacts. +.. * The scope of this Release Notes is for this particular component. In other words, each ONAP component has its Release Notes. +.. * This Release Notes is cumulative, the most recently Released artifact is made visible in the top of this Release Notes. +.. * Except the date and the version number, all the other sections are optional but there must be at least one section describing the purpose of this new release. +.. * This note must be removed after content has been added. +VF-C includes two main components, NFV-O and GVNFM, to implement life cycle management and FCAPS of VNF and NS. VF-C takes part in end to end service orchestration and close loop automation by working with SO, DCAE and Policy. +VF-C also provides standard southbound interface to VNFMs and can integrate with multi vendor VNFMs via drivers. Version: 1.0.0 -------------- - :Release Date: 2017-11-16 - - **New Features** - - NS lifecycle management, including NS instance creation,termination and healing - - VNF lifecycle management, including VNF nstance creation,termination and healing - - VNF FCAPS, collecting FCAPS data from vendor EMS - - VNFM Integration, integration with specific VNFMs of vendors to deploy commercial VNFs - - VNF Integration, integration with VNF via GVNFM +- NS lifecycle management, including NS instance creation, termination and healing +- VNF lifecycle management, including VNF nstance creation, termination and healing +- VNF FCAPS, collecting FCAPS data from vendor EMS +- VNFM Integration, integration with specific VNFMs of vendors to deploy commercial VNFs +- VNF Integration, integration with VNF via GVNFM -released components: +Released components: NFVO - vfc-nfvo-lcm diff --git a/lcm/ns/ns_delete.py b/lcm/ns/ns_delete.py index 2e99f07d..2d251907 100644 --- a/lcm/ns/ns_delete.py +++ b/lcm/ns/ns_delete.py @@ -29,9 +29,9 @@ class DeleteNsService(object): def do_biz(self): try: - self.delete_ns() if REPORT_TO_AAI: self.delete_ns_in_aai() + self.delete_ns() except: logger.error(traceback.format_exc()) @@ -51,29 +51,21 @@ class DeleteNsService(object): def delete_ns_in_aai(self): logger.debug("DeleteNsService::delete_ns_in_aai::delete ns instance[%s] in aai." % self.ns_inst_id) try: - # global_customer_id = "global-customer-id-" + self.ns_inst_id - # - # # query ns instance in aai, get resource_version - # customer_info = query_customer_aai(global_customer_id) - # resource_version = customer_info["resource-version"] - # - # # delete ns instance from aai - # resp_data, resp_status = delete_customer_aai(global_customer_id, resource_version) - ns_insts = NSInstModel.objects.filter(id=self.ns_inst_id) - self.global_customer_id = ns_insts[0].global_customer_id - self.service_type = ns_insts[0].service_type - # query ns instance in aai, get resource_version - logger.debug("self.global_customer_id=[%s], self.service_type=[%s], self.ns_inst_id=[%s]" - % (self.global_customer_id, self.service_type, self.ns_inst_id)) - ns_info = query_ns_aai(self.global_customer_id, self.service_type, self.ns_inst_id) - resource_version = ns_info["resource-version"] + if ns_insts: + self.global_customer_id = ns_insts[0].global_customer_id + self.service_type = ns_insts[0].service_type + # query ns instance in aai, get resource_version + logger.debug("self.global_customer_id=[%s], self.service_type=[%s], self.ns_inst_id=[%s]" + % (self.global_customer_id, self.service_type, self.ns_inst_id)) + ns_info = query_ns_aai(self.global_customer_id, self.service_type, self.ns_inst_id) + resource_version = ns_info["resource-version"] - # delete ns instance from aai - logger.debug("ns instance resource_version=[%s]" % resource_version) - resp_data, resp_status = delete_ns_aai(self.global_customer_id, self.service_type, - self.ns_inst_id, resource_version) - logger.debug("Success to delete ns[%s] from aai, resp_status: [%s]." % (self.ns_inst_id, resp_status)) + # delete ns instance from aai + logger.debug("ns instance resource_version=[%s]" % resource_version) + resp_data, resp_status = delete_ns_aai(self.global_customer_id, self.service_type, + self.ns_inst_id, resource_version) + logger.debug("Success to delete ns[%s] from aai, resp_status: [%s]." % (self.ns_inst_id, resp_status)) except NSLCMException as e: logger.debug("Fail to delete ns[%s] from aai, detail message: %s" % (self.ns_inst_id, e.message)) except: diff --git a/lcm/ns/ns_terminate.py b/lcm/ns/ns_terminate.py index d7c4bfa3..57ba659b 100644 --- a/lcm/ns/ns_terminate.py +++ b/lcm/ns/ns_terminate.py @@ -130,8 +130,8 @@ class TerminateNsService(threading.Thread): def wait_delete_vnf_job_finish(self, vnf_job_id): count = 0 - retry_count = 30 - interval_second = 1 + retry_count = 400 + interval_second = 2 response_id, new_response_id = 0, 0 job_end_normal, job_timeout = False, True while count < retry_count: diff --git a/lcm/pub/config/config.py b/lcm/pub/config/config.py index b7c18162..be47c1ea 100644 --- a/lcm/pub/config/config.py +++ b/lcm/pub/config/config.py @@ -57,13 +57,13 @@ CATALOG_ROOT_PATH = None CATALOG_URL_PATH = None # [aai config] -AAI_BASE_URL = "https://127.0.0.1:8443/aai/v11" +AAI_BASE_URL = "http://%s:%s/aai/v11" % (MSB_SERVICE_IP, MSB_SERVICE_PORT) AAI_USER = "AAI" AAI_PASSWD = "AAI" REPORT_TO_AAI = True # [sdc config] -SDC_BASE_URL = "https://127.0.0.1:8443/api/sdc/v1" +SDC_BASE_URL = "http://%s:%s/api" % (MSB_SERVICE_IP, MSB_SERVICE_PORT) SDC_USER = "SDC" SDC_PASSWD = "SDC" |