Change network delete to delete by uuid or cidr

With melange it will be possible to have overlapping cidrs so it would be
better to specify the uuid of the network to delete.

Change-Id: I6781225d587952cbab3387cd40164d8ac77c58d6

2 files changed, 18 insertions, 1 deletions

diff --git a/nova/tests/test_nova_manage.py b/nova/tests/test_nova_manage.py
index 520bfbea1..b0a76f392 100644
--- a/nova/tests/test_nova_manage.py
+++ b/nova/tests/test_nova_manage.py
@@ -202,6 +202,19 @@ class NetworkCommandsTestCase(test.TestCase):
         self.stubs.Set(db, 'network_delete_safe', fake_network_delete_safe)
         self.commands.delete(fixed_range=self.fake_net['cidr'])
 
+    def test_delete_by_cidr(self):
+        self.fake_net = self.net
+        self.fake_net['project_id'] = None
+        self.fake_net['host'] = None
+        self.stubs.Set(db, 'network_get_by_cidr',
+                       self.fake_network_get_by_cidr)
+
+        def fake_network_delete_safe(context, network_id):
+            self.assertTrue(context.to_dict()['is_admin'])
+            self.assertEqual(network_id, self.fake_net['id'])
+        self.stubs.Set(db, 'network_delete_safe', fake_network_delete_safe)
+        self.commands.delete(fixed_range=self.fake_net['cidr'])
+
     def _test_modify_base(self, update_value, project, host, dis_project=None,
                           dis_host=None):
         self.fake_net = self.net
diff --git a/nova/tests/test_quantum.py b/nova/tests/test_quantum.py
index 1a199131d..fdfc99d49 100644
--- a/nova/tests/test_quantum.py
+++ b/nova/tests/test_quantum.py
@@ -196,7 +196,11 @@ class QuantumTestCaseBase(object):
     def _delete_nets(self):
         for n in networks:
             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):
         self._create_nets()