Merge branch feature7928. It includes feature5837 21/8221/4
authortierno <alfonso.tiernosepulveda@telefonica.com>
Sat, 23 Nov 2019 00:36:52 +0000 (00:36 +0000)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Sat, 23 Nov 2019 22:49:14 +0000 (22:49 +0000)
Change-Id: Ia86ec45a9415df90309ad35dc7c63a063f12db5d
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
Dockerfile.local
devops-stages/stage-test.sh
osm_lcm/__init__.py
osm_lcm/lcm.py
osm_lcm/lcm_utils.py
osm_lcm/ns.py
osm_lcm/tests/test_db_descriptors.py [new file with mode: 0644]
osm_lcm/tests/test_ns.py
setup.py

index 772af7a..a905732 100644 (file)
@@ -31,20 +31,18 @@ RUN curl https://get.helm.sh/helm-v2.15.2-linux-amd64.tar.gz --output helm-v2.15
 
 RUN apt-get update && apt-get install -y git tox python3 \
     python3-pip python3-aiohttp python3-jinja2 \
-    && pip3 install pip==9.0.3 \
-    && pip3 install -U 'PyYAML==3.*' 'aiohttp==0.20.2' flake8
+    && python3 -m pip install pip --upgrade  \
+    && python3 -m pip install -U 'PyYAML==3.*' 'aiohttp==0.20.2' flake8
 
 RUN git -C /app clone https://osm.etsi.org/gerrit/osm/N2VC.git \
-    && git -C /app/N2VC fetch "https://osm.etsi.org/gerrit/osm/N2VC" refs/changes/56/8156/1 \
-    && git -C /app/N2VC checkout FETCH_HEAD \
-    && pip3 install -e /app/N2VC \
-    && pip3 install -e /app/N2VC/modules/libjuju \
+    && python3 -m pip install -e /app/N2VC \
+    && python3 -m pip install -U juju \
     && apt-get install -y libffi-dev libssl-dev openssh-client
     # cd N2VC; python3 setup.py develop
     # cd modules/libjuju; python3 setup.py develop
 
 RUN git -C /app clone https://osm.etsi.org/gerrit/osm/common.git \
-    && pip3 install -e /app/common
+    && python3 -m pip install -e /app/common
     #  python3-pymongo python3-yaml pycrypto aiokafka
 
 RUN mkdir -p /app/storage/kafka && mkdir -p /app/log
index 8d3dc68..56433dc 100755 (executable)
@@ -15,4 +15,4 @@
 ##
 
 tox -e flake8
-tox -e unittest
+tox -e unittest
index 3cf7857..3a64a63 100644 (file)
@@ -13,5 +13,5 @@
 ##
 
 # version moved to lcm.py. uncomment if LCM is installed as library and installed
-version = '6.0.2.post10'
-version_date = '2019-10-08'
+version = '6.0.3.post12'
+version_date = '2019-11-23'
index d8ac91f..3569904 100644 (file)
@@ -400,7 +400,7 @@ class Lcm:
                 return
         elif topic == "vim_account":
             vim_id = params["_id"]
-            if command == "create" or command == "created":
+            if command in ("create", "created"):
                 task = asyncio.ensure_future(self.vim.create(params, order_id))
                 self.lcm_tasks.register("vim_account", vim_id, order_id, "vim_create", task)
                 return
@@ -413,13 +413,15 @@ class Lcm:
                 print("not implemented show with vim_account")
                 sys.stdout.flush()
                 return
-            elif command == "edit" or command == "edited":
+            elif command in ("edit", "edited"):
                 task = asyncio.ensure_future(self.vim.edit(params, order_id))
                 self.lcm_tasks.register("vim_account", vim_id, order_id, "vim_edit", task)
                 return
+            elif command == "deleted":
+                return  # TODO cleaning of task just in case should be done
         elif topic == "wim_account":
             wim_id = params["_id"]
-            if command == "create" or command == "created":
+            if command in ("create", "created"):
                 task = asyncio.ensure_future(self.wim.create(params, order_id))
                 self.lcm_tasks.register("wim_account", wim_id, order_id, "wim_create", task)
                 return
@@ -432,13 +434,15 @@ class Lcm:
                 print("not implemented show with wim_account")
                 sys.stdout.flush()
                 return
-            elif command == "edit" or command == "edited":
+            elif command in ("edit", "edited"):
                 task = asyncio.ensure_future(self.wim.edit(params, order_id))
                 self.lcm_tasks.register("wim_account", wim_id, order_id, "wim_edit", task)
                 return
+            elif command == "deleted":
+                return  # TODO cleaning of task just in case should be done
         elif topic == "sdn":
             _sdn_id = params["_id"]
-            if command == "create" or command == "created":
+            if command in ("create", "created"):
                 task = asyncio.ensure_future(self.sdn.create(params, order_id))
                 self.lcm_tasks.register("sdn", _sdn_id, order_id, "sdn_create", task)
                 return
@@ -447,10 +451,12 @@ class Lcm:
                 task = asyncio.ensure_future(self.sdn.delete(params, order_id))
                 self.lcm_tasks.register("sdn", _sdn_id, order_id, "sdn_delete", task)
                 return
-            elif command == "edit" or command == "edited":
+            elif command in ("edit", "edited"):
                 task = asyncio.ensure_future(self.sdn.edit(params, order_id))
                 self.lcm_tasks.register("sdn", _sdn_id, order_id, "sdn_edit", task)
                 return
+            elif command == "deleted":
+                return  # TODO cleaning of task just in case should be done
         self.logger.critical("unknown topic {} and command '{}'".format(topic, command))
 
     async def kafka_read(self):
@@ -520,7 +526,7 @@ class Lcm:
         # and not parse integer or boolean
         try:
             with open(config_file) as f:
-                conf = yaml.load(f)
+                conf = yaml.load(f, Loader=yaml.Loader)
             for k, v in environ.items():
                 if not k.startswith("OSMLCM_"):
                     continue
@@ -597,6 +603,7 @@ def health_check():
 if __name__ == '__main__':
 
     try:
+        print("SYS.PATH='{}'".format(sys.path))
         # load parameters and configuration
         # -h
         # -c value
index a6ce5bd..b4e6887 100644 (file)
@@ -18,6 +18,7 @@
 
 import asyncio
 from collections import OrderedDict
+from time import time
 # from osm_common.dbbase import DbException
 
 __author__ = "Alfonso Tierno"
