-#!/usr/bin/python3
# -*- coding: utf-8 -*-
+##
+# Copyright 2018 Telefonica S.A.
+#
+# 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, 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 asyncio
import yaml
import logging
import logging.handlers
import functools
import traceback
+from jinja2 import Environment, Template, meta, TemplateError, TemplateNotFound, TemplateSyntaxError
import ROclient
from lcm_utils import LcmException, LcmExceptionNoMgmtIP, LcmBase
class NsLcm(LcmBase):
timeout_vca_on_error = 5 * 60 # Time for charm from first time at blocked,error status to mark as failed
total_deploy_timeout = 2 * 3600 # global timeout for deployment
+ timeout_charm_delete = 10 * 60
def __init__(self, db, msg, fs, lcm_tasks, ro_config, vca_config, loop):
"""
artifacts=None,
)
- def vnfd2RO(self, vnfd, new_id=None):
+ def vnfd2RO(self, vnfd, new_id=None, additionalParams=None, nsrId=None):
"""
Converts creates a new vnfd descriptor for RO base on input OSM IM vnfd
:param vnfd: input vnfd
:param new_id: overrides vnf id if provided
+ :param additionalParamsForVnf: Instantiation params for VNFs provided
+ :param nsrId: Id of the NSR
:return: copy of vnfd
"""
ci_file = None
for vdu in vnfd_RO.get("vdu", ()):
if "cloud-init-file" in vdu:
base_folder = vnfd["_admin"]["storage"]
- clout_init_file = "{}/{}/cloud_init/{}".format(
- base_folder["folder"],
- base_folder["pkg-dir"],
- vdu["cloud-init-file"]
- )
- ci_file = self.fs.file_open(clout_init_file, "r")
- # TODO: detect if binary or text. Propose to read as binary and try to decode to utf8. If fails
- # convert to base 64 or similar
- clout_init_content = ci_file.read()
- ci_file.close()
- ci_file = None
+ cloud_init_file = "{}/{}/cloud_init/{}".format(base_folder["folder"], base_folder["pkg-dir"],
+ vdu["cloud-init-file"])
+ with self.fs.file_open(cloud_init_file, "r") as ci_file:
+ cloud_init_content = ci_file.read()
vdu.pop("cloud-init-file", None)
- vdu["cloud-init"] = clout_init_content
+ elif "cloud-init" in vdu:
+ cloud_init_content = vdu["cloud-init"]
+ try:
+ env = Environment()
+ ast = env.parse(cloud_init_content)
+ mandatory_vars = meta.find_undeclared_variables(ast)
+ if mandatory_vars:
+ for var in mandatory_vars:
+ if not additionalParams or var not in additionalParams.keys():
+ raise LcmException("Variable '{}' defined in vnfd[id={}] vdu[id={}] cloud-init or "
+ "cloud-init-file, must be provided in the instantiation parameters "
+ "inside the 'additionalParamsForVnf' block".format(var, vnfd["id"],
+ vdu["id"]))
+ template = Template(cloud_init_content)
+ cloud_init_content = template.render(additionalParams)
+ except (TemplateError, TemplateNotFound, TemplateSyntaxError) as e:
+ raise LcmException("Error in jinja2 template: {}".format(e))
+ vdu["cloud-init"] = cloud_init_content
# remnove unused by RO configuration, monitoring, scaling
vnfd_RO.pop("vnf-configuration", None)
vnfd_RO.pop("monitoring-param", None)
n2vc_event = n2vc_info["n2vc_event"]
logging_text = "Task ns={} {}={} [n2vc_callback] application={}".format(nsr_id, ns_operation, nslcmop_id,
application_name)
- vca_deployed = deployed.get(application_name)
- if not vca_deployed:
+ for vca_index, vca_deployed in enumerate(deployed):
+ if not vca_deployed:
+ continue
+ if model_name == vca_deployed["model"] and application_name == vca_deployed["application"]:
+ break
+ else:
self.logger.error(logging_text + " Not present at nsr._admin.deployed.VCA")
return
-
if task:
if task.cancelled():
self.logger.debug(logging_text + " task Cancelled")
vca_deployed['operational-status'] = "error"
- db_nsr_update["_admin.deployed.VCA.{}.operational-status".format(application_name)] = "error"
+ db_nsr_update["_admin.deployed.VCA.{}.operational-status".format(vca_index)] = "error"
vca_deployed['detailed-status'] = "Task Cancelled"
- db_nsr_update["_admin.deployed.VCA.{}.detailed-status".format(application_name)] = "Task Cancelled"
+ db_nsr_update["_admin.deployed.VCA.{}.detailed-status".format(vca_index)] = "Task Cancelled"
elif task.done():
exc = task.exception()
if exc:
self.logger.error(logging_text + " task Exception={}".format(exc))
vca_deployed['operational-status'] = "error"
- db_nsr_update["_admin.deployed.VCA.{}.operational-status".format(application_name)] = "error"
+ db_nsr_update["_admin.deployed.VCA.{}.operational-status".format(vca_index)] = "error"
vca_deployed['detailed-status'] = str(exc)
- db_nsr_update["_admin.deployed.VCA.{}.detailed-status".format(application_name)] = str(exc)
+ db_nsr_update["_admin.deployed.VCA.{}.detailed-status".format(vca_index)] = str(exc)
else:
self.logger.debug(logging_text + " task Done")
# task is Done, but callback is still ongoing. So ignore
if vca_deployed['operational-status'] == status:
return # same status, ignore
vca_deployed['operational-status'] = status
- db_nsr_update["_admin.deployed.VCA.{}.operational-status".format(application_name)] = status
+ db_nsr_update["_admin.deployed.VCA.{}.operational-status".format(vca_index)] = status
vca_deployed['detailed-status'] = str(message)
- db_nsr_update["_admin.deployed.VCA.{}.detailed-status".format(application_name)] = str(message)
+ db_nsr_update["_admin.deployed.VCA.{}.detailed-status".format(vca_index)] = str(message)
else:
self.logger.critical(logging_text + " Enter with bad parameters", exc_info=True)
return
populate_dict(RO_ns_params, ("vnfs", vnf_params["member-vnf-index"], "networks",
internal_vld_params["name"], "vim-network-name"),
internal_vld_params["vim-network-name"])
+ if internal_vld_params.get("vim-network-id"):
+ populate_dict(RO_ns_params, ("vnfs", vnf_params["member-vnf-index"], "networks",
+ internal_vld_params["name"], "vim-network-id"),
+ internal_vld_params["vim-network-id"])
if internal_vld_params.get("ip-profile"):
populate_dict(RO_ns_params, ("vnfs", vnf_params["member-vnf-index"], "networks",
internal_vld_params["name"], "ip-profile"),
RO_vld_sites.append({"netmap-use": vld_params["vim-network-name"]})
if RO_vld_sites:
populate_dict(RO_ns_params, ("networks", vld_params["name"], "sites"), RO_vld_sites)
+ if vld_params.get("vim-network-id"):
+ RO_vld_sites = []
+ if isinstance(vld_params["vim-network-id"], dict):
+ for vim_account, vim_net in vld_params["vim-network-id"].items():
+ RO_vld_sites.append({
+ "netmap-use": vim_net,
+ "datacenter": vim_account_2_RO(vim_account)
+ })
+ else: # isinstance str
+ RO_vld_sites.append({"netmap-use": vld_params["vim-network-id"]})
+ if RO_vld_sites:
+ populate_dict(RO_ns_params, ("networks", vld_params["name"], "sites"), RO_vld_sites)
if "vnfd-connection-point-ref" in vld_params:
for cp_params in vld_params["vnfd-connection-point-ref"]:
# look for interface
nslcmop_operation_state = None
db_vnfrs = {}
RO_descriptor_number = 0 # number of descriptors created at RO
- descriptor_id_2_RO = {} # map between vnfd/nsd id to the id used at RO
+ vnf_index_2_RO_id = {} # map between vnfd/nsd id to the id used at RO
n2vc_info = {}
exc = None
try:
db_vnfds_ref[vnfd_ref] = vnfd
db_vnfds[vnfd_id] = vnfd
- nsr_lcm = db_nsr["_admin"].get("deployed")
- if not nsr_lcm:
- nsr_lcm = db_nsr["_admin"]["deployed"] = {
- "id": nsr_id,
- "RO": {"vnfd_id": {}, "nsd_id": None, "nsr_id": None, "nsr_status": "SCHEDULED"},
- # "nsr_ip": {},
- "VCA": {},
- }
+ # Get or generates the _admin.deployed,VCA list
+ vca_deployed_list = None
+ if db_nsr["_admin"].get("deployed"):
+ vca_deployed_list = db_nsr["_admin"]["deployed"].get("VCA")
+ if vca_deployed_list is None:
+ vca_deployed_list = []
+ db_nsr_update["_admin.deployed.VCA"] = vca_deployed_list
+ elif isinstance(vca_deployed_list, dict):
+ # maintain backward compatibility. Change a dict to list at database
+ vca_deployed_list = list(vca_deployed_list.values())
+ db_nsr_update["_admin.deployed.VCA"] = vca_deployed_list
+
db_nsr_update["detailed-status"] = "creating"
db_nsr_update["operational-status"] = "init"
RO = ROclient.ROClient(self.loop, **self.ro_config)
+ # set state to INSTANTIATED. When instantiated NBI will not delete directly
+ db_nsr_update["_admin.nsState"] = "INSTANTIATED"
+ self.update_db_2("nsrs", nsr_id, db_nsr_update)
+
# get vnfds, instantiate at RO
- for vnfd_id, vnfd in db_vnfds.items():
+ for c_vnf in nsd.get("constituent-vnfd", ()):
+ member_vnf_index = c_vnf["member-vnf-index"]
vnfd_ref = vnfd["id"]
step = db_nsr_update["detailed-status"] = "Creating vnfd={} at RO".format(vnfd_ref)
# self.logger.debug(logging_text + step)
- vnfd_id_RO = "{}.{}.{}".format(nsr_id, RO_descriptor_number, vnfd_ref[:23])
- descriptor_id_2_RO[vnfd_ref] = vnfd_id_RO
+ vnfd_id_RO = "{}.{}.{}".format(nsr_id, RO_descriptor_number, member_vnf_index[:23])
+ vnf_index_2_RO_id[member_vnf_index] = vnfd_id_RO
RO_descriptor_number += 1
# look if present
self.logger.debug(logging_text + "vnfd={} exists at RO. Using RO_id={}".format(
vnfd_ref, vnfd_list[0]["uuid"]))
else:
- vnfd_RO = self.vnfd2RO(vnfd, vnfd_id_RO)
+ vnfd_RO = self.vnfd2RO(vnfd, vnfd_id_RO, db_vnfrs[c_vnf["member-vnf-index"]].
+ get("additionalParamsForVnf"), nsr_id)
desc = await RO.create("vnfd", descriptor=vnfd_RO)
db_nsr_update["_admin.deployed.RO.vnfd_id.{}".format(vnfd_id)] = desc["uuid"]
- db_nsr_update["_admin.nsState"] = "INSTANTIATED"
self.logger.debug(logging_text + "vnfd={} created at RO. RO_id={}".format(
vnfd_ref, desc["uuid"]))
self.update_db_2("nsrs", nsr_id, db_nsr_update)
# self.logger.debug(logging_text + step)
RO_osm_nsd_id = "{}.{}.{}".format(nsr_id, RO_descriptor_number, nsd_ref[:23])
- descriptor_id_2_RO[nsd_ref] = RO_osm_nsd_id
RO_descriptor_number += 1
nsd_list = await RO.get_list("nsd", filter_by={"osm_id": RO_osm_nsd_id})
if nsd_list:
nsd_RO.pop("_id", None)
nsd_RO.pop("_admin", None)
for c_vnf in nsd_RO.get("constituent-vnfd", ()):
- vnfd_id = c_vnf["vnfd-id-ref"]
- c_vnf["vnfd-id-ref"] = descriptor_id_2_RO[vnfd_id]
+ member_vnf_index = c_vnf["member-vnf-index"]
+ c_vnf["vnfd-id-ref"] = vnf_index_2_RO_id[member_vnf_index]
+ for c_vld in nsd_RO.get("vld", ()):
+ for cp in c_vld.get("vnfd-connection-point-ref", ()):
+ member_vnf_index = cp["member-vnf-index-ref"]
+ cp["vnfd-id-ref"] = vnf_index_2_RO_id[member_vnf_index]
+
desc = await RO.create("nsd", descriptor=nsd_RO)
db_nsr_update["_admin.nsState"] = "INSTANTIATED"
db_nsr_update["_admin.deployed.RO.nsd_id"] = RO_nsd_uuid = desc["uuid"]
elif ns_status == "ACTIVE":
step = detailed_status = "Waiting for management IP address reported by the VIM. Updating VNFRs"
try:
- # nsr_lcm["nsr_ip"] = RO.get_ns_vnf_info(desc)
self.ns_update_vnfr(db_vnfrs, desc)
break
except LcmExceptionNoMgmtIP:
# The parameters we'll need to deploy a charm
number_to_configure = 0
- def deploy(vnf_index, vdu_id, mgmt_ip_address, n2vc_info, config_primitive=None):
+ def deploy_charm(vnf_index, vdu_id, vdu_name, vdu_count_index, mgmt_ip_address, n2vc_info,
+ config_primitive=None):
"""An inner function to deploy the charm from either vnf or vdu
vnf_index is mandatory. vdu_id can be None for a vnf configuration or the id for vdu configuration
"""
# ns_name will be ignored in the current version of N2VC
# but will be implemented for the next point release.
- model_name = 'default'
- vdu_id_text = "vnfd"
+ model_name = "default" # TODO bug 585 nsr_id
if vdu_id:
- vdu_id_text = vdu_id
- application_name = self.n2vc.FormatApplicationName(
- nsr_name,
- vnf_index,
- vdu_id_text
- )
- if not nsr_lcm.get("VCA"):
- nsr_lcm["VCA"] = {}
- nsr_lcm["VCA"][application_name] = db_nsr_update["_admin.deployed.VCA.{}".format(application_name)] = {
+ vdu_id_text = vdu_id + "-"
+ else:
+ vdu_id_text = "-"
+ application_name = self.n2vc.FormatApplicationName(nsr_name, vnf_index, vdu_id_text)
+
+ vca_index = len(vca_deployed_list)
+ # trunk name and add two char index at the end to ensure that it is unique. It is assumed no more than
+ # 26*26 charm in the same NS
+ application_name = application_name[0:48]
+ application_name += chr(97 + vca_index // 26) + chr(97 + vca_index % 26)
+ vca_deployed_ = {
"member-vnf-index": vnf_index,
"vdu_id": vdu_id,
"model": model_name,
"operational-status": "init",
"detailed-status": "",
"vnfd_id": vnfd_id,
+ "vdu_name": vdu_name,
+ "vdu_count_index": vdu_count_index,
}
+ vca_deployed_list.append(vca_deployed_)
+ db_nsr_update["_admin.deployed.VCA.{}".format(vca_index)] = vca_deployed_
self.update_db_2("nsrs", nsr_id, db_nsr_update)
self.logger.debug("Task create_ns={} Passing artifacts path '{}' for {}".format(nsr_id, charm_path,
n2vc_info["nslcmop_id"] = nslcmop_id
n2vc_info["n2vc_event"] = asyncio.Event(loop=self.loop)
n2vc_info["lcmOperationType"] = "instantiate"
- n2vc_info["deployed"] = nsr_lcm["VCA"]
+ n2vc_info["deployed"] = vca_deployed_list
n2vc_info["db_update"] = db_nsr_update
task = asyncio.ensure_future(
self.n2vc.DeployCharms(
step = "Looking for needed vnfd to configure"
self.logger.debug(logging_text + step)
- for c_vnf in nsd.get("constituent-vnfd", ()):
+ for c_vnf in get_iterable(nsd, "constituent-vnfd"):
vnfd_id = c_vnf["vnfd-id-ref"]
vnf_index = str(c_vnf["member-vnf-index"])
vnfd = db_vnfds_ref[vnfd_id]
# subsequent calls will be a nop and return immediately.
step = "connecting to N2VC to configure vnf {}".format(vnf_index)
await self.n2vc.login()
- deploy(vnf_index, None, db_vnfrs[vnf_index]["ip-address"], n2vc_info, config_primitive)
+ deploy_charm(vnf_index, None, None, None, db_vnfrs[vnf_index]["ip-address"], n2vc_info,
+ config_primitive)
number_to_configure += 1
# Deploy charms for each VDU that supports one.
- vdu_index = 0
- for vdu in vnfd.get('vdu', ()):
+ for vdu_index, vdu in enumerate(get_iterable(vnfd, 'vdu')):
vdu_config = vdu.get('vdu-configuration')
proxy_charm = None
config_primitive = None
if proxy_charm:
step = "connecting to N2VC to configure vdu {} from vnf {}".format(vdu["id"], vnf_index)
await self.n2vc.login()
- deploy(vnf_index, vdu["id"], db_vnfrs[vnf_index]["vdur"][vdu_index]["ip-address"],
- n2vc_info, config_primitive)
+ vdur = db_vnfrs[vnf_index]["vdur"][vdu_index]
+ # TODO for the moment only first vdu_id contains a charm deployed
+ if vdur["vdu-id-ref"] != vdu["id"]:
+ raise LcmException("Mismatch vdur {}, vdu {} at index {} for vnf {}"
+ .format(vdur["vdu-id-ref"], vdu["id"], vdu_index, vnf_index))
+ deploy_charm(vnf_index, vdu["id"], vdur.get("name"), vdur["count-index"],
+ vdur["ip-address"], n2vc_info, config_primitive)
number_to_configure += 1
- vdu_index += 1
db_nsr_update["operational-status"] = "running"
configuration_failed = False
status_map = {}
n2vc_error_text = [] # contain text error list. If empty no one is in error status
now = time()
- for _, vca_info in nsr_lcm["VCA"].items():
- vca_status = vca_info["operational-status"]
+ for vca_deployed in vca_deployed_list:
+ vca_status = vca_deployed["operational-status"]
if vca_status not in status_map:
# Initialize it
status_map[vca_status] = 0
status_map[vca_status] += 1
if vca_status == "active":
- vca_info.pop("time_first_error", None)
- vca_info.pop("status_first_error", None)
+ vca_deployed.pop("time_first_error", None)
+ vca_deployed.pop("status_first_error", None)
continue
all_active = False
if vca_status in ("error", "blocked"):
- vca_info["detailed-status-error"] = vca_info["detailed-status"]
+ vca_deployed["detailed-status-error"] = vca_deployed["detailed-status"]
# if not first time in this status error
- if not vca_info.get("time_first_error"):
- vca_info["time_first_error"] = now
+ if not vca_deployed.get("time_first_error"):
+ vca_deployed["time_first_error"] = now
continue
- if vca_info.get("time_first_error") and \
- now <= vca_info["time_first_error"] + self.timeout_vca_on_error:
+ if vca_deployed.get("time_first_error") and \
+ now <= vca_deployed["time_first_error"] + self.timeout_vca_on_error:
n2vc_error_text.append("member_vnf_index={} vdu_id={} {}: {}"
- .format(vca_info["member-vnf-index"],
- vca_info["vdu_id"], vca_status,
- vca_info["detailed-status-error"]))
+ .format(vca_deployed["member-vnf-index"],
+ vca_deployed["vdu_id"], vca_status,
+ vca_deployed["detailed-status-error"]))
if all_active:
break
db_nslcmop_update["detailed-status"] = "FAILED {}: {}".format(step, exc)
db_nslcmop_update["operationState"] = nslcmop_operation_state = "FAILED"
db_nslcmop_update["statusEnteredTime"] = time()
- if db_nsr:
- db_nsr_update["_admin.nslcmop"] = None
- self.update_db_2("nsrs", nsr_id, db_nsr_update)
- if db_nslcmop_update:
- self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update)
+ try:
+ if db_nsr:
+ db_nsr_update["_admin.nslcmop"] = None
+ self.update_db_2("nsrs", nsr_id, db_nsr_update)
+ if db_nslcmop_update:
+ self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update)
+ except DbException as e:
+ self.logger.error(logging_text + "Cannot update database: {}".format(e))
if nslcmop_operation_state:
try:
await self.msg.aiowrite("ns", "instantiated", {"nsr_id": nsr_id, "nslcmop_id": nslcmop_id,
self.logger.debug(logging_text + "Exit")
self.lcm_tasks.remove("ns", nsr_id, nslcmop_id, "ns_instantiate")
+ async def _destroy_charm(self, model, application):
+ """
+ Order N2VC destroy a charm
+ :param model:
+ :param application:
+ :return: True if charm does not exist. False if it exist
+ """
+ if not await self.n2vc.HasApplication(model, application):
+ return True # Already removed
+ await self.n2vc.RemoveCharms(model, application)
+ return False
+
+ async def _wait_charm_destroyed(self, model, application, timeout):
+ """
+ Wait until charm does not exist
+ :param model:
+ :param application:
+ :param timeout:
+ :return: True if not exist, False if timeout
+ """
+ while True:
+ if not await self.n2vc.HasApplication(model, application):
+ return True
+ if timeout < 0:
+ return False
+ await asyncio.sleep(10)
+ timeout -= 10
+
async def terminate(self, nsr_id, nslcmop_id):
logging_text = "Task ns={} terminate={} ".format(nsr_id, nslcmop_id)
self.logger.debug(logging_text + "Enter")
db_nslcmop = None
exc = None
failed_detail = [] # annotates all failed error messages
- vca_task_list = []
- vca_task_dict = {}
+ vca_time_destroy = None # time of where destroy charm order
db_nsr_update = {"_admin.nslcmop": nslcmop_id}
db_nslcmop_update = {}
nslcmop_operation_state = None
step = "Getting nsr={} from db".format(nsr_id)
db_nsr = self.db.get_one("nsrs", {"_id": nsr_id})
# nsd = db_nsr["nsd"]
- nsr_lcm = deepcopy(db_nsr["_admin"].get("deployed"))
+ nsr_deployed = deepcopy(db_nsr["_admin"].get("deployed"))
if db_nsr["_admin"]["nsState"] == "NOT_INSTANTIATED":
return
- # TODO ALF remove
- # db_vim = self.db.get_one("vim_accounts", {"_id": db_nsr["datacenter"]})
# #TODO check if VIM is creating and wait
# RO_vim_id = db_vim["_admin"]["deployed"]["RO"]
db_nsr_update["operational-status"] = "terminating"
db_nsr_update["config-status"] = "terminating"
- if nsr_lcm and nsr_lcm.get("VCA"):
+ if nsr_deployed and nsr_deployed.get("VCA"):
try:
step = "Scheduling configuration charms removing"
db_nsr_update["detailed-status"] = "Deleting charms"
self.logger.debug(logging_text + step)
self.update_db_2("nsrs", nsr_id, db_nsr_update)
- for application_name, deploy_info in nsr_lcm["VCA"].items():
- if deploy_info: # TODO it would be desirable having a and deploy_info.get("deployed"):
- task = asyncio.ensure_future(
- self.n2vc.RemoveCharms(
- deploy_info['model'],
- application_name,
- # self.n2vc_callback,
- # db_nsr,
- # db_nslcmop,
- )
- )
- vca_task_list.append(task)
- vca_task_dict[application_name] = task
- # task.add_done_callback(functools.partial(self.n2vc_callback, deploy_info['model'],
- # deploy_info['application'], None, db_nsr,
- # db_nslcmop, vnf_index))
- self.lcm_tasks.register("ns", nsr_id, nslcmop_id, "delete_charm:" + application_name, task)
+ # for backward compatibility
+ if isinstance(nsr_deployed["VCA"], dict):
+ nsr_deployed["VCA"] = list(nsr_deployed["VCA"].values())
+ db_nsr_update["_admin.deployed.VCA"] = nsr_deployed["VCA"]
+ self.update_db_2("nsrs", nsr_id, db_nsr_update)
+
+ for vca_index, vca_deployed in enumerate(nsr_deployed["VCA"]):
+ if vca_deployed:
+ if await self._destroy_charm(vca_deployed['model'], vca_deployed["application"]):
+ vca_deployed.clear()
+ db_nsr["_admin.deployed.VCA.{}".format(vca_index)] = None
+ else:
+ vca_time_destroy = time()
except Exception as e:
self.logger.debug(logging_text + "Failed while deleting charms: {}".format(e))
# Delete ns
RO_nsr_id = RO_delete_action = None
- if nsr_lcm and nsr_lcm.get("RO"):
- RO_nsr_id = nsr_lcm["RO"].get("nsr_id")
- RO_delete_action = nsr_lcm["RO"].get("nsr_delete_action_id")
+ if nsr_deployed and nsr_deployed.get("RO"):
+ RO_nsr_id = nsr_deployed["RO"].get("nsr_id")
+ RO_delete_action = nsr_deployed["RO"].get("nsr_delete_action_id")
try:
if RO_nsr_id:
step = db_nsr_update["detailed-status"] = db_nslcmop_update["detailed-status"] = "Deleting ns at RO"
+ self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update)
+ self.update_db_2("nsrs", nsr_id, db_nsr_update)
self.logger.debug(logging_text + step)
desc = await RO.delete("ns", RO_nsr_id)
RO_delete_action = desc["action_id"]
db_nsr_update["_admin.deployed.RO.nsr_status"] = "DELETED"
if RO_delete_action:
# wait until NS is deleted from VIM
- step = detailed_status = "Waiting ns deleted from VIM. RO_id={}".format(RO_nsr_id)
+ step = detailed_status = "Waiting ns deleted from VIM. RO_id={} RO_delete_action={}".\
+ format(RO_nsr_id, RO_delete_action)
detailed_status_old = None
self.logger.debug(logging_text + step)
elif ns_status == "BUILD":
detailed_status = step + "; {}".format(ns_status_info)
elif ns_status == "ACTIVE":
+ db_nsr_update["_admin.deployed.RO.nsr_delete_action_id"] = None
+ db_nsr_update["_admin.deployed.RO.nsr_status"] = "DELETED"
break
else:
assert False, "ROclient.check_action_status returns unknown {}".format(ns_status)
- await asyncio.sleep(5, loop=self.loop)
- delete_timeout -= 5
if detailed_status != detailed_status_old:
- detailed_status_old = db_nslcmop_update["detailed-status"] = detailed_status
+ detailed_status_old = db_nslcmop_update["detailed-status"] = \
+ db_nsr_update["detailed-status"] = detailed_status
self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update)
+ self.update_db_2("nsrs", nsr_id, db_nsr_update)
+ await asyncio.sleep(5, loop=self.loop)
+ delete_timeout -= 5
else: # delete_timeout <= 0:
raise ROclient.ROClientException("Timeout waiting ns deleted from VIM")
if e.http_code == 404: # not found
db_nsr_update["_admin.deployed.RO.nsr_id"] = None
db_nsr_update["_admin.deployed.RO.nsr_status"] = "DELETED"
+ db_nsr_update["_admin.deployed.RO.nsr_delete_action_id"] = None
self.logger.debug(logging_text + "RO_ns_id={} already deleted".format(RO_nsr_id))
elif e.http_code == 409: # conflict
failed_detail.append("RO_ns_id={} delete conflict: {}".format(RO_nsr_id, e))
RO_fail = True
# Delete nsd
- if not RO_fail and nsr_lcm and nsr_lcm.get("RO") and nsr_lcm["RO"].get("nsd_id"):
- RO_nsd_id = nsr_lcm["RO"]["nsd_id"]
+ if not RO_fail and nsr_deployed and nsr_deployed.get("RO") and nsr_deployed["RO"].get("nsd_id"):
+ RO_nsd_id = nsr_deployed["RO"]["nsd_id"]
try:
step = db_nsr_update["detailed-status"] = db_nslcmop_update["detailed-status"] =\
"Deleting nsd at RO"
self.logger.error(logging_text + failed_detail[-1])
RO_fail = True
- if not RO_fail and nsr_lcm and nsr_lcm.get("RO") and nsr_lcm["RO"].get("vnfd_id"):
- for vnf_id, RO_vnfd_id in nsr_lcm["RO"]["vnfd_id"].items():
+ if not RO_fail and nsr_deployed and nsr_deployed.get("RO") and nsr_deployed["RO"].get("vnfd_id"):
+ for vnf_id, RO_vnfd_id in nsr_deployed["RO"]["vnfd_id"].items():
if not RO_vnfd_id:
continue
try:
failed_detail.append("RO_vnfd_id={} delete error: {}".format(RO_vnfd_id, e))
self.logger.error(logging_text + failed_detail[-1])
- if vca_task_list:
- db_nsr_update["detailed-status"] = db_nslcmop_update["detailed-status"] =\
+ # wait until charm deleted
+ if vca_time_destroy:
+ db_nsr_update["detailed-status"] = db_nslcmop_update["detailed-status"] = step = \
"Waiting for deletion of configuration charms"
self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update)
self.update_db_2("nsrs", nsr_id, db_nsr_update)
- await asyncio.wait(vca_task_list, timeout=300)
- for application_name, task in vca_task_dict.items():
- if task.cancelled():
- failed_detail.append("VCA[{}] Deletion has been cancelled".format(application_name))
- elif task.done():
- exc = task.exception()
- if exc:
- failed_detail.append("VCA[{}] Deletion exception: {}".format(application_name, exc))
+ for vca_index, vca_deployed in enumerate(nsr_deployed["VCA"]):
+ if not vca_deployed:
+ continue
+ step = "Waiting for deletion of charm application_name={}".format(vca_deployed["application"])
+ timeout = self.timeout_charm_delete - int(time() - vca_time_destroy)
+ if not await self._wait_charm_destroyed(vca_deployed['model'], vca_deployed["application"],
+ timeout):
+ failed_detail.append("VCA[application_name={}] Deletion timeout".format(
+ vca_deployed["application"]))
else:
- db_nsr_update["_admin.deployed.VCA.{}".format(application_name)] = None
- else: # timeout
- # TODO Should it be cancelled?!!
- task.cancel()
- failed_detail.append("VCA[{}] Deletion timeout".format(application_name))
+ db_nsr["_admin.deployed.VCA.{}".format(vca_index)] = None
if failed_detail:
self.logger.error(logging_text + " ;".join(failed_detail))
db_nslcmop_update["statusEnteredTime"] = time()
elif db_nslcmop["operationParams"].get("autoremove"):
self.db.del_one("nsrs", {"_id": nsr_id})
+ db_nsr = None
db_nsr_update.clear()
self.db.del_list("nslcmops", {"nsInstanceId": nsr_id})
+ db_nslcmop = None
nslcmop_operation_state = "COMPLETED"
db_nslcmop_update.clear()
self.db.del_list("vnfrs", {"nsr-id-ref": nsr_id})
self.db.set_list("pdus", {"_admin.usage.nsr_id": nsr_id},
- {"_admin.usageSate": "NOT_IN_USE", "_admin.usage": None})
+ {"_admin.usageState": "NOT_IN_USE", "_admin.usage": None})
self.logger.debug(logging_text + "Delete from database")
else:
db_nsr_update["operational-status"] = "terminated"
db_nslcmop_update["detailed-status"] = "FAILED {}: {}".format(step, exc)
db_nslcmop_update["operationState"] = nslcmop_operation_state = "FAILED"
db_nslcmop_update["statusEnteredTime"] = time()
- if db_nslcmop_update:
- self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update)
- if db_nsr:
- db_nsr_update["_admin.nslcmop"] = None
- self.update_db_2("nsrs", nsr_id, db_nsr_update)
+ try:
+ if db_nslcmop and db_nslcmop_update:
+ self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update)
+ if db_nsr:
+ db_nsr_update["_admin.nslcmop"] = None
+ self.update_db_2("nsrs", nsr_id, db_nsr_update)
+ except DbException as e:
+ self.logger.error(logging_text + "Cannot update database: {}".format(e))
if nslcmop_operation_state:
try:
await self.msg.aiowrite("ns", "terminated", {"nsr_id": nsr_id, "nslcmop_id": nslcmop_id,
self.logger.debug(logging_text + "Exit")
self.lcm_tasks.remove("ns", nsr_id, nslcmop_id, "ns_terminate")
- async def _ns_execute_primitive(self, db_deployed, nsr_name, member_vnf_index, vdu_id, primitive, primitive_params):
+ async def _ns_execute_primitive(self, db_deployed, nsr_name, member_vnf_index, vdu_id, vdu_name, vdu_count_index,
+ primitive, primitive_params):
- vdu_id_text = "vnfd"
- if vdu_id:
- vdu_id_text = vdu_id
- application_name = self.n2vc.FormatApplicationName(
- nsr_name,
- member_vnf_index,
- vdu_id_text
- )
- vca_deployed = db_deployed["VCA"].get(application_name)
- if not vca_deployed:
- raise LcmException("charm for member_vnf_index={} vdu_id={} is not deployed".format(member_vnf_index,
- vdu_id))
+ for vca_deployed in db_deployed["VCA"]:
+ if not vca_deployed:
+ continue
+ if member_vnf_index != vca_deployed["member-vnf-index"] or vdu_id != vca_deployed["vdu_id"]:
+ continue
+ if vdu_name and vdu_name != vca_deployed["vdu_name"]:
+ continue
+ if vdu_count_index and vdu_count_index != vca_deployed["vdu_count_index"]:
+ continue
+ break
+ else:
+ raise LcmException("charm for member_vnf_index={} vdu_id={} vdu_name={} vdu_count_index={} is not deployed"
+ .format(member_vnf_index, vdu_id, vdu_name, vdu_count_index))
model_name = vca_deployed.get("model")
application_name = vca_deployed.get("application")
if not model_name or not application_name:
- raise LcmException("charm for member_vnf_index={} is not properly deployed".format(member_vnf_index))
+ raise LcmException("charm for member_vnf_index={} vdu_id={} vdu_name={} vdu_count_index={} has not model "
+ "or application name" .format(member_vnf_index, vdu_id, vdu_name, vdu_count_index))
if vca_deployed["operational-status"] != "active":
- raise LcmException("charm for member_vnf_index={} operational_status={} not 'active'".format(
- member_vnf_index, vca_deployed["operational-status"]))
+ raise LcmException("charm for member_vnf_index={} vdu_id={} operational_status={} not 'active'".format(
+ member_vnf_index, vdu_id, vca_deployed["operational-status"]))
callback = None # self.n2vc_callback
callback_args = () # [db_nsr, db_nslcmop, member_vnf_index, None]
await self.n2vc.login()
step = "Getting information from database"
db_nslcmop = self.db.get_one("nslcmops", {"_id": nslcmop_id})
db_nsr = self.db.get_one("nsrs", {"_id": nsr_id})
- nsr_lcm = db_nsr["_admin"].get("deployed")
+ nsr_deployed = db_nsr["_admin"].get("deployed")
nsr_name = db_nsr["name"]
vnf_index = db_nslcmop["operationParams"]["member_vnf_index"]
vdu_id = db_nslcmop["operationParams"].get("vdu_id")
+ vdu_count_index = db_nslcmop["operationParams"].get("vdu_count_index")
+ vdu_name = db_nslcmop["operationParams"].get("vdu_name")
# look if previous tasks in process
task_name, task_dependency = self.lcm_tasks.lookfor_related("ns", nsr_id, nslcmop_id)
if pending:
raise LcmException("Timeout waiting related tasks to be completed")
+ # for backward compatibility
+ if nsr_deployed and isinstance(nsr_deployed.get("VCA"), dict):
+ nsr_deployed["VCA"] = list(nsr_deployed["VCA"].values())
+ db_nsr_update["_admin.deployed.VCA"] = nsr_deployed["VCA"]
+ self.update_db_2("nsrs", nsr_id, db_nsr_update)
+
# TODO check if ns is in a proper status
primitive = db_nslcmop["operationParams"]["primitive"]
primitive_params = db_nslcmop["operationParams"]["primitive_params"]
- result, result_detail = await self._ns_execute_primitive(nsr_lcm, nsr_name, vnf_index, vdu_id, primitive,
+ result, result_detail = await self._ns_execute_primitive(nsr_deployed, nsr_name, vnf_index, vdu_id,
+ vdu_name, vdu_count_index, primitive,
primitive_params)
db_nslcmop_update["detailed-status"] = result_detail
db_nslcmop_update["operationState"] = nslcmop_operation_state = result
db_nslcmop_update["detailed-status"] = "FAILED {}: {}".format(step, exc)
db_nslcmop_update["operationState"] = nslcmop_operation_state = "FAILED"
db_nslcmop_update["statusEnteredTime"] = time()
- if db_nslcmop_update:
- self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update)
- if db_nsr:
- db_nsr_update["_admin.nslcmop"] = None
- self.update_db_2("nsrs", nsr_id, db_nsr_update)
+ try:
+ if db_nslcmop_update:
+ self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update)
+ if db_nsr:
+ db_nsr_update["_admin.nslcmop"] = None
+ self.update_db_2("nsrs", nsr_id, db_nsr_update)
+ except DbException as e:
+ self.logger.error(logging_text + "Cannot update database: {}".format(e))
self.logger.debug(logging_text + "Exit")
if nslcmop_operation_state:
try:
step = "Parsing scaling parameters"
db_nsr_update["operational-status"] = "scaling"
self.update_db_2("nsrs", nsr_id, db_nsr_update)
- nsr_lcm = db_nsr["_admin"].get("deployed")
- RO_nsr_id = nsr_lcm["RO"]["nsr_id"]
+ nsr_deployed = db_nsr["_admin"].get("deployed")
+ RO_nsr_id = nsr_deployed["RO"]["nsr_id"]
vnf_index = db_nslcmop["operationParams"]["scaleVnfData"]["scaleByStepData"]["member-vnf-index"]
scaling_group = db_nslcmop["operationParams"]["scaleVnfData"]["scaleByStepData"]["scaling-group-descriptor"]
scaling_type = db_nslcmop["operationParams"]["scaleVnfData"]["scaleVnfType"]
# scaling_policy = db_nslcmop["operationParams"]["scaleVnfData"]["scaleByStepData"].get("scaling-policy")
+ # for backward compatibility
+ if nsr_deployed and isinstance(nsr_deployed.get("VCA"), dict):
+ nsr_deployed["VCA"] = list(nsr_deployed["VCA"].values())
+ db_nsr_update["_admin.deployed.VCA"] = nsr_deployed["VCA"]
+ self.update_db_2("nsrs", nsr_id, db_nsr_update)
+
step = "Getting vnfr from database"
db_vnfr = self.db.get_one("vnfrs", {"member-vnf-index-ref": vnf_index, "nsr-id-ref": nsr_id})
step = "Getting vnfd from database"
"primitive".format(scaling_group, config_primitive))
scale_process = "VCA"
db_nsr_update["config-status"] = "configuring pre-scaling"
- result, result_detail = await self._ns_execute_primitive(nsr_lcm, nsr_name, vnf_index, None,
- vnf_config_primitive, primitive_params)
+ result, result_detail = await self._ns_execute_primitive(nsr_deployed, nsr_name, vnf_index,
+ None, None, None, vnf_config_primitive,
+ primitive_params)
self.logger.debug(logging_text + "vnf_config_primitive={} Done with result {} {}".format(
vnf_config_primitive, result, result_detail))
if result == "FAILED":
vnfr_scaled = True
try:
desc = await RO.show("ns", RO_nsr_id)
- # nsr_lcm["nsr_ip"] = RO.get_ns_vnf_info(desc)
+ # nsr_deployed["nsr_ip"] = RO.get_ns_vnf_info(desc)
self.ns_update_vnfr({db_vnfr["member-vnf-index-ref"]: db_vnfr}, desc)
break
except LcmExceptionNoMgmtIP:
scale_process = "VCA"
db_nsr_update["config-status"] = "configuring post-scaling"
- result, result_detail = await self._ns_execute_primitive(nsr_lcm, nsr_name, vnf_index, None,
- vnf_config_primitive, primitive_params)
+ result, result_detail = await self._ns_execute_primitive(nsr_deployed, nsr_name, vnf_index,
+ None, None, None, vnf_config_primitive,
+ primitive_params)
self.logger.debug(logging_text + "vnf_config_primitive={} Done with result {} {}".format(
vnf_config_primitive, result, result_detail))
if result == "FAILED":
db_nsr_update["operational-status"] = "failed"
db_nsr_update["detailed-status"] = "FAILED scaling nslcmop={} {}: {}".format(nslcmop_id, step,
exc)
- if db_nslcmop_update:
- self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update)
- if db_nsr:
- db_nsr_update["_admin.nslcmop"] = None
- self.update_db_2("nsrs", nsr_id, db_nsr_update)
+ try:
+ if db_nslcmop and db_nslcmop_update:
+ self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update)
+ if db_nsr:
+ db_nsr_update["_admin.nslcmop"] = None
+ self.update_db_2("nsrs", nsr_id, db_nsr_update)
+ except DbException as e:
+ self.logger.error(logging_text + "Cannot update database: {}".format(e))
if nslcmop_operation_state:
try:
await self.msg.aiowrite("ns", "scaled", {"nsr_id": nsr_id, "nslcmop_id": nslcmop_id,
projects / osm / LCM.git / blobdiff