openstack
/
neutron
Code Issues Proposed changes

Merge "Cisco N1kv: Remove vmnetwork delete REST call on last port delete" into stable/juno

This commit is contained in:
Jenkins 2014-10-30 00:08:52 +00:00 committed by Gerrit Code Review
parent 51b7c2b3a6 72ef7b352c
commit 6e0597b208
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py
View File

@ -847,8 +847,6 @@ class N1kvNeutronPluginV2(db_base_plugin_v2.NeutronDbPluginV2,
LOG.debug(_('_send_delete_port_request: %s'), port['id'])
n1kvclient = n1kv_client.Client()
n1kvclient.delete_n1kv_port(vm_network['name'], port['id'])
if vm_network['port_count'] == 0:
n1kvclient.delete_vm_network(vm_network['name'])
def _get_segmentation_id(self, context, id):
"""

18
neutron/tests/unit/cisco/n1kv/test_n1kv_plugin.py
View File

@ -793,6 +793,24 @@ class TestN1kvPorts(test_plugin.TestPortsV2,
# for network object clean up to succeed.
client_patch.stop()
def test_delete_last_port_vmnetwork_cleanup(self):
"""Test whether VMNetwork is cleaned up from db on last port delete."""
db_session = db.get_session()
with self.port() as port:
pt = port['port']
self.assertIsNotNone(n1kv_db_v2.
get_vm_network(db_session,
pt['n1kv:profile_id'],
pt['network_id']))
req = self.new_delete_request('ports', port['port']['id'])
req.get_response(self.api)
# Verify VMNetwork is cleaned up from the database on port delete.
self.assertRaises(c_exc.VMNetworkNotFound,
n1kv_db_v2.get_vm_network,
db_session,
pt['n1kv:profile_id'],
pt['network_id'])
class TestN1kvPolicyProfiles(N1kvPluginTestCase):
def setUp(self):