From e00b7f3f43063f9db524fca6439aa7de64611d4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Constantino=20V=C3=A1zquez=20Blanco?= Date: Fri, 23 Oct 2009 13:00:34 +0000 Subject: [PATCH] Removing instances variables from econe git-svn-id: http://svn.opennebula.org/one/trunk@887 3034c82b-c49b-4eb3-8279-a7acafdc01c0 --- src/cloud/ec2/etc/templates/m1.small.erb | 6 +-- src/cloud/ec2/lib/EC2QueryServer.rb | 49 +++++++++---------- src/cloud/ec2/lib/views/describe_images.erb | 4 +- .../ec2/lib/views/describe_instances.erb | 4 +- src/cloud/ec2/lib/views/register_image.erb | 2 +- src/cloud/ec2/lib/views/run_instances.erb | 14 +++--- .../ec2/lib/views/terminate_instances.erb | 4 +- 7 files changed, 41 insertions(+), 42 deletions(-) diff --git a/src/cloud/ec2/etc/templates/m1.small.erb b/src/cloud/ec2/etc/templates/m1.small.erb index fb608f88dd..aadc207263 100644 --- a/src/cloud/ec2/etc/templates/m1.small.erb +++ b/src/cloud/ec2/etc/templates/m1.small.erb @@ -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 ]%> diff --git a/src/cloud/ec2/lib/EC2QueryServer.rb b/src/cloud/ec2/lib/EC2QueryServer.rb index d7129d449a..09e6171652 100644 --- a/src/cloud/ec2/lib/EC2QueryServer.rb +++ b/src/cloud/ec2/lib/EC2QueryServer.rb @@ -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) diff --git a/src/cloud/ec2/lib/views/describe_images.erb b/src/cloud/ec2/lib/views/describe_images.erb index 87bc407d7d..c7f2972a56 100644 --- a/src/cloud/ec2/lib/views/describe_images.erb +++ b/src/cloud/ec2/lib/views/describe_images.erb @@ -1,11 +1,11 @@ - <% for image in @erb_images %> + <% for image in erb_images %> <%= image.id %> <%= image.path %> available - <%= @erb_user[:name] %> + <%= erb_user[:name] %> false i386 machine diff --git a/src/cloud/ec2/lib/views/describe_instances.erb b/src/cloud/ec2/lib/views/describe_instances.erb index 5d96c56944..28740fcba0 100644 --- a/src/cloud/ec2/lib/views/describe_instances.erb +++ b/src/cloud/ec2/lib/views/describe_instances.erb @@ -2,14 +2,14 @@ default - <%= @erb_user_name %> + <%= erb_user_name %> default - <% @erb_vmpool.each do |vm| %> + <% erb_vmpool.each do |vm| %> <% vm.info %> <%= vm.id %> diff --git a/src/cloud/ec2/lib/views/register_image.erb b/src/cloud/ec2/lib/views/register_image.erb index b46937ac5e..753487bc2d 100644 --- a/src/cloud/ec2/lib/views/register_image.erb +++ b/src/cloud/ec2/lib/views/register_image.erb @@ -1,3 +1,3 @@ - <%= @erb_img_id %> + <%= erb_img_id %> diff --git a/src/cloud/ec2/lib/views/run_instances.erb b/src/cloud/ec2/lib/views/run_instances.erb index 5e805d5da5..7481d4f978 100644 --- a/src/cloud/ec2/lib/views/run_instances.erb +++ b/src/cloud/ec2/lib/views/run_instances.erb @@ -1,6 +1,6 @@ r-47a5402e - <%= @erb_user_name %> + <%= erb_user_name %> default @@ -8,18 +8,18 @@ - <%= @erb_vm_info[:vm_id] %> - <%= @erb_vm_info[:img_id] %> + <%= erb_vm_info[:vm_id] %> + <%= erb_vm_info[:img_id] %> 0 pending - <%= @erb_vm_info[:vm]["TEMPLATE/NIC/IP"]%> - <%= @erb_vm_info[:vm]["TEMPLATE/NIC/IP"]%> + <%= erb_vm_info[:vm]["TEMPLATE/NIC/IP"]%> + <%= erb_vm_info[:vm]["TEMPLATE/NIC/IP"]%> default 0 - <%= @erb_vm_info[:instance_type] %> - <%= render_launch_time(@erb_vm_info[:vm]) %> + <%= erb_vm_info[:instance_type] %> + <%= render_launch_time(erb_vm_info[:vm]) %> default diff --git a/src/cloud/ec2/lib/views/terminate_instances.erb b/src/cloud/ec2/lib/views/terminate_instances.erb index 00b185e793..cdfc177699 100644 --- a/src/cloud/ec2/lib/views/terminate_instances.erb +++ b/src/cloud/ec2/lib/views/terminate_instances.erb @@ -1,13 +1,13 @@ - <%= @erb_vm.id %> + <%= erb_vm.id %> 32 shutting-down - <%= render_state(@erb_vm) %> + <%= render_state(erb_vm) %>