From 91b49a7fd57d1a28f8f0a8bba56d00d37754b25d Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Thu, 12 Jan 2012 17:16:25 +0100 Subject: [PATCH] Define public method in OCA --- src/cloud/occi/lib/ImageOCCI.rb | 10 ++-------- src/cloud/occi/lib/VirtualNetworkOCCI.rb | 2 +- src/cloud/occi/lib/occi-server.rb | 6 +----- src/oca/ruby/OpenNebula/Image.rb | 8 ++++++++ src/oca/ruby/OpenNebula/Template.rb | 8 ++++++++ src/oca/ruby/OpenNebula/VirtualNetwork.rb | 8 ++++++++ 6 files changed, 28 insertions(+), 14 deletions(-) diff --git a/src/cloud/occi/lib/ImageOCCI.rb b/src/cloud/occi/lib/ImageOCCI.rb index 1a9a9c6bb7..b49e7b91d2 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 6a5e3fe63b..677af015af 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 3c184f73be..dbf1fda8bc 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 fbd5082edb..619df8d005 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 825e1b3c21..03fbef994b 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 1dc568e0ce..70bd2b325f 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