summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2011-12-14 20:08:24 +0000
committerGerrit Code Review <review@openstack.org>2011-12-14 20:08:24 +0000
commitc178043d3021548111a7d7ae4a53210fd96cc1bf (patch)
tree6086eb14da6fa8fa7f2af726a7cb711cc7eda160 /nova/tests
parentaf54e79b7815c233c6e800bc79e428fe23f92eb7 (diff)
parent5815efb158d8dc7f9f435ce96ab4f4caa599a640 (diff)
Merge "Pass additional information from nova to Quantum"
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/test_quantum.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/tests/test_quantum.py b/nova/tests/test_quantum.py
index 37a3ea465..8e8a8511c 100644
--- a/nova/tests/test_quantum.py
+++ b/nova/tests/test_quantum.py
@@ -49,7 +49,7 @@ class FakeQuantumClientConnection(object):
net_ids.append(net_id)
return {'networks': net_ids}
- def create_network(self, tenant_id, network_name):
+ def create_network(self, tenant_id, network_name, **kwargs):
uuid = str(utils.gen_uuid())
self.nets[uuid] = {'net-name': network_name,
@@ -77,7 +77,8 @@ class FakeQuantumClientConnection(object):
raise Exception(_("interface '%s' is already attached" %
interface_id))
- def create_and_attach_port(self, tenant_id, net_id, interface_id):
+ def create_and_attach_port(self, tenant_id, net_id, interface_id,
+ **kwargs):
if not self.network_exists(tenant_id, net_id):
raise Exception(
_("network %(net_id)s does not exist for tenant %(tenant_id)"