diff --git a/neutron/tests/fullstack/resources/config.py b/neutron/tests/fullstack/resources/config.py index bf523f979cd..17ba6195ea5 100644 --- a/neutron/tests/fullstack/resources/config.py +++ b/neutron/tests/fullstack/resources/config.py @@ -187,9 +187,11 @@ class ML2ConfigFixture(ConfigFixture): }, }) - extension_drivers = ['port_security'] + extension_drivers = {'port_security'} if env_desc.qos: - extension_drivers.append(qos_ext.QOS_EXT_DRIVER_ALIAS) + extension_drivers.add(qos_ext.QOS_EXT_DRIVER_ALIAS) + if env_desc.ml2_extension_drivers: + extension_drivers.update(env_desc.ml2_extension_drivers) self.config['ml2']['extension_drivers'] = ','.join(extension_drivers) diff --git a/neutron/tests/fullstack/resources/environment.py b/neutron/tests/fullstack/resources/environment.py index 2eb131121a5..a2bb2f1f961 100644 --- a/neutron/tests/fullstack/resources/environment.py +++ b/neutron/tests/fullstack/resources/environment.py @@ -40,7 +40,7 @@ class EnvironmentDescription(object): global_mtu=constants.DEFAULT_NETWORK_MTU, debug_iptables=False, log=False, report_bandwidths=False, has_placement=False, placement_port=None, - dhcp_scheduler_class=None,): + dhcp_scheduler_class=None, ml2_extension_drivers=None): self.network_type = network_type self.l2_pop = l2_pop self.qos = qos @@ -61,6 +61,7 @@ class EnvironmentDescription(object): self.service_plugins += ',qos' if self.log: self.service_plugins += ',log' + self.ml2_extension_drivers = ml2_extension_drivers @property def tunneling_enabled(self): diff --git a/neutron/tests/fullstack/test_ports_api.py b/neutron/tests/fullstack/test_ports_api.py new file mode 100644 index 00000000000..9cb34a615d5 --- /dev/null +++ b/neutron/tests/fullstack/test_ports_api.py @@ -0,0 +1,59 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +from neutron_lib import constants +from oslo_utils import uuidutils + +from neutron.tests.fullstack import base +from neutron.tests.fullstack.resources import environment +from neutron.tests.unit import testlib_api + +load_tests = testlib_api.module_load_tests + + +class TestPortsApi(base.BaseFullStackTestCase): + + scenarios = [ + ('Sriov Agent', {'l2_agent_type': constants.AGENT_TYPE_NIC_SWITCH})] + + def setUp(self): + host_descriptions = [ + environment.HostDescription( + l2_agent_type=self.l2_agent_type)] + env = environment.Environment( + environment.EnvironmentDescription( + agent_down_time=10, + ml2_extension_drivers=['uplink_status_propagation']), + host_descriptions) + super(TestPortsApi, self).setUp(env) + + self.tenant_id = uuidutils.generate_uuid() + self.network = self.safe_client.create_network(self.tenant_id) + self.safe_client.create_subnet( + self.tenant_id, self.network['id'], '20.0.0.0/24') + + def test_create_port_with_propagate_uplink_status(self): + body = self.safe_client.create_port( + self.tenant_id, self.network['id'], propagate_uplink_status=False) + self.assertFalse(body['propagate_uplink_status']) + body = self.safe_client.client.list_ports(id=body['id'])['ports'][0] + self.assertFalse(body['propagate_uplink_status']) + body = self.safe_client.client.show_port(body['id'])['port'] + self.assertFalse(body['propagate_uplink_status']) + + def test_create_port_without_propagate_uplink_status(self): + body = self.safe_client.create_port(self.tenant_id, self.network['id']) + self.assertTrue(body['propagate_uplink_status']) + body = self.safe_client.client.list_ports(id=body['id'])['ports'][0] + self.assertTrue(body['propagate_uplink_status']) + body = self.safe_client.client.show_port(body['id'])['port'] + self.assertTrue(body['propagate_uplink_status'])