shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-23 22:50:09 +03:00
Code Releases Wiki Activity

Remove old quotas from OCCI

Browse Source 
(cherry picked from commit cf8269df05d8f231e63cc522cfb166a8a280259d)
This commit is contained in:
Daniel Molina 2012-06-25 15:59:04 +02:00
parent 55f7cca13a
commit 18c41da670
1 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/cloud/occi/lib/UserOCCI.rb
View File

@ -18,8 +18,6 @@ require 'OpenNebula'
include OpenNebula
require 'quota'
class UserOCCI < User
FORCE_USAGE = true
@ -28,20 +26,6 @@ class UserOCCI < User
<ID><%= self.id.to_s %></ID>
<NAME><%= self.name %></NAME>
<GROUP><%= self['GNAME'] %></GROUP>
<QUOTA>
<% user_quota.each { |key,value|
key_s = key.to_s.upcase
value_i = value.to_i %>
<<%= key_s %>><%= value_i %></<%= key_s %>>
<% } %>
</QUOTA>
<USAGE>
<% user_usage.each { |key,value|
key_s = key.to_s.upcase
value_i = value.to_i %>
<<%= key_s %>><%= value_i %></<%= key_s %>>
<% } %>
</USAGE>
</USER>
}
@ -52,13 +36,6 @@ class UserOCCI < User
# Creates the OCCI representation of a User
def to_occi(base_url, verbose=false)
quota = Quota.new
user_usage = quota.get_usage(self.id, nil, FORCE_USAGE)
user_usage.delete(:uid)
user_quota = quota.get_quota(self.id)
user_quota.delete(:uid)
occi = ERB.new(OCCI_USER)
return occi.result(binding).gsub(/\n\s*/,'')
end