From 36a331bcf58d7bfc81ec17e51c1b320f07ce5a9d Mon Sep 17 00:00:00 2001 From: Boris Parak Date: Thu, 7 Mar 2013 22:01:32 +0100 Subject: [PATCH] Fixed formatting and storage --- lib/occi/bin/templates/network.erb | 2 ++ lib/occi/bin/templates/os_tpl.erb | 2 ++ lib/occi/bin/templates/resource_tpl.erb | 2 ++ lib/occi/bin/templates/storage.erb | 10 ++++++---- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/occi/bin/templates/network.erb b/lib/occi/bin/templates/network.erb index 96a8280..da64e71 100644 --- a/lib/occi/bin/templates/network.erb +++ b/lib/occi/bin/templates/network.erb @@ -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 %> + + diff --git a/lib/occi/bin/templates/os_tpl.erb b/lib/occi/bin/templates/os_tpl.erb index 4acbe0c..3e534d2 100644 --- a/lib/occi/bin/templates/os_tpl.erb +++ b/lib/occi/bin/templates/os_tpl.erb @@ -3,3 +3,5 @@ OS_TPL: TITLE: <%= json_resource.title %> TERM: <%= json_resource.term %> LOCATION: <%= json_resource.location %> + + diff --git a/lib/occi/bin/templates/resource_tpl.erb b/lib/occi/bin/templates/resource_tpl.erb index 1f64c3c..09ee527 100644 --- a/lib/occi/bin/templates/resource_tpl.erb +++ b/lib/occi/bin/templates/resource_tpl.erb @@ -3,3 +3,5 @@ RESOURCE_TPL: TITLE: <%= json_resource.title %> TERM: <%= json_resource.term %> LOCATION: <%= json_resource.location %> + + diff --git a/lib/occi/bin/templates/storage.erb b/lib/occi/bin/templates/storage.erb index 90f2430..569c972 100644 --- a/lib/occi/bin/templates/storage.erb +++ b/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 %> + +