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 7b87a18..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']: