From aa71c45a0a40e81ffe01ebe6a5cab708548445bf Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Fri, 16 Aug 2013 09:37:24 +0200 Subject: [PATCH] feature #2259: Add DescribeTags --- install.sh | 1 + src/cloud/ec2/lib/EC2QueryServer.rb | 25 ++++++++++++++++++ src/cloud/ec2/lib/ImageEC2.rb | 21 ++++++++++++++- src/cloud/ec2/lib/econe_application.rb | 2 ++ src/cloud/ec2/lib/views/describe_tags.erb | 31 +++++++++++++++++++++++ 5 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 src/cloud/ec2/lib/views/describe_tags.erb diff --git a/install.sh b/install.sh index 7916c50639..0a550a4781 100755 --- a/install.sh +++ b/install.sh @@ -1297,6 +1297,7 @@ ECO_LIB_VIEW_FILES="src/cloud/ec2/lib/views/describe_images.erb \ src/cloud/ec2/lib/views/describe_availability_zones.erb \ src/cloud/ec2/lib/views/create_tags.erb \ src/cloud/ec2/lib/views/delete_tags.erb \ + src/cloud/ec2/lib/views/describe_tags.erb \ src/cloud/ec2/lib/views/create_volume.erb \ src/cloud/ec2/lib/views/create_snapshot.erb \ src/cloud/ec2/lib/views/delete_snapshot.erb \ diff --git a/src/cloud/ec2/lib/EC2QueryServer.rb b/src/cloud/ec2/lib/EC2QueryServer.rb index bf23d53bb7..f788b4a71b 100644 --- a/src/cloud/ec2/lib/EC2QueryServer.rb +++ b/src/cloud/ec2/lib/EC2QueryServer.rb @@ -389,6 +389,31 @@ class EC2QueryServer < CloudServer return response.result(binding), 200 end + def describe_tags(params) + user_flag = OpenNebula::Pool::INFO_ALL + impool = ImageEC2Pool.new(@client, user_flag) + + rc = impool.info + return rc if OpenNebula::is_error?(rc) + + user_flag = OpenNebula::Pool::INFO_ALL + vmpool = VirtualMachinePool.new(@client, user_flag) + + if include_terminated_instances? + rc = vmpool.info(user_flag, -1, -1, + OpenNebula::VirtualMachinePool::INFO_ALL_VM) + else + rc = vmpool.info + end + + return rc if OpenNebula::is_error?(rc) + + erb_version = params['Version'] + + response = ERB.new(File.read(@config[:views]+"/describe_tags.erb")) + return response.result(binding), 200 + end + ########################################################################### # Helper functions ########################################################################### diff --git a/src/cloud/ec2/lib/ImageEC2.rb b/src/cloud/ec2/lib/ImageEC2.rb index 90a3318f26..7919e7e3ff 100644 --- a/src/cloud/ec2/lib/ImageEC2.rb +++ b/src/cloud/ec2/lib/ImageEC2.rb @@ -100,10 +100,29 @@ class ImageEC2 < Image def ec2_ami? self["TEMPLATE/EC2_AMI"] == "YES" - true end def ebs_snapshot? self["TEMPLATE/EBS_SNAPSHOT"] == "YES" end + + def ec2_id + if self.ebs_snapshot? + "snap-" + sprintf('%08i', self.id) + elsif self.ec2_ami? + "ami-" + sprintf('%08i', self.id) + elsif self.ebs_volume? + "vol-" + sprintf('%08i', self.id) + end + end + + def resource_type + if self.ebs_snapshot? + "snapshot" + elsif self.ec2_ami? + "image" + elsif self.ebs_volume? + "volume" + end + end end diff --git a/src/cloud/ec2/lib/econe_application.rb b/src/cloud/ec2/lib/econe_application.rb index b43f0eaea9..7ee84018fa 100644 --- a/src/cloud/ec2/lib/econe_application.rb +++ b/src/cloud/ec2/lib/econe_application.rb @@ -144,6 +144,8 @@ class EC2Application result,rc = econe_server.create_tags(params) when 'DeleteTags' result,rc = econe_server.delete_tags(params) + when 'DescribeTags' + result,rc = econe_server.describe_tags(params) when 'CreateImage' result,rc = econe_server.create_image(params) when 'CreateVolume' diff --git a/src/cloud/ec2/lib/views/describe_tags.erb b/src/cloud/ec2/lib/views/describe_tags.erb new file mode 100644 index 0000000000..2933f6cc60 --- /dev/null +++ b/src/cloud/ec2/lib/views/describe_tags.erb @@ -0,0 +1,31 @@ + + <%= @request_id %> + + <% impool.each do |im| %> + <% if (state_image = im.render_state) && im.has_elements?("TEMPLATE/EC2_TAGS") %> + <% image_hash = im.to_hash %> + <% image_hash["IMAGE"]["TEMPLATE"]["EC2_TAGS"].each do |key, value| %> + + <%= im.ec2_id %> + image + <%= key %> + <%= value %> + + <% end + end + end %> + <% vmpool.each do |vm| %> + <% if include_terminated_instance?(vm) && vm.has_elements?("USER_TEMPLATE/EC2_TAGS") %> + <% vm_hash = vm.to_hash %> + <% vm_hash["VM"]["USER_TEMPLATE"]["EC2_TAGS"].each do |key, value| %> + + i-<%= sprintf('%08i', vm.id) %> + instance + <%= key %> + <%= value %> + + <% end + end + end %> + +