step = "Install configuration Software, getting public ssh key"
pub_key = await self.n2vc.get_ee_ssh_public__key(ee_id=ee_id, db_dict=db_dict)
- step = "Insert public key into VM"
+ step = "Insert public key into VM user={} ssh_key={}".format(user, pub_key)
else:
step = "Waiting to VM being up and getting IP address"
self.logger.debug(logging_text + step)
params=desc_params, db_dict=db_dict, timeout=3600)
)
else:
- task = self.k8sclusterjuju.install(cluster_uuid=cluster_uuid, kdu_model=kdumodel,
- atomic=True, params=desc_params,
- db_dict=db_dict, timeout=600)
+ task = asyncio.ensure_future(
+ self.k8sclusterjuju.install(cluster_uuid=cluster_uuid, kdu_model=kdumodel,
+ atomic=True, params=desc_params,
+ db_dict=db_dict, timeout=600)
+ )
pending_tasks[task] = "_admin.deployed.K8s.{}.".format(index)
index += 1
# or op_index (operationState != 'COMPLETED')
return self._reintent_or_skip_suboperation(db_nslcmop, op_index)
+ # Function to return execution_environment id
+
+ def _get_ee_id(self, vnf_index, vdu_id, vca_deployed_list):
+ for vca in vca_deployed_list:
+ if vca["member-vnf-index"] == vnf_index and vca["vdu_id"] == vdu_id:
+ return vca["ee_id"]
+
# Helper methods for terminate()
async def _terminate_action(self, db_nslcmop, nslcmop_id, nsr_id):
Called from terminate() before deleting instance
Calls action() to execute the primitive """
logging_text = "Task ns={} _terminate_action={} ".format(nsr_id, nslcmop_id)
+ db_nsr = self.db.get_one("nsrs", {"_id": nsr_id})
+ vca_deployed_list = db_nsr["_admin"]["deployed"]["VCA"]
db_vnfrs_list = self.db.get_list("vnfrs", {"nsr-id-ref": nsr_id})
db_vnfds = {}
# Loop over VNFRs
# " primitive={} fails with error {}".format(
# vnf_index, seq.get("name"), result_detail))
- # TODO: find ee_id
- ee_id = None
+ ee_id = self._get_ee_id(vnf_index, vdu_id, vca_deployed_list)
try:
await self.n2vc.exec_primitive(
ee_id=ee_id,