deltacloud-devel August 2009

deltacloud-devel@lists.fedorahosted.org

14 participants
50 discussions

[Libcloud-list] [PATCH server] Add task arg to tasks and kinda try to implement some tasks.
by Ian Main 20 Aug '09

20 Aug '09

Signed-off-by: Ian Main <imain(a)redhat.com> --- src/task-omatic/taskomatic.rb | 15 ++++++++------- src/task-omatic/taskomatic_instance.rb | 27 +++++++++++++++++---------- src/task-omatic/taskomatic_task.rb | 3 ++- 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/src/task-omatic/taskomatic.rb b/src/task-omatic/taskomatic.rb index f09ffd3..2a5c691 100755 --- a/src/task-omatic/taskomatic.rb +++ b/src/task-omatic/taskomatic.rb @@ -44,6 +44,7 @@ class Logger end end +puts $:.inspect class TaskOmatic @@ -104,8 +105,8 @@ class TaskOmatic def mainloop() - task = TaskomaticInstanceCreate.new(@logger) - task.run + tasko_task = TaskomaticInstanceCreate.new(@logger, nil) + tasko_task.run loop do @@ -138,15 +139,15 @@ class TaskOmatic begin case task.action when InstanceTask::CREATE - tasko_task = TaskomaticInstanceCreate.new(@logger) + tasko_task = TaskomaticInstanceCreate.new(@logger, task) when InstanceTask::START - tasko_task = TaskomaticInstanceStart.new(@logger) + tasko_task = TaskomaticInstanceStart.new(@logger, task) when InstanceTask::STOP - tasko_task = TaskomaticInstanceStop.new(@logger) + tasko_task = TaskomaticInstanceStop.new(@logger, task) when InstanceTask::REBOOT - tasko_task = TaskomaticInstanceReboot.new(@logger) + tasko_task = TaskomaticInstanceReboot.new(@logger, task) when InstanceTask::DESTROY - tasko_task = TaskomaticInstanceDestroy.new(@logger) + tasko_task = TaskomaticInstanceDestroy.new(@logger, task) else @logger.error "unknown task " + task.action state = Task::STATE_FAILED diff --git a/src/task-omatic/taskomatic_instance.rb b/src/task-omatic/taskomatic_instance.rb index 6f2df5f..c9d16ab 100644 --- a/src/task-omatic/taskomatic_instance.rb +++ b/src/task-omatic/taskomatic_instance.rb @@ -21,32 +21,39 @@ require 'taskomatic_task' # Create a new instance on a cloud. class TaskomaticInstanceCreate < TaskomaticTask - def initialize(logger) - super(logger) + def initialize(logger, task) + super(logger, task) @logger.info("TaskomaticInstanceCreate created.") end def run + client = @task.instance.portal_pool.cloud_account.connect + instance = client.create_instance((a)task.instance.image.name) + @logger.info("New instance created.") end end # Start a stopped instance on a cloud class TaskomaticInstanceStart < TaskomaticTask - def initialize(logger) - super(logger) + def initialize(logger, task) + super(logger, task) @logger.info("TaskomaticInstanceStart created.") end def run + client = @task.instance.portal_pool.cloud_account.connect + instance = client.instance((a)task.instance.image.name) + #instance.stop + @logger.info("New instance created.") end end # Stop an instance. class TaskomaticInstanceStop < TaskomaticTask - def initialize(logger) - super(logger) + def initialize(logger, task) + super(logger, task) @logger.info("TaskomaticInstanceStop started.") end @@ -57,8 +64,8 @@ end # Reboot an instance. class TaskomaticInstanceReboot < TaskomaticTask - def initialize(logger) - super(logger) + def initialize(logger, task) + super(logger, task) @logger.info("TaskomaticInstanceReboot started.") end @@ -69,8 +76,8 @@ end # Destroy an instance. class TaskomaticInstanceDestroy < TaskomaticTask - def initialize(logger) - super(logger) + def initialize(logger, task) + super(logger, task) @logger.info("TaskomaticInstanceDestroy started.") end diff --git a/src/task-omatic/taskomatic_task.rb b/src/task-omatic/taskomatic_task.rb index 0522f40..f717321 100644 --- a/src/task-omatic/taskomatic_task.rb +++ b/src/task-omatic/taskomatic_task.rb @@ -20,8 +20,9 @@ # Create a new instance on a cloud. class TaskomaticTask - def initialize(logger) + def initialize(logger, task) @logger = logger + @task = task end end -- 1.6.2.5

1 0

[Libcloud-list] [PATCH server] add validation to check for working url.
by jason.guiditta 20 Aug '09

20 Aug '09

This requires a working deltacloud-framework somewhere. Also, since we now require url, database(s) should be dropped, recreated, migrated. Signed-off-by: Jason Guiditta <jason.guiditta(a)gmail.com> --- src/app/models/provider.rb | 18 ++++++++++++++ src/db/migrate/20090731200741_create_providers.rb | 2 +- src/test/unit/provider_test.rb | 26 +++++++++++++++++--- 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/src/app/models/provider.rb b/src/app/models/provider.rb index 0cbb65a..01fd41e 100644 --- a/src/app/models/provider.rb +++ b/src/app/models/provider.rb @@ -8,5 +8,23 @@ class Provider < ActiveRecord::Base validates_uniqueness_of :name validates_presence_of :cloud_type + validates_presence_of :url + def validate + if !nil_or_empty(url) + errors.add("url", "must be a valid provider url") unless valid_framework? + puts errors.inspect + end + end + + private + + def valid_framework? + begin + DeltaCloud.new(nil, nil, url) + return true + rescue Exception => e + return false + end + end end diff --git a/src/db/migrate/20090731200741_create_providers.rb b/src/db/migrate/20090731200741_create_providers.rb index 1a4e41e..253a8fb 100644 --- a/src/db/migrate/20090731200741_create_providers.rb +++ b/src/db/migrate/20090731200741_create_providers.rb @@ -3,7 +3,7 @@ class CreateProviders < ActiveRecord::Migration create_table :providers do |t| t.string :name, :null => false t.string :cloud_type, :null => false - t.string :url + t.string :url, :null => false t.integer :lock_version, :default => 0 t.timestamps end diff --git a/src/test/unit/provider_test.rb b/src/test/unit/provider_test.rb index cdbef7e..d9af732 100644 --- a/src/test/unit/provider_test.rb +++ b/src/test/unit/provider_test.rb @@ -1,8 +1,26 @@ -require 'test_helper' +require File.dirname(__FILE__) + '/../test_helper' class ProviderTest < ActiveSupport::TestCase - # Replace this with your real tests. - test "the truth" do - assert true + fixtures :providers + + def setup + @provider = Provider.new(:name => "my_ec2", + :cloud_type => "EC2") + end + # The following three tests assume you have the deltacloud-framework + # running and configured on localhost:3000 + + test "is valid with good url" do + @provider.url = "http://localhost:3000/api" + flunk "That URL should have worked. Is framework running?" if @provider.invalid? + end + + test "requires url" do + flunk "Providers require a url" if @provider.valid? + end + + test "fails with invalid provider url" do + @provider.url = "http://dcloud.awesome/api" + flunk "Invalid url passed validation" unless @provider.invalid? end end -- 1.6.2.5

1 0

[Libcloud-list] [PATCH server] Add all instance tasks to main switch.
by Ian Main 20 Aug '09

20 Aug '09

Signed-off-by: Ian Main <imain(a)redhat.com> --- src/task-omatic/taskomatic.rb | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/task-omatic/taskomatic.rb b/src/task-omatic/taskomatic.rb index 3790b64..f09ffd3 100755 --- a/src/task-omatic/taskomatic.rb +++ b/src/task-omatic/taskomatic.rb @@ -137,14 +137,26 @@ class TaskOmatic state = Task::STATE_FINISHED begin case task.action - #when InstanceTask::CREATE - when 'InstanceCreate' - TaskomaticInstanceCreate.new(@logger) + when InstanceTask::CREATE + tasko_task = TaskomaticInstanceCreate.new(@logger) + when InstanceTask::START + tasko_task = TaskomaticInstanceStart.new(@logger) + when InstanceTask::STOP + tasko_task = TaskomaticInstanceStop.new(@logger) + when InstanceTask::REBOOT + tasko_task = TaskomaticInstanceReboot.new(@logger) + when InstanceTask::DESTROY + tasko_task = TaskomaticInstanceDestroy.new(@logger) else @logger.error "unknown task " + task.action state = Task::STATE_FAILED task.message = "Unknown task type" end + + # Implement the task.. this may be done in threads based on + # dependencies in the future. + tasko_task.run + rescue Exception => ex @logger.error "Task action processing failed: #{ex.class}: #{ex.message}" @logger.error ex.backtrace -- 1.6.2.5

1 0

[Libcloud-list] [PATCH server] add validation to check for working url.
by jason.guiditta 20 Aug '09

20 Aug '09

This requires a working deltacloud-framework somewhere. Signed-off-by: Jason Guiditta <jason.guiditta(a)gmail.com> --- src/app/models/provider.rb | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/app/models/provider.rb b/src/app/models/provider.rb index 0cbb65a..061f34d 100644 --- a/src/app/models/provider.rb +++ b/src/app/models/provider.rb @@ -9,4 +9,13 @@ class Provider < ActiveRecord::Base validates_presence_of :cloud_type + def validate + if !nil_or_empty(url) + begin + d = DeltaCloud.new(nil, nil, url) + rescue Exception => e + errors.add("url", "must be a valid provider url") + end + end + end end -- 1.6.2.5

1 0

