commit 524313508cbe7e076481f20fca1f99ca72e2d3c7
author Patricia Reinoso <patricia.reinoso@canonical.com> Wed Apr 05 15:35:48 2023 +0000
committer Mark Beierl <mark.beierl@canonical.com> Thu Apr 06 16:17:38 2023 +0000
tree 9fe69392b14b30cb7f1dfc31d587eaf9cb379aaa
parent 9e1379de17838ca0a9ea19ed21617dd89768e13f

NS Instantiate Workflow and Activities

Change-Id: I446e9ec5a98724e23aad273f3d1fafa98c8272c7
Signed-off-by: Patricia Reinoso <patricia.reinoso@canonical.com>
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>

osm_lcm/nglcm.py

diff --git a/osm_lcm/nglcm.py b/osm_lcm/nglcm.py
index 41f7671..4c21d6e 100644
--- a/osm_lcm/nglcm.py
+++ b/osm_lcm/nglcm.py
@@ -42,6 +42,8 @@
 from osm_lcm.temporal.vdu_workflows import VduInstantiateWorkflow
 from osm_lcm.temporal.vnf_workflows import VnfInstantiateWorkflow
 from osm_lcm.temporal.vnf_activities import VnfDbActivity, VnfOperations
+from osm_lcm.temporal.ns_workflows import NsInstantiateWorkflow
+from osm_lcm.temporal.ns_activities import NsOperations, NsDbActivity
 from temporalio.client import Client
 from temporalio.worker import Worker
 
@@ -131,13 +133,17 @@
             f"{self.main_config.temporal.host}:{str(self.main_config.temporal.port)}"
         )
         client = await Client.connect(temporal_api)
-        vim_data_activity_instance = VimDbActivity(self.db)
-        paas_connector_instance = JujuPaasConnector(self.db)
+
+        ns_operation_instance = NsOperations(self.db)
+        ns_data_activity_instance = NsDbActivity(self.db)
         nslcm_activity_instance = NsLcmActivity(self.db)
-        vnf_operation_instance = VnfOperations(self.db)
+        paas_connector_instance = JujuPaasConnector(self.db)
+        vim_data_activity_instance = VimDbActivity(self.db)
         vnf_data_activity_instance = VnfDbActivity(self.db)
+        vnf_operation_instance = VnfOperations(self.db)
 
         workflows = [
+            NsInstantiateWorkflow,
             NsNoOpWorkflow,
             VimCreateWorkflow,
             VimDeleteWorkflow,
@@ -146,15 +152,19 @@
             VnfInstantiateWorkflow,
         ]
         activities = [
-            vim_data_activity_instance.update_vim_operation_state,
-            vim_data_activity_instance.update_vim_state,
-            vim_data_activity_instance.delete_vim_record,
+            ns_data_activity_instance.prepare_vnf_records,
+            ns_data_activity_instance.update_ns_state,
+            ns_operation_instance.check_ns_instantiate_finished,
+            ns_operation_instance.deploy_ns,
             nslcm_activity_instance.update_ns_lcm_operation_state,
             nslcm_activity_instance.no_op,
-            paas_connector_instance.test_vim_connectivity,
             paas_connector_instance.create_model_if_doesnt_exist,
             paas_connector_instance.deploy_charm,
             paas_connector_instance.check_charm_status,
+            paas_connector_instance.test_vim_connectivity,
+            vim_data_activity_instance.update_vim_operation_state,
+            vim_data_activity_instance.update_vim_state,
+            vim_data_activity_instance.delete_vim_record,
             vnf_operation_instance.get_task_queue,
             vnf_data_activity_instance.change_nf_state,
             vnf_data_activity_instance.change_nf_instantiation_state,