Remove orchestra testcases

They are incompatible with Pike and they have to be removed without
any deep update.

The testcases will be re-renabled if updated before 03/16/18.

Change-Id: Ibf656db6ba4177eae44feb41cd5d314b7408d4de
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

7 files changed, 0 insertions, 1548 deletions

diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml
index 8e8de4aaa..dbf470dd0 100644
--- a/docker/vnf/testcases.yaml
+++ b/docker/vnf/testcases.yaml
@@ -38,37 +38,6 @@ tiers:
                     class: 'CloudifyVrouter'
 
             -
-                case_name: orchestra_openims
-                project_name: orchestra
-                enabled: false
-                criteria: 100
-                blocking: false
-                description: >-
-                    OpenIMS VNF deployment with Open Baton (Orchestra)
-                dependencies:
-                    installer: ''
-                    scenario: 'os-nosdn-nofeature-.*ha'
-                run:
-                    module: 'functest.opnfv_tests.vnf.ims.orchestra_openims'
-                    class: 'OpenImsVnf'
-
-            -
-                case_name: orchestra_clearwaterims
-                project_name: orchestra
-                enabled: false
-                criteria: 100
-                blocking: false
-                description: >-
-                    ClearwaterIMS VNF deployment with Open Baton (Orchestra)
-                dependencies:
-                    installer: ''
-                    scenario: 'os-nosdn-nofeature-.*ha'
-                run:
-                    module:
-                        'functest.opnfv_tests.vnf.ims.orchestra_clearwaterims'
-                    class: 'ClearwaterImsVnf'
-
-            -
                 case_name: juju_epc
                 project_name: functest
                 criteria: 100
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 0b7ae4f49..7cbe0e69f 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -398,37 +398,6 @@ tiers:
                     class: 'CloudifyVrouter'
 
             -
-                case_name: orchestra_openims
-                project_name: orchestra
-                enabled: false
-                criteria: 100
-                blocking: false
-                description: >-
-                    OpenIMS VNF deployment with Open Baton (Orchestra)
-                dependencies:
-                    installer: ''
-                    scenario: 'os-nosdn-nofeature-.*ha'
-                run:
-                    module: 'functest.opnfv_tests.vnf.ims.orchestra_openims'
-                    class: 'OpenImsVnf'
-
-            -
-                case_name: orchestra_clearwaterims
-                project_name: orchestra
-                enabled: false
-                criteria: 100
-                blocking: false
-                description: >-
-                    ClearwaterIMS VNF deployment with Open Baton (Orchestra)
-                dependencies:
-                    installer: ''
-                    scenario: 'os-nosdn-nofeature-.*ha'
-                run:
-                    module:
-                        'functest.opnfv_tests.vnf.ims.orchestra_clearwaterims'
-                    class: 'ClearwaterImsVnf'
-
-            -
                 case_name: juju_epc
                 project_name: functest
                 criteria: 100
