Merge "Matching test_check_vm_ip_dhcp on ip only"

diff --git a/snaps/openstack/tests/create_instance_tests.py b/snaps/openstack/tests/create_instance_tests.py
index 9fe5fef..d8d69b3 100644 (file)
--- a/snaps/openstack/tests/create_instance_tests.py
+++ b/snaps/openstack/tests/create_instance_tests.py
@@ -354,20 +354,15 @@ class SimpleHealthCheck(OSIntegrationTestCase):
         found = False
         timeout = 160
         start_time = time.time()
-        match_value = 'Lease of.*obtained'
 
-        logger.info("Looking for expression %s in the console log" % match_value)
+        logger.info("Looking for IP %s in the console log" % ip)
         full_log = ''
         while timeout > time.time() - start_time:
             output = vm.get_console_output()
             full_log = full_log + output
-            if re.search(match_value, output):
+            if re.search(ip, output):
                 logger.info('DHCP lease obtained logged in console')
-                if ip in output:
-                    logger.info('With correct IP address')
-                    found = True
-                else:
-                    logger.error('With incorrect IP address')
+                found = True
                 break
 
         if not found: