From 17654068a65d260f4c82841dd989cf12814c50a4 Mon Sep 17 00:00:00 2001 From: Aaron Lee Date: Wed, 15 Feb 2012 18:36:18 -0600 Subject: Extract get_network in quantum manager To aid understanding, testing and refactoring allocate_for_instance update: rebase update: rebase and trailingslashectomy Change-Id: I85364b925082ec598c1645c33f3db4a25f3242a8 --- nova/tests/test_quantum.py | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/test_quantum.py b/nova/tests/test_quantum.py index 3fa32ef70..e13ad0357 100644 --- a/nova/tests/test_quantum.py +++ b/nova/tests/test_quantum.py @@ -220,10 +220,41 @@ class QuantumNovaTestCase(test.TestCase): n['uuid'] = nwks[0]['uuid'] +class QuantumAllocationTestCase(QuantumNovaTestCase): + def test_get_network_in_db(self): + context = self.mox.CreateMockAnything() + context.elevated().AndReturn('elevated') + self.mox.StubOutWithMock(db, 'network_get_by_uuid') + self.net_man.context = context + db.network_get_by_uuid('elevated', 'quantum_net_id').AndReturn( + {'uuid': 1}) + + self.mox.ReplayAll() + + network = self.net_man.get_network(context, ('quantum_net_id', + 'net_tenant_id')) + self.assertEquals(network['quantum_net_id'], 'quantum_net_id') + self.assertEquals(network['uuid'], 1) + + def test_get_network_not_in_db(self): + context = self.mox.CreateMockAnything() + context.elevated().AndReturn('elevated') + self.mox.StubOutWithMock(db, 'network_get_by_uuid') + self.net_man.context = context + db.network_get_by_uuid('elevated', 'quantum_net_id').AndReturn(None) + + self.mox.ReplayAll() + + network = self.net_man.get_network(context, ('quantum_net_id', + 'net_tenant_id')) + self.assertEquals(network['quantum_net_id'], 'quantum_net_id') + self.assertEquals(network['uuid'], 'quantum_net_id') + + class QuantumDeallocationTestCase(QuantumNovaTestCase): def test_deallocate_port(self): - quantum = self.mox.CreateMock(quantum_connection\ - .QuantumClientConnection) + quantum = self.mox.CreateMock( + quantum_connection.QuantumClientConnection) quantum.get_port_by_attachment('q_tenant_id', 'net_id', 'interface_id').AndReturn('port_id') quantum.detach_and_delete_port('q_tenant_id', 'net_id', 'port_id') -- cgit