x/vmware-nsx
Code Issues Proposed changes

merge trunk

Browse Source
This commit is contained in:
Dan Wendlandt 2011-08-29 23:32:52 -07:00
commit a87a43c8fe
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
quantum/db/api.py
View File

@ -142,6 +142,13 @@ def network_destroy(net_id):
net = session.query(models.Network).\ net = session.query(models.Network).\
filter_by(uuid=net_id).\ filter_by(uuid=net_id).\
one() one()
ports = session.query(models.Port).\
filter_by(network_id=net_id).\
all()
for p in ports:
session.delete(p)
session.delete(net) session.delete(net)
session.flush() session.flush()
return net return net

26
tests/unit/test_api.py
View File

@ -261,6 +261,26 @@ class APITest(unittest.TestCase):
self.assertEqual(delete_network_res.status_int, 421) self.assertEqual(delete_network_res.status_int, 421)
LOG.debug("_test_delete_network_in_use - format:%s - END", format) LOG.debug("_test_delete_network_in_use - format:%s - END", format)
def _test_delete_network_with_unattached_port(self, format):
LOG.debug("_test_delete_network_with_unattached_port "\
"- format:%s - START", format)
content_type = "application/%s" % format
port_state = "ACTIVE"
network_id = self._create_network(format)
LOG.debug("Deleting network %(network_id)s"\
" of tenant %(tenant_id)s", locals())
port_id = self._create_port(network_id, port_state, format)
LOG.debug("Deleting network %(network_id)s"\
" of tenant %(tenant_id)s", locals())
delete_network_req = testlib.network_delete_request(self.tenant_id,
network_id,
format)
delete_network_res = delete_network_req.get_response(self.api)
self.assertEqual(delete_network_res.status_int, 204)
LOG.debug("_test_delete_network_with_unattached_port "\
"- format:%s - END", format)
def _test_list_ports(self, format): def _test_list_ports(self, format):
LOG.debug("_test_list_ports - format:%s - START", format) LOG.debug("_test_list_ports - format:%s - START", format)
content_type = "application/%s" % format content_type = "application/%s" % format
@ -848,6 +868,12 @@ class APITest(unittest.TestCase):
def test_delete_network_in_use_xml(self): def test_delete_network_in_use_xml(self):
self._test_delete_network_in_use('xml') self._test_delete_network_in_use('xml')
def test_delete_network_with_unattached_port_xml(self):
self._test_delete_network_with_unattached_port('xml')
def test_delete_network_with_unattached_port_json(self):
self._test_delete_network_with_unattached_port('json')
def test_list_ports_json(self): def test_list_ports_json(self):
self._test_list_ports('json') self._test_list_ports('json')