From bbd985659d273e7a888c527ab08e1880b4fc8642 Mon Sep 17 00:00:00 2001 From: Stavros Sachtouris Date: Mon, 17 Feb 2014 15:10:42 +0200 Subject: [PATCH] Undo server restructs, keep the big fixes --- kamaki/cli/commands/cyclades.py | 9 ++++++--- kamaki/clients/cyclades/__init__.py | 5 ----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/kamaki/cli/commands/cyclades.py b/kamaki/cli/commands/cyclades.py index b4f988e..6756419 100644 --- a/kamaki/cli/commands/cyclades.py +++ b/kamaki/cli/commands/cyclades.py @@ -268,7 +268,8 @@ class server_list(_init_cyclades, _optional_json, _name_filter, _id_filter): servers = self._filter_by_metadata(servers) if detail and self['detail']: - servers = [self._restruct_server_info(vm) for vm in servers] + # servers = [self._restruct_server_info(vm) for vm in servers] + pass else: for srv in servers: for key in set(srv).difference(self.PERMANENTS): @@ -319,7 +320,8 @@ class server_info(_init_cyclades, _optional_json): self._print(self.client.get_server_diagnostics(server_id)) else: vm = self.client.get_server_details(server_id) - self._print(self._restruct_server_info(vm), self.print_dict) + # self._print(self._restruct_server_info(vm), self.print_dict) + # self._print(vm, self.print_dict) def main(self, server_id): super(self.__class__, self)._run() @@ -520,7 +522,8 @@ class server_create(_init_cyclades, _optional_json, _server_wait): if not r: self.error('Create %s: server response was %s' % (name, r)) continue - self._print(self._restruct_server_info(r), self.print_dict) + # self._print(self._restruct_server_info(r), self.print_dict) + self._print(r, self.print_dict) if self['wait']: self._wait(r['id'], r['status'] or 'BUILD') self.writeln(' ') diff --git a/kamaki/clients/cyclades/__init__.py b/kamaki/clients/cyclades/__init__.py index c8948a9..26a85e7 100644 --- a/kamaki/clients/cyclades/__init__.py +++ b/kamaki/clients/cyclades/__init__.py @@ -218,8 +218,3 @@ class CycladesNetworkClient(NetworkClient): def create_floatingip(self, floating_network_id, floating_ip_address=''): return super(CycladesNetworkClient, self).create_floatingip( floating_network_id, floating_ip_address=floating_ip_address) - - def update_floatingip(self, floating_network_id, floating_ip_address=''): - """To nullify something optional, use None""" - return super(CycladesNetworkClient, self).update_floatingip( - floating_network_id, floating_ip_address=floating_ip_address) -- 1.7.10.4