X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=rwlaunchpad%2Fra%2Fpytest%2Fns%2Ftest_onboard.py;fp=rwlaunchpad%2Fra%2Fpytest%2Fns%2Ftest_onboard.py;h=83f74bfb7c9a97fd6806b4c93d5d79ce5a5eca2b;hb=4870d0ee29789b859931e4e2c73e13dcb29537d5;hp=5951ce876bb207be17feadc368e5503451b9ee04;hpb=6f1a3fe149e4a6b9803382cb299c902f4cf58ec9;p=osm%2FSO.git

diff --git a/rwlaunchpad/ra/pytest/ns/test_onboard.py b/rwlaunchpad/ra/pytest/ns/test_onboard.py
index 5951ce87..83f74bfb 100644
--- a/rwlaunchpad/ra/pytest/ns/test_onboard.py
+++ b/rwlaunchpad/ra/pytest/ns/test_onboard.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """
-# 
-#   Copyright 2016 RIFT.IO Inc
+#
+#   Copyright 2016-2017 RIFT.io Inc
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -21,12 +21,16 @@
 @brief Onboard descriptors
 """
 
+import gi
 import json
 import logging
+import numpy as np
 import os
 import pytest
-import shlex
+import random
 import requests
+import requests_toolbelt
+import shlex
 import shutil
 import subprocess
 import time
@@ -34,32 +38,42 @@ import uuid
 
 import rift.auto.mano
 import rift.auto.session
+import rift.auto.descriptor
 
-import gi
 gi.require_version('RwNsrYang', '1.0')
-gi.require_version('RwVnfdYang', '1.0')
+gi.require_version('RwProjectVnfdYang', '1.0')
 gi.require_version('RwLaunchpadYang', '1.0')
 gi.require_version('RwBaseYang', '1.0')
+gi.require_version('RwStagingMgmtYang', '1.0')
+gi.require_version('RwPkgMgmtYang', '1.0')
+gi.require_version('RwVlrYang', '1.0')
 
 from gi.repository import (
     RwcalYang,
-    NsdYang,
+    RwProjectNsdYang,
     RwNsrYang,
     RwVnfrYang,
     NsrYang,
     VnfrYang,
     VldYang,
-    RwVnfdYang,
+    RwProjectVnfdYang,
     RwLaunchpadYang,
-    RwBaseYang
+    RwBaseYang,
+    RwStagingMgmtYang,
+    RwPkgMgmtYang,
+    RwImageMgmtYang,
+    RwTypes,
+    RwVlrYang
 )
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
 
 logging.basicConfig(level=logging.DEBUG)
 
 
 @pytest.fixture(scope='module')
 def vnfd_proxy(request, mgmt_session):
-    return mgmt_session.proxy(RwVnfdYang)
+    return mgmt_session.proxy(RwProjectVnfdYang)
 
 @pytest.fixture(scope='module')
 def rwvnfr_proxy(request, mgmt_session):
@@ -70,9 +84,14 @@ def vld_proxy(request, mgmt_session):
     return mgmt_session.proxy(VldYang)
 
 
+@pytest.fixture(scope='module')
+def rwvlr_proxy(request, mgmt_session):
+    return mgmt_session.proxy(RwVlrYang)
+
+
 @pytest.fixture(scope='module')
 def nsd_proxy(request, mgmt_session):
-    return mgmt_session.proxy(NsdYang)
+    return mgmt_session.proxy(RwProjectNsdYang)
 
 
 @pytest.fixture(scope='module')
@@ -88,30 +107,6 @@ def base_proxy(request, mgmt_session):
 def endpoint():
     return "upload"
 
-def create_nsr(nsd, input_param_list, cloud_account_name):
-    """
-    Create the NSR record object
-
-    Arguments:
-         nsd              -  NSD
-         input_param_list - list of input-parameter objects
-
-    Return:
-         NSR object
-    """
-    nsr = RwNsrYang.YangData_Nsr_NsInstanceConfig_Nsr()
-
-    nsr.id = str(uuid.uuid4())
-    nsr.name = rift.auto.mano.resource_name(nsr.id)
-    nsr.short_name = "nsr_short_name"
-    nsr.description = "This is a description"
-    nsr.nsd.from_dict(nsd.as_dict())
-    nsr.admin_status = "ENABLED"
-    nsr.input_parameter.extend(input_param_list)
-    nsr.cloud_account = cloud_account_name
-
-    return nsr
-
 
 def upload_descriptor(
         logger,
@@ -200,47 +195,25 @@ def onboard_descriptor(host, file_name, logger, endpoint, scheme, cert):
         host=host,
         endpoint=endpoint)
 
