Change calls to SNAPS library exposing OpenStack instance objects.

Openstack object structures can change when new API versions are released and
SNAPS no longer is exposing OpenStack object implementations as this makes
the library brittle. The only two SNAPS method calls affected are when functest
needs to query for external networks and when vPing Userdata needs to obtain
the console logs.

JIRA: SNAPS-125

Change-Id: If6000e50eaa274713d9a6c964eabd1f73ded684e
Signed-off-by: spisarski <s.pisarski@cablelabs.com>

diff --git a/functest/opnfv_tests/openstack/snaps/snaps_utils.py b/functest/opnfv_tests/openstack/snaps/snaps_utils.py
index 327ba07..309f9db 100644 (file)
--- a/functest/opnfv_tests/openstack/snaps/snaps_utils.py
+++ b/functest/opnfv_tests/openstack/snaps/snaps_utils.py
@@ -16,4 +16,4 @@ def get_ext_net_name(os_creds):
     """
     neutron = neutron_utils.neutron_client(os_creds)
     ext_nets = neutron_utils.get_external_networks(neutron)
-    return ext_nets[0]['network']['name']
+    return ext_nets[0].name

diff --git a/functest/opnfv_tests/openstack/vping/vping_userdata.py b/functest/opnfv_tests/openstack/vping/vping_userdata.py
index 9aed4c1..8088a4d 100644 (file)
--- a/functest/opnfv_tests/openstack/vping/vping_userdata.py
+++ b/functest/opnfv_tests/openstack/vping/vping_userdata.py
@@ -94,7 +94,7 @@ class VPingUserdata(vping_base.VPingBase):
 
         while True:
             time.sleep(1)
-            p_console = vm_creator.get_os_vm_server_obj().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