Revision 291cab21

b/kamaki/cli/commands/cyclades.py
52 52

  
53 53
server_cmds = CommandTree('server', 'Cyclades/Compute API server commands')
54 54
flavor_cmds = CommandTree('flavor', 'Cyclades/Compute API flavor commands')
55
network_cmds = CommandTree('network', 'Cyclades/Compute API network commands')
56
ip_cmds = CommandTree('ip', 'Cyclades/Compute API floating ip commands')
57
_commands = [server_cmds, flavor_cmds, network_cmds]
55
_commands = [server_cmds, flavor_cmds]
58 56

  
59 57

  
60 58
about_authentication = '\nUser Authentication:\
b/kamaki/cli/commands/network.py
577 577
    @errors.generic.all
578 578
    @errors.cyclades.connection
579 579
    def _run(self, ip_id):
580
        self._print(self.client.get_floatingip_details(ip_id))
580
        self._print(
581
            self.client.get_floatingip_details(ip_id), self.print_dict)
581 582

  
582 583
    def main(self, ip_id):
583 584
        super(self.__class__, self)._run()
......
614 615
    """Unreserve an IP (also delete the port, if attached)"""
615 616

  
616 617
    def _run(self, ip_id):
617
        self._optional_output(self.client.floatingip_delete(ip_id))
618
        self._optional_output(self.client.delete_floatingip(ip_id))
618 619

  
619 620
    def main(self, ip_id):
620 621
        super(self.__class__, self)._run()

Also available in: Unified diff