@@ -71,6 +72,8 @@ class LcmBase:
         """
         if not _desc:
             return
+        now = time()
+        _desc["_admin.modified"] = now
         self.db.set_one(item, {"_id": _id}, _desc)
         _desc.clear()
         # except DbException as e:
@@ -252,12 +255,15 @@ class TaskRegistry(LcmBase):
         else:
             # NS/NSI
             if self._is_service_type_HA(topic):
+                now = time()
                 starttime_this_op = db_lcmop.get("startTime")
                 instance_id_label = self.topic2instid_dict.get(topic)
                 instance_id = db_lcmop.get(instance_id_label)
                 _filter = {instance_id_label: instance_id,
                            'operationState': 'PROCESSING',
-                           'startTime.lt': starttime_this_op}
+                           'startTime.lt': starttime_this_op,
+                           "_admin.modified.gt": now - 2*3600,  # ignore if tow hours of inactivity
+                           }
             # VIM/WIM/SDN/K8scluster
             elif self._is_account_type_HA(topic):
                 _, op_index = self._get_account_and_op_HA(op_id)
index 5ca6354..d3acc58 100644 (file)
@@ -383,6 +383,11 @@ class NsLcm(LcmBase):
                     populate_dict(RO_ns_params, ("vnfs", vnf_params["member-vnf-index"], "networks",
                                                  internal_vld_params["name"], "ip-profile"),
                                   ip_profile_2_RO(internal_vld_params["ip-profile"]))
+                if internal_vld_params.get("provider-network"):
+
+                    populate_dict(RO_ns_params, ("vnfs", vnf_params["member-vnf-index"], "networks",
+                                                 internal_vld_params["name"], "provider-network"),
+                                  internal_vld_params["provider-network"].copy())
 
                 for icp_params in get_iterable(internal_vld_params, "internal-connection-point"):
                     # look for interface
@@ -416,6 +421,11 @@ class NsLcm(LcmBase):
                 populate_dict(RO_ns_params, ("networks", vld_params["name"], "ip-profile"),
                               ip_profile_2_RO(vld_params["ip-profile"]))
 
+            if vld_params.get("provider-network"):
+
+                populate_dict(RO_ns_params, ("networks", vld_params["name"], "provider-network"),
+                              vld_params["provider-network"].copy())
+
             if "wimAccountId" in vld_params and vld_params["wimAccountId"] is not None:
                 populate_dict(RO_ns_params, ("networks", vld_params["name"], "wim_account"),
                               wim_account_2_RO(vld_params["wimAccountId"])),
@@ -431,6 +441,7 @@ class NsLcm(LcmBase):
                     RO_vld_sites.append({"netmap-use": vld_params["vim-network-name"]})
                 if RO_vld_sites:
                     populate_dict(RO_ns_params, ("networks", vld_params["name"], "sites"), RO_vld_sites)
+
             if vld_params.get("vim-network-id"):
                 RO_vld_sites = []
                 if isinstance(vld_params["vim-network-id"], dict):
@@ -621,6 +632,57 @@ class NsLcm(LcmBase):
             else:
                 raise LcmException("ns_update_vnfr: Not found member_vnf_index={} from VIM info".format(vnf_index))
 
+    @staticmethod
+    def _get_ns_config_info(vca_deployed_list):
+        """
+        Generates a mapping between vnf,vdu elements and the N2VC id
+        :param vca_deployed_list: List of database _admin.deploy.VCA that contains this list
+        :return: a dictionary with {osm-config-mapping: {}} where its element contains:
+            "<member-vnf-index>": <N2VC-id>  for a vnf configuration, or
+            "<member-vnf-index>.<vdu.id>.<vdu replica(0, 1,..)>": <N2VC-id>  for a vdu configuration
+        """
+        mapping = {}
+        ns_config_info = {"osm-config-mapping": mapping}
+        for vca in vca_deployed_list:
+            if not vca["member-vnf-index"]:
+                continue
+            if not vca["vdu_id"]:
+                mapping[vca["member-vnf-index"]] = vca["application"]
+            else:
+                mapping["{}.{}.{}".format(vca["member-vnf-index"], vca["vdu_id"], vca["vdu_count_index"])] =\
+                    vca["application"]
+        return ns_config_info
+
+    @staticmethod
+    def _get_initial_config_primitive_list(desc_primitive_list, vca_deployed):
+        """
+        Generates a list of initial-config-primitive based on the list provided by the descriptor. It includes internal
+        primitives as verify-ssh-credentials, or config when needed
+        :param desc_primitive_list: information of the descriptor
+        :param vca_deployed: information of the deployed, needed for known if it is related to an NS, VNF, VDU and if
+            this element contains a ssh public key
+        :return: The modified list. Can ba an empty list, but always a list
+        """
+        if desc_primitive_list:
+            primitive_list = desc_primitive_list.copy()
+        else:
+            primitive_list = []
+        # look for primitive config, and get the position. None if not present
+        config_position = None
+        for index, primitive in enumerate(primitive_list):
+            if primitive["name"] == "config":
+                config_position = index
+                break
+
+        # for NS, add always a config primitive if not present (bug 874)
+        if not vca_deployed["member-vnf-index"] and config_position is None:
+            primitive_list.insert(0, {"name": "config", "parameter": []})
+            config_position = 0
+        # for VNF/VDU add verify-ssh-credentials after config
+        if vca_deployed["member-vnf-index"] and config_position is not None and vca_deployed.get("ssh-public-key"):
+            primitive_list.insert(config_position + 1, {"name": "verify-ssh-credentials", "parameter": []})
+        return primitive_list
+
     async def instantiate_RO(self, logging_text, nsr_id, nsd, db_nsr,
                              db_nslcmop, db_vnfrs, db_vnfds_ref, n2vc_key_list):
 
@@ -885,16 +947,15 @@ class NsLcm(LcmBase):
                                kdu_name, vdu_index, config_descriptor, deploy_params, base_folder):
         nsr_id = db_nsr["_id"]
         db_update_entry = "_admin.deployed.VCA.{}.".format(vca_index)
+        vca_deployed_list = db_nsr["_admin"]["deployed"]["VCA"]
         vca_deployed = db_nsr["_admin"]["deployed"]["VCA"][vca_index]
         db_dict = {
             'collection': 'nsrs',
             'filter': {'_id': nsr_id},
             'path': db_update_entry
         }
-
-
-        logging_text += "member_vnf_index={} vdu_id={}, vdu_index={} "\
-            .format(db_vnfr["member-vnf-index-ref"], vdu_id, vdu_index)
+        logging_text += "member_vnf_index={} vdu_id={}, vdu_index={} ".format(db_vnfr["member-vnf-index-ref"],
+                                                                              vdu_id, vdu_index)
 
         step = ""
         try:
@@ -937,7 +998,7 @@ class NsLcm(LcmBase):
                 )
 
             else:
-                step = "register execution envioronment"
+                step = "register execution environment"
                 # TODO wait until deployed by RO, when IP address has been filled. By pooling????
                 credentials = {}   # TODO db_credentials["ip_address"]
                 # get username
@@ -1011,7 +1072,7 @@ class NsLcm(LcmBase):
             deploy_params["rw_mgmt_ip"] = rw_mgmt_ip
 
             # n2vc_redesign STEP 6  Execute initial config primitive
-            initial_config_primitive_list = config_descriptor.get('initial-config-primitive', [])
+            initial_config_primitive_list = config_descriptor.get('initial-config-primitive')
             step = 'execute initial config primitive'
 
             # sort initial config primitives by 'seq'
@@ -1020,7 +1081,14 @@ class NsLcm(LcmBase):
             except Exception:
                 self.logger.warn(logging_text + 'Cannot sort by "seq" field' + step)
 
+            # add config if not present for NS charm
+            initial_config_primitive_list = self._get_initial_config_primitive_list(initial_config_primitive_list,
+                                                                                    vca_deployed)
+
             for initial_config_primitive in initial_config_primitive_list:
+                # adding information on the vca_deployed if it is a NS execution environment
+                if not vca_deployed["member-vnf-index"]:
+                    deploy_params["ns_config_info"] = self._get_ns_config_info(vca_deployed_list)
                 # TODO check if already done
                 primitive_params_ = self._map_primitive_params(initial_config_primitive, {}, deploy_params)
                 step = "execute primitive '{}' params '{}'".format(initial_config_primitive["name"], primitive_params_)
@@ -1082,8 +1150,7 @@ class NsLcm(LcmBase):
         exc = None
         try:
             # wait for any previous tasks in process
-            step = "Waiting for previous tasks"
-            self.logger.debug(logging_text + step)
+            step = "Waiting for previous operations to terminate"
             await self.lcm_tasks.waitfor_related_HA('ns', 'nslcmops', nslcmop_id)
 
             # STEP 0: Reading database (nslcmops, nsrs, nsds, vnfrs, vnfds)
@@ -1315,6 +1382,7 @@ class NsLcm(LcmBase):
                 kdu_name = None
                 vdu_index = 0
                 vdu_name = None
+
                 # Get additional parameters
                 deploy_params = {}
                 if db_nsr.get("additionalParamsForNs"):
@@ -1483,9 +1551,9 @@ class NsLcm(LcmBase):
                         db_dict = {"collection": "nsrs", "filter": {"_id": nsr_id}, "path": "_admin.deployed.K8s."
                                                                                             "{}".format(index)}
                         if k8sclustertype == "chart":
-                            task = self.k8sclusterhelm.install(cluster_uuid=cluster_uuid,
-                                                           kdu_model=kdumodel, atomic=True, params=desc_params,
-                                                           db_dict=db_dict, timeout=300)
+                            task = self.k8sclusterhelm.install(cluster_uuid=cluster_uuid, kdu_model=kdumodel,
+                                                               atomic=True, params=desc_params,
+                                                               db_dict=db_dict, timeout=300)
                         else:
                             # TODO I need the juju connector in place
                             pass
@@ -1516,6 +1584,7 @@ class NsLcm(LcmBase):
             # TODO Write in data base
             if db_nsr_update:
                 self.update_db_2("nsrs", nsr_id, db_nsr_update)
+
     def _deploy_n2vc(self, logging_text, db_nsr, db_vnfr, nslcmop_id, nsr_id, nsi_id, vnfd_id, vdu_id,
                      kdu_name, member_vnf_index, vdu_index, vdu_name, deploy_params, descriptor_config,
                      base_folder, task_instantiation_list):
@@ -1883,6 +1952,7 @@ class NsLcm(LcmBase):
         pending_tasks = []
         try:
             # wait for any previous tasks in process
+            step = "Waiting for previous operations to terminate"
             await self.lcm_tasks.waitfor_related_HA("ns", 'nslcmops', nslcmop_id)
 
             step = "Getting nslcmop={} from db".format(nslcmop_id)
@@ -2153,6 +2223,11 @@ class NsLcm(LcmBase):
                                                                width=256)
             elif isinstance(calculated_params[param_name], str) and calculated_params[param_name].startswith("!!yaml "):
                 calculated_params[param_name] = calculated_params[param_name][7:]
+
+        # add always ns_config_info if primitive name is config
+        if primitive_desc["name"] == "config":
+            if "ns_config_info" in instantiation_params:
+                calculated_params["ns_config_info"] = instantiation_params["ns_config_info"]
         return calculated_params
 
     async def _ns_execute_primitive(self, db_deployed, member_vnf_index, vdu_id, vdu_name, vdu_count_index,
@@ -2230,6 +2305,7 @@ class NsLcm(LcmBase):
         exc = None
         try:
             # wait for any previous tasks in process
+            step = "Waiting for previous operations to terminate"
             await self.lcm_tasks.waitfor_related_HA('ns', 'nslcmops', nslcmop_id)
 
             step = "Getting information from database"
@@ -2301,9 +2377,10 @@ class NsLcm(LcmBase):
 
                             if kdu.get("k8scluster-type") == "chart":
                                 output = await self.k8sclusterhelm.upgrade(cluster_uuid=kdu.get("k8scluster-uuid"),
-                                                                       kdu_instance=kdu.get("kdu-instance"),
-                                                                       atomic=True, kdu_model=kdu_model,
-                                                                       params=desc_params, db_dict=db_dict, timeout=300)
+                                                                           kdu_instance=kdu.get("kdu-instance"),
+                                                                           atomic=True, kdu_model=kdu_model,
+                                                                           params=desc_params, db_dict=db_dict,
+                                                                           timeout=300)
                             elif kdu.get("k8scluster-type") == "juju":
                                 # TODO Juju connector needed
                                 pass
@@ -2458,6 +2535,7 @@ class NsLcm(LcmBase):
         vnfr_scaled = False
         try:
             # wait for any previous tasks in process
+            step = "Waiting for previous operations to terminate"
             await self.lcm_tasks.waitfor_related_HA('ns', 'nslcmops', nslcmop_id)
 
             step = "Getting nslcmop from database"
@@ -2477,9 +2555,9 @@ class NsLcm(LcmBase):
             #######
             nsr_deployed = db_nsr["_admin"].get("deployed")
             vnf_index = db_nslcmop["operationParams"].get("member_vnf_index")
-            vdu_id = db_nslcmop["operationParams"].get("vdu_id")
-            vdu_count_index = db_nslcmop["operationParams"].get("vdu_count_index")
-            vdu_name = db_nslcmop["operationParams"].get("vdu_name")
+            vdu_id = db_nslcmop["operationParams"].get("vdu_id")
+            vdu_count_index = db_nslcmop["operationParams"].get("vdu_count_index")
+            vdu_name = db_nslcmop["operationParams"].get("vdu_name")
             #######
 
             RO_nsr_id = nsr_deployed["RO"]["nsr_id"]
diff --git a/osm_lcm/tests/test_db_descriptors.py b/osm_lcm/tests/test_db_descriptors.py
new file mode 100644 (file)
index 0000000..fa483dc
--- /dev/null
@@ -0,0 +1,948 @@
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# For those usages not covered by the Apache License, Version 2.0 please
+# contact: esousa@whitestack.com or alfonso.tiernosepulveda@telefonica.com
+##
+db_nsds_text = """
+---
+-   _admin:
+        created: 1566823353.971486
+        modified: 1566823353.971486
+        onboardingState: ONBOARDED
+        operationalState: ENABLED
+        projects_read:
+        - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
+        projects_write:
+        - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
+        storage:
+            descriptor: hackfest_3charmed_nsd/hackfest_3charmed_nsd.yaml
+            folder: 8c2f8b95-bb1b-47ee-8001-36dc090678da
+            fs: local
+            path: /app/storage/
+            pkg-dir: hackfest_3charmed_nsd
+            zipfile: package.tar.gz
+        usageState: NOT_IN_USE
+        userDefinedData: {}
+    _id: 8c2f8b95-bb1b-47ee-8001-36dc090678da
+    constituent-vnfd:
+    -   member-vnf-index: '1'
+        vnfd-id-ref: hackfest3charmed-vnf
+    -   member-vnf-index: '2'
+        vnfd-id-ref: hackfest3charmed-vnf
+    description: NS with 2 VNFs hackfest3charmed-vnf connected by datanet and mgmtnet
+        VLs
+    id: hackfest3charmed-ns
+    logo: osm.png
+    name: hackfest3charmed-ns
+    short-name: hackfest3charmed-ns
+    version: '1.0'
+    vld:
+    -   id: mgmt
+        mgmt-network: true
+        name: mgmt
+        short-name: mgmt
+        type: ELAN
+        vim-network-name: mgmt
+        vnfd-connection-point-ref:
+        -   member-vnf-index-ref: '1'
+            vnfd-connection-point-ref: vnf-mgmt
+            vnfd-id-ref: hackfest3charmed-vnf
+        -   member-vnf-index-ref: '2'
+            vnfd-connection-point-ref: vnf-mgmt
+            vnfd-id-ref: hackfest3charmed-vnf
+    -   id: datanet
+        name: datanet
+        short-name: datanet
+        type: ELAN
+        vnfd-connection-point-ref:
+        -   member-vnf-index-ref: '1'
+            vnfd-connection-point-ref: vnf-data
+            vnfd-id-ref: hackfest3charmed-vnf
+        -   member-vnf-index-ref: '2'
+            vnfd-connection-point-ref: vnf-data
+            vnfd-id-ref: hackfest3charmed-vnf
+"""
+db_nslcmops_text = """
+---
+-   _admin:
+        created: 1566823354.4148262
+        modified: 1566823354.4148262
+        projects_read:
+        - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
+        projects_write:
+        - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
+        worker: 86434c2948e2
+        operations:
+        -   member_vnf_index: '1'
+            primitive: touch
+            primitive_params: /home/ubuntu/last-touch-1
+            operationState: COMPLETED
+            detailed-status: Done
+        -   member_vnf_index: '1'
+            primitive: touch
+            primitive_params: /home/ubuntu/last-touch-2
+            operationState: COMPLETED
+            detailed-status: Done
+        -   member_vnf_index: '2'
+            primitive: touch
+            primitive_params: /home/ubuntu/last-touch-3
+            operationState: FAILED
+            detailed-status: Unknown error
+    _id: a639fac7-e0bb-4225-8ecb-c1f8efcc125e
+    detailed-status: 'FAILED executing proxy charm initial primitives for member_vnf_index=1
+        vdu_id=None: charm error executing primitive verify-ssh-credentials for member_vnf_index=1
+        vdu_id=None: ''timeout after 600 seconds'''
+    id: a639fac7-e0bb-4225-8ecb-c1f8efcc125e
+    isAutomaticInvocation: false
+    isCancelPending: false
+    lcmOperationType: instantiate
+    links:
+        nsInstance: /osm/nslcm/v1/ns_instances/f48163a6-c807-47bc-9682-f72caef5af85
+        self: /osm/nslcm/v1/ns_lcm_op_occs/a639fac7-e0bb-4225-8ecb-c1f8efcc125e
+    nsInstanceId: f48163a6-c807-47bc-9682-f72caef5af85
+    operationParams:
+        additionalParamsForVnf:
+        -   additionalParams:
+                touch_filename: /home/ubuntu/first-touch-1
+                touch_filename2: /home/ubuntu/second-touch-1
+            member-vnf-index: '1'
+        -   additionalParams:
+                touch_filename: /home/ubuntu/first-touch-2
+                touch_filename2: /home/ubuntu/second-touch-2
+            member-vnf-index: '2'
+        lcmOperationType: instantiate
+        nsDescription: default description
+        nsInstanceId: f48163a6-c807-47bc-9682-f72caef5af85
+        nsName: ALF
+        nsdId: 8c2f8b95-bb1b-47ee-8001-36dc090678da
+        vimAccountId: ea958ba5-4e58-4405-bf42-6e3be15d4c3a
+    operationState: FAILED
+    startTime: 1566823354.414689
+    statusEnteredTime: 1566824534.5112448
+"""
+db_nsrs_text = """
+---
+-   _admin:
+        created: 1566823354.3716335
+        deployed:
+            RO:
+                nsd_id: 876573b5-968d-40b9-b52b-91bf5c5844f7
+                nsr_id: c9fe9908-3180-430d-b633-fca2f68db008
+                nsr_status: ACTIVE
+                vnfd:
+                -   id: 1ab2a418-9fe3-4358-bf17-411e5155535f
+                    member-vnf-index: '1'
+                -   id: 0de348e3-c201-4f6a-91cc-7f957e2d5504
+                    member-vnf-index: '2'
+            VCA:
+            -   application: alf-b-aa
+                detailed-status: Ready!
+                member-vnf-index: '1'
+                model: f48163a6-c807-47bc-9682-f72caef5af85
+                operational-status: active
+                primitive_id: null
+                ssh-public-key: ssh-rsa pub-key root@juju-145d3e-0
+                step: ssh-public-key-obtained
+                vdu_count_index: null
+                vdu_id: null
+                vdu_name: null
+                vnfd_id: hackfest3charmed-vnf
+            -   application: alf-c-ab
+                detailed-status: Ready!
+                member-vnf-index: '2'
+                model: f48163a6-c807-47bc-9682-f72caef5af85
+                operational-status: active
+                primitive_id: null
+                ssh-public-key: ssh-rsa pub-key root@juju-145d3e-0
+                step: ssh-public-key-obtained
+                vdu_count_index: null
+                vdu_id: null
+                vdu_name: null
+                vnfd_id: hackfest3charmed-vnf
+            VCA-model-name: f48163a6-c807-47bc-9682-f72caef5af85
+        modified: 1566823354.3716335
+        nsState: INSTANTIATED
+        nslcmop: null
+        projects_read:
+        - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
+        projects_write:
+        - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
+    _id: f48163a6-c807-47bc-9682-f72caef5af85
+    additionalParamsForNs: null
+    admin-status: ENABLED
+    config-status: init
+    constituent-vnfr-ref:
+    - 88d90b0c-faff-4b9f-bccd-017f33985984
+    - 1ca3bb1a-b29b-49fe-bed6-5f3076d77434
+    create-time: 1566823354.36234
+    datacenter: ea958ba5-4e58-4405-bf42-6e3be15d4c3a
+    description: default description
+    detailed-status: 'ERROR executing proxy charm initial primitives for member_vnf_index=1
+        vdu_id=None: charm error executing primitive verify-ssh-credentials for member_vnf_index=1
+        vdu_id=None: ''timeout after 600 seconds'''
+    id: f48163a6-c807-47bc-9682-f72caef5af85
+    instantiate_params:
+        nsDescription: default description
+        nsName: ALF
+        nsdId: 8c2f8b95-bb1b-47ee-8001-36dc090678da
+        vimAccountId: ea958ba5-4e58-4405-bf42-6e3be15d4c3a
+    name: ALF
+    name-ref: ALF
+    ns-instance-config-ref: f48163a6-c807-47bc-9682-f72caef5af85
+    nsd:
+        _admin:
+            created: 1566823353.971486
+            modified: 1566823353.971486
+            onboardingState: ONBOARDED
+            operationalState: ENABLED
+            projects_read:
+            - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
+            projects_write:
+            - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
+            storage:
+                descriptor: hackfest_3charmed_nsd/hackfest_3charmed_nsd.yaml
+                folder: 8c2f8b95-bb1b-47ee-8001-36dc090678da
+                fs: local
+                path: /app/storage/
+                pkg-dir: hackfest_3charmed_nsd
+                zipfile: package.tar.gz
+            usageState: NOT_IN_USE
+            userDefinedData: {}
+        _id: 8c2f8b95-bb1b-47ee-8001-36dc090678da
+        constituent-vnfd:
+        -   member-vnf-index: '1'
+            vnfd-id-ref: hackfest3charmed-vnf
+        -   member-vnf-index: '2'
+            vnfd-id-ref: hackfest3charmed-vnf
+        description: NS with 2 VNFs hackfest3charmed-vnf connected by datanet and
+            mgmtnet VLs
+        id: hackfest3charmed-ns
+        logo: osm.png
+        name: hackfest3charmed-ns
+        short-name: hackfest3charmed-ns
+        version: '1.0'
+        vld:
+        -   id: mgmt
+            mgmt-network: true
+            name: mgmt
+            short-name: mgmt
+            type: ELAN
+            vim-network-name: mgmt
+            vnfd-connection-point-ref:
+            -   member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: vnf-mgmt
+                vnfd-id-ref: hackfest3charmed-vnf
+            -   member-vnf-index-ref: '2'
+                vnfd-connection-point-ref: vnf-mgmt
+                vnfd-id-ref: hackfest3charmed-vnf
+        -   id: datanet
+            name: datanet
+            short-name: datanet
+            type: ELAN
+            vnfd-connection-point-ref:
+            -   member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: vnf-data
+                vnfd-id-ref: hackfest3charmed-vnf
+            -   member-vnf-index-ref: '2'
+                vnfd-connection-point-ref: vnf-data
+                vnfd-id-ref: hackfest3charmed-vnf
+    nsd-id: 8c2f8b95-bb1b-47ee-8001-36dc090678da
+    nsd-name-ref: hackfest3charmed-ns
+    nsd-ref: hackfest3charmed-ns
+    operational-events: []
+    operational-status: failed
+    orchestration-progress: {}
+    resource-orchestrator: osmopenmano
+    short-name: ALF
+    ssh-authorized-key: null
+    vld:
+    -   id: mgmt
+        name: null
+        status: ACTIVE
+        status-detailed: null
+        vim-id: f99ae780-0e2f-4985-af41-574eae6919c0
+        vim-network-name: mgmt
+    -   id: datanet
+        name: ALF-datanet
+        status: ACTIVE
+        status-detailed: null
+        vim-id: c31364ba-f573-4ab6-bf1a-fed30ede39a8
+    vnfd-id:
+    - 7637bcf8-cf14-42dc-ad70-c66fcf1e6e77
+"""
+db_ro_ns_text = """
+datacenter_tenant_id: dc5c67fa-c7f2-11e9-b9c0-02420aff0004
+description: null
+name: ALF
+nets:
+-   created: false
+    datacenter_id: dc51ce6c-c7f2-11e9-b9c0-02420aff0004
+    datacenter_tenant_id: dc5c67fa-c7f2-11e9-b9c0-02420aff0004
+    error_msg: null
+    ns_net_osm_id: mgmt
+    related: c6bac394-fa27-4c43-bb34-42f621a9d343
+    sce_net_id: 8f215bab-c35e-41e6-a035-42bfaa07af9f
+    sdn_net_id: null
+    status: ACTIVE
+    uuid: c6bac394-fa27-4c43-bb34-42f621a9d343
+    vim_info: "{vim_info: null}"
+    vim_name: null
+    vim_net_id: f99ae780-0e2f-4985-af41-574eae6919c0
+    vnf_net_id: null
+    vnf_net_osm_id: null
+-   created: true
+    datacenter_id: dc51ce6c-c7f2-11e9-b9c0-02420aff0004
+    datacenter_tenant_id: dc5c67fa-c7f2-11e9-b9c0-02420aff0004
+    error_msg: null
+    ns_net_osm_id: datanet
+    related: 509d576c-120f-493a-99a1-5fea99dfe041
+    sce_net_id: 3d766bbc-33a8-41aa-a986-2f35e8d25c16
+    sdn_net_id: null
+    status: ACTIVE
+    uuid: 509d576c-120f-493a-99a1-5fea99dfe041
+    vim_info: "{vim_info: null}"
+    vim_name: ALF-datanet
+    vim_net_id: c31364ba-f573-4ab6-bf1a-fed30ede39a8
+    vnf_net_id: null
+    vnf_net_osm_id: null
+-   created: true
+    datacenter_id: dc51ce6c-c7f2-11e9-b9c0-02420aff0004
+    datacenter_tenant_id: dc5c67fa-c7f2-11e9-b9c0-02420aff0004
+    error_msg: null
+    ns_net_osm_id: null
+    related: 277fed09-3220-4bfd-9052-b96b21a32daf
+    sce_net_id: null
+    sdn_net_id: null
+    status: ACTIVE
+    uuid: 277fed09-3220-4bfd-9052-b96b21a32daf
+    vim_info: "{vim_info: null}"
+    vim_name: ALF-internal
+    vim_net_id: ff181e6d-2597-4244-b40b-bb0174bdfeb6
+    vnf_net_id: 62e62fae-c12b-4ebc-9a9b-30031c6c16fa
+    vnf_net_osm_id: internal
+-   created: true
+    datacenter_id: dc51ce6c-c7f2-11e9-b9c0-02420aff0004
+    datacenter_tenant_id: dc5c67fa-c7f2-11e9-b9c0-02420aff0004
+    error_msg: null
+    ns_net_osm_id: null
+    related: 92534d1a-e697-4372-a84d-aa0aa643b68a
+    sce_net_id: null
+    sdn_net_id: null
+    status: ACTIVE
+    uuid: 92534d1a-e697-4372-a84d-aa0aa643b68a
+    vim_info: "{vim_info: null}"
+    vim_name: ALF-internal
+    vim_net_id: 09655387-b639-421a-b5f6-72b26d685fb4
+    vnf_net_id: 13c6c77d-86a5-4914-832c-990d4ec7b54e
+    vnf_net_osm_id: internal
+nsd_osm_id: f48163a6-c807-47bc-9682-f72caef5af85.2.hackfest3charmed-ns
+scenario_id: 876573b5-968d-40b9-b52b-91bf5c5844f7
+scenario_name: hackfest3charmed-ns
+sfis: []
+sfps: []
+sfs: []
+tenant_id: 0ea38bd0-2729-47a9-ae07-c6ce76115eb2
+uuid: c9fe9908-3180-430d-b633-fca2f68db008
+vnfs:
+-   datacenter_id: dc51ce6c-c7f2-11e9-b9c0-02420aff0004
+    datacenter_tenant_id: dc5c67fa-c7f2-11e9-b9c0-02420aff0004
+    ip_address: 10.205.1.46
+    member_vnf_index: '1'
+    mgmt_access: '{interface_id: 61549ee3-cd6c-4930-8b90-eaad97fe345b, required: ''False'',
+        vm_id: 6cf4a48f-3b6c-4395-8221-119fa37de24a}
+
+        '
+    sce_vnf_id: 83be04a8-c513-42ba-9908-22728f686d31
+    uuid: 94724042-7576-4fb0-82ec-6a7ab642741c
+    vms:
+    -   created_at: '2019-08-26T12:50:38'
+        error_msg: null
+        interfaces:
+        -   external_name: vnf-mgmt
+            instance_net_id: c6bac394-fa27-4c43-bb34-42f621a9d343
+            internal_name: mgmtVM-eth0
+            ip_address: 10.205.1.46
+            mac_address: fa:16:3e:b4:3e:b1
+            sdn_port_id: null
+            type: mgmt
+            vim_info: "{vim_info: null}"
+            vim_interface_id: 4d3cb8fd-7040-4169-a0ad-2486d2b006a1
+        -   external_name: null
+            instance_net_id: 277fed09-3220-4bfd-9052-b96b21a32daf
+            internal_name: mgmtVM-eth1
+            ip_address: 192.168.54.2
+            mac_address: fa:16:3e:6e:7e:78
+            sdn_port_id: null
+            type: bridge
+            vim_info: "{vim_info: null}"
+            vim_interface_id: 54ed68e2-9802-4dfe-b68a-280b3fc6e02d
+        ip_address: 10.205.1.46
+        name: mgmtVM
+        related: d0b91293-a91d-4f08-b15f-0bf841216dfe
+        status: ACTIVE
+        uuid: d0b91293-a91d-4f08-b15f-0bf841216dfe
+        vdu_osm_id: mgmtVM
+        vim_info: "{vim_info: null}"
+        vim_name: ALF-1-mgmtVM-1
+        vim_vm_id: c2538499-4c30-41c0-acd5-80cb92f48061
+    -   created_at: '2019-08-26T12:50:38'
+        error_msg: null
+        interfaces:
+        -   external_name: null
+            instance_net_id: 277fed09-3220-4bfd-9052-b96b21a32daf
+            internal_name: dataVM-eth0
+            ip_address: 192.168.54.3
+            mac_address: fa:16:3e:d9:7a:5d
+            sdn_port_id: null
+            type: bridge
+            vim_info: "{vim_info: null}"
+            vim_interface_id: 1637f350-8840-4241-8ed0-4616bdcecfcf
+        -   external_name: vnf-data
+            instance_net_id: 509d576c-120f-493a-99a1-5fea99dfe041
+            internal_name: dataVM-xe0
+            ip_address: 192.168.24.3
+            mac_address: fa:16:3e:d1:6c:0d
+            sdn_port_id: null
+            type: bridge
+            vim_info: "{vim_info: null}"
+            vim_interface_id: 54c73e83-7059-41fe-83a9-4c4ae997b481
+        name: dataVM
+        related: 5c08253d-8a35-474f-b0d3-c5297d174c13
+        status: ACTIVE
+        uuid: 5c08253d-8a35-474f-b0d3-c5297d174c13
+        vdu_osm_id: dataVM
+        vim_info: "{vim_info: null}"
+        vim_name: ALF-1-dataVM-1
+        vim_vm_id: 87973c3f-365d-4227-95c2-7a8abc74349c
+    -   created_at: '2019-08-26T13:40:54'
+        error_msg: null
+        interfaces:
+        -   external_name: null
+            instance_net_id: 277fed09-3220-4bfd-9052-b96b21a32daf
+            internal_name: dataVM-eth0
+            ip_address: 192.168.54.5
+            mac_address: fa:16:3e:e4:17:45
+            sdn_port_id: null
+            type: bridge
+            vim_info: "{vim_info: null}"
+            vim_interface_id: 7e246e40-8710-4c33-9c95-78fc3c02bc5b
+        -   external_name: vnf-data
+            instance_net_id: 509d576c-120f-493a-99a1-5fea99dfe041
+            internal_name: dataVM-xe0
+            ip_address: 192.168.24.5
+            mac_address: fa:16:3e:29:6f:a6
+            sdn_port_id: null
+            type: bridge
+            vim_info: "{vim_info: null}"
+            vim_interface_id: ce81af7a-9adf-494b-950e-6581fd04ecc4
+        name: dataVM
+        related: 1ae5a0a2-c15a-49a4-a77c-2991d97f6dbe
+        status: ACTIVE
+        uuid: 1ae5a0a2-c15a-49a4-a77c-2991d97f6dbe
+        vdu_osm_id: dataVM
+        vim_info: "{vim_info: null}"
+        vim_name: ALF-1-dataVM-2
+        vim_vm_id: 4916533e-36c6-4861-9fe3-366a8fb0a5f8
+    vnf_id: 1ab2a418-9fe3-4358-bf17-411e5155535f
+    vnf_name: hackfest3charmed-vnf.1
+    vnfd_osm_id: f48163a6-c807-47bc-9682-f72caef5af85.0.1
+-   datacenter_id: dc51ce6c-c7f2-11e9-b9c0-02420aff0004
+    datacenter_tenant_id: dc5c67fa-c7f2-11e9-b9c0-02420aff0004
+    ip_address: 10.205.1.47
+    member_vnf_index: '2'
+    mgmt_access: '{interface_id: 538604c3-5c5e-41eb-8f84-c0239c7fabcd, required: ''False'',
+        vm_id: dd04d792-05c9-4ecc-bf28-f77384d00311}
+
+        '
+    sce_vnf_id: c4f3607a-08ff-4f75-893c-fce507e2f240
+    uuid: 00020403-e80f-4ef2-bb7e-b29669643035
+    vms:
+    -   created_at: '2019-08-26T12:50:38'
+        error_msg: null
+        interfaces:
+        -   external_name: vnf-mgmt
+            instance_net_id: c6bac394-fa27-4c43-bb34-42f621a9d343
+            internal_name: mgmtVM-eth0
+            ip_address: 10.205.1.47
+            mac_address: fa:16:3e:cb:9f:c7
+            sdn_port_id: null
+            type: mgmt
+            vim_info: "{vim_info: null}"
+            vim_interface_id: dcd6d2de-3c68-481c-883e-e9d38c671dc4
+        -   external_name: null
+            instance_net_id: 92534d1a-e697-4372-a84d-aa0aa643b68a
+            internal_name: mgmtVM-eth1
+            ip_address: 192.168.231.1
+            mac_address: fa:16:3e:1a:89:24
+            sdn_port_id: null
+            type: bridge
+            vim_info: "{vim_info: null}"
+            vim_interface_id: 50e538e3-aba0-4652-93bb-20487f3f28e1
+        ip_address: 10.205.1.47
+        name: mgmtVM
+        related: 4543ab5d-578c-427c-9df2-affd17e21b66
+        status: ACTIVE
+        uuid: 4543ab5d-578c-427c-9df2-affd17e21b66
+        vdu_osm_id: mgmtVM
+        vim_info: "{vim_info: null}"
+        vim_name: ALF-2-mgmtVM-1
+        vim_vm_id: 248077b2-e3b8-4a37-8b72-575abb8ed912
+    -   created_at: '2019-08-26T12:50:38'
+        error_msg: null
+        interfaces:
+        -   external_name: null
+            instance_net_id: 92534d1a-e697-4372-a84d-aa0aa643b68a
+            internal_name: dataVM-eth0
+            ip_address: 192.168.231.3
+            mac_address: fa:16:3e:7e:ba:8c
+            sdn_port_id: null
+            type: bridge
+            vim_info: "{vim_info: null}"
+            vim_interface_id: 15274862-14ea-4527-b405-101cae8bc1a0
+        -   external_name: vnf-data
+            instance_net_id: 509d576c-120f-493a-99a1-5fea99dfe041
+            internal_name: dataVM-xe0
+            ip_address: 192.168.24.4
+            mac_address: fa:16:3e:d2:e1:f5
+            sdn_port_id: null
+            type: bridge
+            vim_info: "{vim_info: null}"
+            vim_interface_id: 253ebe4e-38d5-46be-8777-dbb57510a2ec
+        name: dataVM
+        related: 6f03f16b-295a-47a1-9a69-2d069d574a33
+        status: ACTIVE
+        uuid: 6f03f16b-295a-47a1-9a69-2d069d574a33
+        vdu_osm_id: dataVM
+        vim_info: "{vim_info: null}"
+        vim_name: ALF-2-dataVM-1
+        vim_vm_id: a4ce4372-e0ad-4ae3-8f9f-1c969f32e77b
+    vnf_id: 0de348e3-c201-4f6a-91cc-7f957e2d5504
+    vnf_name: hackfest3charmed-vnf.2
+    vnfd_osm_id: f48163a6-c807-47bc-9682-f72caef5af85.1.2
+"""
+db_vim_accounts_text = """
+---
+-   _admin:
+        created: 1566818150.3024442
+        current_operation: 0
+        deployed:
+            RO: dc51ce6c-c7f2-11e9-b9c0-02420aff0004
+            RO-account: dc5c67fa-c7f2-11e9-b9c0-02420aff0004
+        detailed-status: Done
+        modified: 1566818150.3024442
+        operationalState: ENABLED
+        operations:
+        -   detailed-status: Done
+            lcmOperationType: create
+            operationParams: null
+            operationState: COMPLETED
+            startTime: 1566818150.3025382
+            statusEnteredTime: 1566818150.3025382
+            worker: 86434c2948e2
+        projects_read:
+        - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
+        projects_write:
+        - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
+    _id: ea958ba5-4e58-4405-bf42-6e3be15d4c3a
+    description: Openstack site 2, based on Mirantis, also called DSS9000-1, with
+        tenant tid
+    name: ost2-mrt-tid
+    schema_version: '1.1'
+    vim_password: 5g0yGX86qIhprX86YTMcpg==
+    vim_tenant_name: osm
+    vim_type: openstack
+    vim_url: http://10.95.87.162:5000/v2.0
+    vim_user: osm
+"""
+db_vnfds_text = """
+---
+-   _admin:
+        created: 1566823352.7154346
+        modified: 1566823353.9295402
+        onboardingState: ONBOARDED
+        operationalState: ENABLED
+        projects_read:
+        - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
+        projects_write:
+        - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
+        storage:
+            descriptor: hackfest_3charmed_vnfd/hackfest_3charmed_vnfd.yaml
+            folder: 7637bcf8-cf14-42dc-ad70-c66fcf1e6e77
+            fs: local
+            path: /app/storage/
+            pkg-dir: hackfest_3charmed_vnfd
+            zipfile: package.tar.gz
+        type: vnfd
+        usageState: NOT_IN_USE
+        userDefinedData: {}
+    _id: 7637bcf8-cf14-42dc-ad70-c66fcf1e6e77
+    connection-point:
+    -   id: vnf-mgmt
+        name: vnf-mgmt
+        short-name: vnf-mgmt
+        type: VPORT
+    -   id: vnf-data
+        name: vnf-data
+        short-name: vnf-data
+        type: VPORT
+    description: A VNF consisting of 2 VDUs connected to an internal VL, and one VDU
+        with cloud-init
+    id: hackfest3charmed-vnf
+    internal-vld:
+    -   id: internal
+        internal-connection-point:
+        -   id-ref: mgmtVM-internal
+        -   id-ref: dataVM-internal
+        name: internal
+        short-name: internal
+        type: ELAN
+    logo: osm.png
+    mgmt-interface:
+        cp: vnf-mgmt
+    monitoring-param:
+    -   aggregation-type: AVERAGE
+        id: monitor1
+        name: monitor1
+        vdu-monitoring-param:
+            vdu-monitoring-param-ref: dataVM_cpu_util
+            vdu-ref: dataVM
+    name: hackfest3charmed-vnf
+    scaling-group-descriptor:
+    -   max-instance-count: 10
+        name: scale_dataVM
+        scaling-config-action:
+        -   trigger: post-scale-out
+            vnf-config-primitive-name-ref: touch
+        -   trigger: pre-scale-in
+            vnf-config-primitive-name-ref: touch
+        scaling-policy:
+        -   cooldown-time: 60
+            name: auto_cpu_util_above_threshold
+            scaling-criteria:
+            -   name: cpu_util_above_threshold
+                scale-in-relational-operation: LE
+                scale-in-threshold: '15.0000000000'
+                scale-out-relational-operation: GE
+                scale-out-threshold: '60.0000000000'
+                vnf-monitoring-param-ref: monitor1
+            scaling-type: automatic
+            threshold-time: 0
+        vdu:
+        -   count: 1
+            vdu-id-ref: dataVM
+    short-name: hackfest3charmed-vnf
+    vdu:
+    -   count: '1'
+        cloud-init-file: cloud-config.txt
+        id: mgmtVM
+        image: hackfest3-mgmt
+        interface:
+        -   external-connection-point-ref: vnf-mgmt
+            name: mgmtVM-eth0
+            position: 1
+            type: EXTERNAL
+            virtual-interface:
+                type: VIRTIO
+        -   internal-connection-point-ref: mgmtVM-internal
+            name: mgmtVM-eth1
+            position: 2
+            type: INTERNAL
+            virtual-interface:
+                type: VIRTIO
+        internal-connection-point:
+        -   id: mgmtVM-internal
+            name: mgmtVM-internal
+            short-name: mgmtVM-internal
+            type: VPORT
+        name: mgmtVM
+        vm-flavor:
+            memory-mb: '1024'
+            storage-gb: '10'
+            vcpu-count: 1
+    -   count: '1'
+        id: dataVM
+        image: hackfest3-mgmt
+        interface:
+        -   internal-connection-point-ref: dataVM-internal
+            name: dataVM-eth0
+            position: 1
+            type: INTERNAL
+            virtual-interface:
+                type: VIRTIO
+        -   external-connection-point-ref: vnf-data
+            name: dataVM-xe0
+            position: 2
+            type: EXTERNAL
+            virtual-interface:
+                type: VIRTIO
+        internal-connection-point:
+        -   id: dataVM-internal
+            name: dataVM-internal
+            short-name: dataVM-internal
+            type: VPORT
+        monitoring-param:
+        -   id: dataVM_cpu_util
+            nfvi-metric: cpu_utilization
+        name: dataVM
+        vm-flavor:
+            memory-mb: '1024'
+            storage-gb: '10'
+            vcpu-count: 1
+    version: '1.0'
+    vnf-configuration:
+        config-access:
+            ssh-access:
+                required: True
+                default-user: ubuntu
+        config-primitive:
+        -   name: touch
+            parameter:
+            -   data-type: STRING
+                default-value: <touch_filename2>
+                name: filename
+        initial-config-primitive:
+        -   name: config
+            parameter:
+            -   name: ssh-hostname
+                value: <rw_mgmt_ip>
+            -   name: ssh-username
+                value: ubuntu
+            -   name: ssh-password
+                value: osm4u
+            seq: '1'
+        -   name: touch
+            parameter:
+            -   name: filename
+                value: <touch_filename>
+            seq: '2'
+        juju:
+            charm: simple
+"""
+db_vnfrs_text = """
+---
+-   _admin:
+        created: 1566823354.3668208
+        modified: 1566823354.3668208
+        nsState: NOT_INSTANTIATED
+        projects_read:
+        - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
+        projects_write:
+        - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
+    _id: 88d90b0c-faff-4b9f-bccd-017f33985984
+    additionalParamsForVnf:
+        touch_filename: /home/ubuntu/first-touch-1
+        touch_filename2: /home/ubuntu/second-touch-1
+    connection-point:
+    -   connection-point-id: vnf-mgmt
+        id: vnf-mgmt
+        name: vnf-mgmt
+    -   connection-point-id: vnf-data
+        id: vnf-data
+        name: vnf-data
+    created-time: 1566823354.36234
+    id: 88d90b0c-faff-4b9f-bccd-017f33985984
+    ip-address: 10.205.1.46
+    member-vnf-index-ref: '1'
+    nsr-id-ref: f48163a6-c807-47bc-9682-f72caef5af85
+    vdur:
+    -   _id: f0e7d7ce-2443-4dcb-ad0b-5ab9f3b13d37
+        count-index: 0
+        interfaces:
+        -   ip-address: 10.205.1.46
+            mac-address: fa:16:3e:b4:3e:b1
+            mgmt-vnf: true
+            name: mgmtVM-eth0
+            ns-vld-id: mgmt
+        -   ip-address: 192.168.54.2
+            mac-address: fa:16:3e:6e:7e:78
+            name: mgmtVM-eth1
+            vnf-vld-id: internal
+        internal-connection-point:
+        -   connection-point-id: mgmtVM-internal
+            id: mgmtVM-internal
+            name: mgmtVM-internal
+        ip-address: 10.205.1.46
+        name: ALF-1-mgmtVM-1
+        status: ACTIVE
+        status-detailed: null
+        vdu-id-ref: mgmtVM
+        vim-id: c2538499-4c30-41c0-acd5-80cb92f48061
+    -   _id: ab453219-2d9a-45c2-864d-2c0788385028
+        count-index: 0
+        interfaces:
+        -   ip-address: 192.168.54.3
+            mac-address: fa:16:3e:d9:7a:5d
+            name: dataVM-eth0
+            vnf-vld-id: internal
+        -   ip-address: 192.168.24.3
+            mac-address: fa:16:3e:d1:6c:0d
+            name: dataVM-xe0
+            ns-vld-id: datanet
+        internal-connection-point:
+        -   connection-point-id: dataVM-internal
+            id: dataVM-internal
+            name: dataVM-internal
+        ip-address: null
+        name: ALF-1-dataVM-1
+        status: ACTIVE
+        status-detailed: null
+        vdu-id-ref: dataVM
+        vim-id: 87973c3f-365d-4227-95c2-7a8abc74349c
+    vim-account-id: ea958ba5-4e58-4405-bf42-6e3be15d4c3a
+    vld:
+    -   id: internal
+        name: ALF-internal
+        status: ACTIVE
+        status-detailed: null
+        vim-id: ff181e6d-2597-4244-b40b-bb0174bdfeb6
+    vnfd-id: 7637bcf8-cf14-42dc-ad70-c66fcf1e6e77
+    vnfd-ref: hackfest3charmed-vnf
+-   _admin:
+        created: 1566823354.3703845
+        modified: 1566823354.3703845
+        nsState: NOT_INSTANTIATED
+        projects_read:
+        - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
+        projects_write:
+        - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
+    _id: 1ca3bb1a-b29b-49fe-bed6-5f3076d77434
+    additionalParamsForVnf:
+        touch_filename: /home/ubuntu/first-touch-2
+        touch_filename2: /home/ubuntu/second-touch-2
+    connection-point:
+    -   connection-point-id: vnf-mgmt
+        id: vnf-mgmt
+        name: vnf-mgmt
+    -   connection-point-id: vnf-data
+        id: vnf-data
+        name: vnf-data
+    created-time: 1566823354.36234
+    id: 1ca3bb1a-b29b-49fe-bed6-5f3076d77434
+    ip-address: 10.205.1.47
+    member-vnf-index-ref: '2'
+    nsr-id-ref: f48163a6-c807-47bc-9682-f72caef5af85
+    vdur:
+    -   _id: 190b4a2c-4f85-4cfe-9406-4cef7ffb1e67
+        count-index: 0
+        interfaces:
+        -   ip-address: 10.205.1.47
+            mac-address: fa:16:3e:cb:9f:c7
+            mgmt-vnf: true
+            name: mgmtVM-eth0
+            ns-vld-id: mgmt
+        -   ip-address: 192.168.231.1
+            mac-address: fa:16:3e:1a:89:24
+            name: mgmtVM-eth1
+            vnf-vld-id: internal
+        internal-connection-point:
+        -   connection-point-id: mgmtVM-internal
+            id: mgmtVM-internal
+            name: mgmtVM-internal
+        ip-address: 10.205.1.47
+        name: ALF-2-mgmtVM-1
+        status: ACTIVE
+        status-detailed: null
+        vdu-id-ref: mgmtVM
+        vim-id: 248077b2-e3b8-4a37-8b72-575abb8ed912
+    -   _id: 889b874d-e1c3-4e75-aa45-53a9b0ddabd9
+        count-index: 0
+        interfaces:
+        -   ip-address: 192.168.231.3
+            mac-address: fa:16:3e:7e:ba:8c
+            name: dataVM-eth0
+            vnf-vld-id: internal
+        -   ip-address: 192.168.24.4
+            mac-address: fa:16:3e:d2:e1:f5
+            name: dataVM-xe0
+            ns-vld-id: datanet
+        internal-connection-point:
+        -   connection-point-id: dataVM-internal
+            id: dataVM-internal
+            name: dataVM-internal
+        ip-address: null
+        name: ALF-2-dataVM-1
+        status: ACTIVE
+        status-detailed: null
+        vdu-id-ref: dataVM
+        vim-id: a4ce4372-e0ad-4ae3-8f9f-1c969f32e77b
+    vim-account-id: ea958ba5-4e58-4405-bf42-6e3be15d4c3a
+    vld:
+    -   id: internal
+        name: ALF-internal
+        status: ACTIVE
+        status-detailed: null
+        vim-id: ff181e6d-2597-4244-b40b-bb0174bdfeb6
+    vnfd-id: 7637bcf8-cf14-42dc-ad70-c66fcf1e6e77
+    vnfd-ref: hackfest3charmed-vnf
+"""
+db_nslcmops_scale_text = """
+---
+-   _admin:
+      created: 1565250912.2643092
+      modified: 1570026174.83263
+      projects_read:
+      - d3581c99-31e3-45f9-b45c-49a290faedbc
+      current_operation: '5'
+      deployed:
+        RO: d9aea288-b9b1-11e9-b19e-02420aff0006
+        RO-account: d9bb2f1c-b9b1-11e9-b19e-02420aff0006
+      detailed-status: Done
+      modified: 1565250912.2643092
+      operationalState: ENABLED
+      operations:
+      - member_vnf_index: '1'
+        primitive: touch
+        primitive_params: /home/ubuntu/last-touch-1
+        operationState: COMPLETED
+        detailed-status: Done
+      - member_vnf_index: '1'
+        primitive: touch
+        primitive_params: /home/ubuntu/last-touch-2
+        operationState: COMPLETED
+        detailed-status: Done
+      - member_vnf_index: '2'
+        primitive: touch
+        primitive_params: /home/ubuntu/last-touch-3
+        operationState: COMPLETED
+        detailed-status: Done
+      projects_read:
+      - b2d2ce4b-a1a0-4c01-847e-048632c43b40
+      projects_write:
+      - b2d2ce4b-a1a0-4c01-847e-048632c43b40
+      worker: c4055a07655b
+      deploy:
+        RO: ACTION-1570026232.061742
+    _id: 053967e8-7c1c-400f-ae82-3d45b291374b
+    lcmOperationType: scale
+    nsInstanceId: 90d9ebb7-2b5a-4b7c-bc34-a51fd7ef7b7b
+    statusEnteredTime: 1570026243.09784
+    startTime: 1570026174.8326
+    operationParams:
+      lcmOperationType: scale
+      nsInstanceId: 90d9ebb7-2b5a-4b7c-bc34-a51fd7ef7b7b
+      scaleVnfData:
+        scaleByStepData:
+          member-vnf-index: '1'
+          scaling-group-descriptor: scale_scaling_group
+        scaleVnfType: SCALE_IN
+      scaleType: SCALE_VNF
+    isAutomaticInvocation: false
+    isCancelPending: false
+    id: 053967e8-7c1c-400f-ae82-3d45b291374b
+    links:
+      nsInstance: "/osm/nslcm/v1/ns_instances/90d9ebb7-2b5a-4b7c-bc34-a51fd7ef7b7b"
+      self: "/osm/nslcm/v1/ns_lcm_op_occs/053967e8-7c1c-400f-ae82-3d45b291374b"
+    operationState: COMPLETED
+    detailed-status: done
+"""
index 0e842cb..219724c 100644 (file)
@@ -29,6 +29,8 @@ from osm_lcm.lcm_utils import TaskRegistry
 from n2vc.vnf import N2VC
 from uuid import uuid4
 
+from osm_lcm.tests import test_db_descriptors as descriptors
+
 __author__ = "Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>"
 
 """ Perform unittests using asynctest of osm_lcm.ns module
