Merge "Fix the types.set error for rally job run"

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.

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

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.

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
 

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