Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
itminedu
kamaki
Commits
1d5653d9
Commit
1d5653d9
authored
Dec 09, 2013
by
Stavros Sachtouris
Browse files
Rename "network" to "uuid" in server create w. net
parent
f3740b99
Changes
2
Show whitespace changes
Inline
Side-by-side
kamaki/cli/commands/cyclades.py
View file @
1d5653d9
...
@@ -430,8 +430,8 @@ class server_create(_init_cyclades, _optional_json, _server_wait):
...
@@ -430,8 +430,8 @@ class server_create(_init_cyclades, _optional_json, _server_wait):
networks
=
[]
networks
=
[]
else
:
else
:
networks
=
[
dict
(
uuid
=
netid
)
for
netid
in
(
networks
=
[
dict
(
uuid
=
netid
)
for
netid
in
(
(
self
[
'network_id'
]
or
[])
+
(
self
[
'network_id_and_ip'
]
or
[])
self
[
'network_id'
]
or
[])
]
+
(
self
[
'network_id_and_ip'
]
or
[])
)]
or
None
networks
=
networks
or
None
servers
=
[
dict
(
servers
=
[
dict
(
name
=
'%s%s'
%
(
prefix
,
i
if
size
>
1
else
''
),
name
=
'%s%s'
%
(
prefix
,
i
if
size
>
1
else
''
),
flavor_id
=
flavor_id
,
flavor_id
=
flavor_id
,
...
...
kamaki/clients/compute/__init__.py
View file @
1d5653d9
...
@@ -130,8 +130,8 @@ class ComputeClient(ComputeRestClient):
...
@@ -130,8 +130,8 @@ class ComputeClient(ComputeRestClient):
:param networks: (list of dicts) Networks to connect to, list this:
:param networks: (list of dicts) Networks to connect to, list this:
"networks": [
"networks": [
{"
network
": <network_uuid>},
{"
uuid
": <network_uuid>},
{"
network
": <network_uuid>, "fixed_ip": address},
{"
uuid
": <network_uuid>, "fixed_ip": address},
{"port": <port_id>}, ...]
{"port": <port_id>}, ...]
ATTENTION: Empty list is different to None. None means ' do not
ATTENTION: Empty list is different to None. None means ' do not
mention it', empty list means 'automatically get an ip'
mention it', empty list means 'automatically get an ip'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment