diff options
| author | Aaron Lee <aaron.lee@rackspace.com> | 2012-02-16 11:41:48 -0600 |
|---|---|---|
| committer | Aaron Lee <aaron.lee@rackspace.com> | 2012-02-16 12:26:38 -0600 |
| commit | 471150506653e697fc5a663d4d8b09ef5fbef19b (patch) | |
| tree | bde5c76e7361ab51aaf1710caa980792876a00ba /nova/tests | |
| parent | f5e17bbc155203feb8bba4f34ed93d22b1b8e95b (diff) | |
removed unused method and added another test
get_network_id_by_cidr is not used, I'm removing
it and it's tests.
get_tenant_id_by_net_id relies on catching
exceptions as part of the happy path. I expanded
the tests to try to exemplify that.
Change-Id: Iaf973da1d176ba8ea89d0fd762e796936d056d0f
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_melange_ipam_lib.py | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/nova/tests/test_melange_ipam_lib.py b/nova/tests/test_melange_ipam_lib.py index 031c1f109..ce678ec83 100644 --- a/nova/tests/test_melange_ipam_lib.py +++ b/nova/tests/test_melange_ipam_lib.py @@ -53,22 +53,6 @@ class MelangeIpamLibTestCase(test.TestCase): 'address': 'vif_ref_address'}) self.assertEqual(ips[0], 'ip_address') - def test_get_network_id_by_cidr_finds_block(self): - self.m_conn.get_blocks('tenant_id').AndReturn(self._block_list()) - - self.mox.ReplayAll() - - net_id = self.ipam.get_network_id_by_cidr('context', 'cidr', - 'tenant_id') - self.assertEqual(net_id, 'network_id') - - def test_get_network_id_by_cidr_raises_on_not_found(self): - self.m_conn.get_blocks('tenant_id').AndReturn({'ip_blocks': []}) - self.mox.ReplayAll() - self.assertRaises(exception.NotFound, - self.ipam.get_network_id_by_cidr, - 'context', 'cidr', 'tenant_id') - def test_delete_subnets_by_net_id_deletes_block(self): context = self.mox.CreateMockAnything() context.elevated().AndReturn('elevated') @@ -142,14 +126,29 @@ class MelangeIpamLibTestCase(test.TestCase): self.mox.ReplayAll() self.ipam.get_project_and_global_net_ids(context, 'project_id') - def test_get_tenant_id_by_net_id(self): + def test_get_tenant_id_by_net_id_returns_id(self): FLAGS.quantum_default_tenant_id = 'qdti' self.m_conn.get_allocated_ips('net_id', 'vif_id', - None).AndReturn('tenant_id') + 'qdti').AndReturn({}) self.mox.ReplayAll() - self.ipam.get_tenant_id_by_net_id('context', 'net_id', 'vif_id', - 'project_id') + value = self.ipam.get_tenant_id_by_net_id('context', 'net_id', + 'vif_id', 'project_id') + self.assertEqual(value, 'qdti') + + def test_get_tenant_id_by_net_id_returns_none_if_none_found(self): + FLAGS.quantum_default_tenant_id = 'qdti' + + self.m_conn.get_allocated_ips('net_id', 'vif_id', + 'qdti').AndRaise(KeyError()) + self.m_conn.get_allocated_ips('net_id', 'vif_id', + 'project_id').AndRaise(KeyError()) + self.m_conn.get_allocated_ips('net_id', 'vif_id', + None).AndRaise(KeyError()) + self.mox.ReplayAll() + value = self.ipam.get_tenant_id_by_net_id('context', 'net_id', + 'vif_id', 'project_id') + self.assertEqual(value, None) def test_get_subnets_by_net_id(self): ips = [{'ip_block': {'network_id': 'network_id', |