-def terminate_nsr(rwvnfr_proxy, rwnsr_proxy, logger, wait_after_kill=True):
-    """
-    Terminate the instance and check if the record is deleted.
-
-    Asserts:
-    1. NSR record is deleted from instance-config.
-
-    """
-    logger.debug("Terminating NSRs")
-
-    nsr_path = "/ns-instance-config"
-    nsr = rwnsr_proxy.get_config(nsr_path)
-    nsrs = nsr.nsr
-
-    xpaths = []
-    for nsr in nsrs:
-        xpath = "/ns-instance-config/nsr[id='{}']".format(nsr.id)
-        rwnsr_proxy.delete_config(xpath)
-        xpaths.append(xpath)
-
-    if wait_after_kill:
-        time.sleep(30)
-    else:
-        time.sleep(5)
 
-    for xpath in xpaths:
-        nsr = rwnsr_proxy.get_config(xpath)
-        assert nsr is None
+def get_ns_cloud_resources(rwvnfr_proxy, rwvlr_proxy):
+    """Returns a collection of ports, networks, VMs used by this NS"""
+    ns_cloud_resources = {'ports':[], 'vms':[], 'networks':[]}
 
-    # Get the ns-instance-config
-    ns_instance_config = rwnsr_proxy.get_config("/ns-instance-config")
+    # Get ports and VMs associated with each VNF
+    vnfrs = rwvnfr_proxy.get('/rw-project:project[rw-project:name="default"]/vnfr-catalog/vnfr', list_obj=True)
+    for vnfr in vnfrs.vnfr:
+        for cp in vnfr.connection_point:
+            ns_cloud_resources['ports'].append(cp.connection_point_id)
+        for vdur in vnfr.vdur:
+            ns_cloud_resources['vms'].append(vdur.vim_id)
 
-    # Termination tests
-    vnfr = "/vnfr-catalog/vnfr"
-    vnfrs = rwvnfr_proxy.get(vnfr, list_obj=True)
-    assert vnfrs is None or len(vnfrs.vnfr) == 0
-
-    # nsr = "/ns-instance-opdata/nsr"
-    # nsrs = rwnsr_proxy.get(nsr, list_obj=True)
-    # assert len(nsrs.nsr) == 0
+    # Get the network associated with each NS
+    vlrs = rwvlr_proxy.get('/rw-project:project[rw-project:name="default"]/vlr-catalog/vlr', list_obj=True)
+    for vlr in vlrs.vlr:
+        ns_cloud_resources['networks'].append(vlr.network_id)
 
+    return ns_cloud_resources
 
 
 @pytest.mark.setup('nsr')
@@ -249,7 +222,7 @@ def terminate_nsr(rwvnfr_proxy, rwnsr_proxy, logger, wait_after_kill=True):
 class TestNsrStart(object):
     """A brief overview of the steps performed.
     1. Generate & on-board new descriptors
-    2. Start the NSR 
+    2. Start the NSR
     """
 
     def test_upload_descriptors(
@@ -260,32 +233,168 @@ class TestNsrStart(object):
             mgmt_session,
             scheme,
             cert,
-            descriptors
+            descriptors,
+            iteration,
         ):
         """Generates & On-boards the descriptors.
+
+        1. Request a staging area: RPC returns an endpoint and port
+        1. Upload the file to the endpoint, return the endpoint to download
+        2. Reconstruct the URL and trigger an RPC upload for the package.
         """
+        # We are instantiating the NS twice in port-sequencing test. Seconds NS instantiation will be using already uploaded
+        # descriptors with updated interface positional values.
+        if iteration==1 and pytest.config.getoption("--port-sequencing"):
+            pytest.skip()
         endpoint = "upload"
 
         for file_name in descriptors:
-            onboard_descriptor(
-                    mgmt_session.host,
-                    file_name,
-                    logger,
-                    endpoint,
-                    scheme,
-                    cert)
+
+            ip = RwStagingMgmtYang.YangInput_RwStagingMgmt_CreateStagingArea.from_dict({
+                    "package_type": "VNFD"})
+
+            if "nsd" in file_name:
+                ip.package_type = "NSD"
+
+            data = mgmt_session.proxy(RwStagingMgmtYang).rpc(ip)
+            form = requests_toolbelt.MultipartEncoder(fields={
+                        'file': (os.path.basename(file_name),
+                                 open(file_name, 'rb'),
+                                 'application/octet-stream')
+                        })
+
+            response = requests.post(
+                    "{}://{}:{}/{}".format(
+                            scheme,
+                            mgmt_session.host,
+                            data.port,
+                            data.endpoint),
+                    data=form.to_string(),
+                    cert=cert,  # cert is a tuple
+                    verify=False,
+                    headers={"Content-Type": "multipart/form-data"})
+
+            resp = json.loads(response.text)
+            url = "https://{}:{}{}".format(mgmt_session.host, data.port, resp['path'])
+
+            ip = RwPkgMgmtYang.YangInput_RwPkgMgmt_PackageCreate.from_dict({
+                    "package_type": "VNFD",
+                    "external_url": url
+                })
+
+            if "nsd" in file_name:
+                ip.package_type = "NSD"
+
+            # trigger the upload.
+            resp = mgmt_session.proxy(RwPkgMgmtYang).rpc(ip)
+
+            wait_onboard_transaction_finished(
+                logger,
+                resp.transaction_id,
+                scheme,
+                cert,
+                host=mgmt_session.host,
+                endpoint=endpoint)
 
         descriptor_vnfds, descriptor_nsd = descriptors[:-1], descriptors[-1]
 
-        catalog = vnfd_proxy.get_config('/vnfd-catalog')
+        catalog = vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog')
         actual_vnfds = catalog.vnfd
         assert len(actual_vnfds) == len(descriptor_vnfds), \
                 "There should {} vnfds".format(len(descriptor_vnfds))
 
-        catalog = nsd_proxy.get_config('/nsd-catalog')
+        catalog = nsd_proxy.get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog')
         actual_nsds = catalog.nsd
         assert len(actual_nsds) == 1, "There should only be a single nsd"
 
+    @pytest.mark.skipif(not pytest.config.getoption('--upload-images-multiple-accounts'),
+                        reason="need --upload-images-multiple-accounts option to run")
+    def test_images_uploaded_multiple_accounts(self, logger, mgmt_session, random_image_name, cloud_accounts, cal):
+        image_mgmt_proxy = mgmt_session.proxy(RwImageMgmtYang)
+        upload_jobs = image_mgmt_proxy.get('/rw-project:project[rw-project:name="default"]/upload-jobs')
+        logger.info('Embedded image name(apart from ping pong Fedora images): {}'.format(random_image_name))
+        for job in upload_jobs.job:
+            assert image_mgmt_proxy.wait_for('/rw-project:project[rw-project:name="default"]/upload-jobs/job[id={}]/status'.format(quoted_key(job.id)), 'COMPLETED', timeout=240)
+            assert len(job.upload_tasks) == len(cloud_accounts)
+            for upload_task in job.upload_tasks:
+                assert upload_task.status == 'COMPLETED'
+
+        assert len(upload_jobs.job) == 3
+
+        # Check whether images are present in VIMs
+        for account in cloud_accounts:
+            rc, res = cal.get_image_list(RwcalYang.YangData_RwProject_Project_CloudAccounts_CloudAccountList.from_dict(account.as_dict()))
+            assert rc == RwTypes.RwStatus.SUCCESS
+            assert [image for image in res.imageinfo_list if image.name == random_image_name]
+
+    @pytest.mark.skipif(not pytest.config.getoption("--vnf-onboard-delete"), reason="need --vnf-onboard-delete option to run")
+    def test_upload_delete_descriptors(self, logger, mgmt_session, vnfd_proxy, descriptors, vnf_onboard_delete):
+        """Randomly upload and delete VNFs. With each upload/delete, verify if the VNF
+        gets uploaded/deleted successfully.
+        """
+        xpath = "/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd[id={}]"
+        iteration, vnf_count = map(int, vnf_onboard_delete.split(','))
+
+        # Get the VNF paths to be used for onboarding
+        all_vnfs = [pkg_path for pkg_path in descriptors if '_nsd' not in os.path.basename(pkg_path)]
+        if vnf_count > len(all_vnfs):
+            vnf_count = len(all_vnfs)
+        available_vnfs = random.sample(all_vnfs, vnf_count)
+
+        # Get the add, delete iterations
+        add_del_seq = list(np.random.choice(['add', 'del'], iteration))
+        random.shuffle(add_del_seq)
+        logger.info('Vnf add-delete iteration sequence: {}'.format(add_del_seq))
+
+        uploaded_vnfs = {}
+
+        def get_vnfd_list():
+            """Returns list of VNFDs"""
+            vnfd_obj = vnfd_proxy.get("/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd", list_obj=True)
+            return vnfd_obj.vnfd if vnfd_obj else []
+
+        def delete_vnfd():
+            """Deletes a VNFD"""
+            vnf_path, vnfd_id = random.choice(list(uploaded_vnfs.items()))
+            logger.info('Deleting VNF {} having id {}'.format(os.path.basename(vnf_path), vnfd_id))
+            vnfd_proxy.delete_config(xpath.format(quoted_key(vnfd_id)))
+            uploaded_vnfs.pop(vnf_path)
+            available_vnfs.append(vnf_path)
+            assert not [vnfd for vnfd in get_vnfd_list() if vnfd.id == vnfd_id]
+
+        for op_type in add_del_seq:
+            if op_type =='del':
+                if uploaded_vnfs:
+                    delete_vnfd()
+                    continue
+                op_type = 'add'
+
+            if op_type == 'add':
+                if not available_vnfs:
+                    delete_vnfd()
+                    continue
+                vnf_path = random.choice(available_vnfs)
+                logger.info('Adding VNF {}'.format(os.path.basename(vnf_path)))
+                rift.auto.descriptor.onboard(mgmt_session, vnf_path)
+                vnfs = get_vnfd_list()
+                assert len(vnfs) == len(uploaded_vnfs) + 1
+                vnfd = [vnfd for vnfd in vnfs if vnfd.id not in list(uploaded_vnfs.values())]
+                assert len(vnfd) == 1
+                vnfd = vnfd[0]
+                assert vnfd.name
+                assert vnfd.connection_point
+                assert vnfd.vdu
+                uploaded_vnfs[vnf_path] = vnfd.id
+                available_vnfs.remove(vnf_path)
+
+            assert len(get_vnfd_list()) == len(uploaded_vnfs)
+            logger.info('Onboarded VNFs : {}'.format(uploaded_vnfs))
+
+        assert len(available_vnfs) + len(uploaded_vnfs) == vnf_count
+        # cleanup - Delete VNFs(if any)
+        for vnfd_id in uploaded_vnfs.values():
+            vnfd_proxy.delete_config(xpath.format(quoted_key(vnfd_id)))
+
     @pytest.mark.feature("upload-image")
     def test_upload_images(self, descriptor_images, cloud_host, cloud_user, cloud_tenants):
 
@@ -295,7 +404,7 @@ class TestNsrStart(object):
                 [(tenant, "private") for tenant in cloud_tenants])
 
         for image_location in descriptor_images:
-            image = RwcalYang.ImageInfoItem.from_dict({
+            image = RwcalYang.YangData_RwProject_Project_VimResources_ImageinfoList.from_dict({
                     'name': os.path.basename(image_location),
                     'location': image_location,
                     'disk_format': 'qcow2',
@@ -304,14 +413,85 @@ class TestNsrStart(object):
 
 
     def test_set_scaling_params(self, nsd_proxy):
-        nsds = nsd_proxy.get('/nsd-catalog')
+        nsds = nsd_proxy.get('/rw-project:project[rw-project:name="default"]/nsd-catalog')
         nsd = nsds.nsd[0]
         for scaling_group in nsd.scaling_group_descriptor:
             scaling_group.max_instance_count = 2
 
-        nsd_proxy.replace_config('/nsd-catalog/nsd[id="{}"]'.format(
-            nsd.id), nsd)
+        nsd_proxy.replace_config('/rw-project:project[rw-project:name="default"]/nsd-catalog/nsd[id={}]'.format(
+            quoted_key(nsd.id)), nsd)
 
+    @pytest.mark.skipif(not (pytest.config.getoption("--update-vnfd-instantiate") or pytest.config.getoption("--port-sequencing")),
+                        reason="need --update-vnfd-instantiate or --port-sequencing option to run")
+    def test_update_vnfd(self, vnfd_proxy, iteration, port_sequencing_intf_positions):
+        """Updates few fields of ping pong VNFDs and verify those changes
+        """
+        xpath = "/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd[id={}]"
+        vnfd_catalog = "/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd"
+
+        if iteration==0 and pytest.config.getoption("--port-sequencing"):
+            pytest.skip()
+
+        def get_vnfd():
+            vnfds = vnfd_proxy.get(vnfd_catalog, list_obj=True)
+            dict_ = {}
+
+            # Get ping pong VNFDs
+            for vnfd in vnfds.vnfd:
+                if 'ping' in vnfd.name:
+                    dict_['ping'] = vnfd
+                if 'pong' in vnfd.name:
+                    dict_['pong'] = vnfd
+            return dict_
+
+        vnfds_dict = get_vnfd()
+        update_data = {'ping':{'static_ip_address':'31.31.31.60'}, 'pong':{'static_ip_address':'31.31.31.90'}}
+        port_sequencing_intf_positions_tmp = port_sequencing_intf_positions[:]
+
+        # Modify/add fields in VNFDs
+        for name_, vnfd in vnfds_dict.items():
+            if pytest.config.getoption('--update-vnfd-instantiate'):
+                vnfd.vdu[0].interface[1].static_ip_address = update_data[name_]['static_ip_address']
+            if pytest.config.getoption('--port-sequencing'):
+                vnfd_intf_list = vnfd.vdu[0].interface
+                # for ping vnfd, remove positional values from all interfaces
+                # for pong vnfd, modify the positional values as per fixture port_sequencing_intf_positions
+                if 'ping' in vnfd.name:
+                    tmp_intf_list = []
+                    for i in range(len(vnfd_intf_list)):
+                        tmp_intf_dict = vnfd_intf_list[-1].as_dict()
+                        del tmp_intf_dict['position']
+                        vnfd_intf_list.pop()
+                        tmp_intf_list.append(tmp_intf_dict)
+                    for intf_dict_without_positional_values in tmp_intf_list:
+                        new_intf = vnfd.vdu[0].interface.add()
+                        new_intf.from_dict(intf_dict_without_positional_values)
+
+                if 'pong' in vnfd.name:
+                    for intf in vnfd_intf_list:
+                        if 'position' in intf:
+                            intf.position = port_sequencing_intf_positions_tmp.pop()
+
+        # Update/save the VNFDs
+        for vnfd in vnfds_dict.values():
+            vnfd_proxy.replace_config(xpath.format(quoted_key(vnfd.id)), vnfd)
+
+        # Match whether data is updated
+        vnfds_dict = get_vnfd()
+        assert vnfds_dict
+        for name_, vnfd in vnfds_dict.items():
+            if pytest.config.getoption('--update-vnfd-instantiate'):
+                assert vnfd.vdu[0].interface[1].static_ip_address == update_data[name_]['static_ip_address']
+            if pytest.config.getoption('--port-sequencing'):
+                if 'ping' in vnfd.name:
+                    for intf in vnfd.vdu[0].interface:
+                        assert 'position' not in intf.as_dict()
+                if 'pong' in vnfd.name:
+                    tmp_positional_values_list = []
+                    for intf in vnfd.vdu[0].interface:
+                        if 'position' in intf.as_dict():
+                            tmp_positional_values_list.append(intf.position)
+                    assert set(tmp_positional_values_list) == set(port_sequencing_intf_positions)
 
     def test_instantiate_nsr(self, logger, nsd_proxy, rwnsr_proxy, base_proxy, cloud_account_name):
 
@@ -329,47 +509,72 @@ class TestNsrStart(object):
                                                                            config_param.value,
                                                                            running_config.input_parameter))
 
-        catalog = nsd_proxy.get_config('/nsd-catalog')
+        catalog = nsd_proxy.get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog')
         nsd = catalog.nsd[0]
 
         input_parameters = []
-        descr_xpath = "/nsd:nsd-catalog/nsd:nsd[nsd:id='%s']/nsd:description" % nsd.id
-        descr_value = "New NSD Description"
+        descr_xpath = "/nsd:nsd-catalog/nsd:nsd/nsd:vendor"
+        descr_value = "New Vendor"
         in_param_id = str(uuid.uuid4())
 
-        input_param_1 = NsrYang.YangData_Nsr_NsInstanceConfig_Nsr_InputParameter(
+        input_param_1 = NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr_InputParameter(
                                                                 xpath=descr_xpath,
                                                                 value=descr_value)
 
         input_parameters.append(input_param_1)
 
-        nsr = create_nsr(nsd, input_parameters, cloud_account_name)
+        nsr = rift.auto.descriptor.create_nsr(cloud_account_name, nsd.name, nsd, input_param_list=input_parameters)
 
         logger.info("Instantiating the Network Service")
-        rwnsr_proxy.create_config('/ns-instance-config/nsr', nsr)
+        rwnsr_proxy.create_config('/rw-project:project[rw-project:name="default"]/ns-instance-config/nsr', nsr)
 
-        nsr_opdata = rwnsr_proxy.get('/ns-instance-opdata/nsr[ns-instance-config-ref="{}"]'.format(nsr.id))
+        nsr_opdata = rwnsr_proxy.get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata/nsr[ns-instance-config-ref={}]'.format(quoted_key(nsr.id)))
         assert nsr_opdata is not None
 
         # Verify the input parameter configuration
-        running_config = rwnsr_proxy.get_config("/ns-instance-config/nsr[id='%s']" % nsr.id)
+        running_config = rwnsr_proxy.get_config("/rw-project:project[rw-project:name='default']/ns-instance-config/nsr[id=%s]" % quoted_key(nsr.id))
         for input_param in input_parameters:
             verify_input_parameters(running_config, input_param)
 
     def test_wait_for_nsr_started(self, rwnsr_proxy):
-        nsr_opdata = rwnsr_proxy.get('/ns-instance-opdata')
+        """Verify NSR instances enter 'running' operational-status
+        """
+        nsr_opdata = rwnsr_proxy.get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata')
         nsrs = nsr_opdata.nsr
 
         for nsr in nsrs:
-            xpath = "/ns-instance-opdata/nsr[ns-instance-config-ref='{}']/operational-status".format(nsr.ns_instance_config_ref)
-            rwnsr_proxy.wait_for(xpath, "running", fail_on=['failed'], timeout=240)
+            xpath = "/rw-project:project[rw-project:name='default']/ns-instance-opdata/nsr[ns-instance-config-ref={}]/operational-status".format(quoted_key(nsr.ns_instance_config_ref))
+            rwnsr_proxy.wait_for(xpath, "running", fail_on=['failed'], timeout=400)
+
+    def test_wait_for_nsr_configured(self, rwnsr_proxy):
+        """Verify NSR instances enter 'configured' config-status
+        """
+        nsr_opdata = rwnsr_proxy.get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata')
+        nsrs = nsr_opdata.nsr
+
+        for nsr in nsrs:
+            xpath = "/rw-project:project[rw-project:name='default']/ns-instance-opdata/nsr[ns-instance-config-ref={}]/config-status".format(quoted_key(nsr.ns_instance_config_ref))
+            rwnsr_proxy.wait_for(xpath, "configured", fail_on=['failed'], timeout=400)
 
 
 @pytest.mark.teardown('nsr')
 @pytest.mark.depends('launchpad')
 @pytest.mark.incremental
 class TestNsrTeardown(object):
-    def test_terminate_nsr(self, rwvnfr_proxy, rwnsr_proxy, logger, cloud_type):
+
+    def test_delete_embedded_images(self, random_image_name, cloud_accounts, cal):
+        """Deletes images embedded in VNF from VIM. It only deletes additional images, not
+        the Fedora ping pong images"""
+        for account in cloud_accounts:
+            rc, rsp = cal.get_image_list(RwcalYang.YangData_RwProject_Project_CloudAccounts_CloudAccountList.from_dict(account.as_dict()))
+            assert rc == RwTypes.RwStatus.SUCCESS
+            if rsp is not None:
+                for image in rsp.imageinfo_list:
+                    if random_image_name in image.name:
+                        cal.delete_image(RwcalYang.YangData_RwProject_Project_CloudAccounts_CloudAccountList.from_dict(account.as_dict()), image.id)
+
+    def test_terminate_nsr(self, rwvnfr_proxy, rwnsr_proxy, logger, cloud_type,
+                           rwvlr_proxy, vim_clients, cloud_account_name):
         """
         Terminate the instance and check if the record is deleted.
 
@@ -377,32 +582,66 @@ class TestNsrTeardown(object):
         1. NSR record is deleted from instance-config.
 
         """
-        logger.debug("Terminating NSR")
+        # Collects the Cloud resources like ports, networks, VMs used by the current NS
+        ns_cloud_resources = get_ns_cloud_resources(rwvnfr_proxy, rwvlr_proxy)
+        logger.info('Cloud resources used by NS: {}'.format(ns_cloud_resources))
 
+        logger.debug("Terminating NSR")
         wait_after_kill = True
         if cloud_type == "mock":
             wait_after_kill = False
 
-        terminate_nsr(rwvnfr_proxy, rwnsr_proxy, logger, wait_after_kill=wait_after_kill)
-
-    def test_delete_records(self, nsd_proxy, vnfd_proxy):
+        rift.auto.descriptor.terminate_nsr(rwvnfr_proxy, rwnsr_proxy,
+                                           rwvlr_proxy, logger,
+                                           wait_after_kill=wait_after_kill)
+        # Collect all the ports, networks VMs from openstack and
+        # check if previously collected resources (i.e ns_cloud_resources) are still present in this collection
+        start_time = time.time()
+        while time.time()-start_time < 240:
+            try:
+                vim_client = vim_clients[cloud_account_name]
+                vim_resources = dict()
+                vim_resources['networks'] = vim_client.neutron_network_list()
+                vim_resources['vms'] = vim_client.nova_server_list()
+                vim_resources['ports'] = vim_client.neutron_port_list()
+
+                for resource_type in ns_cloud_resources.keys():
+                    logger.debug("Verifying all %s resources have been removed from vim", resource_type)
+                    vim_resource_ids = [
+                        vim_resource['id'] for vim_resource in vim_resources[resource_type]
+                        if 'shared' not in vim_resource.keys()
+                        or not vim_resource['shared']
+                    ]
+                    for ns_resource_id in ns_cloud_resources[resource_type]:
+                        logger.debug('Verifying %s resource %s removed', resource_type, ns_resource_id)
+                        assert ns_resource_id not in vim_resource_ids
+                return
+            except AssertionError:
+                time.sleep(10)
+        raise AssertionError("Resources not cleared from openstack")
+
+    def test_delete_records(self, nsd_proxy, vnfd_proxy, iteration):
         """Delete the NSD & VNFD records
 
         Asserts:
             The records are deleted.
         """
-        nsds = nsd_proxy.get("/nsd-catalog/nsd", list_obj=True)
+        # We are instantiating the NS twice in port-sequencing test. Seconds NS instantiation will be using already uploaded
+        # descriptors with updated interface positional values.
+        if iteration==0 and pytest.config.getoption("--port-sequencing"):
+            pytest.skip()
+        nsds = nsd_proxy.get("/rw-project:project[rw-project:name='default']/nsd-catalog/nsd", list_obj=True)
         for nsd in nsds.nsd:
-            xpath = "/nsd-catalog/nsd[id='{}']".format(nsd.id)
+            xpath = "/rw-project:project[rw-project:name='default']/nsd-catalog/nsd[id={}]".format(quoted_key(nsd.id))
             nsd_proxy.delete_config(xpath)
 
-        nsds = nsd_proxy.get("/nsd-catalog/nsd", list_obj=True)
+        nsds = nsd_proxy.get("/rw-project:project[rw-project:name='default']/nsd-catalog/nsd", list_obj=True)
         assert nsds is None or len(nsds.nsd) == 0
 
-        vnfds = vnfd_proxy.get("/vnfd-catalog/vnfd", list_obj=True)
+        vnfds = vnfd_proxy.get("/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd", list_obj=True)
         for vnfd_record in vnfds.vnfd:
-            xpath = "/vnfd-catalog/vnfd[id='{}']".format(vnfd_record.id)
+            xpath = "/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd[id={}]".format(quoted_key(vnfd_record.id))
             vnfd_proxy.delete_config(xpath)
 
-        vnfds = vnfd_proxy.get("/vnfd-catalog/vnfd", list_obj=True)
+        vnfds = vnfd_proxy.get("/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd", list_obj=True)
         assert vnfds is None or len(vnfds.vnfd) == 0