From cbf56e3f77564a794a8cd9e64bcb595dbeb61095 Mon Sep 17 00:00:00 2001 From: Georgy Dyuldin Date: Tue, 18 Apr 2017 17:02:15 +0300 Subject: [PATCH] Fix SRIOV test Change-Id: I9ebd5d0ffed382c49a2e43dae67a4ac29b47ac38 --- plugin_test/vapor/vapor/settings.py | 1 + plugin_test/vapor/vapor/tests/test_sriov.py | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/plugin_test/vapor/vapor/settings.py b/plugin_test/vapor/vapor/settings.py index e7666820e..bc1c517e5 100644 --- a/plugin_test/vapor/vapor/settings.py +++ b/plugin_test/vapor/vapor/settings.py @@ -196,6 +196,7 @@ DPDK_NEC_BIND_CMD = 'curl https://raw.githubusercontent.com/Juniper/contrail-dpd # SR-IOV SRIOV_PHYSNET = os.environ.get('SRIOV_PHYSNET', 'physnet1') +SEGMENTATION_ID = int(os.environ.get('SEGMENTATION_ID', 2426)) # Security groups INGRESS = 'ingress' diff --git a/plugin_test/vapor/vapor/tests/test_sriov.py b/plugin_test/vapor/vapor/tests/test_sriov.py index 2f70443a6..af1cbb7f3 100644 --- a/plugin_test/vapor/vapor/tests/test_sriov.py +++ b/plugin_test/vapor/vapor/tests/test_sriov.py @@ -24,7 +24,7 @@ pytestmark = pytest.mark.requires('sriov_enabled') def test_virtual_function_exhaustion_and_reuse( ubuntu_xenial_image, flavor, network, subnet, net_subnet_router, neutron_security_group, floating_ip, keypair, create_network, - create_subnet, create_port, os_faults_steps, computes, + create_subnet, create_port, os_faults_steps, port_steps, computes, floating_ip_steps, server_steps, nova_availability_zone_hosts): """Verify Nova can schedule VM to all the VF of a PF. @@ -61,12 +61,15 @@ def test_virtual_function_exhaustion_and_reuse( kwargs = { 'provider:network_type': 'vlan', 'provider:physical_network': settings.SRIOV_PHYSNET, - 'provider:segmentation_id': 200 + 'provider:segmentation_id': settings.SEGMENTATION_ID } sriov_net_name, = utils.generate_ids() sriov_net = create_network(sriov_net_name, **kwargs) create_subnet( - sriov_net_name + '__subnet', sriov_net, cidr="10.200.54.0/24") + sriov_net_name + '__subnet', + sriov_net, + cidr="10.200.54.0/24", + gateway_ip=None) # Create servers servers = [] @@ -79,14 +82,16 @@ def test_virtual_function_exhaustion_and_reuse( flavor=flavor, availability_zone='nova:{}'.format(compute_host), keypair=keypair, + security_groups=[neutron_security_group], username=stepler_config.UBUNTU_USERNAME) + for i in range(numvfs): sriov_port = create_port(sriov_net, **sriov_port_kwargs) ports = [sriov_port] if i == 0: mgmt_port = create_port( network, security_groups=[neutron_security_group['id']]) - ports.insert(0, mgmt_port) + ports.append(mgmt_port) server = server_steps.create_servers( ports=ports, **server_create_args)[0] servers.append(server)