x/vmware-nsx
Code Issues Proposed changes

Merge "De-duplicate unit tests for ports in Big Switch"

Browse Source
This commit is contained in:
Jenkins 2014-04-03 18:08:10 +00:00 committed by Gerrit Code Review
commit 507c0c8f32
1 changed files with 15 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
neutron/tests/unit/bigswitch/test_restproxy_plugin.py
View File

@ -181,48 +181,14 @@ class TestBigSwitchProxyPortsV2(test_plugin.TestPortsV2,
mock_send_all.assert_has_calls([call]) mock_send_all.assert_has_calls([call])
self.spawn_p.start() self.spawn_p.start()
def test_port_vif_details_default(self):
class TestBigSwitchProxyPortsV2IVS(test_plugin.TestPortsV2,
BigSwitchProxyPluginV2TestCase,
test_bindings.PortBindingsTestCase):
VIF_TYPE = portbindings.VIF_TYPE_IVS
HAS_PORT_FILTER = False
def setUp(self):
super(TestBigSwitchProxyPortsV2IVS,
self).setUp()
cfg.CONF.set_override('vif_type', 'ivs', 'NOVA')
class TestNoHostIDVIFOverride(test_plugin.TestPortsV2,
BigSwitchProxyPluginV2TestCase,
test_bindings.PortBindingsTestCase):
VIF_TYPE = portbindings.VIF_TYPE_OVS
HAS_PORT_FILTER = False
def setUp(self):
super(TestNoHostIDVIFOverride, self).setUp()
cfg.CONF.set_override('vif_type', 'ovs', 'NOVA')
def test_port_vif_details(self):
kwargs = {'name': 'name', 'device_id': 'override_dev'} kwargs = {'name': 'name', 'device_id': 'override_dev'}
with self.port(**kwargs) as port: with self.port(**kwargs) as port:
self.assertEqual(port['port']['binding:vif_type'], self.assertEqual(port['port']['binding:vif_type'],
portbindings.VIF_TYPE_OVS) portbindings.VIF_TYPE_OVS)
def test_port_vif_details_override(self):
class TestBigSwitchVIFOverride(test_plugin.TestPortsV2, # ivshost is in the test config to override to IVS
BigSwitchProxyPluginV2TestCase,
test_bindings.PortBindingsTestCase):
VIF_TYPE = portbindings.VIF_TYPE_OVS
HAS_PORT_FILTER = False
def setUp(self):
super(TestBigSwitchVIFOverride,
self).setUp()
cfg.CONF.set_override('vif_type', 'ovs', 'NOVA')
def test_port_vif_details(self):
kwargs = {'name': 'name', 'binding:host_id': 'ivshost', kwargs = {'name': 'name', 'binding:host_id': 'ivshost',
'device_id': 'override_dev'} 'device_id': 'override_dev'}
with self.port(**kwargs) as port: with self.port(**kwargs) as port:
@ -234,6 +200,7 @@ class TestBigSwitchVIFOverride(test_plugin.TestPortsV2,
self.assertEqual(port['port']['binding:vif_type'], self.VIF_TYPE) self.assertEqual(port['port']['binding:vif_type'], self.VIF_TYPE)
def test_port_move(self): def test_port_move(self):
# ivshost is in the test config to override to IVS
kwargs = {'name': 'name', 'binding:host_id': 'ivshost', kwargs = {'name': 'name', 'binding:host_id': 'ivshost',
'device_id': 'override_dev'} 'device_id': 'override_dev'}
with self.port(**kwargs) as port: with self.port(**kwargs) as port:
@ -256,6 +223,17 @@ class TestBigSwitchVIFOverride(test_plugin.TestPortsV2,
return self.deserialize(fmt, res) return self.deserialize(fmt, res)
class TestVifDifferentDefault(BigSwitchProxyPluginV2TestCase):
def setup_config_files(self):
super(TestVifDifferentDefault, self).setup_config_files()
cfg.CONF.set_override('vif_type', 'ivs', 'NOVA')
def test_default_viftype(self):
with self.port() as port:
self.assertEqual(port['port']['binding:vif_type'], 'ivs')
class TestBigSwitchProxyNetworksV2(test_plugin.TestNetworksV2, class TestBigSwitchProxyNetworksV2(test_plugin.TestNetworksV2,
BigSwitchProxyPluginV2TestCase): BigSwitchProxyPluginV2TestCase):