x/python-ganttclient
Code Issues Proposed changes

Merge "Change network delete to delete by uuid or cidr"

Browse Source
This commit is contained in:
Jenkins
2011-11-08 22:29:04 +00:00
committed by Gerrit Code Review
parent daa6b0719b 0b8400a0b6
commit 553c2dc8a0
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bin/nova-manage
View File

@@ -858,14 +858,26 @@ class NetworkCommands(object):
network.cidr, network.cidr,
network.cidr_v6) network.cidr_v6)
@args('--network', dest="fixed_range", metavar='<x.x.x.x/yy>', @args('--fixed_range', dest="fixed_range", metavar='<x.x.x.x/yy>',
help='Network to delete') help='Network to delete')
def delete(self, fixed_range): @args('--uuid', dest='uuid', metavar='<uuid>',
help='UUID of network to delete')
def delete(self, fixed_range=None, uuid=None):
"""Deletes a network""" """Deletes a network"""
# delete the network if fixed_range is None and uuid is None:
raise Exception("Please specify either fixed_range or uuid")
net_manager = utils.import_object(FLAGS.network_manager) net_manager = utils.import_object(FLAGS.network_manager)
net_manager.delete_network(context.get_admin_context(), fixed_range) if "QuantumManager" in FLAGS.network_manager:
if uuid is None:
raise Exception("UUID is required to delete Quantum Networks")
if fixed_range:
raise Exception("Deleting by fixed_range is not supported " \
"with the QuantumManager")
# delete the network
net_manager.delete_network(context.get_admin_context(),
fixed_range, uuid)
@args('--network', dest="fixed_range", metavar='<x.x.x.x/yy>', @args('--network', dest="fixed_range", metavar='<x.x.x.x/yy>',
help='Network to modify') help='Network to modify')

6
nova/tests/test_quantum.py
View File

@@ -196,7 +196,11 @@ class QuantumTestCaseBase(object):
def _delete_nets(self): def _delete_nets(self):
for n in networks: for n in networks:
ctx = context.RequestContext('user1', n['project_id']) ctx = context.RequestContext('user1', n['project_id'])
self.net_man.delete_network(ctx, n['cidr']) db_nets = db.network_get_all(ctx.elevated())
for x in db_nets:
if x['label'] == n['label']:
n['uuid'] = x['uuid']
self.net_man.delete_network(ctx, None, n['uuid'])
def test_allocate_and_deallocate_instance_static(self): def test_allocate_and_deallocate_instance_static(self):
self._create_nets() self._create_nets()