import traceback
from jinja2 import Environment, Template, meta, TemplateError, TemplateNotFound, TemplateSyntaxError
-import ROclient
-from lcm_utils import LcmException, LcmExceptionNoMgmtIP, LcmBase
+from osm_lcm import ROclient
+from osm_lcm.lcm_utils import LcmException, LcmExceptionNoMgmtIP, LcmBase
from osm_common.dbbase import DbException
from osm_common.fsbase import FsException
def populate_dict(target_dict, key_list, value):
"""
- Upate target_dict creating nested dictionaries with the key_list. Last key_list item is asigned the value.
+ Update target_dict creating nested dictionaries with the key_list. Last key_list item is asigned the value.
Example target_dict={K: J}; key_list=[a,b,c]; target_dict will be {K: J, a: {b: {c: value}}}
:param target_dict: dictionary to be changed
:param key_list: list of keys to insert at target_dict
target_dict[key_list[-1]] = value
+def deep_get(target_dict, key_list):
+ """
+ Get a value from target_dict entering in the nested keys. If keys does not exist, it returns None
+ Example target_dict={a: {b: 5}}; key_list=[a,b] returns 5; both key_list=[a,b,c] and key_list=[f,h] return None
+ :param target_dict: dictionary to be read
+ :param key_list: list of keys to read from target_dict
+ :return: The wanted value if exist, None otherwise
+ """
+ for key in key_list:
+ if not isinstance(target_dict, dict) or key not in target_dict:
+ return None
+ target_dict = target_dict[key]
+ return target_dict
+
+
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
artifacts=None,
juju_public_key=vca_config.get('pubkey'),
ca_cert=vca_config.get('cacert'),
+ api_proxy=vca_config.get('apiproxy')
)
+ self.RO = ROclient.ROClient(self.loop, **self.ro_config)
def vnfd2RO(self, vnfd, new_id=None, additionalParams=None, nsrId=None):
"""
"wim_account": wim_account_2_RO(ns_params.get("wimAccountId")),
# "scenario": ns_params["nsdId"],
}
- if n2vc_key_list:
- for vnfd_ref, vnfd in vnfd_dict.items():
- vdu_needed_access = []
- mgmt_cp = None
- if vnfd.get("vnf-configuration"):
- if vnfd.get("mgmt-interface"):
- if vnfd["mgmt-interface"].get("vdu-id"):
- vdu_needed_access.append(vnfd["mgmt-interface"]["vdu-id"])
- elif vnfd["mgmt-interface"].get("cp"):
- mgmt_cp = vnfd["mgmt-interface"]["cp"]
-
- for vdu in vnfd.get("vdu", ()):
- if vdu.get("vdu-configuration"):
+ n2vc_key_list = n2vc_key_list or []
+ for vnfd_ref, vnfd in vnfd_dict.items():
+ vdu_needed_access = []
+ mgmt_cp = None
+ if vnfd.get("vnf-configuration"):
+ ssh_required = deep_get(vnfd, ("vnf-configuration", "config-access", "ssh-access", "required"))
+ if ssh_required and vnfd.get("mgmt-interface"):
+ if vnfd["mgmt-interface"].get("vdu-id"):
+ vdu_needed_access.append(vnfd["mgmt-interface"]["vdu-id"])
+ elif vnfd["mgmt-interface"].get("cp"):
+ mgmt_cp = vnfd["mgmt-interface"]["cp"]
+
+ for vdu in vnfd.get("vdu", ()):
+ if vdu.get("vdu-configuration"):
+ ssh_required = deep_get(vdu, ("vdu-configuration", "config-access", "ssh-access", "required"))
+ if ssh_required:
vdu_needed_access.append(vdu["id"])
- elif mgmt_cp:
- for vdu_interface in vdu.get("interface"):
- if vdu_interface.get("external-connection-point-ref") and \
- vdu_interface["external-connection-point-ref"] == mgmt_cp:
- vdu_needed_access.append(vdu["id"])
- mgmt_cp = None
- break
+ elif mgmt_cp:
+ for vdu_interface in vdu.get("interface"):
+ if vdu_interface.get("external-connection-point-ref") and \
+ vdu_interface["external-connection-point-ref"] == mgmt_cp:
+ vdu_needed_access.append(vdu["id"])
+ mgmt_cp = None
+ break
- if vdu_needed_access:
- for vnf_member in nsd.get("constituent-vnfd"):
- if vnf_member["vnfd-id-ref"] != vnfd_ref:
- continue
- for vdu in vdu_needed_access:
- populate_dict(RO_ns_params,
- ("vnfs", vnf_member["member-vnf-index"], "vdus", vdu, "mgmt_keys"),
- n2vc_key_list)
+ if vdu_needed_access:
+ for vnf_member in nsd.get("constituent-vnfd"):
+ if vnf_member["vnfd-id-ref"] != vnfd_ref:
+ continue
+ for vdu in vdu_needed_access:
+ populate_dict(RO_ns_params,
+ ("vnfs", vnf_member["member-vnf-index"], "vdus", vdu, "mgmt_keys"),
+ n2vc_key_list)
if ns_params.get("vduImage"):
RO_ns_params["vduImage"] = ns_params["vduImage"]
for vld_id, instance_scenario_id in vld_params["ns-net"].items():
RO_vld_ns_net = {"instance_scenario_id": instance_scenario_id, "osm_id": vld_id}
if RO_vld_ns_net:
- populate_dict(RO_ns_params, ("networks", vld_params["name"], "use-network"), RO_vld_ns_net)
+ populate_dict(RO_ns_params, ("networks", vld_params["name"], "use-network"), RO_vld_ns_net)
if "vnfd-connection-point-ref" in vld_params:
for cp_params in vld_params["vnfd-connection-point-ref"]:
# look for interface
break
else:
raise LcmException("ns_update_vnfr: Not found member_vnf_index={} vdur={} interface={} "
- "at RO info".format(vnf_index, vdur["vdu-id-ref"], ifacer["name"]))
+ "from VIM info".format(vnf_index, vdur["vdu-id-ref"],
+ ifacer["name"]))
vnfr_update["vdur.{}".format(vdu_index)] = vdur
break
else:
- raise LcmException("ns_update_vnfr: Not found member_vnf_index={} vdur={} count_index={} at "
- "RO info".format(vnf_index, vdur["vdu-id-ref"], vdur["count-index"]))
+ raise LcmException("ns_update_vnfr: Not found member_vnf_index={} vdur={} count_index={} from "
+ "VIM info".format(vnf_index, vdur["vdu-id-ref"], vdur["count-index"]))
for vld_index, vld in enumerate(get_iterable(db_vnfr, "vld")):
for net_RO in get_iterable(nsr_desc_RO, "nets"):
vnfr_update["vld.{}".format(vld_index)] = vld
break
else:
- raise LcmException("ns_update_vnfr: Not found member_vnf_index={} vld={} at RO info".format(
+ raise LcmException("ns_update_vnfr: Not found member_vnf_index={} vld={} from VIM info".format(
vnf_index, vld["id"]))
self.update_db_2("vnfrs", db_vnfr["_id"], vnfr_update)
break
else:
- raise LcmException("ns_update_vnfr: Not found member_vnf_index={} at RO info".format(vnf_index))
+ raise LcmException("ns_update_vnfr: Not found member_vnf_index={} from VIM info".format(vnf_index))
async def instantiate(self, nsr_id, nslcmop_id):
exc = None
try:
# wait for any previous tasks in process
+ step = "Waiting for previous tasks"
await self.lcm_tasks.waitfor_related_HA('ns', 'nslcmops', nslcmop_id)
step = "Getting nslcmop={} from db".format(nslcmop_id)
db_nsr_update["detailed-status"] = "creating"
db_nsr_update["operational-status"] = "init"
- if not db_nsr["_admin"].get("deployed") or not db_nsr["_admin"]["deployed"].get("RO") or \
- not db_nsr["_admin"]["deployed"]["RO"].get("vnfd"):
+ if not isinstance(deep_get(db_nsr, ("_admin", "deployed", "RO", "vnfd")), list):
populate_dict(db_nsr, ("_admin", "deployed", "RO", "vnfd"), [])
db_nsr_update["_admin.deployed.RO.vnfd"] = []
machine_spec = {}
if native_charm:
- machine_spec["username"] = charm_params.get("username"),
+ machine_spec["username"] = charm_params.get("username")
machine_spec["hostname"] = charm_params.get("rw_mgmt_ip")
# Note: The charm needs to exist on disk at the location
if vdu_config["juju"].get("proxy") is False:
# native_charm, will be deployed after VM. Skip
proxy_charm = None
-
if proxy_charm:
if not vca_model_name:
step = "creating VCA model name"
if ns_config["juju"].get("proxy") is False:
# native_charm, will be deployed after VM. Skip
proxy_charm = None
-
if proxy_charm:
step = "deploying proxy charm to configure ns"
# TODO is NS magmt IP address needed?
.format(vca_deployed["member-vnf-index"], vca_deployed["vdu_id"]))
# deploy RO
- RO = ROclient.ROClient(self.loop, **self.ro_config)
# get vnfds, instantiate at RO
for c_vnf in nsd.get("constituent-vnfd", ()):
member_vnf_index = c_vnf["member-vnf-index"]
# look if present
RO_update = {"member-vnf-index": member_vnf_index}
- vnfd_list = await RO.get_list("vnfd", filter_by={"osm_id": vnfd_id_RO})
+ vnfd_list = await self.RO.get_list("vnfd", filter_by={"osm_id": vnfd_id_RO})
if vnfd_list:
RO_update["id"] = vnfd_list[0]["uuid"]
self.logger.debug(logging_text + "vnfd='{}' member_vnf_index='{}' exists at RO. Using RO_id={}".
else:
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)
+ desc = await self.RO.create("vnfd", descriptor=vnfd_RO)
RO_update["id"] = desc["uuid"]
self.logger.debug(logging_text + "vnfd='{}' member_vnf_index='{}' created at RO. RO_id={}".format(
vnfd_ref, member_vnf_index, desc["uuid"]))
RO_osm_nsd_id = "{}.{}.{}".format(nsr_id, RO_descriptor_number, nsd_ref[:23])
RO_descriptor_number += 1
- nsd_list = await RO.get_list("nsd", filter_by={"osm_id": RO_osm_nsd_id})
+ nsd_list = await self.RO.get_list("nsd", filter_by={"osm_id": RO_osm_nsd_id})
if nsd_list:
db_nsr_update["_admin.deployed.RO.nsd_id"] = RO_nsd_uuid = nsd_list[0]["uuid"]
self.logger.debug(logging_text + "nsd={} exists at RO. Using RO_id={}".format(
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)
+ desc = await self.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"]
self.logger.debug(logging_text + "nsd={} created at RO. RO_id={}".format(nsd_ref, RO_nsd_uuid))
# Crate ns at RO
# if present use it unless in error status
- RO_nsr_id = db_nsr["_admin"].get("deployed", {}).get("RO", {}).get("nsr_id")
+ RO_nsr_id = deep_get(db_nsr, ("_admin", "deployed", "RO", "nsr_id"))
if RO_nsr_id:
try:
step = db_nsr_update["detailed-status"] = "Looking for existing ns at RO"
# self.logger.debug(logging_text + step + " RO_ns_id={}".format(RO_nsr_id))
- desc = await RO.show("ns", RO_nsr_id)
+ desc = await self.RO.show("ns", RO_nsr_id)
except ROclient.ROClientException as e:
if e.http_code != HTTPStatus.NOT_FOUND:
raise
RO_nsr_id = db_nsr_update["_admin.deployed.RO.nsr_id"] = None
if RO_nsr_id:
- ns_status, ns_status_info = RO.check_ns_status(desc)
+ ns_status, ns_status_info = self.RO.check_ns_status(desc)
db_nsr_update["_admin.deployed.RO.nsr_status"] = ns_status
if ns_status == "ERROR":
step = db_nsr_update["detailed-status"] = "Deleting ns at RO. RO_ns_id={}".format(RO_nsr_id)
self.logger.debug(logging_text + step)
- await RO.delete("ns", RO_nsr_id)
+ await self.RO.delete("ns", RO_nsr_id)
RO_nsr_id = db_nsr_update["_admin.deployed.RO.nsr_id"] = None
if not RO_nsr_id:
step = db_nsr_update["detailed-status"] = "Checking dependencies"
n2vc_key_list.append(n2vc_key)
RO_ns_params = self.ns_params_2_RO(ns_params, nsd, db_vnfds_ref, n2vc_key_list)
- step = db_nsr_update["detailed-status"] = "Creating ns at RO"
- desc = await RO.create("ns", descriptor=RO_ns_params,
- name=db_nsr["name"],
- scenario=RO_nsd_uuid)
+ step = db_nsr_update["detailed-status"] = "Deploying ns at VIM"
+ desc = await self.RO.create("ns", descriptor=RO_ns_params,
+ name=db_nsr["name"],
+ scenario=RO_nsd_uuid)
RO_nsr_id = db_nsr_update["_admin.deployed.RO.nsr_id"] = desc["uuid"]
db_nsr_update["_admin.nsState"] = "INSTANTIATED"
db_nsr_update["_admin.deployed.RO.nsr_status"] = "BUILD"
self.update_db_2("nsrs", nsr_id, db_nsr_update)
# wait until NS is ready
- step = ns_status_detailed = detailed_status = "Waiting ns ready at RO. RO_id={}".format(RO_nsr_id)
+ step = ns_status_detailed = detailed_status = "Waiting VIM to deploy ns. RO_id={}".format(RO_nsr_id)
detailed_status_old = None
self.logger.debug(logging_text + step)
while time() <= start_deploy + self.total_deploy_timeout:
- desc = await RO.show("ns", RO_nsr_id)
- ns_status, ns_status_info = RO.check_ns_status(desc)
+ desc = await self.RO.show("ns", RO_nsr_id)
+ ns_status, ns_status_info = self.RO.check_ns_status(desc)
db_nsr_update["_admin.deployed.RO.nsr_status"] = ns_status
if ns_status == "ERROR":
raise ROclient.ROClientException(ns_status_info)
vnf_config = vnfd.get("vnf-configuration")
if vnf_config and vnf_config.get("juju"):
native_charm = vnf_config["juju"].get("proxy") is False
-
- if native_charm:
+ proxy_charm = vnf_config["juju"]["charm"]
+ if native_charm and proxy_charm:
if not vca_model_name:
step = "creating VCA model name '{}'".format(nsr_id)
self.logger.debug(logging_text + step)
db_nsr_update["_admin.deployed.VCA-model-name"] = nsr_id
self.update_db_2("nsrs", nsr_id, db_nsr_update)
step = "deploying native charm for vnf_member_index={}".format(vnf_index)
+ self.logger.debug(logging_text + step)
+
vnfr_params["rw_mgmt_ip"] = db_vnfrs[vnf_index]["ip-address"]
charm_params = {
"user_values": vnfr_params,
if vdu_config and vdu_config.get("juju"):
native_charm = vdu_config["juju"].get("proxy") is False
-
- if native_charm:
+ proxy_charm = vdu_config["juju"]["charm"]
+ if native_charm and proxy_charm:
if not vca_model_name:
step = "creating VCA model name"
await self.n2vc.CreateNetworkService(nsr_id)
self.update_db_2("nsrs", nsr_id, db_nsr_update)
step = "deploying native charm for vnf_member_index={} vdu_id={}".format(vnf_index,
vdu["id"])
- await self.n2vc.login()
+
+ self.logger.debug(logging_text + step)
+
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 {}"
charm_params["username"] = vdu_config["config-access"]["ssh-access"].get(
"default-user")
+ await self.n2vc.login()
+
deploy_charm(vnf_index, vdu["id"], vdur.get("name"), vdur["count-index"],
charm_params, n2vc_info, native_charm)
number_to_configure += 1
ns_config = nsd.get("ns-configuration")
if ns_config and ns_config.get("juju"):
native_charm = ns_config["juju"].get("proxy") is False
-
- if native_charm:
+ proxy_charm = ns_config["juju"]["charm"]
+ if native_charm and proxy_charm:
step = "deploying native charm to configure ns"
# TODO is NS magmt IP address needed?
}
return nslcmop
+ def _get_terminate_primitive_params(self, seq, vnf_index):
+ primitive = seq.get('name')
+ primitive_params = {}
+ params = {
+ "member_vnf_index": vnf_index,
+ "primitive": primitive,
+ "primitive_params": primitive_params,
+ }
+ desc_params = {}
+ return self._map_primitive_params(seq, params, desc_params)
+
+ def _add_suboperation(self, db_nslcmop, nslcmop_id, vnf_index, vdu_id, vdu_count_index,
+ vdu_name, primitive, mapped_primitive_params):
+ # Create the "_admin.operations" array, or append operation if array already exists
+ key_admin = '_admin'
+ key_operations = 'operations'
+ db_nslcmop_update = {}
+ db_nslcmop_admin = db_nslcmop.get(key_admin, {})
+ op_list = db_nslcmop_admin.get(key_operations)
+ new_op = {'member_vnf_index': vnf_index,
+ 'vdu_id': vdu_id,
+ 'vdu_count_index': vdu_count_index,
+ 'primitive': primitive,
+ 'primitive_params': mapped_primitive_params}
+ if db_nslcmop_admin:
+ if not op_list:
+ # First operation, create key 'operations' with current operation as first list element
+ db_nslcmop_admin.update({key_operations: [new_op]})
+ op_list = db_nslcmop_admin.get(key_operations)
+ else:
+ # Not first operation, append operation to existing list
+ op_list.append(new_op)
+
+ db_nslcmop_update['_admin.operations'] = op_list
+ self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update)
+
async def _terminate_action(self, db_nslcmop, nslcmop_id, nsr_id):
""" Create a primitive with params from VNFD
Called from terminate() before deleting instance
Calls action() to execute the primitive """
logging_text = "Task ns={} _terminate_action={} ".format(nsr_id, nslcmop_id)
- db_vnfds = {}
db_vnfrs_list = self.db.get_list("vnfrs", {"nsr-id-ref": nsr_id})
+ db_vnfds = {}
# Loop over VNFRs
for vnfr in db_vnfrs_list:
vnfd_id = vnfr["vnfd-id"]
# Get the primitive's sorted sequence list
seq_list = self._get_terminate_config_primitive_seq_list(vnfd)
for seq in seq_list:
- # For each sequence in list, call terminate action
+ # For each sequence in list, get primitive and call _ns_execute_primitive()
step = "Calling terminate action for vnf_member_index={} primitive={}".format(
vnf_index, seq.get("name"))
self.logger.debug(logging_text + step)
- # Create the primitive for each sequence
- operation = "action"
- # primitive, i.e. "primitive": "touch"
+ # Create the primitive for each sequence, i.e. "primitive": "touch"
primitive = seq.get('name')
- primitive_params = {}
- params = {
- "member_vnf_index": vnf_index,
- "primitive": primitive,
- "primitive_params": primitive_params,
- }
- nslcmop_primitive = self._create_nslcmop(nsr_id, operation, params)
- # Get a copy of db_nslcmop 'admin' part
- db_nslcmop_action = {"_admin": deepcopy(db_nslcmop["_admin"])}
- # Update db_nslcmop with the primitive data
- db_nslcmop_action.update(nslcmop_primitive)
- # Create a new db entry for the created primitive, returns the new ID.
- # (The ID is normally obtained from Kafka.)
- nslcmop_terminate_action_id = self.db.create(
- "nslcmops", db_nslcmop_action)
- # Execute the primitive
- nslcmop_operation_state, nslcmop_operation_state_detail = await self.action(
- nsr_id, nslcmop_terminate_action_id)
+ mapped_primitive_params = self._get_terminate_primitive_params(seq, vnf_index)
+ # The following 3 parameters are currently set to None for 'terminate':
+ # vdu_id, vdu_count_index, vdu_name
+ 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")
+ # Add suboperation
+ self._add_suboperation(db_nslcmop,
+ nslcmop_id,
+ vnf_index,
+ vdu_id,
+ vdu_count_index,
+ vdu_name,
+ primitive,
+ mapped_primitive_params)
+ # Suboperations: Call _ns_execute_primitive() instead of action()
+ db_nsr = self.db.get_one("nsrs", {"_id": nsr_id})
+ nsr_deployed = db_nsr["_admin"]["deployed"]
+ result, result_detail = await self._ns_execute_primitive(
+ nsr_deployed, vnf_index, vdu_id, vdu_name, vdu_count_index, primitive,
+ mapped_primitive_params)
+
+ # nslcmop_operation_state, nslcmop_operation_state_detail = await self.action(
+ # nsr_id, nslcmop_terminate_action_id)
# Launch Exception if action() returns other than ['COMPLETED', 'PARTIALLY_COMPLETED']
- nslcmop_operation_states_ok = ['COMPLETED', 'PARTIALLY_COMPLETED']
- if nslcmop_operation_state not in nslcmop_operation_states_ok:
+ result_ok = ['COMPLETED', 'PARTIALLY_COMPLETED']
+ if result not in result_ok:
raise LcmException(
"terminate_primitive_action for vnf_member_index={}",
" primitive={} fails with error {}".format(
- vnf_index, seq.get("name"), nslcmop_operation_state_detail))
+ vnf_index, seq.get("name"), result_detail))
async def terminate(self, nsr_id, nslcmop_id):
# remove from RO
RO_fail = False
- RO = ROclient.ROClient(self.loop, **self.ro_config)
# Delete ns
RO_nsr_id = RO_delete_action = None
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"
+ step = db_nsr_update["detailed-status"] = db_nslcmop_update["detailed-status"] = \
+ "Deleting ns from VIM"
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)
+ desc = await self.RO.delete("ns", RO_nsr_id)
RO_delete_action = desc["action_id"]
db_nsr_update["_admin.deployed.RO.nsr_delete_action_id"] = RO_delete_action
db_nsr_update["_admin.deployed.RO.nsr_id"] = None
delete_timeout = 20 * 60 # 20 minutes
while delete_timeout > 0:
- desc = await RO.show("ns", item_id_name=RO_nsr_id, extra_item="action",
- extra_item_id=RO_delete_action)
- ns_status, ns_status_info = RO.check_action_status(desc)
+ desc = await self.RO.show("ns", item_id_name=RO_nsr_id, extra_item="action",
+ extra_item_id=RO_delete_action)
+ ns_status, ns_status_info = self.RO.check_action_status(desc)
if ns_status == "ERROR":
raise ROclient.ROClientException(ns_status_info)
elif ns_status == "BUILD":
RO_nsd_id = nsr_deployed["RO"]["nsd_id"]
try:
step = db_nsr_update["detailed-status"] = db_nslcmop_update["detailed-status"] =\
- "Deleting nsd at RO"
- await RO.delete("nsd", RO_nsd_id)
+ "Deleting nsd from RO"
+ await self.RO.delete("nsd", RO_nsd_id)
self.logger.debug(logging_text + "RO_nsd_id={} deleted".format(RO_nsd_id))
db_nsr_update["_admin.deployed.RO.nsd_id"] = None
except ROclient.ROClientException as e:
step = db_nsr_update["detailed-status"] = db_nslcmop_update["detailed-status"] =\
"Deleting member_vnf_index={} RO_vnfd_id={} from RO".format(
vnf_deployed["member-vnf-index"], RO_vnfd_id)
- await RO.delete("vnfd", RO_vnfd_id)
+ await self.RO.delete("vnfd", RO_vnfd_id)
self.logger.debug(logging_text + "RO_vnfd_id={} deleted".format(RO_vnfd_id))
db_nsr_update["_admin.deployed.RO.vnfd.{}.id".format(index)] = None
except ROclient.ROClientException as e:
# break
# TODO check if ns is in a proper status
- step = "Sending scale order to RO"
+ step = "Sending scale order to VIM"
nb_scale_op = 0
if not db_nsr["_admin"].get("scaling-group"):
self.update_db_2("nsrs", nsr_id, {"_admin.scaling-group": [{"name": scaling_group, "nb-scale-op": 0}]})
vdu_scaling_info = {"scaling_group_name": scaling_group, "vdu": []}
if scaling_type == "SCALE_OUT":
# count if max-instance-count is reached
- if "max-instance-count" in scaling_descriptor and scaling_descriptor["max-instance-count"] is not None:
- max_instance_count = int(scaling_descriptor["max-instance-count"])
-
- # self.logger.debug("MAX_INSTANCE_COUNT is {}".format(scaling_descriptor["max-instance-count"]))
- if nb_scale_op >= max_instance_count:
- raise LcmException("reached the limit of {} (max-instance-count) "
- "scaling-out operations for the "
- "scaling-group-descriptor '{}'".format(nb_scale_op, scaling_group))
-
+ max_instance_count = scaling_descriptor.get("max-instance-count", 10)
+ # self.logger.debug("MAX_INSTANCE_COUNT is {}".format(max_instance_count))
+ if nb_scale_op >= max_instance_count:
+ raise LcmException("reached the limit of {} (max-instance-count) "
+ "scaling-out operations for the "
+ "scaling-group-descriptor '{}'".format(nb_scale_op, scaling_group))
+
nb_scale_op += 1
vdu_scaling_info["scaling_direction"] = "OUT"
vdu_scaling_info["vdu-create"] = {}
if RO_scaling_info:
scale_process = "RO"
- RO = ROclient.ROClient(self.loop, **self.ro_config)
- RO_desc = await RO.create_action("ns", RO_nsr_id, {"vdu-scaling": RO_scaling_info})
+ RO_desc = await self.RO.create_action("ns", RO_nsr_id, {"vdu-scaling": RO_scaling_info})
db_nsr_update["_admin.scaling-group.{}.nb-scale-op".format(admin_scale_index)] = nb_scale_op
db_nsr_update["_admin.scaling-group.{}.time".format(admin_scale_index)] = time()
# wait until ready
deployment_timeout = 1 * 3600 # One hour
while deployment_timeout > 0:
if not RO_task_done:
- desc = await RO.show("ns", item_id_name=RO_nsr_id, extra_item="action",
- extra_item_id=RO_nslcmop_id)
- ns_status, ns_status_info = RO.check_action_status(desc)
+ desc = await self.RO.show("ns", item_id_name=RO_nsr_id, extra_item="action",
+ extra_item_id=RO_nslcmop_id)
+ ns_status, ns_status_info = self.RO.check_action_status(desc)
if ns_status == "ERROR":
raise ROclient.ROClientException(ns_status_info)
elif ns_status == "BUILD":
detailed_status = step + "; {}".format(ns_status_info)
elif ns_status == "ACTIVE":
RO_task_done = True
- step = detailed_status = "Waiting ns ready at RO. RO_id={}".format(RO_nsr_id)
+ step = detailed_status = "Waiting VIM to deploy ns. RO_id={}".format(RO_nsr_id)
self.logger.debug(logging_text + step)
else:
assert False, "ROclient.check_action_status returns unknown {}".format(ns_status)
else:
- desc = await RO.show("ns", RO_nsr_id)
- ns_status, ns_status_info = RO.check_ns_status(desc)
+ desc = await self.RO.show("ns", RO_nsr_id)
+ ns_status, ns_status_info = self.RO.check_ns_status(desc)
if ns_status == "ERROR":
raise ROclient.ROClientException(ns_status_info)
elif ns_status == "BUILD":
self.scale_vnfr(db_vnfr, vdu_create=vdu_create, vdu_delete=vdu_delete)
vnfr_scaled = True
try:
- desc = await RO.show("ns", RO_nsr_id)
+ desc = await self.RO.show("ns", RO_nsr_id)
# nsr_deployed["nsr_ip"] = RO.get_ns_vnf_info(desc)
self.ns_update_vnfr({db_vnfr["member-vnf-index-ref"]: db_vnfr}, desc)
break