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

Removing instances variables from econe

Browse Source 
git-svn-id: http://svn.opennebula.org/one/trunk@887 3034c82b-c49b-4eb3-8279-a7acafdc01c0
This commit is contained in:
Constantino Vázquez Blanco 2009-10-23 13:00:34 +00:00
parent 7c4a406da0
commit e00b7f3f43
7 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cloud/ec2/etc/templates/m1.small.erb
View File

@ -9,7 +9,7 @@ OS = [ kernel = /vmlinuz,
root = sda1,
kernel_cmd = "ro xencons=tty console=tty1"]
DISK = [ source = <%= @erb_vm_info[:img_path] %>,
DISK = [ source = <%= erb_vm_info[:img_path] %>,
clone = no,
target = sda1,
readonly = no]
@ -18,6 +18,6 @@ DISK = [ source = <%= @erb_vm_info[:img_path] %>,
NIC=[NETWORK="Public EC2"]
IMAGE_ID = <%= @erb_vm_info[:img_id] %>
INSTANCE_TYPE = <%= @erb_vm_info[:instance_type ]%>
IMAGE_ID = <%= erb_vm_info[:img_id] %>
INSTANCE_TYPE = <%= erb_vm_info[:instance_type ]%>

49
src/cloud/ec2/lib/EC2QueryServer.rb
View File

@ -97,7 +97,7 @@ class EC2QueryServer < CloudServer
user = get_user(params['AWSAccessKeyId'])
image = add_image(user[:id],params["file"][:tempfile])
@erb_img_id = image.id
erb_img_id = image.id
response = ERB.new(File.read(@config[:views]+"/register_image.erb"))
return response.result(binding), 200
@ -113,15 +113,15 @@ class EC2QueryServer < CloudServer
return OpenNebula::Error.new('Not permited to use image'), 401
end
@erb_img_id=image.id
erb_img_id=image.id
response = ERB.new(File.read(@config[:views]+"/register_image.erb"))
return response.result(binding), 200
end
def describe_images(params)
@erb_user = get_user(params['AWSAccessKeyId'])
@erb_images = Image.filter(:owner => @erb_user[:id])
erb_user = get_user(params['AWSAccessKeyId'])
erb_images = Image.filter(:owner => erb_user[:id])
response = ERB.new(File.read(@config[:views]+"/describe_images.erb"))
return response.result(binding), 200
@ -146,20 +146,19 @@ class EC2QueryServer < CloudServer
# Get the user
user = get_user(params['AWSAccessKeyId'])
one_client = one_client_user(user)
@erb_user_name = user[:name]
erb_user_name = user[:name]
# Build the VM
@erb_vm_info=Hash.new
erb_vm_info=Hash.new
@erb_vm_info[:img_path] = image.path
@erb_vm_info[:img_id] = params['ImageId']
@erb_vm_info[:instance_type] = instance_type_name
@erb_vm_info[:template] = @config[:template_location] +
erb_vm_info[:img_path] = image.path
erb_vm_info[:img_id] = params['ImageId']
erb_vm_info[:instance_type] = instance_type_name
erb_vm_info[:template] = @config[:template_location] +
"/#{instance_type['TEMPLATE']}"
template = ERB.new(File.read(@erb_vm_info[:template]))
template = ERB.new(File.read(erb_vm_info[:template]))
template_text = template.result(binding)
#Start the VM.
vm = VirtualMachine.new(VirtualMachine.build_xml, one_client)
rc = vm.allocate(template_text)
@ -167,9 +166,9 @@ class EC2QueryServer < CloudServer
return rc, 401 if OpenNebula::is_error?(rc)
vm.info
@erb_vm_info[:vm_id]=vm.id
@erb_vm_info[:vm]=vm
erb_vm_info[:vm_id]=vm.id
erb_vm_info[:vm]=vm
response = ERB.new(File.read(@config[:views]+"/run_instances.erb"))
return response.result(binding), 200
@ -181,7 +180,7 @@ class EC2QueryServer < CloudServer
user = get_user(params['AWSAccessKeyId'])
one_client = one_client_user(user)
@erb_user_name = user[:name]
erb_user_name = user[:name]
if user[:id]==0
user_flag=-2
@ -189,8 +188,8 @@ class EC2QueryServer < CloudServer
user_flag=-1
end
@erb_vmpool = VirtualMachinePool.new(one_client, user_flag)
@erb_vmpool.info
erb_vmpool = VirtualMachinePool.new(one_client, user_flag)
erb_vmpool.info
response = ERB.new(File.read(@config[:views]+"/describe_instances.erb"))
return response.result(binding), 200
@ -203,15 +202,15 @@ class EC2QueryServer < CloudServer
vmid=params['InstanceId.1']
@erb_vm = VirtualMachine.new(VirtualMachine.build_xml(vmid),one_client)
rc = @erb_vm.info
erb_vm = VirtualMachine.new(VirtualMachine.build_xml(vmid),one_client)
rc = erb_vm.info
return rc, 401 if OpenNebula::is_error?(rc)
if @erb_vm.status == 'runn'
rc = @erb_vm.shutdown
if erb_vm.status == 'runn'
rc = erb_vm.shutdown
else
rc = @erb_vm.finalize
rc = erb_vm.finalize
end
return rc, 401 if OpenNebula::is_error?(rc)

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

@ -1,11 +1,11 @@
<DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2009-04-04/">
<imagesSet>
<% for image in @erb_images %>
<% for image in erb_images %>
<item>
<imageId><%= image.id %></imageId>
<imageLocation><%= image.path %></imageLocation>
<imageState>available</imageState>
<imageOwnerId><%= @erb_user[:name] %></imageOwnerId>
<imageOwnerId><%= erb_user[:name] %></imageOwnerId>
<isPublic>false</isPublic>
<architecture>i386</architecture>
<imageType>machine</imageType>

4
src/cloud/ec2/lib/views/describe_instances.erb
View File

@ -2,14 +2,14 @@
<reservationSet>
<item>
<reservationId>default</reservationId>
<ownerId><%= @erb_user_name %></ownerId>
<ownerId><%= erb_user_name %></ownerId>
<groupSet>
<item>
<groupId>default</groupId>
</item>
</groupSet>
<instancesSet>
<% @erb_vmpool.each do |vm| %>
<% erb_vmpool.each do |vm| %>
<% vm.info %>
<item>
<instanceId><%= vm.id %></instanceId>

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

@ -1,3 +1,3 @@
<RegisterImageResponse xmlns="http://ec2.amazonaws.com/doc/2009-04-04/">
<imageId><%= @erb_img_id %></imageId>
<imageId><%= erb_img_id %></imageId>
</RegisterImageResponse>

14
src/cloud/ec2/lib/views/run_instances.erb
View File

@ -1,6 +1,6 @@
<RunInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2009-04-04/">
<reservationId>r-47a5402e</reservationId>
<ownerId><%= @erb_user_name %></ownerId>
<ownerId><%= erb_user_name %></ownerId>
<groupSet>
<item>
<groupId>default</groupId>
@ -8,18 +8,18 @@
</groupSet>
<instancesSet>
<item>
<instanceId><%= @erb_vm_info[:vm_id] %></instanceId>
<imageId><%= @erb_vm_info[:img_id] %></imageId>
<instanceId><%= erb_vm_info[:vm_id] %></instanceId>
<imageId><%= erb_vm_info[:img_id] %></imageId>
<instanceState>
<code>0</code>
<name>pending</name>
</instanceState>
<privateDnsName><%= @erb_vm_info[:vm]["TEMPLATE/NIC/IP"]%></privateDnsName>
<dnsName><%= @erb_vm_info[:vm]["TEMPLATE/NIC/IP"]%></dnsName>
<privateDnsName><%= erb_vm_info[:vm]["TEMPLATE/NIC/IP"]%></privateDnsName>
<dnsName><%= erb_vm_info[:vm]["TEMPLATE/NIC/IP"]%></dnsName>
<keyName>default</keyName>
<amiLaunchIndex>0</amiLaunchIndex>
<instanceType><%= @erb_vm_info[:instance_type] %></instanceType>
<%= render_launch_time(@erb_vm_info[:vm]) %>
<instanceType><%= erb_vm_info[:instance_type] %></instanceType>
<%= render_launch_time(erb_vm_info[:vm]) %>
<placement>
<availabilityZone>default</availabilityZone>
</placement>

4
src/cloud/ec2/lib/views/terminate_instances.erb
View File

@ -1,13 +1,13 @@
<TerminateInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2009-04-04/">
<instancesSet>
<item>
<instanceId><%= @erb_vm.id %></instanceId>
<instanceId><%= erb_vm.id %></instanceId>
<shutdownState>
<code>32</code>
<name>shutting-down</name>
</shutdownState>
<previousState>
<%= render_state(@erb_vm) %>
<%= render_state(erb_vm) %>
</previousState>
</item>
</instancesSet>