[Libcloud-list] [PATCH server] Rename instance.rb to taskomatic_instance.rb and add all the instance task types.
by Ian Main 20 Aug '09

20 Aug '09

Signed-off-by: Ian Main <imain(a)redhat.com> --- src/task-omatic/instance.rb | 29 ------------ src/task-omatic/taskomatic.rb | 7 ++- src/task-omatic/taskomatic_instance.rb | 79 ++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 31 deletions(-) delete mode 100644 src/task-omatic/instance.rb create mode 100644 src/task-omatic/taskomatic_instance.rb diff --git a/src/task-omatic/instance.rb b/src/task-omatic/instance.rb deleted file mode 100644 index 2db9c0e..0000000 --- a/src/task-omatic/instance.rb +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (C) 2009 Red Hat, Inc. -# Written by Ian Main <imain(a)redhat.com> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -# MA 02110-1301, USA. A copy of the GNU General Public License is -# also available at http://www.gnu.org/copyleft/gpl.html. - -require 'taskomatic_task' - -# Create a new instance on a cloud. -class InstanceTaskCreate < TaskomaticTask - - def initialize(logger) - super(logger) - @logger.info("InstanceTaskCreate started.") - end - -end diff --git a/src/task-omatic/taskomatic.rb b/src/task-omatic/taskomatic.rb index 5dbaa8f..3790b64 100755 --- a/src/task-omatic/taskomatic.rb +++ b/src/task-omatic/taskomatic.rb @@ -30,7 +30,7 @@ require 'daemons' require 'logger' include Daemonize -require 'instance' +require 'taskomatic_instance' # This sad and pathetic readjustment to ruby logger class is # required to fix the formatting because rails does the same @@ -104,6 +104,9 @@ class TaskOmatic def mainloop() + task = TaskomaticInstanceCreate.new(@logger) + task.run + loop do tasks = Array.new @@ -136,7 +139,7 @@ class TaskOmatic case task.action #when InstanceTask::CREATE when 'InstanceCreate' - InstanceTaskCreate.new(@logger) + TaskomaticInstanceCreate.new(@logger) else @logger.error "unknown task " + task.action state = Task::STATE_FAILED diff --git a/src/task-omatic/taskomatic_instance.rb b/src/task-omatic/taskomatic_instance.rb new file mode 100644 index 0000000..6f2df5f --- /dev/null +++ b/src/task-omatic/taskomatic_instance.rb @@ -0,0 +1,79 @@ +# Copyright (C) 2009 Red Hat, Inc. +# Written by Ian Main <imain(a)redhat.com> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301, USA. A copy of the GNU General Public License is +# also available at http://www.gnu.org/copyleft/gpl.html. + +require 'taskomatic_task' + +# Create a new instance on a cloud. +class TaskomaticInstanceCreate < TaskomaticTask + + def initialize(logger) + super(logger) + @logger.info("TaskomaticInstanceCreate created.") + end + + def run + end +end + +# Start a stopped instance on a cloud +class TaskomaticInstanceStart < TaskomaticTask + + def initialize(logger) + super(logger) + @logger.info("TaskomaticInstanceStart created.") + end + + def run + end +end + +# Stop an instance. +class TaskomaticInstanceStop < TaskomaticTask + + def initialize(logger) + super(logger) + @logger.info("TaskomaticInstanceStop started.") + end + + def run + end +end + +# Reboot an instance. +class TaskomaticInstanceReboot < TaskomaticTask + + def initialize(logger) + super(logger) + @logger.info("TaskomaticInstanceReboot started.") + end + + def run + end +end + +# Destroy an instance. +class TaskomaticInstanceDestroy < TaskomaticTask + + def initialize(logger) + super(logger) + @logger.info("TaskomaticInstanceDestroy started.") + end + + def run + end +end -- 1.6.2.5

1 0

[Libcloud-list] [PATCH server] Initial Add Provider controller.
by jason.guiditta 19 Aug '09

19 Aug '09

This is just a rough initial form, with validation. Still needs to be wrapped with js, redirect you to the right place, and check with deltacloud api to validate url. Also adds providers to left nav area. Signed-off-by: Jason Guiditta <jason.guiditta(a)gmail.com> --- src/app/controllers/application_controller.rb | 6 +++++- src/app/controllers/provider_controller.rb | 20 ++++++++++++++++++++ src/app/helpers/provider_controller_helper.rb | 2 ++ src/app/views/layouts/_navigation_tabs.rhtml | 4 +++- src/app/views/layouts/dcloud.rhtml | 9 ++++++++- src/app/views/provider/delete.html.erb | 2 ++ src/app/views/provider/index.html.erb | 2 ++ src/app/views/provider/new.html.erb | 11 +++++++++++ src/app/views/provider/show.html.erb | 2 ++ src/public/stylesheets/dcloud.css | 8 ++++++++ 10 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 src/app/controllers/provider_controller.rb create mode 100644 src/app/helpers/provider_controller_helper.rb create mode 100644 src/app/views/provider/delete.html.erb create mode 100644 src/app/views/provider/index.html.erb create mode 100644 src/app/views/provider/new.html.erb create mode 100644 src/app/views/provider/show.html.erb create mode 100644 src/public/stylesheets/dcloud.css diff --git a/src/app/controllers/application_controller.rb b/src/app/controllers/application_controller.rb index 973b4fb..4cc8192 100644 --- a/src/app/controllers/application_controller.rb +++ b/src/app/controllers/application_controller.rb @@ -28,7 +28,7 @@ class ApplicationController < ActionController::Base init_gettext "ovirt" layout :choose_layout - before_filter :is_logged_in, :get_help_section + before_filter :is_logged_in, :get_help_section, :get_nav_items # General error handlers, must be in order from least specific # to most specific @@ -65,6 +65,10 @@ class ApplicationController < ActionController::Base (ENV["RAILS_ENV"] == "production") ? session[:user] : "ovirtadmin" end + def get_nav_items + @providers = Provider.find(:all) + end + protected # permissions checking diff --git a/src/app/controllers/provider_controller.rb b/src/app/controllers/provider_controller.rb new file mode 100644 index 0000000..09ed19f --- /dev/null +++ b/src/app/controllers/provider_controller.rb @@ -0,0 +1,20 @@ +class ProviderController < ApplicationController + def index + @providers = Provider.find(:all) + end + + def show + end + + def new + @provider = Provider.new(params[:provider]) + if request.post? && @provider.save + flash[:notice] = "Provider added." + redirect_to :action => "index" + end + end + + def delete + end + +end diff --git a/src/app/helpers/provider_controller_helper.rb b/src/app/helpers/provider_controller_helper.rb new file mode 100644 index 0000000..55514eb --- /dev/null +++ b/src/app/helpers/provider_controller_helper.rb @@ -0,0 +1,2 @@ +module ProviderControllerHelper +end diff --git a/src/app/views/layouts/_navigation_tabs.rhtml b/src/app/views/layouts/_navigation_tabs.rhtml index 2fe2ee8..2791132 100644 --- a/src/app/views/layouts/_navigation_tabs.rhtml +++ b/src/app/views/layouts/_navigation_tabs.rhtml @@ -1,4 +1,5 @@ -<% if controller.controller_name == "hardware" %> +<% if 1 ==2 %> +<% if controller.controller_name == "portal_pool" %> <script> $(document).ready(function(){ $tabs = $("#hardware_nav_tabs").tabs({ @@ -51,4 +52,5 @@ <ul id="search_nav_tabs" class="ui-tabs-nav"> <li id="nav_search" class="ui-tabs-selected"><a href="#">Search Results</a></li> </ul> +<% end %> <% end %> \ No newline at end of file diff --git a/src/app/views/layouts/dcloud.rhtml b/src/app/views/layouts/dcloud.rhtml index 0f98f25..c724950 100644 --- a/src/app/views/layouts/dcloud.rhtml +++ b/src/app/views/layouts/dcloud.rhtml @@ -9,6 +9,7 @@  <%# remove me %> <%= stylesheet_link_tag 'layout' %> <%= stylesheet_link_tag 'components' %> + <%= stylesheet_link_tag 'dcloud' %>  @@ -67,7 +68,13 @@ </div> <div id="side"> - fred <%#= render :partial => '/layouts/tree' %> + <%#= render :partial => '/layouts/tree' %> + <%=link_to "Add a provider", :controller => "provider", :action => "new" %> + <ul id="providers"> + <% @providers.each { |provider| %> + <li><%= provider.name %></li> + <% } %> + </ul> </div> <div id="tabs-and-content-container"> diff --git a/src/app/views/provider/delete.html.erb b/src/app/views/provider/delete.html.erb new file mode 100644 index 0000000..b21ec14 --- /dev/null +++ b/src/app/views/provider/delete.html.erb @@ -0,0 +1,2 @@ +<h1>ProviderController#delete</h1> +<p>Find me in app/views/provider_controller/delete.html.erb</p> diff --git a/src/app/views/provider/index.html.erb b/src/app/views/provider/index.html.erb new file mode 100644 index 0000000..acd2676 --- /dev/null +++ b/src/app/views/provider/index.html.erb @@ -0,0 +1,2 @@ +<h1>ProviderController#index</h1> +<p>Find me in app/views/provider_controller/index.html.erb</p> diff --git a/src/app/views/provider/new.html.erb b/src/app/views/provider/new.html.erb new file mode 100644 index 0000000..48c93fd --- /dev/null +++ b/src/app/views/provider/new.html.erb @@ -0,0 +1,11 @@ +<div id="provider_form"> + <%= error_messages_for 'provider' %> + + Add a provider:<br/> + <% form_for :provider do |f| %> + Name: <%= f.text_field :name %><br/> + Type: <%= select_tag :cloud_type, "<option>EC2</option><option>RHEV-M</option>" %><br/> + URL: <%= f.text_field :url %><br/> + <%= submit_tag "Save", :class => "submit" %> + <% end %> +</div> \ No newline at end of file diff --git a/src/app/views/provider/show.html.erb b/src/app/views/provider/show.html.erb new file mode 100644 index 0000000..f1c634a --- /dev/null +++ b/src/app/views/provider/show.html.erb @@ -0,0 +1,2 @@ +<h1>ProviderController#show</h1> +<p>Find me in app/views/provider_controller/show.html.erb</p> diff --git a/src/public/stylesheets/dcloud.css b/src/public/stylesheets/dcloud.css new file mode 100644 index 0000000..0e179f2 --- /dev/null +++ b/src/public/stylesheets/dcloud.css @@ -0,0 +1,8 @@ +#provider_form { + width: 50%; + padding-left: 25%; +} + +#provider_form .submit { + float: right; +} \ No newline at end of file -- 1.6.2.5

1 0

[Libcloud-list] [PATCH server] Fix a couple errors.
by jason.guiditta 19 Aug '09

19 Aug '09

These turned up when I was trying to write a new test, but they surely would cause issues once we were using these classes anyway. STATE_FIXME is just a temporary value until actual is determined. Signed-off-by: Jason Guiditta <jason.guiditta(a)gmail.com> --- src/app/models/cloud_account.rb | 4 ++-- src/app/models/instance.rb | 1 + src/app/models/instance_task.rb | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/app/models/cloud_account.rb b/src/app/models/cloud_account.rb index 29b9ccf..c69c863 100644 --- a/src/app/models/cloud_account.rb +++ b/src/app/models/cloud_account.rb @@ -8,9 +8,9 @@ class CloudAccount < ActiveRecord::Base # has_many :portal_users - validates_presence of :provider_id + validates_presence_of :provider_id validates_presence_of :username - validates_uniqueness_of :username, :scope => provider_id + validates_uniqueness_of :username, :scope => :provider_id validates_presence_of :password end diff --git a/src/app/models/instance.rb b/src/app/models/instance.rb index 7d2cb9b..bc2acb7 100644 --- a/src/app/models/instance.rb +++ b/src/app/models/instance.rb @@ -22,5 +22,6 @@ class Instance < ActiveRecord::Base STATE_PENDING = "pending" STATE_RUNNING = "running" STATE_TERMINATED = "terminated" + STATE_FIXME = "tbd" # what about newly created instances? end diff --git a/src/app/models/instance_task.rb b/src/app/models/instance_task.rb index 66e671c..99b164b 100644 --- a/src/app/models/instance_task.rb +++ b/src/app/models/instance_task.rb @@ -68,7 +68,7 @@ class InstanceTask < Task :running => Instance::STATE_FIXME, :success => Instance::STATE_FIXME, :failure => Instance::STATE_TERMINATED, - :privilege => [Privilege::VM_MODIFY]} } + :privilege => [Privilege::MODIFY]} } def task_obj if self.instance -- 1.6.2.5

1 0

[Libcloud-list] [PATCH server] Gut taskomatic
by Ian Main 19 Aug '09

19 Aug '09

