Revision bbd98565

b/kamaki/cli/commands/cyclades.py
268 268
            servers = self._filter_by_metadata(servers)
269 269

  
270 270
        if detail and self['detail']:
271
            servers = [self._restruct_server_info(vm) for vm in servers]
271
            #  servers = [self._restruct_server_info(vm) for vm in servers]
272
            pass
272 273
        else:
273 274
            for srv in servers:
274 275
                for key in set(srv).difference(self.PERMANENTS):
......
319 320
            self._print(self.client.get_server_diagnostics(server_id))
320 321
        else:
321 322
            vm = self.client.get_server_details(server_id)
322
            self._print(self._restruct_server_info(vm), self.print_dict)
323
            # self._print(self._restruct_server_info(vm), self.print_dict)
324
            # self._print(vm, self.print_dict)
323 325

  
324 326
    def main(self, server_id):
325 327
        super(self.__class__, self)._run()
......
520 522
            if not r:
521 523
                self.error('Create %s: server response was %s' % (name, r))
522 524
                continue
523
            self._print(self._restruct_server_info(r), self.print_dict)
525
            #  self._print(self._restruct_server_info(r), self.print_dict)
526
            self._print(r, self.print_dict)
524 527
            if self['wait']:
525 528
                self._wait(r['id'], r['status'] or 'BUILD')
526 529
            self.writeln(' ')
b/kamaki/clients/cyclades/__init__.py
218 218
    def create_floatingip(self, floating_network_id, floating_ip_address=''):
219 219
        return super(CycladesNetworkClient, self).create_floatingip(
220 220
            floating_network_id, floating_ip_address=floating_ip_address)
221

  
222
    def update_floatingip(self, floating_network_id, floating_ip_address=''):
223
        """To nullify something optional, use None"""
224
        return super(CycladesNetworkClient, self).update_floatingip(
225
            floating_network_id, floating_ip_address=floating_ip_address)

Also available in: Unified diff