From a6c697ad2915a8b1839b33f3b9a297d656499283 Mon Sep 17 00:00:00 2001 From: ashish-kumar-gupta Date: Thu, 11 Aug 2016 11:04:43 +0530 Subject: [PATCH] Fix the types.set error for rally job run Rally jobs run for neutron vpnaas fails Closes-Bug: #1612056 Change-Id: Ia5356a466b7521f1aeeee22903c176c696422553 --- rally-jobs/plugins/test_vpn_connectivity.py | 6 +++--- rally-jobs/plugins/test_vpn_status.py | 6 +++--- rally-jobs/plugins/test_vpn_tenant_scenario.py | 6 +++--- rally-jobs/plugins/vpn_base.py | 2 +- rally-jobs/plugins/vpn_utils.py | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/rally-jobs/plugins/test_vpn_connectivity.py b/rally-jobs/plugins/test_vpn_connectivity.py index 3828680d8..c04b92cea 100644 --- a/rally-jobs/plugins/test_vpn_connectivity.py +++ b/rally-jobs/plugins/test_vpn_connectivity.py @@ -13,7 +13,7 @@ # under the License. from neutron_vpnaas._i18n import _LI -from rally.common import log as logging +from rally.common import logging from rally.task import scenario from rally.task import types as types @@ -24,8 +24,8 @@ LOG = logging.getLogger(__name__) class TestVpnBasicScenario(vpn_base.VpnBase): """Rally scenarios for VPNaaS""" - @types.set(image=types.ImageResourceType, - flavor=types.FlavorResourceType) + @types.convert(image={"type": "glance_image"}, + flavor={"type": "nova_flavor"}) @scenario.configure() def create_and_delete_vpn_connection(self, **kwargs): """Basic VPN connectivity scenario. diff --git a/rally-jobs/plugins/test_vpn_status.py b/rally-jobs/plugins/test_vpn_status.py index 46717b322..6cde4872d 100644 --- a/rally-jobs/plugins/test_vpn_status.py +++ b/rally-jobs/plugins/test_vpn_status.py @@ -13,7 +13,7 @@ # under the License. from neutron_vpnaas._i18n import _LI -from rally.common import log as logging +from rally.common import logging from rally.task import scenario from rally.task import types as types @@ -23,8 +23,8 @@ LOG = logging.getLogger(__name__) class TestVpnStatusScenario(vpn_base.VpnBase): - @types.set(image=types.ImageResourceType, - flavor=types.FlavorResourceType) + @types.convert(image={"type": "glance_image"}, + flavor={"type": "nova_flavor"}) @scenario.configure() def check_vpn_status(self, **kwargs): """Test VPN's status correctly after bringing router's status to diff --git a/rally-jobs/plugins/test_vpn_tenant_scenario.py b/rally-jobs/plugins/test_vpn_tenant_scenario.py index fd7198d78..09d59eae0 100644 --- a/rally-jobs/plugins/test_vpn_tenant_scenario.py +++ b/rally-jobs/plugins/test_vpn_tenant_scenario.py @@ -13,7 +13,7 @@ # under the License. from neutron_vpnaas._i18n import _LI -from rally.common import log as logging +from rally.common import logging from rally.task import scenario from rally.task import types as types @@ -25,8 +25,8 @@ LOG = logging.getLogger(__name__) class TestVpnTenantScenario(vpn_base.VpnBase): """Rally scenarios for VPNaaS""" - @types.set(image=types.ImageResourceType, - flavor=types.FlavorResourceType) + @types.convert(image={"type": "glance_image"}, + flavor={"type": "nova_flavor"}) @scenario.configure() def multitenants_vpn_test(self, **kwargs): """Test VPN connectivity under two different tenants. diff --git a/rally-jobs/plugins/vpn_base.py b/rally-jobs/plugins/vpn_base.py index 9b7b97025..16465bd69 100644 --- a/rally-jobs/plugins/vpn_base.py +++ b/rally-jobs/plugins/vpn_base.py @@ -19,7 +19,7 @@ import threading import time from oslo_utils import uuidutils -from rally.common import log as logging +from rally.common import logging from rally.plugins.openstack import scenario as rally_base from rally.task import atomic diff --git a/rally-jobs/plugins/vpn_utils.py b/rally-jobs/plugins/vpn_utils.py index 565264296..097200cb9 100644 --- a/rally-jobs/plugins/vpn_utils.py +++ b/rally-jobs/plugins/vpn_utils.py @@ -19,7 +19,7 @@ import socket import stat import time -from rally.common import log as logging +from rally.common import logging from rally.plugins.openstack.wrappers import network as network_wrapper from rally.task import utils as task_utils