diff --git a/src/cli/one_helper.rb b/src/cli/one_helper.rb
index 683d71f83f..aa67841b22 100644
--- a/src/cli/one_helper.rb
+++ b/src/cli/one_helper.rb
@@ -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)
diff --git a/src/cli/onevm b/src/cli/onevm
index 7321fe3059..57e8ce3b51 100755
--- a/src/cli/onevm
+++ b/src/cli/onevm
@@ -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
diff --git a/src/cli/onevnet b/src/cli/onevnet
index f876579190..5376291da9 100755
--- a/src/cli/onevnet
+++ b/src/cli/onevnet
@@ -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
diff --git a/src/cloud/ec2/lib/EC2QueryServer.rb b/src/cloud/ec2/lib/EC2QueryServer.rb
index 03e7f44ecf..1d8c786729 100644
--- a/src/cloud/ec2/lib/EC2QueryServer.rb
+++ b/src/cloud/ec2/lib/EC2QueryServer.rb
@@ -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
diff --git a/src/cloud/ec2/lib/views/describe_images.erb b/src/cloud/ec2/lib/views/describe_images.erb
index 5ef277ad1a..163241c670 100644
--- a/src/cloud/ec2/lib/views/describe_images.erb
+++ b/src/cloud/ec2/lib/views/describe_images.erb
@@ -13,7 +13,7 @@
<% elsif im['STATE'] == '4'%>
pending
<% end %>
- <%= erb_user_name %>
+ <%= im['UNAME'] %>
<% if im['PUBLIC'] == '0' %>
false
<% elsif im['PUBLIC'] == '1' %>