diff --git a/functest/opnfv_tests/vnf/ims/orchestra.yaml b/functest/opnfv_tests/vnf/ims/orchestra.yaml
deleted file mode 100644
index 905dcd800..000000000
--- a/functest/opnfv_tests/vnf/ims/orchestra.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-tenant_images:
-    orchestrator:
-        ubuntu-14.04-server-cloudimg-amd64-disk1:
-            /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-amd64-disk1.img
-    orchestra_openims:
-        openims: /home/opnfv/functest/images/img
-    orchestra_clearwaterims:
-        ubuntu-14.04-server-cloudimg-amd64-disk1:
-            /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-amd64-disk1.img
-mano:
-    name: OpenBaton
-    version: '3.2.0'
-    requirements:
-        flavor:
-            name: openbaton
-            ram_min: 4096
-            disk: 5
-            vcpus: 2
-        image: 'ubuntu-14.04-server-cloudimg-amd64-disk1'
-    bootstrap:
-        url: http://get.openbaton.org/bootstraps/bootstrap_3.2.0_opnfv/bootstrap
-        config:
-            url:
-                http://get.openbaton.org/bootstraps/bootstrap_3.2.0_opnfv/bootstrap-config-file
-    gvnfm:
-        userdata:
-            url:
-                https://raw.githubusercontent.com/openbaton/generic-vnfm/3.2.0/src/main/resources/user-data.sh
-    credentials:
-        username: admin
-        password: openbaton
-
-orchestra_openims:
-    name: OpenIMS
-    descriptor:
-        url:
-            http://marketplace.openbaton.org:8080/api/v1/nsds/fokus/OpenImsCore/3.2.0/json
-    requirements:
-        flavor:
-            name: m1.small
-            ram_min: 2048
-            disk: 5
-            vcpus: 2
-    test:
-        scscf:
-            ports: [3870, 6060]
-        pcscf:
-            ports: [4060]
-        icscf:
-            ports: [3869, 5060]
-        fhoss:
-            ports: [3868]
-        bind9:
-            ports: []
-
-orchestra_clearwaterims:
-    name: Clearwater IMS
-    descriptor:
-        url:
-            http://marketplace.openbaton.org:8080/api/v1/nsds/fokus/ClearwaterIMS/3.2.0/json
-    requirements:
-        flavor:
-            name: m1.small
-            ram_min: 2048
-            disk: 5
-            vcpus: 2
-    test:
diff --git a/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py b/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py
deleted file mode 100644
index 2b458e8c1..000000000
--- a/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py
+++ /dev/null
@@ -1,576 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (c) 2016 Orange and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-
-"""Orchestra Clearwater IMS testcase implementation."""
-
-import json
-import logging
-import os
-import socket
-import time
-
-import pkg_resources
-import yaml
-
-from functest.core import vnf
-from functest.opnfv_tests.openstack.snaps import snaps_utils
-from functest.utils import config
-from functest.utils import env
-
-from org.openbaton.cli.errors.errors import NfvoException
-from org.openbaton.cli.agents.agents import MainAgent
-from snaps.config.flavor import FlavorConfig
-from snaps.config.image import ImageConfig
-from snaps.config.network import NetworkConfig, PortConfig, SubnetConfig
-from snaps.config.router import RouterConfig
-from snaps.config.security_group import (
-    Direction, Protocol, SecurityGroupConfig, SecurityGroupRuleConfig)
-from snaps.config.vm_inst import FloatingIpConfig
-from snaps.config.vm_inst import VmInstanceConfig
-from snaps.openstack.utils import keystone_utils
-from snaps.openstack.create_flavor import OpenStackFlavor
-from snaps.openstack.create_image import OpenStackImage
-from snaps.openstack.create_instance import OpenStackVmInstance
-from snaps.openstack.create_network import OpenStackNetwork
-from snaps.openstack.create_router import OpenStackRouter
-from snaps.openstack.create_security_group import OpenStackSecurityGroup
-
-
-__author__ = "Pauls, Michael <michael.pauls@fokus.fraunhofer.de>"
-# ----------------------------------------------------------
-#
-#               UTILS
-#
-# -----------------------------------------------------------
-
-
-def get_config(parameter, file_path):
-    """
-    Get config parameter.
-
-    Returns the value of a given parameter in file.yaml
-    parameter must be given in string format with dots
-    Example: general.openstack.image_name
-    """
-    with open(file_path) as config_file:
-        file_yaml = yaml.safe_load(config_file)
-    config_file.close()
-    value = file_yaml
-    for element in parameter.split("."):
-        value = value.get(element)
-        if value is None:
-            raise ValueError("The parameter %s is not defined in"
-                             " reporting.yaml", parameter)
-    return value
-
-
-def servertest(host, port):
-    """Method to test that a server is reachable at IP:port"""
-    args = socket.getaddrinfo(host, port, socket.AF_INET, socket.SOCK_STREAM)
-    for family, socktype, proto, _, sockaddr in args:
-        sock = socket.socket(family, socktype, proto)
-        try:
-            sock.connect(sockaddr)
-        except socket.error:
-            return False
-        else:
-            sock.close()
-            return True
-
-
-def get_userdata(orchestrator=dict):
-    """Build userdata for Open Baton machine"""
-    userdata = "#!/bin/bash\n"
-    userdata += "echo \"Executing userdata...\"\n"
-    userdata += "set -x\n"
-    userdata += "set -e\n"
-    userdata += "echo \"Install curl...\"\n"
-    userdata += "apt-get install curl\n"
-    userdata += "echo \"Inject public key...\"\n"
-    userdata += ("echo \"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCuPXrV3"
-                 "geeHc6QUdyUr/1Z+yQiqLcOskiEGBiXr4z76MK4abiFmDZ18OMQlc"
-                 "fl0p3kS0WynVgyaOHwZkgy/DIoIplONVr2CKBKHtPK+Qcme2PVnCtv"
-                 "EqItl/FcD+1h5XSQGoa+A1TSGgCod/DPo+pes0piLVXP8Ph6QS1k7S"
-                 "ic7JDeRQ4oT1bXYpJ2eWBDMfxIWKZqcZRiGPgMIbJ1iEkxbpeaAd9O"
-                 "4MiM9nGCPESmed+p54uYFjwEDlAJZShcAZziiZYAvMZhvAhe6USljc"
-                 "7YAdalAnyD/jwCHuwIrUw/lxo7UdNCmaUxeobEYyyFA1YVXzpNFZya"
-                 "XPGAAYIJwEq/ openbaton@opnfv\" >> /home/ubuntu/.ssh/aut"
-                 "horized_keys\n")
-    userdata += "echo \"Download bootstrap...\"\n"
-    userdata += ("curl -s %s "
-                 "> ./bootstrap\n" % orchestrator['bootstrap']['url'])
-    userdata += ("curl -s %s" "> ./config_file\n" %
-                 orchestrator['bootstrap']['config']['url'])
-    userdata += ("echo \"Disable usage of mysql...\"\n")
-    userdata += "sed -i s/mysql=.*/mysql=no/g /config_file\n"
-    userdata += "echo \"Set autostart of components to 'false'\"\n"
-    userdata += "export OPENBATON_COMPONENT_AUTOSTART=false\n"
-    userdata += "echo \"Execute bootstrap...\"\n"
-    bootstrap = "sh ./bootstrap release -configFile=./config_file"
-    userdata += bootstrap + "\n"
-    userdata += "echo \"Setting 'nfvo.plugin.timeout' to '300000'\"\n"
-    userdata += ("echo \"nfvo.plugin.timeout=600000\" >> "
-                 "/etc/openbaton/openbaton-nfvo.properties\n")
-    userdata += (
-        "wget %s -O /etc/openbaton/openbaton-vnfm-generic-user-data.sh\n" %
-        orchestrator['gvnfm']['userdata']['url'])
-    userdata += "sed -i '113i"'\ \ \ \ '"sleep 60' " \
-                "/etc/openbaton/openbaton-vnfm-generic-user-data.sh\n"
-    userdata += ("sed -i s/nfvo.marketplace.port=8082/nfvo.marketplace."
-                 "port=8080/g /etc/openbaton/openbaton-nfvo.properties\n")
-    userdata += "echo \"Starting NFVO\"\n"
-    userdata += "service openbaton-nfvo restart\n"
-    userdata += "echo \"Starting Generic VNFM\"\n"
-    userdata += "service openbaton-vnfm-generic restart\n"
-    userdata += "echo \"...end of userdata...\"\n"
-    return userdata
-
-
-class ClearwaterImsVnf(vnf.VnfOnBoarding):
-    """Clearwater IMS VNF deployed with openBaton orchestrator"""
-
-    # logger = logging.getLogger(__name__)
-
-    def __init__(self, **kwargs):
-        if "case_name" not in kwargs:
-            kwargs["case_name"] = "orchestra_clearwaterims"
-        super(ClearwaterImsVnf, self).__init__(**kwargs)
-        self.logger = logging.getLogger("functest.ci.run_tests.orchestra")
-        self.logger.info("kwargs %s", (kwargs))
-
-        self.case_dir = pkg_resources.resource_filename(
-            'functest', 'opnfv_tests/vnf/ims/')
-        self.data_dir = getattr(config.CONF, 'dir_ims_data')
-        self.test_dir = getattr(config.CONF, 'dir_repo_vims_test')
-        self.created_resources = []
-        self.logger.info("%s VNF onboarding test starting", self.case_name)
-
-        try:
-            self.config = getattr(
-                config.CONF, 'vnf_{}_config'.format(self.case_name))
-        except BaseException:
-            raise Exception("Orchestra VNF config file not found")
-
-        config_file = self.case_dir + self.config
-
-        self.mano = dict(
-            get_config("mano", config_file),
-            details={}
-        )
-        self.logger.debug("Orchestrator configuration %s", self.mano)
-
-        self.details['orchestrator'] = dict(
-            name=self.mano['name'],
-            version=self.mano['version'],
-            status='ERROR',
-            result=''
-        )
-
-        self.vnf = dict(
-            get_config(self.case_name, config_file),
-        )
-        self.logger.debug("VNF configuration: %s", self.vnf)
-
-        self.details['vnf'] = dict(
-            name=self.vnf['name'],
-        )
-
-        self.details['test_vnf'] = dict(
-            name=self.case_name,
-        )
-
-        # Orchestra base Data directory creation
-        if not os.path.exists(self.data_dir):
-            os.makedirs(self.data_dir)
-
-        self.images = get_config("tenant_images.orchestrator", config_file)
-        self.images.update(
-            get_config(
-                "tenant_images.%s" %
-                self.case_name,
-                config_file))
-        self.creds = None
-        self.orchestra_router = None
-
-    def prepare(self):
-        """Prepare testscase (Additional pre-configuration steps)."""
-        super(ClearwaterImsVnf, self).prepare()
-
-        self.logger.info("Additional pre-configuration steps")
-
-        public_auth_url = keystone_utils.get_endpoint(
-            self.snaps_creds, 'identity')
-        self.creds = {
-            "tenant": self.snaps_creds.project_name,
-            "username": self.snaps_creds.username,
-            "password": self.snaps_creds.password,
-            "auth_url": public_auth_url}
-        self.prepare_images()
-        self.prepare_flavor()
-        self.prepare_security_groups()
-        self.prepare_network()
-
-    def prepare_images(self):
-        """Upload images if they doen't exist yet"""
-        self.logger.info("Upload images if they doen't exist yet")
-        for image_name, image_file in self.images.iteritems():
-            self.logger.info("image: %s, file: %s", image_name, image_file)
-            if image_file and image_name:
-                image = OpenStackImage(
-                    self.snaps_creds,
-                    ImageConfig(name=image_name,
-                                image_user='cloud',
-                                img_format='qcow2',
-                                image_file=image_file,
-                                public=True))
-                image.create()
-                self.created_resources.append(image)
-
-    def prepare_security_groups(self):
-        """Create Open Baton security group if it doesn't exist yet"""
-        self.logger.info(
-            "Creating security group for Open Baton if not yet existing...")
-        sg_rules = list()
-        sg_rules.append(
-            SecurityGroupRuleConfig(
-                sec_grp_name="orchestra-sec-group-allowall-{}".format(
-                    self.uuid),
-                direction=Direction.ingress,
-                protocol=Protocol.tcp,
-                port_range_min=1,
-                port_range_max=65535))
-        sg_rules.append(
-            SecurityGroupRuleConfig(
-                sec_grp_name="orchestra-sec-group-allowall-{}".format(
-                    self.uuid),
-                direction=Direction.egress,
-                protocol=Protocol.tcp,
-                port_range_min=1,
-                port_range_max=65535))
-        sg_rules.append(
-            SecurityGroupRuleConfig(
-                sec_grp_name="orchestra-sec-group-allowall-{}".format(
-                    self.uuid),
-                direction=Direction.ingress,
-                protocol=Protocol.udp,
-                port_range_min=1,
-                port_range_max=65535))
-        sg_rules.append(
-            SecurityGroupRuleConfig(
-                sec_grp_name="orchestra-sec-group-allowall-{}".format(
-                    self.uuid),
-                direction=Direction.egress,
-                protocol=Protocol.udp,
-                port_range_min=1,
-                port_range_max=65535))
-        sg_rules.append(
-            SecurityGroupRuleConfig(
-                sec_grp_name="orchestra-sec-group-allowall-{}".format(
-                    self.uuid),
-                direction=Direction.ingress,
-                protocol=Protocol.icmp))
-        sg_rules.append(
-            SecurityGroupRuleConfig(
-                sec_grp_name="orchestra-sec-group-allowall-{}".format(
-                    self.uuid),
-                direction=Direction.egress,
-                protocol=Protocol.icmp))
-        security_group = OpenStackSecurityGroup(
-            self.snaps_creds,
-            SecurityGroupConfig(
-                name="orchestra-sec-group-allowall-{}".format(
-                    self.uuid),
-                rule_settings=sg_rules))
-        security_group_info = security_group.create()
-        self.created_resources.append(security_group)
-        self.mano['details']['sec_group'] = security_group_info.name
-        self.logger.info(
-            "Security group orchestra-sec-group-allowall prepared")
-
-    def prepare_flavor(self):
-        """Create Open Baton flavor if it doesn't exist yet"""
-        self.logger.info(
-            "Create Flavor for Open Baton NFVO if not yet existing")
-
-        flavor_settings = FlavorConfig(
-            name=self.mano['requirements']['flavor']['name'],
-            ram=self.mano['requirements']['flavor']['ram_min'],
-            disk=self.mano['requirements']['flavor']['disk'],
-            vcpus=self.mano['requirements']['flavor']['vcpus'])
-        flavor = OpenStackFlavor(self.snaps_creds, flavor_settings)
-        flavor_info = flavor.create()
-        self.created_resources.append(flavor)
-        self.mano['details']['flavor'] = {}
-        self.mano['details']['flavor']['name'] = flavor_settings.name
-        self.mano['details']['flavor']['id'] = flavor_info.id
-
-    def prepare_network(self):
-        """Create network/subnet/router if they doen't exist yet"""
-        self.logger.info(
-            "Creating network/subnet/router if they doen't exist yet...")
-        subnet_settings = SubnetConfig(
-            name='{}_subnet-{}'.format(self.case_name, self.uuid),
-            cidr="192.168.100.0/24",
-            dns_nameservers=[env.get('NAMESERVER')])
-        network_settings = NetworkConfig(
-            name='{}_net-{}'.format(self.case_name, self.uuid),
-            subnet_settings=[subnet_settings])
-        orchestra_network = OpenStackNetwork(
-            self.snaps_creds, network_settings)
-        orchestra_network_info = orchestra_network.create()
-        self.mano['details']['network'] = {}
-        self.mano['details']['network']['id'] = orchestra_network_info.id
-        self.mano['details']['network']['name'] = orchestra_network_info.name
-        self.mano['details']['external_net_name'] = snaps_utils.\
-            get_ext_net_name(self.snaps_creds)
-        self.created_resources.append(orchestra_network)
-        self.orchestra_router = OpenStackRouter(
-            self.snaps_creds,
-            RouterConfig(
-                name='{}_router-{}'.format(self.case_name, self.uuid),
-                external_gateway=self.mano['details']['external_net_name'],
-                internal_subnets=[
-                    subnet_settings.name]))
-        self.orchestra_router.create()
-        self.created_resources.append(self.orchestra_router)
-        self.logger.info("Created network and router for Open Baton NFVO...")
-
-    def get_vim_descriptor(self):
-        """"Create VIM descriptor to be used for onboarding"""
-        self.logger.info(
-            "Building VIM descriptor with PoP creds: %s",
-            self.creds)
-        self.logger.debug("VIM project/tenant id: %s",
-                          self.snaps_creds.project_name)
-        keystone = keystone_utils.keystone_client(self.snaps_creds)
-        project_id = keystone_utils.get_project(
-            keystone=keystone, project_name=self.snaps_creds.project_name).id
-        vim_json = {
-            "name": "vim-instance",
-            "authUrl": self.creds.get("auth_url"),
-            "tenant": project_id,
-            "username": self.creds.get("username"),
-            "password": self.creds.get("password"),
-            "securityGroups": [
-                self.mano['details']['sec_group']
-            ],
-            "type": "openstack",
-            "location": {
-                "name": "opnfv",
-                "latitude": "52.525876",
-                "longitude": "13.314400"
-            }
-        }
-        self.logger.info("Built VIM descriptor: %s", vim_json)
-        return vim_json
-
-    def deploy_orchestrator(self):
-        self.logger.info("Deploying Open Baton...")
-        self.logger.info("Details: %s", self.mano['details'])
-        start_time = time.time()
-
-        self.logger.info("Creating orchestra instance...")
-        userdata = get_userdata(self.mano)
-        self.logger.info("flavor: %s\n"
-                         "image: %s\n"
-                         "network_id: %s\n",
-                         self.mano['details']['flavor']['name'],
-                         self.mano['requirements']['image'],
-                         self.mano['details']['network']['id'])
-        self.logger.debug("userdata: %s\n", userdata)
-        # setting up image
-        image_settings = ImageConfig(
-            name=self.mano['requirements']['image'],
-            image_user='ubuntu',
-            exists=True)
-        # setting up port
-        port_settings = PortConfig(
-            name='{}_port-{}'.format(self.case_name, self.uuid),
-            network_name=self.mano['details']['network']['name'])
-
-        # build configuration of vm
-        orchestra_settings = VmInstanceConfig(
-            name=self.case_name,
-            flavor=self.mano['details']['flavor']['name'],
-            port_settings=[port_settings],
-            security_group_names=[self.mano['details']['sec_group']],
-            floating_ip_settings=[FloatingIpConfig(
-                name='orchestra_fip-{}'.format(self.uuid),
-                port_name=port_settings.name,
-                router_name=self.orchestra_router.router_settings.name)],
-            userdata=str(userdata))
-        orchestra_vm = OpenStackVmInstance(
-            self.snaps_creds, orchestra_settings, image_settings)
-        orchestra_vm.create()
-        self.mano['details']['fip'] = orchestra_vm.get_floating_ip()
-        self.created_resources.append(orchestra_vm)
-        self.mano['details']['id'] = orchestra_vm.get_vm_info()['id']
-        self.logger.info(
-            "Created orchestra instance: %s", self.mano['details']['id'])
-        self.logger.info("Waiting for Open Baton NFVO to be up and running...")
-        timeout = 0
-        while timeout < 20:
-            if servertest(
-                    self.mano['details']['fip'].ip,
-                    "8080"):
-                break
-            else:
-                self.logger.info(
-                    "Open Baton NFVO is not started yet (%ss)",
-                    (timeout * 60))
-                time.sleep(60)
-                timeout += 1
-
-        if timeout >= 20:
-            duration = time.time() - start_time
-            self.details["orchestrator"].update(
-                status='FAIL', duration=duration)
-            self.logger.error("Open Baton is not started correctly")
-            return False
-
-        self.logger.info("Waiting for all components to be up and running...")
-        time.sleep(60)
-        duration = time.time() - start_time
-        self.details["orchestrator"].update(status='PASS', duration=duration)
-        self.logger.info("Deploy Open Baton NFVO: OK")
-        return True
-
-    def deploy_vnf(self):
-        start_time = time.time()
-        self.logger.info("Deploying %s...", self.vnf['name'])
-
-        main_agent = MainAgent(
-            nfvo_ip=self.mano['details']['fip'].ip,
-            nfvo_port=8080,
-            https=False,
-            version=1,
-            username=self.mano['credentials']['username'],
-            password=self.mano['credentials']['password'])
-
-        self.logger.info(
-            "Create %s Flavor if not existing", self.vnf['name'])
-        flavor_settings = FlavorConfig(
-            name=self.vnf['requirements']['flavor']['name'],
-            ram=self.vnf['requirements']['flavor']['ram_min'],
-            disk=self.vnf['requirements']['flavor']['disk'],
-            vcpus=self.vnf['requirements']['flavor']['vcpus'])
-        flavor = OpenStackFlavor(self.snaps_creds, flavor_settings)
-        flavor_info = flavor.create()
-        self.logger.debug("Flavor id: %s", flavor_info.id)
-
-        self.logger.info("Getting project 'default'...")
-        project_agent = main_agent.get_agent("project", "")
-        for project in json.loads(project_agent.find()):
-            if project.get("name") == "default":
-                self.mano['details']['project_id'] = project.get("id")
-                self.logger.info("Found project 'default': %s", project)
-                break
-
-        vim_json = self.get_vim_descriptor()
-        self.logger.info("Registering VIM: %s", vim_json)
-
-        main_agent.get_agent(
-            "vim", project_id=self.mano['details']['project_id']).create(
-                entity=json.dumps(vim_json))
-
-        market_agent = main_agent.get_agent(
-            "market", project_id=self.mano['details']['project_id'])
-
-        try:
-            self.logger.info("sending: %s", self.vnf['descriptor']['url'])
-            nsd = market_agent.create(entity=self.vnf['descriptor']['url'])
-            if nsd.get('id') is None:
-                self.logger.error("NSD not onboarded correctly")
-                duration = time.time() - start_time
-                self.details["vnf"].update(status='FAIL', duration=duration)
-                return False
-            self.mano['details']['nsd_id'] = nsd.get('id')
-            self.logger.info("Onboarded NSD: " + nsd.get("name"))
-
-            nsr_agent = main_agent.get_agent(
-                "nsr", project_id=self.mano['details']['project_id'])
-
-            self.mano['details']['nsr'] = nsr_agent.create(
-                self.mano['details']['nsd_id'])
-        except NfvoException:
-            self.logger.exception("failed")
-            duration = time.time() - start_time
-            self.details["vnf"].update(status='FAIL', duration=duration)
-            return False
-
-        if self.mano['details']['nsr'].get('code') is not None:
-            self.logger.error(
-                "%s cannot be deployed: %s -> %s",
-                self.vnf['name'],
-                self.mano['details']['nsr'].get('code'),
-                self.mano['details']['nsr'].get('message'))
-            self.logger.error("%s cannot be deployed", self.vnf['name'])
-            duration = time.time() - start_time
-            self.details["vnf"].update(status='FAIL', duration=duration)
-            return False
-
-        timeout = 0
-        self.logger.info("Waiting for NSR to go to ACTIVE...")
-        while self.mano['details']['nsr'].get("status") != 'ACTIVE' \
-                and self.mano['details']['nsr'].get("status") != 'ERROR':
-            timeout += 1
-            self.logger.info("NSR is not yet ACTIVE... (%ss)", 60 * timeout)
-            if timeout == 30:
-                self.logger.error("INACTIVE NSR after %s sec..", 60 * timeout)
-                duration = time.time() - start_time
-                self.details["vnf"].update(status='FAIL', duration=duration)
-                return False
-            time.sleep(60)
-            self.mano['details']['nsr'] = json.loads(
-                nsr_agent.find(self.mano['details']['nsr'].get('id')))
-
-        duration = time.time() - start_time
-        if self.mano['details']['nsr'].get("status") == 'ACTIVE':
-            self.details["vnf"].update(status='PASS', duration=duration)
-            self.logger.info("Sleep for 60s to ensure that all "
-                             "services are up and running...")
-            time.sleep(60)
-            result = True
-        else:
-            self.details["vnf"].update(status='FAIL', duration=duration)
-            self.logger.error("NSR: %s", self.mano['details'].get('nsr'))
-            result = False
-        return result
-
-    def test_vnf(self):
-        self.logger.info(
-            "Testing VNF Clearwater IMS is not yet implemented...")
-        start_time = time.time()
-
-        duration = time.time() - start_time
-        self.details["test_vnf"].update(status='PASS', duration=duration)
-        self.logger.info("Test VNF: OK")
-        return True
-
-    def clean(self):
-        self.logger.info("Cleaning %s...", self.case_name)
-        try:
-            main_agent = MainAgent(
-                nfvo_ip=self.mano['details']['fip'].ip,
-                nfvo_port=8080, https=False, version=1,
-                username=self.mano['credentials']['username'],
-                password=self.mano['credentials']['password'])
-            self.logger.info("Terminating %s...", self.vnf['name'])
-            if self.mano['details'].get('nsr'):
-                main_agent.get_agent(
-                    "nsr",
-                    project_id=self.mano['details']['project_id']).delete(
-                        self.mano['details']['nsr'].get('id'))
-                self.logger.info("Sleeping 60 seconds...")
-                time.sleep(60)
-            else:
-                self.logger.info("No need to terminate the VNF...")
-        except (NfvoException, KeyError) as exc:
-            self.logger.error('Unexpected error cleaning - %s', exc)
-        super(ClearwaterImsVnf, self).clean()
diff --git a/functest/opnfv_tests/vnf/ims/orchestra_openims.py b/functest/opnfv_tests/vnf/ims/orchestra_openims.py
deleted file mode 100644
index 5615b6ac7..000000000
--- a/functest/opnfv_tests/vnf/ims/orchestra_openims.py
+++ /dev/null
@@ -1,600 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (c) 2016 Orange and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-
-"""Orchestra OpenIMS testcase implementation."""
-
-import json
-import logging
-import os
-import socket
-import time
-import pkg_resources
-import yaml
-
-from functest.core import vnf
-from functest.utils import config
-from functest.utils import env
-
-from org.openbaton.cli.errors.errors import NfvoException
-from org.openbaton.cli.agents.agents import MainAgent
-from snaps.config.flavor import FlavorConfig
-from snaps.config.image import ImageConfig
-from snaps.config.network import NetworkConfig, PortConfig, SubnetConfig
-from snaps.config.router import RouterConfig
-from snaps.config.security_group import (
-    Direction, Protocol, SecurityGroupConfig, SecurityGroupRuleConfig)
-from snaps.config.vm_inst import FloatingIpConfig
-from snaps.config.vm_inst import VmInstanceConfig
-from snaps.openstack.utils import keystone_utils
-from snaps.openstack.create_image import OpenStackImage
-from snaps.openstack.create_flavor import OpenStackFlavor
-from snaps.openstack.create_security_group import OpenStackSecurityGroup
-from snaps.openstack.create_network import OpenStackNetwork
-from snaps.openstack.create_router import OpenStackRouter
-from snaps.openstack.create_instance import OpenStackVmInstance
-
-from functest.opnfv_tests.openstack.snaps import snaps_utils
-
-
-__author__ = "Pauls, Michael <michael.pauls@fokus.fraunhofer.de>"
-# ----------------------------------------------------------
-#
-#               UTILS
-#
-# -----------------------------------------------------------
-
-
-def get_config(parameter, file_path):
-    """
-    Get config parameter.
-
-    Returns the value of a given parameter in file.yaml
-    parameter must be given in string format with dots
-    Example: general.openstack.image_name
-    """
-    with open(file_path) as config_file:
-        file_yaml = yaml.safe_load(config_file)
-    config_file.close()
-    value = file_yaml
-    for element in parameter.split("."):
-        value = value.get(element)
-        if value is None:
-            raise ValueError("The parameter %s is not defined in"
-                             " reporting.yaml", parameter)
-    return value
-
-
-def servertest(host, port):
-    """Method to test that a server is reachable at IP:port"""
-    args = socket.getaddrinfo(host, port, socket.AF_INET, socket.SOCK_STREAM)
-    for family, socktype, proto, _, sockaddr in args:
-        sock = socket.socket(family, socktype, proto)
-        try:
-            sock.connect(sockaddr)
-        except socket.error:
-            return False
-        else:
-            sock.close()
-            return True
-
-
-def get_userdata(orchestrator=dict):
-    """Build userdata for Open Baton machine"""
-    userdata = "#!/bin/bash\n"
-    userdata += "echo \"Executing userdata...\"\n"
-    userdata += "set -x\n"
-    userdata += "set -e\n"
-    userdata += "echo \"Install curl...\"\n"
-    userdata += "apt-get install curl\n"
-    userdata += "echo \"Inject public key...\"\n"
-    userdata += ("echo \"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCuPXrV3"
-                 "geeHc6QUdyUr/1Z+yQiqLcOskiEGBiXr4z76MK4abiFmDZ18OMQlc"
-                 "fl0p3kS0WynVgyaOHwZkgy/DIoIplONVr2CKBKHtPK+Qcme2PVnCtv"
-                 "EqItl/FcD+1h5XSQGoa+A1TSGgCod/DPo+pes0piLVXP8Ph6QS1k7S"
-                 "ic7JDeRQ4oT1bXYpJ2eWBDMfxIWKZqcZRiGPgMIbJ1iEkxbpeaAd9O"
-                 "4MiM9nGCPESmed+p54uYFjwEDlAJZShcAZziiZYAvMZhvAhe6USljc"
-                 "7YAdalAnyD/jwCHuwIrUw/lxo7UdNCmaUxeobEYyyFA1YVXzpNFZya"
-                 "XPGAAYIJwEq/ openbaton@opnfv\" >> /home/ubuntu/.ssh/aut"
-                 "horized_keys\n")
-    userdata += "echo \"Download bootstrap...\"\n"
-    userdata += ("curl -s %s "
-                 "> ./bootstrap\n" % orchestrator['bootstrap']['url'])
-    userdata += ("curl -s %s" "> ./config_file\n" %
-                 orchestrator['bootstrap']['config']['url'])
-    userdata += ("echo \"Disable usage of mysql...\"\n")
-    userdata += "sed -i s/mysql=.*/mysql=no/g /config_file\n"
-    userdata += "echo \"Set autostart of components to 'false'\"\n"
-    userdata += "export OPENBATON_COMPONENT_AUTOSTART=false\n"
-    userdata += "echo \"Execute bootstrap...\"\n"
-    bootstrap = "sh ./bootstrap release -configFile=./config_file"
-    userdata += bootstrap + "\n"
-    userdata += "echo \"Setting 'nfvo.plugin.timeout' to '300000'\"\n"
-    userdata += ("echo \"nfvo.plugin.timeout=600000\" >> "
-                 "/etc/openbaton/openbaton-nfvo.properties\n")
-    userdata += (
-        "wget %s -O /etc/openbaton/openbaton-vnfm-generic-user-data.sh\n" %
-        orchestrator['gvnfm']['userdata']['url'])
-    userdata += "sed -i '113i"'\ \ \ \ '"sleep 60' " \
-                "/etc/openbaton/openbaton-vnfm-generic-user-data.sh\n"
-    userdata += ("sed -i s/nfvo.marketplace.port=8082/nfvo.marketplace."
-                 "port=8080/g /etc/openbaton/openbaton-nfvo.properties\n")
-    userdata += "echo \"Starting NFVO\"\n"
-    userdata += "service openbaton-nfvo restart\n"
-    userdata += "echo \"Starting Generic VNFM\"\n"
-    userdata += "service openbaton-vnfm-generic restart\n"
-    userdata += "echo \"...end of userdata...\"\n"
-    return userdata
-
-
-class OpenImsVnf(vnf.VnfOnBoarding):
-    """OpenIMS VNF deployed with openBaton orchestrator"""
-
-    # logger = logging.getLogger(__name__)
-
-    def __init__(self, **kwargs):
-        if "case_name" not in kwargs:
-            kwargs["case_name"] = "orchestra_openims"
-        super(OpenImsVnf, self).__init__(**kwargs)
-        self.logger = logging.getLogger("functest.ci.run_tests.orchestra")
-        self.logger.info("kwargs %s", (kwargs))
-
-        self.case_dir = pkg_resources.resource_filename(
-            'functest', 'opnfv_tests/vnf/ims/')
-        self.data_dir = getattr(config.CONF, 'dir_ims_data')
-        self.test_dir = getattr(config.CONF, 'dir_repo_vims_test')
-        self.created_resources = []
-        self.logger.info("%s VNF onboarding test starting", self.case_name)
-
-        try:
-            self.config = getattr(
-                config.CONF, 'vnf_{}_config'.format(self.case_name))
-        except BaseException:
-            raise Exception("Orchestra VNF config file not found")
-        config_file = self.case_dir + self.config
-
-        self.mano = dict(
-            get_config("mano", config_file),
-            details={}
-        )
-        self.logger.debug("Orchestrator configuration %s", self.mano)
-
-        self.details['orchestrator'] = dict(
-            name=self.mano['name'],
-            version=self.mano['version'],
-            status='ERROR',
-            result=''
-        )
-
-        self.vnf = dict(
-            get_config(self.case_name, config_file),
-        )
-        self.logger.debug("VNF configuration: %s", self.vnf)
-
-        self.details['vnf'] = dict(
-            name=self.vnf['name'],
-        )
-
-        self.details['test_vnf'] = dict(
-            name=self.case_name,
-        )
-
-        # Orchestra base Data directory creation
-        if not os.path.exists(self.data_dir):
-            os.makedirs(self.data_dir)
-
-        self.images = get_config("tenant_images.orchestrator", config_file)
-        self.images.update(get_config("tenant_images.%s" %
-                                      self.case_name, config_file))
-        self.creds = None
-        self.orchestra_router = None
-
-    def prepare(self):
-        """Prepare testscase (Additional pre-configuration steps)."""
-        super(OpenImsVnf, self).prepare()
-
-        public_auth_url = keystone_utils.get_endpoint(
-            self.snaps_creds, 'identity')
-
-        self.logger.info("Additional pre-configuration steps")
-        self.creds = {
-            "tenant": self.snaps_creds.project_name,
-            "username": self.snaps_creds.username,
-            "password": self.snaps_creds.password,
-            "auth_url": public_auth_url}
-        self.prepare_images()
-        self.prepare_flavor()
-        self.prepare_security_groups()
-        self.prepare_network()
-
-    def prepare_images(self):
-        """Upload images if they doen't exist yet"""
-        self.logger.info("Upload images if they doen't exist yet")
-        for image_name, image_file in self.images.iteritems():
-            self.logger.info("image: %s, file: %s", image_name, image_file)
-            if image_file and image_name:
-                image = OpenStackImage(
-                    self.snaps_creds,
-                    ImageConfig(name=image_name,
-                                image_user='cloud',
-                                img_format='qcow2',
-                                image_file=image_file,
-                                public=True))
-                image.create()
-                self.created_resources.append(image)
-
-    def prepare_security_groups(self):
-        """Create Open Baton security group if it doesn't exist yet"""
-        self.logger.info(
-            "Creating security group for Open Baton if not yet existing...")
-        sg_rules = list()
-        sg_rules.append(
-            SecurityGroupRuleConfig(
-                sec_grp_name="orchestra-sec-group-allowall-{}".format(
-                    self.uuid),
-                direction=Direction.ingress,
-                protocol=Protocol.tcp,
-                port_range_min=1,
-                port_range_max=65535))
-        sg_rules.append(
-            SecurityGroupRuleConfig(
-                sec_grp_name="orchestra-sec-group-allowall-{}".format(
-                    self.uuid),
-                direction=Direction.egress,
-                protocol=Protocol.tcp,
-                port_range_min=1,
-                port_range_max=65535))
-        sg_rules.append(
-            SecurityGroupRuleConfig(
-                sec_grp_name="orchestra-sec-group-allowall-{}".format(
-                    self.uuid),
-                direction=Direction.ingress,
-                protocol=Protocol.udp,
-                port_range_min=1,
-                port_range_max=65535))
-        sg_rules.append(
-            SecurityGroupRuleConfig(
-                sec_grp_name="orchestra-sec-group-allowall-{}".format(
-                    self.uuid),
-                direction=Direction.egress,
-                protocol=Protocol.udp,
-                port_range_min=1,
-                port_range_max=65535))
-        security_group = OpenStackSecurityGroup(
-            self.snaps_creds,
-            SecurityGroupConfig(
-                name="orchestra-sec-group-allowall-{}".format(
-                    self.uuid),
-                rule_settings=sg_rules))
-
-        security_group_info = security_group.create()
-        self.created_resources.append(security_group)
-        self.mano['details']['sec_group'] = security_group_info.name
-        self.logger.info(
-            "Security group orchestra-sec-group-allowall prepared")
-
-    def prepare_flavor(self):
-        """Create Open Baton flavor if it doesn't exist yet"""
-        self.logger.info(
-            "Create Flavor for Open Baton NFVO if not yet existing")
-
-        flavor_settings = FlavorConfig(
-            name=self.mano['requirements']['flavor']['name'],
-            ram=self.mano['requirements']['flavor']['ram_min'],
-            disk=self.mano['requirements']['flavor']['disk'],
-            vcpus=self.mano['requirements']['flavor']['vcpus'])
-        flavor = OpenStackFlavor(self.snaps_creds, flavor_settings)
-        flavor_info = flavor.create()
-        self.created_resources.append(flavor)
-        self.mano['details']['flavor'] = {}
-        self.mano['details']['flavor']['name'] = flavor_settings.name
-        self.mano['details']['flavor']['id'] = flavor_info.id
-
-    def prepare_network(self):
-        """Create network/subnet/router if they doen't exist yet"""
-        self.logger.info(
-            "Creating network/subnet/router if they doen't exist yet...")
-        subnet_settings = SubnetConfig(
-            name='{}_subnet-{}'.format(self.case_name, self.uuid),
-            cidr="192.168.100.0/24",
-            dns_nameservers=[env.get('NAMESERVER')])
-        network_settings = NetworkConfig(
-            name='{}_net-{}'.format(self.case_name, self.uuid),
-            subnet_settings=[subnet_settings])
-        orchestra_network = OpenStackNetwork(
-            self.snaps_creds, network_settings)
-        orchestra_network_info = orchestra_network.create()
-        self.mano['details']['network'] = {}
-        self.mano['details']['network']['id'] = orchestra_network_info.id
-        self.mano['details']['network']['name'] = orchestra_network_info.name
-        self.mano['details']['external_net_name'] = \
-            snaps_utils.get_ext_net_name(self.snaps_creds)
-        self.created_resources.append(orchestra_network)
-        self.orchestra_router = OpenStackRouter(
-            self.snaps_creds,
-            RouterConfig(
-                name='{}_router-{}'.format(self.case_name, self.uuid),
-                external_gateway=self.mano['details']['external_net_name'],
-                internal_subnets=[
-                    subnet_settings.name]))
-        self.orchestra_router.create()
-        self.created_resources.append(self.orchestra_router)
-        self.logger.info("Created network and router for Open Baton NFVO...")
-
-    def get_vim_descriptor(self):
-        """"Create VIM descriptor to be used for onboarding"""
-        self.logger.info(
-            "Building VIM descriptor with PoP creds: %s",
-            self.creds)
-        self.logger.debug("VIM project/tenant id: %s",
-                          self.snaps_creds.project_name)
-        keystone = keystone_utils.keystone_client(self.snaps_creds)
-        project_id = keystone_utils.get_project(
-            keystone=keystone, project_name=self.snaps_creds.project_name).id
-        vim_json = {
-            "name": "vim-instance",
-            "authUrl": self.creds.get("auth_url"),
-            "tenant": project_id,
-            "username": self.creds.get("username"),
-            "password": self.creds.get("password"),
-            "securityGroups": [
-                self.mano['details']['sec_group']
-            ],
-            "type": "openstack",
-            "location": {
-                "name": "opnfv",
-                "latitude": "52.525876",
-                "longitude": "13.314400"
-            }
-        }
-        self.logger.info("Built VIM descriptor: %s", vim_json)
-        return vim_json
-
-    def deploy_orchestrator(self):
-        self.logger.info("Deploying Open Baton...")
-        self.logger.info("Details: %s", self.mano['details'])
-        start_time = time.time()
-
-        self.logger.info("Creating orchestra instance...")
-        userdata = get_userdata(self.mano)
-        self.logger.info("flavor: %s\n"
-                         "image: %s\n"
-                         "network_id: %s\n",
-                         self.mano['details']['flavor']['name'],
-                         self.mano['requirements']['image'],
-                         self.mano['details']['network']['id'])
-        self.logger.debug("userdata: %s\n", userdata)
-        # setting up image
-        image_settings = ImageConfig(
-            name=self.mano['requirements']['image'],
-            image_user='ubuntu',
-            exists=True)
-        # setting up port
-        port_settings = PortConfig(
-            name='{}_port-{}'.format(self.case_name, self.uuid),
-            network_name=self.mano['details']['network']['name'])
-        # build configuration of vm
-        orchestra_settings = VmInstanceConfig(
-            name='{}-{}'.format(self.case_name, self.uuid),
-            flavor=self.mano['details']['flavor']['name'],
-            port_settings=[port_settings],
-            security_group_names=[self.mano['details']['sec_group']],
-            floating_ip_settings=[FloatingIpConfig(
-                name='orchestra_fip-{}'.format(self.uuid),
-                port_name=port_settings.name,
-                router_name=self.orchestra_router.router_settings.name)],
-            userdata=str(userdata))
-        orchestra_vm = OpenStackVmInstance(
-            self.snaps_creds, orchestra_settings, image_settings)
-        orchestra_vm.create()
-        self.mano['details']['fip'] = orchestra_vm.get_floating_ip()
-        self.created_resources.append(orchestra_vm)
-        self.mano['details']['id'] = orchestra_vm.get_vm_info()['id']
-        self.logger.info(
-            "Created orchestra instance: %s", self.mano['details']['id'])
-        self.logger.info("Waiting for Open Baton NFVO to be up and running...")
-        timeout = 0
-        while timeout < 20:
-            if servertest(
-                    self.mano['details']['fip'].ip,
-                    "8080"):
-                break
-            else:
-                self.logger.info("Open Baton NFVO is not started yet (%ss)",
-                                 (timeout * 60))
-                time.sleep(60)
-                timeout += 1
-
-        if timeout >= 20:
-            duration = time.time() - start_time
-            self.details["orchestrator"].update(
-                status='FAIL', duration=duration)
-            self.logger.error("Open Baton is not started correctly")
-            return False
-
-        self.logger.info("Waiting for all components to be up and running...")
-        time.sleep(60)
-        duration = time.time() - start_time
-        self.details["orchestrator"].update(status='PASS', duration=duration)
-        self.logger.info("Deploy Open Baton NFVO: OK")
-        return True
-
-    def deploy_vnf(self):
-        start_time = time.time()
-        self.logger.info("Deploying %s...", self.vnf['name'])
-
-        main_agent = MainAgent(
-            nfvo_ip=self.mano['details']['fip'].ip,
-            nfvo_port=8080,
-            https=False,
-            version=1,
-            username=self.mano['credentials']['username'],
-            password=self.mano['credentials']['password'])
-
-        self.logger.info(
-            "Create %s Flavor if not existing", self.vnf['name'])
-        flavor_settings = FlavorConfig(
-            name=self.vnf['requirements']['flavor']['name'],
-            ram=self.vnf['requirements']['flavor']['ram_min'],
-            disk=self.vnf['requirements']['flavor']['disk'],
-            vcpus=self.vnf['requirements']['flavor']['vcpus'])
-        flavor = OpenStackFlavor(self.snaps_creds, flavor_settings)
-        flavor_info = flavor.create()
-        self.logger.debug("Flavor id: %s", flavor_info.id)
-
-        self.logger.info("Getting project 'default'...")
-        project_agent = main_agent.get_agent("project", "")
-        for project in json.loads(project_agent.find()):
-            if project.get("name") == "default":
-                self.mano['details']['project_id'] = project.get("id")
-                self.logger.info("Found project 'default': %s", project)
-                break
-
-        vim_json = self.get_vim_descriptor()
-        self.logger.info("Registering VIM: %s", vim_json)
-
-        main_agent.get_agent(
-            "vim", project_id=self.mano['details']['project_id']).create(
-                entity=json.dumps(vim_json))
-
-        market_agent = main_agent.get_agent(
-            "market", project_id=self.mano['details']['project_id'])
-
-        try:
-            self.logger.info("sending: %s", self.vnf['descriptor']['url'])
-            nsd = market_agent.create(entity=self.vnf['descriptor']['url'])
-            if nsd.get('id') is None:
-                self.logger.error("NSD not onboarded correctly")
-                duration = time.time() - start_time
-                self.details["vnf"].update(status='FAIL', duration=duration)
-                return False
-            self.mano['details']['nsd_id'] = nsd.get('id')
-            self.logger.info("Onboarded NSD: " + nsd.get("name"))
-
-            nsr_agent = main_agent.get_agent(
-                "nsr", project_id=self.mano['details']['project_id'])
-
-            self.mano['details']['nsr'] = nsr_agent.create(
-                self.mano['details']['nsd_id'])
-        except NfvoException:
-            self.logger.exception("failed")
-            duration = time.time() - start_time
-            self.details["vnf"].update(status='FAIL', duration=duration)
-            return False
-
-        if self.mano['details']['nsr'].get('code') is not None:
-            self.logger.error(
-                "%s cannot be deployed: %s -> %s",
-                self.vnf['name'],
-                self.mano['details']['nsr'].get('code'),
-                self.mano['details']['nsr'].get('message'))
-            self.logger.error("%s cannot be deployed", self.vnf['name'])
-            duration = time.time() - start_time
-            self.details["vnf"].update(status='FAIL', duration=duration)
-            return False
-
-        timeout = 0
-        self.logger.info("Waiting for NSR to go to ACTIVE...")
-        while self.mano['details']['nsr'].get("status") != 'ACTIVE' \
-                and self.mano['details']['nsr'].get("status") != 'ERROR':
-            timeout += 1
-            self.logger.info("NSR is not yet ACTIVE... (%ss)", 60 * timeout)
-            if timeout == 30:
-                self.logger.error("INACTIVE NSR after %s sec..", 60 * timeout)
-                duration = time.time() - start_time
-                self.details["vnf"].update(status='FAIL', duration=duration)
-                return False
-            time.sleep(60)
-            self.mano['details']['nsr'] = json.loads(
-                nsr_agent.find(self.mano['details']['nsr'].get('id')))
-
-        duration = time.time() - start_time
-        if self.mano['details']['nsr'].get("status") == 'ACTIVE':
-            self.details["vnf"].update(status='PASS', duration=duration)
-            self.logger.info("Sleep for 60s to ensure that all "
-                             "services are up and running...")
-            time.sleep(60)
-            result = True
-        else:
-            self.details["vnf"].update(status='FAIL', duration=duration)
-            self.logger.error("NSR: %s", self.mano['details'].get('nsr'))
-            result = False
-        return result
-
-    def test_vnf(self):
-        self.logger.info("Testing VNF OpenIMS...")
-        start_time = time.time()
-        self.logger.info(
-            "Testing if %s works properly...",
-            self.mano['details']['nsr'].get('name'))
-        for vnfr in self.mano['details']['nsr'].get('vnfr'):
-            self.logger.info(
-                "Checking ports %s of VNF %s",
-                self.vnf['test'][vnfr.get('name')]['ports'],
-                vnfr.get('name'))
-            for vdu in vnfr.get('vdu'):
-                for vnfci in vdu.get('vnfc_instance'):
-                    self.logger.debug(
-                        "Checking ports of VNFC instance %s",
-                        vnfci.get('hostname'))
-                    for floating_ip in vnfci.get('floatingIps'):
-                        self.logger.debug(
-                            "Testing %s:%s",
-                            vnfci.get('hostname'),
-                            floating_ip.get('ip'))
-                        for port in self.vnf['test'][vnfr.get(
-                                'name')]['ports']:
-                            if servertest(floating_ip.get('ip'), port):
-                                self.logger.info(
-                                    "VNFC instance %s is reachable at %s:%s",
-                                    vnfci.get('hostname'),
-                                    floating_ip.get('ip'),
-                                    port)
-                            else:
-                                self.logger.error(
-                                    "VNFC instance %s is not reachable "
-                                    "at %s:%s",
-                                    vnfci.get('hostname'),
-                                    floating_ip.get('ip'),
-                                    port)
-                                duration = time.time() - start_time
-                                self.details["test_vnf"].update(
-                                    status='FAIL', duration=duration, esult=(
-                                        "Port %s of server %s -> %s is "
-                                        "not reachable",
-                                        port,
-                                        vnfci.get('hostname'),
-                                        floating_ip.get('ip')))
-                                self.logger.error("Test VNF: ERROR")
-                                return False
-        duration = time.time() - start_time
-        self.details["test_vnf"].update(status='PASS', duration=duration)
-        self.logger.info("Test VNF: OK")
-        return True
-
-    def clean(self):
-        self.logger.info("Cleaning %s...", self.case_name)
-        try:
-            main_agent = MainAgent(
-                nfvo_ip=self.mano['details']['fip'].ip,
-                nfvo_port=8080, https=False, version=1,
-                username=self.mano['credentials']['username'],
-                password=self.mano['credentials']['password'])
-            self.logger.info("Terminating %s...", self.vnf['name'])
-            if self.mano['details'].get('nsr'):
-                main_agent.get_agent(
-                    "nsr",
-                    project_id=self.mano['details']['project_id']).\
-                        delete(self.mano['details']['nsr'].get('id'))
-                self.logger.info("Sleeping 60 seconds...")
-                time.sleep(60)
-            else:
-                self.logger.info("No need to terminate the VNF...")
-        except (NfvoException, KeyError) as exc:
-            self.logger.error('Unexpected error cleaning - %s', exc)
-        super(OpenImsVnf, self).clean()
diff --git a/functest/tests/unit/vnf/ims/test_orchestra_clearwaterims.py b/functest/tests/unit/vnf/ims/test_orchestra_clearwaterims.py
deleted file mode 100644
index 2e83f30a4..000000000
--- a/functest/tests/unit/vnf/ims/test_orchestra_clearwaterims.py
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/usr/bin/env python
-
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-
-"""Test module for orchestra_clearwaterims"""
-
-import logging
-import unittest
-
-import mock
-
-from functest.core import vnf
-from functest.opnfv_tests.vnf.ims import orchestra_clearwaterims
-
-
-class OrchestraClearwaterImsTesting(unittest.TestCase):
-    """Test class for orchestra_clearwaterims"""
-    def setUp(self):
-
-        self.tenant = 'orchestra_clearwaterims'
-        self.creds = {'username': 'mocked_username',
-                      'password': 'mocked_password'}
-        self.tenant_images = {
-            'image1': 'mocked_image_url_1',
-            'image2': 'mocked_image_url_2'
-        }
-        self.mano = {
-            'name': 'openbaton',
-            'version': '3.2.0',
-            'object': 'foo',
-            'requirements': {
-                'flavor': {
-                    'name': 'mocked_flavor',
-                    'ram_min': 4096,
-                    'disk': 5,
-                    'vcpus': 2
-                },
-                'os_image': 'mocked_image'
-            },
-            'bootstrap': {
-                'url': 'mocked_bootstrap_url',
-                'config': {
-                    'url': 'mocked_config_url'}
-            },
-            'gvnfm': {
-                'userdata': {
-                    'url': 'mocked_userdata_url'
-                }
-            },
-            'credentials': {
-                'username': 'mocked_username',
-                'password': 'mocked_password'
-            }
-        }
-        self.vnf = {
-            'name': 'openims',
-            'descriptor': {
-                'url': 'mocked_descriptor_url'
-            },
-            'requirements': {
-                'flavor': {
-                    'name': 'mocked_flavor',
-                    'ram_min': 2048,
-                    'disk': 5,
-                    'vcpus': 2}
-            }
-        }
-        self.clearwaterims = {
-            'scscf': {
-                'ports': [3870, 6060]
-            },
-            'pcscf': {
-                'ports': [4060]
-            },
-            'icscf': {
-                'ports': [3869, 5060]
-            },
-            'fhoss': {
-                'ports': [3868]
-            },
-            'bind9': {
-                'ports': []
-            }
-        }
-        with mock.patch('functest.opnfv_tests.vnf.ims.orchestra_clearwaterims.'
-                        'os.makedirs'),\
-            mock.patch('functest.opnfv_tests.vnf.ims.orchestra_clearwaterims.'
-                       'get_config', return_value={
-                           'orchestrator': self.mano,
-                           'name': self.mano['name'],
-                           'version': self.mano['version'],
-                           'requirements': self.mano['requirements'],
-                           'credentials': self.mano['credentials'],
-                           'bootstrap': self.mano['bootstrap'],
-                           'gvnfm': self.mano['gvnfm'],
-                           'os_image': self.mano['requirements']['os_image'],
-                           'flavor': self.mano['requirements']['flavor'],
-                           'url': self.mano['bootstrap']['url'],
-                           'config': self.mano['bootstrap']['config'],
-                           'tenant_images': self.tenant_images,
-                           'vnf': self.vnf,
-                           'orchestra_clearwaterims': self.clearwaterims}):
-            self.ims_vnf = orchestra_clearwaterims.ClearwaterImsVnf()
-
-        self.details = {'orchestrator': {'status': 'PASS', 'duration': 120},
-                        'vnf': {},
-                        'test_vnf': {}}
-
-    def test_prepare_missing_param(self):
-        """Testing prepare function with missing param"""
-        with self.assertRaises(vnf.VnfPreparationException):
-            self.ims_vnf.prepare()
-
-
-if __name__ == "__main__":
-    logging.disable(logging.CRITICAL)
-    unittest.main(verbosity=2)
diff --git a/functest/tests/unit/vnf/ims/test_orchestra_openims.py b/functest/tests/unit/vnf/ims/test_orchestra_openims.py
deleted file mode 100644
index 47a8d0338..000000000
--- a/functest/tests/unit/vnf/ims/test_orchestra_openims.py
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/usr/bin/env python
-
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-
-"""Test module for orchestra_openims"""
-
-import logging
-import unittest
-
-import mock
-
-from functest.core import vnf
-from functest.opnfv_tests.vnf.ims import orchestra_openims
-
-
-class OrchestraOpenImsTesting(unittest.TestCase):
-    """Test class for orchestra_openims"""
-    def setUp(self):
-
-        self.tenant = 'orchestra_openims'
-        self.creds = {'username': 'mocked_username',
-                      'password': 'mocked_password'}
-        self.tenant_images = {
-            'image1': 'mocked_image_url_1',
-            'image2': 'mocked_image_url_2'
-        }
-        self.mano = {
-            'name': 'openbaton',
-            'version': '3.2.0',
-            'object': 'foo',
-            'requirements': {
-                'flavor': {
-                    'name': 'mocked_flavor',
-                    'ram_min': 4096,
-                    'disk': 5,
-                    'vcpus': 2
-                },
-                'os_image': 'mocked_image'
-            },
-            'bootstrap': {
-                'url': 'mocked_bootstrap_url',
-                'config': {
-                    'url': 'mocked_config_url'}
-            },
-            'gvnfm': {
-                'userdata': {
-                    'url': 'mocked_userdata_url'
-                }
-            },
-            'credentials': {
-                'username': 'mocked_username',
-                'password': 'mocked_password'
-            }
-        }
-        self.vnf = {
-            'name': 'openims',
-            'descriptor': {
-                'url': 'mocked_descriptor_url'
-            },
-            'requirements': {
-                'flavor': {
-                    'name': 'mocked_flavor',
-                    'ram_min': 2048,
-                    'disk': 5,
-                    'vcpus': 2}
-            }
-        }
-        self.openims = {
-            'scscf': {
-                'ports': [3870, 6060]
-            },
-            'pcscf': {
-                'ports': [4060]
-            },
-            'icscf': {
-                'ports': [3869, 5060]
-            },
-            'fhoss': {
-                'ports': [3868]
-            },
-            'bind9': {
-                'ports': []
-            }
-        }
-        with mock.patch('functest.opnfv_tests.vnf.ims.orchestra_openims.'
-                        'os.makedirs'),\
-            mock.patch('functest.opnfv_tests.vnf.ims.orchestra_openims.'
-                       'get_config', return_value={
-                           'orchestrator': self.mano,
-                           'name': self.mano['name'],
-                           'version': self.mano['version'],
-                           'requirements': self.mano['requirements'],
-                           'credentials': self.mano['credentials'],
-                           'bootstrap': self.mano['bootstrap'],
-                           'gvnfm': self.mano['gvnfm'],
-                           'os_image':
-                               self.mano['requirements']['os_image'],
-                           'flavor':
-                               self.mano['requirements']['flavor'],
-                           'url': self.mano['bootstrap']['url'],
-                           'config': self.mano['bootstrap']['config'],
-                           'tenant_images': self.tenant_images,
-                           'vnf': self.vnf,
-                           'orchestra_openims': self.openims}):
-            self.ims_vnf = orchestra_openims.OpenImsVnf()
-
-        self.details = {'orchestrator': {'status': 'PASS', 'duration': 120},
-                        'vnf': {},
-                        'test_vnf': {}}
-
-    def test_prepare_missing_param(self):
-        """Testing prepare function with missing param"""
-        with self.assertRaises(vnf.VnfPreparationException):
-            self.ims_vnf.prepare()
-
-
-if __name__ == "__main__":
-    logging.disable(logging.CRITICAL)
-    unittest.main(verbosity=2)