diff --git a/src/cloud/occi/lib/ImageOCCI.rb b/src/cloud/occi/lib/ImageOCCI.rb index 50a12133f5..1a9a9c6bb7 100755 --- a/src/cloud/occi/lib/ImageOCCI.rb +++ b/src/cloud/occi/lib/ImageOCCI.rb @@ -33,7 +33,7 @@ class ImageOCCI < Image <% if self['FSTYPE'] != nil and !self['FSTYPE'].empty? %> <%= self['FSTYPE'] %> <% end %> - <%= self['PUBLIC'] == "0" ? "NO" : "YES"%> + <%= pub %> <%= self['PERSISTENT'] == "0" ? "NO" : "YES"%> } @@ -82,6 +82,12 @@ 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 f996b967d2..6a5e3fe63b 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'] %> - <%= self['PUBLIC'] == "0" ? "NO" : "YES"%> + <%= pub %> } @@ -65,6 +65,12 @@ class VirtualNetworkOCCI < VirtualNetwork network_size = ip_end.to_i - ip_start.to_i end + if self['PERMISSIONS/GROUP_U'] == "1" || self['PERMISSIONS/OTHER_U'] == "1" + pub = "YES" + else + pub = "NO" + end + begin occi = ERB.new(OCCI_NETWORK) occi_text = occi.result(binding)