Merge "Using shared private network"

diff --git a/testcases/config_functest.py b/testcases/config_functest.py
index 918282a..b4e29bf 100755 (executable)
--- a/testcases/config_functest.py
+++ b/testcases/config_functest.py
@@ -55,6 +55,7 @@ RALLY_REPO_DIR = functest_yaml.get("general").get("directories").get("dir_repo_r
 RALLY_INSTALLATION_DIR = functest_yaml.get("general").get("directories").get("dir_rally_inst")
 RALLY_RESULT_DIR = functest_yaml.get("general").get("directories").get("dir_rally_res")
 VPING_DIR = REPO_PATH + functest_yaml.get("general").get("directories").get("dir_vping")
+VIMS_TEST_DIR = functest_yaml.get("general").get("directories").get("dir_repo_vims_test")
 ODL_DIR = REPO_PATH + functest_yaml.get("general").get("directories").get("dir_odl")
 DATA_DIR = functest_yaml.get("general").get("directories").get("dir_functest_data")
 
@@ -114,6 +115,14 @@ def action_start():
             action_clean()
             exit(-1)
 
+        # Install ruby libraries for vims test-case
+        script = 'source /etc/profile.d/rvm.sh; '
+        script += 'cd ' + VIMS_TEST_DIR + '; '
+        script += 'bundle install'
+
+        cmd = "/bin/bash -c '" + script + "'"
+        functest_utils.execute_command(cmd,logger)
+
         # Create result folder under functest if necessary
         if not os.path.exists(RALLY_RESULT_DIR):
             os.makedirs(RALLY_RESULT_DIR)

diff --git a/testcases/vIMS/CI/orchestrator.py b/testcases/vIMS/CI/orchestrator.py
index 409b3e0..be1c6e3 100644 (file)
--- a/testcases/vIMS/CI/orchestrator.py
+++ b/testcases/vIMS/CI/orchestrator.py
@@ -10,170 +10,198 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ########################################################################
-import sys, subprocess, os, shutil, yaml
+import sys
+import subprocess
+import os
+import shutil
+import yaml
 from git import Repo
 
+
 class orchestrator:
 
-       def __init__(self, testcase_dir, inputs={}, logger=None):
-               self.testcase_dir = testcase_dir
-               self.blueprint_dir = testcase_dir + 'cloudify-manager-blueprint/'
-               self.input_file = 'inputs.yaml'
-               self.manager_blueprint = False
-               self.config = inputs
-               self.logger = logger
-               self.manager_up = False
-
-       def set_credentials(self, username, password, tenant_name, auth_url):
-               self.config['keystone_username'] = username
-               self.config['keystone_password'] = password
-               self.config['keystone_url'] = auth_url
-               self.config['keystone_tenant_name'] = tenant_name
-
-       def set_flavor_id(self, flavor_id):
-               self.config['flavor_id'] = flavor_id
-
-       def set_image_id(self, image_id):
-               self.config['image_id'] = image_id
-
-       def set_external_network_name(self, external_network_name):
-               self.config['external_network_name'] = external_network_name
-
-       def set_ssh_user(self, ssh_user):
-               self.config['ssh_user'] = ssh_user
-
-       def set_logger(self, logger):
-               self.logger = logger
-
-       def download_manager_blueprint(self, manager_blueprint_url, manager_blueprint_branch):
-               if self.manager_blueprint:
-                       if self.logger:
-                               self.logger.info("cloudify manager server blueprint is already downloaded !")
-               else:
-                       if self.logger:
-                               self.logger.info("Downloading the cloudify manager server blueprint")
-                       download_result = download_blueprints(manager_blueprint_url, manager_blueprint_branch, self.blueprint_dir)
-
-                       if not download_result:
-                               if self.logger:
-                                       self.logger.error("Failed to download manager blueprint")
-                               exit(-1)
-                       else:
-                               self.manager_blueprint = True
-
-       def manager_up(self):
-               return manager_up
-
-       def deploy_manager(self):
-               if self.manager_blueprint:
-                       if self.logger:
-                               self.logger.info("Writing the inputs file")
-                       with open( self.blueprint_dir + "inputs.yaml", "w") as f:
-                               f.write(yaml.dump(self.config, default_style='"') )
-                       f.close()
-
-                       if self.logger:
-                               self.logger.info("Launching the cloudify-manager deployment")
-                       script = "source " + self.testcase_dir + "venv_cloudify/bin/activate; "
-                       script += "cd " + self.testcase_dir + "; "
-                       script += "cfy init -r; "
-                       script += "cd cloudify-manager-blueprint; "
-                       script += "cfy local create-requirements -o requirements.txt -p openstack-manager-blueprint.yaml; "
-                       script += "pip install -r requirements.txt; "
-                       script += "cfy bootstrap --install-plugins -p openstack-manager-blueprint.yaml -i inputs.yaml; "
-                       cmd = "/bin/bash -c '" + script + "'"
-                       execute_command(cmd, self.logger)
-
-                       if self.logger:
-                               self.logger.info("Cloudify-manager server is UP !")
-
-                       self.manager_up = True
-
-       def undeploy_manager(self):
-               if self.logger:
-                       self.logger.info("Launching the cloudify-manager undeployment")
-
-               self.manager_up = False
-
-               script = "source " + self.testcase_dir + "venv_cloudify/bin/activate; "
-               script += "cd " + self.testcase_dir + "; "
-               script += "cfy teardown -f; "
-               cmd = "/bin/bash -c '" + script + "'"
-               execute_command(cmd, self.logger)
-
-               if self.logger:
-                       self.logger.info("Cloudify-manager server has been successfully removed!")
-
-       def download_upload_and_deploy_blueprint(self, blueprint, config, bp_name, dep_name):
-               if self.logger:
-                       self.logger.info("Downloading the {0} blueprint".format(blueprint['file_name']))
-               download_result = download_blueprints(blueprint['url'], blueprint['branch'],
-                                                                                                 self.testcase_dir + blueprint['destination_folder'])
-
-               if not download_result:
-                       if self.logger:
-                               self.logger.error("Failed to download blueprint {0}".format(blueprint['file_name']))
-                       exit(-1)
-
-               if self.logger:
-                       self.logger.info("Writing the inputs file")
-               with open(self.testcase_dir + blueprint['destination_folder'] + "/inputs.yaml", "w") as f:
-                       f.write(yaml.dump(config, default_style='"') )
-               f.close()
-
-               if self.logger:
-                       self.logger.info("Launching the {0} deployment".format(bp_name))
-               script = "source " + self.testcase_dir + "venv_cloudify/bin/activate; "
-               script += "cd " + self.testcase_dir + blueprint['destination_folder'] + "; "
-               script += "cfy blueprints upload -b " + bp_name + " -p openstack-blueprint.yaml; "
-               script += "cfy deployments create -b " + bp_name  + " -d " + dep_name + " --inputs inputs.yaml; "
-               script += "cfy executions start -w install -d " + dep_name + " --timeout 1800; "
-
-               cmd = "/bin/bash -c '" + script + "'"
-               execute_command(cmd, self.logger)
-
-               if self.logger:
-                       self.logger.info("The deployment of {0} is ended".format(dep_name))
-
-       def undeploy_deployment(self, dep_name):
-               if self.logger:
-                       self.logger.info("Launching the {0} undeployment".format(dep_name))
-               script = "source " + self.testcase_dir + "venv_cloudify/bin/activate; "
-               script += "cd " + self.testcase_dir + "; "
-               script += "cfy executions start -w uninstall -d " + dep_name + " --timeout 1800 ; "
-               script += "cfy deployments delete -d " + dep_name + "; "
-
-               cmd = "/bin/bash -c '" + script + "'"
-               execute_command(cmd, self.logger)
+    def __init__(self, testcase_dir, inputs={}, logger=None):
+        self.testcase_dir = testcase_dir
+        self.blueprint_dir = testcase_dir + 'cloudify-manager-blueprint/'
+        self.input_file = 'inputs.yaml'
+        self.manager_blueprint = False
+        self.config = inputs
+        self.logger = logger
+        self.manager_up = False
+
+    def set_credentials(self, username, password, tenant_name, auth_url):
+        self.config['keystone_username'] = username
+        self.config['keystone_password'] = password
+        self.config['keystone_url'] = auth_url
+        self.config['keystone_tenant_name'] = tenant_name
+
+    def set_flavor_id(self, flavor_id):
+        self.config['flavor_id'] = flavor_id
+
+    def set_image_id(self, image_id):
+        self.config['image_id'] = image_id
+
+    def set_external_network_name(self, external_network_name):
+        self.config['external_network_name'] = external_network_name
+
+    def set_ssh_user(self, ssh_user):
+        self.config['ssh_user'] = ssh_user
+
+    def set_logger(self, logger):
+        self.logger = logger
+
+    def download_manager_blueprint(self, manager_blueprint_url, manager_blueprint_branch):
+        if self.manager_blueprint:
+            if self.logger:
+                self.logger.info(
+                    "cloudify manager server blueprint is already downloaded !")
+        else:
+            if self.logger:
+                self.logger.info(
+                    "Downloading the cloudify manager server blueprint")
+            download_result = download_blueprints(
+                manager_blueprint_url, manager_blueprint_branch, self.blueprint_dir)
+
+            if not download_result:
+                if self.logger:
+                    self.logger.error("Failed to download manager blueprint")
+                exit(-1)
+            else:
+                self.manager_blueprint = True
+
+    def manager_up(self):
+        return manager_up
+
+    def deploy_manager(self):
+        if self.manager_blueprint:
+            if self.logger:
+                self.logger.info("Writing the inputs file")
+            with open(self.blueprint_dir + "inputs.yaml", "w") as f:
+                f.write(yaml.dump(self.config, default_style='"'))
+            f.close()
+
+            # Ensure no ssh key file already exists
+            key_files = ["/.ssh/cloudify-manager-kp.pem",
+                         "/.ssh/cloudify-agent-kp.pem"]
+            home = os.path.expanduser("~")
+
+            for key_file in key_files:
+                if os.path.isfile(home + key_file):
+                    os.remove(home + key_file)
+
+            if self.logger:
+                self.logger.info("Launching the cloudify-manager deployment")
+
+            script = "source " + self.testcase_dir + "venv_cloudify/bin/activate; "
+            script += "cd " + self.testcase_dir + "; "
+            script += "cfy init -r; "
+            script += "cd cloudify-manager-blueprint; "
+            script += "cfy local create-requirements -o requirements.txt -p openstack-manager-blueprint.yaml; "
+            script += "pip install -r requirements.txt; "
+            script += "cfy bootstrap --install-plugins -p openstack-manager-blueprint.yaml -i inputs.yaml; "
+            cmd = "/bin/bash -c '" + script + "'"
+            execute_command(cmd, self.logger)
+
+            if self.logger:
+                self.logger.info("Cloudify-manager server is UP !")
+
+            self.manager_up = True
+
+    def undeploy_manager(self):
+        if self.logger:
+            self.logger.info("Launching the cloudify-manager undeployment")
+
+        self.manager_up = False
+
+        script = "source " + self.testcase_dir + "venv_cloudify/bin/activate; "
+        script += "cd " + self.testcase_dir + "; "
+        script += "cfy teardown -f --ignore-deployments=True; "
+        cmd = "/bin/bash -c '" + script + "'"
+        execute_command(cmd, self.logger)
+
+        if self.logger:
+            self.logger.info(
+                "Cloudify-manager server has been successfully removed!")
+
+    def download_upload_and_deploy_blueprint(self, blueprint, config, bp_name, dep_name):
+        if self.logger:
+            self.logger.info("Downloading the {0} blueprint".format(
+                blueprint['file_name']))
+        download_result = download_blueprints(blueprint['url'], blueprint['branch'],
+                                              self.testcase_dir + blueprint['destination_folder'])
+
+        if not download_result:
+            if self.logger:
+                self.logger.error(
+                    "Failed to download blueprint {0}".format(blueprint['file_name']))
+            exit(-1)
+
+        if self.logger:
+            self.logger.info("Writing the inputs file")
+        with open(self.testcase_dir + blueprint['destination_folder'] + "/inputs.yaml", "w") as f:
+            f.write(yaml.dump(config, default_style='"'))
+        f.close()
+
+        if self.logger:
+            self.logger.info("Launching the {0} deployment".format(bp_name))
+        script = "source " + self.testcase_dir + "venv_cloudify/bin/activate; "
+        script += "cd " + self.testcase_dir + \
+            blueprint['destination_folder'] + "; "
+        script += "cfy blueprints upload -b " + \
+            bp_name + " -p openstack-blueprint.yaml; "
+        script += "cfy deployments create -b " + bp_name + \
+            " -d " + dep_name + " --inputs inputs.yaml; "
+        script += "cfy executions start -w install -d " + dep_name + " --timeout 1800; "
+
+        cmd = "/bin/bash -c '" + script + "'"
+        execute_command(cmd, self.logger)
+
+        if self.logger:
+            self.logger.info("The deployment of {0} is ended".format(dep_name))
+
+    def undeploy_deployment(self, dep_name):
+        if self.logger:
+            self.logger.info("Launching the {0} undeployment".format(dep_name))
+        script = "source " + self.testcase_dir + "venv_cloudify/bin/activate; "
+        script += "cd " + self.testcase_dir + "; "
+        script += "cfy executions start -w uninstall -d " + dep_name + " --timeout 1800 ; "
+        script += "cfy deployments delete -d " + dep_name + "; "
+
+        cmd = "/bin/bash -c '" + script + "'"
+        try:
+            execute_command(cmd, self.logger)
+        except:
+            if self.logger:
+                self.logger.error("Clearwater undeployment failed")
 
 
 def execute_command(cmd, logger):
-       """
-       Execute Linux command
-       """
-       if logger:
-               logger.debug('Executing command : {}'.format(cmd))
-       output_file = "output.txt"
-       f = open(output_file, 'w+')
-       p = subprocess.call(cmd, shell=True, stdout=f, stderr=subprocess.STDOUT)
-       f.close()
-       f = open(output_file, 'r')
-       result = f.read()
-       if result != "" and logger:
-               logger.debug(result)
-       if p == 0:
-               return True
-       else:
-               if logger:
-                       logger.error("Error when executing command %s" % cmd)
-               exit(-1)
+    """
+    Execute Linux command
+    """
+    if logger:
+        logger.debug('Executing command : {}'.format(cmd))
+    output_file = "output.txt"
+    f = open(output_file, 'w+')
+    p = subprocess.call(cmd, shell=True, stdout=f, stderr=subprocess.STDOUT)
+    f.close()
+    f = open(output_file, 'r')
+    result = f.read()
+    if result != "" and logger:
+        logger.debug(result)
+    if p == 0:
+        return True
+    else:
+        if logger:
+            logger.error("Error when executing command %s" % cmd)
+        exit(-1)
 
 
 def download_blueprints(blueprint_url, branch, dest_path):
-       if os.path.exists(dest_path):
-               shutil.rmtree(dest_path)
-       try:
-               Repo.clone_from(blueprint_url, dest_path, branch=branch)
-               return True
-       except:
-               return False
\ No newline at end of file
+    if os.path.exists(dest_path):
+        shutil.rmtree(dest_path)
+    try:
+        Repo.clone_from(blueprint_url, dest_path, branch=branch)
+        return True
+    except:
+        return False