733eb3c3d3
Found when I enabled test_extension_allowedaddress_pairs, where test_create_port_removed_allowed_address_pairs would fail due to the returned port still containing the original addresspair. The cause is ovs simply not updating the port info being returned. This patch additionally enables test_extension_allowedaddress_pairs for openvswitch. Moved checks and updating into method similar to what we do for extradhcpopts and security_groups. Additionally, this required fixing is_address_pairs_attribute_updated() as it was passing (non-hashable) dicts to utils.compare_elements. Change-Id: Ic871fea68fb9fcc862b1fd5ae5fe7aec540e4a30 Partial-Bug: #1255150
82 lines
2.8 KiB
Python
82 lines
2.8 KiB
Python
# Copyright (c) 2012 OpenStack Foundation.
|
|
#
|
|
# 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.extensions import portbindings
|
|
from neutron.tests.unit import _test_extension_portbindings as test_bindings
|
|
from neutron.tests.unit import test_db_plugin as test_plugin
|
|
from neutron.tests.unit import test_extension_allowedaddresspairs as test_pair
|
|
from neutron.tests.unit import test_security_groups_rpc as test_sg_rpc
|
|
|
|
|
|
class OpenvswitchPluginV2TestCase(test_plugin.NeutronDbPluginV2TestCase):
|
|
|
|
_plugin_name = ('neutron.plugins.openvswitch.'
|
|
'ovs_neutron_plugin.OVSNeutronPluginV2')
|
|
|
|
def setUp(self):
|
|
super(OpenvswitchPluginV2TestCase, self).setUp(self._plugin_name)
|
|
self.port_create_status = 'DOWN'
|
|
|
|
|
|
class TestOpenvswitchBasicGet(test_plugin.TestBasicGet,
|
|
OpenvswitchPluginV2TestCase):
|
|
pass
|
|
|
|
|
|
class TestOpenvswitchV2HTTPResponse(test_plugin.TestV2HTTPResponse,
|
|
OpenvswitchPluginV2TestCase):
|
|
pass
|
|
|
|
|
|
class TestOpenvswitchPortsV2(test_plugin.TestPortsV2,
|
|
OpenvswitchPluginV2TestCase):
|
|
|
|
def test_update_port_status_build(self):
|
|
with self.port() as port:
|
|
self.assertEqual(port['port']['status'], 'DOWN')
|
|
self.assertEqual(self.port_create_status, 'DOWN')
|
|
|
|
|
|
class TestOpenvswitchNetworksV2(test_plugin.TestNetworksV2,
|
|
OpenvswitchPluginV2TestCase):
|
|
pass
|
|
|
|
|
|
class TestOpenvswitchPortBinding(OpenvswitchPluginV2TestCase,
|
|
test_bindings.PortBindingsTestCase):
|
|
VIF_TYPE = portbindings.VIF_TYPE_OVS
|
|
HAS_PORT_FILTER = True
|
|
FIREWALL_DRIVER = test_sg_rpc.FIREWALL_HYBRID_DRIVER
|
|
|
|
def setUp(self, firewall_driver=None):
|
|
test_sg_rpc.set_firewall_driver(self.FIREWALL_DRIVER)
|
|
super(TestOpenvswitchPortBinding, self).setUp()
|
|
|
|
|
|
class TestOpenvswitchPortBindingNoSG(TestOpenvswitchPortBinding):
|
|
HAS_PORT_FILTER = False
|
|
FIREWALL_DRIVER = test_sg_rpc.FIREWALL_NOOP_DRIVER
|
|
|
|
|
|
class TestOpenvswitchPortBindingHost(
|
|
OpenvswitchPluginV2TestCase,
|
|
test_bindings.PortBindingsHostTestCaseMixin):
|
|
pass
|
|
|
|
|
|
class TestOpenvswitchAllowedAddressPairs(OpenvswitchPluginV2TestCase,
|
|
test_pair.TestAllowedAddressPairs):
|
|
pass
|