Correct key names in network-related http bodies

[kamaki] / kamaki / cli / commands / cyclades.py

diff --git a/kamaki/cli/commands/cyclades.py b/kamaki/cli/commands/cyclades.py
index 7c48dd8..1849fc1 100644 (file)
--- a/kamaki/cli/commands/cyclades.py
+++ b/kamaki/cli/commands/cyclades.py
@@ -392,7 +392,7 @@ class NetworkIpArgument(RepeatableArgument):
                         self.parsed_name[0])])
             self._value = getattr(self, '_value', list())
             self._value.append(
-                dict(network=net_and_ip[0], fixed_ip=net_and_ip[1]))
+                dict(uuid=net_and_ip[0], fixed_ip=net_and_ip[1]))
 
 
 @command(server_cmds)
@@ -429,7 +429,7 @@ class server_create(_init_cyclades, _optional_json, _server_wait):
         if self['automatic_ip']:
             networks = []
         else:
-            networks = [dict(network=netid) for netid in (
+            networks = [dict(uuid=netid) for netid in (
                 (self['network_id'] or []) + (self['network_id_and_ip'] or [])
             )] or None
         servers = [dict(
@@ -551,7 +551,7 @@ class server_modify(_init_cyclades, _optional_output_cmd):
         if self['metadata_to_set']:
             self.client.update_server_metadata(
                 server_id, **self['metadata_to_set'])
-        for key in self['metadata_to_delete']:
+        for key in (self['metadata_to_delete'] or []):
             errors.cyclades.metadata(
                 self.client.delete_server_metadata)(server_id, key=key)
         if self['with_output']:
@@ -708,7 +708,7 @@ class server_shutdown(_init_cyclades, _optional_output_cmd, _server_wait):
 
 @command(server_cmds)
 class server_addr(_init_cyclades):
-    """DEPRECATED, use: [kamaki] server info <SERVER_ID> --nics"""
+    """DEPRECATED, use: [kamaki] server info SERVER_ID --nics"""
 
     def main(self, *args):
         raiseCLIError('DEPRECATED since v0.12', importance=3, details=[
@@ -718,7 +718,7 @@ class server_addr(_init_cyclades):
 
 @command(server_cmds)
 class server_console(_init_cyclades, _optional_json):
-    """DEPRECATED, use: [kamaki] server info <SERVER_ID> --vnc-credentials"""
+    """DEPRECATED, use: [kamaki] server info SERVER_ID --vnc-credentials"""
 
     def main(self, *args):
         raiseCLIError('DEPRECATED since v0.12', importance=3, details=[
@@ -727,8 +727,18 @@ class server_console(_init_cyclades, _optional_json):
 
 
 @command(server_cmds)
+class server_rename(_init_cyclades, _optional_json):
+    """DEPRECATED, use: [kamaki] server modify SERVER_ID --name=NEW_NAME"""
+
+    def main(self, *args):
+        raiseCLIError('DEPRECATED since v0.12', importance=3, details=[
+            'Replaced by',
+            '  [kamaki] server info <SERVER_ID> --stats'])
+
+
+@command(server_cmds)
 class server_stats(_init_cyclades, _optional_json):
-    """DEPRECATED, use: [kamaki] server info <SERVER_ID> --stats"""
+    """DEPRECATED, use: [kamaki] server info SERVER_ID --stats"""
 
     def main(self, *args):
         raiseCLIError('DEPRECATED since v0.12', importance=3, details=[