This change guts all the unrelated stuff out of taskomatic for dcloud. It also makes it so new tasks are implemented in classes to allow for multithreading to be easier at a later date. Signed-off-by: Ian Main <imain(a)redhat.com> --- src/task-omatic/instance.rb | 30 ++ src/task-omatic/task_storage.rb | 374 ----------------- src/task-omatic/task_vm.rb | 152 ------- src/task-omatic/taskomatic.rb | 795 +----------------------------------- src/task-omatic/taskomatic_task.rb | 29 ++ 5 files changed, 67 insertions(+), 1313 deletions(-) create mode 100644 src/task-omatic/instance.rb delete mode 100644 src/task-omatic/task_storage.rb delete mode 100644 src/task-omatic/task_vm.rb create mode 100644 src/task-omatic/taskomatic_task.rb diff --git a/src/task-omatic/instance.rb b/src/task-omatic/instance.rb new file mode 100644 index 0000000..287b7bb --- /dev/null +++ b/src/task-omatic/instance.rb @@ -0,0 +1,30 @@ +# Copyright (C) 2009 Red Hat, Inc. +# Written by Ian Main <imain(a)redhat.com> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301, USA. A copy of the GNU General Public License is +# also available at http://www.gnu.org/copyleft/gpl.html. + +require 'taskomatic_task' + +# Create a new instance on a cloud. +class InstanceTaskCreate < TaskomaticTask + + def initialize(logger) + super(logger) + @logger.info("InstanceTaskCreate started.") + end + +end + diff --git a/src/task-omatic/task_storage.rb b/src/task-omatic/task_storage.rb deleted file mode 100644 index 77b0166..0000000 --- a/src/task-omatic/task_storage.rb +++ /dev/null @@ -1,374 +0,0 @@ -# Copyright (C) 2008 Red Hat, Inc. -# Written by Chris Lalancette <clalance(a)redhat.com> -# and Ian Main <imain(a)redhat.com> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -# MA 02110-1301, USA. A copy of the GNU General Public License is -# also available at http://www.gnu.org/copyleft/gpl.html. - -require 'libvirt' -require 'rexml/document' -include REXML - -def String.random_alphanumeric(size=16) - s = "" - size.times { s << (i = Kernel.rand(62); i += ((i < 10) ? 48 : ((i < 36) ? 55 : 61 ))).chr } - s -end - -def get_libvirt_lvm_pool_from_volume(db_volume, logger) - phys_volume = StorageVolume.find(:first, :conditions => - ["lvm_pool_id = ?", db_volume.storage_pool_id]) - - return LibvirtPool.factory(phys_volume.storage_pool, logger) -end - - -def task_storage_cobbler_setup(db_vm) - - image_volume = nil - - if (db_vm.boot_device == Vm::BOOT_DEV_CDROM) && - db_vm.uses_cobbler? && (db_vm.cobbler_type == Vm::IMAGE_PREFIX) - - details = Cobbler::Image.find_one(db_vm.cobbler_name) - raise "Image #{vm.cobbler_name} not found in Cobbler server" unless details - - # extract the components of the image filename - image_uri = details.file - protocol = auth = ip_addr = export_path = filename = "" - - protocol, image_uri = image_uri.split("://") if image_uri.include?("://") - auth, image_uri = image_uri.split("@") if image_uri.include?("@") - - # it's ugly, but string.split returns an empty string as the first - # result here, so we'll just ignore it - ignored, ip_addr, image_uri = - image_uri.split(/^([^\/]+)(\/.*)/) unless image_uri =~ /^\// - ignored, export_path, filename = - image_uri.split(/^(.*)\/(.+)/) - - found = false - - db_vm.storage_volumes.each do |volume| - if volume.filename == filename - if (volume.storage_pool.ip_addr == ip_addr) && - (volume.storage_pool.export_path == export_path) - found = true - end - end - end - - unless found - # Create a new transient NFS storage volume - # This volume is *not* persisted. - image_volume = StorageVolume.factory("NFS", :filename => filename) - - image_volume.storage_pool - image_pool = StoragePool.factory(StoragePool::NFS) - - image_pool.ip_addr = ip_addr - image_pool.export_path = export_path - image_pool.storage_volumes << image_volume - image_volume.storage_pool = image_pool - end - end - - return image_volume -end - -class LibvirtPool - - attr_reader :remote_pool - - def initialize(type, name = nil, logger = nil) - @remote_pool = nil - @build_on_start = true - @remote_pool_defined = false - @remote_pool_started = false - @logger = logger - - if name == nil - @name = type + "-" + String.random_alphanumeric - else - @name = name - end - - @xml = Document.new - @xml.add_element("pool", {"type" => type}) - - @xml.root.add_element("name").add_text(@name) - - @xml.root.add_element("source") - - @xml.root.add_element("target") - @xml.root.elements["target"].add_element("path") - end - - def connect(session, node) - pools = session.objects(:class => 'pool', 'node' => node.object_id) - pools.each do |pool| - result = pool.getXMLDesc - raise "Error getting xml description of pool: #{result.text}" unless result.status == 0 - - xml_desc = result.description - if self.xmlequal?(Document.new(xml_desc).root) - @remote_pool = pool - @logger.debug("Found existing storage pool #{pool.name} on host: #{node.hostname}") - break - end - end - - if @remote_pool == nil - @logger.debug("Defining new storage pool: #{(a)xml.to_s} on host: #{node.hostname}") - result = node.storagePoolDefineXML((a)xml.to_s, :timeout => 60 * 10) - raise "Error creating pool: #{result.text}" unless result.status == 0 - @remote_pool = session.object(:object_id => result.pool) - raise "Error finding newly created remote pool." unless @remote_pool - - # we need this because we don't want to "build" LVM pools, which would - # destroy existing data - if @build_on_start - @logger.debug("Building remote pool #{(a)remote_pool.name}") - result = @remote_pool.build(:timeout => 60 * 10) - raise "Error building pool: #{result.text}" unless result.status == 0 - end - @remote_pool_defined = true - end - - # FIXME: I'm not sure.. it seems like there could be other things going on - # with the storage pool state. State can be inactive, building, running - # or degraded. I think some more thought should go here to make sure - # we're doing things right in each state. - - if @remote_pool.state == "inactive" - # only try to start the pool if it is currently inactive; in all other - # states, assume it is already running - result = @remote_pool.create(:timeout => 60 * 10) - raise "Error defining pool: #{result.text}" unless result.status == 0 - - # Refresh qpid object with new properties. - @remote_pool.update - - @remote_pool_started = true - end - - # Refresh the remote pool requesting that it rescan its volumes. Putting - # it here means it will call this every time we connect to a pool from - # taskomatic. This includes when starting a VM which is probably the most - # important time. - result = @remote_pool.refresh - puts "Error refreshing storage pool: #{result.text}" unless result.status == 0 - end - - def create_vol(type, name, size, owner, group, mode) - @vol_xml = Document.new - @vol_xml.add_element("volume", {"type" => type}) - @vol_xml.root.add_element("name").add_text(name) - @vol_xml.root.add_element("capacity", {"unit" => "K"}).add_text(size.to_s) - @vol_xml.root.add_element("target") - @vol_xml.root.elements["target"].add_element("permissions") - @vol_xml.root.elements["target"].elements["permissions"].add_element("owner").add_text(owner) if owner - @vol_xml.root.elements["target"].elements["permissions"].add_element("group").add_text(group) if group - @vol_xml.root.elements["target"].elements["permissions"].add_element("mode").add_text(mode) if mode - end - - def shutdown - if @remote_pool_started - result = @remote_pool.destroy - end - if @remote_pool_defined - result = @remote_pool.undefine - end - end - - def xmlequal?(docroot) - return false - end - - def self.factory(pool, logger) - if pool[:type] == "IscsiStoragePool" - return IscsiLibvirtPool.new(pool.ip_addr, pool[:target], pool[:port], logger) - elsif pool[:type] == "NfsStoragePool" - return NFSLibvirtPool.new(pool.ip_addr, pool.export_path, logger) - elsif pool[:type] == "GlusterfsStoragePool" - return GLUSTERFSLibvirtPool.new(pool.ip_addr, pool.export_path, logger) - elsif pool[:type] == "LvmStoragePool" - # OK, if this is LVM storage, there are two cases we need to care about: - # 1) this is a LUN with LVM already on it. In this case, all we need to - # do is to create a new LV (== libvirt volume), and be done with it - # 2) this LUN is blank, so there is no LVM on it already. In this - # case, we need to pvcreate, vgcreate first (== libvirt pool build), - # and *then* create the new LV (== libvirt volume) on top of that. - # - # We can tell the difference between an LVM Pool that exists and one - # that needs to be created based on the value of the pool.state; - # if it is PENDING_SETUP, we need to create it first - phys_volume = StorageVolume.find(:first, :conditions => - [ "lvm_pool_id = ?", pool.id]) - return LVMLibvirtPool.new(pool.vg_name, phys_volume.path, - pool.state == StoragePool::STATE_PENDING_SETUP, logger) - else - raise "Unknown storage pool type " + pool[:type].to_s - end - end -end - -class IscsiLibvirtPool < LibvirtPool - def initialize(ip_addr, target, port, logger) - mount = "#{ip_addr}-#{target}-#{port}" - super('iscsi', mount, logger) - - @type = 'iscsi' - @ipaddr = ip_addr - @target = target - - @xml.root.elements["source"].add_element("host", {"name" => @ipaddr}) - @xml.root.elements["source"].add_element("device", {"path" => @target}) - - @xml.root.elements["target"].elements["path"].text = "/dev/disk/by-id" - end - - def xmlequal?(docroot) - return (docroot.attributes['type'] == @type and - docroot.elements['source'].elements['host'].attributes['name'] == @ipaddr and - docroot.elements['source'].elements['device'].attributes['path'] == @target) - end -end - -class NFSLibvirtPool < LibvirtPool - def initialize(ip_addr, export_path, logger) - target = "#{ip_addr}-#{export_path.tr('/', '_')}" - super('netfs', target, logger) - - @type = 'netfs' - @host = ip_addr - @remote_path = export_path - - @xml.root.elements["source"].add_element("host", {"name" => @host}) - @xml.root.elements["source"].add_element("dir", {"path" => @remote_path}) - @xml.root.elements["source"].add_element("format", {"type" => "nfs"}) - - @xml.root.elements["target"].elements["path"].text = "/mnt/" + @name - end - - def create_vol(name, size, owner, group, mode) - # FIXME: this can actually take some time to complete (since we aren't - # doing sparse allocations at the moment). During that time, whichever - # libvirtd we chose to use is completely hung up. The solution is 3-fold: - # 1. Allow sparse allocations in the WUI front-end - # 2. Make libvirtd multi-threaded - # 3. Make taskomatic multi-threaded - super("netfs", name, size, owner, group, mode) - - # FIXME: we have to add the format as raw here because of a bug in libvirt; - # if you specify a volume with no format, it will crash libvirtd - @vol_xml.root.elements["target"].add_element("format", {"type" => "raw"}) - - # FIXME: Add allocation 0 element so that we create a sparse file. - # This was done because qmf was timing out waiting for the create - # operation to complete. This needs to be fixed in a better way - # however. We want to have non-sparse files for performance reasons. - @vol_xml.root.add_element("allocation").add_text('0') - - @logger.debug("Creating new volume on pool #{(a)remote_pool.name} - XML: #{(a)vol_xml.to_s}") - result = @remote_pool.createVolumeXML(@vol_xml.to_s) - raise "Error creating remote pool: #{result.text}" unless result.status == 0 - return result.volume - end - - def xmlequal?(docroot) - return (docroot.attributes['type'] == @type and - docroot.elements['source'].elements['host'].attributes['name'] == @host and - docroot.elements['source'].elements['dir'].attributes['path'] == @remote_path) - end -end - -class GLUSTERFSLibvirtPool < LibvirtPool - def initialize(ip_addr, export_path, logger) - target = "#{ip_addr}-#{export_path.tr('/', '_')}" - super('netfs', target, logger) - - @type = 'netfs' - @host = ip_addr - @remote_vol = export_path - - @xml.root.elements["source"].add_element("host", {"name" => @host}) - @xml.root.elements["source"].add_element("dir", {"path" => @remote_vol}) - @xml.root.elements["source"].add_element("format", {"type" => "glusterfs"}) - - @xml.root.elements["target"].elements["path"].text = "/mnt/" + @name - end - - def create_vol(name, size, owner, group, mode) - # FIXME: this can actually take some time to complete (since we aren't - # doing sparse allocations at the moment). During that time, whichever - # libvirtd we chose to use is completely hung up. The solution is 3-fold: - # 1. Allow sparse allocations in the WUI front-end - # 2. Make libvirtd multi-threaded - # 3. Make taskomatic multi-threaded - super("netfs", name, size, owner, group, mode) - - # FIXME: we have to add the format as raw here because of a bug in libvirt; - # if you specify a volume with no format, it will crash libvirtd - @vol_xml.root.elements["target"].add_element("format", {"type" => "qcow2"}) - - # FIXME: Add allocation 0 element so that we create a sparse file. - # This was done because qmf was timing out waiting for the create - # operation to complete. This needs to be fixed in a better way - # however. We want to have non-sparse files for performance reasons. - @vol_xml.root.add_element("allocation").add_text('0') - - @logger.debug("Creating new volume on pool #{(a)remote_pool.name} - XML: #{(a)vol_xml.to_s}") - result = @remote_pool.createVolumeXML(@vol_xml.to_s) - raise "Error creating remote pool: #{result.text}" unless result.status == 0 - return result.volume - end - - def xmlequal?(docroot) - return (docroot.attributes['type'] == @type and - docroot.elements['source'].elements['host'].attributes['name'] == @host and - docroot.elements['source'].elements['dir'].attributes['path'] == @remote_vol) - end -end - -class LVMLibvirtPool < LibvirtPool - def initialize(vg_name, device, build_on_start, logger) - super('logical', vg_name, logger) - - @type = 'logical' - @build_on_start = build_on_start - - @xml.root.elements["source"].add_element("name").add_text(@name) - @xml.root.elements["source"].add_element("device", {"path" => device}) - @xml.root.elements["target"].elements["path"].text = "/dev/" + @name - end - - def create_vol(name, size, owner, group, mode) - super("logical", name, size, owner, group, mode) - - @logger.debug("Creating new volume on pool #{(a)remote_pool.name} - XML: #{(a)vol_xml.to_s}") - result = @remote_pool.createVolumeXML(@vol_xml.to_s) - raise "Error creating remote pool: #{result.text}" unless result.status == 0 - return result.volume - end - - def xmlequal?(docroot) - return (docroot.attributes['type'] == @type and - docroot.elements['name'].text == @name and - docroot.elements['source'].elements['name'] and - docroot.elements['source'].elements['name'].text == @name) - end -end - diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb deleted file mode 100644 index dd71747..0000000 --- a/src/task-omatic/task_vm.rb +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright (C) 2008 Red Hat, Inc. -# Written by Chris Lalancette <clalance(a)redhat.com> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -# MA 02110-1301, USA. A copy of the GNU General Public License is -# also available at http://www.gnu.org/copyleft/gpl.html. - -require 'rexml/document' -include REXML - -gem 'cobbler' -require 'cobbler' - -def find_host(host_id) - host = Host.find(:first, :conditions => [ "id = ?", host_id]) - - if host == nil - # Hm, we didn't find the host_id. Seems odd. Return a failure - raise "Could not find host_id " + host_id.to_s - end - - return host -end - - -def create_vm_xml(name, uuid, memAllocated, memUsed, vcpus, bootDevice, - net_interfaces, diskDevices) - doc = Document.new - - doc.add_element("domain", {"type" => "kvm"}) - - doc.root.add_element("name").add_text(name) - - doc.root.add_element("uuid").add_text(uuid) - - doc.root.add_element("memory").add_text(memAllocated.to_s) - - doc.root.add_element("currentMemory").add_text(memUsed.to_s) - - doc.root.add_element("vcpu").add_text(vcpus.to_s) - - doc.root.add_element("os") - doc.root.elements["os"].add_element("type").add_text("hvm") - doc.root.elements["os"].add_element("boot", {"dev" => bootDevice}) - - doc.root.add_element("clock", {"offset" => "utc"}) - - doc.root.add_element("on_poweroff").add_text("destroy") - - doc.root.add_element("on_reboot").add_text("restart") - - doc.root.add_element("on_crash").add_text("destroy") - - doc.root.add_element("devices") - doc.root.elements["devices"].add_element("emulator").add_text("/usr/bin/qemu-kvm") - - devs = ['hda', 'hdb', 'hdc', 'hdd'] - which_device = 0 - diskDevices.each do |disk| - is_cdrom = (disk =~ /\.iso/) ? true : false - - diskdev = Element.new("disk") - diskdev.add_attribute("type", is_cdrom ? "file" : "block") - diskdev.add_attribute("device", is_cdrom ? "cdrom" : "disk") - - if is_cdrom - diskdev.add_element("readonly") - diskdev.add_element("source", {"file" => disk}) - diskdev.add_element("target", {"dev" => devs[which_device], "bus" => "ide"}) - else - diskdev.add_element("source", {"dev" => disk}) - diskdev.add_element("target", {"dev" => devs[which_device]}) - end - - doc.root.elements["devices"] << diskdev - which_device += 1 - end - - net_interfaces.each { |nic| - interface = Element.new("interface") - interface.add_attribute("type", "bridge") - interface.add_element("mac", {"address" => nic[:mac]}) - interface.add_element("source", {"bridge" => nic[:interface]}) - doc.root.elements["devices"] << interface - } - - doc.root.elements["devices"].add_element("input", {"type" => "mouse", "bus" => "ps2"}) - doc.root.elements["devices"].add_element("graphics", {"type" => "vnc", "port" => "-1", "listen" => "0.0.0.0"}) - - doc.root.add_element("features") - doc.root.elements["features"].add_element("acpi") - doc.root.elements["features"].add_element("apic") - - serial = Element.new("serial") - serial.add_attribute("type", "pty") - serial.add_element("target", {"port" => "0"}) - doc.root.elements["devices"] << serial - - return doc -end - -def set_vm_state(vm, state) - vm.reload - vm.state = state - vm.save! -end - -def set_vm_vnc_port(vm, xml_desc) - doc = REXML::Document.new(xml_desc) - attrib = REXML::XPath.match(doc, "//graphics/@port") - if not attrib.empty?: - vm.vnc_port = attrib.to_s.to_i - end - vm.save! -end - -def find_vm(task, fail_on_nil_host_id = true) - # find the matching VM in the vms table - vm = task.vm - - if vm == nil - raise "VM #{task.vm} not found for task #{task.id}" - end - - if vm.host_id == nil && fail_on_nil_host_id - raise "No host_id for VM " + vm.id.to_s - end - - return vm -end - -def set_vm_shut_down(vm) - vm.host_id = nil - vm.memory_used = nil - vm.num_vcpus_used = nil - vm.state = Vm::STATE_STOPPED - vm.needs_restart = nil - vm.vnc_port = nil - vm.save! -end - diff --git a/src/task-omatic/taskomatic.rb b/src/task-omatic/taskomatic.rb index 96b2ec4..0e8711e 100755 --- a/src/task-omatic/taskomatic.rb +++ b/src/task-omatic/taskomatic.rb @@ -23,7 +23,6 @@ $: << File.join(File.dirname(__FILE__), "../dutils") $: << File.join(File.dirname(__FILE__), ".") require 'rubygems' -require 'qpid' require 'monitor' require 'dutils' require 'optparse' @@ -31,8 +30,7 @@ require 'daemons' require 'logger' include Daemonize -require 'task_vm' -require 'task_storage' +require 'instance' # This sad and pathetic readjustment to ruby logger class is # required to fix the formatting because rails does the same @@ -102,769 +100,14 @@ class TaskOmatic # # For now I'm going to always enable debugging until we do a real release. @logger.level = Logger::DEBUG - - ensure_credentials - - server, port = nil - sleepy = 5 - while true do - server, port = get_srv('qpidd', 'tcp') - break if server - @logger.error "Unable to determine qpid server from DNS SRV record, retrying.." if not server - sleep(sleepy) - sleepy *= 2 if sleepy < 120 - end - - @session = Qpid::Qmf::Session.new(:manage_connections => true) - @logger.info "Connecting to amqp://#{server}:#{port}" - @broker = @session.add_broker("amqp://#{server}:#{port}", :mechanism => 'GSSAPI') - - end - - def ensure_credentials() - get_credentials('qpidd') - get_credentials('libvirt') - - Thread.new do - while true do - sleep(3600) - get_credentials('qpidd') - get_credentials('libvirt') - end - end - end - - def find_capable_host(db_vm) - possible_hosts = [] - - # FIXME: There may be a bug here in that a host that's already running the - # vm won't be returned. I think that's supposed to be for migration - # but it could break creation of VMs in certain conditions.. - - vm = @session.object(:class => "domain", 'uuid' => db_vm.uuid) - - db_vm.vm_resource_pool.get_hardware_pool.hosts.each do |curr| - # Now each of 'curr' is in the right hardware pool.. - # now we check them out. - - node = @session.object(:class => "node", 'hostname' => curr.hostname) - next unless node - - # So now we expect if the node was found it's alive and well, then - # we check to make sure there's enough real cores for the number of - # vcpus, the node memory is adequate, the node is not disabled in the - # database, and if the node id is nil or if it is already running - # (has a node id set) then it is probably looking to migrate so we - # find a node that is not the current node. - # - # In the future we could add load or similar checks here. - - #puts "checking node, #{node.cores} >= #{db_vm.num_vcpus_allocated}," - #puts "and #{node.memory} >= #{db_vm.memory_allocated}" - #puts "and not #{curr.is_disabled.nil?} and #{curr.is_disabled == 0}" - #puts "and #{vm ? vm : 'nil'} or #{vm ? vm.active : 'nil'}) or #{vm ? vm.node : 'nil'} != #{node.object_id}" - - if node and node.cores >= db_vm.num_vcpus_allocated \ - and node.memory >= db_vm.memory_allocated \ - and not curr.is_disabled.nil? and curr.is_disabled == 0 \ - and ((!vm or vm.active == 'false') or vm.node != node.object_id) - # FIXME ensure host is on all networks a vm's assigned to - # db_vm.nics.each { |nic| ignore if nic.network ! in host } - possible_hosts.push(curr) - end - end - - #puts "possible_hosts.length = #{possible_hosts.length}" - if possible_hosts.length == 0 - # we couldn't find a host that matches this criteria - raise "No host matching VM parameters could be found" - end - - # Right now we're just picking the nth host, we could also look at - # how many vms are already on it, or the load of the hosts etc. - host = possible_hosts[@nth_host % possible_hosts.length] - @nth_host += 1 - - return host - end - - def connect_storage_pools(node, storage_volumes) - storagedevs = [] - storage_volumes.each do |db_volume| - # here, we need to iterate through each volume and possibly attach it - # to the host we are going to be using - db_pool = db_volume.storage_pool - if db_pool == nil - # Hum. Specified by the VM description, but not in the storage pool? - # continue on and hope for the best - @logger.error "Couldn't find pool for volume #{db_volume.path}; skipping" - next - end - - # we have to special case LVM pools. In that case, we need to first - # activate the underlying physical device, and then do the logical one - if db_volume[:type] == "LvmStorageVolume" - phys_libvirt_pool = get_libvirt_lvm_pool_from_volume(db_volume, @logger) - phys_libvirt_pool.connect(@session, node) - end - - @logger.debug "Verifying mount of pool #{db_pool.ip_addr}:#{db_pool.type}:#{db_pool.target}:#{db_pool.export_path}" - libvirt_pool = LibvirtPool.factory(db_pool, @logger) - libvirt_pool.connect(@session, node) - - # OK, the pool should be all set. The last thing we need to do is get - # the path based on the volume key - - volume_key = db_volume.key - pool = libvirt_pool.remote_pool - - @logger.debug "Pool mounted: #{pool.name}; state: #{pool.state}" - - volume = @session.object(:class => 'volume', - 'key' => volume_key, - 'storagePool' => pool.object_id) - raise "Unable to find volume #{volume_key} attached to pool #{pool.name}." unless volume - @logger.debug "Verified volume of pool #{volume.path}" - - storagedevs << volume.path - end - - return storagedevs - end - - def task_create_vm(task) - @logger.info "starting task_create_vm" - # This is mostly just a place holder. - vm = find_vm(task, false) - if vm.state != Vm::STATE_PENDING - raise "VM not pending" - end - vm.state = Vm::STATE_STOPPED - vm.save! - end - - def teardown_storage_pools(node) - - # This is rather silly because we only destroy pools if there are no - # more vms on the node. We should be reference counting the pools - # somehow so we know when they are no longer in use. - vms = @session.objects(:class => 'domain', 'node' => node.object_id) - if vms.length > 0 - return - end - pools = @session.objects(:class => 'pool', 'node' => node.object_id) - - # We do this in two passes, first undefine/destroys LVM pools, then - # we do physical pools. - pools.each do |pool| - # libvirt-qpid sets parentVolume to the name of the parent volume - # if this is an LVM pool, else it leaves it empty. - if pool.parentVolume != '' - result = pool.destroy(:timeout => 60 * 2) - result = pool.undefine(:timeout => 60 * 2) - end - end - - pools.each do |pool| - result = pool.destroy(:timeout => 60 * 2) - result = pool.undefine(:timeout => 60 * 2) - end - end - - - def task_shutdown_or_destroy_vm(task, action) - @logger.info "starting task_shutdown_or_destroy_vm" - db_vm = task.vm - vm = @session.object(:class => 'domain', 'uuid' => db_vm.uuid) - if !vm - @logger.error "VM already shut down?" - return - end - - node = @session.object(:object_id => vm.node) - raise "Unable to get node that vm is on??" unless node - - if vm.state == "shutdown" or vm.state == "shutoff" - result = vm.undefine - if result.status == 0 - @logger.info "Deleted VM #{db_vm.description}." - teardown_storage_pools(node) - end - return - elsif vm.state == "suspended" - raise "Cannot shutdown suspended domain" - elsif vm.state == "saved" - raise "Cannot shutdown saved domain" - end - - if action == :shutdown - result = vm.shutdown - @logger.info "shutdown - result.status is #{result.status}" - raise "Error shutting down VM: #{result.text}" unless result.status == 0 - elsif action == :destroy - result = vm.destroy - @logger.info "destroy - result.status is #{result.status}" - raise "Error destroying VM: #{result.text}" unless result.status == 0 - end - - # undefine can fail, for instance, if we live migrated from A -> B, and - # then we are shutting down the VM on B (because it only has "transient" - # XML). Therefore, just ignore undefine errors so we do the rest - # FIXME: we really should have a marker in the database somehow so that - # we can tell if this domain was migrated; that way, we can tell the - # difference between a real undefine failure and one because of migration - # - # We only set the vm to shutdown if the undefine succeeds. Otherwise, - # dbomatic will pick up any state changes. doing a 'shutdown' rather - # than destroy for instance can possibly take quite some time. - result = vm.undefine - if result.status == 0 - @logger.info "Deleted VM #{db_vm.description}." - set_vm_shut_down(db_vm) - teardown_storage_pools(node) - else - @logger.info "Error undefining VM: #{result.text}" unless result.status == 0 - end - end - - def task_start_vm(task) - @logger.info "starting task_start_vm" - db_vm = find_vm(task, false) - - vm = @session.object(:class => "domain", 'uuid' => db_vm.uuid) - - if vm - case vm.state - when "running" - return - when "blocked" - raise "Virtual machine state is blocked, cannot start VM." - when "paused" - raise "Virtual machine is currently paused, cannot start, must resume." - end - end - db_host = find_capable_host(db_vm) - - node = @session.object(:class => "node", 'hostname' => db_host.hostname) - - raise "Unable to find host #{db_host.hostname} to create VM on." unless node - @logger.info("VM will be started on node #{node.hostname}") - - image_volume = task_storage_cobbler_setup(db_vm) - - # FIXME: I know this part is broken.. - # - # hrrm, who wrote this comment and why is it broken? - Ian - volumes = [] - volumes += db_vm.storage_volumes - volumes << image_volume if image_volume - - @logger.debug("Connecting volumes: #{volumes}") - storagedevs = connect_storage_pools(node, volumes) - - # loop through each nic/network assigned to vm, - # finding necessary host devices to bridge - net_interfaces = [] - db_vm.nics.each { |nic| - device = net_device = nil - if nic.network.class == PhysicalNetwork - device = Nic.find(:first, - :conditions => ["host_id = ? AND network_id = ?", - db_host.id, nic.network_id ]) - else - device = Bonding.find(:first, - :conditions => ["host_id = ? AND vlan_id = ?", - db_host.id, nic.network_id ]) - end - - unless device.nil? - net_device = "br" + device.interface_name - else - net_device = "breth0" # FIXME remove this default at some point - end - net_interfaces.push({ :mac => nic.mac, :interface => net_device }) - } - - xml = create_vm_xml(db_vm.description, db_vm.uuid, db_vm.memory_allocated, - db_vm.memory_used, db_vm.num_vcpus_allocated, db_vm.boot_device, - net_interfaces, storagedevs) - - @logger.debug("XML Domain definition: #{xml}") - - result = node.domainDefineXML(xml.to_s) - raise "Error defining virtual machine: #{result.text}" unless result.status == 0 - - domain = @session.object(:object_id => result.domain) - raise "Cannot find domain on host #{db_host.hostname}, cannot start virtual machine." unless domain - - result = domain.create - if result.status != 0 - domain.undefine - raise "Error creating virtual machine: #{result.text}" - end - - result = domain.getXMLDesc - - # Reget the db record or you can get 'dirty' errors. This can happen in a number - # of places so you'll see a lot of .reloads. - db_vm.reload - set_vm_vnc_port(db_vm, result.description) unless result.status != 0 - - # This information is not available via the libvirt interface. - db_vm.memory_used = db_vm.memory_allocated - db_vm.boot_device = Vm::BOOT_DEV_HD - db_vm.host_id = db_host.id - db_vm.save! - - # We write the new state here even though dbomatic will set it soon anyway. - # This is just to let the UI know that it's good to go right away and really - # dbomatic will just write the same thing over top of it soon enough. - db_vm.state = Vm::STATE_RUNNING - db_vm.save! - end - - def task_suspend_vm(task) - @logger.info "starting task_suspend_vm" - db_vm = task.vm - dom = @session.object(:class => 'domain', 'uuid' => db_vm.uuid) - raise "Unable to locate VM to suspend" unless dom - - if dom.state != "running" and dom.state != "blocked" - raise "Cannot suspend domain in state #{dom.state}" - end - - result = dom.suspend - raise "Error suspending VM: #{result.text}" unless result.status == 0 - - db_vm.reload - db_vm.state = Vm::STATE_SUSPENDED - db_vm.save! - end - - def task_resume_vm(task) - @logger.info "starting task_resume_vm" - db_vm = task.vm - dom = @session.object(:class => 'domain', 'uuid' => db_vm.uuid) - raise "Unable to locate VM to resume" unless dom - - if dom.state == "running" - # the VM is already suspended; just return success - return - elsif dom.state != "paused" - raise "Cannot suspend domain in state #{dom.state}" - end - - result = dom.resume - raise "Error resuming VM: #{result.text}" unless result.status == 0 - - db_vm.reload - db_vm.state = Vm::STATE_RUNNING - db_vm.save! - end - - def task_save_vm(task) - @logger.info "starting task_save_vm" - - # FIXME: This task is actually very broken. It saves to a local - # disk on the node which could be volatile memory, and there is no - # differentiation of a 'saved' vm in libvirt which makes it so we - # really have no way of knowing when a domain is 'saved'. We - # need to put it on the storage server and mark it in the database - # where the image is stored. - db_vm = task.vm - dom = @session.object(:class => 'domain', 'uuid' => db_vm.uuid) - raise "Unable to locate VM to save" unless dom - - filename = "/tmp/#{dom.uuid}.save" - @logger.info "saving vm #{dom.name} to #{filename}" - result = dom.save(filename) - raise "Error saving VM: #{result.text}" unless result.status == 0 - - db_vm.reload - set_vm_state(db_vm, Vm::STATE_SAVED) - end - - def task_restore_vm(task) - @logger.info "starting task_restore_vm" - - # FIXME: This is also broken, see task_save_vm FIXME. - db_vm = task.vm - dom = @session.object(:class => 'domain', 'uuid' => db_vm.uuid) - raise "Unable to locate VM to restore" unless dom - - filename = "/tmp/#{dom.uuid}.save" - @logger.info "restoring vm #{dom.name} from #{filename}" - result = dom.restore("/tmp/" + dom.uuid + ".save") - raise "Error restoring VM: #{result.text}" unless result.status == 0 - - set_vm_state(db_vm, Vm::STATE_RUNNING) - end - - def migrate(db_vm, dest = nil) - - vm = @session.object(:class => "domain", 'uuid' => db_vm.uuid) - raise "Unable to find VM to migrate" unless vm - src_node = @session.object(:object_id => vm.node) - raise "Unable to find node that VM is on??" unless src_node - - @logger.info "Migrating domain lookup complete, domain is #{vm}" - - vm_orig_state = db_vm.state - set_vm_state(db_vm, Vm::STATE_MIGRATING) - - begin - unless dest.nil? or dest.empty? - if dest.to_i == db_vm.host_id - raise "Cannot migrate from host " + src_node.hostname + " to itself!" - end - db_dst_host = find_host(dest.to_i) - else - db_dst_host = find_capable_host(db_vm) - end - - dest_node = @session.object(:class => 'node', 'hostname' => db_dst_host.hostname) - raise "Unable to find host #{db_dst_host.hostname} to migrate to." unless dest_node - - volumes = [] - volumes += db_vm.storage_volumes - @logger.debug("Connecting volumes: #{volumes}") - connect_storage_pools(dest_node, volumes) - - # Sadly migrate with qpid is broken because it requires a connection between - # both nodes and currently that can't happen securely. For now we do it - # the old fashioned way.. - src_uri = "qemu+tcp://" + src_node.hostname + "/system" - dest_uri = "qemu+tcp://" + dest_node.hostname + "/system" - @logger.debug("Migrating from #{src_uri} to #{dest_uri}") - - result = vm.migrate(dest_uri, Libvirt::Domain::MIGRATE_LIVE, '', '', 0, :timeout => 60 * 10) - @logger.error "Error migrating VM: #{result.text}" unless result.status == 0 - - # undefine can fail, for instance, if we live migrated from A -> B, and - # then we are shutting down the VM on B (because it only has "transient" - # XML). Therefore, just ignore undefine errors so we do the rest - # FIXME: we really should have a marker in the database somehow so that - # we can tell if this domain was migrated; that way, we can tell the - # difference between a real undefine failure and one because of migration - result = vm.undefine - - @logger.info "Couldn't undefine old vm after migrate (probably fine): #{result.text}" unless result.status == 0 - - # See if we can take down storage pools on the src host. - teardown_storage_pools(src_node) - rescue => ex - @logger.error "Error: #{ex}" - set_vm_state(db_vm, vm_orig_state) - raise ex - end - - db_vm.reload - db_vm.state = Vm::STATE_RUNNING - db_vm.host_id = db_dst_host.id - db_vm.save! - end - - def task_migrate_vm(task) - @logger.info "starting task_migrate_vm" - - # here, we are given an id for a VM to migrate; we have to lookup which - # physical host it is running on - vm = find_vm(task) - migrate(vm, task.args) - end - - def storage_find_suitable_host(hardware_pool) - # find all of the hosts in the same pool as the storage - hardware_pool.hosts.each do |host| - @logger.info "storage_find_suitable_host: host #{host.hostname} uuid #{host.uuid}" - @logger.info "host.is_disabled is #{host.is_disabled}" - if host.is_disabled.to_i != 0 - @logger.info "host #{host.hostname} is disabled" - next - end - puts "searching for node with hostname #{host.hostname}" - node = @session.object(:class => 'node', 'hostname' => host.hostname) - puts "node returned is #{node}" - return node if node - end - - raise "Could not find a host within this storage pool to scan the storage server." - end - - def add_volume_to_db(db_pool, volume, owner = nil, group = nil, mode = nil) - storage_volume = StorageVolume.factory(db_pool.get_type_label) - storage_volume.path = volume.path - storage_volume.size = volume.capacity / 1024 - storage_volume.storage_pool_id = db_pool.id - storage_volume.write_attribute(storage_volume.volume_name, volume.name) - storage_volume.key = volume.key - storage_volume.lv_owner_perms = owner - storage_volume.lv_group_perms = group - storage_volume.lv_mode_perms = mode - storage_volume.state = StorageVolume::STATE_AVAILABLE - @logger.info "saving storage volume to db." - storage_volume.save! - end - - # The words "pool" and "volume" are ridiculously overloaded in our context. - # Therefore, the refresh_pool method adopts this convention: - # db_pool_phys: The underlying physical storage pool, as it is represented in - # the database - # phys_libvirt_pool: The underlying physical storage, as it is represented in - # libvirt - # db_lvm_pool: The logical storage pool (if it exists), as it is represented - # in the database - # lvm_libvirt_pool: The logical storage pool (if it exists), as it is - # represented in the database - - def task_refresh_pool(task) - @logger.info "starting task_refresh_pool" - - db_pool_phys = task.storage_pool - raise "Could not find storage pool" unless db_pool_phys - - node = storage_find_suitable_host(db_pool_phys.hardware_pool) - # FIXME: this is currently broken if you do something like: - # 1. Add an iscsi pool with 3 volumes (lun-1, lun-2, lun-3) - # 2. Scan it in - # 3. Remove lun-3 from the pool - # 4. Re-scan it - # What will happen is that you will still have lun-3 available in the - # database, even though it's not available in the pool anymore. It's a - # little tricky, though; we have to make sure that we don't pull the - # database entry out from underneath a possibly running VM (or do we?) - begin - @logger.info("refresh being done on node #{node.hostname}") - - phys_libvirt_pool = LibvirtPool.factory(db_pool_phys, @logger) - phys_libvirt_pool.connect(@session, node) - db_pool_phys.state = StoragePool::STATE_AVAILABLE - db_pool_phys.save! - - begin - # First we do the physical volumes. - volumes = @session.objects(:class => 'volume', - 'storagePool' => phys_libvirt_pool.remote_pool.object_id) - volumes.each do |volume| - storage_volume = StorageVolume.factory(db_pool_phys.get_type_label) - - existing_vol = StorageVolume.find(:first, :conditions => - ["storage_pool_id = ? AND key = ?", - db_pool_phys.id, volume.key]) - - puts "Existing volume is #{existing_vol}, searched for storage volume key and #{volume.key}" - # Only add if it's not already there. - if not existing_vol - add_volume_to_db(db_pool_phys, volume); - else - @logger.debug "Scanned volume #{volume.key} already exists in db.." - end - - # Now check for an LVM pool carving up this volume. - lvm_name = volume.childLVMName - next if lvm_name == '' - - @logger.debug "Child LVM exists for this volume - #{lvm_name}" - lvm_db_pool = LvmStoragePool.find(:first, :conditions => - [ "vg_name = ?", lvm_name ]) - if lvm_db_pool == nil - lvm_db_pool = LvmStoragePool.new - lvm_db_pool[:type] = "LvmStoragePool" - # set the LVM pool to the same hardware pool as the underlying storage - lvm_db_pool.hardware_pool_id = db_pool_phys.hardware_pool_id - lvm_db_pool.vg_name = lvm_name - lvm_db_pool.state = StoragePool::STATE_AVAILABLE - lvm_db_pool.save! - end - - physical_vol = StorageVolume.find(:first, :conditions => - [ "path = ?", volume.path]) - if physical_vol == nil - # Hm. We didn't find the device in the storage volumes already. - # something went wrong internally, and we have to bail - raise "Storage internal physical volume error" - end - - # OK, put the right lvm_pool_id in place - physical_vol.lvm_pool_id = lvm_db_pool.id - physical_vol.save! - - lvm_libvirt_pool = LibvirtPool.factory(lvm_db_pool, @logger) - lvm_libvirt_pool.connect(@session, node) - - lvm_volumes = @session.objects(:class => 'volume', - 'storagePool' => lvm_libvirt_pool.remote_pool.object_id) - lvm_volumes.each do |lvm_volume| - - lvm_storage_volume = StorageVolume.factory(lvm_db_pool.get_type_label) - existing_vol = StorageVolume.find(:first, :conditions => - ["storage_pool_id = ? AND key = ?", - lvm_db_pool.id, lvm_volume.key]) - if not existing_vol - add_volume_to_db(lvm_db_pool, lvm_volume, "0744", "0744", "0744"); - else - @logger.info "volume #{lvm_volume.key} already exists in db.." - end - end - end - end - ensure - phys_libvirt_pool.shutdown - end - end - - def task_create_volume(task) - @logger.info "starting task_create_volume" - - db_volume = task.storage_volume - raise "Could not find storage volume to create" unless db_volume - - db_pool = db_volume.storage_pool - raise "Could not find storage pool" unless db_pool - - node = storage_find_suitable_host(db_pool.hardware_pool) - - begin - if db_volume[:type] == "LvmStorageVolume" - phys_libvirt_pool = get_libvirt_lvm_pool_from_volume(db_volume, @logger) - phys_libvirt_pool.connect(@session, node) - end - - begin - libvirt_pool = LibvirtPool.factory(db_pool, @logger) - - begin - libvirt_pool.connect(@session, node) - volume_id = libvirt_pool.create_vol(*db_volume.volume_create_params) - volume = @session.object(:object_id => volume_id) - raise "Unable to find newly created volume" unless volume - - @logger.debug " volume:" - for (key, val) in volume.properties - @logger.debug " property: #{key}, #{val}" - end - - db_volume.reload - db_volume.key = volume.key - db_volume.path = volume.path - db_volume.state = StorageVolume::STATE_AVAILABLE - db_volume.save! - - db_pool.reload - db_pool.state = StoragePool::STATE_AVAILABLE - db_pool.save! - rescue => ex - @logger.error "Error saving new volume: #{ex.class}: #{ex.message}" - ensure - libvirt_pool.shutdown - end - ensure - if db_volume[:type] == "LvmStorageVolume" - phys_libvirt_pool.shutdown - end - end - end - - # Now that we created a new volume, we need to refresh - # the storage pools to ensure that they pick up the changes. - # I currently refresh ALL storage pools at this time as it - # shouldn't be a long operation and it doesn't hurt to refresh - # them once in a while. - pools = @session.objects(:class => 'pool') - pools.each do |pool| - result = pool.refresh - @logger.info "Problem refreshing pool (you can probably ignore this): #{result.text}" unless result.status == 0 - end - - end - - def task_delete_volume(task) - @logger.info "starting task_delete_volume" - - db_volume = task.storage_volume - raise "Could not find storage volume to create" unless db_volume - - db_pool = db_volume.storage_pool - raise "Could not find storage pool" unless db_pool - - node = storage_find_suitable_host(db_pool.hardware_pool) - - begin - if db_volume[:type] == "LvmStorageVolume" - phys_libvirt_pool = get_libvirt_lvm_pool_from_volume(db_volume, @logger) - phys_libvirt_pool.connect(@session, node) - @logger.info "connected to lvm pool.." - end - - begin - libvirt_pool = LibvirtPool.factory(db_pool, @logger) - libvirt_pool.connect(@session, node) - - begin - volume = @session.object(:class => 'volume', - 'storagePool' => libvirt_pool.remote_pool.object_id, - 'key' => db_volume.key) - @logger.error "Unable to find volume to delete" unless volume - - # FIXME: we actually probably want to zero out the whole volume - # here, so we aren't potentially leaking data from one user - # to another. There are two problems, though: - # 1) I'm not sure how I would go about zero'ing the data on a remote - # machine, since there is no "libvirt_write_data" call - # 2) This could potentially take quite a while, so we want to spawn - # off another thread to do it - # result = volume.delete - - # If we don't find the volume we assume there was some error setting - # it up, so just carry on here.. - volume.delete if volume - - @logger.info "Volume deleted successfully." - - # Note: we have to nil out the task_target because when we delete the - # volume object, that also deletes all dependent tasks (including this - # one), which leads to accessing stale tasks. Orphan the task, then - # delete the object; we can clean up orphans later (or not, depending - # on the audit policy) - task.reload - task.task_target = nil - task.save! - - db_volume.destroy - ensure - libvirt_pool.shutdown - end - ensure - if db_volume[:type] == "LvmStorageVolume" - phys_libvirt_pool.shutdown - end - end - end - end - - def task_clear_vms_host(task) - @logger.info "starting task_clear_vms_host" - src_host = task.host - - src_host.vms.each do |vm| - migrate(vm) - end end def mainloop() - was_disconnected = false - loop do + + # For testing I'm just putting stuff here... + InstanceTaskCreate.new(@logger) - if not @broker.connected? - @logger.info("Cannot implement tasks, not connected to broker. Sleeping.") - sleep(@sleeptime * 3) - was_disconnected = true - next - end - - @logger.info("Reconnected, resuming task checking..") if was_disconnected - was_disconnected = false - @session.object(:class => 'agent') + loop do tasks = Array.new begin @@ -894,31 +137,9 @@ class TaskOmatic state = Task::STATE_FINISHED begin case task.action - when VmTask::ACTION_CREATE_VM - task_create_vm(task) - when VmTask::ACTION_SHUTDOWN_VM - task_shutdown_or_destroy_vm(task, :shutdown) - when VmTask::ACTION_POWEROFF_VM - task_shutdown_or_destroy_vm(task, :destroy) - when VmTask::ACTION_START_VM - task_start_vm(task) - when VmTask::ACTION_SUSPEND_VM - task_suspend_vm(task) - when VmTask::ACTION_RESUME_VM - task_resume_vm(task) - when VmTask::ACTION_SAVE_VM - task_save_vm(task) - when VmTask::ACTION_RESTORE_VM - task_restore_vm(task) - when VmTask::ACTION_MIGRATE_VM - task_migrate_vm(task) - when StorageTask::ACTION_REFRESH_POOL - task_refresh_pool(task) - when StorageVolumeTask::ACTION_CREATE_VOLUME - task_create_volume(task) - when StorageVolumeTask::ACTION_DELETE_VOLUME - task_delete_volume(task) - when HostTask::ACTION_CLEAR_VMS: task_clear_vms_host(task) + #when InstanceTask::CREATE + when 'InstanceCreate' + InstanceTaskCreate.new(@logger) else @logger.error "unknown task " + task.action state = Task::STATE_FAILED diff --git a/src/task-omatic/taskomatic_task.rb b/src/task-omatic/taskomatic_task.rb new file mode 100644 index 0000000..dc3a00f --- /dev/null +++ b/src/task-omatic/taskomatic_task.rb @@ -0,0 +1,29 @@ +# Copyright (C) 2009 Red Hat, Inc. +# Written by Ian Main <imain(a)redhat.com> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301, USA. A copy of the GNU General Public License is +# also available at http://www.gnu.org/copyleft/gpl.html. + + +# Create a new instance on a cloud. +class TaskomaticTask + + def initialize(logger) + @logger = logger + end + +end + + -- 1.6.2.5

2 1

[Libcloud-list] Monitoring in EC2
by Steve Linabery 17 Aug '09

17 Aug '09

Monitoring and statistics collection in EC2 are handled through a separate AWS service called CloudWatch. Here is some basic info gleaned from their docs: 0) What does it cost? http://aws.amazon.com/cloudwatch/ "Amazon CloudWatch is charged by the number of Amazon EC2 instances you monitor, at a rate of $0.015 per hour for each Amazon EC2 instance you choose to monitor." 1) What's finest resolution for stats? http://docs.amazonwebservices.com/AmazonCloudWatch/latest/DeveloperGuide/ar… "The maximum frequency with which statistics are gathered by Amazon CloudWatch is 1 minute." 3) What metrics can you track? CPUUtilization NetworkIn NetworkOut DiskWriteOps DiskReadBytes DiskReadOps DiskWriteBytes 4) Is there an API? Yes. SOAP-based. 5) Where is the API documentation? http://docs.amazonwebservices.com/AmazonCloudWatch/latest/DeveloperGuide/ 6) What languages can use API? Any that support SOAP. 7) Is it GPL? (rimshot!) hth Steve Linabery

1 0

[Libcloud-list] [PATCH server] added external_key attribute to flavor, image, realm, and instance which is the cloud API's ID field for these types.
by Scott Seago 17 Aug '09

