openstack/neutron-vpnaas
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2017-01-31 22:47:03 +00:00 committed by Gerrit Code Review
commit d6db1238a4
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rally-jobs/plugins/test_vpn_connectivity.py
View File

@ -13,7 +13,7 @@
# under the License. # under the License.
from neutron_vpnaas._i18n import _LI 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 scenario
from rally.task import types as types from rally.task import types as types
@ -24,8 +24,8 @@ LOG = logging.getLogger(__name__)
class TestVpnBasicScenario(vpn_base.VpnBase): class TestVpnBasicScenario(vpn_base.VpnBase):
"""Rally scenarios for VPNaaS""" """Rally scenarios for VPNaaS"""
@types.set(image=types.ImageResourceType, @types.convert(image={"type": "glance_image"},
flavor=types.FlavorResourceType) flavor={"type": "nova_flavor"})
@scenario.configure() @scenario.configure()
def create_and_delete_vpn_connection(self, **kwargs): def create_and_delete_vpn_connection(self, **kwargs):
"""Basic VPN connectivity scenario. """Basic VPN connectivity scenario.

6
rally-jobs/plugins/test_vpn_status.py
View File

@ -13,7 +13,7 @@
# under the License. # under the License.
from neutron_vpnaas._i18n import _LI 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 scenario
from rally.task import types as types from rally.task import types as types
@ -23,8 +23,8 @@ LOG = logging.getLogger(__name__)
class TestVpnStatusScenario(vpn_base.VpnBase): class TestVpnStatusScenario(vpn_base.VpnBase):
@types.set(image=types.ImageResourceType, @types.convert(image={"type": "glance_image"},
flavor=types.FlavorResourceType) flavor={"type": "nova_flavor"})
@scenario.configure() @scenario.configure()
def check_vpn_status(self, **kwargs): def check_vpn_status(self, **kwargs):
"""Test VPN's status correctly after bringing router's status to """Test VPN's status correctly after bringing router's status to

6
rally-jobs/plugins/test_vpn_tenant_scenario.py
View File

@ -13,7 +13,7 @@
# under the License. # under the License.
from neutron_vpnaas._i18n import _LI 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 scenario
from rally.task import types as types from rally.task import types as types
@ -25,8 +25,8 @@ LOG = logging.getLogger(__name__)
class TestVpnTenantScenario(vpn_base.VpnBase): class TestVpnTenantScenario(vpn_base.VpnBase):
"""Rally scenarios for VPNaaS""" """Rally scenarios for VPNaaS"""
@types.set(image=types.ImageResourceType, @types.convert(image={"type": "glance_image"},
flavor=types.FlavorResourceType) flavor={"type": "nova_flavor"})
@scenario.configure() @scenario.configure()
def multitenants_vpn_test(self, **kwargs): def multitenants_vpn_test(self, **kwargs):
"""Test VPN connectivity under two different tenants. """Test VPN connectivity under two different tenants.

2
rally-jobs/plugins/vpn_base.py
View File

@ -19,7 +19,7 @@ import threading
import time import time
from oslo_utils import uuidutils 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.plugins.openstack import scenario as rally_base
from rally.task import atomic from rally.task import atomic

2
rally-jobs/plugins/vpn_utils.py
View File

@ -19,7 +19,7 @@ import socket
import stat import stat
import time 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.plugins.openstack.wrappers import network as network_wrapper
from rally.task import utils as task_utils from rally.task import utils as task_utils