Merge "Set the ram of flavor 1024"

[functest.git] / functest / opnfv_tests / openstack / vping / vping_userdata.py

diff --git a/functest/opnfv_tests/openstack/vping/vping_userdata.py b/functest/opnfv_tests/openstack/vping/vping_userdata.py
old mode 100755 (executable)
new mode 100644 (file)
index b69b395..ceba091
--- a/functest/opnfv_tests/openstack/vping/vping_userdata.py
+++ b/functest/opnfv_tests/openstack/vping/vping_userdata.py
@@ -7,17 +7,16 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 
-import argparse
-import sys
-import time
+"""vping_userdata testcase."""
 
-from functest.core.testcase import TestCase
+import time
 
+from snaps.config.network import PortConfig
+from snaps.config.vm_inst import VmInstanceConfig
 from snaps.openstack.utils import deploy_utils
-from snaps.openstack.create_instance import VmInstanceSettings
-from snaps.openstack.create_network import PortSettings
 
-import vping_base
+from functest.core.testcase import TestCase
+from functest.opnfv_tests.openstack.vping import vping_base
 
 
 class VPingUserdata(vping_base.VPingBase):
@@ -40,18 +39,18 @@ class VPingUserdata(vping_base.VPingBase):
             super(VPingUserdata, self).run()
 
             # Creating Instance 1
-            port1_settings = PortSettings(
+            port1_settings = PortConfig(
                 name=self.vm1_name + '-vPingPort',
                 network_name=self.network_creator.network_settings.name)
-            instance1_settings = VmInstanceSettings(
+            instance1_settings = VmInstanceConfig(
                 name=self.vm1_name,
                 flavor=self.flavor_name,
                 vm_boot_timeout=self.vm_boot_timeout,
                 port_settings=[port1_settings])
 
             self.logger.info(
-                "Creating VM 1 instance with name: '%s'"
-                % instance1_settings.name)
+                "Creating VM 1 instance with name: '%s'",
+                instance1_settings.name)
             self.vm1_creator = deploy_utils.create_vm_instance(
                 self.os_creds, instance1_settings,
                 self.image_creator.image_settings)
@@ -61,10 +60,10 @@ class VPingUserdata(vping_base.VPingBase):
                 self.vm1_creator.get_port_ip(port1_settings.name))
             if userdata:
                 # Creating Instance 2
-                port2_settings = PortSettings(
+                port2_settings = PortConfig(
                     name=self.vm2_name + '-vPingPort',
                     network_name=self.network_creator.network_settings.name)
-                instance2_settings = VmInstanceSettings(
+                instance2_settings = VmInstanceConfig(
                     name=self.vm2_name,
                     flavor=self.flavor_name,
                     vm_boot_timeout=self.vm_boot_timeout,
@@ -72,8 +71,8 @@ class VPingUserdata(vping_base.VPingBase):
                     userdata=userdata)
 
                 self.logger.info(
-                    "Creating VM 2 instance with name: '%s'"
-                    % instance2_settings.name)
+                    "Creating VM 2 instance with name: '%s'",
+                    instance2_settings.name)
                 self.vm2_creator = deploy_utils.create_vm_instance(
                     self.os_creds, instance2_settings,
                     self.image_creator.image_settings)
@@ -91,19 +90,19 @@ class VPingUserdata(vping_base.VPingBase):
         Override from super
         """
         self.logger.info("Waiting for ping...")
-        exit_code = -1
+        exit_code = TestCase.EX_TESTCASE_FAILED
         sec = 0
         tries = 0
 
         while True:
             time.sleep(1)
-            p_console = vm_creator.get_vm_inst().get_console_output()
+            p_console = vm_creator.get_console_output()
             if "vPing OK" in p_console:
                 self.logger.info("vPing detected!")
                 exit_code = TestCase.EX_OK
                 break
             elif "failed to read iid from metadata" in p_console or tries > 5:
-                exit_code = TestCase.EX_TESTCASE_FAILED
+                self.logger.info("Failed to read iid from metadata")
                 break
             elif sec == self.ping_timeout:
                 self.logger.info("Timeout reached.")
@@ -116,7 +115,7 @@ class VPingUserdata(vping_base.VPingBase):
                     tries += 1
                 else:
                     self.logger.debug(
-                        "Pinging %s. Waiting for response..." % test_ip)
+                        "Pinging %s. Waiting for response...", test_ip)
             sec += 1
 
         return exit_code
@@ -140,15 +139,5 @@ def _get_userdata(test_ip):
                 "  echo 'vPing KO'\n"
                 " fi\n"
                 " sleep 1\n"
-                "done\n" % test_ip)
+                "done\n" % str(test_ip))
     return None
-
-
-if __name__ == '__main__':
-    args_parser = argparse.ArgumentParser()
-    args_parser.add_argument("-r", "--report",
-                             help="Create json result file",
-                             action="store_true")
-    args = vars(args_parser.parse_args())
-
-    sys.exit(vping_base.VPingMain(VPingUserdata).main(**args))