fixed bug 920856

Changed the responses to match that of Amazon EC2
Changed test to expect that response

Change-Id: Ia03a0ea663614944067c0a0193058ba91e149ad2

1 files changed, 3 insertions, 3 deletions

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 5a3b952a9..55969b2eb 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -1201,7 +1201,7 @@ class CloudController(object):
     def release_address(self, context, public_ip, **kwargs):
         LOG.audit(_("Release address %s"), public_ip, context=context)
         self.network_api.release_floating_ip(context, address=public_ip)
-        return {'releaseResponse': ["Address released."]}
+        return {'return': "true"}
 
     def associate_address(self, context, instance_id, public_ip, **kwargs):
         LOG.audit(_("Associate address %(public_ip)s to"
@@ -1211,12 +1211,12 @@ class CloudController(object):
         self.compute_api.associate_floating_ip(context,
                                                instance,
                                                address=public_ip)
-        return {'associateResponse': ["Address associated."]}
+        return {'return': "true"}
 
     def disassociate_address(self, context, public_ip, **kwargs):
         LOG.audit(_("Disassociate address %s"), public_ip, context=context)
         self.network_api.disassociate_floating_ip(context, address=public_ip)
-        return {'disassociateResponse': ["Address disassociated."]}
+        return {'return': "true"}
 
     def run_instances(self, context, **kwargs):
         max_count = int(kwargs.get('max_count', 1))