Fix typos in floating ip methods (cli + lib)

diff --git a/kamaki/cli/commands/cyclades.py b/kamaki/cli/commands/cyclades.py
index 1b0c6bd..6f21613 100644 (file)
--- a/kamaki/cli/commands/cyclades.py
+++ b/kamaki/cli/commands/cyclades.py
@@ -919,8 +919,7 @@ class server_ip_create(_init_cyclades, _optional_json):
     @errors.generic.all
     @errors.cyclades.connection
     def _run(self, ip=None):
-        self._print(
-            self.client.alloc_floating_ip(self['pool'], ip), print_dict)
+        self._print([self.client.alloc_floating_ip(self['pool'], ip)])
 
     def main(self, requested_address=None):
         super(self.__class__, self)._run()
@@ -958,7 +957,7 @@ class server_ip_attach(_init_cyclades, _optional_output_cmd):
 
 
 @command(server_cmds)
-class server_ip_detach(_init_cyclades):
+class server_ip_detach(_init_cyclades, _optional_output_cmd):
     """Detach floating IP from server
     """
 

diff --git a/kamaki/clients/compute/rest_api.py b/kamaki/clients/compute/rest_api.py
index 036b01c..c3978d2 100644 (file)
--- a/kamaki/clients/compute/rest_api.py
+++ b/kamaki/clients/compute/rest_api.py
@@ -393,7 +393,7 @@ class ComputeRestClient(Client):
         path = path4url('os-floating-ips', ip or '')
         return self.get(path, success=success, **kwargs)
 
-    def floating_ips_post(self, json_data, ip='', success=201, **kwargs):
+    def floating_ips_post(self, json_data, ip='', success=200, **kwargs):
         path = path4url('os-floating-ips', ip or '')
         if json_data is not None:
             json_data = json.dumps(json_data)

diff --git a/kamaki/clients/cyclades/__init__.py b/kamaki/clients/cyclades/__init__.py
index df0c618..6a1efc3 100644 (file)
--- a/kamaki/clients/cyclades/__init__.py
+++ b/kamaki/clients/cyclades/__init__.py
@@ -403,8 +403,8 @@ class CycladesClient(CycladesRestClient):
         json_data = dict()
         if pool:
             json_data['pool'] = pool
-            if address:
-                json_data['address'] = address
+        if address:
+            json_data['address'] = address
         r = self.floating_ips_post(json_data)
         return r.json['floating_ip']