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

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

Browse Source
This commit is contained in:
Jaime Melis 2011-07-11 18:43:12 +02:00
commit 91fb1cd3d0
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cli/one_helper.rb
View File

@ -81,8 +81,8 @@ EOT
end
end
def list_pool(options, top=false, filter_flag=-2)
filter_flag ||= -2
def list_pool(options, top=false, filter_flag=nil)
filter_flag ||= OpenNebula::Pool::INFO_GROUP
pool = factory_pool(filter_flag)

2
src/cli/onevm
View File

@ -314,7 +314,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
command :chown, chown_desc, [:range, :vmid_list], :userid,
[:groupid,nil] do
gid = args[2].nil? ? -1 : args[2].to_id
gid = args[2].nil? ? -1 : args[2].to_i
helper.perform_actions(args[0],options,"Owner/Group changed") do |vm|
vm.chown(args[1].to_i, gid)
end

2
src/cli/onevnet
View File

@ -148,7 +148,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
command :chown, chown_desc, [:range, :vnid_list], :userid,
[:groupid,nil] do
gid = args[2].nil? ? -1 : args[2].to_id
gid = args[2].nil? ? -1 : args[2].to_i
helper.perform_actions(args[0],options,"Owner/Group changed") do |vn|
vn.chown(args[1].to_i, gid)
end

5
src/cloud/ec2/lib/EC2QueryServer.rb
View File

@ -161,11 +161,10 @@ class EC2QueryServer < CloudServer
end
def describe_images(params, one_client)
user_flag=-1
user_flag = OpenNebula::Pool::INFO_GROUP
impool = ImagePool.new(one_client, user_flag)
impool.info
erb_user_name = params['AWSAccessKeyId']
erb_version = params['Version']
response = ERB.new(File.read(@config[:views]+"/describe_images.erb"))
@ -221,7 +220,7 @@ class EC2QueryServer < CloudServer
end
def describe_instances(params, one_client)
user_flag=-1
user_flag = OpenNebula::Pool::INFO_MINE
vmpool = VirtualMachinePool.new(one_client, user_flag)
vmpool.info

2
src/cloud/ec2/lib/views/describe_images.erb
View File

@ -13,7 +13,7 @@
<% elsif im['STATE'] == '4'%>
<imageState>pending</imageState>
<% end %>
<imageOwnerId><%= erb_user_name %></imageOwnerId>
<imageOwnerId><%= im['UNAME'] %></imageOwnerId>
<% if im['PUBLIC'] == '0' %>
<isPublic>false</isPublic>
<% elsif im['PUBLIC'] == '1' %>