Skip to content

Commit

Permalink
Fixed formatting and storage
Browse files Browse the repository at this point in the history
  • Loading branch information
arax committed Mar 7, 2013
1 parent 4e17b1e commit 36a331b
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
2 changes: 2 additions & 0 deletions lib/occi/bin/templates/network.erb
Expand Up @@ -5,3 +5,5 @@ NETWORK:
STATE: <%= json_resource.resources.first.attributes.occi.network.state %>
ALLOCATION: <%= json_resource.resources.first.attributes.occi.network.allocation %>
ADDRESS: <%= json_resource.resources.first.attributes.occi.network.address %>


2 changes: 2 additions & 0 deletions lib/occi/bin/templates/os_tpl.erb
Expand Up @@ -3,3 +3,5 @@ OS_TPL:
TITLE: <%= json_resource.title %>
TERM: <%= json_resource.term %>
LOCATION: <%= json_resource.location %>


2 changes: 2 additions & 0 deletions lib/occi/bin/templates/resource_tpl.erb
Expand Up @@ -3,3 +3,5 @@ RESOURCE_TPL:
TITLE: <%= json_resource.title %>
TERM: <%= json_resource.term %>
LOCATION: <%= json_resource.location %>


10 changes: 6 additions & 4 deletions lib/occi/bin/templates/storage.erb
@@ -1,6 +1,8 @@
<%# We always get a JSON %>
STORAGE:
ID: <%= storage.resources.first.attributes.occi.core.id %>
TITLE: <%= storage.resources.first.attributes.occi.core.title %>
STATE: <%= storage.resources.first.attributes.occi.storage.state%>
DESCRIPTION: <%= storage.resources.first.attributes.occi.core.summary %>
ID: <%= json_resource.resources.first.attributes.occi.core.id %>
TITLE: <%= json_resource.resources.first.attributes.occi.core.title %>
STATE: <%= json_resource.resources.first.attributes.occi.storage.state%>
DESCRIPTION: <%= json_resource.resources.first.attributes.occi.core.summary %>


0 comments on commit 36a331b

Please sign in to comment.