Merge "Replace glance client calls with openstack sdk"

[sdnvpn.git] / sdnvpn / test / functest / testcase_10.py

diff --git a/sdnvpn/test/functest/testcase_10.py b/sdnvpn/test/functest/testcase_10.py
index d4ab664..78d5684 100644 (file)
--- a/sdnvpn/test/functest/testcase_10.py
+++ b/sdnvpn/test/functest/testcase_10.py
@@ -19,7 +19,6 @@ from sdnvpn.lib import openstack_utils as os_utils
 from sdnvpn.lib import utils as test_utils
 from sdnvpn.lib.results import Results
 
-
 logger = logging.getLogger('__name__')
 
 std_out_lock = Lock()
@@ -46,20 +45,20 @@ def monitor(in_data, out_data, vm):
                                                   format(vm.name))
                         # Atomic write to std out
                         with std_out_lock:
-                            logging.error("Failure during ping from "
-                                          "instance {}: {}".
-                                          format(vm.name, console_line))
+                            logger.error("Failure during ping from "
+                                         "instance {}: {}".
+                                         format(vm.name, console_line))
                     elif re.match(r'ping.*OK', console_line):
                         # Atomic write to std out
                         with std_out_lock:
-                            logging.info("Ping from instance {}: {}".
-                                         format(vm.name, console_line))
+                            logger.info("Ping from instance {}: {}".
+                                        format(vm.name, console_line))
                 lines_offset = len(vm_console_out_lines)
         except:
             # Atomic write to std out
             with std_out_lock:
-                logging.error("Failure in monitor_thread of instance {}".
-                              format(vm.name))
+                logger.error("Failure in monitor_thread of instance {}".
+                             format(vm.name))
     # Return to main process
     return
 
@@ -73,11 +72,11 @@ def main():
 
     nova_client = os_utils.get_nova_client()
     neutron_client = os_utils.get_neutron_client()
-    glance_client = os_utils.get_glance_client()
+    conn = os_utils.get_os_connection()
 
     (floatingip_ids, instance_ids, router_ids, network_ids, image_ids,
      subnet_ids, interfaces, bgpvpn_ids) = ([] for i in range(8))
-    image_id = os_utils.create_glance_image(glance_client,
+    image_id = os_utils.create_glance_image(conn,
                                             TESTCASE_CONFIG.image_name,
                                             COMMON_CONFIG.image_path,
                                             disk=COMMON_CONFIG.image_format,
@@ -173,11 +172,11 @@ def main():
     thread_inputs = [monitor_input1, monitor_input2, monitor_input3]
     thread_outputs = [monitor_output1, monitor_output2, monitor_output3]
     try:
-        logging.info("Starting all monitor threads")
+        logger.info("Starting all monitor threads")
         # Start all monitor threads
         for thread in threads:
             thread.start()
-        logging.info("Wait before subtest")
+        logger.info("Wait before subtest")
         test_utils.wait_before_subtest()
         monitor_err_msg = ""
         for thread_output in thread_outputs:
@@ -193,8 +192,8 @@ def main():
         # 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):
-            logging.error("Fail to delete vm_2 instance during "
-                          "testing process")
+            logger.error("Fail to delete vm_2 instance during "
+                         "testing process")
             raise Exception("Fail to delete instance vm_2.")
         for thread_input in thread_inputs:
             thread_input["stop_thread"] = True
@@ -232,7 +231,7 @@ def main():
         threads.append(monitor_thread4)
         thread_inputs.append(monitor_input4)
         thread_outputs.append(monitor_output4)
-        logging.info("Starting monitor thread of vm_4")
+        logger.info("Starting monitor thread of vm_4")
         threads[0].start()
         test_utils.wait_before_subtest()
         monitor_err_msg = ""
@@ -253,7 +252,7 @@ def main():
         raise
     finally:
         # Give a stop signal to all threads
-        logging.info("Sending stop signal to monitor thread")
+        logger.info("Sending stop signal to monitor thread")
         for thread_input in thread_inputs:
             thread_input["stop_thread"] = True
         # Wait for all threads to stop and return to the main process
@@ -261,7 +260,7 @@ def main():
             thread.join()
 
         test_utils.cleanup_nova(nova_client, instance_ids)
-        test_utils.cleanup_glance(glance_client, image_ids)
+        test_utils.cleanup_glance(conn, image_ids)
         test_utils.cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids,
                                    interfaces, subnet_ids, router_ids,
                                    network_ids)
@@ -270,5 +269,4 @@ def main():
 
 
 if __name__ == '__main__':
-    logging.basicConfig(level=logging.INFO)
     sys.exit(main())