mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-19 03:12:55 +09:00
feature #2259: Add DeleteTags
This commit is contained in:
1 parent
4dad58d453
commit
c2e4558040
4 files changed
+92
No files matched your search
@@ -1296,6 +1296,7 @@ ECO_LIB_VIEW_FILES="src/cloud/ec2/lib/views/describe_images.erb \
|
||||
src/cloud/ec2/lib/views/describe_regions.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/create_volume.erb \
|
||||
src/cloud/ec2/lib/views/create_snapshot.erb \
|
||||
src/cloud/ec2/lib/views/delete_snapshot.erb \
|
||||
|
||||
@@ -304,6 +304,91 @@ class EC2QueryServer < CloudServer
|
||||
return response.result(binding), 200
|
||||
end
|
||||
|
||||
# Deletes the specified set of tags from the specified set of resources.
|
||||
#
|
||||
# @param [Hash] params
|
||||
# @option params [String] ResourceId.n The IDs of one or more resources
|
||||
# to tag. For example, ami-1a2b3c4d.
|
||||
# @option params [String] Tag.n.Key The key for a tag.
|
||||
# @option params [String] Tag.n.Value The value for a tag. If you don't
|
||||
# want the tag to have a value, specify the parameter with no value,
|
||||
# and we set the value to an empty string.
|
||||
#
|
||||
# TODO: return if error or continue
|
||||
def delete_tags(params)
|
||||
resources = []
|
||||
tags = {}
|
||||
|
||||
params.each { |key, value|
|
||||
case key
|
||||
when /ResourceId\./
|
||||
resources << case value
|
||||
when /ami\-(.+)/
|
||||
image = ImageEC2.new(Image.build_xml($1), @client)
|
||||
rc = image.info
|
||||
if OpenNebula.is_error?(rc) || !image.ec2_ami?
|
||||
rc ||= OpenNebula::Error.new()
|
||||
rc.ec2_code = "InvalidAMIID.NotFound"
|
||||
return rc
|
||||
else
|
||||
image
|
||||
end
|
||||
when /vol\-(.+)/
|
||||
image = ImageEC2.new(Image.build_xml($1), @client)
|
||||
rc = image.info
|
||||
if OpenNebula.is_error?(rc) || !image.ebs_volume?
|
||||
rc ||= OpenNebula::Error.new()
|
||||
rc.ec2_code = "InvalidVolume.NotFound"
|
||||
return rc
|
||||
else
|
||||
image
|
||||
end
|
||||
when /snap\-(.+)/
|
||||
image = ImageEC2.new(Image.build_xml($1), @client)
|
||||
rc = image.info
|
||||
if OpenNebula.is_error?(rc) || !image.ebs_snapshot?
|
||||
rc ||= OpenNebula::Error.new()
|
||||
rc.ec2_code = "InvalidSnapshot.NotFound"
|
||||
return rc
|
||||
else
|
||||
image
|
||||
end
|
||||
when /i\-(.+)/
|
||||
vm = VirtualMachine.new(VirtualMachine.build_xml($1), @client)
|
||||
rc = vm.info
|
||||
if OpenNebula.is_error?(rc)
|
||||
rc.ec2_code = "InvalidInstanceID.NotFound"
|
||||
return rc
|
||||
else
|
||||
vm
|
||||
end
|
||||
end
|
||||
when /Tag\.(\d+)\.Key/
|
||||
tags[value] = params["Tag.#{$1}.Value"] || ""
|
||||
end
|
||||
}
|
||||
|
||||
resources.each {|resource|
|
||||
if resource.is_a?(VirtualMachine)
|
||||
template_key = "USER_TEMPLATE"
|
||||
elsif resource.is_a?(Image)
|
||||
template_key = "TEMPLATE"
|
||||
end
|
||||
|
||||
tags.each { |key,value|
|
||||
resource.delete_element("#{template_key}/EC2_TAGS/#{key}")
|
||||
}
|
||||
|
||||
rc = resource.update(resource.template_like_str(template_key))
|
||||
return rc if OpenNebula::is_error?(rc)
|
||||
}
|
||||
|
||||
erb_version = params['Version']
|
||||
|
||||
response = ERB.new(File.read(@config[:views]+"/delete_tags.erb"))
|
||||
return response.result(binding), 200
|
||||
end
|
||||
|
||||
###########################################################################
|
||||
# Helper functions
|
||||
###########################################################################
|
||||
|
||||
@@ -142,6 +142,8 @@ class EC2Application
|
||||
result,rc = econe_server.describe_snapshots(params)
|
||||
when 'CreateTags'
|
||||
result,rc = econe_server.create_tags(params)
|
||||
when 'DeleteTags'
|
||||
result,rc = econe_server.delete_tags(params)
|
||||
when 'CreateImage'
|
||||
result,rc = econe_server.create_image(params)
|
||||
when 'CreateVolume'
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
<DeleteTagsResponse xmlns="http://ec2.amazonaws.com/doc/2013-06-15/">
|
||||
<requestId><%= @request_id %></requestId>
|
||||
<return>true</return>
|
||||
</DeleteTagsResponse>
|
||||
Reference in new issue
Block a user