X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Finstance_topics.py;h=8ca35d06343f8346042ec36608c48890a7e5e630;hp=139ced72da3d638b8b3f63c6b159e62fa0575321;hb=f318b3045ae5e005f6241ec170ea943c92cc67d6;hpb=bee3bad8d15fe0893855d0dff92cef4351629edb

diff --git a/osm_nbi/instance_topics.py b/osm_nbi/instance_topics.py
index 139ced7..8ca35d0 100644
--- a/osm_nbi/instance_topics.py
+++ b/osm_nbi/instance_topics.py
@@ -232,6 +232,14 @@ class NsrTopic(BaseTopic):
                 "name-ref": ns_request["nsName"],
                 "short-name": ns_request["nsName"],
                 "admin-status": "ENABLED",
+                "nsState": "NOT_INSTANTIATED",
+                "currentOperation": "IDLE",
+                "currentOperationID": None,
+                "errorDescription": None,
+                "errorDetail": None,
+                "deploymentStatus": None,
+                "configurationStatus": None,
+                "vcaStatus": None,
                 "nsd": nsd,
                 "datacenter": ns_request["vimAccountId"],
                 "resource-orchestrator": "osmopenmano",
@@ -921,6 +929,10 @@ class NsLcmOpTopic(BaseTopic):
             "id": _id,
             "_id": _id,
             "operationState": "PROCESSING",  # COMPLETED,PARTIALLY_COMPLETED,FAILED_TEMP,FAILED,ROLLING_BACK,ROLLED_BACK
+            "queuePosition": None,
+            "stage": None,
+            "errorMessage": None,
+            "detailedStatus": None,
             "statusEnteredTime": now,
             "nsInstanceId": nsr_id,
             "lcmOperationType": operation,
@@ -935,6 +947,19 @@ class NsLcmOpTopic(BaseTopic):
         }
         return nslcmop
 
+    def _get_enabled_vims(self, session):
+        """
+        Retrieve and return VIM accounts that are accessible by current user and has state ENABLE
+        :param session: current session with user information
+        """
+        db_filter = self._get_project_filter(session)
+        db_filter["_admin.operationalState"] = "ENABLED"
+        vims = self.db.get_list("vim_accounts", db_filter)
+        vimAccounts = []
+        for vim in vims:
+            vimAccounts.append(vim['_id'])
+        return vimAccounts
+
     def new(self, rollback, session, indata=None, kwargs=None, headers=None, slice_object=False):
         """
         Performs a new operation over a ns
@@ -990,6 +1015,9 @@ class NsLcmOpTopic(BaseTopic):
             nslcmop_desc = self._create_nslcmop(nsInstanceId, operation, indata)
             _id = nslcmop_desc["_id"]
             self.format_on_new(nslcmop_desc, session["project_id"], make_public=session["public"])
+            if indata.get("placement-engine"):
+                # Save valid vim accounts in lcm operation descriptor
+                nslcmop_desc['operationParams']['validVimAccounts'] = self._get_enabled_vims(session)
             self.db.create("nslcmops", nslcmop_desc)
             rollback.append({"topic": "nslcmops", "_id": _id})
             if not slice_object: