summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2012-11-02 06:54:50 +0000
committerMark McLoughlin <markmc@redhat.com>2012-11-02 07:19:36 +0000
commit9264d8a04accdd72fb7c70fe09e40eae99e1db37 (patch)
treeb939ee388bf8b73a77616cb2b06fd94819e5d510
parent41e87bbfc5ecaf1731d0741c3b235adc215f476c (diff)
downloadnova-9264d8a04accdd72fb7c70fe09e40eae99e1db37.tar.gz
nova-9264d8a04accdd72fb7c70fe09e40eae99e1db37.tar.xz
nova-9264d8a04accdd72fb7c70fe09e40eae99e1db37.zip
Fix Quantum v2 API method signatures
Commit d96102b6 made a change to network.api.API but rather than making the corresponding change to network.quantumv2.api.API it appears that it was changed to match the network manager signature instead. Fix the quantum signatures to match the stock network API signatures. Change-Id: I97e16f29473f3f2e3f9c53b1e2ef10e499cef29a
-rw-r--r--nova/network/quantumv2/api.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/nova/network/quantumv2/api.py b/nova/network/quantumv2/api.py
index 241bb1a2d..e8d672835 100644
--- a/nova/network/quantumv2/api.py
+++ b/nova/network/quantumv2/api.py
@@ -508,15 +508,13 @@ class API(base.Base):
fip = self._get_floating_ip_by_address(client, address)
client.update_floatingip(fip['id'], {'floatingip': {'port_id': None}})
- def migrate_instance_start(self, context, instance_uuid, rxtx_factor,
- project_id, source, dest, floating_addresses):
+ def migrate_instance_start(self, context, instance, migration):
"""Start to migrate the network of an instance"""
# NOTE(wenjianhn): just pass to make migrate instance doesn't
# raise for now.
pass
- def migrate_instance_finish(self, context, instance_uuid, rxtx_factor,
- project_id, source, dest, floating_addresses):
+ def migrate_instance_finish(self, context, instance, migration):
"""Finish migrating the network of an instance"""
# NOTE(wenjianhn): just pass to make migrate instance doesn't
# raise for now.