diff --git a/src/cloud/occi/lib/ImageOCCI.rb b/src/cloud/occi/lib/ImageOCCI.rb
index 650883c14a..8f873aaa93 100755
--- a/src/cloud/occi/lib/ImageOCCI.rb
+++ b/src/cloud/occi/lib/ImageOCCI.rb
@@ -24,7 +24,7 @@ class ImageOCCI < Image
<%= self.id.to_s %>
<%= self.name %>
<% if self['TYPE'] != nil %>
- <%= self['TYPE'] %>
+ <%= self.type_str %>
<% end %>
<% if self['TEMPLATE/DESCRIPTION'] != nil %>
<%= self['TEMPLATE/DESCRIPTION'] %>
@@ -33,7 +33,7 @@ class ImageOCCI < Image
<% if self['FSTYPE'] != nil and !self['FSTYPE'].empty? %>
<%= self['FSTYPE'] %>
<% end %>
- <%= pub %>
+ <%= self.public? ? "YES" : "NO" %>
<%= self['PERSISTENT'] == "0" ? "NO" : "YES"%>
}
@@ -82,12 +82,6 @@ class ImageOCCI < Image
# Creates the OCCI representation of an Image
def to_occi(base_url)
- if self['PERMISSIONS/GROUP_U'] == "1" || self['PERMISSIONS/OTHER_U'] == "1"
- pub = "YES"
- else
- pub = "NO"
- end
-
begin
occi_im = ERB.new(OCCI_IMAGE)
occi_im_text = occi_im.result(binding)
diff --git a/src/cloud/occi/lib/VirtualNetworkOCCI.rb b/src/cloud/occi/lib/VirtualNetworkOCCI.rb
index f522d9e8c4..22cb93901a 100755
--- a/src/cloud/occi/lib/VirtualNetworkOCCI.rb
+++ b/src/cloud/occi/lib/VirtualNetworkOCCI.rb
@@ -34,7 +34,7 @@ class VirtualNetworkOCCI < VirtualNetwork
<%= network_size %>
<% end %>
<%= self['TOTAL_LEASES'] %>
- <%= pub %>
+ <%= self.public? ? "YES" : "NO" %>
}
diff --git a/src/cloud/occi/lib/occi-server.rb b/src/cloud/occi/lib/occi-server.rb
index 6f5ba7cec2..e1e1df568d 100755
--- a/src/cloud/occi/lib/occi-server.rb
+++ b/src/cloud/occi/lib/occi-server.rb
@@ -255,11 +255,7 @@ end
###################################################
get '/compute/:id' do
- if params[:id] == "types"
- result,rc = @occi_server.get_computes_types
- else
- result,rc = @occi_server.get_compute(request, params)
- end
+ result,rc = @occi_server.get_compute(request, params)
treat_response(result,rc)
end
diff --git a/src/oca/ruby/OpenNebula/Image.rb b/src/oca/ruby/OpenNebula/Image.rb
index 6b364adba6..348b4c4df1 100644
--- a/src/oca/ruby/OpenNebula/Image.rb
+++ b/src/oca/ruby/OpenNebula/Image.rb
@@ -219,6 +219,14 @@ module OpenNebula
self['GID'].to_i
end
+ def public?
+ if self['PERMISSIONS/GROUP_U'] == "1" || self['PERMISSIONS/OTHER_U'] == "1"
+ true
+ else
+ false
+ end
+ end
+
private
def set_enabled(enabled)
diff --git a/src/oca/ruby/OpenNebula/Template.rb b/src/oca/ruby/OpenNebula/Template.rb
index df9d4c454b..2ee5e90262 100644
--- a/src/oca/ruby/OpenNebula/Template.rb
+++ b/src/oca/ruby/OpenNebula/Template.rb
@@ -154,6 +154,14 @@ module OpenNebula
self['UID'].to_i
end
+ def public?
+ if self['PERMISSIONS/GROUP_U'] == "1" || self['PERMISSIONS/OTHER_U'] == "1"
+ true
+ else
+ false
+ end
+ end
+
private
def set_publish(published)
diff --git a/src/oca/ruby/OpenNebula/VirtualNetwork.rb b/src/oca/ruby/OpenNebula/VirtualNetwork.rb
index a7ee9c42c4..134e0a038c 100644
--- a/src/oca/ruby/OpenNebula/VirtualNetwork.rb
+++ b/src/oca/ruby/OpenNebula/VirtualNetwork.rb
@@ -210,6 +210,14 @@ module OpenNebula
SHORT_VN_TYPES[type_str]
end
+ def public?
+ if self['PERMISSIONS/GROUP_U'] == "1" || self['PERMISSIONS/OTHER_U'] == "1"
+ true
+ else
+ false
+ end
+ end
+
private
def set_publish(published)
group_u = published ? 1 : 0