Adapt the testcases to multiple installers

Right now the testcases are dependent to only one installer.
So when we are trying to run the testcases to multiple installers
the tests are failing.

This patch make the testcases independent to the installer that they
run.

The testcases are running until the point which they hit the tacker
client commands.They are failing in the tacker client commands
because we need the new library for the upstream tacker API.

The testaces have already tested to two installers (Fuel,Apex-ha).

Also this patch contains the changes which are required for the
adaptation to the new functest.

For more information see the Jira tickets [0],[1],[2].

[0]: https://jira.opnfv.org/browse/SFC-100
[1]: https://jira.opnfv.org/browse/SFC-101
[2]: https://jira.opnfv.org/browse/SFC-102

Change-Id: Id1e5d5c94a65ab8bdea9584fa833bfa0cdec6632
Signed-off-by: Dimitrios Markou <mardim@intracom-telecom.com>

1 files changed, 7 insertions, 8 deletions

diff --git a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py
index 7f121b93..f0c5844e 100644
--- a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py
+++ b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py
@@ -11,8 +11,8 @@
 import os
 import sys
 import threading
-
 import logging
+
 import functest.utils.openstack_tacker as os_tacker
 import functest.utils.openstack_utils as os_utils
 import opnfv.utils.ovs_logger as ovs_log
@@ -23,7 +23,6 @@ from sfc.lib.results import Results
 from opnfv.deployment.factory import Factory as DeploymentFactory
 import sfc.lib.topology_shuffler as topo_shuffler
 
-from functest.utils.constants import CONST
 
 logger = logging.getLogger(__name__)
 
@@ -38,7 +37,8 @@ def main():
         COMMON_CONFIG.installer_type,
         COMMON_CONFIG.installer_ip,
         COMMON_CONFIG.installer_user,
-        installer_pwd=COMMON_CONFIG.installer_password)
+        COMMON_CONFIG.installer_password,
+        COMMON_CONFIG.installer_key_file)
 
     cluster = COMMON_CONFIG.installer_cluster
     openstack_nodes = (deploymentHandler.get_nodes({'cluster': cluster})
@@ -53,7 +53,7 @@ def main():
     odl_ip, odl_port = test_utils.get_odl_ip_port(openstack_nodes)
 
     for compute in compute_nodes:
-        logger.info("This is a compute: %s" % compute.info)
+        logger.info("This is a compute: %s" % compute.ip)
 
     results = Results(COMMON_CONFIG.line_length)
     results.add_to_summary(0, "=")
@@ -61,9 +61,9 @@ def main():
     results.add_to_summary(0, "=")
 
     installer_type = os.environ.get("INSTALLER_TYPE")
-    if installer_type != "fuel":
+    if installer_type != "fuel" and installer_type != "apex":
         logger.error(
-            '\033[91mCurrently supported only Fuel Installer type\033[0m')
+            '\033[91mCurrently supported only Fuel and Apex\033[0m')
         sys.exit(1)
 
     installer_ip = os.environ.get("INSTALLER_IP")
@@ -321,6 +321,5 @@ def main():
 
 
 if __name__ == '__main__':
-    logging.config.fileConfig(
-        CONST.__getattribute__('dir_functest_logging_cfg'))
+    logging.config.fileConfig(COMMON_CONFIG.functest_logging_api)
     main()