OSMENG-987: Implement PrepareVnfWorkflow
Change-Id: Icf3ccfd44160fbc3f2f2d9ec64e360c07fc9bbfa
Signed-off-by: Dario Faccin <dario.faccin@canonical.com>
diff --git a/osm_lcm/temporal/ns_activities.py b/osm_lcm/temporal/ns_activities.py
index 6834eec..eee4325 100644
--- a/osm_lcm/temporal/ns_activities.py
+++ b/osm_lcm/temporal/ns_activities.py
@@ -21,7 +21,6 @@
ACTIVITY_CHECK_NS_INSTANTIATION_FINISHED,
ACTIVITY_DEPLOY_NS,
ACTIVITY_GET_MODEL_INFO,
- ACTIVITY_PREPARE_VNF_RECORDS,
ACTIVITY_UPDATE_NS_STATE,
)
from osm_common.dataclasses.temporal_dataclasses import (
@@ -84,30 +83,6 @@
self.db = db
self.logger = logging.getLogger(f"lcm.act.{self.__class__.__name__}")
- @activity.defn(name=ACTIVITY_PREPARE_VNF_RECORDS)
- async def prepare_vnf_records(
- self, ns_instantiate_input: NsInstantiateInput
- ) -> None:
- """Prepare VNFs to be deployed: Add namespace to the VNFr.
-
- Collaborators:
- DB Write: vnfrs
-
- Raises (Retryable):
- DbException If the target DB record does not exist or DB is not reachable.
-
- Activity Lifecycle:
- This activity will not report a heartbeat due to its
- short-running nature.
-
- As this is a direct DB update, it is not recommended to have
- any specific retry policy
-
- """
- vnfrs = self.db.get_list("vnfrs", {"nsr-id-ref": ns_instantiate_input.ns_uuid})
- for vnfr in vnfrs:
- self._prepare_vnf_record(vnfr)
-
@activity.defn(name=ACTIVITY_GET_MODEL_INFO)
async def get_model_info(
self, ns_instantiate_input: NsInstantiateInput
@@ -134,18 +109,11 @@
model_name = self._get_namespace(ns_uuid, vim_uuid)
return ModelInfo(vim_uuid, model_name)
- def _get_namespace(self, ns_id: str, vim_id: str) -> str:
+ @staticmethod
+ def _get_namespace(ns_id: str, vim_id: str) -> str:
"""The NS namespace is the combination if the NS ID and the VIM ID."""
return ns_id[-12:] + "-" + vim_id[-12:]
- def _prepare_vnf_record(self, vnfr: dict) -> None:
- """Add namespace to the VNFr."""
- ns_id = vnfr["nsr-id-ref"]
- vim_id = vnfr["vim-account-id"]
- namespace = self._get_namespace(ns_id, vim_id)
- update_namespace = {"namespace": namespace}
- self.db.set_one("vnfrs", {"_id": vnfr["_id"]}, update_namespace)
-
@activity.defn(name=ACTIVITY_UPDATE_NS_STATE)
async def update_ns_state(self, data: UpdateNsStateInput) -> None:
"""
diff --git a/osm_lcm/temporal/vnf_activities.py b/osm_lcm/temporal/vnf_activities.py
index 3e2155b..6e5abcb 100644
--- a/osm_lcm/temporal/vnf_activities.py
+++ b/osm_lcm/temporal/vnf_activities.py
@@ -22,12 +22,14 @@
ACTIVITY_SEND_NOTIFICATION_FOR_VNF,
ACTIVITY_GET_TASK_QUEUE,
VIM_TYPE_TASK_QUEUE_MAPPINGS,
+ ACTIVITY_SET_VNF_MODEL,
)
from osm_common.dataclasses.temporal_dataclasses import (
ChangeVnfInstantiationStateInput,
ChangeVnfStateInput,
GetTaskQueueInput,
GetTaskQueueOutput,
+ VnfInstantiateInput,
)
@@ -143,6 +145,36 @@
f"VNF {vnf_instantiation_state_input.vnfr_uuid} state is updated to {vnf_instantiation_state_input.state}."
)
+ @activity.defn(name=ACTIVITY_SET_VNF_MODEL)
+ async def set_vnf_model(self, set_vnf_model_input: VnfInstantiateInput) -> None:
+ """Updates the model name of VNF in VNFR.
+
+ Collaborators:
+ DB Access Object
+
+ Raises (retryable):
+ DbException: If DB access or update fails, the collection or DB record ID does not exist.
+
+ Activity Lifecycle:
+ This activity should complete relatively quickly (less than a
+ second). However, it would be reasonable to wait up to 10
+ seconds.
+
+ This activity will not report a heartbeat due to its
+ short-running nature.
+
+ It is not necessary to implement a back-off strategy for this
+ activity, the operation is idempotent.
+
+ """
+ update_namespace = {"namespace": set_vnf_model_input.model_name}
+ self.db.set_one(
+ "vnfrs", {"_id": set_vnf_model_input.vnfr_uuid}, update_namespace
+ )
+ self.logger.debug(
+ f"VNF {set_vnf_model_input.vnfr_uuid} model name is updated to {set_vnf_model_input.model_name}."
+ )
+
class VnfSendNotifications:
"""Perform Notification operations."""
diff --git a/osm_lcm/temporal/vnf_workflows.py b/osm_lcm/temporal/vnf_workflows.py
index 4521889..6d16d26 100644
--- a/osm_lcm/temporal/vnf_workflows.py
+++ b/osm_lcm/temporal/vnf_workflows.py
@@ -27,7 +27,6 @@
ChangeVnfInstantiationStateInput,
ChangeVnfStateInput,
GetTaskQueueInput,
- PrepareVnfInput,
)
from osm_common.temporal_constants import (
@@ -35,6 +34,7 @@
ACTIVITY_SEND_NOTIFICATION_FOR_VNF,
ACTIVITY_CHANGE_VNF_STATE,
ACTIVITY_GET_TASK_QUEUE,
+ ACTIVITY_SET_VNF_MODEL,
LCM_TASK_QUEUE,
WORKFLOW_VDU_INSTANTIATE,
WORKFLOW_VNF_INSTANTIATE,
@@ -82,7 +82,7 @@
await workflow.execute_child_workflow(
workflow=WORKFLOW_VNF_PREPARE,
- arg=PrepareVnfInput(input.vnfr_uuid),
+ arg=input,
task_queue=vnf_task_queue,
id=f"{WORKFLOW_VNF_PREPARE}-{input.vnfr_uuid}",
)
@@ -168,7 +168,7 @@
@workflow.defn(name=WORKFLOW_VNF_PREPARE, sandboxed=_SANDBOXED)
-class PrepareVnfWorkflow:
+class VnfPrepareWorkflow:
"""Prepare a VNF.
Workflow Identifier:
@@ -176,7 +176,20 @@
ID when invoking this workflow.
"""
+ def __init__(self):
+ self.logger = logging.getLogger(f"lcm.wfl.{self.__class__.__name__}")
+
@workflow.run
- async def run(self, input: PrepareVnfInput) -> None:
- # TODO: Set the model here OSM-991
- pass
+ async def run(self, wf_input: VnfInstantiateInput) -> None:
+ try:
+ await workflow.execute_activity(
+ activity=ACTIVITY_SET_VNF_MODEL,
+ arg=wf_input,
+ activity_id=f"{ACTIVITY_SET_VNF_MODEL}-{wf_input.vnfr_uuid}",
+ task_queue=LCM_TASK_QUEUE,
+ schedule_to_close_timeout=default_schedule_to_close_timeout,
+ retry_policy=retry_policy,
+ )
+ except Exception as e:
+ self.logger.error(f"{WORKFLOW_VNF_PREPARE} failed with {str(e)}")
+ raise e