Implement instantiate NS workflow
Change-Id: I61defdc64865396cd6af4a20ffb67443450bd742
Signed-off-by: Daniel Arndt <daniel.arndt@canonical.com>
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>
diff --git a/osm_lcm/nglcm.py b/osm_lcm/nglcm.py
index a3c57b3..5ddae3f 100644
--- a/osm_lcm/nglcm.py
+++ b/osm_lcm/nglcm.py
@@ -22,34 +22,35 @@
import logging.handlers
import os
import sys
-import yaml
+from os import path
+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
-from os import path
+from osm_lcm.temporal.juju_paas_activities import JujuPaasConnector
from osm_lcm.temporal.lcm_activities import NsLcmActivity
from osm_lcm.temporal.lcm_workflows import NsNoOpWorkflow
+from osm_lcm.temporal.ns_activities import NsDbActivity, NsOperations
+from osm_lcm.temporal.ns_workflows import NsInstantiateWorkflow
+from osm_lcm.temporal.vdu_workflows import VduInstantiateWorkflow
from osm_lcm.temporal.vim_activities import VimDbActivity
-from osm_lcm.temporal.juju_paas_activities import JujuPaasConnector
from osm_lcm.temporal.vim_workflows import (
VimCreateWorkflow,
VimDeleteWorkflow,
VimUpdateWorkflow,
)
-from osm_lcm.temporal.vdu_workflows import VduInstantiateWorkflow
-from osm_lcm.temporal.vnf_workflows import VnfInstantiateWorkflow, VnfPrepareWorkflow
from osm_lcm.temporal.vnf_activities import (
VnfDbActivity,
VnfOperations,
VnfSendNotifications,
)
-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
+from osm_lcm.temporal.vnf_workflows import VnfInstantiateWorkflow, VnfPrepareWorkflow
class NGLcm:
@@ -159,10 +160,8 @@
VnfPrepareWorkflow,
]
activities = [
- ns_data_activity_instance.get_model_info,
ns_data_activity_instance.update_ns_state,
- ns_operation_instance.check_ns_instantiate_finished,
- ns_operation_instance.deploy_ns,
+ ns_operation_instance.get_vnf_records,
nslcm_activity_instance.update_ns_lcm_operation_state,
nslcm_activity_instance.no_op,
paas_connector_instance.create_model,