Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
itminedu
synnefo
Commits
b091083f
Commit
b091083f
authored
Oct 08, 2013
by
Giorgos Korfiatis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cyclades: use project as tenant_id in API
parent
dccf8009
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
snf-cyclades-app/synnefo/api/networks.py
snf-cyclades-app/synnefo/api/networks.py
+1
-1
snf-cyclades-app/synnefo/api/servers.py
snf-cyclades-app/synnefo/api/servers.py
+1
-1
No files found.
snf-cyclades-app/synnefo/api/networks.py
View file @
b091083f
...
...
@@ -201,7 +201,7 @@ def network_to_dict(network, detail=True):
state
=
"SNF:DRAINED"
if
network
.
drained
else
network
.
state
d
[
'user_id'
]
=
network
.
userid
d
[
'tenant_id'
]
=
network
.
userid
d
[
'tenant_id'
]
=
network
.
project
d
[
'type'
]
=
network
.
flavor
d
[
'updated'
]
=
api
.
utils
.
isoformat
(
network
.
updated
)
d
[
'created'
]
=
api
.
utils
.
isoformat
(
network
.
created
)
...
...
snf-cyclades-app/synnefo/api/servers.py
View file @
b091083f
...
...
@@ -171,7 +171,7 @@ def vm_to_dict(vm, detail=False):
d
[
'links'
]
=
util
.
vm_to_links
(
vm
.
id
)
if
detail
:
d
[
'user_id'
]
=
vm
.
userid
d
[
'tenant_id'
]
=
vm
.
userid
d
[
'tenant_id'
]
=
vm
.
project
d
[
'status'
]
=
logic_utils
.
get_rsapi_state
(
vm
)
d
[
'SNF:task_state'
]
=
logic_utils
.
get_task_state
(
vm
)
d
[
'progress'
]
=
100
if
d
[
'status'
]
==
'ACTIVE'
else
vm
.
buildpercentage
...
...
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