@@ -64,869 +66,6 @@ ro_config = {
     "loglevel": "DEBUG",
 }
 
-db_vim_accounts_text = """
----
--   _admin:
-        created: 1566818150.3024442
-        current_operation: 0
-        deployed:
-            RO: dc51ce6c-c7f2-11e9-b9c0-02420aff0004
-            RO-account: dc5c67fa-c7f2-11e9-b9c0-02420aff0004
-        detailed-status: Done
-        modified: 1566818150.3024442
-        operationalState: ENABLED
-        operations:
-        -   detailed-status: Done
-            lcmOperationType: create
-            operationParams: null
-            operationState: COMPLETED
-            startTime: 1566818150.3025382
-            statusEnteredTime: 1566818150.3025382
-            worker: 86434c2948e2
-        projects_read:
-        - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
-        projects_write:
-        - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
-    _id: ea958ba5-4e58-4405-bf42-6e3be15d4c3a
-    description: Openstack site 2, based on Mirantis, also called DSS9000-1, with
-        tenant tid
-    name: ost2-mrt-tid
-    schema_version: '1.1'
-    vim_password: 5g0yGX86qIhprX86YTMcpg==
-    vim_tenant_name: osm
-    vim_type: openstack
-    vim_url: http://10.95.87.162:5000/v2.0
-    vim_user: osm
-"""
-
-db_vnfds_text = """
----
--   _admin:
-        created: 1566823352.7154346
-        modified: 1566823353.9295402
-        onboardingState: ONBOARDED
-        operationalState: ENABLED
-        projects_read:
-        - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
-        projects_write:
-        - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
-        storage:
-            descriptor: hackfest_3charmed_vnfd/hackfest_3charmed_vnfd.yaml
-            folder: 7637bcf8-cf14-42dc-ad70-c66fcf1e6e77
-            fs: local
-            path: /app/storage/
-            pkg-dir: hackfest_3charmed_vnfd
-            zipfile: package.tar.gz
-        type: vnfd
-        usageState: NOT_IN_USE
-        userDefinedData: {}
-    _id: 7637bcf8-cf14-42dc-ad70-c66fcf1e6e77
-    connection-point:
-    -   id: vnf-mgmt
-        name: vnf-mgmt
-        short-name: vnf-mgmt
-        type: VPORT
-    -   id: vnf-data
-        name: vnf-data
-        short-name: vnf-data
-        type: VPORT
-    description: A VNF consisting of 2 VDUs connected to an internal VL, and one VDU
-        with cloud-init
-    id: hackfest3charmed-vnf
-    internal-vld:
-    -   id: internal
-        internal-connection-point:
-        -   id-ref: mgmtVM-internal
-        -   id-ref: dataVM-internal
-        name: internal
-        short-name: internal
-        type: ELAN
-    logo: osm.png
-    mgmt-interface:
-        cp: vnf-mgmt
-    monitoring-param:
-    -   aggregation-type: AVERAGE
-        id: monitor1
-        name: monitor1
-        vdu-monitoring-param:
-            vdu-monitoring-param-ref: dataVM_cpu_util
-            vdu-ref: dataVM
-    name: hackfest3charmed-vnf
-    scaling-group-descriptor:
-    -   max-instance-count: 10
-        name: scale_dataVM
-        scaling-config-action:
-        -   trigger: post-scale-out
-            vnf-config-primitive-name-ref: touch
-        -   trigger: pre-scale-in
-            vnf-config-primitive-name-ref: touch
-        scaling-policy:
-        -   cooldown-time: 60
-            name: auto_cpu_util_above_threshold
-            scaling-criteria:
-            -   name: cpu_util_above_threshold
-                scale-in-relational-operation: LE
-                scale-in-threshold: '15.0000000000'
-                scale-out-relational-operation: GE
-                scale-out-threshold: '60.0000000000'
-                vnf-monitoring-param-ref: monitor1
-            scaling-type: automatic
-            threshold-time: 0
-        vdu:
-        -   count: 1
-            vdu-id-ref: dataVM
-    short-name: hackfest3charmed-vnf
-    vdu:
-    -   count: '1'
-        cloud-init-file: cloud-config.txt
-        id: mgmtVM
-        image: hackfest3-mgmt
-        interface:
-        -   external-connection-point-ref: vnf-mgmt
-            name: mgmtVM-eth0
-            position: 1
-            type: EXTERNAL
-            virtual-interface:
-                type: VIRTIO
-        -   internal-connection-point-ref: mgmtVM-internal
-            name: mgmtVM-eth1
-            position: 2
-            type: INTERNAL
-            virtual-interface:
-                type: VIRTIO
-        internal-connection-point:
-        -   id: mgmtVM-internal
-            name: mgmtVM-internal
-            short-name: mgmtVM-internal
-            type: VPORT
-        name: mgmtVM
-        vm-flavor:
-            memory-mb: '1024'
-            storage-gb: '10'
-            vcpu-count: 1
-    -   count: '1'
-        id: dataVM
-        image: hackfest3-mgmt
-        interface:
-        -   internal-connection-point-ref: dataVM-internal
-            name: dataVM-eth0
-            position: 1
-            type: INTERNAL
-            virtual-interface:
-                type: VIRTIO
-        -   external-connection-point-ref: vnf-data
-            name: dataVM-xe0
-            position: 2
-            type: EXTERNAL
-            virtual-interface:
-                type: VIRTIO
-        internal-connection-point:
-        -   id: dataVM-internal
-            name: dataVM-internal
-            short-name: dataVM-internal
-            type: VPORT
-        monitoring-param:
-        -   id: dataVM_cpu_util
-            nfvi-metric: cpu_utilization
-        name: dataVM
-        vm-flavor:
-            memory-mb: '1024'
-            storage-gb: '10'
-            vcpu-count: 1
-    version: '1.0'
-    vnf-configuration:
-        config-access:
-            ssh-access:
-                required: True
-                default-user: ubuntu
-        config-primitive:
-        -   name: touch
-            parameter:
-            -   data-type: STRING
-                default-value: <touch_filename2>
-                name: filename
-        initial-config-primitive:
-        -   name: config
-            parameter:
-            -   name: ssh-hostname
-                value: <rw_mgmt_ip>
-            -   name: ssh-username
-                value: ubuntu
-            -   name: ssh-password
-                value: osm4u
-            seq: '1'
-        -   name: touch
-            parameter:
-            -   name: filename
-                value: <touch_filename>
-            seq: '2'
-        juju:
-            charm: simple
-"""
-
-db_nsds_text = """
----
--   _admin:
-        created: 1566823353.971486
-        modified: 1566823353.971486
-        onboardingState: ONBOARDED
-        operationalState: ENABLED
-        projects_read:
-        - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
-        projects_write:
-        - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
-        storage:
-            descriptor: hackfest_3charmed_nsd/hackfest_3charmed_nsd.yaml
-            folder: 8c2f8b95-bb1b-47ee-8001-36dc090678da
-            fs: local
-            path: /app/storage/
-            pkg-dir: hackfest_3charmed_nsd
-            zipfile: package.tar.gz
-        usageState: NOT_IN_USE
-        userDefinedData: {}
-    _id: 8c2f8b95-bb1b-47ee-8001-36dc090678da
-    constituent-vnfd:
-    -   member-vnf-index: '1'
-        vnfd-id-ref: hackfest3charmed-vnf
-    -   member-vnf-index: '2'
-        vnfd-id-ref: hackfest3charmed-vnf
-    description: NS with 2 VNFs hackfest3charmed-vnf connected by datanet and mgmtnet
-        VLs
-    id: hackfest3charmed-ns
-    logo: osm.png
-    name: hackfest3charmed-ns
-    short-name: hackfest3charmed-ns
-    version: '1.0'
-    vld:
-    -   id: mgmt
-        mgmt-network: true
-        name: mgmt
-        short-name: mgmt
-        type: ELAN
-        vim-network-name: mgmt
-        vnfd-connection-point-ref:
-        -   member-vnf-index-ref: '1'
-            vnfd-connection-point-ref: vnf-mgmt
-            vnfd-id-ref: hackfest3charmed-vnf
-        -   member-vnf-index-ref: '2'
-            vnfd-connection-point-ref: vnf-mgmt
-            vnfd-id-ref: hackfest3charmed-vnf
-    -   id: datanet
-        name: datanet
-        short-name: datanet
-        type: ELAN
-        vnfd-connection-point-ref:
-        -   member-vnf-index-ref: '1'
-            vnfd-connection-point-ref: vnf-data
-            vnfd-id-ref: hackfest3charmed-vnf
-        -   member-vnf-index-ref: '2'
-            vnfd-connection-point-ref: vnf-data
-            vnfd-id-ref: hackfest3charmed-vnf
-"""
-
-db_nsrs_text = """
----
--   _admin:
-        created: 1566823354.3716335
-        deployed:
-            RO:
-                nsd_id: 876573b5-968d-40b9-b52b-91bf5c5844f7
-                nsr_id: c9fe9908-3180-430d-b633-fca2f68db008
-                nsr_status: ACTIVE
-                vnfd:
-                -   id: 1ab2a418-9fe3-4358-bf17-411e5155535f
-                    member-vnf-index: '1'
-                -   id: 0de348e3-c201-4f6a-91cc-7f957e2d5504
-                    member-vnf-index: '2'
-            VCA:
-            -   application: alf-b-aa
-                detailed-status: Ready!
-                member-vnf-index: '1'
-                model: f48163a6-c807-47bc-9682-f72caef5af85
-                operational-status: active
-                primitive_id: null
-                ssh-public-key: ssh-rsa pub-key root@juju-145d3e-0
-                step: ssh-public-key-obtained
-                vdu_count_index: null
-                vdu_id: null
-                vdu_name: null
-                vnfd_id: hackfest3charmed-vnf
-            -   application: alf-c-ab
-                detailed-status: Ready!
-                member-vnf-index: '2'
-                model: f48163a6-c807-47bc-9682-f72caef5af85
-                operational-status: active
-                primitive_id: null
-                ssh-public-key: ssh-rsa pub-key root@juju-145d3e-0
-                step: ssh-public-key-obtained
-                vdu_count_index: null
-                vdu_id: null
-                vdu_name: null
-                vnfd_id: hackfest3charmed-vnf
-            VCA-model-name: f48163a6-c807-47bc-9682-f72caef5af85
-        modified: 1566823354.3716335
-        nsState: INSTANTIATED
-        nslcmop: null
-        projects_read:
-        - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
-        projects_write:
-        - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
-    _id: f48163a6-c807-47bc-9682-f72caef5af85
-    additionalParamsForNs: null
-    admin-status: ENABLED
-    config-status: init
-    constituent-vnfr-ref:
-    - 88d90b0c-faff-4b9f-bccd-017f33985984
-    - 1ca3bb1a-b29b-49fe-bed6-5f3076d77434
-    create-time: 1566823354.36234
-    datacenter: ea958ba5-4e58-4405-bf42-6e3be15d4c3a
-    description: default description
-    detailed-status: 'ERROR executing proxy charm initial primitives for member_vnf_index=1
-        vdu_id=None: charm error executing primitive verify-ssh-credentials for member_vnf_index=1
-        vdu_id=None: ''timeout after 600 seconds'''
-    id: f48163a6-c807-47bc-9682-f72caef5af85
-    instantiate_params:
-        nsDescription: default description
-        nsName: ALF
-        nsdId: 8c2f8b95-bb1b-47ee-8001-36dc090678da
-        vimAccountId: ea958ba5-4e58-4405-bf42-6e3be15d4c3a
-    name: ALF
-    name-ref: ALF
-    ns-instance-config-ref: f48163a6-c807-47bc-9682-f72caef5af85
-    nsd:
-        _admin:
-            created: 1566823353.971486
-            modified: 1566823353.971486
-            onboardingState: ONBOARDED
-            operationalState: ENABLED
-            projects_read:
-            - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
-            projects_write:
-            - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
-            storage:
-                descriptor: hackfest_3charmed_nsd/hackfest_3charmed_nsd.yaml
-                folder: 8c2f8b95-bb1b-47ee-8001-36dc090678da
-                fs: local
-                path: /app/storage/
-                pkg-dir: hackfest_3charmed_nsd
-                zipfile: package.tar.gz
-            usageState: NOT_IN_USE
-            userDefinedData: {}
-        _id: 8c2f8b95-bb1b-47ee-8001-36dc090678da
-        constituent-vnfd:
-        -   member-vnf-index: '1'
-            vnfd-id-ref: hackfest3charmed-vnf
-        -   member-vnf-index: '2'
-            vnfd-id-ref: hackfest3charmed-vnf
-        description: NS with 2 VNFs hackfest3charmed-vnf connected by datanet and
-            mgmtnet VLs
-        id: hackfest3charmed-ns
-        logo: osm.png
-        name: hackfest3charmed-ns
-        short-name: hackfest3charmed-ns
-        version: '1.0'
-        vld:
-        -   id: mgmt
-            mgmt-network: true
-            name: mgmt
-            short-name: mgmt
-            type: ELAN
-            vim-network-name: mgmt
-            vnfd-connection-point-ref:
-            -   member-vnf-index-ref: '1'
-                vnfd-connection-point-ref: vnf-mgmt
-                vnfd-id-ref: hackfest3charmed-vnf
-            -   member-vnf-index-ref: '2'
-                vnfd-connection-point-ref: vnf-mgmt
-                vnfd-id-ref: hackfest3charmed-vnf
-        -   id: datanet
-            name: datanet
-            short-name: datanet
-            type: ELAN
-            vnfd-connection-point-ref:
-            -   member-vnf-index-ref: '1'
-                vnfd-connection-point-ref: vnf-data
-                vnfd-id-ref: hackfest3charmed-vnf
-            -   member-vnf-index-ref: '2'
-                vnfd-connection-point-ref: vnf-data
-                vnfd-id-ref: hackfest3charmed-vnf
-    nsd-id: 8c2f8b95-bb1b-47ee-8001-36dc090678da
-    nsd-name-ref: hackfest3charmed-ns
-    nsd-ref: hackfest3charmed-ns
-    operational-events: []
-    operational-status: failed
-    orchestration-progress: {}
-    resource-orchestrator: osmopenmano
-    short-name: ALF
-    ssh-authorized-key: null
-    vld:
-    -   id: mgmt
-        name: null
-        status: ACTIVE
-        status-detailed: null
-        vim-id: f99ae780-0e2f-4985-af41-574eae6919c0
-        vim-network-name: mgmt
-    -   id: datanet
-        name: ALF-datanet
-        status: ACTIVE
-        status-detailed: null
-        vim-id: c31364ba-f573-4ab6-bf1a-fed30ede39a8
-    vnfd-id:
-    - 7637bcf8-cf14-42dc-ad70-c66fcf1e6e77
-"""
-
-db_nslcmops_text = """
----
--   _admin:
-        created: 1566823354.4148262
-        modified: 1566823354.4148262
-        projects_read:
-        - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
-        projects_write:
-        - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
-        worker: 86434c2948e2
-    _id: a639fac7-e0bb-4225-8ecb-c1f8efcc125e
-    detailed-status: 'FAILED executing proxy charm initial primitives for member_vnf_index=1
-        vdu_id=None: charm error executing primitive verify-ssh-credentials for member_vnf_index=1
-        vdu_id=None: ''timeout after 600 seconds'''
-    id: a639fac7-e0bb-4225-8ecb-c1f8efcc125e
-    isAutomaticInvocation: false
-    isCancelPending: false
-    lcmOperationType: instantiate
-    links:
-        nsInstance: /osm/nslcm/v1/ns_instances/f48163a6-c807-47bc-9682-f72caef5af85
-        self: /osm/nslcm/v1/ns_lcm_op_occs/a639fac7-e0bb-4225-8ecb-c1f8efcc125e
-    nsInstanceId: f48163a6-c807-47bc-9682-f72caef5af85
-    operationParams:
-        additionalParamsForVnf:
-        -   additionalParams:
-                touch_filename: /home/ubuntu/first-touch-1
-                touch_filename2: /home/ubuntu/second-touch-1
-            member-vnf-index: '1'
-        -   additionalParams:
-                touch_filename: /home/ubuntu/first-touch-2
-                touch_filename2: /home/ubuntu/second-touch-2
-            member-vnf-index: '2'
-        lcmOperationType: instantiate
-        nsDescription: default description
-        nsInstanceId: f48163a6-c807-47bc-9682-f72caef5af85
-        nsName: ALF
-        nsdId: 8c2f8b95-bb1b-47ee-8001-36dc090678da
-        vimAccountId: ea958ba5-4e58-4405-bf42-6e3be15d4c3a
-    operationState: FAILED
-    startTime: 1566823354.414689
-    statusEnteredTime: 1566824534.5112448
-"""
-
-db_vnfrs_text = """
----
--   _admin:
-        created: 1566823354.3668208
-        modified: 1566823354.3668208
-        nsState: NOT_INSTANTIATED
-        projects_read:
-        - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
-        projects_write:
-        - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
-    _id: 88d90b0c-faff-4b9f-bccd-017f33985984
-    additionalParamsForVnf:
-        touch_filename: /home/ubuntu/first-touch-1
-        touch_filename2: /home/ubuntu/second-touch-1
-    connection-point:
-    -   connection-point-id: vnf-mgmt
-        id: vnf-mgmt
-        name: vnf-mgmt
-    -   connection-point-id: vnf-data
-        id: vnf-data
-        name: vnf-data
-    created-time: 1566823354.36234
-    id: 88d90b0c-faff-4b9f-bccd-017f33985984
-    ip-address: 10.205.1.46
-    member-vnf-index-ref: '1'
-    nsr-id-ref: f48163a6-c807-47bc-9682-f72caef5af85
-    vdur:
-    -   _id: f0e7d7ce-2443-4dcb-ad0b-5ab9f3b13d37
-        count-index: 0
-        interfaces:
-        -   ip-address: 10.205.1.46
-            mac-address: fa:16:3e:b4:3e:b1
-            mgmt-vnf: true
-            name: mgmtVM-eth0
-            ns-vld-id: mgmt
-        -   ip-address: 192.168.54.2
-            mac-address: fa:16:3e:6e:7e:78
-            name: mgmtVM-eth1
-            vnf-vld-id: internal
-        internal-connection-point:
-        -   connection-point-id: mgmtVM-internal
-            id: mgmtVM-internal
-            name: mgmtVM-internal
-        ip-address: 10.205.1.46
-        name: ALF-1-mgmtVM-1
-        status: ACTIVE
-        status-detailed: null
-        vdu-id-ref: mgmtVM
-        vim-id: c2538499-4c30-41c0-acd5-80cb92f48061
-    -   _id: ab453219-2d9a-45c2-864d-2c0788385028
-        count-index: 0
-        interfaces:
-        -   ip-address: 192.168.54.3
-            mac-address: fa:16:3e:d9:7a:5d
-            name: dataVM-eth0
-            vnf-vld-id: internal
-        -   ip-address: 192.168.24.3
-            mac-address: fa:16:3e:d1:6c:0d
-            name: dataVM-xe0
-            ns-vld-id: datanet
-        internal-connection-point:
-        -   connection-point-id: dataVM-internal
-            id: dataVM-internal
-            name: dataVM-internal
-        ip-address: null
-        name: ALF-1-dataVM-1
-        status: ACTIVE
-        status-detailed: null
-        vdu-id-ref: dataVM
-        vim-id: 87973c3f-365d-4227-95c2-7a8abc74349c
-    vim-account-id: ea958ba5-4e58-4405-bf42-6e3be15d4c3a
-    vld:
-    -   id: internal
-        name: ALF-internal
-        status: ACTIVE
-        status-detailed: null
-        vim-id: ff181e6d-2597-4244-b40b-bb0174bdfeb6
-    vnfd-id: 7637bcf8-cf14-42dc-ad70-c66fcf1e6e77
-    vnfd-ref: hackfest3charmed-vnf
--   _admin:
-        created: 1566823354.3703845
-        modified: 1566823354.3703845
-        nsState: NOT_INSTANTIATED
-        projects_read:
-        - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
-        projects_write:
-        - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
-    _id: 1ca3bb1a-b29b-49fe-bed6-5f3076d77434
-    additionalParamsForVnf:
-        touch_filename: /home/ubuntu/first-touch-2
-        touch_filename2: /home/ubuntu/second-touch-2
-    connection-point:
-    -   connection-point-id: vnf-mgmt
-        id: vnf-mgmt
-        name: vnf-mgmt
-    -   connection-point-id: vnf-data
-        id: vnf-data
-        name: vnf-data
-    created-time: 1566823354.36234
-    id: 1ca3bb1a-b29b-49fe-bed6-5f3076d77434
-    ip-address: 10.205.1.47
-    member-vnf-index-ref: '2'
-    nsr-id-ref: f48163a6-c807-47bc-9682-f72caef5af85
-    vdur:
-    -   _id: 190b4a2c-4f85-4cfe-9406-4cef7ffb1e67
-        count-index: 0
-        interfaces:
-        -   ip-address: 10.205.1.47
-            mac-address: fa:16:3e:cb:9f:c7
-            mgmt-vnf: true
-            name: mgmtVM-eth0
-            ns-vld-id: mgmt
-        -   ip-address: 192.168.231.1
-            mac-address: fa:16:3e:1a:89:24
-            name: mgmtVM-eth1
-            vnf-vld-id: internal
-        internal-connection-point:
-        -   connection-point-id: mgmtVM-internal
-            id: mgmtVM-internal
-            name: mgmtVM-internal
-        ip-address: 10.205.1.47
-        name: ALF-2-mgmtVM-1
-        status: ACTIVE
-        status-detailed: null
-        vdu-id-ref: mgmtVM
-        vim-id: 248077b2-e3b8-4a37-8b72-575abb8ed912
-    -   _id: 889b874d-e1c3-4e75-aa45-53a9b0ddabd9
-        count-index: 0
-        interfaces:
-        -   ip-address: 192.168.231.3
-            mac-address: fa:16:3e:7e:ba:8c
-            name: dataVM-eth0
-            vnf-vld-id: internal
-        -   ip-address: 192.168.24.4
-            mac-address: fa:16:3e:d2:e1:f5
-            name: dataVM-xe0
-            ns-vld-id: datanet
-        internal-connection-point:
-        -   connection-point-id: dataVM-internal
-            id: dataVM-internal
-            name: dataVM-internal
-        ip-address: null
-        name: ALF-2-dataVM-1
-        status: ACTIVE
-        status-detailed: null
-        vdu-id-ref: dataVM
-        vim-id: a4ce4372-e0ad-4ae3-8f9f-1c969f32e77b
-    vim-account-id: ea958ba5-4e58-4405-bf42-6e3be15d4c3a
-    vld:
-    -   id: internal
-        name: ALF-internal
-        status: ACTIVE
-        status-detailed: null
-        vim-id: ff181e6d-2597-4244-b40b-bb0174bdfeb6
-    vnfd-id: 7637bcf8-cf14-42dc-ad70-c66fcf1e6e77
-    vnfd-ref: hackfest3charmed-vnf
-"""
-
-ro_ns_text = """
-datacenter_tenant_id: dc5c67fa-c7f2-11e9-b9c0-02420aff0004
-description: null
-name: ALF
-nets:
--   created: false
-    datacenter_id: dc51ce6c-c7f2-11e9-b9c0-02420aff0004
-    datacenter_tenant_id: dc5c67fa-c7f2-11e9-b9c0-02420aff0004
-    error_msg: null
-    ns_net_osm_id: mgmt
-    related: c6bac394-fa27-4c43-bb34-42f621a9d343
-    sce_net_id: 8f215bab-c35e-41e6-a035-42bfaa07af9f
-    sdn_net_id: null
-    status: ACTIVE
-    uuid: c6bac394-fa27-4c43-bb34-42f621a9d343
-    vim_info: "{vim_info: null}"
-    vim_name: null
-    vim_net_id: f99ae780-0e2f-4985-af41-574eae6919c0
-    vnf_net_id: null
-    vnf_net_osm_id: null
--   created: true
-    datacenter_id: dc51ce6c-c7f2-11e9-b9c0-02420aff0004
-    datacenter_tenant_id: dc5c67fa-c7f2-11e9-b9c0-02420aff0004
-    error_msg: null
-    ns_net_osm_id: datanet
-    related: 509d576c-120f-493a-99a1-5fea99dfe041
-    sce_net_id: 3d766bbc-33a8-41aa-a986-2f35e8d25c16
-    sdn_net_id: null
-    status: ACTIVE
-    uuid: 509d576c-120f-493a-99a1-5fea99dfe041
-    vim_info: "{vim_info: null}"
-    vim_name: ALF-datanet
-    vim_net_id: c31364ba-f573-4ab6-bf1a-fed30ede39a8
-    vnf_net_id: null
-    vnf_net_osm_id: null
--   created: true
-    datacenter_id: dc51ce6c-c7f2-11e9-b9c0-02420aff0004
-    datacenter_tenant_id: dc5c67fa-c7f2-11e9-b9c0-02420aff0004
-    error_msg: null
-    ns_net_osm_id: null
-    related: 277fed09-3220-4bfd-9052-b96b21a32daf
-    sce_net_id: null
-    sdn_net_id: null
-    status: ACTIVE
-    uuid: 277fed09-3220-4bfd-9052-b96b21a32daf
-    vim_info: "{vim_info: null}"
-    vim_name: ALF-internal
-    vim_net_id: ff181e6d-2597-4244-b40b-bb0174bdfeb6
-    vnf_net_id: 62e62fae-c12b-4ebc-9a9b-30031c6c16fa
-    vnf_net_osm_id: internal
--   created: true
-    datacenter_id: dc51ce6c-c7f2-11e9-b9c0-02420aff0004
-    datacenter_tenant_id: dc5c67fa-c7f2-11e9-b9c0-02420aff0004
-    error_msg: null
-    ns_net_osm_id: null
-    related: 92534d1a-e697-4372-a84d-aa0aa643b68a
-    sce_net_id: null
-    sdn_net_id: null
-    status: ACTIVE
-    uuid: 92534d1a-e697-4372-a84d-aa0aa643b68a
-    vim_info: "{vim_info: null}"
-    vim_name: ALF-internal
-    vim_net_id: 09655387-b639-421a-b5f6-72b26d685fb4
-    vnf_net_id: 13c6c77d-86a5-4914-832c-990d4ec7b54e
-    vnf_net_osm_id: internal
-nsd_osm_id: f48163a6-c807-47bc-9682-f72caef5af85.2.hackfest3charmed-ns
-scenario_id: 876573b5-968d-40b9-b52b-91bf5c5844f7
-scenario_name: hackfest3charmed-ns
-sfis: []
-sfps: []
-sfs: []
-tenant_id: 0ea38bd0-2729-47a9-ae07-c6ce76115eb2
-uuid: c9fe9908-3180-430d-b633-fca2f68db008
-vnfs:
--   datacenter_id: dc51ce6c-c7f2-11e9-b9c0-02420aff0004
-    datacenter_tenant_id: dc5c67fa-c7f2-11e9-b9c0-02420aff0004
-    ip_address: 10.205.1.46
-    member_vnf_index: '1'
-    mgmt_access: '{interface_id: 61549ee3-cd6c-4930-8b90-eaad97fe345b, required: ''False'',
-        vm_id: 6cf4a48f-3b6c-4395-8221-119fa37de24a}
-
-        '
-    sce_vnf_id: 83be04a8-c513-42ba-9908-22728f686d31
-    uuid: 94724042-7576-4fb0-82ec-6a7ab642741c
-    vms:
-    -   created_at: '2019-08-26T12:50:38'
-        error_msg: null
-        interfaces:
-        -   external_name: vnf-mgmt
-            instance_net_id: c6bac394-fa27-4c43-bb34-42f621a9d343
-            internal_name: mgmtVM-eth0
-            ip_address: 10.205.1.46
-            mac_address: fa:16:3e:b4:3e:b1
-            sdn_port_id: null
-            type: mgmt
-            vim_info: "{vim_info: null}"
-            vim_interface_id: 4d3cb8fd-7040-4169-a0ad-2486d2b006a1
-        -   external_name: null
-            instance_net_id: 277fed09-3220-4bfd-9052-b96b21a32daf
-            internal_name: mgmtVM-eth1
-            ip_address: 192.168.54.2
-            mac_address: fa:16:3e:6e:7e:78
-            sdn_port_id: null
-            type: bridge
-            vim_info: "{vim_info: null}"
-            vim_interface_id: 54ed68e2-9802-4dfe-b68a-280b3fc6e02d
-        ip_address: 10.205.1.46
-        name: mgmtVM
-        related: d0b91293-a91d-4f08-b15f-0bf841216dfe
-        status: ACTIVE
-        uuid: d0b91293-a91d-4f08-b15f-0bf841216dfe
-        vdu_osm_id: mgmtVM
-        vim_info: "{vim_info: null}"
-        vim_name: ALF-1-mgmtVM-1
-        vim_vm_id: c2538499-4c30-41c0-acd5-80cb92f48061
-    -   created_at: '2019-08-26T12:50:38'
-        error_msg: null
-        interfaces:
-        -   external_name: null
-            instance_net_id: 277fed09-3220-4bfd-9052-b96b21a32daf
-            internal_name: dataVM-eth0
-            ip_address: 192.168.54.3
-            mac_address: fa:16:3e:d9:7a:5d
-            sdn_port_id: null
-            type: bridge
-            vim_info: "{vim_info: null}"
-            vim_interface_id: 1637f350-8840-4241-8ed0-4616bdcecfcf
-        -   external_name: vnf-data
-            instance_net_id: 509d576c-120f-493a-99a1-5fea99dfe041
-            internal_name: dataVM-xe0
-            ip_address: 192.168.24.3
-            mac_address: fa:16:3e:d1:6c:0d
-            sdn_port_id: null
-            type: bridge
-            vim_info: "{vim_info: null}"
-            vim_interface_id: 54c73e83-7059-41fe-83a9-4c4ae997b481
-        name: dataVM
-        related: 5c08253d-8a35-474f-b0d3-c5297d174c13
-        status: ACTIVE
-        uuid: 5c08253d-8a35-474f-b0d3-c5297d174c13
-        vdu_osm_id: dataVM
-        vim_info: "{vim_info: null}"
-        vim_name: ALF-1-dataVM-1
-        vim_vm_id: 87973c3f-365d-4227-95c2-7a8abc74349c
-    -   created_at: '2019-08-26T13:40:54'
-        error_msg: null
-        interfaces:
-        -   external_name: null
-            instance_net_id: 277fed09-3220-4bfd-9052-b96b21a32daf
-            internal_name: dataVM-eth0
-            ip_address: 192.168.54.5
-            mac_address: fa:16:3e:e4:17:45
-            sdn_port_id: null
-            type: bridge
-            vim_info: "{vim_info: null}"
-            vim_interface_id: 7e246e40-8710-4c33-9c95-78fc3c02bc5b
-        -   external_name: vnf-data
-            instance_net_id: 509d576c-120f-493a-99a1-5fea99dfe041
-            internal_name: dataVM-xe0
-            ip_address: 192.168.24.5
-            mac_address: fa:16:3e:29:6f:a6
-            sdn_port_id: null
-            type: bridge
-            vim_info: "{vim_info: null}"
-            vim_interface_id: ce81af7a-9adf-494b-950e-6581fd04ecc4
-        name: dataVM
-        related: 1ae5a0a2-c15a-49a4-a77c-2991d97f6dbe
-        status: ACTIVE
-        uuid: 1ae5a0a2-c15a-49a4-a77c-2991d97f6dbe
-        vdu_osm_id: dataVM
-        vim_info: "{vim_info: null}"
-        vim_name: ALF-1-dataVM-2
-        vim_vm_id: 4916533e-36c6-4861-9fe3-366a8fb0a5f8
-    vnf_id: 1ab2a418-9fe3-4358-bf17-411e5155535f
-    vnf_name: hackfest3charmed-vnf.1
-    vnfd_osm_id: f48163a6-c807-47bc-9682-f72caef5af85.0.1
--   datacenter_id: dc51ce6c-c7f2-11e9-b9c0-02420aff0004
-    datacenter_tenant_id: dc5c67fa-c7f2-11e9-b9c0-02420aff0004
-    ip_address: 10.205.1.47
-    member_vnf_index: '2'
-    mgmt_access: '{interface_id: 538604c3-5c5e-41eb-8f84-c0239c7fabcd, required: ''False'',
-        vm_id: dd04d792-05c9-4ecc-bf28-f77384d00311}
-
-        '
-    sce_vnf_id: c4f3607a-08ff-4f75-893c-fce507e2f240
-    uuid: 00020403-e80f-4ef2-bb7e-b29669643035
-    vms:
-    -   created_at: '2019-08-26T12:50:38'
-        error_msg: null
-        interfaces:
-        -   external_name: vnf-mgmt
-            instance_net_id: c6bac394-fa27-4c43-bb34-42f621a9d343
-            internal_name: mgmtVM-eth0
-            ip_address: 10.205.1.47
-            mac_address: fa:16:3e:cb:9f:c7
-            sdn_port_id: null
-            type: mgmt
-            vim_info: "{vim_info: null}"
-            vim_interface_id: dcd6d2de-3c68-481c-883e-e9d38c671dc4
-        -   external_name: null
-            instance_net_id: 92534d1a-e697-4372-a84d-aa0aa643b68a
-            internal_name: mgmtVM-eth1
-            ip_address: 192.168.231.1
-            mac_address: fa:16:3e:1a:89:24
-            sdn_port_id: null
-            type: bridge
-            vim_info: "{vim_info: null}"
-            vim_interface_id: 50e538e3-aba0-4652-93bb-20487f3f28e1
-        ip_address: 10.205.1.47
-        name: mgmtVM
-        related: 4543ab5d-578c-427c-9df2-affd17e21b66
-        status: ACTIVE
-        uuid: 4543ab5d-578c-427c-9df2-affd17e21b66
-        vdu_osm_id: mgmtVM
-        vim_info: "{vim_info: null}"
-        vim_name: ALF-2-mgmtVM-1
-        vim_vm_id: 248077b2-e3b8-4a37-8b72-575abb8ed912
-    -   created_at: '2019-08-26T12:50:38'
-        error_msg: null
-        interfaces:
-        -   external_name: null
-            instance_net_id: 92534d1a-e697-4372-a84d-aa0aa643b68a
-            internal_name: dataVM-eth0
-            ip_address: 192.168.231.3
-            mac_address: fa:16:3e:7e:ba:8c
-            sdn_port_id: null
-            type: bridge
-            vim_info: "{vim_info: null}"
-            vim_interface_id: 15274862-14ea-4527-b405-101cae8bc1a0
-        -   external_name: vnf-data
-            instance_net_id: 509d576c-120f-493a-99a1-5fea99dfe041
-            internal_name: dataVM-xe0
-            ip_address: 192.168.24.4
-            mac_address: fa:16:3e:d2:e1:f5
-            sdn_port_id: null
-            type: bridge
-            vim_info: "{vim_info: null}"
-            vim_interface_id: 253ebe4e-38d5-46be-8777-dbb57510a2ec
-        name: dataVM
-        related: 6f03f16b-295a-47a1-9a69-2d069d574a33
-        status: ACTIVE
-        uuid: 6f03f16b-295a-47a1-9a69-2d069d574a33
-        vdu_osm_id: dataVM
-        vim_info: "{vim_info: null}"
-        vim_name: ALF-2-dataVM-1
-        vim_vm_id: a4ce4372-e0ad-4ae3-8f9f-1c969f32e77b
-    vnf_id: 0de348e3-c201-4f6a-91cc-7f957e2d5504
-    vnf_name: hackfest3charmed-vnf.2
-    vnfd_osm_id: f48163a6-c807-47bc-9682-f72caef5af85.1.2
-"""
-
 
 class TestMyNS(asynctest.TestCase):
 
