Merge branch 'master' of git.opennebula.org:one

This commit is contained in:
Ruben S. Montero committed 2012-01-12 17:32:19 +01:00
commit 6a8032d028
6 files changed
+28 -14

No files matched your search

+2 -8
View File
@@ -24,7 +24,7 @@ class ImageOCCI < Image
<ID><%= self.id.to_s %></ID>
<NAME><%= self.name %></NAME>
<% if self['TYPE'] != nil %>
<TYPE><%= self['TYPE'] %></TYPE>
<TYPE><%= self.type_str %></TYPE>
<% end %>
<% if self['TEMPLATE/DESCRIPTION'] != nil %>
<DESCRIPTION><%= self['TEMPLATE/DESCRIPTION'] %></DESCRIPTION>
@@ -33,7 +33,7 @@ class ImageOCCI < Image
<% if self['FSTYPE'] != nil and !self['FSTYPE'].empty? %>
<FSTYPE><%= self['FSTYPE'] %></FSTYPE>
<% end %>
<PUBLIC><%= pub %></PUBLIC>
<PUBLIC><%= self.public? ? "YES" : "NO" %></PUBLIC>
<PERSISTENT><%= self['PERSISTENT'] == "0" ? "NO" : "YES"%></PERSISTENT>
</STORAGE>
}
@@ -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)
+1 -1
View File
@@ -34,7 +34,7 @@ class VirtualNetworkOCCI < VirtualNetwork
<SIZE><%= network_size %></SIZE>
<% end %>
<USED_LEASES><%= self['TOTAL_LEASES'] %></USED_LEASES>
<PUBLIC><%= pub %></PUBLIC>
<PUBLIC><%= self.public? ? "YES" : "NO" %></PUBLIC>
</NETWORK>
}
+1 -5
View File
@@ -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
+8
View File
@@ -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)
+8
View File
@@ -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)
@@ -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