Fix typos in Network CLI

diff --git a/kamaki/cli/commands/cyclades.py b/kamaki/cli/commands/cyclades.py
index 37ae2e2..e434d78 100644 (file)
--- a/kamaki/cli/commands/cyclades.py
+++ b/kamaki/cli/commands/cyclades.py
@@ -52,9 +52,7 @@ from kamaki.cli.commands import (
 
 server_cmds = CommandTree('server', 'Cyclades/Compute API server commands')
 flavor_cmds = CommandTree('flavor', 'Cyclades/Compute API flavor commands')
-network_cmds = CommandTree('network', 'Cyclades/Compute API network commands')
-ip_cmds = CommandTree('ip', 'Cyclades/Compute API floating ip commands')
-_commands = [server_cmds, flavor_cmds, network_cmds]
+_commands = [server_cmds, flavor_cmds]
 
 
 about_authentication = '\nUser Authentication:\

diff --git a/kamaki/cli/commands/network.py b/kamaki/cli/commands/network.py
index bb9cbbf..7534781 100644 (file)
--- a/kamaki/cli/commands/network.py
+++ b/kamaki/cli/commands/network.py
@@ -577,7 +577,8 @@ class ip_info(_init_network, _optional_json):
     @errors.generic.all
     @errors.cyclades.connection
     def _run(self, ip_id):
-        self._print(self.client.get_floatingip_details(ip_id))
+        self._print(
+            self.client.get_floatingip_details(ip_id), self.print_dict)
 
     def main(self, ip_id):
         super(self.__class__, self)._run()
@@ -614,7 +615,7 @@ class ip_delete(_init_network, _optional_output_cmd):
     """Unreserve an IP (also delete the port, if attached)"""
 
     def _run(self, ip_id):
-        self._optional_output(self.client.floatingip_delete(ip_id))
+        self._optional_output(self.client.delete_floatingip(ip_id))
 
     def main(self, ip_id):
         super(self.__class__, self)._run()