Replace nova client calls with openstack sdk

JIRA: SDNVPN-220

This patch replaces all calls of nova client with openstack sdk.

Change-Id: I9e3a0fe08ba36bfb64483238cd286acad829ae90
Signed-off-by: Stamatis Katsaounis <mokats@intracom-telecom.com>

11 files changed, 108 insertions, 107 deletions

diff --git a/sdnvpn/test/functest/run_sdnvpn_tests.py b/sdnvpn/test/functest/run_sdnvpn_tests.py
index c05876d..3f3b519 100644
--- a/sdnvpn/test/functest/run_sdnvpn_tests.py
+++ b/sdnvpn/test/functest/run_sdnvpn_tests.py
@@ -31,7 +31,7 @@ class SdnvpnFunctest(feature.Feature):
 
     def execute(self):
 
-        nova_client = os_utils.get_nova_client()
+        cloud = os_utils.get_os_cloud()
         neutron_client = os_utils.get_neutron_client()
 
         tenant_id = os_utils.get_tenant_id(os_utils.get_keystone_client(),
@@ -42,7 +42,7 @@ class SdnvpnFunctest(feature.Feature):
          neutron_router_quota) = (
             neutron_quota['network'], neutron_quota['subnet'],
             neutron_quota['port'], neutron_quota['router'])
-        instances_quota = test_utils.get_nova_instances_quota(nova_client)
+        instances_quota = test_utils.get_nova_instances_quota(cloud)
 
         logger.info("Setting net/subnet/port/router "
                     "quota to unlimited")
@@ -59,8 +59,7 @@ class SdnvpnFunctest(feature.Feature):
         # https://jira.opnfv.org/projects/SDNVPN/issues/SDNVPN-115
         logger.info("Setting instances quota class to unlimited")
         test_utils.update_instance_quota_class(
-            nova_client,
-            COMMON_CONFIG.nova_instances_quota_class)
+            cloud, COMMON_CONFIG.nova_instances_quota_class)
 
         # Clean up the stale floating ip's so that required
         # ip addresses are available for sdnvpn testcases
@@ -141,7 +140,7 @@ class SdnvpnFunctest(feature.Feature):
                                                neutron_router_quota)
 
         logger.info("Resetting instances quota class")
-        test_utils.update_instance_quota_class(nova_client, instances_quota)
+        test_utils.update_instance_quota_class(cloud, instances_quota)
 
         try:
             installer_type = str(os.environ['INSTALLER_TYPE'].lower())
diff --git a/sdnvpn/test/functest/testcase_1.py b/sdnvpn/test/functest/testcase_1.py
index 7c0cb43..1ba90af 100644
--- a/sdnvpn/test/functest/testcase_1.py
+++ b/sdnvpn/test/functest/testcase_1.py
@@ -25,13 +25,13 @@ TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig(
 
 
 def main():
-    results = Results(COMMON_CONFIG.line_length)
+    conn = os_utils.get_os_connection()
+    results = Results(COMMON_CONFIG.line_length, conn)
 
     results.add_to_summary(0, "=")
     results.add_to_summary(2, "STATUS", "SUBTEST")
     results.add_to_summary(0, "=")
 
-    nova_client = os_utils.get_nova_client()
     neutron_client = os_utils.get_neutron_client()
     conn = os_utils.get_os_connection()
 
@@ -66,46 +66,46 @@ def main():
             neutron_client, TESTCASE_CONFIG.secgroup_name,
             TESTCASE_CONFIG.secgroup_descr)
 
-        compute_nodes = test_utils.assert_and_get_compute_nodes(nova_client)
+        compute_nodes = test_utils.assert_and_get_compute_nodes(conn)
 
         av_zone_1 = "nova:" + compute_nodes[0]
         av_zone_2 = "nova:" + compute_nodes[1]
 
         # boot INTANCES
         vm_2 = test_utils.create_instance(
-            nova_client,
+            conn,
             TESTCASE_CONFIG.instance_2_name,
             image_id,
             network_1_id,
             sg_id,
             secgroup_name=TESTCASE_CONFIG.secgroup_name,
             compute_node=av_zone_1)
-        vm_2_ip = test_utils.get_instance_ip(vm_2)
+        vm_2_ip = test_utils.get_instance_ip(conn, vm_2)
 
         vm_3 = test_utils.create_instance(
-            nova_client,
+            conn,
             TESTCASE_CONFIG.instance_3_name,
             image_id,
             network_1_id,
             sg_id,
             secgroup_name=TESTCASE_CONFIG.secgroup_name,
             compute_node=av_zone_2)
-        vm_3_ip = test_utils.get_instance_ip(vm_3)
+        vm_3_ip = test_utils.get_instance_ip(conn, vm_3)
 
         vm_5 = test_utils.create_instance(
-            nova_client,
+            conn,
             TESTCASE_CONFIG.instance_5_name,
             image_id,
             network_2_id,
             sg_id,
             secgroup_name=TESTCASE_CONFIG.secgroup_name,
             compute_node=av_zone_2)
-        vm_5_ip = test_utils.get_instance_ip(vm_5)
+        vm_5_ip = test_utils.get_instance_ip(conn, vm_5)
 
         # We boot vm5 first because we need vm5_ip for vm4 userdata
         u4 = test_utils.generate_ping_userdata([vm_5_ip])
         vm_4 = test_utils.create_instance(
-            nova_client,
+            conn,
             TESTCASE_CONFIG.instance_4_name,
             image_id,
             network_2_id,
@@ -113,7 +113,7 @@ def main():
             secgroup_name=TESTCASE_CONFIG.secgroup_name,
             compute_node=av_zone_1,
             userdata=u4)
-        vm_4_ip = test_utils.get_instance_ip(vm_4)
+        vm_4_ip = test_utils.get_instance_ip(conn, vm_4)
 
         # We boot VM1 at the end because we need to get the IPs first
         # to generate the userdata
