From 0b68e9b59a3dc82b3f16b2569806ea78722672dc Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Tue, 13 Aug 2013 13:00:25 +0200 Subject: [PATCH] feature #2259: Add CreateImage --- install.sh | 1 + src/cloud/ec2/lib/EC2QueryServer.rb | 34 ++++++++++++++++++++++++ src/cloud/ec2/lib/econe_application.rb | 2 ++ src/cloud/ec2/lib/instance.rb | 1 + src/cloud/ec2/lib/views/create_image.erb | 4 +++ 5 files changed, 42 insertions(+) create mode 100644 src/cloud/ec2/lib/views/create_image.erb diff --git a/install.sh b/install.sh index 141abc4113..a0e92e1845 100755 --- a/install.sh +++ b/install.sh @@ -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_volume.erb \ + src/cloud/ec2/lib/views/create_image.erb \ src/cloud/ec2/lib/views/describe_volumes.erb \ src/cloud/ec2/lib/views/attach_volume.erb \ src/cloud/ec2/lib/views/detach_volume.erb \ diff --git a/src/cloud/ec2/lib/EC2QueryServer.rb b/src/cloud/ec2/lib/EC2QueryServer.rb index bf22cbd931..525454f80e 100644 --- a/src/cloud/ec2/lib/EC2QueryServer.rb +++ b/src/cloud/ec2/lib/EC2QueryServer.rb @@ -182,6 +182,40 @@ class EC2QueryServer < CloudServer return response.result(binding), 200 end + # TODO: NoReboot = false, cleanly shut down the instance before image + # creation and then reboots the instance. + # TODO: If you customized your instance with instance store volumes + # or EBS volumes in addition to the root device volume, the + # new AMI contains block device mapping information for those volumes + def create_image(params) + instance_id = params['InstanceId'] + instance_id = instance_id.split('-')[1] + + vm = VirtualMachine.new( + VirtualMachine.build_xml(instance_id), + @client) + + rc = vm.info + if OpenNebula::is_error?(rc) + rc.ec2_code = "InvalidInstanceID.NotFound" + return rc + end + + image_id = vm.disk_snapshot(1, + params["Name"], + OpenNebula::Image::IMAGE_TYPES[0], + true) + + if OpenNebula::is_error?(image_id) + return image_id + end + + erb_version = params['Version'] + + response = ERB.new(File.read(@config[:views]+"/create_image.erb")) + return response.result(binding), 200 + end + ########################################################################### # Helper functions ########################################################################### diff --git a/src/cloud/ec2/lib/econe_application.rb b/src/cloud/ec2/lib/econe_application.rb index 7360f720c3..43a3284153 100644 --- a/src/cloud/ec2/lib/econe_application.rb +++ b/src/cloud/ec2/lib/econe_application.rb @@ -134,6 +134,8 @@ class EC2Application result,rc = econe_server.describe_regions(params) when 'DescribeAvailabilityZones' result,rc = econe_server.describe_availability_zones(params) + when 'CreateImage' + result,rc = econe_server.create_image(params) when 'CreateVolume' result,rc = econe_server.create_volume(params) when 'DescribeVolumes' diff --git a/src/cloud/ec2/lib/instance.rb b/src/cloud/ec2/lib/instance.rb index cf63b68964..a9bfacadaa 100644 --- a/src/cloud/ec2/lib/instance.rb +++ b/src/cloud/ec2/lib/instance.rb @@ -205,6 +205,7 @@ module Instance rc = vm.info if OpenNebula::is_error?(rc) + rc.ec2_code = "InvalidInstanceID.NotFound" return rc end diff --git a/src/cloud/ec2/lib/views/create_image.erb b/src/cloud/ec2/lib/views/create_image.erb new file mode 100644 index 0000000000..480183aeb8 --- /dev/null +++ b/src/cloud/ec2/lib/views/create_image.erb @@ -0,0 +1,4 @@ + + <%= @request_id %> + ami-<%= sprintf('%08i', image_id) %> +