@@ -991,7 +130,7 @@ class TestMyNS(asynctest.TestCase):
         return ee_id, {}
 
     def _ro_show(self, *args, **kwargs):
-        ro_ns_desc = yaml.load(ro_ns_text)
+        ro_ns_desc = yaml.load(descriptors.db_ro_ns_text, Loader=yaml.Loader)
 
         # if ip address provided, replace descriptor
         ip_addresses = getenv("OSMLCMTEST_NS_IPADDRESS", "")
@@ -1034,13 +173,13 @@ class TestMyNS(asynctest.TestCase):
             self.db.get_list.side_effect = self._db_get_list
             self.db.set_one.side_effect = self._db_set_one
             self.db_content = {
-                "nsrs": yaml.load(db_nsrs_text),
-                "nslcmops": yaml.load(db_nslcmops_text),
-                "vnfrs": yaml.load(db_vnfrs_text),
-                "vnfds": yaml.load(db_vnfds_text),
-                "vim_accounts": yaml.load(db_vim_accounts_text),
+                "nsrs": yaml.load(descriptors.db_nsrs_text, Loader=yaml.Loader),
+                "nslcmops": yaml.load(descriptors.db_nslcmops_text, Loader=yaml.Loader),
+                "vnfrs": yaml.load(descriptors.db_vnfrs_text, Loader=yaml.Loader),
+                "vnfds": yaml.load(descriptors.db_vnfds_text, Loader=yaml.Loader),
+                "vim_accounts": yaml.load(descriptors.db_vim_accounts_text, Loader=yaml.Loader),
             }
