commit 50d12e0005f5a385e9b9545c4834008032ca4a4a
author Gulsum Atici <gulsum.atici@canonical.com> Thu Apr 27 16:41:43 2023 +0300
committer aticig <gulsum.atici@canonical.com> Thu Jun 08 09:43:02 2023 +0200
tree 621db75f59e4db594307ea8ef3b2842d6bc52643
parent 842c11fee5317c515129a8f9673bc97050f88bca

OSMENG-1048 Implement day1 configuration for VDU

Day1 config implementation, arranging existing unit tests and imports
adding task and execution timeout policy for workflows in tests.

Change-Id: Ie5a2626eec01176723d8130576facbf4934d5285
Signed-off-by: Gulsum Atici <gulsum.atici@canonical.com>

osm_lcm/nglcm.py

diff --git a/osm_lcm/nglcm.py b/osm_lcm/nglcm.py
index 729b775..bad37f7 100644
--- a/osm_lcm/nglcm.py
+++ b/osm_lcm/nglcm.py
@@ -27,9 +27,6 @@
 import yaml
 from osm_common.dbbase import DbException
 from osm_common.temporal_constants import LCM_TASK_QUEUE
-from temporalio.client import Client
-from temporalio.worker import Worker
-
 from osm_lcm.data_utils.database.database import Database
 from osm_lcm.data_utils.lcm_config import LcmCfg
 from osm_lcm.lcm_utils import LcmException
@@ -51,6 +48,8 @@
     VnfSendNotifications,
 )
 from osm_lcm.temporal.vnf_workflows import VnfInstantiateWorkflow, VnfPrepareWorkflow
+from temporalio.client import Client
+from temporalio.worker import Worker
 
 
 class NGLcm:
@@ -161,7 +160,8 @@
         ]
         activities = [
             ns_data_activity_instance.update_ns_state,
-            ns_operation_instance.get_vnf_record_ids,
+            ns_operation_instance.get_vnf_details,
+            ns_operation_instance.get_ns_record,
             nslcm_activity_instance.update_ns_lcm_operation_state,
             nslcm_activity_instance.no_op,
             paas_connector_instance.create_model,
@@ -175,7 +175,8 @@
             vnf_data_activity_instance.change_vnf_instantiation_state,
             vnf_operation_instance.get_task_queue,
             vnf_operation_instance.get_vim_cloud,
-            vnf_operation_instance.get_vnf_details,
+            vnf_operation_instance.get_vnf_descriptor,
+            vnf_operation_instance.get_vnf_record,
             vnf_send_notifications_instance.send_notification_for_vnf,
             vnf_data_activity_instance.set_vnf_model,
         ]