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

feature #378: Improve EBS functionality

Browse Source 
* Add LICENSE headers
  * Check if a volume is already attached
  * Add EBS_VOLUME parameter when an image is created using CreateVolume
This commit is contained in:
Daniel Molina 2012-08-30 19:07:01 +02:00
parent 6e862acbe6
commit b9c486238b
6 changed files with 66 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cloud/ec2/lib/ImageEC2.rb
View File

@ -55,6 +55,9 @@ class ImageEC2 < Image
<% if @image_info[:persistent] != nil %>
PERSISTENT = "YES"
<% end %>
<% if @image_info[:ebs] != "nil" %>
EBS_VOLUME = "YES"
<% end %>
<% if @image_file != nil %>
PATH = "<%= @image_file %>"
<% end %>

37
src/cloud/ec2/lib/ebs.rb
View File

@ -1,3 +1,19 @@
# -------------------------------------------------------------------------- #
# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org) #
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
# not use this file except in compliance with the License. You may obtain #
# a copy of the License at #
# #
# http://www.apache.org/licenses/LICENSE-2.0 #
# #
# Unless required by applicable law or agreed to in writing, software #
# distributed under the License is distributed on an "AS IS" BASIS, #
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
# See the License for the specific language governing permissions and #
# limitations under the License. #
#--------------------------------------------------------------------------- #
module EBS
# Default FSTYPE when creating new volumes
DEFAULT_FSTYPE = "ext3"
@ -93,9 +109,19 @@ module EBS
target = m[1]
end
# Check if the volume is already attached to another instance
image = Image.new(Image.build_xml(image_id), @client)
rc = image.info
return rc if OpenNebula::is_error?(rc)
if image['TEMPLATE/EBS/INSTANCE_ID']
return OpenNebula::Error.new("Volume #{params['VolumeId']} \
already attached to another instance \
(#{image['TEMPLATE/EBS/INSTANCE_ID']})")
end
# Attach
vm = VirtualMachine.new(VirtualMachine.build_xml(vm_id), @client)
rc = vm.info
@ -108,12 +134,6 @@ module EBS
# Update IMAGE metadata
image = Image.new(Image.build_xml(image_id), @client)
rc = image.info
return rc if OpenNebula::is_error?(rc)
attach_time = Time.now.to_i
xml_hash = {'EBS' => {
@ -156,7 +176,8 @@ module EBS
:type => "DATABLOCK",
:size => size,
:fstype => @config[:ebs_fstype]||DEFAULT_FSTYPE,
:persistent => "YES"
:persistent => "YES",
:ebs => "YES"
}
image = ImageEC2.new(Image.build_xml, @client, nil, opts)

16
src/cloud/ec2/lib/elastic_ip.rb
View File

@ -1,3 +1,19 @@
# -------------------------------------------------------------------------- #
# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org) #
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
# not use this file except in compliance with the License. You may obtain #
# a copy of the License at #
# #
# http://www.apache.org/licenses/LICENSE-2.0 #
# #
# Unless required by applicable law or agreed to in writing, software #
# distributed under the License is distributed on an "AS IS" BASIS, #
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
# See the License for the specific language governing permissions and #
# limitations under the License. #
#--------------------------------------------------------------------------- #
module ElasticIP
def allocate_address(params)
# Get public IP

16
src/cloud/ec2/lib/instance.rb
View File

@ -1,3 +1,19 @@
# -------------------------------------------------------------------------- #
# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org) #
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
# not use this file except in compliance with the License. You may obtain #
# a copy of the License at #
# #
# http://www.apache.org/licenses/LICENSE-2.0 #
# #
# Unless required by applicable law or agreed to in writing, software #
# distributed under the License is distributed on an "AS IS" BASIS, #
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
# See the License for the specific language governing permissions and #
# limitations under the License. #
#--------------------------------------------------------------------------- #
module Instance
###########################################################################
# Class Constants. Defined the EC2 and OpenNebula State mapping

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

@ -2,7 +2,7 @@
<DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/<%=erb_version%>/">
<imagesSet>
<% impool.each do |im| %>
<% if state_image = im.render_state %>
<% if (state_image = im.render_state) && (im['TEMPLATE/EBS'] != 'YES') %>
<item>
<imageId>ami-<%= sprintf('%08i', im.id) %></imageId>
<imageLocation><%= im['SOURCE'].split('/').last %></imageLocation>

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

@ -3,7 +3,7 @@
<requestId/>
<volumeSet>
<% impool.each do |im| %>
<% if state_image = im.render_state %>
<% if (state_image = im.render_state) && (im['TEMPLATE/EBS'] == 'YES') %>
<item>
<volumeId>vol-<%= sprintf('%08i', im.id) %></volumeId>
<size><%= im.render_size %></size>