17 Aug '09

Signed-off-by: Scott Seago <sseago(a)redhat.com> --- src/app/models/flavor.rb | 4 +++- src/app/models/image.rb | 4 +++- src/app/models/instance.rb | 5 +++++ src/app/models/realm.rb | 4 +++- src/db/migrate/20090804135630_create_flavors.rb | 3 ++- src/db/migrate/20090804140143_create_images.rb | 4 ++-- src/db/migrate/20090804141600_create_realms.rb | 3 ++- src/db/migrate/20090804142049_create_instances.rb | 3 ++- 8 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/app/models/flavor.rb b/src/app/models/flavor.rb index 473546c..bead068 100644 --- a/src/app/models/flavor.rb +++ b/src/app/models/flavor.rb @@ -4,8 +4,10 @@ class Flavor < ActiveRecord::Base validates_presence_of :provider_id + validates_presence_of :external_key + validates_uniqueness_of :external_key, :scope => :provider_id + validates_presence_of :name - validates_uniqueness_of :name, :scope => :provider_id validates_presence_of :storage validates_numericality_of :storage diff --git a/src/app/models/image.rb b/src/app/models/image.rb index 15f4ccb..e7d0679 100644 --- a/src/app/models/image.rb +++ b/src/app/models/image.rb @@ -4,8 +4,10 @@ class Image < ActiveRecord::Base validates_presence_of :provider_id + validates_presence_of :external_key + validates_uniqueness_of :external_key, :scope => :provider_id + validates_presence_of :name - validates_uniqueness_of :name, :scope => :provider_id validates_presence_of :description validates_presence_of :architecture diff --git a/src/app/models/instance.rb b/src/app/models/instance.rb index 1ac167e..7d2cb9b 100644 --- a/src/app/models/instance.rb +++ b/src/app/models/instance.rb @@ -6,6 +6,11 @@ class Instance < ActiveRecord::Base validates_presence_of :portal_pool_id + validates_presence_of :external_key + # TODO: can we do uniqueness validation on indirect association + # -- portal_pool.account.provider + #validates_uniqueness_of :external_key, :scope => :provider_id + validates_presence_of :name validates_uniqueness_of :name, :scope => :portal_pool_id diff --git a/src/app/models/realm.rb b/src/app/models/realm.rb index 130ceb2..3d2dc66 100644 --- a/src/app/models/realm.rb +++ b/src/app/models/realm.rb @@ -4,7 +4,9 @@ class Realm < ActiveRecord::Base validates_presence_of :provider_id + validates_presence_of :external_key + validates_uniqueness_of :external_key, :scope => :provider_id + validates_presence_of :name - validates_uniqueness_of :name, :scope => :provider_id end diff --git a/src/db/migrate/20090804135630_create_flavors.rb b/src/db/migrate/20090804135630_create_flavors.rb index cdc34e3..7f8538b 100644 --- a/src/db/migrate/20090804135630_create_flavors.rb +++ b/src/db/migrate/20090804135630_create_flavors.rb @@ -1,7 +1,8 @@ class CreateFlavors < ActiveRecord::Migration def self.up create_table :flavors do |t| - t.string :name, :null => false + t.string :external_key, :null => false + t.string :name, :null => false, :limit => 1024 t.integer :memory, :null => false t.integer :storage, :null => false t.string :architecture, :null => false diff --git a/src/db/migrate/20090804140143_create_images.rb b/src/db/migrate/20090804140143_create_images.rb index 0163ec7..62fcc2e 100644 --- a/src/db/migrate/20090804140143_create_images.rb +++ b/src/db/migrate/20090804140143_create_images.rb @@ -1,8 +1,8 @@ class CreateImages < ActiveRecord::Migration def self.up create_table :images do |t| - t.string :name, :null => false - t.string :description, :null => false + t.string :external_key, :null => false + t.string :name, :null => false, :limit => 1024 t.string :architecture, :null => false t.integer :provider_id, :null => false t.integer :lock_version, :default => 0 diff --git a/src/db/migrate/20090804141600_create_realms.rb b/src/db/migrate/20090804141600_create_realms.rb index 7ece640..9a9c154 100644 --- a/src/db/migrate/20090804141600_create_realms.rb +++ b/src/db/migrate/20090804141600_create_realms.rb @@ -1,7 +1,8 @@ class CreateRealms < ActiveRecord::Migration def self.up create_table :realms do |t| - t.string :name, :null => false + t.string :external_key, :null => false + t.string :name, :null => false, :limit => 1024 t.integer :provider_id, :null => false t.integer :lock_version, :default => 0 t.timestamps diff --git a/src/db/migrate/20090804142049_create_instances.rb b/src/db/migrate/20090804142049_create_instances.rb index 57ee511..82f574e 100644 --- a/src/db/migrate/20090804142049_create_instances.rb +++ b/src/db/migrate/20090804142049_create_instances.rb @@ -1,7 +1,8 @@ class CreateInstances < ActiveRecord::Migration def self.up create_table :instances do |t| - t.string :name, :null => false + t.string :external_key, :null => false + t.string :name, :null => false, :limit => 1024 t.integer :flavor_id, :null => false t.integer :image_id, :null => false t.integer :realm_id -- 1.6.2.5

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

deltacloud-devel August 2009