@@ -122,7 +122,7 @@ def main():
                                                 vm_4_ip,
                                                 vm_5_ip])
         vm_1 = test_utils.create_instance(
-            nova_client,
+            conn,
             TESTCASE_CONFIG.instance_1_name,
             image_id,
             network_1_id,
@@ -244,7 +244,7 @@ def main():
         logger.error("exception occurred while executing testcase_1: %s", e)
         raise
     finally:
-        test_utils.cleanup_nova(nova_client, instance_ids)
+        test_utils.cleanup_nova(conn, instance_ids)
         test_utils.cleanup_glance(conn, image_ids)
         test_utils.cleanup_neutron(neutron_client, floatingip_ids,
                                    bgpvpn_ids, interfaces, subnet_ids,
diff --git a/sdnvpn/test/functest/testcase_10.py b/sdnvpn/test/functest/testcase_10.py
index 78d5684..a315c32 100644
--- a/sdnvpn/test/functest/testcase_10.py
+++ b/sdnvpn/test/functest/testcase_10.py
@@ -28,14 +28,15 @@ TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig(
     'sdnvpn.test.functest.testcase_10')
 
 
-def monitor(in_data, out_data, vm):
+def monitor(conn, in_data, out_data, vm):
     # At the beginning of ping we might have some
     # failures, so we ignore the first 10 pings
     lines_offset = 20
     while in_data["stop_thread"] is False:
         try:
             time.sleep(1)
-            vm_console_out_lines = vm.get_console_output().split('\n')
+            vm_console_out_lines = conn.compute.\
+                get_server_console_output(vm)['output'].split('\n')
             if lines_offset < len(vm_console_out_lines):
                 for console_line in vm_console_out_lines[lines_offset:-1]:
                     is_ping_error = re.match(r'ping.*KO', console_line)
@@ -64,13 +65,13 @@ def monitor(in_data, out_data, vm):
 
 
 def main():
-    results = Results(COMMON_CONFIG.line_length)
+    conn = os_utils.get_os_connection()
+    results = Results(COMMON_CONFIG.line_length, conn)
 
     results.add_to_summary(0, "=")
     results.add_to_summary(2, "STATUS", "SUBTEST")
     results.add_to_summary(0, "=")
 
-    nova_client = os_utils.get_nova_client()
     neutron_client = os_utils.get_neutron_client()
     conn = os_utils.get_os_connection()
 
@@ -98,24 +99,24 @@ def main():
                                                 TESTCASE_CONFIG.secgroup_name,
                                                 TESTCASE_CONFIG.secgroup_descr)
 
-    compute_nodes = test_utils.assert_and_get_compute_nodes(nova_client)
+    compute_nodes = test_utils.assert_and_get_compute_nodes(conn)
     av_zone_1 = "nova:" + compute_nodes[0]
     av_zone_2 = "nova:" + compute_nodes[1]
 
     # boot INSTANCES
     vm_2 = test_utils.create_instance(
-        nova_client,
+        conn,
         TESTCASE_CONFIG.instance_2_name,
         image_id,
         network_1_id,
         sg_id,
         secgroup_name=TESTCASE_CONFIG.secgroup_name,
         compute_node=av_zone_1)
-    vm2_ip = test_utils.get_instance_ip(vm_2)
+    vm2_ip = test_utils.get_instance_ip(conn, vm_2)
 
     u1 = test_utils.generate_ping_userdata([vm2_ip])
     vm_1 = test_utils.create_instance(
-        nova_client,
+        conn,
         TESTCASE_CONFIG.instance_1_name,
         image_id,
         network_1_id,
@@ -123,11 +124,11 @@ def main():
         secgroup_name=TESTCASE_CONFIG.secgroup_name,
         compute_node=av_zone_1,
         userdata=u1)
-    vm1_ip = test_utils.get_instance_ip(vm_1)
+    vm1_ip = test_utils.get_instance_ip(conn, vm_1)
 
     u3 = test_utils.generate_ping_userdata([vm1_ip, vm2_ip])
     vm_3 = test_utils.create_instance(
-        nova_client,
+        conn,
         TESTCASE_CONFIG.instance_3_name,
         image_id,
         network_1_id,
@@ -135,7 +136,7 @@ def main():
         secgroup_name=TESTCASE_CONFIG.secgroup_name,
         compute_node=av_zone_2,
         userdata=u3)
-    vm3_ip = test_utils.get_instance_ip(vm_3)
+    vm3_ip = test_utils.get_instance_ip(conn, vm_3)
     # We do not put vm_2 id in instance_ids table because we will
     # delete the current instance during the testing process
     instance_ids.extend([vm_1.id, vm_3.id])
@@ -153,19 +154,19 @@ def main():
     monitor_output1 = m.dict()
     monitor_input1["stop_thread"] = False
     monitor_output1["error_msg"] = ""
-    monitor_thread1 = Process(target=monitor, args=(monitor_input1,
+    monitor_thread1 = Process(target=monitor, args=(conn, monitor_input1,
                                                     monitor_output1, vm_1,))
     monitor_input2 = m.dict()
     monitor_output2 = m.dict()
     monitor_input2["stop_thread"] = False
     monitor_output2["error_msg"] = ""
-    monitor_thread2 = Process(target=monitor, args=(monitor_input2,
+    monitor_thread2 = Process(target=monitor, args=(conn, monitor_input2,
                                                     monitor_output2, vm_2,))
     monitor_input3 = m.dict()
     monitor_output3 = m.dict()
     monitor_input3["stop_thread"] = False
     monitor_output3["error_msg"] = ""
-    monitor_thread3 = Process(target=monitor, args=(monitor_input3,
+    monitor_thread3 = Process(target=monitor, args=(conn, monitor_input3,
                                                     monitor_output3, vm_3,))
     # Lists of all monitor threads and their inputs and outputs.
     threads = [monitor_thread1, monitor_thread2, monitor_thread3]
@@ -191,7 +192,7 @@ def main():
             results.add_failure(monitor_err_msg)
         # Stop monitor thread 2 and delete instance vm_2
         thread_inputs[1]["stop_thread"] = True
-        if not os_utils.delete_instance(nova_client, vm_2.id):
+        if not os_utils.delete_instance(conn, vm_2.id):
             logger.error("Fail to delete vm_2 instance during "
                          "testing process")
             raise Exception("Fail to delete instance vm_2.")
@@ -205,7 +206,7 @@ def main():
         # Create a new vm (vm_4) on compute 1 node
         u4 = test_utils.generate_ping_userdata([vm1_ip, vm3_ip])
         vm_4 = test_utils.create_instance(
-            nova_client,
+            conn,
             TESTCASE_CONFIG.instance_4_name,
             image_id,
             network_1_id,
@@ -225,7 +226,7 @@ def main():
         monitor_output4 = m.dict()
         monitor_input4["stop_thread"] = False
         monitor_output4["error_msg"] = ""
-        monitor_thread4 = Process(target=monitor, args=(monitor_input4,
+        monitor_thread4 = Process(target=monitor, args=(conn, monitor_input4,
                                                         monitor_output4,
                                                         vm_4,))
         threads.append(monitor_thread4)
@@ -259,7 +260,7 @@ def main():
         for thread in threads:
             thread.join()
 
-        test_utils.cleanup_nova(nova_client, instance_ids)
+        test_utils.cleanup_nova(conn, instance_ids)
         test_utils.cleanup_glance(conn, image_ids)
         test_utils.cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids,
                                    interfaces, subnet_ids, router_ids,
diff --git a/sdnvpn/test/functest/testcase_11.py b/sdnvpn/test/functest/testcase_11.py
index 85dea19..78f01a9 100644
--- a/sdnvpn/test/functest/testcase_11.py
+++ b/sdnvpn/test/functest/testcase_11.py
@@ -24,13 +24,13 @@ TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig(
 
 
 def main():
-    results = Results(COMMON_CONFIG.line_length)
+    conn = os_utils.get_os_connection()
+    results = Results(COMMON_CONFIG.line_length, conn)
 
     results.add_to_summary(0, "=")
     results.add_to_summary(2, "STATUS", "SUBTEST")
     results.add_to_summary(0, "=")
 
-    nova_client = os_utils.get_nova_client()
     neutron_client = os_utils.get_neutron_client()
     conn = os_utils.get_os_connection()
     openstack_nodes = test_utils.get_nodes()
@@ -60,8 +60,7 @@ def main():
             TESTCASE_CONFIG.secgroup_descr)
 
         # Check required number of compute nodes
-        compute_hostname = (
-            nova_client.hypervisors.list()[0].hypervisor_hostname)
+        compute_hostname = conn.compute.hypervisors().next().name
         compute_nodes = [node for node in openstack_nodes
                          if node.is_compute()]
 
@@ -74,7 +73,7 @@ def main():
 
         # boot INSTANCES
         vm_2 = test_utils.create_instance(
-            nova_client,
+            conn,
             TESTCASE_CONFIG.instance_2_name,
             image_id,
             network_1_id,
@@ -83,7 +82,7 @@ def main():
             compute_node=av_zone_1)
 
         vm_1 = test_utils.create_instance(
-            nova_client,
+            conn,
             TESTCASE_CONFIG.instance_1_name,
             image_id,
             network_1_id,
@@ -128,7 +127,7 @@ def main():
         raise
     finally:
         # Cleanup topology
-        test_utils.cleanup_nova(nova_client, instance_ids)
+        test_utils.cleanup_nova(conn, instance_ids)
         test_utils.cleanup_glance(conn, image_ids)
         test_utils.cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids,
                                    interfaces, subnet_ids, router_ids,
diff --git a/sdnvpn/test/functest/testcase_12.py b/sdnvpn/test/functest/testcase_12.py
index be32d1d..53e5ab9 100644
--- a/sdnvpn/test/functest/testcase_12.py
+++ b/sdnvpn/test/functest/testcase_12.py
@@ -24,13 +24,13 @@ TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig(
 
 
 def main():
-    results = Results(COMMON_CONFIG.line_length)
+    conn = os_utils.get_os_connection()
+    results = Results(COMMON_CONFIG.line_length, conn)
 
     results.add_to_summary(0, "=")
     results.add_to_summary(2, "STATUS", "SUBTEST")
     results.add_to_summary(0, "=")
 
-    nova_client = os_utils.get_nova_client()
     neutron_client = os_utils.get_neutron_client()
     conn = os_utils.get_os_connection()
     openstack_nodes = test_utils.get_nodes()
@@ -60,8 +60,7 @@ def main():
             TESTCASE_CONFIG.secgroup_descr)
 
         # Check required number of compute nodes
-        compute_hostname = (
-            nova_client.hypervisors.list()[0].hypervisor_hostname)
+        compute_hostname = conn.compute.hypervisors().next().name
         compute_nodes = [node for node in openstack_nodes
                          if node.is_compute()]
 
@@ -76,7 +75,7 @@ def main():
 
         # boot INSTANCES
         vm_2 = test_utils.create_instance(
-            nova_client,
+            conn,
             TESTCASE_CONFIG.instance_2_name,
             image_id,
             network_1_id,
@@ -85,7 +84,7 @@ def main():
             compute_node=av_zone_1)
 
         vm_1 = test_utils.create_instance(
-            nova_client,
+            conn,
             TESTCASE_CONFIG.instance_1_name,
             image_id,
             network_1_id,
@@ -185,7 +184,7 @@ def main():
         raise
     finally:
         # Cleanup topology
-        test_utils.cleanup_nova(nova_client, instance_ids)
+        test_utils.cleanup_nova(conn, instance_ids)
         test_utils.cleanup_glance(conn, image_ids)
         test_utils.cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids,
                                    interfaces, subnet_ids, router_ids,
diff --git a/sdnvpn/test/functest/testcase_13.py b/sdnvpn/test/functest/testcase_13.py
index 2d79b45..4152c67 100644
--- a/sdnvpn/test/functest/testcase_13.py
+++ b/sdnvpn/test/functest/testcase_13.py
@@ -26,7 +26,8 @@ TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig(
 
 
 def main():
-    results = Results(COMMON_CONFIG.line_length)
+    conn = os_utils.get_os_connection()
+    results = Results(COMMON_CONFIG.line_length, conn)
 
     results.add_to_summary(0, "=")
     results.add_to_summary(2, "STATUS", "SUBTEST")
@@ -43,7 +44,6 @@ def main():
     else:
         logger.info("Using old image")
 
-    nova_client = os_utils.get_nova_client()
     neutron_client = os_utils.get_neutron_client()
     conn = os_utils.get_os_connection()
 
@@ -79,7 +79,7 @@ def main():
             neutron_client, TESTCASE_CONFIG.secgroup_name,
             TESTCASE_CONFIG.secgroup_descr)
 
-        compute_nodes = test_utils.assert_and_get_compute_nodes(nova_client)
+        compute_nodes = test_utils.assert_and_get_compute_nodes(conn)
 
         av_zone_1 = "nova:" + compute_nodes[0]
         av_zone_2 = "nova:" + compute_nodes[1]
@@ -91,7 +91,7 @@ def main():
             TESTCASE_CONFIG.extra_route_subnet_mask)
         # boot INTANCES
         vm_1 = test_utils.create_instance(
-            nova_client,
+            conn,
             TESTCASE_CONFIG.instance_1_name,
             image_id,
             network_1_id,
@@ -100,7 +100,7 @@ def main():
             secgroup_name=TESTCASE_CONFIG.secgroup_name,
             compute_node=av_zone_1,
             userdata=u1)
-        vm_1_ip = test_utils.get_instance_ip(vm_1)
+        vm_1_ip = test_utils.get_instance_ip(conn, vm_1)
 
         vm1_port = test_utils.get_port(neutron_client, vm_1.id)
         test_utils.update_port_allowed_address_pairs(
@@ -111,7 +111,7 @@ def main():
                 vm1_port['mac_address'])])
 
         vm_2 = test_utils.create_instance(
-            nova_client,
+            conn,
             TESTCASE_CONFIG.instance_2_name,
             image_id,
             network_1_id,
@@ -120,7 +120,7 @@ def main():
             secgroup_name=TESTCASE_CONFIG.secgroup_name,
             compute_node=av_zone_1,
             userdata=u1)
-        vm_2_ip = test_utils.get_instance_ip(vm_2)
+        vm_2_ip = test_utils.get_instance_ip(conn, vm_2)
 
         vm2_port = test_utils.get_port(neutron_client, vm_2.id)
         test_utils.update_port_allowed_address_pairs(
@@ -144,7 +144,7 @@ def main():
         u3 = test_utils.generate_ping_userdata(
             [TESTCASE_CONFIG.extra_route_ip])
         vm_3 = test_utils.create_instance(
-            nova_client,
+            conn,
             TESTCASE_CONFIG.instance_3_name,
             image_2_id,
             network_1_id,
@@ -208,7 +208,7 @@ def main():
         raise
     finally:
         test_utils.update_router_no_extra_route(neutron_client, router_ids)
-        test_utils.cleanup_nova(nova_client, instance_ids, flavor_ids)
+        test_utils.cleanup_nova(conn, instance_ids, flavor_ids)
         test_utils.cleanup_glance(conn, image_ids)
         test_utils.cleanup_neutron(neutron_client, floatingip_ids,
                                    bgpvpn_ids, interfaces, subnet_ids,
diff --git a/sdnvpn/test/functest/testcase_2.py b/sdnvpn/test/functest/testcase_2.py
index 4955f7e..12f3cc4 100644
--- a/sdnvpn/test/functest/testcase_2.py
+++ b/sdnvpn/test/functest/testcase_2.py
@@ -8,6 +8,7 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 #
 
+import base64
 import logging
 import sys
 
@@ -25,13 +26,13 @@ TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig(
 
 
 def main():
-    results = Results(COMMON_CONFIG.line_length)
+    conn = os_utils.get_os_connection()
+    results = Results(COMMON_CONFIG.line_length, conn)
 
     results.add_to_summary(0, "=")
     results.add_to_summary(2, "STATUS", "SUBTEST")
     results.add_to_summary(0, "=")
 
-    nova_client = os_utils.get_nova_client()
     neutron_client = os_utils.get_neutron_client()
     conn = os_utils.get_os_connection()
 
@@ -44,7 +45,8 @@ def main():
         keyfile = open(COMMON_CONFIG.keyfile_path, 'r')
         key = keyfile.read()
         keyfile.close()
-        files = {"/home/cirros/id_rsa": key}
+        files = [{'path': '/home/cirros/id_rsa',
+                  'contents': base64.b64encode(key)}]
 
         image_id = os_utils.create_glance_image(
             conn, TESTCASE_CONFIG.image_name,
@@ -91,7 +93,7 @@ def main():
             neutron_client, TESTCASE_CONFIG.secgroup_name,
             TESTCASE_CONFIG.secgroup_descr)
 
-        compute_nodes = test_utils.assert_and_get_compute_nodes(nova_client)
+        compute_nodes = test_utils.assert_and_get_compute_nodes(conn)
 
         av_zone_1 = "nova:" + compute_nodes[0]
         # av_zone_2 = "nova:" + compute_nodes[1]
@@ -99,7 +101,7 @@ def main():
         # boot INTANCES
         userdata_common = test_utils.generate_userdata_common()
         vm_2 = test_utils.create_instance(
-            nova_client,
+            conn,
             TESTCASE_CONFIG.instance_2_name,
             image_id,
             network_1_id,
@@ -111,7 +113,7 @@ def main():
 
 
 #         vm_3 = test_utils.create_instance(
-#             nova_client,
+#             conn,
 #             TESTCASE_CONFIG.instance_3_name,
 #             image_id,
 #             network_1_id,
@@ -122,7 +124,7 @@ def main():
 #             userdata=userdata_common)
 #
 #         vm_5 = test_utils.create_instance(
-#             nova_client,
+#             conn,
 #             TESTCASE_CONFIG.instance_5_name,
 #             image_id,
 #             network_2_id,
@@ -139,7 +141,7 @@ def main():
              # TESTCASE_CONFIG.instance_5_ip
              ])
         vm_4 = test_utils.create_instance(
-            nova_client,
+            conn,
             TESTCASE_CONFIG.instance_4_name,
             image_id,
             network_2_id,
@@ -159,7 +161,7 @@ def main():
              # TESTCASE_CONFIG.instance_5_ip
              ])
         vm_1 = test_utils.create_instance(
-            nova_client,
+            conn,
             TESTCASE_CONFIG.instance_1_name,
             image_id,
             network_1_id,
@@ -267,7 +269,7 @@ def main():
         logger.error("exception occurred while executing testcase_2: %s", e)
         raise
     finally:
-        test_utils.cleanup_nova(nova_client, instance_ids)
+        test_utils.cleanup_nova(conn, instance_ids)
         test_utils.cleanup_glance(conn, image_ids)
         test_utils.cleanup_neutron(neutron_client, floatingip_ids,
                                    bgpvpn_ids, interfaces, subnet_ids,
diff --git a/sdnvpn/test/functest/testcase_3.py b/sdnvpn/test/functest/testcase_3.py
index 3d202c5..796feeb 100644
--- a/sdnvpn/test/functest/testcase_3.py
+++ b/sdnvpn/test/functest/testcase_3.py
@@ -34,7 +34,8 @@ TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig(
 
 
 def main():
-    results = Results(COMMON_CONFIG.line_length)
+    conn = os_utils.get_os_connection()
+    results = Results(COMMON_CONFIG.line_length, conn)
     results.add_to_summary(0, "=")
     results.add_to_summary(2, "STATUS", "SUBTEST")
     results.add_to_summary(0, "=")
@@ -180,7 +181,6 @@ def main():
         logger.info("Using old image")
 
     conn = os_utils.get_os_connection()
-    nova_client = os_utils.get_nova_client()
     neutron_client = os_utils.get_neutron_client()
 
     (floatingip_ids, instance_ids, router_ids, network_ids, image_ids,
@@ -259,8 +259,9 @@ def main():
         fake_fip = os_utils.create_floating_ip(neutron_client)
         # pin quagga to some compute
         floatingip_ids.append(fake_fip['fip_id'])
-        compute_node = nova_client.hypervisors.list()[0]
-        quagga_compute_node = "nova:" + compute_node.hypervisor_hostname
+        compute_node = conn.compute.hypervisors().next()
+        compute_node = conn.compute.get_hypervisor(compute_node)
+        quagga_compute_node = "nova:" + compute_node.name
         # Map the hypervisor used above to a compute handle
         # returned by releng's manager
         for comp in computes:
@@ -277,7 +278,7 @@ def main():
             TESTCASE_CONFIG.export_targets)
 
         quagga_vm = test_utils.create_instance(
-            nova_client,
+            conn,
             TESTCASE_CONFIG.quagga_instance_name,
             ubuntu_image_id,
             quagga_net_id,
@@ -287,7 +288,7 @@ def main():
             userdata=quagga_bootstrap_script,
             compute_node=quagga_compute_node)
 
-        instance_ids.append(quagga_vm)
+        instance_ids.append(quagga_vm.id)
 
         quagga_vm_port = test_utils.get_port(neutron_client,
                                              quagga_vm.id)
@@ -305,7 +306,7 @@ def main():
         test_utils.attach_instance_to_ext_br(quagga_vm, compute)
 
         testcase = "Bootstrap quagga inside an OpenStack instance"
-        cloud_init_success = test_utils.wait_for_cloud_init(quagga_vm)
+        cloud_init_success = test_utils.wait_for_cloud_init(conn, quagga_vm)
         if cloud_init_success:
             results.add_success(testcase)
         else:
@@ -355,10 +356,10 @@ def main():
         userdata_common = test_utils.generate_ping_userdata(
             [TESTCASE_CONFIG.external_network_ip])
 
-        compute_node = nova_client.hypervisors.list()[0]
-        av_zone_1 = "nova:" + compute_node.hypervisor_hostname
+        compute_node = conn.compute.hypervisors().next()
+        av_zone_1 = "nova:" + compute_node.name
         vm_bgpvpn = test_utils.create_instance(
-            nova_client,
+            conn,
             TESTCASE_CONFIG.instance_1_name,
             image_id,
             net_1_id,
@@ -367,7 +368,7 @@ def main():
             secgroup_name=TESTCASE_CONFIG.secgroup_name,
             compute_node=av_zone_1,
             userdata=userdata_common)
-        instance_ids.append(vm_bgpvpn)
+        instance_ids.append(vm_bgpvpn.id)
 
         # wait for VM to get IP
         instance_up = test_utils.wait_for_instances_up(vm_bgpvpn)
@@ -409,7 +410,7 @@ def main():
     finally:
         if quagga_vm is not None:
             test_utils.detach_instance_from_ext_br(quagga_vm, compute)
-        test_utils.cleanup_nova(nova_client, instance_ids, flavor_ids)
+        test_utils.cleanup_nova(conn, instance_ids, flavor_ids)
         test_utils.cleanup_glance(conn, image_ids)
         test_utils.cleanup_neutron(neutron_client, floatingip_ids,
                                    bgpvpn_ids, interfaces, subnet_ids,
diff --git a/sdnvpn/test/functest/testcase_4.py b/sdnvpn/test/functest/testcase_4.py
index a29dc12..4c7cc40 100644
--- a/sdnvpn/test/functest/testcase_4.py
+++ b/sdnvpn/test/functest/testcase_4.py
@@ -26,13 +26,13 @@ TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig(
 
 
 def main():
-    results = Results(COMMON_CONFIG.line_length)
+    conn = os_utils.get_os_connection()
+    results = Results(COMMON_CONFIG.line_length, conn)
 
     results.add_to_summary(0, "=")
     results.add_to_summary(2, "STATUS", "SUBTEST")
     results.add_to_summary(0, "=")
 
-    nova_client = os_utils.get_nova_client()
     neutron_client = os_utils.get_neutron_client()
     conn = os_utils.get_os_connection()
 
@@ -72,46 +72,46 @@ def main():
             TESTCASE_CONFIG.secgroup_name,
             TESTCASE_CONFIG.secgroup_descr)
 
-        compute_nodes = test_utils.assert_and_get_compute_nodes(nova_client)
+        compute_nodes = test_utils.assert_and_get_compute_nodes(conn)
 
         av_zone_1 = "nova:" + compute_nodes[0]
         av_zone_2 = "nova:" + compute_nodes[1]
 
         # boot INTANCES
         vm_2 = test_utils.create_instance(
-            nova_client,
+            conn,
             TESTCASE_CONFIG.instance_2_name,
             image_id,
             network_1_id,
             sg_id,
             secgroup_name=TESTCASE_CONFIG.secgroup_name,
             compute_node=av_zone_1)
-        vm_2_ip = test_utils.get_instance_ip(vm_2)
+        vm_2_ip = test_utils.get_instance_ip(conn, vm_2)
 
         vm_3 = test_utils.create_instance(
-            nova_client,
+            conn,
             TESTCASE_CONFIG.instance_3_name,
             image_id,
             network_1_id,
             sg_id,
             secgroup_name=TESTCASE_CONFIG.secgroup_name,
             compute_node=av_zone_2)
-        vm_3_ip = test_utils.get_instance_ip(vm_3)
+        vm_3_ip = test_utils.get_instance_ip(conn, vm_3)
 
         vm_5 = test_utils.create_instance(
-            nova_client,
+            conn,
             TESTCASE_CONFIG.instance_5_name,
             image_id,
             network_2_id,
             sg_id,
             secgroup_name=TESTCASE_CONFIG.secgroup_name,
             compute_node=av_zone_2)
-        vm_5_ip = test_utils.get_instance_ip(vm_5)
+        vm_5_ip = test_utils.get_instance_ip(conn, vm_5)
 
         # We boot vm5 first because we need vm5_ip for vm4 userdata
         u4 = test_utils.generate_ping_userdata([vm_5_ip])
         vm_4 = test_utils.create_instance(
-            nova_client,
+            conn,
             TESTCASE_CONFIG.instance_4_name,
             image_id,
             network_2_id,
@@ -119,7 +119,7 @@ def main():
             secgroup_name=TESTCASE_CONFIG.secgroup_name,
             compute_node=av_zone_1,
             userdata=u4)
-        vm_4_ip = test_utils.get_instance_ip(vm_4)
+        vm_4_ip = test_utils.get_instance_ip(conn, vm_4)
 
         # We boot VM1 at the end because we need to get the IPs
         # first to generate the userdata
@@ -128,7 +128,7 @@ def main():
                                                 vm_4_ip,
                                                 vm_5_ip])
         vm_1 = test_utils.create_instance(
-            nova_client,
+            conn,
             TESTCASE_CONFIG.instance_1_name,
             image_id,
             network_1_id,
@@ -258,7 +258,7 @@ def main():
         logger.error("exception occurred while executing testcase_4: %s", e)
         raise
     finally:
-        test_utils.cleanup_nova(nova_client, instance_ids)
+        test_utils.cleanup_nova(conn, instance_ids)
         test_utils.cleanup_glance(conn, image_ids)
         test_utils.cleanup_neutron(neutron_client, floatingip_ids,
                                    bgpvpn_ids, interfaces, subnet_ids,
diff --git a/sdnvpn/test/functest/testcase_7.py b/sdnvpn/test/functest/testcase_7.py
index 381b98b..715b55a 100644
--- a/sdnvpn/test/functest/testcase_7.py
+++ b/sdnvpn/test/functest/testcase_7.py
@@ -35,13 +35,13 @@ TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig(
 
 
 def main():
-    results = Results(COMMON_CONFIG.line_length)
+    conn = os_utils.get_os_connection()
+    results = Results(COMMON_CONFIG.line_length, conn)
 
     results.add_to_summary(0, "=")
     results.add_to_summary(2, "STATUS", "SUBTEST")
     results.add_to_summary(0, "=")
 
-    nova_client = os_utils.get_nova_client()
     neutron_client = os_utils.get_neutron_client()
     conn = os_utils.get_os_connection()
 
@@ -82,17 +82,17 @@ def main():
         test_utils.open_http_port(neutron_client, sg_id)
 
         vm_2 = test_utils.create_instance(
-            nova_client,
+            conn,
             TESTCASE_CONFIG.instance_2_name,
             image_id,
             network_2_id,
             sg_id,
             secgroup_name=TESTCASE_CONFIG.secgroup_name)
-        vm_2_ip = test_utils.get_instance_ip(vm_2)
+        vm_2_ip = test_utils.get_instance_ip(conn, vm_2)
 
         u1 = test_utils.generate_ping_userdata([vm_2_ip])
         vm_1 = test_utils.create_instance(
-            nova_client,
+            conn,
             TESTCASE_CONFIG.instance_1_name,
             image_id,
             network_1_id,
@@ -168,7 +168,7 @@ def main():
         logger.error("exception occurred while executing testcase_7: %s", e)
         raise
     finally:
-        test_utils.cleanup_nova(nova_client, instance_ids)
+        test_utils.cleanup_nova(conn, instance_ids)
         test_utils.cleanup_glance(conn, image_ids)
         test_utils.cleanup_neutron(neutron_client, floatingip_ids,
                                    bgpvpn_ids, interfaces, subnet_ids,
diff --git a/sdnvpn/test/functest/testcase_8.py b/sdnvpn/test/functest/testcase_8.py
index cfdb950..adf09e4 100644
--- a/sdnvpn/test/functest/testcase_8.py
+++ b/sdnvpn/test/functest/testcase_8.py
@@ -33,13 +33,13 @@ TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig(
 
 
 def main():
-    results = Results(COMMON_CONFIG.line_length)
+    conn = os_utils.get_os_connection()
+    results = Results(COMMON_CONFIG.line_length, conn)
 
     results.add_to_summary(0, "=")
     results.add_to_summary(2, "STATUS", "SUBTEST")
     results.add_to_summary(0, "=")
 
-    nova_client = os_utils.get_nova_client()
     neutron_client = os_utils.get_neutron_client()
     conn = os_utils.get_os_connection()
 
@@ -79,24 +79,24 @@ def main():
         test_utils.open_icmp(neutron_client, sg_id)
         test_utils.open_http_port(neutron_client, sg_id)
 
-        compute_nodes = test_utils.assert_and_get_compute_nodes(nova_client)
+        compute_nodes = test_utils.assert_and_get_compute_nodes(conn)
         av_zone_1 = "nova:" + compute_nodes[0]
         # spawning the VMs on the same compute because fib flow (21) entries
         # are not created properly if vm1 and vm2 are attached to two
         # different computes
         vm_2 = test_utils.create_instance(
-            nova_client,
+            conn,
             TESTCASE_CONFIG.instance_2_name,
             image_id,
             network_2_id,
             sg_id,
             secgroup_name=TESTCASE_CONFIG.secgroup_name,
             compute_node=av_zone_1)
-        vm_2_ip = test_utils.get_instance_ip(vm_2)
+        vm_2_ip = test_utils.get_instance_ip(conn, vm_2)
 
         u1 = test_utils.generate_ping_userdata([vm_2_ip])
         vm_1 = test_utils.create_instance(
-            nova_client,
+            conn,
             TESTCASE_CONFIG.instance_1_name,
             image_id,
             network_1_id,
@@ -176,7 +176,7 @@ def main():
         logger.error("exception occurred while executing testcase_8: %s", e)
         raise
     finally:
-        test_utils.cleanup_nova(nova_client, instance_ids)
+        test_utils.cleanup_nova(conn, instance_ids)
         test_utils.cleanup_glance(conn, image_ids)
         test_utils.cleanup_neutron(neutron_client, floatingip_ids,
                                    bgpvpn_ids, interfaces, subnet_ids,