From 913179fcba30b5c55aa0a6ece1f1618b716d628c Mon Sep 17 00:00:00 2001 From: rajarammallya Date: Tue, 24 Jan 2012 18:20:46 +0530 Subject: [PATCH] Test changes to accomodate no default block functionality Change-Id: Id22c524ae430220cf02ed1c417aac7d6af1c6668 --- melange/client/tests/functional/test_cli.py | 27 ++++++++++++--------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/melange/client/tests/functional/test_cli.py b/melange/client/tests/functional/test_cli.py index 59cc9c0..466ff84 100644 --- a/melange/client/tests/functional/test_cli.py +++ b/melange/client/tests/functional/test_cli.py @@ -397,7 +397,12 @@ class TestIpRoutesCLI(TestBaseCLI): class TestInterfaceCLI(TestBaseCLI): def test_crud(self): - iface = factory.create_interface(tenant_id=self.tenant_id) + network_id = uuid.uuid4() + block = factory.create_block(cidr="20.1.1.0/24", + network_id=network_id, + tenant_id=self.tenant_id) + iface = factory.create_interface(network_id=network_id, + tenant_id=self.tenant_id) self.assertShows("interface", iface, parameters="vif_id=%s" % iface['id']) @@ -438,19 +443,19 @@ class TestAllowedIpCLI(TestBaseCLI): def test_crud(self): network_id = uuid.uuid4() - iface = factory.create_interface(network_id=network_id, - tenant_id=self.tenant_id) block = factory.create_block(cidr="20.1.1.0/24", - network_id=network_id, - tenant_id=self.tenant_id) + network_id=network_id, + tenant_id=self.tenant_id) + iface = factory.create_interface(network_id=network_id, + tenant_id=self.tenant_id) ip = factory.create_ip(address="20.1.1.2", - block_id=block['id'], - used_by_tenant=self.tenant_id, - tenant_id=self.tenant_id) + block_id=block['id'], + used_by_tenant=self.tenant_id, + tenant_id=self.tenant_id) another_ip = factory.create_ip(address="20.1.1.3", - block_id=block['id'], - used_by_tenant=self.tenant_id, - tenant_id=self.tenant_id) + block_id=block['id'], + used_by_tenant=self.tenant_id, + tenant_id=self.tenant_id) ip_res = self.command("allowed_ip create", interface_id=iface['id'],