-            self.db_vim_accounts = yaml.load(db_vim_accounts_text)
+            self.db_vim_accounts = yaml.load(descriptors.db_vim_accounts_text, Loader=yaml.Loader)
 
         # Mock kafka
         self.msg = asynctest.Mock(MsgKafka())
@@ -1162,9 +301,201 @@ class TestMyNS(asynctest.TestCase):
                               "vnfs": {"5": {"vdus": {"vdu_id": {"mgmt_keys": n2vc_key_list}}}}}
         self.assertEqual(ro_ns_params, ro_params_expected)
 
+    # Test scale() and related methods
     @asynctest.fail_on(active_handles=True)   # all async tasks must be completed
     async def test_scale(self):
-        pass
+        # print("Test scale started")
+
+        # TODO: Add more higher-lever tests here, for example:
+        # scale-out/scale-in operations with success/error result
+
+        # Test scale() with missing 'scaleVnfData', should return operationState = 'FAILED'
+        nsr_id = self.db_content["nsrs"][0]["_id"]
+        nslcmop_id = self.db_content["nslcmops"][0]["_id"]
+        await self.my_ns.scale(nsr_id, nslcmop_id)
+        expected_value = 'FAILED'
+        return_value = self._db_get_one("nslcmops", {"_id": nslcmop_id}).get("operationState")
+        self.assertEqual(return_value, expected_value)
+        # print("scale_result: {}".format(self._db_get_one("nslcmops", {"_id": nslcmop_id}).get("detailed-status")))
+
+    # Test _reintent_or_skip_suboperation()
+    # Expected result:
+    # - if a suboperation's 'operationState' is marked as 'COMPLETED', SUBOPERATION_STATUS_SKIP is expected
+    # - if marked as anything but 'COMPLETED', the suboperation index is expected
+    def test_scale_reintent_or_skip_suboperation(self):
+        # Load an alternative 'nslcmops' YAML for this test
+        self.db_content['nslcmops'] = yaml.load(descriptors.db_nslcmops_scale_text, Loader=yaml.Loader)
+        db_nslcmop = self.db_content['nslcmops'][0]
+        op_index = 2
+        # Test when 'operationState' is 'COMPLETED'
+        db_nslcmop['_admin']['operations'][op_index]['operationState'] = 'COMPLETED'
+        return_value = self.my_ns._reintent_or_skip_suboperation(db_nslcmop, op_index)
+        expected_value = self.my_ns.SUBOPERATION_STATUS_SKIP
+        self.assertEqual(return_value, expected_value)
+        # Test when 'operationState' is not 'COMPLETED'
+        db_nslcmop['_admin']['operations'][op_index]['operationState'] = None
+        return_value = self.my_ns._reintent_or_skip_suboperation(db_nslcmop, op_index)
+        expected_value = op_index
+        self.assertEqual(return_value, expected_value)
+
+    # Test _find_suboperation()
+    # Expected result: index of the found sub-operation, or SUBOPERATION_STATUS_NOT_FOUND if not found
+    def test_scale_find_suboperation(self):
+        # Load an alternative 'nslcmops' YAML for this test
+        self.db_content['nslcmops'] = yaml.load(descriptors.db_nslcmops_scale_text, Loader=yaml.Loader)
+        db_nslcmop = self.db_content['nslcmops'][0]
+        # Find this sub-operation
+        op_index = 2
+        vnf_index = db_nslcmop['_admin']['operations'][op_index]['member_vnf_index']
+        primitive = db_nslcmop['_admin']['operations'][op_index]['primitive']
+        primitive_params = db_nslcmop['_admin']['operations'][op_index]['primitive_params']
+        match = {
+            'member_vnf_index': vnf_index,
+            'primitive': primitive,
+            'primitive_params': primitive_params,
+        }
+        found_op_index = self.my_ns._find_suboperation(db_nslcmop, match)
+        self.assertEqual(found_op_index, op_index)
+        # Test with not-matching params
+        match = {
+            'member_vnf_index': vnf_index,
+            'primitive': '',
+            'primitive_params': primitive_params,
+        }
+        found_op_index = self.my_ns._find_suboperation(db_nslcmop, match)
+        self.assertEqual(found_op_index, self.my_ns.SUBOPERATION_STATUS_NOT_FOUND)
+        # Test with None
+        match = None
+        found_op_index = self.my_ns._find_suboperation(db_nslcmop, match)
+        self.assertEqual(found_op_index, self.my_ns.SUBOPERATION_STATUS_NOT_FOUND)
+
+    # Test _update_suboperation_status()
+    def test_scale_update_suboperation_status(self):
+        db_nslcmop = self.db_content['nslcmops'][0]
+        op_index = 0
+        # Force the initial values to be distinct from the updated ones
+        db_nslcmop['_admin']['operations'][op_index]['operationState'] = 'PROCESSING'
+        db_nslcmop['_admin']['operations'][op_index]['detailed-status'] = 'In progress'
+        # Test to change 'operationState' and 'detailed-status'
+        operationState = 'COMPLETED'
+        detailed_status = 'Done'
+        self.my_ns._update_suboperation_status(
+            db_nslcmop, op_index, operationState, detailed_status)
+        operationState_new = db_nslcmop['_admin']['operations'][op_index]['operationState']
+        detailed_status_new = db_nslcmop['_admin']['operations'][op_index]['detailed-status']
+        # print("DEBUG: operationState_new={}, detailed_status_new={}".format(operationState_new, detailed_status_new))
+        self.assertEqual(operationState, operationState_new)
+        self.assertEqual(detailed_status, detailed_status_new)
+
+    # Test _add_suboperation()
+    def test_scale_add_suboperation(self):
+        db_nslcmop = self.db_content['nslcmops'][0]
+        vnf_index = '1'
+        num_ops_before = len(db_nslcmop.get('_admin', {}).get('operations', [])) - 1
+        vdu_id = None
+        vdu_count_index = None
+        vdu_name = None
+        primitive = 'touch'
+        mapped_primitive_params = {'parameter':
+                                   [{'data-type': 'STRING',
+                                     'name': 'filename',
+                                     'default-value': '<touch_filename2>'}],
+                                   'name': 'touch'}
+        operationState = 'PROCESSING'
+        detailed_status = 'In progress'
+        operationType = 'PRE-SCALE'
+        # Add a 'pre-scale' suboperation
+        op_index_after = self.my_ns._add_suboperation(db_nslcmop, vnf_index, vdu_id, vdu_count_index,
+                                                      vdu_name, primitive, mapped_primitive_params,
+                                                      operationState, detailed_status, operationType)
+        self.assertEqual(op_index_after, num_ops_before + 1)
+
+        # Delete all suboperations and add the same operation again
+        del db_nslcmop['_admin']['operations']
+        op_index_zero = self.my_ns._add_suboperation(db_nslcmop, vnf_index, vdu_id, vdu_count_index,
+                                                     vdu_name, primitive, mapped_primitive_params,
+                                                     operationState, detailed_status, operationType)
+        self.assertEqual(op_index_zero, 0)
+
+        # Add a 'RO' suboperation
+        RO_nsr_id = '1234567890'
+        RO_scaling_info = [{'type': 'create', 'count': 1, 'member-vnf-index': '1', 'osm_vdu_id': 'dataVM'}]
+        op_index = self.my_ns._add_suboperation(db_nslcmop, vnf_index, vdu_id, vdu_count_index,
+                                                vdu_name, primitive, mapped_primitive_params,
+                                                operationState, detailed_status, operationType,
+                                                RO_nsr_id, RO_scaling_info)
+        db_RO_nsr_id = db_nslcmop['_admin']['operations'][op_index]['RO_nsr_id']
+        self.assertEqual(op_index, 1)
+        self.assertEqual(RO_nsr_id, db_RO_nsr_id)
+
+        # Try to add an invalid suboperation, should return SUBOPERATION_STATUS_NOT_FOUND
+        op_index_invalid = self.my_ns._add_suboperation(None, None, None, None, None,
+                                                        None, None, None,
+                                                        None, None, None)
+        self.assertEqual(op_index_invalid, self.my_ns.SUBOPERATION_STATUS_NOT_FOUND)
+
+    # Test _check_or_add_scale_suboperation() and _check_or_add_scale_suboperation_RO()
+    # check the possible return values:
+    # - SUBOPERATION_STATUS_NEW: This is a new sub-operation
+    # - op_index (non-negative number): This is an existing sub-operation, operationState != 'COMPLETED'
+    # - SUBOPERATION_STATUS_SKIP: This is an existing sub-operation, operationState == 'COMPLETED'
+    def test_scale_check_or_add_scale_suboperation(self):
+        db_nslcmop = self.db_content['nslcmops'][0]
+        operationType = 'PRE-SCALE'
+        vnf_index = '1'
+        primitive = 'touch'
+        primitive_params = {'parameter':
+                            [{'data-type': 'STRING',
+                              'name': 'filename',
+                              'default-value': '<touch_filename2>'}],
+                            'name': 'touch'}
+
+        # Delete all sub-operations to be sure this is a new sub-operation
+        del db_nslcmop['_admin']['operations']
+
+        # Add a new sub-operation
+        # For new sub-operations, operationState is set to 'PROCESSING' by default
+        op_index_new = self.my_ns._check_or_add_scale_suboperation(
+            db_nslcmop, vnf_index, primitive, primitive_params, operationType)
+        self.assertEqual(op_index_new, self.my_ns.SUBOPERATION_STATUS_NEW)
+
+        # Use the same parameters again to match the already added sub-operation
+        # which has status 'PROCESSING' (!= 'COMPLETED') by default
+        # The expected return value is a non-negative number
+        op_index_existing = self.my_ns._check_or_add_scale_suboperation(
+            db_nslcmop, vnf_index, primitive, primitive_params, operationType)
+        self.assertTrue(op_index_existing >= 0)
+
+        # Change operationState 'manually' for this sub-operation
+        db_nslcmop['_admin']['operations'][op_index_existing]['operationState'] = 'COMPLETED'
+        # Then use the same parameters again to match the already added sub-operation,
+        # which now has status 'COMPLETED'
+        # The expected return value is SUBOPERATION_STATUS_SKIP
+        op_index_skip = self.my_ns._check_or_add_scale_suboperation(
+            db_nslcmop, vnf_index, primitive, primitive_params, operationType)
+        self.assertEqual(op_index_skip, self.my_ns.SUBOPERATION_STATUS_SKIP)
+
+        # RO sub-operation test:
+        # Repeat tests for the very similar _check_or_add_scale_suboperation_RO(),
+        RO_nsr_id = '1234567890'
+        RO_scaling_info = [{'type': 'create', 'count': 1, 'member-vnf-index': '1', 'osm_vdu_id': 'dataVM'}]
+        op_index_new_RO = self.my_ns._check_or_add_scale_suboperation(
+            db_nslcmop, vnf_index, None, None, 'SCALE-RO', RO_nsr_id, RO_scaling_info)
+        self.assertEqual(op_index_new_RO, self.my_ns.SUBOPERATION_STATUS_NEW)
+
+        # Use the same parameters again to match the already added RO sub-operation
+        op_index_existing_RO = self.my_ns._check_or_add_scale_suboperation(
+            db_nslcmop, vnf_index, None, None, 'SCALE-RO', RO_nsr_id, RO_scaling_info)
+        self.assertTrue(op_index_existing_RO >= 0)
+
+        # Change operationState 'manually' for this RO sub-operation
+        db_nslcmop['_admin']['operations'][op_index_existing_RO]['operationState'] = 'COMPLETED'
+        # Then use the same parameters again to match the already added sub-operation,
+        # which now has status 'COMPLETED'
+        # The expected return value is SUBOPERATION_STATUS_SKIP
+        op_index_skip_RO = self.my_ns._check_or_add_scale_suboperation(
+            db_nslcmop, vnf_index, None, None, 'SCALE-RO', RO_nsr_id, RO_scaling_info)
+        self.assertEqual(op_index_skip_RO, self.my_ns.SUBOPERATION_STATUS_SKIP)
 
 
 if __name__ == '__main__':
index 17e6ab8..ffbd01c 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -51,7 +51,7 @@ setup(
     ],
     install_requires=[
         # 'pymongo',
-        'PyYAML==3.*',
+        'PyYAML>=3.*',
         'aiohttp==0.20.2',
         'osm-common',
         'n2vc',