<%= yield :title -%>

- <%= image_tag "icon_move.png", :style => "vertical-align:middle;" %> Type <%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %> -
- - style="border-bottom: 1px solid #CCCCCC;" - <% end %> - > - - <%= @task_type == @task_types[index][1] ? "X" : " " %> - <%=@task_types[index][0]%> -
-

+ <%= image_tag "icon_move.png", :style => "vertical-align:middle;" %> Type <%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %> +
- + style="border-bottom: 1px solid #CCCCCC;" + <% end %> + > + + <%= task_type == task_types[index][1] ? "X" : " " %> + <%=task_types[index][0]%> +
+

<%= image_tag "icon_move.png", :style => "vertical-align:middle;" %> State <%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %>

+ <% task_states.each_index { |index| %> +
style="border-bottom: 1px solid #CCCCCC;" <% end %> > - <%= @task_state == @task_states[index][1] ? "X" : " " %> - <%=@task_states[index][0]%> + <%= task_state == task_states[index][1] ? "X" : " " %> + <%=task_states[index][0]%>

@@ -40,7 +43,7 @@ function apply_task_filter(task_type, task_state) { $tabs.tabs("url", $tabs.data("selected.tabs"), - "<%= url_for :action => 'show_tasks', :id => @pool.id, + "<%= url_for :action => action, :id => pool, :nolayout => :true %>" + "&task_type=" + task_type + "&task_state=" + task_state); $tabs.tabs("load", $tabs.data("selected.tabs")); @@ -48,12 +51,12 @@

-<% if @tasks[:rows].size != 0 %> +<% if tasks[:rows].size != 0 %>

<%= render :partial => "/task/grid", :locals => { :table_id => "tasks_grid", - :task_type => @task_type, - :task_state => @task_state, - :pool => @pool, + :task_type => task_type, + :task_state => task_state, + :pool => pool, :checkboxes => false, :on_select => "tasks_grid_select" } %>

-- 1.6.0.4 From bkearney at redhat.com Thu Jan 8 19:18:00 2009 From: bkearney at redhat.com (Bryan Kearney) Date: Thu, 8 Jan 2009 14:18:00 -0500 Subject: [Ovirt-devel] [PATCH node] Allow the menu to be ordered based on prepending XX_ onto the front of the symlinks Message-ID: <1231442280-1814-1-git-send-email-bkearney@redhat.com> --- ovirt-node.spec.in | 12 ++++++------ scripts/ovirt-config-setup | 6 ++++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in index 72b35f2..b292c3e 100644 --- a/ovirt-node.spec.in +++ b/ovirt-node.spec.in @@ -186,12 +186,12 @@ install -p -m 644 images/syslinux-vesa-splash.jpg %{buildroot}/usr/lib/anaconda- # default ovirt-config-setup menu options %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/ovirt-config-setup.d -%{__ln_s} ../..%{_sbindir}/ovirt-config-networking %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"Networking Setup" -%{__ln_s} ../..%{_sbindir}/ovirt-config-storage %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"Disk Partitioning" -%{__ln_s} ../..%{_sbindir}/ovirt-config-hostname %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"Set Hostname" -%{__ln_s} ../..%{_sbindir}/ovirt-config-logging %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"Logging Setup" -%{__ln_s} ../..%{_sbindir}/ovirt-config-password %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"Administrator Password" -%{__ln_s} ../..%{_sbindir}/ovirt-config-boot %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"Local install and reboot" +%{__ln_s} ../..%{_sbindir}/ovirt-config-networking %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"15_Networking Setup" +%{__ln_s} ../..%{_sbindir}/ovirt-config-storage %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"20_Disk Partitioning" +%{__ln_s} ../..%{_sbindir}/ovirt-config-hostname %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"10_Set Hostname" +%{__ln_s} ../..%{_sbindir}/ovirt-config-logging %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"30_Logging Setup" +%{__ln_s} ../..%{_sbindir}/ovirt-config-password %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"00_Administrator Password" +%{__ln_s} ../..%{_sbindir}/ovirt-config-boot %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"99_Local install and reboot" %clean diff --git a/scripts/ovirt-config-setup b/scripts/ovirt-config-setup index 9f97afc..9ee268f 100755 --- a/scripts/ovirt-config-setup +++ b/scripts/ovirt-config-setup @@ -13,10 +13,12 @@ declare -a OPTIONS for cfg in $CONFIG_DIR/*; do label=$(basename "$cfg") + # Assume label is actually XX_Some Text. So strip of the first 3 characters + label=${label:3} OPTIONS[${#OPTIONS[*]}]="$label" done -OPTIONS[${#OPTIONS[*]}]="$CONTINUE" OPTIONS[${#OPTIONS[*]}]="$DEBUG_SHELL" +OPTIONS[${#OPTIONS[*]}]="$CONTINUE" # reset tty, otherwise serial console is broken @@ -33,7 +35,7 @@ while true; do case "$OPTION" in "$DEBUG_SHELL") bash ; break ;; "$CONTINUE") exit 0 ;; - *) $CONFIG_DIR/"$OPTION" ;; + *) $CONFIG_DIR/*"$OPTION" ;; esac printf "\n" -- 1.6.0.6 From dpierce at redhat.com Thu Jan 8 19:58:02 2009 From: dpierce at redhat.com (Darryl L. Pierce) Date: Thu, 8 Jan 2009 14:58:02 -0500 Subject: [Ovirt-devel] [PATCH node] Allow the menu to be ordered based on prepending XX_ onto the front of the symlinks In-Reply-To: <1231442280-1814-1-git-send-email-bkearney@redhat.com> References: <1231442280-1814-1-git-send-email-bkearney@redhat.com> Message-ID: <20090108195802.GA15952@mcpierce-laptop.rdu.redhat.com> On Thu, Jan 08, 2009 at 02:18:00PM -0500, Bryan Kearney wrote: > --- > ovirt-node.spec.in | 12 ++++++------ > scripts/ovirt-config-setup | 6 ++++-- > 2 files changed, 10 insertions(+), 8 deletions(-) > > diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in > index 72b35f2..b292c3e 100644 > --- a/ovirt-node.spec.in > +++ b/ovirt-node.spec.in > @@ -186,12 +186,12 @@ install -p -m 644 images/syslinux-vesa-splash.jpg %{buildroot}/usr/lib/anaconda- > > # default ovirt-config-setup menu options > %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/ovirt-config-setup.d > -%{__ln_s} ../..%{_sbindir}/ovirt-config-networking %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"Networking Setup" > -%{__ln_s} ../..%{_sbindir}/ovirt-config-storage %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"Disk Partitioning" > -%{__ln_s} ../..%{_sbindir}/ovirt-config-hostname %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"Set Hostname" > -%{__ln_s} ../..%{_sbindir}/ovirt-config-logging %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"Logging Setup" > -%{__ln_s} ../..%{_sbindir}/ovirt-config-password %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"Administrator Password" > -%{__ln_s} ../..%{_sbindir}/ovirt-config-boot %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"Local install and reboot" > +%{__ln_s} ../..%{_sbindir}/ovirt-config-networking %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"15_Networking Setup" > +%{__ln_s} ../..%{_sbindir}/ovirt-config-storage %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"20_Disk Partitioning" > +%{__ln_s} ../..%{_sbindir}/ovirt-config-hostname %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"10_Set Hostname" > +%{__ln_s} ../..%{_sbindir}/ovirt-config-logging %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"30_Logging Setup" > +%{__ln_s} ../..%{_sbindir}/ovirt-config-password %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"00_Administrator Password" > +%{__ln_s} ../..%{_sbindir}/ovirt-config-boot %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"99_Local install and reboot" ACK with one request: can we rearrange the above symlinks so that they're in order? -- Darryl L. Pierce, Sr. Software Engineer @ Red Hat, Inc. Virtual Machine Management - http://www.ovirt.org/ "What do you care what other people think, Mr. Feynman?" -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 197 bytes Desc: not available URL: From slinabery at redhat.com Thu Jan 8 20:48:44 2009 From: slinabery at redhat.com (Steve Linabery) Date: Thu, 8 Jan 2009 14:48:44 -0600 Subject: [Ovirt-devel] [PATCH server] Add audit trail for hosts joining/leaving hwpools with Rails observer class Message-ID: <1231447724-30339-1-git-send-email-slinabery@redhat.com> Modify graph_controller.rb to utilize new audit feature when generating data for flexchart --- src/app/controllers/graph_controller.rb | 65 +++++++++++++++++++++++++-- src/app/models/hardware_pool.rb | 2 +- src/app/models/host.rb | 9 ++++ src/app/models/host_observer.rb | 47 ++++++++++++++++++++ src/app/models/membership_audit_event.rb | 26 +++++++++++ src/app/models/pool.rb | 1 + src/config/environment.rb | 2 +- src/db/migrate/033_add_pool_audit_trail.rb | 32 ++++++++++++++ 8 files changed, 177 insertions(+), 7 deletions(-) create mode 100644 src/app/models/host_observer.rb create mode 100644 src/app/models/membership_audit_event.rb create mode 100644 src/db/migrate/033_add_pool_audit_trail.rb diff --git a/src/app/controllers/graph_controller.rb b/src/app/controllers/graph_controller.rb index ee9425f..df516f5 100644 --- a/src/app/controllers/graph_controller.rb +++ b/src/app/controllers/graph_controller.rb @@ -6,9 +6,9 @@ class GraphController < ApplicationController def flexchart_data @id = params[:id] target = params[:target] - startTime = params[:startTime].to_i - endTime = params[:endTime].to_i - duration = endTime - startTime + startTime = Time.at(params[:startTime].to_i) + endTime = Time.at(params[:endTime].to_i) + duration = endTime.to_i - startTime.to_i #the maximum number of data points we want in any chart maxPoints = 100 @@ -29,10 +29,30 @@ class GraphController < ApplicationController counter = DEV_KEY_COUNTERS[target] pool = Pool.find(@id) - hosts = pool.hosts + hosts = Host.find(:all, + :include=> :membership_audit_events, + :conditions => ['membership_audit_events.container_target_id = ?',pool]) + requestList = [ ] hosts.each{ |host| - requestList.push StatsRequest.new(host.hostname, devclass, 0, counter, startTime, duration, resolution, DataFunction::Peak) + eventsInRange = host.membership_audit_events.from_pool(pool, + startTime, + endTime) + priorAuditEvent = host.membership_audit_events.most_recent_prior_event_from_pool(pool,startTime) + timeRanges = get_ranges_from_event_list(eventsInRange, + priorAuditEvent, + startTime, + endTime) + timeRanges.each{ |range| + requestList.push StatsRequest.new(host.hostname, + devclass, + 0, + counter, + range[0].to_i, + range[1].to_i - range[0].to_i, + resolution, + DataFunction::Peak) + } } statsList = getAggregateStatsData?(requestList) @@ -51,6 +71,41 @@ class GraphController < ApplicationController render :json => graph end + def get_ranges_from_event_list(list, priorEvent, startTime, endTime) + + results = Array.new + range = [startTime,endTime] + + joined = false + if priorEvent + if priorEvent.action == MembershipAuditEvent::JOIN + joined = true + end + end + + list.each_with_index { |event,index| + if event.action == MembershipAuditEvent::JOIN + joined = true + range[0] = event.created_at + else + range[0] = startTime unless joined + joined = false + range[1] = event.created_at + results.push Array.new(range) + range = [startTime,endTime] + end + } + + if joined + range[1] = endTime + results.push Array.new(range) + ddebug(range) + end + + results + end + + # generate layout for availability bar graphs def availability_graph diff --git a/src/app/models/hardware_pool.rb b/src/app/models/hardware_pool.rb index d39d8e7..b72d485 100644 --- a/src/app/models/hardware_pool.rb +++ b/src/app/models/hardware_pool.rb @@ -54,7 +54,7 @@ class HardwarePool < Pool hosts = Host.find(:all, :conditions => "id in (#{host_ids.join(', ')})") transaction do hosts.each do |host| - host.hardware_pool_id = target_pool_id + host.hardware_pool = HardwarePool.find(target_pool_id) host.save! end end diff --git a/src/app/models/host.rb b/src/app/models/host.rb index 640782d..813bc1d 100644 --- a/src/app/models/host.rb +++ b/src/app/models/host.rb @@ -23,6 +23,15 @@ class Host < ActiveRecord::Base belongs_to :hardware_pool belongs_to :bonding_type + has_many :membership_audit_events, :as => :member_target, :dependent => :destroy, :order => "created_at ASC" do + def from_pool(pool,startTime,endTime) + find(:all, :conditions=> ['container_target_id = ? and created_at between ? and ?',pool,startTime,endTime]) + end + def most_recent_prior_event_from_pool(pool,startTime) + find(:last, :conditions=> ['container_target_id = ? and created_at < ?',pool,startTime]) + end + end + has_many :cpus, :dependent => :destroy has_many :nics, :dependent => :destroy has_many :bondings, :dependent => :destroy diff --git a/src/app/models/host_observer.rb b/src/app/models/host_observer.rb new file mode 100644 index 0000000..df5efa1 --- /dev/null +++ b/src/app/models/host_observer.rb @@ -0,0 +1,47 @@ +# +# Copyright (C) 2008 Red Hat, Inc. +# Written by Steve Linabery +# +# 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. + +class HostObserver < ActiveRecord::Observer + + def after_create(a_host) + join = MembershipAuditEvent.new({ :member_target => a_host, + :container_target => a_host.hardware_pool, + :action => MembershipAuditEvent::JOIN }) + join.save! + end + + def before_update(a_host) + if a_host.changed? + change = a_host.changes['hardware_pool_id'] + if change + leave = MembershipAuditEvent.new({ :member_target => a_host, + :container_target => HardwarePool.find(change[0]), + :action => MembershipAuditEvent::LEAVE }) + leave.save! + + join = MembershipAuditEvent.new({ :member_target => a_host, + :container_target => HardwarePool.find(change[1]), + :action => MembershipAuditEvent::JOIN }) + join.save! + end + end + end +end + +HostObserver.instance diff --git a/src/app/models/membership_audit_event.rb b/src/app/models/membership_audit_event.rb new file mode 100644 index 0000000..b36cbee --- /dev/null +++ b/src/app/models/membership_audit_event.rb @@ -0,0 +1,26 @@ +# +# Copyright (C) 2008 Red Hat, Inc. +# Written by Steve Linabery +# +# 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. + +class MembershipAuditEvent < ActiveRecord::Base + belongs_to :container_target, :polymorphic => true + belongs_to :member_target, :polymorphic => true + + JOIN = "join" + LEAVE = "leave" +end diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb index 7034e79..614325a 100644 --- a/src/app/models/pool.rb +++ b/src/app/models/pool.rb @@ -20,6 +20,7 @@ class Pool < ActiveRecord::Base acts_as_nested_set + has_many :membership_audit_events, :as => :container_target, :dependent => :destroy # moved associations here so that nested set :include directives work # TODO: find a way to put this back into vm_resource_pool.rb has_many :vms, :dependent => :nullify, :order => "id ASC", :foreign_key => :vm_resource_pool_id diff --git a/src/config/environment.rb b/src/config/environment.rb index 53edfad..66cae90 100644 --- a/src/config/environment.rb +++ b/src/config/environment.rb @@ -82,7 +82,7 @@ Rails::Initializer.run do |config| # Activate observers that should always be running # config.active_record.observers = :cacher, :garbage_collector - + config.active_record.observers = :host_observer end # Add new inflection rules using the following format diff --git a/src/db/migrate/033_add_pool_audit_trail.rb b/src/db/migrate/033_add_pool_audit_trail.rb new file mode 100644 index 0000000..656ad87 --- /dev/null +++ b/src/db/migrate/033_add_pool_audit_trail.rb @@ -0,0 +1,32 @@ +# +# Copyright (C) 2008 Red Hat, Inc. +# Written by Steve Linabery +# +# 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. + +class AddPoolAuditTrail < ActiveRecord::Migration + def self.up + create_table :membership_audit_events do |t| + t.timestamp :created_at + t.string :action + t.integer :container_target_id + t.string :container_target_type + t.integer :member_target_id + t.string :member_target_type + t.integer :lock_version, :default => 0 + end + end +end -- 1.6.0.6 From slinabery at redhat.com Thu Jan 8 20:52:14 2009 From: slinabery at redhat.com (Steve Linabery) Date: Thu, 8 Jan 2009 14:52:14 -0600 Subject: [Ovirt-devel] Re: [PATCH server] Add audit trail for hosts joining/leaving hwpools with Rails observer class In-Reply-To: <1231447724-30339-1-git-send-email-slinabery@redhat.com> References: <1231447724-30339-1-git-send-email-slinabery@redhat.com> Message-ID: <20090108205213.GF14957@redhat.com> Disregard this for the moment, folks. I have to add to the migration file. On Thu, Jan 08, 2009 at 02:48:44PM -0600, Steve Linabery wrote: > Modify graph_controller.rb to utilize new audit feature when generating data for flexchart > --- > src/app/controllers/graph_controller.rb | 65 +++++++++++++++++++++++++-- > src/app/models/hardware_pool.rb | 2 +- > src/app/models/host.rb | 9 ++++ > src/app/models/host_observer.rb | 47 ++++++++++++++++++++ > src/app/models/membership_audit_event.rb | 26 +++++++++++ > src/app/models/pool.rb | 1 + > src/config/environment.rb | 2 +- > src/db/migrate/033_add_pool_audit_trail.rb | 32 ++++++++++++++ > 8 files changed, 177 insertions(+), 7 deletions(-) > create mode 100644 src/app/models/host_observer.rb > create mode 100644 src/app/models/membership_audit_event.rb > create mode 100644 src/db/migrate/033_add_pool_audit_trail.rb > > diff --git a/src/app/controllers/graph_controller.rb b/src/app/controllers/graph_controller.rb > index ee9425f..df516f5 100644 > --- a/src/app/controllers/graph_controller.rb > +++ b/src/app/controllers/graph_controller.rb > @@ -6,9 +6,9 @@ class GraphController < ApplicationController > def flexchart_data > @id = params[:id] > target = params[:target] > - startTime = params[:startTime].to_i > - endTime = params[:endTime].to_i > - duration = endTime - startTime > + startTime = Time.at(params[:startTime].to_i) > + endTime = Time.at(params[:endTime].to_i) > + duration = endTime.to_i - startTime.to_i > > #the maximum number of data points we want in any chart > maxPoints = 100 > @@ -29,10 +29,30 @@ class GraphController < ApplicationController > counter = DEV_KEY_COUNTERS[target] > > pool = Pool.find(@id) > - hosts = pool.hosts > + hosts = Host.find(:all, > + :include=> :membership_audit_events, > + :conditions => ['membership_audit_events.container_target_id = ?',pool]) > + > requestList = [ ] > hosts.each{ |host| > - requestList.push StatsRequest.new(host.hostname, devclass, 0, counter, startTime, duration, resolution, DataFunction::Peak) > + eventsInRange = host.membership_audit_events.from_pool(pool, > + startTime, > + endTime) > + priorAuditEvent = host.membership_audit_events.most_recent_prior_event_from_pool(pool,startTime) > + timeRanges = get_ranges_from_event_list(eventsInRange, > + priorAuditEvent, > + startTime, > + endTime) > + timeRanges.each{ |range| > + requestList.push StatsRequest.new(host.hostname, > + devclass, > + 0, > + counter, > + range[0].to_i, > + range[1].to_i - range[0].to_i, > + resolution, > + DataFunction::Peak) > + } > } > statsList = getAggregateStatsData?(requestList) > > @@ -51,6 +71,41 @@ class GraphController < ApplicationController > render :json => graph > end > > + def get_ranges_from_event_list(list, priorEvent, startTime, endTime) > + > + results = Array.new > + range = [startTime,endTime] > + > + joined = false > + if priorEvent > + if priorEvent.action == MembershipAuditEvent::JOIN > + joined = true > + end > + end > + > + list.each_with_index { |event,index| > + if event.action == MembershipAuditEvent::JOIN > + joined = true > + range[0] = event.created_at > + else > + range[0] = startTime unless joined > + joined = false > + range[1] = event.created_at > + results.push Array.new(range) > + range = [startTime,endTime] > + end > + } > + > + if joined > + range[1] = endTime > + results.push Array.new(range) > + ddebug(range) > + end > + > + results > + end > + > + > > # generate layout for availability bar graphs > def availability_graph > diff --git a/src/app/models/hardware_pool.rb b/src/app/models/hardware_pool.rb > index d39d8e7..b72d485 100644 > --- a/src/app/models/hardware_pool.rb > +++ b/src/app/models/hardware_pool.rb > @@ -54,7 +54,7 @@ class HardwarePool < Pool > hosts = Host.find(:all, :conditions => "id in (#{host_ids.join(', ')})") > transaction do > hosts.each do |host| > - host.hardware_pool_id = target_pool_id > + host.hardware_pool = HardwarePool.find(target_pool_id) > host.save! > end > end > diff --git a/src/app/models/host.rb b/src/app/models/host.rb > index 640782d..813bc1d 100644 > --- a/src/app/models/host.rb > +++ b/src/app/models/host.rb > @@ -23,6 +23,15 @@ class Host < ActiveRecord::Base > belongs_to :hardware_pool > belongs_to :bonding_type > > + has_many :membership_audit_events, :as => :member_target, :dependent => :destroy, :order => "created_at ASC" do > + def from_pool(pool,startTime,endTime) > + find(:all, :conditions=> ['container_target_id = ? and created_at between ? and ?',pool,startTime,endTime]) > + end > + def most_recent_prior_event_from_pool(pool,startTime) > + find(:last, :conditions=> ['container_target_id = ? and created_at < ?',pool,startTime]) > + end > + end > + > has_many :cpus, :dependent => :destroy > has_many :nics, :dependent => :destroy > has_many :bondings, :dependent => :destroy > diff --git a/src/app/models/host_observer.rb b/src/app/models/host_observer.rb > new file mode 100644 > index 0000000..df5efa1 > --- /dev/null > +++ b/src/app/models/host_observer.rb > @@ -0,0 +1,47 @@ > +# > +# Copyright (C) 2008 Red Hat, Inc. > +# Written by Steve Linabery > +# > +# 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. > + > +class HostObserver < ActiveRecord::Observer > + > + def after_create(a_host) > + join = MembershipAuditEvent.new({ :member_target => a_host, > + :container_target => a_host.hardware_pool, > + :action => MembershipAuditEvent::JOIN }) > + join.save! > + end > + > + def before_update(a_host) > + if a_host.changed? > + change = a_host.changes['hardware_pool_id'] > + if change > + leave = MembershipAuditEvent.new({ :member_target => a_host, > + :container_target => HardwarePool.find(change[0]), > + :action => MembershipAuditEvent::LEAVE }) > + leave.save! > + > + join = MembershipAuditEvent.new({ :member_target => a_host, > + :container_target => HardwarePool.find(change[1]), > + :action => MembershipAuditEvent::JOIN }) > + join.save! > + end > + end > + end > +end > + > +HostObserver.instance > diff --git a/src/app/models/membership_audit_event.rb b/src/app/models/membership_audit_event.rb > new file mode 100644 > index 0000000..b36cbee > --- /dev/null > +++ b/src/app/models/membership_audit_event.rb > @@ -0,0 +1,26 @@ > +# > +# Copyright (C) 2008 Red Hat, Inc. > +# Written by Steve Linabery > +# > +# 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. > + > +class MembershipAuditEvent < ActiveRecord::Base > + belongs_to :container_target, :polymorphic => true > + belongs_to :member_target, :polymorphic => true > + > + JOIN = "join" > + LEAVE = "leave" > +end > diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb > index 7034e79..614325a 100644 > --- a/src/app/models/pool.rb > +++ b/src/app/models/pool.rb > @@ -20,6 +20,7 @@ > class Pool < ActiveRecord::Base > acts_as_nested_set > > + has_many :membership_audit_events, :as => :container_target, :dependent => :destroy > # moved associations here so that nested set :include directives work > # TODO: find a way to put this back into vm_resource_pool.rb > has_many :vms, :dependent => :nullify, :order => "id ASC", :foreign_key => :vm_resource_pool_id > diff --git a/src/config/environment.rb b/src/config/environment.rb > index 53edfad..66cae90 100644 > --- a/src/config/environment.rb > +++ b/src/config/environment.rb > @@ -82,7 +82,7 @@ Rails::Initializer.run do |config| > > # Activate observers that should always be running > # config.active_record.observers = :cacher, :garbage_collector > - > + config.active_record.observers = :host_observer > end > > # Add new inflection rules using the following format > diff --git a/src/db/migrate/033_add_pool_audit_trail.rb b/src/db/migrate/033_add_pool_audit_trail.rb > new file mode 100644 > index 0000000..656ad87 > --- /dev/null > +++ b/src/db/migrate/033_add_pool_audit_trail.rb > @@ -0,0 +1,32 @@ > +# > +# Copyright (C) 2008 Red Hat, Inc. > +# Written by Steve Linabery > +# > +# 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. > + > +class AddPoolAuditTrail < ActiveRecord::Migration > + def self.up > + create_table :membership_audit_events do |t| > + t.timestamp :created_at > + t.string :action > + t.integer :container_target_id > + t.string :container_target_type > + t.integer :member_target_id > + t.string :member_target_type > + t.integer :lock_version, :default => 0 > + end > + end > +end > -- > 1.6.0.6 > From bkearney at redhat.com Thu Jan 8 21:22:46 2009 From: bkearney at redhat.com (Bryan Kearney) Date: Thu, 8 Jan 2009 16:22:46 -0500 Subject: [Ovirt-devel] [PATCH node] Added a wrapper script around the boot menu item to warn the users about the reboot Message-ID: <1231449766-28155-1-git-send-email-bkearney@redhat.com> --- Makefile.am | 1 + ovirt-node.spec.in | 4 +++- scripts/ovirt-config-boot-wrapper | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 1 deletions(-) create mode 100644 scripts/ovirt-config-boot-wrapper diff --git a/Makefile.am b/Makefile.am index 6847234..c62774f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,6 +30,7 @@ EXTRA_DIST = \ scripts/ovirt \ scripts/ovirt-awake \ scripts/ovirt-config-boot \ + scripts/ovirt-config-boot-wrapper \ scripts/ovirt-config-hostname \ scripts/ovirt-config-logging \ scripts/ovirt-config-networking \ diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in index 501bf4f..f30dd62 100644 --- a/ovirt-node.spec.in +++ b/ovirt-node.spec.in @@ -132,6 +132,7 @@ cd - %{__install} -p -m0755 scripts/ovirt-awake %{buildroot}%{_sbindir} %{__install} -p -m0755 scripts/ovirt-config-boot %{buildroot}%{_sbindir} +%{__install} -p -m0755 scripts/ovirt-config-boot-wrapper %{buildroot}%{_sbindir} %{__install} -p -m0755 scripts/ovirt-config-hostname %{buildroot}%{_sbindir} %{__install} -p -m0755 scripts/ovirt-config-logging %{buildroot}%{_sbindir} %{__install} -p -m0755 scripts/ovirt-config-networking %{buildroot}%{_sbindir} @@ -191,7 +192,7 @@ install -p -m 644 images/syslinux-vesa-splash.jpg %{buildroot}/usr/lib/anaconda- %{__ln_s} ../..%{_sbindir}/ovirt-config-networking %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"15_Networking Setup" %{__ln_s} ../..%{_sbindir}/ovirt-config-storage %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"20_Disk Partitioning" %{__ln_s} ../..%{_sbindir}/ovirt-config-logging %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"30_Logging Setup" -%{__ln_s} ../..%{_sbindir}/ovirt-config-boot %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"99_Local install and reboot" +%{__ln_s} ../..%{_sbindir}/ovirt-config-boot-wrapper %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"99_Local install and reboot" %clean @@ -253,6 +254,7 @@ fi %defattr(-,root,root,0755) %{_sbindir}/ovirt-awake %{_sbindir}/ovirt-config-boot +%{_sbindir}/ovirt-config-boot-wrapper %{_sbindir}/ovirt-config-hostname %{_sbindir}/ovirt-config-logging %{_sbindir}/ovirt-config-networking diff --git a/scripts/ovirt-config-boot-wrapper b/scripts/ovirt-config-boot-wrapper new file mode 100644 index 0000000..6876a30 --- /dev/null +++ b/scripts/ovirt-config-boot-wrapper @@ -0,0 +1,16 @@ +#!/bin/bash +# +# Wrapper function to make sure the user wishes to continue before +# rebooting the system + +while true; do + read -p "This option will exit the menu, and require a reboot. Do you wish to continue? (Y|N)? " + r=$(echo $REPLY|tr '[[:lower:]]' '[[:upper:]]') + if [ "$r" == "Y" ]; then + /usr/sbin/ovirt-config-boot + break + elif [ "$r" == "N" ]; then + printf "\nExiting back to the menu\n" + break + fi +done -- 1.6.0.6 From mmorsi at redhat.com Thu Jan 8 22:37:08 2009 From: mmorsi at redhat.com (Mohammed Morsi) Date: Thu, 08 Jan 2009 17:37:08 -0500 Subject: [Ovirt-devel] oVirt server wui console integration Message-ID: <49668014.6060706@redhat.com> Currently the idea for the console interface in the wui is that a user can navigate the the 'virtual machines' tab under a vm pool, click on a specific vm, click on 'console' in the details pane and will be presented with a console to that vm. There were a few ideas as to where the console should appear, * in a minimally themed popup window, most likely the first implementation as it is simplest, but may result in many popups when connected to several vms * in the dialog / popup box interface we have now, we will want to introduce a tabbing mechanism for access to multiple vm consoles * in another tab in the main content area, same vm-tab concept needed here * a rollover, eg the user rolls over 'console' in the vm details pane and the console appears so long as the user holds his mouse over it / the link Its currently looking like the console frontend and apache-proxied backend daemon will be driven by anyterm http://anyterm.org/ . We will use anyterm to launch ovirt-viewer or the virsh console to connect to the vm and then present the anyterm html / js / css ui to the user. A rough layout of the setup can be found here http://ovirt.org/page/Image:Anyterm.png Looking for thoughts / feedback / suggestions as to the interface placement of the console or the backend. Thanks alot, -Mo From jeremy.perry at redhat.com Thu Jan 8 23:23:30 2009 From: jeremy.perry at redhat.com (Jeremy Perry) Date: Thu, 8 Jan 2009 18:23:30 -0500 Subject: [Ovirt-devel] Re: oVirt server wui console integration In-Reply-To: <49668014.6060706@redhat.com> References: <49668014.6060706@redhat.com> Message-ID: <820A3B59-B2C2-4A9D-A48A-A4CB1F6F7B5E@redhat.com> On Jan 8, 2009, at 5:37 PM, Mohammed Morsi wrote: > Currently the idea for the console interface in the wui is that a user > can navigate the the 'virtual machines' tab under a vm pool, click > on a > specific vm, click on 'console' in the details pane and will be > presented with a console to that vm. There were a few ideas as to > where > the console should appear, > > * in a minimally themed popup window, most likely the first > implementation as it is simplest, but may result in many popups when > connected to several vms > * in the dialog / popup box interface we have now, we will want to > introduce a tabbing mechanism for access to multiple vm consoles > * in another tab in the main content area, same vm-tab concept > needed here > * a rollover, eg the user rolls over 'console' in the vm details pane > and the console appears so long as the user holds his mouse over it / > the link > I've taken the liberty of mocking some of these ideas up here: http://file.rdu.redhat.com/~jeperry/ovirt/terminal/round1.html I didnt mockup the new themed popup window yet, since its simple to imagine. I think its a decent approach, but wondering if we can eliminate the multiple popups issue by targeting our popup once there is at least one open. Subsequent terminals would nest via tabs in the one terminal window, so all you deal with is one window with tabs for each vm terminal. > Its currently looking like the console frontend and apache-proxied > backend daemon will be driven by anyterm http://anyterm.org/ . We will > use anyterm to launch ovirt-viewer or the virsh console to connect to > the vm and then present the anyterm html / js / css ui to the user. A > rough layout of the setup can be found here > http://ovirt.org/page/Image:Anyterm.png I based my mockups on their demos - let me know if the actions I included (like copy, paste) make sense or not. > > Looking for thoughts / feedback / suggestions as to the interface > placement of the console or the backend. Thanks alot, > > -Mo Finally, I wanted to propose we settle on the term "Terminal" instead of "Console" - at least in the UI - since that is what is used in Fedora. I know terminology consistency is a challenge for us, is this a place we can make a choice in the UI and be consistent? Thanks! - Jeremy From slinabery at redhat.com Fri Jan 9 01:35:37 2009 From: slinabery at redhat.com (Steve Linabery) Date: Thu, 8 Jan 2009 19:35:37 -0600 Subject: [Ovirt-devel] [PATCH server] Add audit trail for hosts joining/leaving hwpools with Rails observer class Message-ID: <1231464937-2324-1-git-send-email-slinabery@redhat.com> Modify graph_controller.rb to utilize new audit feature when generating data for flexchart --- src/app/controllers/graph_controller.rb | 65 +++++++++++++++++++++++++-- src/app/models/hardware_pool.rb | 2 +- src/app/models/host.rb | 9 ++++ src/app/models/host_observer.rb | 47 ++++++++++++++++++++ src/app/models/membership_audit_event.rb | 26 +++++++++++ src/app/models/pool.rb | 1 + src/config/environment.rb | 2 +- src/db/migrate/033_add_pool_audit_trail.rb | 44 +++++++++++++++++++ 8 files changed, 189 insertions(+), 7 deletions(-) create mode 100644 src/app/models/host_observer.rb create mode 100644 src/app/models/membership_audit_event.rb create mode 100644 src/db/migrate/033_add_pool_audit_trail.rb diff --git a/src/app/controllers/graph_controller.rb b/src/app/controllers/graph_controller.rb index ee9425f..df516f5 100644 --- a/src/app/controllers/graph_controller.rb +++ b/src/app/controllers/graph_controller.rb @@ -6,9 +6,9 @@ class GraphController < ApplicationController def flexchart_data @id = params[:id] target = params[:target] - startTime = params[:startTime].to_i - endTime = params[:endTime].to_i - duration = endTime - startTime + startTime = Time.at(params[:startTime].to_i) + endTime = Time.at(params[:endTime].to_i) + duration = endTime.to_i - startTime.to_i #the maximum number of data points we want in any chart maxPoints = 100 @@ -29,10 +29,30 @@ class GraphController < ApplicationController counter = DEV_KEY_COUNTERS[target] pool = Pool.find(@id) - hosts = pool.hosts + hosts = Host.find(:all, + :include=> :membership_audit_events, + :conditions => ['membership_audit_events.container_target_id = ?',pool]) + requestList = [ ] hosts.each{ |host| - requestList.push StatsRequest.new(host.hostname, devclass, 0, counter, startTime, duration, resolution, DataFunction::Peak) + eventsInRange = host.membership_audit_events.from_pool(pool, + startTime, + endTime) + priorAuditEvent = host.membership_audit_events.most_recent_prior_event_from_pool(pool,startTime) + timeRanges = get_ranges_from_event_list(eventsInRange, + priorAuditEvent, + startTime, + endTime) + timeRanges.each{ |range| + requestList.push StatsRequest.new(host.hostname, + devclass, + 0, + counter, + range[0].to_i, + range[1].to_i - range[0].to_i, + resolution, + DataFunction::Peak) + } } statsList = getAggregateStatsData?(requestList) @@ -51,6 +71,41 @@ class GraphController < ApplicationController render :json => graph end + def get_ranges_from_event_list(list, priorEvent, startTime, endTime) + + results = Array.new + range = [startTime,endTime] + + joined = false + if priorEvent + if priorEvent.action == MembershipAuditEvent::JOIN + joined = true + end + end + + list.each_with_index { |event,index| + if event.action == MembershipAuditEvent::JOIN + joined = true + range[0] = event.created_at + else + range[0] = startTime unless joined + joined = false + range[1] = event.created_at + results.push Array.new(range) + range = [startTime,endTime] + end + } + + if joined + range[1] = endTime + results.push Array.new(range) + ddebug(range) + end + + results + end + + # generate layout for availability bar graphs def availability_graph diff --git a/src/app/models/hardware_pool.rb b/src/app/models/hardware_pool.rb index d39d8e7..b72d485 100644 --- a/src/app/models/hardware_pool.rb +++ b/src/app/models/hardware_pool.rb @@ -54,7 +54,7 @@ class HardwarePool < Pool hosts = Host.find(:all, :conditions => "id in (#{host_ids.join(', ')})") transaction do hosts.each do |host| - host.hardware_pool_id = target_pool_id + host.hardware_pool = HardwarePool.find(target_pool_id) host.save! end end diff --git a/src/app/models/host.rb b/src/app/models/host.rb index 640782d..813bc1d 100644 --- a/src/app/models/host.rb +++ b/src/app/models/host.rb @@ -23,6 +23,15 @@ class Host < ActiveRecord::Base belongs_to :hardware_pool belongs_to :bonding_type + has_many :membership_audit_events, :as => :member_target, :dependent => :destroy, :order => "created_at ASC" do + def from_pool(pool,startTime,endTime) + find(:all, :conditions=> ['container_target_id = ? and created_at between ? and ?',pool,startTime,endTime]) + end + def most_recent_prior_event_from_pool(pool,startTime) + find(:last, :conditions=> ['container_target_id = ? and created_at < ?',pool,startTime]) + end + end + has_many :cpus, :dependent => :destroy has_many :nics, :dependent => :destroy has_many :bondings, :dependent => :destroy diff --git a/src/app/models/host_observer.rb b/src/app/models/host_observer.rb new file mode 100644 index 0000000..df5efa1 --- /dev/null +++ b/src/app/models/host_observer.rb @@ -0,0 +1,47 @@ +# +# Copyright (C) 2008 Red Hat, Inc. +# Written by Steve Linabery +# +# 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. + +class HostObserver < ActiveRecord::Observer + + def after_create(a_host) + join = MembershipAuditEvent.new({ :member_target => a_host, + :container_target => a_host.hardware_pool, + :action => MembershipAuditEvent::JOIN }) + join.save! + end + + def before_update(a_host) + if a_host.changed? + change = a_host.changes['hardware_pool_id'] + if change + leave = MembershipAuditEvent.new({ :member_target => a_host, + :container_target => HardwarePool.find(change[0]), + :action => MembershipAuditEvent::LEAVE }) + leave.save! + + join = MembershipAuditEvent.new({ :member_target => a_host, + :container_target => HardwarePool.find(change[1]), + :action => MembershipAuditEvent::JOIN }) + join.save! + end + end + end +end + +HostObserver.instance diff --git a/src/app/models/membership_audit_event.rb b/src/app/models/membership_audit_event.rb new file mode 100644 index 0000000..b36cbee --- /dev/null +++ b/src/app/models/membership_audit_event.rb @@ -0,0 +1,26 @@ +# +# Copyright (C) 2008 Red Hat, Inc. +# Written by Steve Linabery +# +# 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. + +class MembershipAuditEvent < ActiveRecord::Base + belongs_to :container_target, :polymorphic => true + belongs_to :member_target, :polymorphic => true + + JOIN = "join" + LEAVE = "leave" +end diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb index 7034e79..614325a 100644 --- a/src/app/models/pool.rb +++ b/src/app/models/pool.rb @@ -20,6 +20,7 @@ class Pool < ActiveRecord::Base acts_as_nested_set + has_many :membership_audit_events, :as => :container_target, :dependent => :destroy # moved associations here so that nested set :include directives work # TODO: find a way to put this back into vm_resource_pool.rb has_many :vms, :dependent => :nullify, :order => "id ASC", :foreign_key => :vm_resource_pool_id diff --git a/src/config/environment.rb b/src/config/environment.rb index 53edfad..66cae90 100644 --- a/src/config/environment.rb +++ b/src/config/environment.rb @@ -82,7 +82,7 @@ Rails::Initializer.run do |config| # Activate observers that should always be running # config.active_record.observers = :cacher, :garbage_collector - + config.active_record.observers = :host_observer end # Add new inflection rules using the following format diff --git a/src/db/migrate/033_add_pool_audit_trail.rb b/src/db/migrate/033_add_pool_audit_trail.rb new file mode 100644 index 0000000..07d2433 --- /dev/null +++ b/src/db/migrate/033_add_pool_audit_trail.rb @@ -0,0 +1,44 @@ +# +# Copyright (C) 2008 Red Hat, Inc. +# Written by Steve Linabery +# +# 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. + +class AddPoolAuditTrail < ActiveRecord::Migration + def self.up + create_table :membership_audit_events do |t| + t.timestamp :created_at + t.string :action + t.integer :container_target_id + t.string :container_target_type + t.integer :member_target_id + t.string :member_target_type + t.integer :lock_version, :default => 0 + end + + Host.transaction do + Host.find(:all).each do |host| + + if (! host.membership_audit_events) + event = MembershipAuditEvent.new(:action => MembershipAuditEvent::JOIN, + :container_target => host.hardware_pool, + :member_target => host) + event.save! + end + end + end + end +end -- 1.6.0.6 From slinabery at redhat.com Fri Jan 9 01:41:36 2009 From: slinabery at redhat.com (Steve Linabery) Date: Thu, 8 Jan 2009 19:41:36 -0600 Subject: [Ovirt-devel] Re: [PATCH server] Add audit trail for hosts joining/leaving hwpools with Rails observer class In-Reply-To: <1231464937-2324-1-git-send-email-slinabery@redhat.com> References: <1231464937-2324-1-git-send-email-slinabery@redhat.com> Message-ID: <20090109014135.GG14957@redhat.com> Sorry folks, I am having some serious operator error here. I sent the wrong file. Please disregard. Third time is the charm... --Steve From slinabery at redhat.com Fri Jan 9 01:50:53 2009 From: slinabery at redhat.com (Steve Linabery) Date: Thu, 8 Jan 2009 19:50:53 -0600 Subject: [Ovirt-devel] [PATCH server] (Legit) Add audit trl for hosts join/leaving hwpools w/Rails observer class Message-ID: <1231465853-2898-1-git-send-email-slinabery@redhat.com> Modify graph_controller.rb to utilize new audit feature when generating data for flexchart --- src/app/controllers/graph_controller.rb | 64 +++++++++++++++++++++++++-- src/app/models/hardware_pool.rb | 2 +- src/app/models/host.rb | 9 ++++ src/app/models/host_observer.rb | 47 ++++++++++++++++++++ src/app/models/membership_audit_event.rb | 26 +++++++++++ src/app/models/pool.rb | 1 + src/config/environment.rb | 2 +- src/db/migrate/033_add_pool_audit_trail.rb | 44 +++++++++++++++++++ 8 files changed, 188 insertions(+), 7 deletions(-) create mode 100644 src/app/models/host_observer.rb create mode 100644 src/app/models/membership_audit_event.rb create mode 100644 src/db/migrate/033_add_pool_audit_trail.rb diff --git a/src/app/controllers/graph_controller.rb b/src/app/controllers/graph_controller.rb index ee9425f..e8eea7e 100644 --- a/src/app/controllers/graph_controller.rb +++ b/src/app/controllers/graph_controller.rb @@ -6,9 +6,9 @@ class GraphController < ApplicationController def flexchart_data @id = params[:id] target = params[:target] - startTime = params[:startTime].to_i - endTime = params[:endTime].to_i - duration = endTime - startTime + startTime = Time.at(params[:startTime].to_i) + endTime = Time.at(params[:endTime].to_i) + duration = endTime.to_i - startTime.to_i #the maximum number of data points we want in any chart maxPoints = 100 @@ -29,10 +29,30 @@ class GraphController < ApplicationController counter = DEV_KEY_COUNTERS[target] pool = Pool.find(@id) - hosts = pool.hosts + hosts = Host.find(:all, + :include=> :membership_audit_events, + :conditions => ['membership_audit_events.container_target_id = ?',pool]) + requestList = [ ] hosts.each{ |host| - requestList.push StatsRequest.new(host.hostname, devclass, 0, counter, startTime, duration, resolution, DataFunction::Peak) + eventsInRange = host.membership_audit_events.from_pool(pool, + startTime, + endTime) + priorAuditEvent = host.membership_audit_events.most_recent_prior_event_from_pool(pool,startTime) + timeRanges = get_ranges_from_event_list(eventsInRange, + priorAuditEvent, + startTime, + endTime) + timeRanges.each{ |range| + requestList.push StatsRequest.new(host.hostname, + devclass, + 0, + counter, + range[0].to_i, + range[1].to_i - range[0].to_i, + resolution, + DataFunction::Peak) + } } statsList = getAggregateStatsData?(requestList) @@ -51,6 +71,40 @@ class GraphController < ApplicationController render :json => graph end + def get_ranges_from_event_list(list, priorEvent, startTime, endTime) + + results = Array.new + range = [startTime,endTime] + + joined = false + if priorEvent + if priorEvent.action == MembershipAuditEvent::JOIN + joined = true + end + end + + list.each_with_index { |event,index| + if event.action == MembershipAuditEvent::JOIN + joined = true + range[0] = event.created_at + else + range[0] = startTime unless joined + joined = false + range[1] = event.created_at + results.push Array.new(range) + range = [startTime,endTime] + end + } + + if joined + range[1] = endTime + results.push Array.new(range) + end + + results + end + + # generate layout for availability bar graphs def availability_graph diff --git a/src/app/models/hardware_pool.rb b/src/app/models/hardware_pool.rb index d39d8e7..b72d485 100644 --- a/src/app/models/hardware_pool.rb +++ b/src/app/models/hardware_pool.rb @@ -54,7 +54,7 @@ class HardwarePool < Pool hosts = Host.find(:all, :conditions => "id in (#{host_ids.join(', ')})") transaction do hosts.each do |host| - host.hardware_pool_id = target_pool_id + host.hardware_pool = HardwarePool.find(target_pool_id) host.save! end end diff --git a/src/app/models/host.rb b/src/app/models/host.rb index 640782d..813bc1d 100644 --- a/src/app/models/host.rb +++ b/src/app/models/host.rb @@ -23,6 +23,15 @@ class Host < ActiveRecord::Base belongs_to :hardware_pool belongs_to :bonding_type + has_many :membership_audit_events, :as => :member_target, :dependent => :destroy, :order => "created_at ASC" do + def from_pool(pool,startTime,endTime) + find(:all, :conditions=> ['container_target_id = ? and created_at between ? and ?',pool,startTime,endTime]) + end + def most_recent_prior_event_from_pool(pool,startTime) + find(:last, :conditions=> ['container_target_id = ? and created_at < ?',pool,startTime]) + end + end + has_many :cpus, :dependent => :destroy has_many :nics, :dependent => :destroy has_many :bondings, :dependent => :destroy diff --git a/src/app/models/host_observer.rb b/src/app/models/host_observer.rb new file mode 100644 index 0000000..df5efa1 --- /dev/null +++ b/src/app/models/host_observer.rb @@ -0,0 +1,47 @@ +# +# Copyright (C) 2008 Red Hat, Inc. +# Written by Steve Linabery +# +# 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. + +class HostObserver < ActiveRecord::Observer + + def after_create(a_host) + join = MembershipAuditEvent.new({ :member_target => a_host, + :container_target => a_host.hardware_pool, + :action => MembershipAuditEvent::JOIN }) + join.save! + end + + def before_update(a_host) + if a_host.changed? + change = a_host.changes['hardware_pool_id'] + if change + leave = MembershipAuditEvent.new({ :member_target => a_host, + :container_target => HardwarePool.find(change[0]), + :action => MembershipAuditEvent::LEAVE }) + leave.save! + + join = MembershipAuditEvent.new({ :member_target => a_host, + :container_target => HardwarePool.find(change[1]), + :action => MembershipAuditEvent::JOIN }) + join.save! + end + end + end +end + +HostObserver.instance diff --git a/src/app/models/membership_audit_event.rb b/src/app/models/membership_audit_event.rb new file mode 100644 index 0000000..b36cbee --- /dev/null +++ b/src/app/models/membership_audit_event.rb @@ -0,0 +1,26 @@ +# +# Copyright (C) 2008 Red Hat, Inc. +# Written by Steve Linabery +# +# 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. + +class MembershipAuditEvent < ActiveRecord::Base + belongs_to :container_target, :polymorphic => true + belongs_to :member_target, :polymorphic => true + + JOIN = "join" + LEAVE = "leave" +end diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb index 7034e79..614325a 100644 --- a/src/app/models/pool.rb +++ b/src/app/models/pool.rb @@ -20,6 +20,7 @@ class Pool < ActiveRecord::Base acts_as_nested_set + has_many :membership_audit_events, :as => :container_target, :dependent => :destroy # moved associations here so that nested set :include directives work # TODO: find a way to put this back into vm_resource_pool.rb has_many :vms, :dependent => :nullify, :order => "id ASC", :foreign_key => :vm_resource_pool_id diff --git a/src/config/environment.rb b/src/config/environment.rb index 53edfad..66cae90 100644 --- a/src/config/environment.rb +++ b/src/config/environment.rb @@ -82,7 +82,7 @@ Rails::Initializer.run do |config| # Activate observers that should always be running # config.active_record.observers = :cacher, :garbage_collector - + config.active_record.observers = :host_observer end # Add new inflection rules using the following format diff --git a/src/db/migrate/033_add_pool_audit_trail.rb b/src/db/migrate/033_add_pool_audit_trail.rb new file mode 100644 index 0000000..d4b4338 --- /dev/null +++ b/src/db/migrate/033_add_pool_audit_trail.rb @@ -0,0 +1,44 @@ +# +# Copyright (C) 2008 Red Hat, Inc. +# Written by Steve Linabery +# +# 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. + +class AddPoolAuditTrail < ActiveRecord::Migration + def self.up + create_table :membership_audit_events do |t| + t.timestamp :created_at + t.string :action + t.integer :container_target_id + t.string :container_target_type + t.integer :member_target_id + t.string :member_target_type + t.integer :lock_version, :default => 0 + end + + Host.transaction do + Host.find(:all).each do |host| + + if (! host.membership_audit_events) + event = MembershipAuditEvent.new(:action => MembershipAuditEvent::JOIN, + :container_target => host.hardware_pool, + :member_target => host) + event.save! + end + end + end + end +end -- 1.6.0.6 From jguiditt at redhat.com Fri Jan 9 03:04:14 2009 From: jguiditt at redhat.com (Jason Guiditta) Date: Thu, 08 Jan 2009 22:04:14 -0500 Subject: [Ovirt-devel] Re: oVirt server wui console integration In-Reply-To: <820A3B59-B2C2-4A9D-A48A-A4CB1F6F7B5E@redhat.com> References: <49668014.6060706@redhat.com> <820A3B59-B2C2-4A9D-A48A-A4CB1F6F7B5E@redhat.com> Message-ID: <1231470254.4174.19.camel@physical.priv.ovirt.org> On Thu, 2009-01-08 at 18:23 -0500, Jeremy Perry wrote: > On Jan 8, 2009, at 5:37 PM, Mohammed Morsi wrote: > > > Currently the idea for the console interface in the wui is that a user > > can navigate the the 'virtual machines' tab under a vm pool, click > > on a > > specific vm, click on 'console' in the details pane and will be > > presented with a console to that vm. There were a few ideas as to > > where > > the console should appear, > > > > * in a minimally themed popup window, most likely the first > > implementation as it is simplest, but may result in many popups when > > connected to several vms > > * in the dialog / popup box interface we have now, we will want to > > introduce a tabbing mechanism for access to multiple vm consoles > > * in another tab in the main content area, same vm-tab concept > > needed here > > * a rollover, eg the user rolls over 'console' in the vm details pane > > and the console appears so long as the user holds his mouse over it / > > the link > > > I've taken the liberty of mocking some of these ideas up. > > I didnt mockup the new themed popup window yet, since its simple to > imagine. I think its a decent approach, but wondering if we can > eliminate the multiple popups issue by targeting our popup once there > is at least one open. Subsequent terminals would nest via tabs in the > one terminal window, so all you deal with is one window with tabs for > each vm terminal. I like the idea of the popup window, then adding tabs to it as needed, and like the pop-out (thanks google!). My first choice is the design with the initial console on the right of the details in the same pane. The other with them stacked felt too squished. The tabbed one could work too, but I kind of think the terminal being in the detail pane is not super usable, since you can't see that much in the space allowed. I agree on the modal dialog thing, no need to force them to have only that accessible, but another idea could be a non-modal dialog that you could minimize somewhere w/in the application. If done right, I think this could be pretty slick, but perhaps not worth the effort, as the single popup window seems like a perfectly good way to go. > > > Its currently looking like the console frontend and apache-proxied > > backend daemon will be driven by anyterm http://anyterm.org/ . We will > > use anyterm to launch ovirt-viewer or the virsh console to connect to > > the vm and then present the anyterm html / js / css ui to the user. A > > rough layout of the setup can be found here > > http://ovirt.org/page/Image:Anyterm.png > > I based my mockups on their demos - let me know if the actions I > included (like copy, paste) make sense or not. > > > > Looking for thoughts / feedback / suggestions as to the interface > > placement of the console or the backend. Thanks alot, > > > > -Mo > > > Finally, I wanted to propose we settle on the term "Terminal" instead > of "Console" - at least in the UI - since that is what is used in > Fedora. I know terminology consistency is a challenge for us, is this > a place we can make a choice in the UI and be consistent? > Seems reasonable to me, matches more closely with the 'anyterm' name too. > Thanks! > - Jeremy From pmyers at redhat.com Fri Jan 9 05:07:02 2009 From: pmyers at redhat.com (Perry Myers) Date: Fri, 09 Jan 2009 00:07:02 -0500 Subject: [Ovirt-devel] [PATCH node] Updating menu labels In-Reply-To: <4965A442.3090601@redhat.com> References: <4965A307.1040009@redhat.com> <4965A442.3090601@redhat.com> Message-ID: <4966DB76.1090707@redhat.com> Christopher Curran wrote: > Christopher Curran wrote: >> Can we use the word 'stand-alone' over 'standalone'. I know google >> will disagree with me but style guides and dictionaries support the >> stand-alone spelling. This is mainly to make my life easier by >> sticking to one consistent style. Here is a patch to fix it. >> >> > Stupid email clients... This one should work I've no objection to this change as long as the patch catches all instances of it. Perry From ccurran at redhat.com Fri Jan 9 05:52:57 2009 From: ccurran at redhat.com (Christopher Curran) Date: Fri, 09 Jan 2009 15:52:57 +1000 Subject: [Ovirt-devel] [PATCH node] Updating menu labels In-Reply-To: <4966DB76.1090707@redhat.com> References: <4965A307.1040009@redhat.com> <4965A442.3090601@redhat.com> <4966DB76.1090707@redhat.com> Message-ID: <4966E639.6010706@redhat.com> Perry Myers wrote: > Christopher Curran wrote: >> Christopher Curran wrote: >>> Can we use the word 'stand-alone' over 'standalone'. I know google >>> will disagree with me but style guides and dictionaries support the >>> stand-alone spelling. This is mainly to make my life easier by >>> sticking to one consistent style. Here is a patch to fix it. >>> >>> >> Stupid email clients... This one should work > > I've no objection to this change as long as the patch catches all > instances of it. > > Perry everything except variable names. From pmyers at redhat.com Fri Jan 9 05:53:47 2009 From: pmyers at redhat.com (Perry Myers) Date: Fri, 09 Jan 2009 00:53:47 -0500 Subject: [Ovirt-devel] [PATCH node] Updating menu labels In-Reply-To: <4966E639.6010706@redhat.com> References: <4965A307.1040009@redhat.com> <4965A442.3090601@redhat.com> <4966DB76.1090707@redhat.com> <4966E639.6010706@redhat.com> Message-ID: <4966E66B.20503@redhat.com> Christopher Curran wrote: > Perry Myers wrote: >> Christopher Curran wrote: >>> Christopher Curran wrote: >>>> Can we use the word 'stand-alone' over 'standalone'. I know google >>>> will disagree with me but style guides and dictionaries support the >>>> stand-alone spelling. This is mainly to make my life easier by >>>> sticking to one consistent style. Here is a patch to fix it. >>>> >>>> >>> Stupid email clients... This one should work >> >> I've no objection to this change as long as the patch catches all >> instances of it. >> >> Perry > everything except variable names. That's fine. variable names can omit the hyphen. Perry -- |=- Red Hat, Engineering, Emerging Technologies, Boston -=| |=- Email: pmyers at redhat.com -=| |=- Office: +1 412 474 3552 Mobile: +1 703 362 9622 -=| |=- GnuPG: E65E4F3D 88F9 F1C9 C2F3 1303 01FE 817C C5D2 8B91 E65E 4F3D -=| From jeremy.perry at redhat.com Fri Jan 9 15:55:43 2009 From: jeremy.perry at redhat.com (Jeremy Perry) Date: Fri, 9 Jan 2009 10:55:43 -0500 Subject: [Ovirt-devel] Re: oVirt server wui console integration In-Reply-To: <1231470254.4174.19.camel@physical.priv.ovirt.org> References: <49668014.6060706@redhat.com> <820A3B59-B2C2-4A9D-A48A-A4CB1F6F7B5E@redhat.com> <1231470254.4174.19.camel@physical.priv.ovirt.org> Message-ID: <41FA0D09-2A71-4A17-B9D2-0078B2D40A8D@redhat.com> I've posted the mockups and descriptions mentioned here to the the ovirt.org wiki: http://ovirt.org/page/Terminal_UX one more comment below... On Jan 8, 2009, at 10:04 PM, Jason Guiditta wrote: > On Thu, 2009-01-08 at 18:23 -0500, Jeremy Perry wrote: >> On Jan 8, 2009, at 5:37 PM, Mohammed Morsi wrote: >> >>> Currently the idea for the console interface in the wui is that a >>> user >>> can navigate the the 'virtual machines' tab under a vm pool, click >>> on a >>> specific vm, click on 'console' in the details pane and will be >>> presented with a console to that vm. There were a few ideas as to >>> where >>> the console should appear, >>> >>> * in a minimally themed popup window, most likely the first >>> implementation as it is simplest, but may result in many popups when >>> connected to several vms >>> * in the dialog / popup box interface we have now, we will want to >>> introduce a tabbing mechanism for access to multiple vm consoles >>> * in another tab in the main content area, same vm-tab concept >>> needed here >>> * a rollover, eg the user rolls over 'console' in the vm details >>> pane >>> and the console appears so long as the user holds his mouse over >>> it / >>> the link >>> >> I've taken the liberty of mocking some of these ideas up. >> >> I didnt mockup the new themed popup window yet, since its simple to >> imagine. I think its a decent approach, but wondering if we can >> eliminate the multiple popups issue by targeting our popup once there >> is at least one open. Subsequent terminals would nest via tabs in the >> one terminal window, so all you deal with is one window with tabs for >> each vm terminal. > > I like the idea of the popup window, then adding tabs to it as needed, > and like the pop-out (thanks google!). My first choice is the design > with the initial console on the right of the details in the same pane. > The other with them stacked felt too squished. The tabbed one could > work too, but I kind of think the terminal being in the detail pane is > not super usable, since you can't see that much in the space > allowed. I > agree on the modal dialog thing, no need to force them to have only > that > accessible, but another idea could be a non-modal dialog that you > could > minimize somewhere w/in the application. If done right, I think this > could be pretty slick, but perhaps not worth the effort, as the single > popup window seems like a perfectly good way to go. I agree on the popup window, and will take a stab at it. As for the non-modal idea, this would be pretty cool to look at. Well executed examples in the wild is Google chat in gmail and the alerts/etc bar in facebook. > >> >>> Its currently looking like the console frontend and apache-proxied >>> backend daemon will be driven by anyterm http://anyterm.org/ . We >>> will >>> use anyterm to launch ovirt-viewer or the virsh console to connect >>> to >>> the vm and then present the anyterm html / js / css ui to the >>> user. A >>> rough layout of the setup can be found here >>> http://ovirt.org/page/Image:Anyterm.png >> >> I based my mockups on their demos - let me know if the actions I >> included (like copy, paste) make sense or not. >>> >>> Looking for thoughts / feedback / suggestions as to the interface >>> placement of the console or the backend. Thanks alot, >>> >>> -Mo >> >> >> Finally, I wanted to propose we settle on the term "Terminal" instead >> of "Console" - at least in the UI - since that is what is used in >> Fedora. I know terminology consistency is a challenge for us, is this >> a place we can make a choice in the UI and be consistent? >> > Seems reasonable to me, matches more closely with the 'anyterm' name > too. >> Thanks! >> - Jeremy > From mmorsi at redhat.com Fri Jan 9 17:15:45 2009 From: mmorsi at redhat.com (Mohammed Morsi) Date: Fri, 09 Jan 2009 12:15:45 -0500 Subject: [Ovirt-devel] Re: oVirt server wui console integration In-Reply-To: <41FA0D09-2A71-4A17-B9D2-0078B2D40A8D@redhat.com> References: <49668014.6060706@redhat.com> <820A3B59-B2C2-4A9D-A48A-A4CB1F6F7B5E@redhat.com> <1231470254.4174.19.camel@physical.priv.ovirt.org> <41FA0D09-2A71-4A17-B9D2-0078B2D40A8D@redhat.com> Message-ID: <49678641.4040504@redhat.com> Jeremy Perry wrote: > I've posted the mockups and descriptions mentioned here to the the > ovirt.org wiki: > http://ovirt.org/page/Terminal_UX > > one more comment below... > > On Jan 8, 2009, at 10:04 PM, Jason Guiditta wrote: > >> On Thu, 2009-01-08 at 18:23 -0500, Jeremy Perry wrote: >>> On Jan 8, 2009, at 5:37 PM, Mohammed Morsi wrote: >>> >>>> Currently the idea for the console interface in the wui is that a user >>>> can navigate the the 'virtual machines' tab under a vm pool, click >>>> on a >>>> specific vm, click on 'console' in the details pane and will be >>>> presented with a console to that vm. There were a few ideas as to >>>> where >>>> the console should appear, >>>> >>>> * in a minimally themed popup window, most likely the first >>>> implementation as it is simplest, but may result in many popups when >>>> connected to several vms >>>> * in the dialog / popup box interface we have now, we will want to >>>> introduce a tabbing mechanism for access to multiple vm consoles >>>> * in another tab in the main content area, same vm-tab concept >>>> needed here >>>> * a rollover, eg the user rolls over 'console' in the vm details pane >>>> and the console appears so long as the user holds his mouse over it / >>>> the link >>>> >>> I've taken the liberty of mocking some of these ideas up. >>> >>> I didnt mockup the new themed popup window yet, since its simple to >>> imagine. I think its a decent approach, but wondering if we can >>> eliminate the multiple popups issue by targeting our popup once there >>> is at least one open. Subsequent terminals would nest via tabs in the >>> one terminal window, so all you deal with is one window with tabs for >>> each vm terminal. >> >> I like the idea of the popup window, then adding tabs to it as needed, >> and like the pop-out (thanks google!). My first choice is the design >> with the initial console on the right of the details in the same pane. >> The other with them stacked felt too squished. The tabbed one could >> work too, but I kind of think the terminal being in the detail pane is >> not super usable, since you can't see that much in the space allowed. I >> agree on the modal dialog thing, no need to force them to have only that >> accessible, but another idea could be a non-modal dialog that you could >> minimize somewhere w/in the application. If done right, I think this >> could be pretty slick, but perhaps not worth the effort, as the single >> popup window seems like a perfectly good way to go. > > I agree on the popup window, and will take a stab at it. As for the > non-modal idea, this would be pretty cool to look at. Well executed > examples in the wild is Google chat in gmail and the alerts/etc bar in > facebook. I also agree that the terminal in the details pane seems a bit squished. I'm not sure if we'd be able to do this immediately, but I'd think we'd also want to support terminal resizing at some point in the future (size saved in the user preferences system when we have it). I also like the idea of the non-modal dialog, perhaps we can 'minimize' it to the dashboard so that a user can maintain active terminal sessions between uses of the ovirt wui. > >> >>> >>>> Its currently looking like the console frontend and apache-proxied >>>> backend daemon will be driven by anyterm http://anyterm.org/ . We will >>>> use anyterm to launch ovirt-viewer or the virsh console to connect to >>>> the vm and then present the anyterm html / js / css ui to the user. A >>>> rough layout of the setup can be found here >>>> http://ovirt.org/page/Image:Anyterm.png >>> >>> I based my mockups on their demos - let me know if the actions I >>> included (like copy, paste) make sense or not. Ya thats totally fine for the mockups, I might remove some of that stuff from the anyterm html that gets added to the project (its all gpl) depending of how it works and what we need. In any case 'Close' will definetly be staying, 'copy' and 'paste' might be removed depending on if we can get that functionality without it, 'Control Keys' will most likey be removed as they work without needing the drop down. I do like the 'pop out' action you added, and I'll look into seeing how the terminal location can be parametrized so that we could put it in multiple locations. >>>> >>>> Looking for thoughts / feedback / suggestions as to the interface >>>> placement of the console or the backend. Thanks alot, >>>> >>>> -Mo >>> >>> >>> Finally, I wanted to propose we settle on the term "Terminal" instead >>> of "Console" - at least in the UI - since that is what is used in >>> Fedora. I know terminology consistency is a challenge for us, is this >>> a place we can make a choice in the UI and be consistent? >>> >> Seems reasonable to me, matches more closely with the 'anyterm' name >> too. >>> Thanks! >>> - Jeremy >> > Sounds good to me too. -Mo From mdehaan at redhat.com Fri Jan 9 21:55:31 2009 From: mdehaan at redhat.com (Michael DeHaan) Date: Fri, 09 Jan 2009 16:55:31 -0500 Subject: [Ovirt-devel] Re: oVirt server wui console integration In-Reply-To: <49678641.4040504@redhat.com> References: <49668014.6060706@redhat.com> <820A3B59-B2C2-4A9D-A48A-A4CB1F6F7B5E@redhat.com> <1231470254.4174.19.camel@physical.priv.ovirt.org> <41FA0D09-2A71-4A17-B9D2-0078B2D40A8D@redhat.com> <49678641.4040504@redhat.com> Message-ID: <4967C7D3.9080004@redhat.com> Mohammed Morsi wrote: > Jeremy Perry wrote: > >> I've posted the mockups and descriptions mentioned here to the the >> ovirt.org wiki: >> http://ovirt.org/page/Terminal_UX >> >> one more comment below... >> >> On Jan 8, 2009, at 10:04 PM, Jason Guiditta wrote: >> >> >>> On Thu, 2009-01-08 at 18:23 -0500, Jeremy Perry wrote: >>> >>>> On Jan 8, 2009, at 5:37 PM, Mohammed Morsi wrote: >>>> >>>> >>>>> Currently the idea for the console interface in the wui is that a user >>>>> can navigate the the 'virtual machines' tab under a vm pool, click >>>>> on a >>>>> specific vm, click on 'console' in the details pane and will be >>>>> presented with a console to that vm. There were a few ideas as to >>>>> where >>>>> the console should appear, >>>>> >>>>> * in a minimally themed popup window, most likely the first >>>>> implementation as it is simplest, but may result in many popups when >>>>> connected to several vms >>>>> * in the dialog / popup box interface we have now, we will want to >>>>> introduce a tabbing mechanism for access to multiple vm consoles >>>>> * in another tab in the main content area, same vm-tab concept >>>>> needed here >>>>> * a rollover, eg the user rolls over 'console' in the vm details pane >>>>> and the console appears so long as the user holds his mouse over it / >>>>> the link >>>>> >>>>> >>>> I've taken the liberty of mocking some of these ideas up. >>>> >>>> I didnt mockup the new themed popup window yet, since its simple to >>>> imagine. I think its a decent approach, but wondering if we can >>>> eliminate the multiple popups issue by targeting our popup once there >>>> is at least one open. Subsequent terminals would nest via tabs in the >>>> one terminal window, so all you deal with is one window with tabs for >>>> each vm terminal. >>>> >>> I like the idea of the popup window, then adding tabs to it as needed, >>> and like the pop-out (thanks google!). My first choice is the design >>> with the initial console on the right of the details in the same pane. >>> The other with them stacked felt too squished. The tabbed one could >>> work too, but I kind of think the terminal being in the detail pane is >>> not super usable, since you can't see that much in the space allowed. I >>> agree on the modal dialog thing, no need to force them to have only that >>> accessible, but another idea could be a non-modal dialog that you could >>> minimize somewhere w/in the application. If done right, I think this >>> could be pretty slick, but perhaps not worth the effort, as the single >>> popup window seems like a perfectly good way to go. >>> >> I agree on the popup window, and will take a stab at it. As for the >> non-modal idea, this would be pretty cool to look at. Well executed >> examples in the wild is Google chat in gmail and the alerts/etc bar in >> facebook. >> > > I also agree that the terminal in the details pane seems a bit squished. > I'm not sure if we'd be able to do this immediately, but I'd think we'd > also want to support terminal resizing at some point in the future > (size saved in the user preferences system when we have it). I also like > the idea of the non-modal dialog, perhaps we can 'minimize' it to the > dashboard so that a user can maintain active terminal sessions between > uses of the ovirt wui. > > > >>>>> Its currently looking like the console frontend and apache-proxied >>>>> backend daemon will be driven by anyterm http://anyterm.org/ . We will >>>>> use anyterm to launch ovirt-viewer or the virsh console to connect to >>>>> the vm and then present the anyterm html / js / css ui to the user. A >>>>> rough layout of the setup can be found here >>>>> http://ovirt.org/page/Image:Anyterm.png >>>>> >>>> I based my mockups on their demos - let me know if the actions I >>>> included (like copy, paste) make sense or not. >>>> > > Ya thats totally fine for the mockups, I might remove some of that stuff > from the anyterm html that gets added to the project (its all gpl) > depending of how it works and what we need. > > In any case 'Close' will definetly be staying, 'copy' and 'paste' might > be removed depending on if we can get that functionality without it, > 'Control Keys' will most likey be removed as they work without needing > the drop down. I do like the 'pop out' action you added, and I'll look > into seeing how the terminal location can be parametrized so that we > could put it in multiple locations. > > > >>>>> Looking for thoughts / feedback / suggestions as to the interface >>>>> placement of the console or the backend. Thanks alot, >>>>> >>>>> -Mo >>>>> >>>> Finally, I wanted to propose we settle on the term "Terminal" instead >>>> of "Console" - at least in the UI - since that is what is used in >>>> Fedora. I know terminology consistency is a challenge for us, is this >>>> a place we can make a choice in the UI and be consistent? >>>> >>>> >>> Seems reasonable to me, matches more closely with the 'anyterm' name >>> too. >>> >>>> Thanks! >>>> - Jeremy >>>> > > Sounds good to me too. > > -Mo > > _______________________________________________ > Ovirt-devel mailing list > Ovirt-devel at redhat.com > https://www.redhat.com/mailman/listinfo/ovirt-devel > How about a link to just the terminal (no-popup) so someone can just do "New Tab" in Firefox and get a nice large terminal? Tabs across the top may also not scale if a user has a bit too many VMs open (perhaps a drop down to select the VM, or multiple firefox tabs?) --Michael From sseago at redhat.com Fri Jan 9 22:33:41 2009 From: sseago at redhat.com (Scott Seago) Date: Fri, 09 Jan 2009 17:33:41 -0500 Subject: [Ovirt-devel] [PATCH server] (Legit) Add audit trl for hosts join/leaving hwpools w/Rails observer class In-Reply-To: <1231465853-2898-1-git-send-email-slinabery@redhat.com> References: <1231465853-2898-1-git-send-email-slinabery@redhat.com> Message-ID: <4967D0C5.9050703@redhat.com> Steve Linabery wrote: > Modify graph_controller.rb to utilize new audit feature when generating data for flexchart > --- > src/app/controllers/graph_controller.rb | 64 +++++++++++++++++++++++++-- > src/app/models/hardware_pool.rb | 2 +- > src/app/models/host.rb | 9 ++++ > src/app/models/host_observer.rb | 47 ++++++++++++++++++++ > src/app/models/membership_audit_event.rb | 26 +++++++++++ > src/app/models/pool.rb | 1 + > src/config/environment.rb | 2 +- > src/db/migrate/033_add_pool_audit_trail.rb | 44 +++++++++++++++++++ > 8 files changed, 188 insertions(+), 7 deletions(-) > create mode 100644 src/app/models/host_observer.rb > create mode 100644 src/app/models/membership_audit_event.rb > create mode 100644 src/db/migrate/033_add_pool_audit_trail.rb > > diff --git a/src/db/migrate/033_add_pool_audit_trail.rb b/src/db/migrate/033_add_pool_audit_trail.rb > new file mode 100644 > index 0000000..d4b4338 > --- /dev/null > +++ b/src/db/migrate/033_add_pool_audit_trail.rb > @@ -0,0 +1,44 @@ > +class AddPoolAuditTrail < ActiveRecord::Migration > + def self.up > + create_table :membership_audit_events do |t| > + t.timestamp :created_at > + t.string :action > + t.integer :container_target_id > + t.string :container_target_type > + t.integer :member_target_id > + t.string :member_target_type > + t.integer :lock_version, :default => 0 > + end > + > + Host.transaction do > + Host.find(:all).each do |host| > + > + if (! host.membership_audit_events) > This line needs to be changed to if (host.membership_audit_events.empty?) > + event = MembershipAuditEvent.new(:action => MembershipAuditEvent::JOIN, > + :container_target => host.hardware_pool, > + :member_target => host) > + event.save! > + end > + end > + end > + end > +end > You should also probably write the self.down action to remove the table if a downgrade is attempted. But other than these two migration issues, ACK -- seems to work fine for me. Scott From my.nikkea at gmail.com Fri Jan 9 09:46:30 2009 From: my.nikkea at gmail.com (nikkea) Date: Fri, 09 Jan 2009 17:46:30 +0800 Subject: [Ovirt-devel] How to update ovirt based current version? Message-ID: <49671CF6.4010904@gmail.com> --Just as title. From pmyers at redhat.com Fri Jan 9 23:33:07 2009 From: pmyers at redhat.com (Perry Myers) Date: Fri, 09 Jan 2009 18:33:07 -0500 Subject: [Ovirt-devel] How to update ovirt based current version? In-Reply-To: <49671CF6.4010904@gmail.com> References: <49671CF6.4010904@gmail.com> Message-ID: <4967DEB3.4010004@redhat.com> nikkea wrote: > --Just as title. Right now we don't support upgrades from released versions since the API and database formats are still actively being updated. Starting with 1.0 we'll support upgrades between minor version release. But for the time being we recommend that users start fresh with each release. 0.96 is the latest release right now. Thanks, Perry From lutter at redhat.com Sat Jan 10 00:02:48 2009 From: lutter at redhat.com (David Lutterkort) Date: Fri, 09 Jan 2009 16:02:48 -0800 Subject: [Ovirt-devel] [PATCH] Add task list to dashboard In-Reply-To: <1231440209-26690-1-git-send-email-sseago@redhat.com> References: <1231440209-26690-1-git-send-email-sseago@redhat.com> Message-ID: <1231545768.434.31.camel@localhost.localdomain> On Thu, 2009-01-08 at 18:43 +0000, Scott Seago wrote: > Refactored task list functionality to allow for the dashboard-level task list. > The dashboard task list shows all tasks initiated by the logged-in user, and is > filterable by task type and state. This causes trouble for me when looking at the task list for a VM pool (see below) Some minor nits on the presentation: * When I look at the dashboard now, I have a single tab that says 'Dashboard' - shouldn't that say 'Tasks' ? * When there are no tasks to display, I get that empty splash screen with a '+' in it, as if I could add a task - that shouldn't be there * Some general comments on how task lists are displayed (nothing to do with this patch in particular): 1. Could we use an icon to indicate state ? Using a whole column is kinda bulky, and not as informative as a nice icon 2. The column 'Message' is only visible after scrolling, even though it's pretty important - that should be moved to a more prominent position (like right next to 'Action') 3. The column 'Args' is almost always empty - why not just drop it from the default view, or roll the info from that into another column, e.g. Action 4. It would be nice if you could combine several of the Type resp. State filters (like look at all Storage and Storage Volume tasks) - and as somebody else mentioned, a clearer indication of the currently active filters 5. Conceptually, do users really care about the distinction between 'Storage' and 'Storage Volume' tasks ? Why not just lump them all into 'Storage tasks' ? Some more comments; most of them are more todo type items, though it might be good to address as many of htem aspossible right away. > Signed-off-by: Scott Seago > --- > src/app/controllers/dashboard_controller.rb | 41 +++++++--- > src/app/controllers/hardware_controller.rb | 12 +--- > src/app/controllers/pool_controller.rb | 41 ++-------- > src/app/controllers/task_actions.rb | 50 ++++++++++++ > src/app/models/task.rb | 13 +++ > src/app/views/dashboard/index.html.erb | 38 ++------- > src/app/views/hardware/show_tasks.rhtml | 84 ++------------------ > src/app/views/layouts/_navigation_tabs.rhtml | 20 ++++- > src/app/views/resources/show_tasks.rhtml | 68 ++-------------- > src/app/views/task/_grid.rhtml | 2 +- > .../show_tasks.rhtml => task/_show.rhtml} | 57 +++++++------ > 11 files changed, 169 insertions(+), 257 deletions(-) > create mode 100644 src/app/controllers/task_actions.rb > copy src/app/views/{hardware/show_tasks.rhtml => task/_show.rhtml} (59%) > > diff --git a/src/app/controllers/dashboard_controller.rb b/src/app/controllers/dashboard_controller.rb > index c4830df..00398a5 100644 > --- a/src/app/controllers/dashboard_controller.rb > +++ b/src/app/controllers/dashboard_controller.rb > @@ -18,19 +18,36 @@ > # also available at http://www.gnu.org/copyleft/gpl.html. > > class DashboardController < ApplicationController Not directly a comment about this patch: it would be cleaner if we had a TaskController with an index action that accepts parameters to restrict the list of tasks to a certain object, e.g. a hw pool or a vm pool. The implementation with TaskActions and the index -> show_tasks -> show call sequence seems a little roundabout. > + > + include TaskActions > + def tasks_query_obj > + Task > + end > + def tasks_conditions > + {:user => get_login_user} > + end > + > def index > - @default_pool = HardwarePool.get_default_pool > - set_perms(@default_pool) > - #remove these soon > - @hardware_pools = HardwarePool.find(:all) > - @available_hosts = Host.find(:all) > - @available_storage_volumes = StorageVolume.find(:all) > - @storage_pools = StoragePool.find(:all) > - @hosts = Host.find(:all) > - @storage_volumes = StorageVolume.find(:all) > - @vms = Vm.find(:all) > - if params[:ajax] > - render :layout => 'tabs-and-content' #:template => 'hardware/show.html.erb' > + @task_types = Task::TASK_TYPES_OPTIONS > + show_tasks > + end > + > + def show > + respond_to do |format| > + format.html { > + render :layout => 'tabs-and-content' if params[:ajax] > + render :layout => 'help-and-content' if params[:nolayout] > + } > + format.xml { > + render :xml => @pool.to_xml(XML_OPTS) > + } > end > end Thanks for thinking of the API ;) It seems though that this is missing a route to really work - and for retrieving lists of items, the index action should be used, not show. > --- a/src/app/views/hardware/show_tasks.rhtml > +++ b/src/app/views/task/_show.rhtml > @@ -1,33 +1,36 @@ >

> -

> - <%= image_tag "icon_move.png", :style => "vertical-align:middle;" %> Type <%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %> > -
- - <% if (index == @task_types.length - 1) or @task_types[index].length == 3 %> > - style="border-bottom: 1px solid #CCCCCC;" > - <% end %> > - > > - > - <%= @task_type == @task_types[index][1] ? "X" : " " %> > - <%=@task_types[index][0]%> > -
> -

> + <%= image_tag "icon_move.png", :style => "vertical-align:middle;" %> Type <%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %> > +

5: <%= image_tag "icon_move.png", :style => "vertical-align:middle;" %> Type <%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %> 6:

10: style="border-bottom: 1px solid #CCCCCC;" David From sseago at redhat.com Sat Jan 10 02:00:05 2009 From: sseago at redhat.com (Scott Seago) Date: Fri, 09 Jan 2009 21:00:05 -0500 Subject: [Ovirt-devel] [PATCH] Add task list to dashboard In-Reply-To: <1231545768.434.31.camel@localhost.localdomain> References: <1231440209-26690-1-git-send-email-sseago@redhat.com> <1231545768.434.31.camel@localhost.localdomain> Message-ID: <49680125.3090907@redhat.com> David Lutterkort wrote: > On Thu, 2009-01-08 at 18:43 +0000, Scott Seago wrote: > >> Refactored task list functionality to allow for the dashboard-level task list. >> The dashboard task list shows all tasks initiated by the logged-in user, and is >> filterable by task type and state. >> > > This causes trouble for me when looking at the task list for a VM pool > (see below) > > Some minor nits on the presentation: > > * When I look at the dashboard now, I have a single tab that says > 'Dashboard' - shouldn't that say 'Tasks' ? > It's still 'dashboard' since the fact that tasks is the only tab is temporary. Dashboard will eventually have alerts, user preferences, and other stuff -- but the rest of it isn't ready yet. Although I'd be fine w/ the tab saying 'Tasks' as long as the left nav still said 'Dashboard' > * When there are no tasks to display, I get that empty splash > screen with a '+' in it, as if I could add a task - that > shouldn't be there > Good point. I'll remove it -- it makes sense for VMs, hosts, etc but not here. > * Some general comments on how task lists are displayed (nothing > to do with this patch in particular): > 1. Could we use an icon to indicate state ? Using a whole > column is kinda bulky, and not as informative as a nice > icon > The icon would be useful, yes, but we may still want the column so we can sort and filter by it. Anyway perhaps it's a point to work through w/ Jeremy. > 2. The column 'Message' is only visible after scrolling, > even though it's pretty important - that should be moved > to a more prominent position (like right next to > 'Action') > Easy enough to do. > 3. The column 'Args' is almost always empty - why not just > drop it from the default view, or roll the info from > that into another column, e.g. Action > Hmm. Yeah it's empty for the basic VM actions, but migrate, etc can use it. Joining it w/ action might be just the right thing though. So for "start_vm" we still have just that. But for migrate_vm w/ the arg being the host w/ ID 5 it would say "migrate_vm 5". > 4. It would be nice if you could combine several of the > Type resp. State filters (like look at all Storage and > Storage Volume tasks) - and as somebody else mentioned, > a clearer indication of the currently active filters > Yeah redoing the filter setup is another task on the sprint list which will involve reworking filter display and adding date ranges. Perhaps, time permitting, we could look into filtering by groups as well, depending on how much work it is. > 5. Conceptually, do users really care about the distinction > between 'Storage' and 'Storage Volume' tasks ? Why not > just lump them all into 'Storage tasks' ? > > Well the task type distinction is more for the benefit of taskomatic than for users -- the task type determines the behavior of the task. Different object pointed to, different ruby class implementation, etc. If there's a need for a more human-friendly categorization of tasks, we could consider adding it, but we shouldn't mix that up w/ 'type' which has model and class implications. In addition, a category-like 'type' field would allow us to distinguish different types of VM tasks. Note that I won't hold up pushing this patch on the above 5 points, as they have more to do with the overall UI design of the existing task list rather than the dashboard refactoring, and in some cases we have UI design issues to work through before resolving them anyway. > Some more comments; most of them are more todo type items, though it > might be good to address as many of htem aspossible right away. > > >> Signed-off-by: Scott Seago >> --- >> src/app/controllers/dashboard_controller.rb | 41 +++++++--- >> src/app/controllers/hardware_controller.rb | 12 +--- >> src/app/controllers/pool_controller.rb | 41 ++-------- >> src/app/controllers/task_actions.rb | 50 ++++++++++++ >> src/app/models/task.rb | 13 +++ >> src/app/views/dashboard/index.html.erb | 38 ++------- >> src/app/views/hardware/show_tasks.rhtml | 84 ++------------------ >> src/app/views/layouts/_navigation_tabs.rhtml | 20 ++++- >> src/app/views/resources/show_tasks.rhtml | 68 ++-------------- >> src/app/views/task/_grid.rhtml | 2 +- >> .../show_tasks.rhtml => task/_show.rhtml} | 57 +++++++------ >> 11 files changed, 169 insertions(+), 257 deletions(-) >> create mode 100644 src/app/controllers/task_actions.rb >> copy src/app/views/{hardware/show_tasks.rhtml => task/_show.rhtml} (59%) >> >> diff --git a/src/app/controllers/dashboard_controller.rb b/src/app/controllers/dashboard_controller.rb >> index c4830df..00398a5 100644 >> --- a/src/app/controllers/dashboard_controller.rb >> +++ b/src/app/controllers/dashboard_controller.rb >> @@ -18,19 +18,36 @@ >> # also available at http://www.gnu.org/copyleft/gpl.html. >> >> class DashboardController < ApplicationController >> > > Not directly a comment about this patch: it would be cleaner if we had a > TaskController with an index action that accepts parameters to restrict > the list of tasks to a certain object, e.g. a hw pool or a vm pool. > > The implementation with TaskActions and the index -> show_tasks -> show > call sequence seems a little roundabout. > > I tried to pull all of the generic stuff (that applies to more than one of the 3 controllers that have task lists) into the task_actions module which is included by the controllers that have task lists. I suppose we could have a separate controller with 3 different actions relating to dashboard, vm, and hw pool, but it doesn't really match the model we're already using for VM pool and HW pool controllers -- where one controller handles the various UI tabs for an object type. So the bits common to all task lists are already pulled out into task_actions -- and on the view side in task/_show and task/_grid. Some of the roundabout nature here has to do with the way the flexigrid setup works -- we need one action to generate the page itself -- with navigation, filters, etc., and another action to return the json array for the table content. The index vs. show_tasks confusion will go away once we move the task list off the index action -- i.e. the dashboard index will be a portal-like page and the task list will be a separate tab called show_tasks just like elsewhere. >> + >> + include TaskActions >> + def tasks_query_obj >> + Task >> + end >> + def tasks_conditions >> + {:user => get_login_user} >> + end >> + >> def index >> - @default_pool = HardwarePool.get_default_pool >> - set_perms(@default_pool) >> - #remove these soon >> - @hardware_pools = HardwarePool.find(:all) >> - @available_hosts = Host.find(:all) >> - @available_storage_volumes = StorageVolume.find(:all) >> - @storage_pools = StoragePool.find(:all) >> - @hosts = Host.find(:all) >> - @storage_volumes = StorageVolume.find(:all) >> - @vms = Vm.find(:all) >> - if params[:ajax] >> - render :layout => 'tabs-and-content' #:template => 'hardware/show.html.erb' >> + @task_types = Task::TASK_TYPES_OPTIONS >> + show_tasks >> + end >> + >> + def show >> + respond_to do |format| >> + format.html { >> + render :layout => 'tabs-and-content' if params[:ajax] >> + render :layout => 'help-and-content' if params[:nolayout] >> + } >> + format.xml { >> + render :xml => @pool.to_xml(XML_OPTS) >> + } >> end >> end >> > > Thanks for thinking of the API ;) It seems though that this is missing a > route to really work - and for retrieving lists of items, the index > action should be used, not show. > > Yeah -- mostly I was pulling the show action from the other controllers -- in fact we're not really even using show directly -- it's mostly an artifact of the way that show_tasks works for the other instances ,and I wanted to reuse as much of this as possible. In general the 'index' action is used a lot for the API, but none of the web UI uses index in the current iteration (except dashboard) >> --- a/src/app/views/hardware/show_tasks.rhtml >> +++ b/src/app/views/task/_show.rhtml >> @@ -1,33 +1,36 @@ >>

>> -

>> - <%= image_tag "icon_move.png", :style => "vertical-align:middle;" %> Type <%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %> >> -
- > - <% if (index == @task_types.length - 1) or @task_types[index].length == 3 %> >> - style="border-bottom: 1px solid #CCCCCC;" >> - <% end %> >> - > >> - >> - <%= @task_type == @task_types[index][1] ? "X" : " " %> >> - <%=@task_types[index][0]%> >> -
>> -

>> + <%= image_tag "icon_move.png", :style => "vertical-align:middle;" %> Type <%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %> >> +

> 5: <%= image_tag "icon_move.png", :style => "vertical-align:middle;" %> Type <%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %> > 6:

9: <% if (index == task_types.length - 1) or task_types[index].length == 3 %> > 10: style="border-bottom: 1px solid #CCCCCC;" > > David > > Oops. Looks like I didn't follow through with enough testing at the end. I ran into a lot of refactoring bugs that broke either the dashboard view or the HW pool view and when I finally came up with something that worked for both I must have forgotten to re-test the VM pool UI again. OK so of the above issues, the ones that I will rework into an updated patch are as follows: 1) dashboard tab name changed to 'Tasks' (left nav is still 'dashboard') 2) fix the 'no tasks' view to remove the 'add' icon 3) Fix whatever's wrong with the VM pool template/controller in the current patch. Let me know if there's anything else in the above comments that ought to be handled before pushing. And, of course, for some of the above the discussion is ongoing :-) Scott From pronix.service at gmail.com Mon Jan 12 12:22:48 2009 From: pronix.service at gmail.com (pronix pronix) Date: Mon, 12 Jan 2009 15:22:48 +0300 Subject: [Ovirt-devel] are 'migration' between hosts working ? Message-ID: <639ce0480901120422j455be592oeb72ce3f3e2a2ac0@mail.gmail.com> when i try migrate vm from one host to another, i see error "Selected Migration Target: No migration target selected." but i haven't select menu whith hosts listing From pronix.service at gmail.com Mon Jan 12 13:37:27 2009 From: pronix.service at gmail.com (pronix pronix) Date: Mon, 12 Jan 2009 16:37:27 +0300 Subject: [Ovirt-devel] Re: are 'migration' between hosts working ? In-Reply-To: <639ce0480901120422j455be592oeb72ce3f3e2a2ac0@mail.gmail.com> References: <639ce0480901120422j455be592oeb72ce3f3e2a2ac0@mail.gmail.com> Message-ID: <639ce0480901120537k6adbe870leb85b77316a7de33@mail.gmail.com> found litle bug diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb index c187287..cbeda20 100644 --- a/src/task-omatic/task_vm.rb +++ b/src/task-omatic/task_vm.rb @@ -656,7 +656,7 @@ def migrate(vm, dest = nil) src_conn = Libvirt::open("qemu+tcp://" + src_host.hostname + "/system") dst_conn = Libvirt::open("qemu+tcp://" + dst_host.hostname + "/system") - connect_storage_pools(dst_conn, vm) + connect_storage_pools(dst_conn, vm.storage_volumes) dom = src_conn.lookup_domain_by_uuid(vm.uuid) dom.migrate(dst_conn, Libvirt::Domain::MIGRATE_LIVE) 2009/1/12 pronix pronix : > when i try migrate vm from one host to another, i see error "Selected > Migration Target: > No migration target selected." > but i haven't select menu whith hosts listing > From jeremy.perry at redhat.com Mon Jan 12 15:00:56 2009 From: jeremy.perry at redhat.com (Jeremy Perry) Date: Mon, 12 Jan 2009 10:00:56 -0500 Subject: [Ovirt-devel] [PATCH] Add task list to dashboard In-Reply-To: <1231545768.434.31.camel@localhost.localdomain> References: <1231440209-26690-1-git-send-email-sseago@redhat.com> <1231545768.434.31.camel@localhost.localdomain> Message-ID: <89BF2C44-1110-4C39-8C70-3AA74520314F@redhat.com> On Jan 9, 2009, at 7:02 PM, David Lutterkort wrote: > On Thu, 2009-01-08 at 18:43 +0000, Scott Seago wrote: >> Refactored task list functionality to allow for the dashboard-level >> task list. >> The dashboard task list shows all tasks initiated by the logged-in >> user, and is >> filterable by task type and state. > Good comments David - I've got a page in the wiki now to start capturing UX for the Dashboard. http://ovirt.org/page/Dashboard_UX > This causes trouble for me when looking at the task list for a VM pool > (see below) > > Some minor nits on the presentation: > > * When I look at the dashboard now, I have a single tab that says > 'Dashboard' - shouldn't that say 'Tasks' ? If the dashboard is a singleton, I think it might be best to have no tab at all. But otherwise, Tasks seems to be a better label. > * When there are no tasks to display, I get that empty splash > screen with a '+' in it, as if I could add a task - that > shouldn't be there Agree > > * Some general comments on how task lists are displayed (nothing > to do with this patch in particular): > 1. Could we use an icon to indicate state ? Using a whole > column is kinda bulky, and not as informative as a nice > icon > 2. The column 'Message' is only visible after scrolling, > even though it's pretty important - that should be > moved > to a more prominent position (like right next to > 'Action') > 3. The column 'Args' is almost always empty - why not just > drop it from the default view, or roll the info from > that into another column, e.g. Action > 4. It would be nice if you could combine several of the > Type resp. State filters (like look at all Storage and > Storage Volume tasks) - and as somebody else mentioned, > a clearer indication of the currently active filters > 5. Conceptually, do users really care about the > distinction > between 'Storage' and 'Storage Volume' tasks ? Why not > just lump them all into 'Storage tasks' ? I agree with all the comments here - I think we should do all we can to make the Dashboard and specifically the task list more consumable at a glance. ... - Jeremy From sseago at redhat.com Mon Jan 12 15:19:09 2009 From: sseago at redhat.com (Scott Seago) Date: Mon, 12 Jan 2009 15:19:09 +0000 Subject: [Ovirt-devel] [PATCH] Add task list to dashboard (revised) Message-ID: <1231773549-13671-1-git-send-email-sseago@redhat.com> Refactored task list functionality to allow for the dashboard-level task list. The dashboard task list shows all tasks initiated by the logged-in user, and is filterable by task type and state. revised to fix a couple bugs found by lutter Signed-off-by: Scott Seago --- src/app/controllers/dashboard_controller.rb | 41 +++++++--- src/app/controllers/hardware_controller.rb | 12 +--- src/app/controllers/pool_controller.rb | 41 ++-------- src/app/controllers/task_actions.rb | 50 ++++++++++++ src/app/models/task.rb | 13 +++ src/app/views/dashboard/index.html.erb | 38 ++------- src/app/views/hardware/show_tasks.rhtml | 84 ++------------------ src/app/views/layouts/_navigation_tabs.rhtml | 20 ++++- src/app/views/resources/show_tasks.rhtml | 68 ++-------------- src/app/views/task/_grid.rhtml | 2 +- .../show_tasks.rhtml => task/_show.rhtml} | 60 +++++++------- 11 files changed, 170 insertions(+), 259 deletions(-) create mode 100644 src/app/controllers/task_actions.rb copy src/app/views/{hardware/show_tasks.rhtml => task/_show.rhtml} (56%) diff --git a/src/app/controllers/dashboard_controller.rb b/src/app/controllers/dashboard_controller.rb index c4830df..00398a5 100644 --- a/src/app/controllers/dashboard_controller.rb +++ b/src/app/controllers/dashboard_controller.rb @@ -18,19 +18,36 @@ # also available at http://www.gnu.org/copyleft/gpl.html. class DashboardController < ApplicationController + + include TaskActions + def tasks_query_obj + Task + end + def tasks_conditions + {:user => get_login_user} + end + def index - @default_pool = HardwarePool.get_default_pool - set_perms(@default_pool) - #remove these soon - @hardware_pools = HardwarePool.find(:all) - @available_hosts = Host.find(:all) - @available_storage_volumes = StorageVolume.find(:all) - @storage_pools = StoragePool.find(:all) - @hosts = Host.find(:all) - @storage_volumes = StorageVolume.find(:all) - @vms = Vm.find(:all) - if params[:ajax] - render :layout => 'tabs-and-content' #:template => 'hardware/show.html.erb' + @task_types = Task::TASK_TYPES_OPTIONS + show_tasks + end + + def show + respond_to do |format| + format.html { + render :layout => 'tabs-and-content' if params[:ajax] + render :layout => 'help-and-content' if params[:nolayout] + } + format.xml { + render :xml => @pool.to_xml(XML_OPTS) + } end end + + def tasks_internal + @task_type = params[:task_type] + @task_type ||="" + super + end + end diff --git a/src/app/controllers/hardware_controller.rb b/src/app/controllers/hardware_controller.rb index 4dda736..7be67cc 100644 --- a/src/app/controllers/hardware_controller.rb +++ b/src/app/controllers/hardware_controller.rb @@ -116,17 +116,7 @@ class HardwareController < PoolController end def show_tasks - @task_types = [["VM Task", "VmTask"], - ["Host Task", "HostTask"], - ["Storage Task", "StorageTask"], - ["Storage Volume Task", "StorageVolumeTask", "break"], - ["Show All", ""]] - super - end - - def tasks_internal - @task_type = params[:task_type] - @task_type ||="" + @task_types = Task::TASK_TYPES_OPTIONS super end diff --git a/src/app/controllers/pool_controller.rb b/src/app/controllers/pool_controller.rb index 03d1316..b8d0f10 100644 --- a/src/app/controllers/pool_controller.rb +++ b/src/app/controllers/pool_controller.rb @@ -31,6 +31,14 @@ class PoolController < ApplicationController :include => [ :storage_pools, :hosts, :quota ] } + include TaskActions + def tasks_query_obj + @pool.tasks + end + def tasks_conditions + {} + end + def show respond_to do |format| format.html { @@ -58,39 +66,6 @@ class PoolController < ApplicationController [:grid_id, :uid, :user_role, :source]) end - def show_tasks - @task_states = [["Queued", Task::STATE_QUEUED], - ["Running", Task::STATE_RUNNING], - ["Paused", Task::STATE_PAUSED], - ["Finished", Task::STATE_FINISHED], - ["Failed", Task::STATE_FAILED], - ["Canceled", Task::STATE_CANCELED, "break"], - ["Show All", ""]] - params[:page]=1 - params[:sortname]="tasks.created_at" - params[:sortorder]="desc" - @tasks = tasks_internal - show - end - - def tasks - render :json => tasks_internal.to_json - end - - def tasks_internal - @task_state = params[:task_state] - @task_state ||=Task::STATE_QUEUED - conditions = {} - conditions[:type] = @task_type unless @task_type.empty? - conditions[:state] = @task_state unless @task_state.empty? - find_opts = {:include => [:storage_pool, :host, :vm]} - find_opts[:conditions] = conditions unless conditions.empty? - attr_list = [] - attr_list << :id if params[:checkboxes] - attr_list += [:type_label, :task_obj, :action, :state, :user, :created_at, :args, :message] - json_hash(@pool.tasks, attr_list, [:all], find_opts) - end - def hosts_json(args) attr_list = [] attr_list << :id if params[:checkboxes] diff --git a/src/app/controllers/task_actions.rb b/src/app/controllers/task_actions.rb new file mode 100644 index 0000000..d71c11e --- /dev/null +++ b/src/app/controllers/task_actions.rb @@ -0,0 +1,50 @@ +# +# Copyright (C) 2009 Red Hat, Inc. +# Written by Scott Seago +# +# 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. +module TaskActions + def show_tasks + @task_states = Task::TASK_STATES_OPTIONS + params[:page]=1 + params[:sortname]="tasks.created_at" + params[:sortorder]="desc" + @tasks = tasks_internal + show + end + + def tasks + render :json => tasks_internal.to_json + end + + def tasks_internal + @task_state = params[:task_state] + @task_state ||=Task::STATE_QUEUED + @task_type = params[:task_type] + @task_type ||="" + conditions = tasks_conditions + conditions[:type] = @task_type unless @task_type.empty? + conditions[:state] = @task_state unless @task_state.empty? + find_opts = {:include => [:storage_pool, :host, :vm]} + find_opts[:conditions] = conditions unless conditions.empty? + attr_list = [] + attr_list << :id if params[:checkboxes] + attr_list += [:type_label, :task_obj, :action, :state, :user, :created_at, :args, :message] + json_hash(tasks_query_obj, attr_list, [:all], find_opts) + end + + +end diff --git a/src/app/models/task.rb b/src/app/models/task.rb index f231c18..4d16e01 100644 --- a/src/app/models/task.rb +++ b/src/app/models/task.rb @@ -45,6 +45,19 @@ class Task < ActiveRecord::Base COMPLETED_STATES = [STATE_FINISHED, STATE_FAILED, STATE_CANCELED] WORKING_STATES = [STATE_QUEUED, STATE_RUNNING, STATE_PAUSED] + TASK_TYPES_OPTIONS = [["VM Task", "VmTask"], + ["Host Task", "HostTask"], + ["Storage Task", "StorageTask"], + ["Storage Volume Task", "StorageVolumeTask", "break"], + ["Show All", ""]] + TASK_STATES_OPTIONS = [["Queued", Task::STATE_QUEUED], + ["Running", Task::STATE_RUNNING], + ["Paused", Task::STATE_PAUSED], + ["Finished", Task::STATE_FINISHED], + ["Failed", Task::STATE_FAILED], + ["Canceled", Task::STATE_CANCELED, "break"], + ["Show All", ""]] + def cancel self[:state] = STATE_CANCELED save! diff --git a/src/app/views/dashboard/index.html.erb b/src/app/views/dashboard/index.html.erb index 8815ebc..c361e55 100644 --- a/src/app/views/dashboard/index.html.erb +++ b/src/app/views/dashboard/index.html.erb @@ -1,31 +1,7 @@ - -

- -

Actions

- -

<%= link_to_if @can_set_perms, 'User Permissions', { :controller => 'permission', :action => 'new', :pool_id => @default_pool }, { :class => "edit" } %>

- - - - - -

<%= pluralize @default_pool.permissions.super_admins.size, "Super Admin" %>

<%= pluralize @default_pool.permissions.admins.size, "Administrator" %>

<%= pluralize @default_pool.permissions.users.size, "User" %>

<%= pluralize @default_pool.permissions.monitors.size, "Monitor" %>

- - <% if @can_modify %> -

Networks

- - View / Edit - - <% end %> - -

- - - - -<%- content_for :title do -%> -<%= _("Dashboard") %> -<%- end -%> - + <%= render :partial => "/task/show", :locals => { :task_types => @task_types, + :task_states => @task_states, + :task_type => @task_type, + :task_state => @task_state, + :tasks => @tasks, + :action => 'index', + :pool => nil } %> diff --git a/src/app/views/hardware/show_tasks.rhtml b/src/app/views/hardware/show_tasks.rhtml index e49086c..87ea13f 100644 --- a/src/app/views/hardware/show_tasks.rhtml +++ b/src/app/views/hardware/show_tasks.rhtml @@ -1,77 +1,7 @@ -

- <%= image_tag "icon_move.png", :style => "vertical-align:middle;" %> Type <%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %> -
- - style="border-bottom: 1px solid #CCCCCC;" - <% end %> - > - - <%= @task_type == @task_types[index][1] ? "X" : " " %> - <%=@task_types[index][0]%> -
-
- <%= image_tag "icon_move.png", :style => "vertical-align:middle;" %> State <%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %> -
- - style="border-bottom: 1px solid #CCCCCC;" - <% end %> - > - - <%= @task_state == @task_states[index][1] ? "X" : " " %> - <%=@task_states[index][0]%> -
-

- - - -

-<% if @tasks[:rows].size != 0 %> -

- <%= render :partial => "/task/grid", :locals => { :table_id => "tasks_grid", - :task_type => @task_type, - :task_state => @task_state, - :pool => @pool, - :checkboxes => false, - :on_select => "tasks_grid_select" } %> -

- -<% else %> -

- <%= image_tag 'no-grid-items.png', :style => 'float: left;' %> - -

- No tasks found.

- <%= image_tag "icon_addhost.png", :style=>"vertical-align:middle;" %> -

-<% end %> + <%= render :partial => "/task/show", :locals => { :task_types => @task_types, + :task_states => @task_states, + :task_type => @task_type, + :task_state => @task_state, + :tasks => @tasks, + :action => 'show_tasks', + :pool => @pool } %> diff --git a/src/app/views/layouts/_navigation_tabs.rhtml b/src/app/views/layouts/_navigation_tabs.rhtml index dd50820..6619efc 100644 --- a/src/app/views/layouts/_navigation_tabs.rhtml +++ b/src/app/views/layouts/_navigation_tabs.rhtml @@ -3,7 +3,7 @@ $(document).ready(function(){ $tabs = $("#hardware_nav_tabs").tabs({ pool_type: "hardware", - selected: <%if params[:tab]%><%=params[:tab]%><%else%>1<%end%> + selected: <%if params[:tab]%><%=params[:tab]%><%else%>0<%end%> }); }); @@ -20,7 +20,7 @@ $(document).ready(function(){ $tabs = $("#resources_nav_tabs").tabs({ pool_type: "resource", - selected: <%if params[:tab]%><%=params[:tab]%><%else%>1<%end%> + selected: <%if params[:tab]%><%=params[:tab]%><%else%>0<%end%> }); }); @@ -35,7 +35,7 @@ $(document).ready(function(){ $tabs = $("#smart_pools_nav_tabs").tabs({ pool_type: "smart", - selected: <%if params[:tab]%><%=params[:tab]%><%else%>1<%end%> + selected: <%if params[:tab]%><%=params[:tab]%><%else%>0<%end%> }); }); @@ -48,7 +48,19 @@

<%= link_to "User Access", {:action => 'show_users', :id => @pool.id, :nolayout => :true}, :title => "content area" %>

<% elsif controller.controller_name == "search" %> -

Search Results

<%= link_to "Tasks", {:action => 'index', :nolayout => :true}, :title => "content area" %>

- <%= image_tag "icon_move.png", :style => "vertical-align:middle;" %> State <%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %> -
- - style="border-bottom: 1px solid #CCCCCC;" - <% end %> - > - - <%= @task_state == @task_states[index][1] ? "X" : " " %> - <%=@task_states[index][0]%> -
-

- <%= render :partial => "/task/grid", :locals => { :table_id => "vm_tasks_grid", - :task_type => nil, - :task_state => @task_state, - :pool => @pool, - :checkboxes => false, - :on_select => "vm_tasks_grid_select" } %> -

- <%= image_tag 'no-grid-items.png', :style => 'float: left;' %> - -

- No tasks found.

- <%= image_tag "icon_addhost.png", :style=>"vertical-align:middle;" %> -

- <%= image_tag "icon_move.png", :style => "vertical-align:middle;" %> Type <%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %> -
- - style="border-bottom: 1px solid #CCCCCC;" - <% end %> - > - - <%= @task_type == @task_types[index][1] ? "X" : " " %> - <%=@task_types[index][0]%> -
-

+ <%= image_tag "icon_move.png", :style => "vertical-align:middle;" %> Type <%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %> +
- + style="border-bottom: 1px solid #CCCCCC;" + <% end %> + > + + <%= task_type == task_types[index][1] ? "X" : " " %> + <%=task_types[index][0]%> +
+
<%= image_tag "icon_move.png", :style => "vertical-align:middle;" %> State <%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %>
- + <% task_states.each_index { |index| %> +
- style="border-bottom: 1px solid #CCCCCC;" <% end %> > - <%= @task_state == @task_states[index][1] ? "X" : " " %> - <%=@task_states[index][0]%> + <%= task_state == task_states[index][1] ? "X" : " " %> + <%=task_states[index][0]%>
@@ -40,7 +43,7 @@ function apply_task_filter(task_type, task_state) { $tabs.tabs("url", $tabs.data("selected.tabs"), - "<%= url_for :action => 'show_tasks', :id => @pool.id, + "<%= url_for :action => action, :id => pool, :nolayout => :true %>" + "&task_type=" + task_type + "&task_state=" + task_state); $tabs.tabs("load", $tabs.data("selected.tabs")); @@ -48,12 +51,12 @@
-<% if @tasks[:rows].size != 0 %> +<% if tasks[:rows].size != 0 %>
<%= render :partial => "/task/grid", :locals => { :table_id => "tasks_grid", - :task_type => @task_type, - :task_state => @task_state, - :pool => @pool, + :task_type => task_type, + :task_state => task_state, + :pool => pool, :checkboxes => false, :on_select => "tasks_grid_select" } %>
@@ -69,8 +72,7 @@ <%= image_tag 'no-grid-items.png', :style => 'float: left;' %>
- No tasks found.

- <%= image_tag "icon_addhost.png", :style=>"vertical-align:middle;" %> + No tasks found.

-- 1.6.0.6 From clalance at redhat.com Mon Jan 12 15:44:51 2009 From: clalance at redhat.com (Chris Lalancette) Date: Mon, 12 Jan 2009 16:44:51 +0100 Subject: [Ovirt-devel] Re: are 'migration' between hosts working ? In-Reply-To: <639ce0480901120537k6adbe870leb85b77316a7de33@mail.gmail.com> References: <639ce0480901120422j455be592oeb72ce3f3e2a2ac0@mail.gmail.com> <639ce0480901120537k6adbe870leb85b77316a7de33@mail.gmail.com> Message-ID: <496B6573.3000300@redhat.com> pronix pronix wrote: > found litle bug > > diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb > index c187287..cbeda20 100644 > --- a/src/task-omatic/task_vm.rb > +++ b/src/task-omatic/task_vm.rb > @@ -656,7 +656,7 @@ def migrate(vm, dest = nil) > src_conn = Libvirt::open("qemu+tcp://" + src_host.hostname + "/system") > dst_conn = Libvirt::open("qemu+tcp://" + dst_host.hostname + "/system") > > - connect_storage_pools(dst_conn, vm) > + connect_storage_pools(dst_conn, vm.storage_volumes) > > dom = src_conn.lookup_domain_by_uuid(vm.uuid) > dom.migrate(dst_conn, Libvirt::Domain::MIGRATE_LIVE) Arg! You are completely right; I don't know how that ever worked, although at some point it definitely did. With this fix in place, does it actually work for you? -- Chris Lalancette From jeremy.perry at redhat.com Mon Jan 12 15:47:58 2009 From: jeremy.perry at redhat.com (Jeremy Perry) Date: Mon, 12 Jan 2009 10:47:58 -0500 Subject: [Ovirt-devel] Re: oVirt server wui console integration In-Reply-To: <4967C7D3.9080004@redhat.com> References: <49668014.6060706@redhat.com> <820A3B59-B2C2-4A9D-A48A-A4CB1F6F7B5E@redhat.com> <1231470254.4174.19.camel@physical.priv.ovirt.org> <41FA0D09-2A71-4A17-B9D2-0078B2D40A8D@redhat.com> <49678641.4040504@redhat.com> <4967C7D3.9080004@redhat.com> Message-ID: <515EA981-1344-4DD4-929C-0A386C965C0C@redhat.com> On Jan 9, 2009, at 4:55 PM, Michael DeHaan wrote: > Mohammed Morsi wrote: >> Jeremy Perry wrote: >> >>> I've posted the mockups and descriptions mentioned here to the the >>> ovirt.org wiki: >>> http://ovirt.org/page/Terminal_UX >>> >>> one more comment below... >>> >>> On Jan 8, 2009, at 10:04 PM, Jason Guiditta wrote: >>> >>> >>>> On Thu, 2009-01-08 at 18:23 -0500, Jeremy Perry wrote: >>>> >>>>> On Jan 8, 2009, at 5:37 PM, Mohammed Morsi wrote: >>>>> >>>>> >>>>>> Currently the idea for the console interface in the wui is that >>>>>> a user >>>>>> can navigate the the 'virtual machines' tab under a vm pool, >>>>>> click >>>>>> on a >>>>>> specific vm, click on 'console' in the details pane and will be >>>>>> presented with a console to that vm. There were a few ideas as to >>>>>> where >>>>>> the console should appear, >>>>>> >>>>>> * in a minimally themed popup window, most likely the first >>>>>> implementation as it is simplest, but may result in many popups >>>>>> when >>>>>> connected to several vms >>>>>> * in the dialog / popup box interface we have now, we will want >>>>>> to >>>>>> introduce a tabbing mechanism for access to multiple vm consoles >>>>>> * in another tab in the main content area, same vm-tab concept >>>>>> needed here >>>>>> * a rollover, eg the user rolls over 'console' in the vm >>>>>> details pane >>>>>> and the console appears so long as the user holds his mouse >>>>>> over it / >>>>>> the link >>>>>> >>>>>> >>>>> I've taken the liberty of mocking some of these ideas up. >>>>> >>>>> I didnt mockup the new themed popup window yet, since its simple >>>>> to >>>>> imagine. I think its a decent approach, but wondering if we can >>>>> eliminate the multiple popups issue by targeting our popup once >>>>> there >>>>> is at least one open. Subsequent terminals would nest via tabs >>>>> in the >>>>> one terminal window, so all you deal with is one window with >>>>> tabs for >>>>> each vm terminal. >>>>> >>>> I like the idea of the popup window, then adding tabs to it as >>>> needed, >>>> and like the pop-out (thanks google!). My first choice is the >>>> design >>>> with the initial console on the right of the details in the same >>>> pane. >>>> The other with them stacked felt too squished. The tabbed one >>>> could >>>> work too, but I kind of think the terminal being in the detail >>>> pane is >>>> not super usable, since you can't see that much in the space >>>> allowed. I >>>> agree on the modal dialog thing, no need to force them to have >>>> only that >>>> accessible, but another idea could be a non-modal dialog that you >>>> could >>>> minimize somewhere w/in the application. If done right, I think >>>> this >>>> could be pretty slick, but perhaps not worth the effort, as the >>>> single >>>> popup window seems like a perfectly good way to go. >>>> >>> I agree on the popup window, and will take a stab at it. As for the >>> non-modal idea, this would be pretty cool to look at. Well executed >>> examples in the wild is Google chat in gmail and the alerts/etc >>> bar in >>> facebook. >>> >> >> I also agree that the terminal in the details pane seems a bit >> squished. >> I'm not sure if we'd be able to do this immediately, but I'd think >> we'd >> also want to support terminal resizing at some point in the future >> (size saved in the user preferences system when we have it). I also >> like >> the idea of the non-modal dialog, perhaps we can 'minimize' it to the >> dashboard so that a user can maintain active terminal sessions >> between >> uses of the ovirt wui. >> >> >> >>>>>> Its currently looking like the console frontend and apache- >>>>>> proxied >>>>>> backend daemon will be driven by anyterm http://anyterm.org/ . >>>>>> We will >>>>>> use anyterm to launch ovirt-viewer or the virsh console to >>>>>> connect to >>>>>> the vm and then present the anyterm html / js / css ui to the >>>>>> user. A >>>>>> rough layout of the setup can be found here >>>>>> http://ovirt.org/page/Image:Anyterm.png >>>>>> >>>>> I based my mockups on their demos - let me know if the actions I >>>>> included (like copy, paste) make sense or not. >>>>> >> >> Ya thats totally fine for the mockups, I might remove some of that >> stuff >> from the anyterm html that gets added to the project (its all gpl) >> depending of how it works and what we need. >> >> In any case 'Close' will definetly be staying, 'copy' and 'paste' >> might >> be removed depending on if we can get that functionality without it, >> 'Control Keys' will most likey be removed as they work without >> needing >> the drop down. I do like the 'pop out' action you added, and I'll >> look >> into seeing how the terminal location can be parametrized so that we >> could put it in multiple locations. >> >> >> >>>>>> Looking for thoughts / feedback / suggestions as to the interface >>>>>> placement of the console or the backend. Thanks alot, >>>>>> >>>>>> -Mo >>>>>> >>>>> Finally, I wanted to propose we settle on the term "Terminal" >>>>> instead >>>>> of "Console" - at least in the UI - since that is what is used in >>>>> Fedora. I know terminology consistency is a challenge for us, is >>>>> this >>>>> a place we can make a choice in the UI and be consistent? >>>>> >>>>> >>>> Seems reasonable to me, matches more closely with the 'anyterm' >>>> name >>>> too. >>>> >>>>> Thanks! >>>>> - Jeremy >>>>> >> >> Sounds good to me too. >> >> -Mo >> >> _______________________________________________ >> Ovirt-devel mailing list >> Ovirt-devel at redhat.com >> https://www.redhat.com/mailman/listinfo/ovirt-devel >> > > How about a link to just the terminal (no-popup) so someone can just > do "New Tab" in Firefox and get a nice large terminal? > > Tabs across the top may also not scale if a user has a bit too many > VMs open (perhaps a drop down to select the VM, or multiple firefox > tabs?) > > --Michael > That's reasonable, though I don't feel strongly about it. It seems one way or another it is nice to give the user the ability to have a dedicated tab or window per terminal if they want. I'm not sure you can have that AND smaller popups from the same link, which would be ideal. Looking at gmail's pop out for a mail message, you cant seem do a new regular window/tab, which is too bad. I also dont know how they get around popup blockers (but they do), which would be another concern for us - we do not want to require you to disable them. I guess the ultimate would be a new window link that behaves like this: - you click it and you get a new popup window. Additional terminals nest here - you can right click and choose new full browser window/tab. If we just have a normal link, the only issue is unintentional navigation away from the main UI. So I think this is a case where it makes sense to target a new window by default (used with caution - we should make it clear on the link label). This is even better if we can resize the terminal - right now it looks like you have to hard code the # of columns and rows for Anyterm. From jguiditt at redhat.com Mon Jan 12 19:15:22 2009 From: jguiditt at redhat.com (Jason Guiditta) Date: Mon, 12 Jan 2009 14:15:22 -0500 Subject: [Ovirt-devel] [PATCH] Add task list to dashboard (revised) In-Reply-To: <1231773549-13671-1-git-send-email-sseago@redhat.com> References: <1231773549-13671-1-git-send-email-sseago@redhat.com> Message-ID: <1231787722.4148.2.camel@physical.priv.ovirt.org> On Mon, 2009-01-12 at 15:19 +0000, Scott Seago wrote: > Refactored task list functionality to allow for the dashboard-level task list. > The dashboard task list shows all tasks initiated by the logged-in user, and is > filterable by task type and state. > > revised to fix a couple bugs found by lutter > Almost ACK. I have attached a few fixes. They correct both the 'double render', and fix the dashboard link so it doesn't reload the whole page (making you lose state on your nav tree). Also added a little cleanup bit making the correct thing show as current (blue background). -j -------------- next part -------------- A non-text attachment was scrubbed... Name: sseago-tasklist-update.patch Type: text/x-patch Size: 6571 bytes Desc: not available URL: From lutter at redhat.com Mon Jan 12 19:40:53 2009 From: lutter at redhat.com (David Lutterkort) Date: Mon, 12 Jan 2009 11:40:53 -0800 Subject: [Ovirt-devel] [PATCH] Add task list to dashboard In-Reply-To: <49680125.3090907@redhat.com> References: <1231440209-26690-1-git-send-email-sseago@redhat.com> <1231545768.434.31.camel@localhost.localdomain> <49680125.3090907@redhat.com> Message-ID: <1231789253.7479.12.camel@localhost.localdomain> On Fri, 2009-01-09 at 21:00 -0500, Scott Seago wrote: > Note that I won't hold up pushing this patch on the above 5 points, as > they have more to do with the overall UI design of the existing task > list rather than the dashboard refactoring, and in some cases we have UI > design issues to work through before resolving them anyway. Agreed, except for the one outright bug I mentioned, it's fine to push as is for now. We can address the other points in subsequent commits. > > > > Not directly a comment about this patch: it would be cleaner if we had a > > TaskController with an index action that accepts parameters to restrict > > the list of tasks to a certain object, e.g. a hw pool or a vm pool. > > > > The implementation with TaskActions and the index -> show_tasks -> show > > call sequence seems a little roundabout. > > > > > I tried to pull all of the generic stuff (that applies to more than one > of the 3 controllers that have task lists) into the task_actions module > which is included by the controllers that have task lists. I suppose we > could have a separate controller with 3 different actions relating to > dashboard, vm, and hw pool, but it doesn't really match the model we're > already using for VM pool and HW pool controllers -- where one > controller handles the various UI tabs for an object type. So the bits > common to all task lists are already pulled out into task_actions -- and > on the view side in task/_show and task/_grid. What I specifically object to is the TaskActions module. Simply for data retrieval, the way to think about this is that there is a collection of tasks that gets filtered by various criteria - some of them user-supplied, and some of them context-dependant. I would simply have a TaskController with only an index action; to display tasks for a VM pool, pass in a vm_pool_id request param, for a hardware pool a hw_pool_id etc. Regardless of how this is done for the WUI, for the API, we'll need a TaskController to pull down lists of tasks. > Some of the roundabout > nature here has to do with the way the flexigrid setup works -- we need > one action to generate the page itself -- with navigation, filters, > etc., and another action to return the json array for the table content. To be clear: I was only talking about how the json array is generated. > OK so of the above issues, the ones that I will rework into an updated > patch are as follows: > 1) dashboard tab name changed to 'Tasks' (left nav is still 'dashboard') > 2) fix the 'no tasks' view to remove the 'add' icon > 3) Fix whatever's wrong with the VM pool template/controller in the > current patch. Sounds good. David From sseago at redhat.com Mon Jan 12 20:21:16 2009 From: sseago at redhat.com (Scott Seago) Date: Mon, 12 Jan 2009 15:21:16 -0500 Subject: [Ovirt-devel] [PATCH] Add task list to dashboard In-Reply-To: <1231789253.7479.12.camel@localhost.localdomain> References: <1231440209-26690-1-git-send-email-sseago@redhat.com> <1231545768.434.31.camel@localhost.localdomain> <49680125.3090907@redhat.com> <1231789253.7479.12.camel@localhost.localdomain> Message-ID: <496BA63C.4050305@redhat.com> David Lutterkort wrote: > > >>> Not directly a comment about this patch: it would be cleaner if we had a >>> TaskController with an index action that accepts parameters to restrict >>> the list of tasks to a certain object, e.g. a hw pool or a vm pool. >>> >>> The implementation with TaskActions and the index -> show_tasks -> show >>> call sequence seems a little roundabout. >>> >>> >>> >> I tried to pull all of the generic stuff (that applies to more than one >> of the 3 controllers that have task lists) into the task_actions module >> which is included by the controllers that have task lists. I suppose we >> could have a separate controller with 3 different actions relating to >> dashboard, vm, and hw pool, but it doesn't really match the model we're >> already using for VM pool and HW pool controllers -- where one >> controller handles the various UI tabs for an object type. So the bits >> common to all task lists are already pulled out into task_actions -- and >> on the view side in task/_show and task/_grid. >> > > What I specifically object to is the TaskActions module. Simply for data > retrieval, the way to think about this is that there is a collection of > tasks that gets filtered by various criteria - some of them > user-supplied, and some of them context-dependant. > > I would simply have a TaskController with only an index action; to > display tasks for a VM pool, pass in a vm_pool_id request param, for a > hardware pool a hw_pool_id etc. > > And a username for the dashboard task list -- i.e. for the dashboard we want all tasks initiated by a given user. > Regardless of how this is done for the WUI, for the API, we'll need a > TaskController to pull down lists of tasks. > > My concern is that this will be a little more convoluted to put all of this stuff in a single TaskController, since the behavior is slightly different in the three contexts. For the VM pool case, for example, we don't have a list of types to filter on (since they're only VM tasks). For the dashboard one, the query itself is different, since instead of calling (vm,hw)pool.tasks we have to call Task.find(...) with the username set in the conditions clause. Also for the WUI we're handling the permissions, etc. at the pool controller. On the other hand having an index api method on the Task controller makes perfect sense for the API case -- maybe the way to accomodate both uses would be to simply also include TaskActions in the task controller and make TaskController.index call the right methods to return exactly what you need. >> Some of the roundabout >> nature here has to do with the way the flexigrid setup works -- we need >> one action to generate the page itself -- with navigation, filters, >> etc., and another action to return the json array for the table content. >> > > To be clear: I was only talking about how the json array is generated. > > And it may be that we can find a way to put the json array stuff all into the TaskController but leave the rest of it where it is... Scott From jguiditt at redhat.com Mon Jan 12 20:29:33 2009 From: jguiditt at redhat.com (Jason Guiditta) Date: Mon, 12 Jan 2009 15:29:33 -0500 Subject: [Ovirt-devel] [PATCH server] Add task list to dashboard (revised) In-Reply-To: <1231787722.4148.2.camel@physical.priv.ovirt.org> References: <1231787722.4148.2.camel@physical.priv.ovirt.org> Message-ID: <1231792173-8924-1-git-send-email-jguiditt@redhat.com> From: Scott Seago Incorporated some js changes from jay. Refactored task list functionality to allow for the dashboard-level task list. The dashboard task list shows all tasks initiated by the logged-in user, and is filterable by task type and state. revised to fix a couple bugs found by lutter Signed-off-by: Scott Seago Signed-off-by: Jason Guiditta --- src/app/controllers/dashboard_controller.rb | 41 +++++++++---- src/app/controllers/hardware_controller.rb | 12 +---- src/app/controllers/pool_controller.rb | 41 +++---------- src/app/controllers/task_actions.rb | 50 +++++++++++++++ src/app/models/task.rb | 13 ++++ src/app/views/dashboard/index.html.erb | 38 ++---------- src/app/views/hardware/show_tasks.rhtml | 84 ++----------------------- src/app/views/layouts/_navigation_tabs.rhtml | 17 ++++- src/app/views/layouts/_tree.rhtml | 26 ++++++-- src/app/views/resources/show_tasks.rhtml | 68 ++------------------- src/app/views/task/_grid.rhtml | 2 +- src/app/views/task/_show.rhtml | 81 +++++++++++++++++++++++++ src/public/javascripts/ovirt.js | 5 ++ src/public/stylesheets/ovirt-tree/tree.css | 2 +- 14 files changed, 242 insertions(+), 238 deletions(-) create mode 100644 src/app/controllers/task_actions.rb create mode 100644 src/app/views/task/_show.rhtml diff --git a/src/app/controllers/dashboard_controller.rb b/src/app/controllers/dashboard_controller.rb index c4830df..00398a5 100644 --- a/src/app/controllers/dashboard_controller.rb +++ b/src/app/controllers/dashboard_controller.rb @@ -18,19 +18,36 @@ # also available at http://www.gnu.org/copyleft/gpl.html. class DashboardController < ApplicationController + + include TaskActions + def tasks_query_obj + Task + end + def tasks_conditions + {:user => get_login_user} + end + def index - @default_pool = HardwarePool.get_default_pool - set_perms(@default_pool) - #remove these soon - @hardware_pools = HardwarePool.find(:all) - @available_hosts = Host.find(:all) - @available_storage_volumes = StorageVolume.find(:all) - @storage_pools = StoragePool.find(:all) - @hosts = Host.find(:all) - @storage_volumes = StorageVolume.find(:all) - @vms = Vm.find(:all) - if params[:ajax] - render :layout => 'tabs-and-content' #:template => 'hardware/show.html.erb' + @task_types = Task::TASK_TYPES_OPTIONS + show_tasks + end + + def show + respond_to do |format| + format.html { + render :layout => 'tabs-and-content' if params[:ajax] + render :layout => 'help-and-content' if params[:nolayout] + } + format.xml { + render :xml => @pool.to_xml(XML_OPTS) + } end end + + def tasks_internal + @task_type = params[:task_type] + @task_type ||="" + super + end + end diff --git a/src/app/controllers/hardware_controller.rb b/src/app/controllers/hardware_controller.rb index 4dda736..7be67cc 100644 --- a/src/app/controllers/hardware_controller.rb +++ b/src/app/controllers/hardware_controller.rb @@ -116,17 +116,7 @@ class HardwareController < PoolController end def show_tasks - @task_types = [["VM Task", "VmTask"], - ["Host Task", "HostTask"], - ["Storage Task", "StorageTask"], - ["Storage Volume Task", "StorageVolumeTask", "break"], - ["Show All", ""]] - super - end - - def tasks_internal - @task_type = params[:task_type] - @task_type ||="" + @task_types = Task::TASK_TYPES_OPTIONS super end diff --git a/src/app/controllers/pool_controller.rb b/src/app/controllers/pool_controller.rb index 03d1316..b8d0f10 100644 --- a/src/app/controllers/pool_controller.rb +++ b/src/app/controllers/pool_controller.rb @@ -31,6 +31,14 @@ class PoolController < ApplicationController :include => [ :storage_pools, :hosts, :quota ] } + include TaskActions + def tasks_query_obj + @pool.tasks + end + def tasks_conditions + {} + end + def show respond_to do |format| format.html { @@ -58,39 +66,6 @@ class PoolController < ApplicationController [:grid_id, :uid, :user_role, :source]) end - def show_tasks - @task_states = [["Queued", Task::STATE_QUEUED], - ["Running", Task::STATE_RUNNING], - ["Paused", Task::STATE_PAUSED], - ["Finished", Task::STATE_FINISHED], - ["Failed", Task::STATE_FAILED], - ["Canceled", Task::STATE_CANCELED, "break"], - ["Show All", ""]] - params[:page]=1 - params[:sortname]="tasks.created_at" - params[:sortorder]="desc" - @tasks = tasks_internal - show - end - - def tasks - render :json => tasks_internal.to_json - end - - def tasks_internal - @task_state = params[:task_state] - @task_state ||=Task::STATE_QUEUED - conditions = {} - conditions[:type] = @task_type unless @task_type.empty? - conditions[:state] = @task_state unless @task_state.empty? - find_opts = {:include => [:storage_pool, :host, :vm]} - find_opts[:conditions] = conditions unless conditions.empty? - attr_list = [] - attr_list << :id if params[:checkboxes] - attr_list += [:type_label, :task_obj, :action, :state, :user, :created_at, :args, :message] - json_hash(@pool.tasks, attr_list, [:all], find_opts) - end - def hosts_json(args) attr_list = [] attr_list << :id if params[:checkboxes] diff --git a/src/app/controllers/task_actions.rb b/src/app/controllers/task_actions.rb new file mode 100644 index 0000000..d71c11e --- /dev/null +++ b/src/app/controllers/task_actions.rb @@ -0,0 +1,50 @@ +# +# Copyright (C) 2009 Red Hat, Inc. +# Written by Scott Seago +# +# 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. +module TaskActions + def show_tasks + @task_states = Task::TASK_STATES_OPTIONS + params[:page]=1 + params[:sortname]="tasks.created_at" + params[:sortorder]="desc" + @tasks = tasks_internal + show + end + + def tasks + render :json => tasks_internal.to_json + end + + def tasks_internal + @task_state = params[:task_state] + @task_state ||=Task::STATE_QUEUED + @task_type = params[:task_type] + @task_type ||="" + conditions = tasks_conditions + conditions[:type] = @task_type unless @task_type.empty? + conditions[:state] = @task_state unless @task_state.empty? + find_opts = {:include => [:storage_pool, :host, :vm]} + find_opts[:conditions] = conditions unless conditions.empty? + attr_list = [] + attr_list << :id if params[:checkboxes] + attr_list += [:type_label, :task_obj, :action, :state, :user, :created_at, :args, :message] + json_hash(tasks_query_obj, attr_list, [:all], find_opts) + end + + +end diff --git a/src/app/models/task.rb b/src/app/models/task.rb index f231c18..4d16e01 100644 --- a/src/app/models/task.rb +++ b/src/app/models/task.rb @@ -45,6 +45,19 @@ class Task < ActiveRecord::Base COMPLETED_STATES = [STATE_FINISHED, STATE_FAILED, STATE_CANCELED] WORKING_STATES = [STATE_QUEUED, STATE_RUNNING, STATE_PAUSED] + TASK_TYPES_OPTIONS = [["VM Task", "VmTask"], + ["Host Task", "HostTask"], + ["Storage Task", "StorageTask"], + ["Storage Volume Task", "StorageVolumeTask", "break"], + ["Show All", ""]] + TASK_STATES_OPTIONS = [["Queued", Task::STATE_QUEUED], + ["Running", Task::STATE_RUNNING], + ["Paused", Task::STATE_PAUSED], + ["Finished", Task::STATE_FINISHED], + ["Failed", Task::STATE_FAILED], + ["Canceled", Task::STATE_CANCELED, "break"], + ["Show All", ""]] + def cancel self[:state] = STATE_CANCELED save! diff --git a/src/app/views/dashboard/index.html.erb b/src/app/views/dashboard/index.html.erb index 8815ebc..c361e55 100644 --- a/src/app/views/dashboard/index.html.erb +++ b/src/app/views/dashboard/index.html.erb @@ -1,31 +1,7 @@ - -

- -

Actions

- -

<%= link_to_if @can_set_perms, 'User Permissions', { :controller => 'permission', :action => 'new', :pool_id => @default_pool }, { :class => "edit" } %>

- - - - - -

<%= pluralize @default_pool.permissions.super_admins.size, "Super Admin" %>

<%= pluralize @default_pool.permissions.admins.size, "Administrator" %>

<%= pluralize @default_pool.permissions.users.size, "User" %>

<%= pluralize @default_pool.permissions.monitors.size, "Monitor" %>

- - <% if @can_modify %> -

Networks

- - View / Edit - - <% end %> - -

- <%= image_tag "icon_move.png", :style => "vertical-align:middle;" %> Type <%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %> -
- - style="border-bottom: 1px solid #CCCCCC;" - <% end %> - > - - <%= @task_type == @task_types[index][1] ? "X" : " " %> - <%=@task_types[index][0]%> -
-
- <%= image_tag "icon_move.png", :style => "vertical-align:middle;" %> State <%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %> -
- - style="border-bottom: 1px solid #CCCCCC;" - <% end %> - > - - <%= @task_state == @task_states[index][1] ? "X" : " " %> - <%=@task_states[index][0]%> -
-

- - - -

-<% if @tasks[:rows].size != 0 %> -

- -<% else %> -

- <%= image_tag 'no-grid-items.png', :style => 'float: left;' %> - -

- No tasks found.

- <%= image_tag "icon_addhost.png", :style=>"vertical-align:middle;" %> -

-<% end %> + <%= render :partial => "/task/show", :locals => { :task_types => @task_types, + :task_states => @task_states, + :task_type => @task_type, + :task_state => @task_state, + :tasks => @tasks, + :action => 'show_tasks', + :pool => @pool } %> diff --git a/src/app/views/layouts/_navigation_tabs.rhtml b/src/app/views/layouts/_navigation_tabs.rhtml index dd50820..8d9e36a 100644 --- a/src/app/views/layouts/_navigation_tabs.rhtml +++ b/src/app/views/layouts/_navigation_tabs.rhtml @@ -3,7 +3,7 @@ $(document).ready(function(){ $tabs = $("#hardware_nav_tabs").tabs({ pool_type: "hardware", - selected: <%if params[:tab]%><%=params[:tab]%><%else%>1<%end%> + selected: <%if params[:tab]%><%=params[:tab]%><%else%>0<%end%> }); }); @@ -20,7 +20,7 @@ $(document).ready(function(){ $tabs = $("#resources_nav_tabs").tabs({ pool_type: "resource", - selected: <%if params[:tab]%><%=params[:tab]%><%else%>1<%end%> + selected: <%if params[:tab]%><%=params[:tab]%><%else%>0<%end%> }); }); @@ -35,7 +35,7 @@ $(document).ready(function(){ $tabs = $("#smart_pools_nav_tabs").tabs({ pool_type: "smart", - selected: <%if params[:tab]%><%=params[:tab]%><%else%>1<%end%> + selected: <%if params[:tab]%><%=params[:tab]%><%else%>0<%end%> }); }); @@ -48,7 +48,16 @@

<%= link_to "User Access", {:action => 'show_users', :id => @pool.id, :nolayout => :true}, :title => "content area" %>

<% elsif controller.controller_name == "search" %> -

Search Results

<%= link_to "Tasks", {:action => 'index', :nolayout => :true}, :title => "content area" %>

- <% selected = "selected" if controller.controller_name == "dashboard" && params[:action] == "index" %> - <%= link_to "Dashboard", { :controller => "dashboard" }, { :id => "dashboard", :class => "#{selected}" } %> +<% selected = "current" if controller.controller_name == "dashboard" && params[:action] == "index" %> +

+ <%= link_to "Dashboard", { :controller => "dashboard", :ajax => true }, { :id => "dashboard"} %>

diff --git a/src/app/views/resources/show_tasks.rhtml b/src/app/views/resources/show_tasks.rhtml index 6c92779..87ea13f 100644 --- a/src/app/views/resources/show_tasks.rhtml +++ b/src/app/views/resources/show_tasks.rhtml @@ -1,61 +1,7 @@ -

- <%= image_tag "icon_move.png", :style => "vertical-align:middle;" %> State <%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %> -
- - style="border-bottom: 1px solid #CCCCCC;" - <% end %> - > - - <%= @task_state == @task_states[index][1] ? "X" : " " %> - <%=@task_states[index][0]%> -
-

- - - -

-<% if @tasks[:rows].size != 0 %> -

- -<% else %> -

- <%= image_tag 'no-grid-items.png', :style => 'float: left;' %> - -

- No tasks found.

- <%= image_tag "icon_addhost.png", :style=>"vertical-align:middle;" %> -

-<% end %> + <%= render :partial => "/task/show", :locals => { :task_types => @task_types, + :task_states => @task_states, + :task_type => @task_type, + :task_state => @task_state, + :tasks => @tasks, + :action => 'show_tasks', + :pool => @pool } %> diff --git a/src/app/views/task/_grid.rhtml b/src/app/views/task/_grid.rhtml index cab99e5..3c17ac5 100644 --- a/src/app/views/task/_grid.rhtml +++ b/src/app/views/task/_grid.rhtml @@ -9,7 +9,7 @@ ( { url: '<%= url_for :action => "tasks", - :id => pool.id %>', + :id => pool %>', params: [{name: "task_type", value: '<%=task_type%>'}, {name: "task_state", value: '<%=task_state%>'} <%=", {name: 'checkboxes', value: #{checkboxes}}" if checkboxes%>], diff --git a/src/app/views/task/_show.rhtml b/src/app/views/task/_show.rhtml new file mode 100644 index 0000000..5d8d180 --- /dev/null +++ b/src/app/views/task/_show.rhtml @@ -0,0 +1,81 @@ +

+ <%= image_tag "icon_move.png", :style => "vertical-align:middle;" %> Type <%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %> +
- + style="border-bottom: 1px solid #CCCCCC;" + <% end %> + > + + <%= task_type == task_types[index][1] ? "X" : " " %> + <%=task_types[index][0]%> +
+
+ <%= image_tag "icon_move.png", :style => "vertical-align:middle;" %> State <%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %> +
- + style="border-bottom: 1px solid #CCCCCC;" + <% end %> + > + + <%= task_state == task_states[index][1] ? "X" : " " %> + <%=task_states[index][0]%> +
+

+ + + +

+<%if params[:nolayout] %> + <% if tasks[:rows].size != 0 %> +

+ <%= render :partial => "/task/grid", :locals => { :table_id => "tasks_grid", + :task_type => task_type, + :task_state => task_state, + :pool => pool, + :checkboxes => false, + :on_select => "tasks_grid_select" } %> +

+ + <% else %> +

+ <%= image_tag 'no-grid-items.png', :style => 'float: left;' %> + +

+ No tasks found. +

+ <% end %> +<% end %> \ No newline at end of file diff --git a/src/public/javascripts/ovirt.js b/src/public/javascripts/ovirt.js index e0e3dc8..a43f004 100644 --- a/src/public/javascripts/ovirt.js +++ b/src/public/javascripts/ovirt.js @@ -318,3 +318,8 @@ function afterNetwork(response, status){ } } } + +function handleTabsAndContent(data) { + $('#side-toolbar').html($(data).find('div.toolbar')); + $('#tabs-and-content-container').html($(data).not('div#side-toolbar')); +} \ No newline at end of file diff --git a/src/public/stylesheets/ovirt-tree/tree.css b/src/public/stylesheets/ovirt-tree/tree.css index 2c9456d..7d5411f 100644 --- a/src/public/stylesheets/ovirt-tree/tree.css +++ b/src/public/stylesheets/ovirt-tree/tree.css @@ -59,7 +59,7 @@ background: url('../../images/minus.gif') no-repeat left; } -ul.ovirt-tree .current { +.current { background-color: #698FA6; color:#000000; width: 100%; -- 1.5.6.5 From bkearney at redhat.com Mon Jan 12 20:31:57 2009 From: bkearney at redhat.com (Bryan Kearney) Date: Mon, 12 Jan 2009 15:31:57 -0500 Subject: [Ovirt-devel] [PATCH node] BZ479241: Modified the continue message per the commnets Message-ID: <1231792317-31316-1-git-send-email-bkearney@redhat.com> --- scripts/ovirt-config-setup | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/ovirt-config-setup b/scripts/ovirt-config-setup index 9ee268f..3e096bd 100755 --- a/scripts/ovirt-config-setup +++ b/scripts/ovirt-config-setup @@ -7,7 +7,7 @@ CONFIG_DIR=/etc/ovirt-config-setup.d # special options, all others execute the symlinked script in CONFIG_DIR DEBUG_SHELL="Shell" -CONTINUE="Continue" +CONTINUE="Continue Stateless Boot" declare -a OPTIONS -- 1.6.0.6 From dpierce at redhat.com Mon Jan 12 20:51:14 2009 From: dpierce at redhat.com (Darryl L. Pierce) Date: Mon, 12 Jan 2009 15:51:14 -0500 Subject: [Ovirt-devel] [PATCH node] BZ479241: Modified the continue message per the commnets In-Reply-To: <1231792317-31316-1-git-send-email-bkearney@redhat.com> References: <1231792317-31316-1-git-send-email-bkearney@redhat.com> Message-ID: <20090112205114.GJ12916@mcpierce-laptop.rdu.redhat.com> On Mon, Jan 12, 2009 at 03:31:57PM -0500, Bryan Kearney wrote: > --- > scripts/ovirt-config-setup | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/scripts/ovirt-config-setup b/scripts/ovirt-config-setup > index 9ee268f..3e096bd 100755 > --- a/scripts/ovirt-config-setup > +++ b/scripts/ovirt-config-setup > @@ -7,7 +7,7 @@ CONFIG_DIR=/etc/ovirt-config-setup.d > > # special options, all others execute the symlinked script in CONFIG_DIR > DEBUG_SHELL="Shell" > -CONTINUE="Continue" > +CONTINUE="Continue Stateless Boot" > > declare -a OPTIONS > > -- > 1.6.0.6 ACK. -- Darryl L. Pierce, Sr. Software Engineer @ Red Hat, Inc. Virtual Machine Management - http://www.ovirt.org/ "What do you care what other people think, Mr. Feynman?" -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 197 bytes Desc: not available URL: From clalance at redhat.com Tue Jan 13 07:36:25 2009 From: clalance at redhat.com (Chris Lalancette) Date: Tue, 13 Jan 2009 08:36:25 +0100 Subject: [Ovirt-devel] Re: are 'migration' between hosts working ? In-Reply-To: <639ce0480901120929t6b4d99cej1ad04f3a4d1960f5@mail.gmail.com> References: <639ce0480901120422j455be592oeb72ce3f3e2a2ac0@mail.gmail.com> <639ce0480901120537k6adbe870leb85b77316a7de33@mail.gmail.com> <496B6573.3000300@redhat.com> <639ce0480901120929t6b4d99cej1ad04f3a4d1960f5@mail.gmail.com> Message-ID: <496C4479.90504@redhat.com> pronix pronix wrote: > yes, it is working. > > i have a question: should destroy domain on old host ,when i migrate > vm to new host, and create on new host ? > because after reboot vm come back to old host. > pardon my english :) Well, that depends on what you mean. Every time you shut down a guest, and start it again, it re-runs the algorithm to decide what the "best" host to start a guest is. If the best host is still the "old" host, then yes, it will restart it over there. If you really don't want it to start on the old host, you can mark the old host as "unavailable", which will make it automatically skip that host. In any case, thanks for the bug fix. Ian, can you give this a quick review/test of this patch, and then we can commit it? -- Chris Lalancette From my.nikkea at gmail.com Mon Jan 12 09:07:09 2009 From: my.nikkea at gmail.com (Nikkea) Date: Mon, 12 Jan 2009 17:07:09 +0800 Subject: [Ovirt-devel] Is ovirt-0.96 based on fedora 10? And also is other any newer version? Message-ID: <496B083D.2030503@gmail.com> Was ovirt's development platform transferred to fedora10? From dpierce at redhat.com Tue Jan 13 14:32:12 2009 From: dpierce at redhat.com (Darryl L. Pierce) Date: Tue, 13 Jan 2009 09:32:12 -0500 Subject: [Ovirt-devel] Is ovirt-0.96 based on fedora 10? And also is other any newer version? In-Reply-To: <496B083D.2030503@gmail.com> References: <496B083D.2030503@gmail.com> Message-ID: <20090113143212.GA4717@mcpierce-laptop.rdu.redhat.com> On Mon, Jan 12, 2009 at 05:07:09PM +0800, Nikkea wrote: > Was ovirt's development platform transferred to fedora10? Yes. With 0.96 oVirt now targets Fedora 10. -- Darryl L. Pierce, Sr. Software Engineer @ Red Hat, Inc. Virtual Machine Management - http://www.ovirt.org/ "What do you care what other people think, Mr. Feynman?" -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 197 bytes Desc: not available URL: From bkearney at redhat.com Tue Jan 13 16:13:54 2009 From: bkearney at redhat.com (Bryan Kearney) Date: Tue, 13 Jan 2009 11:13:54 -0500 Subject: [Ovirt-devel] [PATCH node] Bootup mounts the local log partition if it exists Message-ID: <1231863234-1845-1-git-send-email-bkearney@redhat.com> --- scripts/ovirt-early | 1 + scripts/ovirt-functions | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/scripts/ovirt-early b/scripts/ovirt-early index 153c0c7..53d5e21 100755 --- a/scripts/ovirt-early +++ b/scripts/ovirt-early @@ -113,6 +113,7 @@ find_disk() { start() { + mount_logging # oVirt boot parameters # BOOTIF=link|eth*| (appended by pxelinux) # ovirt_init=usb|scsi[:serial#] diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions index 9301678..1204231 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -196,6 +196,26 @@ mount_config() { fi } +# mount logging partition +mount_logging() { + if grep -q " /var/log " /proc/mounts; then + return 0 + fi + # backup the logs + if [-e /var/logs-backup ]; then + rm -rf /var/logs-backup + fi + cp -R /var/log /var/logs-backup + + mount /dev/HostVG/Logging /var/log + if grep -q " /var/log " /proc/mounts; then + return 0 + else + # /var/log is not available + return 1 + fi +} + # unmount bindmounted config files # umount_config /etc/config /etc/config2 ... # -- 1.6.0.6 From bkearney at redhat.com Tue Jan 13 16:16:57 2009 From: bkearney at redhat.com (Bryan Kearney) Date: Tue, 13 Jan 2009 11:16:57 -0500 Subject: [Ovirt-devel] Re: [PATCH node] Bootup mounts the local log partition if it exists In-Reply-To: <1231863234-1845-1-git-send-email-bkearney@redhat.com> References: <1231863234-1845-1-git-send-email-bkearney@redhat.com> Message-ID: <496CBE79.8030603@redhat.com> Bryan Kearney wrote: > --- > scripts/ovirt-early | 1 + > scripts/ovirt-functions | 20 ++++++++++++++++++++ > 2 files changed, 21 insertions(+), 0 deletions(-) I should have put in the comment that this is for https://bugzilla.redhat.com/show_bug.cgi?id=479378 -- bk From sseago at redhat.com Tue Jan 13 17:42:06 2009 From: sseago at redhat.com (Scott Seago) Date: Tue, 13 Jan 2009 17:42:06 +0000 Subject: [Ovirt-devel] [PATCH] More UI enhancements for task list: Message-ID: <1231868526-8239-1-git-send-email-sseago@redhat.com> 1) show selected filters more clearly (without having to expand the menu) 2) combined rarely-used 'args' column with 'action' in the display 3) moved 'message' next to the 'action' column Signed-off-by: Scott Seago --- src/app/controllers/task_actions.rb | 2 +- src/app/models/host_task.rb | 6 +++++- src/app/models/storage_task.rb | 6 +++++- src/app/models/storage_volume_task.rb | 6 +++++- src/app/models/task.rb | 17 +++++++++++------ src/app/models/vm_task.rb | 6 +++++- src/app/views/task/_grid.rhtml | 7 +++---- src/app/views/task/_show.rhtml | 6 ++++-- src/public/images/view.png | Bin 0 -> 985 bytes 9 files changed, 39 insertions(+), 17 deletions(-) create mode 100644 src/public/images/view.png diff --git a/src/app/controllers/task_actions.rb b/src/app/controllers/task_actions.rb index d71c11e..de43e9b 100644 --- a/src/app/controllers/task_actions.rb +++ b/src/app/controllers/task_actions.rb @@ -42,7 +42,7 @@ module TaskActions find_opts[:conditions] = conditions unless conditions.empty? attr_list = [] attr_list << :id if params[:checkboxes] - attr_list += [:type_label, :task_obj, :action, :state, :user, :created_at, :args, :message] + attr_list += [:type_label, :task_obj, :action_with_args, :message, :state, :user, :created_at] json_hash(tasks_query_obj, attr_list, [:all], find_opts) end diff --git a/src/app/models/host_task.rb b/src/app/models/host_task.rb index 82298db..38305a3 100644 --- a/src/app/models/host_task.rb +++ b/src/app/models/host_task.rb @@ -26,7 +26,11 @@ class HostTask < Task end def task_obj - "Host;;;#{self.host.id};;;#{self.host.hostname}" + if self.host + "Host;;;#{self.host.id};;;#{self.host.hostname}" + else + "" + end end def vm diff --git a/src/app/models/storage_task.rb b/src/app/models/storage_task.rb index 785f0ea..308673d 100644 --- a/src/app/models/storage_task.rb +++ b/src/app/models/storage_task.rb @@ -26,7 +26,11 @@ class StorageTask < Task end def task_obj - "StoragePool;;;#{self.storage_pool.id};;;#{self.storage_pool.display_name}" + if self.storage_pool + "StoragePool;;;#{self.storage_pool.id};;;#{self.storage_pool.display_name}" + else + "" + end end def host nil diff --git a/src/app/models/storage_volume_task.rb b/src/app/models/storage_volume_task.rb index 136f1ba..021ef63 100644 --- a/src/app/models/storage_volume_task.rb +++ b/src/app/models/storage_volume_task.rb @@ -27,7 +27,11 @@ class StorageVolumeTask < Task end def task_obj - "StorageVolume;;;#{self.storage_volume.id};;;#{self.storage_volume.display_name}" + if self.storage_volume + "StorageVolume;;;#{self.storage_volume.id};;;#{self.storage_volume.display_name}" + else + "" + end end def host nil diff --git a/src/app/models/task.rb b/src/app/models/task.rb index 4d16e01..dd24e6a 100644 --- a/src/app/models/task.rb +++ b/src/app/models/task.rb @@ -45,18 +45,18 @@ class Task < ActiveRecord::Base COMPLETED_STATES = [STATE_FINISHED, STATE_FAILED, STATE_CANCELED] WORKING_STATES = [STATE_QUEUED, STATE_RUNNING, STATE_PAUSED] - TASK_TYPES_OPTIONS = [["VM Task", "VmTask"], - ["Host Task", "HostTask"], - ["Storage Task", "StorageTask"], - ["Storage Volume Task", "StorageVolumeTask", "break"], - ["Show All", ""]] + TASK_TYPES_OPTIONS = [["VM Tasks", "VmTask"], + ["Host Tasks", "HostTask"], + ["Storage Tasks", "StorageTask"], + ["Storage Volume Tasks", "StorageVolumeTask", "break"], + ["All Types", ""]] TASK_STATES_OPTIONS = [["Queued", Task::STATE_QUEUED], ["Running", Task::STATE_RUNNING], ["Paused", Task::STATE_PAUSED], ["Finished", Task::STATE_FINISHED], ["Failed", Task::STATE_FAILED], ["Canceled", Task::STATE_CANCELED, "break"], - ["Show All", ""]] + ["All States", ""]] def cancel self[:state] = STATE_CANCELED @@ -84,4 +84,9 @@ class Task < ActiveRecord::Base "" end + def action_with_args + ret_val = action + ret_val += " #{args}" if args + ret_val + end end diff --git a/src/app/models/vm_task.rb b/src/app/models/vm_task.rb index 27e3e65..27513bb 100644 --- a/src/app/models/vm_task.rb +++ b/src/app/models/vm_task.rb @@ -123,7 +123,11 @@ class VmTask < Task end def task_obj - "Vm;;;#{self.vm.id};;;#{self.vm.description}" + if self.vm + "Vm;;;#{self.vm.id};;;#{self.vm.description}" + else + "" + end end def self.valid_actions_for_vm_state(state, vm=nil, user=nil) diff --git a/src/app/views/task/_grid.rhtml b/src/app/views/task/_grid.rhtml index 3c17ac5..5e2a3d5 100644 --- a/src/app/views/task/_grid.rhtml +++ b/src/app/views/task/_grid.rhtml @@ -18,12 +18,11 @@ <%= "{display: '', width : 20, align: 'left', process: #{table_id}checkbox}," if checkboxes %> {display: 'Type', width : 80, align: 'left'}, {display: 'Item', width : 120, align: 'right', process: <%= table_id%>item}, - {display: 'Action', name : 'action', width : 80, align: 'left'}, + {display: 'Action', name : 'action', width : 120, align: 'left'}, + {display: 'Message', name : 'message', width : 180, align: 'left'}, {display: 'State', name : 'state', width : 60, align: 'left'}, {display: 'User', name : 'user', width : 60, align: 'right'}, - {display: 'Created', name : 'tasks.created_at', width : 140, align: 'right'}, - {display: 'Args', name : 'args', width : 180, align: 'left'}, - {display: 'Message', name : 'message', width : 180, align: 'left'} + {display: 'Created', name : 'tasks.created_at', width : 140, align: 'right'} ], sortname: "tasks.created_at", sortorder: "desc", diff --git a/src/app/views/task/_show.rhtml b/src/app/views/task/_show.rhtml index 5d8d180..9421dc9 100644 --- a/src/app/views/task/_show.rhtml +++ b/src/app/views/task/_show.rhtml @@ -2,7 +2,8 @@

- <%= image_tag "icon_move.png", :style => "vertical-align:middle;" %> Type <%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %> + <%= image_tag "view.png", :style => "vertical-align:middle;" %> <%= task_types.select {|type| type[1]==task_type}[0][0] %> + <%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %>
- - <%= image_tag "icon_move.png", :style => "vertical-align:middle;" %> State <%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %> + <%= image_tag "view.png", :style => "vertical-align:middle;" %> <%= task_states.select {|state| state[1]==task_state}[0][0] %> + <%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %>
  - #5u&OIDnf!*3dE%w*dSK0KnPT}AhAHKSo0T9sTD$k6^npc2|?LJpj23)h_-2+ zHj~Cp+{Ae}6Wj54#*gv!+ at 3qNQ50Dbk1Ks+&-i>lpL@=ktKjgZOifOnWsJSan37B+ z5)+nX3(K~bgzL_7&ad4_rEXH3_}g#@j3r;0{8&}hkKX&>;@DL3JYw+#ITS4D%lLI> z1~Wfj&A6 at Bm$Sd8E>XODSZ0he`{Y70Sy^0K7WJkpTCNaHx=3XUj+k5A65n2(5i&-` zN{=+E-L`q|<(FRd`+Z+r`s(X=Xy7Cw0fq(_upJjg+eOB3kS#R9U526I6aLJ?t
    RO|J$uJOHzp$Gz`9N9_3vc>Kq;^+Kt1Ww%h!y8+pYBh~T#Uh$!R zXCA_BK?(E`q~9Br^3FQ8(zD3TO(ROMwbXRYG%Mev??3pSyyn4IPkH-%_>D-2T|W^Y zgzv};xTEia2NP)6WoisV&)^V3M~->h+_-%`S2oQb=I^C1lXp}0az9Xc=e5Y|;h^%% z#B(EX5X44q6(yTN&nKosJ)sGo<{S3v%A0Gn{kz4z(r+uP*;#tDO|s
    q3!YG)wu50;$6P?HP21G{?O(&>dLqC862I3E#!IpG00000NkvXX Hu0mjfwm{v~ literal 0 HcmV?d00001 -- 1.6.0.6 From sseago at redhat.com Tue Jan 13 17:42:05 2009 From: sseago at redhat.com (Scott Seago) Date: Tue, 13 Jan 2009 12:42:05 -0500 Subject: [Ovirt-devel] [PATCH] Add task list to dashboard In-Reply-To: <49680125.3090907@redhat.com> References: <1231440209-26690-1-git-send-email-sseago@redhat.com> <1231545768.434.31.camel@localhost.localdomain> <49680125.3090907@redhat.com> Message-ID: <496CD26D.3030002@redhat.com> Scott Seago wrote: > David Lutterkort wrote: > >> * Some general comments on how task lists are displayed (nothing >> to do with this patch in particular): I've just submitted a patch dealing with a few of these issues. >> 1. Could we use an icon to indicate state ? Using a whole >> column is kinda bulky, and not as informative as a nice >> icon >> > The icon would be useful, yes, but we may still want the column so we > can sort and filter by it. Anyway perhaps it's a point to work through > w/ Jeremy. We still need to work through w/ jeremy how best to handle this. >> 2. The column 'Message' is only visible after scrolling, >> even though it's pretty important - that should be moved >> to a more prominent position (like right next to >> 'Action') >> > Easy enough to do. Done. >> 3. The column 'Args' is almost always empty - why not just >> drop it from the default view, or roll the info from >> that into another column, e.g. Action >> > Hmm. Yeah it's empty for the basic VM actions, but migrate, etc can > use it. Joining it w/ action might be just the right thing though. So > for "start_vm" we still have just that. But for migrate_vm w/ the arg > being the host w/ ID 5 it would say "migrate_vm 5". I've rolled 'args' into the 'action' column (when it's non-null) >> 4. It would be nice if you could combine several of the >> Type resp. State filters (like look at all Storage and >> Storage Volume tasks) - and as somebody else mentioned, >> a clearer indication of the currently active filters >> > Yeah redoing the filter setup is another task on the sprint list which > will involve reworking filter display and adding date ranges. Perhaps, > time permitting, we could look into filtering by groups as well, > depending on how much work it is. I've handled the currently active filter display -- the active ones show up in the label for the filter menu. If we want to group states or types (rather than just show one at a time) that is fine -- we just need to make a decision on how they should be grouped. >> 5. Conceptually, do users really care about the distinction >> between 'Storage' and 'Storage Volume' tasks ? Why not >> just lump them all into 'Storage tasks' ? >> >> > Well the task type distinction is more for the benefit of taskomatic > than for users -- the task type determines the behavior of the task. > Different object pointed to, different ruby class implementation, etc. > If there's a need for a more human-friendly categorization of tasks, > we could consider adding it, but we shouldn't mix that up w/ 'type' > which has model and class implications. In addition, a category-like > 'type' field would allow us to distinguish different types of VM tasks. > As mentioned in the comments for 4, we can group task types for filtering purposes, although we should still display the actual task type. All we need to do to get moving on the grouping is to decide what to group. Scott From jeremy.perry at redhat.com Tue Jan 13 18:04:54 2009 From: jeremy.perry at redhat.com (Jeremy Perry) Date: Tue, 13 Jan 2009 13:04:54 -0500 Subject: [Ovirt-devel] [PATCH] Add task list to dashboard In-Reply-To: <496CD26D.3030002@redhat.com> References: <1231440209-26690-1-git-send-email-sseago@redhat.com> <1231545768.434.31.camel@localhost.localdomain> <49680125.3090907@redhat.com> <496CD26D.3030002@redhat.com> Message-ID: On Jan 13, 2009, at 12:42 PM, Scott Seago wrote: > Scott Seago wrote: >> David Lutterkort wrote: >> >>> * Some general comments on how task lists are displayed >>> (nothing >>> to do with this patch in particular): > I've just submitted a patch dealing with a few of these issues. >>> 1. Could we use an icon to indicate state ? Using a >>> whole >>> column is kinda bulky, and not as informative as a >>> nice >>> icon >>> >> The icon would be useful, yes, but we may still want the column so >> we can sort and filter by it. Anyway perhaps it's a point to work >> through w/ Jeremy. > We still need to work through w/ jeremy how best to handle this. I like the icon idea, this will save space. In using the icon we should be sure to supply the ALT and hover tip that gives the text label that the image is replacing. Alphabetic sorting on this column should work the same as if the images were text. I'll find or make a set of suitable icons using these visual metaphors: Queued - clock Running - play symbol Paused - pause symbol Finished - checkmark Failed - X or ! Cancelled - universal "no" symbol > >>> 2. The column 'Message' is only visible after scrolling, >>> even though it's pretty important - that should be >>> moved >>> to a more prominent position (like right next to >>> 'Action') >>> >> Easy enough to do. > Done. >>> 3. The column 'Args' is almost always empty - why not >>> just >>> drop it from the default view, or roll the info from >>> that into another column, e.g. Action >>> >> Hmm. Yeah it's empty for the basic VM actions, but migrate, etc can >> use it. Joining it w/ action might be just the right thing though. >> So for "start_vm" we still have just that. But for migrate_vm w/ >> the arg being the host w/ ID 5 it would say "migrate_vm 5". > I've rolled 'args' into the 'action' column (when it's non-null) >>> 4. It would be nice if you could combine several of the >>> Type resp. State filters (like look at all Storage >>> and >>> Storage Volume tasks) - and as somebody else >>> mentioned, >>> a clearer indication of the currently active filters >>> >> Yeah redoing the filter setup is another task on the sprint list >> which will involve reworking filter display and adding date ranges. >> Perhaps, time permitting, we could look into filtering by groups as >> well, depending on how much work it is. > I've handled the currently active filter display -- the active ones > show up in the label for the filter menu. If we want to group states > or types (rather than just show one at a time) that is fine -- we > just need to make a decision on how they should be grouped. >>> 5. Conceptually, do users really care about the >>> distinction >>> between 'Storage' and 'Storage Volume' tasks ? Why >>> not >>> just lump them all into 'Storage tasks' ? >>> >>> >> Well the task type distinction is more for the benefit of >> taskomatic than for users -- the task type determines the behavior >> of the task. Different object pointed to, different ruby class >> implementation, etc. If there's a need for a more human-friendly >> categorization of tasks, we could consider adding it, but we >> shouldn't mix that up w/ 'type' which has model and class >> implications. In addition, a category-like 'type' field would allow >> us to distinguish different types of VM tasks. >> > As mentioned in the comments for 4, we can group task types for > filtering purposes, although we should still display the actual task > type. All we need to do to get moving on the grouping is to decide > what to group. Let me know how I can help > > > Scott > > _______________________________________________ > Ovirt-devel mailing list > Ovirt-devel at redhat.com > https://www.redhat.com/mailman/listinfo/ovirt-devel From dpierce at redhat.com Tue Jan 13 22:33:41 2009 From: dpierce at redhat.com (Darryl L. Pierce) Date: Tue, 13 Jan 2009 17:33:41 -0500 Subject: [Ovirt-devel] [PATCH node] Changed max swap size to allow for overcommitting. Message-ID: <1231886021-16855-1-git-send-email-dpierce@redhat.com> If the ovirt_overcommit kernel argument is passed, the value supplied will override the default value, which is 2GB. Signed-off-by: Darryl L. Pierce --- scripts/ovirt-config-storage | 3 +-- scripts/ovirt-early | 14 +++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage index b3d87ae..71e5575 100755 --- a/scripts/ovirt-config-storage +++ b/scripts/ovirt-config-storage @@ -289,8 +289,7 @@ MEM_SIZE=$(cat /proc/meminfo | awk '/MemTotal:/ { print $2 }') case $MEM_SIZE in ''|*[^0-9]*) die failed to get system memory size;; esac - -MEM_SIZE=$(echo "scale=0; m=($MEM_SIZE / 1024 * 2); if (m < 2048) { m } else { 2048 }" | bc -l) +MEM_SIZE=$(echo "scale=0; m=($MEM_SIZE / 1024 * 2); if (m < ${OVIRT_OVERCOMMIT}) { m } else { ${OVIRT_OVERCOMMIT} }" | bc -l) SWAP_SIZE=${OVIRT_VOL_SWAP_SIZE:-$MEM_SIZE} BOOT_SIZE=${OVIRT_VOL_BOOT_SIZE:-$default_boot_size} diff --git a/scripts/ovirt-early b/scripts/ovirt-early index 153c0c7..9031ad8 100755 --- a/scripts/ovirt-early +++ b/scripts/ovirt-early @@ -117,6 +117,7 @@ start() { # BOOTIF=link|eth*| (appended by pxelinux) # ovirt_init=usb|scsi[:serial#] # ovirt_vol=BOOT_MB:SWAP_MB:ROOT_MB:CONFIG_MB:LOGGING_MB + # ovirt_overcommit # ovirt_local_boot # ovirt_standalone # pxelinux format: ip=::: @@ -156,6 +157,11 @@ start() { # install/update oVirt Node image on the local installation target disk local_boot=0 + # ovirt_overcommit + # set the overcommit size for the swap partition, in megabytes + # default is 2204 maximum + overcommit=2048 + # ovirt_standalone # force oVirt Node standalone mode standalone=0 @@ -245,6 +251,12 @@ start() { standalone=1 bootparams="$bootparams $i" ;; + + ovirt_overcommit*) + i=${i#ovirt_overcommit=} + eval $(printf $i|awk -F: '{print "overcommit="$1;}') + ;; + ip=*) i=${i#ip=} eval $(printf $i|awk -F: '{print "ip_address="$1; print "ip_gateway="$3; print "ip_netmask="$4}') @@ -278,7 +290,7 @@ start() { ip_gateway=$gateway fi # save boot parameters as defaults for ovirt-config-* - params="bootif init vol_boot_size vol_swap_size vol_root_size vol_config_size vol_logging_size local_boot standalone ip_address ip_netmask ip_gateway ipv6 syslog_server syslog_port bootparams hostname" + params="bootif init vol_boot_size vol_swap_size vol_root_size vol_config_size vol_logging_size local_boot standalone overcommit ip_address ip_netmask ip_gateway ipv6 syslog_server syslog_port bootparams hostname" mount_config if [ -e $OVIRT_DEFAULTS ]; then echo "update ovirt defaults" -- 1.6.0.6 From apevec at gmail.com Tue Jan 13 23:58:07 2009 From: apevec at gmail.com (Alan Pevec) Date: Wed, 14 Jan 2009 00:58:07 +0100 Subject: [Ovirt-devel] [PATCH node] Changed max swap size to allow for overcommitting. In-Reply-To: <1231886021-16855-1-git-send-email-dpierce@redhat.com> References: <1231886021-16855-1-git-send-email-dpierce@redhat.com> Message-ID: <2be7262f0901131558t163d40e5na7bfb29a8d8a321f@mail.gmail.com> On Tue, Jan 13, 2009 at 11:33 PM, Darryl L. Pierce wrote: > If the ovirt_overcommit kernel argument is passed, the value supplied > will override the default value, which is 2GB. > nack - that's too easy :) lemme try to explain what I had in mind: parameter should accept the overcommit ratio as its value and not max. size in MB - otherwise admin needs to adjust it for different machines ovirt_overcommit=N means swap area is set to N * MEM_SIZE default N is 2, in case parameter is not present special case N=0, means overcommit is not used and swap area is set to min. required size from the table in http://kbase.redhat.com/faq/docs/DOC-15252 MEM_SIZE SWAP_SIZE <=4GB 2GB 4GB to 16GB 4GB 16GB to 64GB 8GB 64GB to 256GB 16GB -------------- next part -------------- An HTML attachment was scrubbed... URL: From lutter at redhat.com Wed Jan 14 00:57:13 2009 From: lutter at redhat.com (David Lutterkort) Date: Wed, 14 Jan 2009 00:57:13 +0000 Subject: [Ovirt-devel] [PATCH] More UI enhancements for task list: In-Reply-To: <1231868526-8239-1-git-send-email-sseago@redhat.com> References: <1231868526-8239-1-git-send-email-sseago@redhat.com> Message-ID: <1231894633.20424.24.camel@localhost.localdomain> On Tue, 2009-01-13 at 17:42 +0000, Scott Seago wrote: > 1) show selected filters more clearly (without having to expand the menu) > 2) combined rarely-used 'args' column with 'action' in the display > 3) moved 'message' next to the 'action' column ACK .. very nice ! David From lutter at redhat.com Wed Jan 14 01:00:41 2009 From: lutter at redhat.com (David Lutterkort) Date: Tue, 13 Jan 2009 17:00:41 -0800 Subject: [Ovirt-devel] [PATCH] Add task list to dashboard In-Reply-To: <496CD26D.3030002@redhat.com> References: <1231440209-26690-1-git-send-email-sseago@redhat.com> <1231545768.434.31.camel@localhost.localdomain> <49680125.3090907@redhat.com> <496CD26D.3030002@redhat.com> Message-ID: <1231894841.20424.26.camel@localhost.localdomain> On Tue, 2009-01-13 at 12:42 -0500, Scott Seago wrote: > Scott Seago wrote: > > Well the task type distinction is more for the benefit of taskomatic > > than for users -- the task type determines the behavior of the task. > > Different object pointed to, different ruby class implementation, etc. > > If there's a need for a more human-friendly categorization of tasks, > > we could consider adding it, but we shouldn't mix that up w/ 'type' > > which has model and class implications. In addition, a category-like > > 'type' field would allow us to distinguish different types of VM tasks. > > > As mentioned in the comments for 4, we can group task types for > filtering purposes, although we should still display the actual task > type. All we need to do to get moving on the grouping is to decide what > to group. I would just hide the storage/storage volume distinction; the item and action columns should make it clear enough to the user what that task is about. David From my.nikkea at gmail.com Wed Jan 14 03:36:30 2009 From: my.nikkea at gmail.com (nikkea) Date: Wed, 14 Jan 2009 11:36:30 +0800 Subject: [Ovirt-devel] 500 Internal Server Error Message-ID: <496D5DBE.5010707@gmail.com> Hey guys, When trying to login 192.168.50.2/ovirt after installing 0.96,I got "500 Internal Server Error". Ovirt-appliance can run correctly. Which package should I reinstall to fix this? Thanks From apevec at redhat.com Wed Jan 14 10:33:56 2009 From: apevec at redhat.com (Alan Pevec) Date: Wed, 14 Jan 2009 11:33:56 +0100 Subject: [Ovirt-devel] [PATCH node-image] enable VLAN support in the Node image Message-ID: <1231929236-11349-1-git-send-email-apevec@redhat.com> --- common-blacklist.ks | 2 +- common-pkgs.ks | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/common-blacklist.ks b/common-blacklist.ks index 5b41982..3b20122 100644 --- a/common-blacklist.ks +++ b/common-blacklist.ks @@ -49,7 +49,7 @@ fs_mods="fs/nls fs/9p fs/affs fs/autofs fs/autofs4 fs/befs fs/bfs fs/cifs \ fs/jffs2 fs/jfs fs/minix fs/ncpfs fs/ocfs2 fs/qnx4 fs/reiserfs \ fs/romfs fs/sysv fs/udf fs/ufs fs/xfs" -net_mods="net/8021q net/9p net/appletalk net/atm net/ax25 \ +net_mods="net/9p net/appletalk net/atm net/ax25 \ net/bluetooth net/dccp net/decnet net/ieee80211 net/ipx net/irda \ net/mac80211 net/netrom net/rfkill net/rose net/sched net/tipc \ net/wanrouter net/wireless" diff --git a/common-pkgs.ks b/common-pkgs.ks index dd60930..a46ad2b 100644 --- a/common-pkgs.ks +++ b/common-pkgs.ks @@ -37,6 +37,7 @@ python-libs gdbm db4 m2crypto +vconfig -audit-libs-python -hdparm -ustr -- 1.6.0.6 From dlaor at redhat.com Wed Jan 14 10:41:57 2009 From: dlaor at redhat.com (Dor Laor) Date: Wed, 14 Jan 2009 12:41:57 +0200 Subject: [Ovirt-devel] [PATCH node] Changed max swap size to allow for overcommitting. In-Reply-To: <2be7262f0901131558t163d40e5na7bfb29a8d8a321f@mail.gmail.com> References: <1231886021-16855-1-git-send-email-dpierce@redhat.com> <2be7262f0901131558t163d40e5na7bfb29a8d8a321f@mail.gmail.com> Message-ID: <496DC175.3090908@redhat.com> Alan Pevec wrote: > On Tue, Jan 13, 2009 at 11:33 PM, Darryl L. Pierce > wrote: > > If the ovirt_overcommit kernel argument is passed, the value supplied > will override the default value, which is 2GB. > > > nack - that's too easy :) > > lemme try to explain what I had in mind: > parameter should accept the overcommit ratio as its value and not max. > size in MB - otherwise admin needs to adjust it for different machines > > ovirt_overcommit=N > means swap area is set to N * MEM_SIZE Can it be N*MEM_SIZE + the values from the table below? This way you retain swap memory for the VMs and additional swap for the host. > > default N is 2, in case parameter is not present Make sure N is not an int. The current solidIce default is 150%. For 150% N should be 0.5 since the 100% is in the RAM. > special case N=0, means overcommit is not used and swap area is set to > min. required size from the table in > http://kbase.redhat.com/faq/docs/DOC-15252 > > MEM_SIZE SWAP_SIZE > > <=4GB 2GB > > 4GB to 16GB 4GB > > 16GB to 64GB 8GB > > 64GB to 256GB 16GB > > > ------------------------------------------------------------------------ > > _______________________________________________ > Ovirt-devel mailing list > Ovirt-devel at redhat.com > https://www.redhat.com/mailman/listinfo/ovirt-devel > -------------- next part -------------- An HTML attachment was scrubbed... URL: From apevec at gmail.com Wed Jan 14 10:46:52 2009 From: apevec at gmail.com (Alan Pevec) Date: Wed, 14 Jan 2009 11:46:52 +0100 Subject: [Ovirt-devel] 500 Internal Server Error In-Reply-To: <496D5DBE.5010707@gmail.com> References: <496D5DBE.5010707@gmail.com> Message-ID: <2be7262f0901140246u7d70958ev6343be6d421cdf81@mail.gmail.com> On Wed, Jan 14, 2009 at 4:36 AM, nikkea wrote: > Hey guys, > When trying to login 192.168.50.2/ovirt after installing 0.96,I got "500 > Internal Server Error". > Ovirt-appliance can run correctly. > Which package should I reinstall to fix this? > Thanks > please provide the complete error message, should be somewhere in logfiles /var/log/ovirt* -------------- next part -------------- An HTML attachment was scrubbed... URL: From my.nikkea at gmail.com Wed Jan 14 11:04:16 2009 From: my.nikkea at gmail.com (nikkea) Date: Wed, 14 Jan 2009 19:04:16 +0800 Subject: [Ovirt-devel] 500 Internal Server Error Message-ID: <496DC6B0.9070605@gmail.com> -------------- next part -------------- An embedded message was scrubbed... From: nikkea Subject: Re: [Ovirt-devel] 500 Internal Server Error Date: Wed, 14 Jan 2009 18:53:29 +0800 Size: 1792 URL: From jguiditt at redhat.com Wed Jan 14 14:36:59 2009 From: jguiditt at redhat.com (Jason Guiditta) Date: Wed, 14 Jan 2009 09:36:59 -0500 Subject: [Ovirt-devel] 500 Internal Server Error In-Reply-To: <496DC6B0.9070605@gmail.com> References: <496DC6B0.9070605@gmail.com> Message-ID: <1231943819.4293.4.camel@physical.priv.ovirt.org> On Wed, 2009-01-14 at 19:04 +0800, nikkea wrote: > email message attachment (Re: [Ovirt-devel] 500 Internal Server > Error.eml) > > -------- Forwarded Message -------- > > From: nikkea > > To: Alan Pevec > > Subject: Re: [Ovirt-devel] 500 Internal Server Error > > Date: Wed, 14 Jan 2009 18:53:29 +0800 > > > _______________________________________________ > Ovirt-devel mailing list > Ovirt-devel at redhat.com > https://www.redhat.com/mailman/listinfo/ovirt-devel > Check if you have a valid postgres db, and that you can log in (using the un/pw in database.yml in /usr/share/ovirt-server/config. Assuming this test passes check what you have in the pools and permissions table and send your findings to the list. -j From slinabery at redhat.com Wed Jan 14 15:01:56 2009 From: slinabery at redhat.com (Steve Linabery) Date: Wed, 14 Jan 2009 09:01:56 -0600 Subject: [Ovirt-devel] 500 Internal Server Error In-Reply-To: <496DC6B0.9070605@gmail.com> References: <496DC6B0.9070605@gmail.com> Message-ID: <20090114150155.GD4743@redhat.com> On Wed, Jan 14, 2009 at 07:04:16PM +0800, nikkea wrote: > > Date: Wed, 14 Jan 2009 18:53:29 +0800 > From: nikkea > To: Alan Pevec > Subject: Re: [Ovirt-devel] 500 Internal Server Error > > I cannot find any log about ovirt in that path. Are you looking on the appliance? You should be able to ssh to it from the host (ssh root at 192.168.50.2, password 'ovirt'), or get a console with 'virt-viewer ovirt-appliance'. From pmyers at redhat.com Wed Jan 14 15:12:14 2009 From: pmyers at redhat.com (Perry Myers) Date: Wed, 14 Jan 2009 10:12:14 -0500 Subject: [Ovirt-devel] [PATCH node] Added a wrapper script around the boot menu item to warn the users about the reboot In-Reply-To: <1231449766-28155-1-git-send-email-bkearney@redhat.com> References: <1231449766-28155-1-git-send-email-bkearney@redhat.com> Message-ID: <496E00CE.4020502@redhat.com> Question on this patch, why did you create a separate script to wrap the o-c-boot script instead of just putting a question at the top of the main section of the o-c-boot script itself? You could just have o-c-boot be executed directly by the firstboot menu and the first thing it does is say "Are you sure" and if the user says No then it just exits back to the main menu. Also, do we have sanity checks in place for o-c-boot that check to make sure that other things have been run like o-c-networking and o-c-storage? If we don't have this, add that to the top of main in o-c-boot along with the user question. Finally, in a fully automated boot (i.e. all opts passed on kernel cmdline) none of these user interactive questions should come up (this is probably the case, just stating to make sure it's clear) Perry Bryan Kearney wrote: > --- > Makefile.am | 1 + > ovirt-node.spec.in | 4 +++- > scripts/ovirt-config-boot-wrapper | 16 ++++++++++++++++ > 3 files changed, 20 insertions(+), 1 deletions(-) > create mode 100644 scripts/ovirt-config-boot-wrapper > > diff --git a/Makefile.am b/Makefile.am > index 6847234..c62774f 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -30,6 +30,7 @@ EXTRA_DIST = \ > scripts/ovirt \ > scripts/ovirt-awake \ > scripts/ovirt-config-boot \ > + scripts/ovirt-config-boot-wrapper \ > scripts/ovirt-config-hostname \ > scripts/ovirt-config-logging \ > scripts/ovirt-config-networking \ > diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in > index 501bf4f..f30dd62 100644 > --- a/ovirt-node.spec.in > +++ b/ovirt-node.spec.in > @@ -132,6 +132,7 @@ cd - > > %{__install} -p -m0755 scripts/ovirt-awake %{buildroot}%{_sbindir} > %{__install} -p -m0755 scripts/ovirt-config-boot %{buildroot}%{_sbindir} > +%{__install} -p -m0755 scripts/ovirt-config-boot-wrapper %{buildroot}%{_sbindir} > %{__install} -p -m0755 scripts/ovirt-config-hostname %{buildroot}%{_sbindir} > %{__install} -p -m0755 scripts/ovirt-config-logging %{buildroot}%{_sbindir} > %{__install} -p -m0755 scripts/ovirt-config-networking %{buildroot}%{_sbindir} > @@ -191,7 +192,7 @@ install -p -m 644 images/syslinux-vesa-splash.jpg %{buildroot}/usr/lib/anaconda- > %{__ln_s} ../..%{_sbindir}/ovirt-config-networking %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"15_Networking Setup" > %{__ln_s} ../..%{_sbindir}/ovirt-config-storage %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"20_Disk Partitioning" > %{__ln_s} ../..%{_sbindir}/ovirt-config-logging %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"30_Logging Setup" > -%{__ln_s} ../..%{_sbindir}/ovirt-config-boot %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"99_Local install and reboot" > +%{__ln_s} ../..%{_sbindir}/ovirt-config-boot-wrapper %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"99_Local install and reboot" > > > %clean > @@ -253,6 +254,7 @@ fi > %defattr(-,root,root,0755) > %{_sbindir}/ovirt-awake > %{_sbindir}/ovirt-config-boot > +%{_sbindir}/ovirt-config-boot-wrapper > %{_sbindir}/ovirt-config-hostname > %{_sbindir}/ovirt-config-logging > %{_sbindir}/ovirt-config-networking > diff --git a/scripts/ovirt-config-boot-wrapper b/scripts/ovirt-config-boot-wrapper > new file mode 100644 > index 0000000..6876a30 > --- /dev/null > +++ b/scripts/ovirt-config-boot-wrapper > @@ -0,0 +1,16 @@ > +#!/bin/bash > +# > +# Wrapper function to make sure the user wishes to continue before > +# rebooting the system > + > +while true; do > + read -p "This option will exit the menu, and require a reboot. Do you wish to continue? (Y|N)? " > + r=$(echo $REPLY|tr '[[:lower:]]' '[[:upper:]]') > + if [ "$r" == "Y" ]; then > + /usr/sbin/ovirt-config-boot > + break > + elif [ "$r" == "N" ]; then > + printf "\nExiting back to the menu\n" > + break > + fi > +done -- |=- Red Hat, Engineering, Emerging Technologies, Boston -=| |=- Email: pmyers at redhat.com -=| |=- Office: +1 412 474 3552 Mobile: +1 703 362 9622 -=| |=- GnuPG: E65E4F3D 88F9 F1C9 C2F3 1303 01FE 817C C5D2 8B91 E65E 4F3D -=| From pmyers at redhat.com Wed Jan 14 15:17:08 2009 From: pmyers at redhat.com (Perry Myers) Date: Wed, 14 Jan 2009 10:17:08 -0500 Subject: [Ovirt-devel] [PATCH node] Bootup mounts the local log partition if it exists In-Reply-To: <1231863234-1845-1-git-send-email-bkearney@redhat.com> References: <1231863234-1845-1-git-send-email-bkearney@redhat.com> Message-ID: <496E01F4.90303@redhat.com> The logs-backup directory is just to catch any logs that get created between the system starting and ovirt-early coming up, correct? Should be minimal messages and dmesg output probably. Any way to get the log partition mounted earlier than ovirt-early so that we minimize log discontinuity? Also it looks like logs-backup directory is itself not persistent. So the early logs will always get lost. Perhaps we should do: cp -R /var/log /var/logs-backup mount /dev/HostVG/Logging /var/log rm -Rf /var/log/logs-backup mv /var/logs-backup /var/log That way the logs-backup is persisted at least for one boot. Also, what about logs created during firstboot? We need a patch that makes it so immediately after the Node has the log partition created from o-c-storage the log partition is mounted and logs in the non-persistent log partition are moved over. Otherwise we lose all of the log output from the firstboot scripts. Perry Bryan Kearney wrote: > --- > scripts/ovirt-early | 1 + > scripts/ovirt-functions | 20 ++++++++++++++++++++ > 2 files changed, 21 insertions(+), 0 deletions(-) > > diff --git a/scripts/ovirt-early b/scripts/ovirt-early > index 153c0c7..53d5e21 100755 > --- a/scripts/ovirt-early > +++ b/scripts/ovirt-early > @@ -113,6 +113,7 @@ find_disk() { > > > start() { > + mount_logging > # oVirt boot parameters > # BOOTIF=link|eth*| (appended by pxelinux) > # ovirt_init=usb|scsi[:serial#] > diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions > index 9301678..1204231 100644 > --- a/scripts/ovirt-functions > +++ b/scripts/ovirt-functions > @@ -196,6 +196,26 @@ mount_config() { > fi > } > > +# mount logging partition > +mount_logging() { > + if grep -q " /var/log " /proc/mounts; then > + return 0 > + fi > + # backup the logs > + if [-e /var/logs-backup ]; then > + rm -rf /var/logs-backup > + fi > + cp -R /var/log /var/logs-backup > + > + mount /dev/HostVG/Logging /var/log > + if grep -q " /var/log " /proc/mounts; then > + return 0 > + else > + # /var/log is not available > + return 1 > + fi > +} > + > # unmount bindmounted config files > # umount_config /etc/config /etc/config2 ... > # -- |=- Red Hat, Engineering, Emerging Technologies, Boston -=| |=- Email: pmyers at redhat.com -=| |=- Office: +1 412 474 3552 Mobile: +1 703 362 9622 -=| |=- GnuPG: E65E4F3D 88F9 F1C9 C2F3 1303 01FE 817C C5D2 8B91 E65E 4F3D -=| From pmyers at redhat.com Wed Jan 14 15:23:02 2009 From: pmyers at redhat.com (Perry Myers) Date: Wed, 14 Jan 2009 10:23:02 -0500 Subject: [Ovirt-devel] How to update ovirt based current version? In-Reply-To: <4967DEB3.4010004@redhat.com> References: <49671CF6.4010904@gmail.com> <4967DEB3.4010004@redhat.com> Message-ID: <496E0356.8030509@redhat.com> Perry Myers wrote: > nikkea wrote: >> --Just as title. > > Right now we don't support upgrades from released versions since the API > and database formats are still actively being updated. Starting with > 1.0 we'll support upgrades between minor version release. > > But for the time being we recommend that users start fresh with each > release. 0.96 is the latest release right now. Just want to point out that upgrades of the ovirt-server RPM should be possible as long as a rake db-migrate is done after an upgrade of the RPM. So one (not supported) upgrade path could be to take an existing appliance and update all of the oVirt RPMs on it. After the RPM update then run the rake db-migrate. It would actually be a good thing if users started doing this as it would get us on the path to being able to support true upgrades in the 1.0 timeframe and it would also keep the developers honest since major database breakage would become apparent more readily. I know David Lutterkort (dlutter at redhat.com) has expressed an interest in getting db upgrades working, so reach out to him on this he may be able to help. Perry From bkearney at redhat.com Wed Jan 14 15:20:03 2009 From: bkearney at redhat.com (Bryan Kearney) Date: Wed, 14 Jan 2009 10:20:03 -0500 Subject: [Ovirt-devel] [PATCH node] Added a wrapper script around the boot menu item to warn the users about the reboot In-Reply-To: <496E00CE.4020502@redhat.com> References: <1231449766-28155-1-git-send-email-bkearney@redhat.com> <496E00CE.4020502@redhat.com> Message-ID: <496E02A3.6020304@redhat.com> Perry Myers wrote: > Question on this patch, why did you create a separate script to wrap the > o-c-boot script instead of just putting a question at the top of the > main section of the o-c-boot script itself? You could just have > o-c-boot be executed directly by the firstboot menu and the first thing > it does is say "Are you sure" and if the user says No then it just exits > back to the main menu. This script is called several times, and it seemed ugly to put in an "Interactive" parameter to look for. Since it is called interactive in only one place, I figured it was cleaner to layer as opposed to add the if checks and flag. > > Also, do we have sanity checks in place for o-c-boot that check to make > sure that other things have been run like o-c-networking and > o-c-storage? If we don't have this, add that to the top of main in > o-c-boot along with the user question. We do some basic checking, but nothing rock-solid. Do we check for an initial state, or just provide text saying "You need to have done X,Y,Z for this to work" > > Finally, in a fully automated boot (i.e. all opts passed on kernel > cmdline) none of these user interactive questions should come up (this > is probably the case, just stating to make sure it's clear) Another reason for the wrapper :) > > Perry > > Bryan Kearney wrote: >> --- >> Makefile.am | 1 + >> ovirt-node.spec.in | 4 +++- >> scripts/ovirt-config-boot-wrapper | 16 ++++++++++++++++ >> 3 files changed, 20 insertions(+), 1 deletions(-) >> create mode 100644 scripts/ovirt-config-boot-wrapper >> >> diff --git a/Makefile.am b/Makefile.am >> index 6847234..c62774f 100644 >> --- a/Makefile.am >> +++ b/Makefile.am >> @@ -30,6 +30,7 @@ EXTRA_DIST = \ >> scripts/ovirt \ >> scripts/ovirt-awake \ >> scripts/ovirt-config-boot \ >> + scripts/ovirt-config-boot-wrapper \ >> scripts/ovirt-config-hostname \ >> scripts/ovirt-config-logging \ >> scripts/ovirt-config-networking \ >> diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in >> index 501bf4f..f30dd62 100644 >> --- a/ovirt-node.spec.in >> +++ b/ovirt-node.spec.in >> @@ -132,6 +132,7 @@ cd - >> >> %{__install} -p -m0755 scripts/ovirt-awake %{buildroot}%{_sbindir} >> %{__install} -p -m0755 scripts/ovirt-config-boot %{buildroot}%{_sbindir} >> +%{__install} -p -m0755 scripts/ovirt-config-boot-wrapper >> %{buildroot}%{_sbindir} >> %{__install} -p -m0755 scripts/ovirt-config-hostname >> %{buildroot}%{_sbindir} >> %{__install} -p -m0755 scripts/ovirt-config-logging >> %{buildroot}%{_sbindir} >> %{__install} -p -m0755 scripts/ovirt-config-networking >> %{buildroot}%{_sbindir} >> @@ -191,7 +192,7 @@ install -p -m 644 images/syslinux-vesa-splash.jpg >> %{buildroot}/usr/lib/anaconda- >> %{__ln_s} ../..%{_sbindir}/ovirt-config-networking >> %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"15_Networking Setup" >> %{__ln_s} ../..%{_sbindir}/ovirt-config-storage >> %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"20_Disk Partitioning" >> %{__ln_s} ../..%{_sbindir}/ovirt-config-logging >> %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"30_Logging Setup" >> -%{__ln_s} ../..%{_sbindir}/ovirt-config-boot >> %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"99_Local install and >> reboot" >> +%{__ln_s} ../..%{_sbindir}/ovirt-config-boot-wrapper >> %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"99_Local install and >> reboot" >> >> >> %clean >> @@ -253,6 +254,7 @@ fi >> %defattr(-,root,root,0755) >> %{_sbindir}/ovirt-awake >> %{_sbindir}/ovirt-config-boot >> +%{_sbindir}/ovirt-config-boot-wrapper >> %{_sbindir}/ovirt-config-hostname >> %{_sbindir}/ovirt-config-logging >> %{_sbindir}/ovirt-config-networking >> diff --git a/scripts/ovirt-config-boot-wrapper >> b/scripts/ovirt-config-boot-wrapper >> new file mode 100644 >> index 0000000..6876a30 >> --- /dev/null >> +++ b/scripts/ovirt-config-boot-wrapper >> @@ -0,0 +1,16 @@ >> +#!/bin/bash >> +# >> +# Wrapper function to make sure the user wishes to continue before >> +# rebooting the system >> + >> +while true; do >> + read -p "This option will exit the menu, and require a reboot. Do >> you wish to continue? (Y|N)? " >> + r=$(echo $REPLY|tr '[[:lower:]]' '[[:upper:]]') >> + if [ "$r" == "Y" ]; then >> + /usr/sbin/ovirt-config-boot >> + break >> + elif [ "$r" == "N" ]; then >> + printf "\nExiting back to the menu\n" >> + break >> + fi >> +done > > From bkearney at redhat.com Wed Jan 14 15:23:52 2009 From: bkearney at redhat.com (Bryan Kearney) Date: Wed, 14 Jan 2009 10:23:52 -0500 Subject: [Ovirt-devel] [PATCH node] Bootup mounts the local log partition if it exists In-Reply-To: <496E01F4.90303@redhat.com> References: <1231863234-1845-1-git-send-email-bkearney@redhat.com> <496E01F4.90303@redhat.com> Message-ID: <496E0388.1000008@redhat.com> Perry Myers wrote: > The logs-backup directory is just to catch any logs that get created > between the system starting and ovirt-early coming up, correct? Should > be minimal messages and dmesg output probably. Any way to get the log > partition mounted earlier than ovirt-early ovirt early runs very early (01), and mounting of the logs is done first in that script. I believe that minimizes the impact. so that we minimize log > discontinuity? Also it looks like logs-backup directory is itself not > persistent. So the early logs will always get lost. Perhaps we should do: > > cp -R /var/log /var/logs-backup > mount /dev/HostVG/Logging /var/log > rm -Rf /var/log/logs-backup > mv /var/logs-backup /var/log I will add that to the patch and re-send it. > > That way the logs-backup is persisted at least for one boot. > > Also, what about logs created during firstboot? We need a patch that > makes it so immediately after the Node has the log partition created > from o-c-storage the log partition is mounted and logs in the > non-persistent log partition are moved over. Otherwise we lose all of > the log output from the firstboot scripts. Good catch..i will add that as well. Given the resolution above, these will be available for 1 reboot only. Unless we put in a rolling logic (keep logs for 3 reboots). Thoughts? -- bk > > Perry > > Bryan Kearney wrote: >> --- >> scripts/ovirt-early | 1 + >> scripts/ovirt-functions | 20 ++++++++++++++++++++ >> 2 files changed, 21 insertions(+), 0 deletions(-) >> >> diff --git a/scripts/ovirt-early b/scripts/ovirt-early >> index 153c0c7..53d5e21 100755 >> --- a/scripts/ovirt-early >> +++ b/scripts/ovirt-early >> @@ -113,6 +113,7 @@ find_disk() { >> >> >> start() { >> + mount_logging >> # oVirt boot parameters >> # BOOTIF=link|eth*| (appended by pxelinux) >> # ovirt_init=usb|scsi[:serial#] >> diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions >> index 9301678..1204231 100644 >> --- a/scripts/ovirt-functions >> +++ b/scripts/ovirt-functions >> @@ -196,6 +196,26 @@ mount_config() { >> fi >> } >> >> +# mount logging partition >> +mount_logging() { >> + if grep -q " /var/log " /proc/mounts; then >> + return 0 >> + fi >> + # backup the logs >> + if [-e /var/logs-backup ]; then >> + rm -rf /var/logs-backup >> + fi >> + cp -R /var/log /var/logs-backup >> + >> + mount /dev/HostVG/Logging /var/log >> + if grep -q " /var/log " /proc/mounts; then >> + return 0 >> + else >> + # /var/log is not available >> + return 1 >> + fi >> +} >> + >> # unmount bindmounted config files >> # umount_config /etc/config /etc/config2 ... >> # > > From pmyers at redhat.com Wed Jan 14 15:32:36 2009 From: pmyers at redhat.com (Perry Myers) Date: Wed, 14 Jan 2009 10:32:36 -0500 Subject: [Ovirt-devel] [PATCH node] Added a wrapper script around the boot menu item to warn the users about the reboot In-Reply-To: <496E02A3.6020304@redhat.com> References: <1231449766-28155-1-git-send-email-bkearney@redhat.com> <496E00CE.4020502@redhat.com> <496E02A3.6020304@redhat.com> Message-ID: <496E0594.5090906@redhat.com> Bryan Kearney wrote: > Perry Myers wrote: >> Question on this patch, why did you create a separate script to wrap >> the o-c-boot script instead of just putting a question at the top of >> the main section of the o-c-boot script itself? You could just have >> o-c-boot be executed directly by the firstboot menu and the first >> thing it does is say "Are you sure" and if the user says No then it >> just exits back to the main menu. > > This script is called several times, and it seemed ugly to put in an > "Interactive" parameter to look for. Since it is called interactive in > only one place, I figured it was cleaner to layer as opposed to add the > if checks and flag. Ah, got it. I was only thinking about the interactive case. In the non-interactive case the o-c-boot script is called directly w/o the wrapper. Ok, given that this seems ok to me. >> >> Also, do we have sanity checks in place for o-c-boot that check to >> make sure that other things have been run like o-c-networking and >> o-c-storage? If we don't have this, add that to the top of main in >> o-c-boot along with the user question. > > We do some basic checking, but nothing rock-solid. Do we check for an > initial state, or just provide text saying "You need to have done X,Y,Z > for this to work" The latter won't work because o-c-storage doesn't guarantee that an ovirt Node partition was created, correct? o-c-storage can be run just to create partitions for config/logging but not hard disk boot. So the user could run o-c-storage, elect not to create a partition to store the Node itself and then try to run o-c-boot. In this case o-c-boot would fail. So I think we want to do checks that ensure that the minimum partitions are present with minimum recommended sizes. For networking I think we can just check to see whether or not o-c-networking script was run or you could check for presence of ifcfg files. This should be equivalent. >> >> Finally, in a fully automated boot (i.e. all opts passed on kernel >> cmdline) none of these user interactive questions should come up (this >> is probably the case, just stating to make sure it's clear) > > Another reason for the wrapper :) Yep. Thanks, Perry From pmyers at redhat.com Wed Jan 14 15:37:35 2009 From: pmyers at redhat.com (Perry Myers) Date: Wed, 14 Jan 2009 10:37:35 -0500 Subject: [Ovirt-devel] [PATCH node] Bootup mounts the local log partition if it exists In-Reply-To: <496E0388.1000008@redhat.com> References: <1231863234-1845-1-git-send-email-bkearney@redhat.com> <496E01F4.90303@redhat.com> <496E0388.1000008@redhat.com> Message-ID: <496E06BF.6080505@redhat.com> Bryan Kearney wrote: > Perry Myers wrote: >> The logs-backup directory is just to catch any logs that get created >> between the system starting and ovirt-early coming up, correct? >> Should be minimal messages and dmesg output probably. Any way to get >> the log partition mounted earlier than ovirt-early > > > ovirt early runs very early (01), and mounting of the logs is done first > in that script. I believe that minimizes the impact. If /etc/fstab contained an entry to mount the log partition then there would be no log discontinuity right? Would there be any harm to always putting /var/HostVG/Logging /var/log into /etc/fstab during Node creation? Before the partition is created (or if it is never created) there will be an error on init saying that the partition couldn't be mounted, but perhaps we can muck with init to swallow that error. If we do this then there is no log discontinuity and no need for the logs-backup directory at all. > so that we minimize log >> discontinuity? Also it looks like logs-backup directory is itself not >> persistent. So the early logs will always get lost. Perhaps we >> should do: >> >> cp -R /var/log /var/logs-backup >> mount /dev/HostVG/Logging /var/log >> rm -Rf /var/log/logs-backup >> mv /var/logs-backup /var/log > > I will add that to the patch and re-send it. This wouldn't be necessary if we do the fstab changes above. >> >> That way the logs-backup is persisted at least for one boot. >> >> Also, what about logs created during firstboot? We need a patch that >> makes it so immediately after the Node has the log partition created >> from o-c-storage the log partition is mounted and logs in the >> non-persistent log partition are moved over. Otherwise we lose all of >> the log output from the firstboot scripts. > > Good catch..i will add that as well. Given the resolution above, these > will be available for 1 reboot only. Unless we put in a rolling logic > (keep logs for 3 reboots). Thoughts? This is the one case where fstab changes wouldn't remove need for logs-backup directory. However, since this is a one time thing (only during firstboot) we could make it a firstboot-logs directory that is in /var/log and since firstboot is only done once the logs would never be overwritten. Perry From apevec at gmail.com Wed Jan 14 15:39:56 2009 From: apevec at gmail.com (Alan Pevec) Date: Wed, 14 Jan 2009 16:39:56 +0100 Subject: [Ovirt-devel] [PATCH node] Changed max swap size to allow for overcommitting. In-Reply-To: <496DC175.3090908@redhat.com> References: <1231886021-16855-1-git-send-email-dpierce@redhat.com> <2be7262f0901131558t163d40e5na7bfb29a8d8a321f@mail.gmail.com> <496DC175.3090908@redhat.com> Message-ID: <2be7262f0901140739r4f80b06p796270b68e8c9bc9@mail.gmail.com> On Wed, Jan 14, 2009 at 11:41 AM, Dor Laor wrote: > ovirt_overcommit=N > means swap area is set to N * MEM_SIZE > > Can it be N*MEM_SIZE + the values from the table below? > This way you retain swap memory for the VMs and additional swap for the > host. > yes, agreed > default N is 2, in case parameter is not present > > > Make sure N is not an int. The current solidIce default is 150%. > For 150% N should be 0.5 since the 100% is in the RAM. > > ok, to recap: swap = mem * overcommit + min_from_kbase_table(mem) where default overcommit=0.5 (in case ovirt_overcommit param isn't present) -------------- next part -------------- An HTML attachment was scrubbed... URL: From pmyers at redhat.com Wed Jan 14 15:55:00 2009 From: pmyers at redhat.com (Perry Myers) Date: Wed, 14 Jan 2009 10:55:00 -0500 Subject: [Ovirt-devel] [PATCH node] BZ479241: Modified the continue message per the commnets In-Reply-To: <1231792317-31316-1-git-send-email-bkearney@redhat.com> References: <1231792317-31316-1-git-send-email-bkearney@redhat.com> Message-ID: <496E0AD4.9010101@redhat.com> Bryan Kearney wrote: > --- > scripts/ovirt-config-setup | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/scripts/ovirt-config-setup b/scripts/ovirt-config-setup > index 9ee268f..3e096bd 100755 > --- a/scripts/ovirt-config-setup > +++ b/scripts/ovirt-config-setup > @@ -7,7 +7,7 @@ CONFIG_DIR=/etc/ovirt-config-setup.d > > # special options, all others execute the symlinked script in CONFIG_DIR > DEBUG_SHELL="Shell" > -CONTINUE="Continue" > +CONTINUE="Continue Stateless Boot" > > declare -a OPTIONS > ACK -- |=- Red Hat, Engineering, Emerging Technologies, Boston -=| |=- Email: pmyers at redhat.com -=| |=- Office: +1 412 474 3552 Mobile: +1 703 362 9622 -=| |=- GnuPG: E65E4F3D 88F9 F1C9 C2F3 1303 01FE 817C C5D2 8B91 E65E 4F3D -=| From dlaor at redhat.com Wed Jan 14 15:57:39 2009 From: dlaor at redhat.com (Dor Laor) Date: Wed, 14 Jan 2009 17:57:39 +0200 Subject: [Ovirt-devel] [PATCH node] Changed max swap size to allow for overcommitting. In-Reply-To: <2be7262f0901140739r4f80b06p796270b68e8c9bc9@mail.gmail.com> References: <1231886021-16855-1-git-send-email-dpierce@redhat.com> <2be7262f0901131558t163d40e5na7bfb29a8d8a321f@mail.gmail.com> <496DC175.3090908@redhat.com> <2be7262f0901140739r4f80b06p796270b68e8c9bc9@mail.gmail.com> Message-ID: <496E0B73.1070604@redhat.com> Alan Pevec wrote: > On Wed, Jan 14, 2009 at 11:41 AM, Dor Laor > wrote: > > ok, to recap: > > swap = mem * overcommit + min_from_kbase_table(mem) > where default overcommit=0.5 (in case ovirt_overcommit param isn't > present) > If overcommit is not present you can use overcommit=0 like you guys assumed before. From mmorsi at redhat.com Wed Jan 14 16:33:24 2009 From: mmorsi at redhat.com (Mohammed Morsi) Date: Wed, 14 Jan 2009 11:33:24 -0500 Subject: [Ovirt-devel] [PATCH server] comprehensive / up to date validations patch Message-ID: <1231950804-6383-1-git-send-email-mmorsi@redhat.com> this patch provides all the validation components included in the previous 3-patch patch-set, updated to incorporate recent changes to the rails application since they were originally sent out and to remove extraneous whitespace. This is the only patch that needs to be ack'd as it contains the validations, tests, and bug fixes Attached is additional validations, added to the rails model and controller layers verifying: bondings: arp related fields boot_types: label uniqueness and proto inclusion cpus: various fields are set and min values help_sections: presence and uniqueness of fields hosts: presence and format of various fields ip_addresses: fk existance / integrity nics: mac address format permissions: presence / inclusion of various fields pools: type inclusion quotas: minimum values smart_pool_tags: tagged_id / type fk present storage_pools: type, state field inclusion, min values storage_volumes: various fields, subclasses w/ various fields tasks: various fields present and consistensy maintained usages: label, other fields present, unique vms: uuid of correct format, min values, various fields present pools lft and rgt are not verified as they are added by acts_as_nested_set _after_ the pool is inserted into the db can only add / move host and storage volumes and pools to / from pools when you have sufficient permissions and target entities don't have associated vms can only destroy storage volumes / pools if there are no attached vms included are a few updates to the main server app and many updates to the test suite to fix a few various bits and assert all the new validations added. --- src/app/controllers/hardware_controller.rb | 28 ++++++- src/app/controllers/storage_controller.rb | 7 ++ src/app/models/bonding.rb | 15 +++- src/app/models/boot_type.rb | 5 + src/app/models/cpu.rb | 23 +++++ src/app/models/help_section.rb | 34 ++++++++ src/app/models/host.rb | 18 ++++ src/app/models/ip_address.rb | 4 + src/app/models/iscsi_storage_volume.rb | 2 + src/app/models/lvm_storage_volume.rb | 6 ++ src/app/models/nfs_storage_pool.rb | 1 + src/app/models/nic.rb | 15 +++- src/app/models/permission.rb | 7 ++ src/app/models/pool.rb | 3 + src/app/models/quota.rb | 22 +++++ src/app/models/smart_pool_tag.rb | 5 + src/app/models/storage_pool.rb | 17 ++++ src/app/models/storage_volume.rb | 21 +++++ src/app/models/task.rb | 16 ++++ src/app/models/usage.rb | 6 ++ src/app/models/vm.rb | 36 ++++++++- src/host-browser/host-browser.rb | 8 +- src/test/fixtures/help_sections.yml | 14 ++- src/test/fixtures/hosts.yml | 45 +++++++---- src/test/fixtures/storage_pools.yml | 11 +++ src/test/fixtures/usages.yml | 12 ++- src/test/functional/resources_controller_test.rb | 2 +- src/test/functional/storage_controller_test.rb | 4 +- src/test/unit/bonding_test.rb | 35 ++++++++ src/test/unit/boot_type_test.rb | 36 +++++++- src/test/unit/cpu_test.rb | 95 +++++++++++++++++++++- src/test/unit/help_section_test.rb | 51 +++++++++++- src/test/unit/host_test.rb | 60 +++++++++++++- src/test/unit/ip_address_test.rb | 5 + src/test/unit/ip_v4_address_test.rb | 3 +- src/test/unit/ip_v6_address_test.rb | 3 +- src/test/unit/nic_test.rb | 58 +++++++++++++- src/test/unit/permission_test.rb | 28 +++++++ src/test/unit/pool_test.rb | 21 +++++ src/test/unit/quota_test.rb | 37 ++++++++- src/test/unit/storage_pool_test.rb | 45 ++++++++++ src/test/unit/storage_volume_test.rb | 86 +++++++++++++++++++ src/test/unit/task_test.rb | 14 +++ src/test/unit/usage_test.rb | 47 ++++++++++- src/test/unit/vm_test.rb | 64 +++++++++++++++ 45 files changed, 1009 insertions(+), 66 deletions(-) diff --git a/src/app/controllers/hardware_controller.rb b/src/app/controllers/hardware_controller.rb index 7be67cc..5c14eec 100644 --- a/src/app/controllers/hardware_controller.rb +++ b/src/app/controllers/hardware_controller.rb @@ -293,15 +293,39 @@ class HardwareController < PoolController resource_ids_str = params[:resource_ids] resource_ids = resource_ids_str.split(",").collect {|x| x.to_i} + # if user doesn't have modify permission on both source and destination + unless @pool.can_modify(@user) and Pool.find(params[:target_pool_id]).can_modify(@user) + render :json => { :success => false, + :alert => "Cannot #{item_action.to_s} #{item_class.table_name.humanize} without admin permissions on both pools" } + return + end + + # relay error message if movable check fails for any resource + success = true + failed_resources = "" + resource_ids.each {|x| + unless item_class.find(x).movable? + success = false + failed_resources += x.to_s + " " + end + } + resource_ids.delete_if { |x| ! item_class.find(x).movable? } + begin @pool.transaction do @pool.send(item_method, resource_ids, target_pool_id) end + rescue + success = false + end + + if success render :json => { :success => true, :alert => "#{item_action.to_s} #{item_class.table_name.humanize} successful." } - rescue + else render :json => { :success => false, - :alert => "#{item_action.to_s} #{item_class.table_name.humanize} failed." } + :alert => "#{item_action.to_s} #{item_class.table_name.humanize} failed" + + (failed_resources == "" ? "." : " for " + failed_resources) } end end diff --git a/src/app/controllers/storage_controller.rb b/src/app/controllers/storage_controller.rb index 148d1be..e4b72f1 100644 --- a/src/app/controllers/storage_controller.rb +++ b/src/app/controllers/storage_controller.rb @@ -310,6 +310,13 @@ class StorageController < ApplicationController end def destroy + unless @storage_pool.movable? + format.json { render :json => { :object => "storage_pool", + :success => false, + :alert => "Cannot delete storage with associated vms" } } + return + end + pool = @storage_pool.hardware_pool if @storage_pool.destroy alert="Storage Pool was successfully deleted." diff --git a/src/app/models/bonding.rb b/src/app/models/bonding.rb index c9af38c..a67b97b 100644 --- a/src/app/models/bonding.rb +++ b/src/app/models/bonding.rb @@ -30,6 +30,8 @@ # interface. They can be ignored if not used. # class Bonding < ActiveRecord::Base + + belongs_to :host belongs_to :bonding_type belongs_to :vlan @@ -58,9 +60,20 @@ class Bonding < ActiveRecord::Base validates_presence_of :vlan_id, :message => 'A vlan must be specified.' + # verify arp ping address to be ipv4 if set + validates_format_of :arp_ping_address, + :with => %r{^(\d{1,3}\.){3}\d{1,3}$}, + :unless => Proc.new { |bonding| bonding.arp_ping_address.nil? } + + validates_numericality_of :arp_interval, + :greater_than_or_equal_to => 0, + :unless => Proc.new { |bonding| bonding.arp_interval.nil? } + protected def validate - if vlan.boot_type.proto == 'static' and ip_addresses.size == 0 + if ! vlan.nil? and + vlan.boot_type.proto == 'static' and + ip_addresses.size == 0 errors.add("vlan_id", "is static. Must create at least one static ip") end diff --git a/src/app/models/boot_type.rb b/src/app/models/boot_type.rb index 8ffbe67..6cfdb04 100644 --- a/src/app/models/boot_type.rb +++ b/src/app/models/boot_type.rb @@ -18,4 +18,9 @@ # also available at http://www.gnu.org/copyleft/gpl.html. class BootType < ActiveRecord::Base + validates_presence_of :label + validates_uniqueness_of :label, + :message => 'Label must be unique' + validates_inclusion_of :proto, + :in => %w( static dhcp bootp ) end diff --git a/src/app/models/cpu.rb b/src/app/models/cpu.rb index 1a7d3cf..714a8ed 100644 --- a/src/app/models/cpu.rb +++ b/src/app/models/cpu.rb @@ -21,4 +21,27 @@ # class Cpu < ActiveRecord::Base belongs_to :host + + validates_presence_of :host_id, + :message => 'A host must be specified.' + + validates_numericality_of :cpu_number, + :greater_than_or_equal_to => 0 + + validates_numericality_of :core_number, + :greater_than_or_equal_to => 0 + + validates_numericality_of :number_of_cores, + :greater_than_or_equal_to => 1 + + validates_numericality_of :cpuid_level, + :greater_than_or_equal_to => 0 + + validates_numericality_of :speed, + :greater_than => 0 + # also verify speed in MHz ? + + validates_presence_of :vendor + validates_presence_of :model + validates_presence_of :family end diff --git a/src/app/models/help_section.rb b/src/app/models/help_section.rb index a891383..bd3e27c 100644 --- a/src/app/models/help_section.rb +++ b/src/app/models/help_section.rb @@ -1,2 +1,36 @@ +# Copyright (C) 2008 Red Hat, Inc. +# Written by Mohammed Morsi +# +# 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. +# +# +HelpSection+ defines a section of the web help document to be +# available for a specific controller / action +# class HelpSection < ActiveRecord::Base + + validates_uniqueness_of :action, + :scope => :controller, + :message => 'Controller / Action must be unique' + + validates_presence_of :controller, + :message => 'A controller must be specified.' + + validates_presence_of :action, + :message => 'An action must be specified.' + + validates_presence_of :section, + :message => 'A section must be specified.' end diff --git a/src/app/models/host.rb b/src/app/models/host.rb index 813bc1d..ba7893a 100644 --- a/src/app/models/host.rb +++ b/src/app/models/host.rb @@ -60,6 +60,14 @@ class Host < ActiveRecord::Base [ :search_users, 'U', "search_users" ] ], :eager_load => :smart_pools + validates_presence_of :hardware_pool_id, + :message => 'A hardware pool id must be specified.' + + validates_presence_of :hostname, + :message => 'A hostname must be specified.' + + validates_presence_of :arch, + :message => 'An arch must be specified.' KVM_HYPERVISOR_TYPE = "KVM" HYPERVISOR_TYPES = [KVM_HYPERVISOR_TYPE] @@ -67,6 +75,12 @@ class Host < ActiveRecord::Base STATE_AVAILABLE = "available" STATES = [STATE_UNAVAILABLE, STATE_AVAILABLE] + validates_inclusion_of :hypervisor_type, + :in => HYPERVISOR_TYPES + + validates_inclusion_of :state, + :in => STATES + Task::COMPLETED_STATES + Task::WORKING_STATES + def memory_in_mb kb_to_mb(memory) end @@ -108,4 +122,8 @@ class Host < ActiveRecord::Base hardware_pool.search_users end + def movable? + return vms.size == 0 + end + end diff --git a/src/app/models/ip_address.rb b/src/app/models/ip_address.rb index 5d2e6af..3f246b1 100644 --- a/src/app/models/ip_address.rb +++ b/src/app/models/ip_address.rb @@ -24,4 +24,8 @@ class IpAddress < ActiveRecord::Base belongs_to :network belongs_to :nic belongs_to :bonding + + def validate + errors.add("id", "ip must be associated with foreign entity") if network_id.nil? and nic_id.nil? and bonding_id.nil? + end end diff --git a/src/app/models/iscsi_storage_volume.rb b/src/app/models/iscsi_storage_volume.rb index 48edbd8..fe2cbf5 100644 --- a/src/app/models/iscsi_storage_volume.rb +++ b/src/app/models/iscsi_storage_volume.rb @@ -31,4 +31,6 @@ class IscsiStorageVolume < StorageVolume return true end + validates_presence_of :lun + end diff --git a/src/app/models/lvm_storage_volume.rb b/src/app/models/lvm_storage_volume.rb index 8eb1f0e..38949ce 100644 --- a/src/app/models/lvm_storage_volume.rb +++ b/src/app/models/lvm_storage_volume.rb @@ -29,4 +29,10 @@ class LvmStorageVolume < StorageVolume def volume_create_params return lv_name, size, lv_owner_perms, lv_group_perms, lv_mode_perms end + + validates_presence_of :lv_name + validates_presence_of :lv_owner_perms + validates_presence_of :lv_group_perms + validates_presence_of :lv_mode_perms + end diff --git a/src/app/models/nfs_storage_pool.rb b/src/app/models/nfs_storage_pool.rb index 398e3f9..3b438c8 100644 --- a/src/app/models/nfs_storage_pool.rb +++ b/src/app/models/nfs_storage_pool.rb @@ -29,4 +29,5 @@ class NfsStoragePool < StoragePool def user_subdividable true end + end diff --git a/src/app/models/nic.rb b/src/app/models/nic.rb index 5649763..7ecfe6f 100644 --- a/src/app/models/nic.rb +++ b/src/app/models/nic.rb @@ -24,15 +24,28 @@ class Nic < ActiveRecord::Base has_and_belongs_to_many :bondings, :join_table => 'bondings_nics' + validates_presence_of :mac, + :message => 'A mac must be specified.' + + validates_format_of :mac, + :with => %r{^([0-9a-f]{2}([:-]|$)){6}$} + validates_presence_of :host_id, :message => 'A host must be specified.' validates_presence_of :physical_network_id, :message => 'A network must be specified.' + validates_numericality_of :bandwidth, + :greater_than_or_equal_to => 0 + + # validate 'bridge' or 'usage_type' attribute ? + protected def validate - if physical_network.boot_type.proto == 'static' and ip_addresses.size == 0 + if ! physical_network.nil? and + physical_network.boot_type.proto == 'static' and + ip_addresses.size == 0 errors.add("physical_network_id", "is static. Must create at least one static ip") end diff --git a/src/app/models/permission.rb b/src/app/models/permission.rb index ece3da5..b3929ad 100644 --- a/src/app/models/permission.rb +++ b/src/app/models/permission.rb @@ -24,9 +24,12 @@ class Permission < ActiveRecord::Base has_many :child_permissions, :dependent => :destroy, :class_name => "Permission", :foreign_key => "inherited_from_id" + validates_presence_of :pool_id + validates_presence_of :uid validates_uniqueness_of :uid, :scope => [:pool_id, :inherited_from_id] + ROLE_SUPER_ADMIN = "Super Admin" ROLE_ADMIN = "Administrator" ROLE_USER = "User" @@ -44,6 +47,10 @@ class Permission < ActiveRecord::Base ROLE_USER => [PRIV_VIEW, PRIV_VM_CONTROL], ROLE_MONITOR => [PRIV_VIEW]} + + validates_inclusion_of :user_role, + :in => ROLES.keys + def self.invert_roles return_hash = {} ROLES.each do |role, privs| diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb index 614325a..ed767dd 100644 --- a/src/app/models/pool.rb +++ b/src/app/models/pool.rb @@ -53,6 +53,9 @@ class Pool < ActiveRecord::Base validates_presence_of :name validates_uniqueness_of :name, :scope => :parent_id + validates_inclusion_of :type, + :in => %w( DirectoryPool HardwarePool VmResourcePool SmartPool ) + # overloading this method such that we can use permissions.admins to get all the admins for an object has_many :permissions, :dependent => :destroy, :order => "id ASC" do def super_admins diff --git a/src/app/models/quota.rb b/src/app/models/quota.rb index fc52177..2a9e0f0 100644 --- a/src/app/models/quota.rb +++ b/src/app/models/quota.rb @@ -22,6 +22,28 @@ require 'util/ovirt' class Quota < ActiveRecord::Base belongs_to :pool + validates_presence_of :pool_id + + + validates_numericality_of :total_vcpus, + :greater_than_or_equal_to => 0, + :unless => Proc.new{ |quota| quota.total_vcpus.nil? } + + validates_numericality_of :total_vmemory, + :greater_than_or_equal_to => 0, + :unless => Proc.new{ |quota| quota.total_vmemory.nil? } + + validates_numericality_of :total_vnics, + :greater_than_or_equal_to => 0, + :unless => Proc.new{ |quota| quota.total_vnics.nil? } + + validates_numericality_of :total_storage, + :greater_than_or_equal_to => 0, + :unless => Proc.new{ |quota| quota.total_storage.nil? } + + validates_numericality_of :total_vms, + :greater_than_or_equal_to => 0, + :unless => Proc.new{ |quota| quota.total_vms.nil? } def total_vmemory_in_mb kb_to_mb(total_vmemory) diff --git a/src/app/models/smart_pool_tag.rb b/src/app/models/smart_pool_tag.rb index e135ddf..00bb5a7 100644 --- a/src/app/models/smart_pool_tag.rb +++ b/src/app/models/smart_pool_tag.rb @@ -31,6 +31,11 @@ class SmartPoolTag < ActiveRecord::Base validates_uniqueness_of :smart_pool_id, :scope => [:tagged_id, :tagged_type] + validates_presence_of :tagged_id + + validates_inclusion_of :tagged_type, + :in => %w( Pool StoragePool Host Vm ) + def tagged_type=(sType) super(sType.to_s.classify.constantize.base_class.to_s) end diff --git a/src/app/models/storage_pool.rb b/src/app/models/storage_pool.rb index bab7031..f9abb55 100644 --- a/src/app/models/storage_pool.rb +++ b/src/app/models/storage_pool.rb @@ -39,6 +39,13 @@ class StoragePool < ActiveRecord::Base validates_presence_of :hardware_pool_id + validates_inclusion_of :type, + :in => %w( IscsiStoragePool LvmStoragePool NfsStoragePool ) + + + validates_numericality_of :capacity, + :greater_than_or_equal_to => 0 + acts_as_xapian :texts => [ :ip_addr, :target, :export_path, :type ], :terms => [ [ :search_users, 'U', "search_users" ] ], :eager_load => :smart_pools @@ -54,6 +61,9 @@ class StoragePool < ActiveRecord::Base STATE_PENDING_DELETION = "pending_deletion" STATE_AVAILABLE = "available" + validates_inclusion_of :state, + :in => [ STATE_PENDING_SETUP, STATE_PENDING_DELETION, STATE_AVAILABLE] + def self.factory(type, params = {}) params[:state] = STATE_PENDING_SETUP unless params[:state] case type @@ -121,4 +131,11 @@ class StoragePool < ActiveRecord::Base end return_hash end + + def movable? + storage_volumes.each{ |x| + return false unless x.movable? + } + return true + end end diff --git a/src/app/models/storage_volume.rb b/src/app/models/storage_volume.rb index 39b72d5..f8bd4fb 100644 --- a/src/app/models/storage_volume.rb +++ b/src/app/models/storage_volume.rb @@ -32,10 +32,23 @@ class StorageVolume < ActiveRecord::Base end end + validates_presence_of :storage_pool_id + + + validates_numericality_of :size, + :greater_than_or_equal_to => 0, + :unless => Proc.new { |storage_volume| storage_volume.nil? } + + validates_inclusion_of :type, + :in => %w( IscsiStorageVolume LvmStorageVolume NfsStorageVolume ) + STATE_PENDING_SETUP = "pending_setup" STATE_PENDING_DELETION = "pending_deletion" STATE_AVAILABLE = "available" + validates_inclusion_of :state, + :in => [ STATE_PENDING_SETUP, STATE_PENDING_DELETION, STATE_AVAILABLE] + def self.factory(type, params = {}) params[:state] = STATE_PENDING_SETUP unless params[:state] case type @@ -131,4 +144,12 @@ class StorageVolume < ActiveRecord::Base return_hash end + def movable? + if vms.size > 0 or + (not lvm_storage_pool.nil? and not lvm_stoage_pool.movable?) + return false + end + return true + end + end diff --git a/src/app/models/task.rb b/src/app/models/task.rb index dd24e6a..66cac33 100644 --- a/src/app/models/task.rb +++ b/src/app/models/task.rb @@ -45,6 +45,17 @@ class Task < ActiveRecord::Base COMPLETED_STATES = [STATE_FINISHED, STATE_FAILED, STATE_CANCELED] WORKING_STATES = [STATE_QUEUED, STATE_RUNNING, STATE_PAUSED] + validates_inclusion_of :type, + :in => %w( HostTask StorageTask StorageVolumeTask VmTask ) + + validates_inclusion_of :state, + :in => COMPLETED_STATES + WORKING_STATES + + # FIXME validate action depending on type / subclass + # validate task_target_id, task_type_id, arg, message + # depending on subclass, action, state + + TASK_TYPES_OPTIONS = [["VM Tasks", "VmTask"], ["Host Tasks", "HostTask"], ["Storage Tasks", "StorageTask"], @@ -89,4 +100,9 @@ class Task < ActiveRecord::Base ret_val += " #{args}" if args ret_val end + + def validate + errors.add("time_ended", "Tasks ends before its started") unless time_ended.nil? or time_started.nil? or time_ended > time_started + errors.add("time_started", "Tasks starts before its created") unless time_started.nil? or time_created.nil? or time_started > time_created + end end diff --git a/src/app/models/usage.rb b/src/app/models/usage.rb index 353e8f4..59b0e48 100644 --- a/src/app/models/usage.rb +++ b/src/app/models/usage.rb @@ -18,4 +18,10 @@ class Usage < ActiveRecord::Base has_and_belongs_to_many :networks, :join_table => 'networks_usages' + + validates_presence_of :label + validates_presence_of :usage + + validates_uniqueness_of :usage + end diff --git a/src/app/models/vm.rb b/src/app/models/vm.rb index 227f343..bf99e2d 100644 --- a/src/app/models/vm.rb +++ b/src/app/models/vm.rb @@ -34,7 +34,32 @@ class Vm < ActiveRecord::Base validates_presence_of :uuid, :description, :num_vcpus_allocated, :boot_device, :memory_allocated_in_mb, - :memory_allocated, :vnic_mac_addr + :memory_allocated, :vnic_mac_addr, + :vm_resource_pool_id + + validates_format_of :uuid, + :with => %r([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}) + + validates_numericality_of :needs_restart, + :greater_than_or_equal_to => 0, + :less_than_or_equal_to => 1, + :unless => Proc.new{ |vm| vm.needs_restart.nil? } + + validates_numericality_of :memory_used, + :greater_than_or_equal_to => 0, + :unless => Proc.new{ |vm| vm.memory_used.nil? } + + validates_numericality_of :vnc_port, + :greater_than_or_equal_to => 0, + :unless => Proc.new{ |vm| vm.vnc_port.nil? } + + validates_numericality_of :num_vcpus_allocated, + :greater_than_or_equal_to => 0, + :unless => Proc.new{ |vm| vm.num_vcpus_allocated.nil? } + + validates_numericality_of :memory_allocated, + :greater_than_or_equal_to => 0, + :unless => Proc.new{ |vm| vm.memory_allocated.nil? } acts_as_xapian :texts => [ :uuid, :description, :vnic_mac_addr, :state ], :terms => [ [ :search_users, 'U', "search_users" ] ], @@ -117,9 +142,14 @@ class Vm < ActiveRecord::Base STATE_SAVED => STATE_SAVED, STATE_RESTORING => STATE_RUNNING, STATE_MIGRATING => STATE_RUNNING, - STATE_CREATE_FAILED => STATE_CREATE_FAILED} + STATE_CREATE_FAILED => STATE_CREATE_FAILED, + STATE_INVALID => STATE_INVALID} TASK_STATE_TRANSITIONS = [] + validates_inclusion_of :state, + :in => EFFECTIVE_STATE.keys + + def get_hardware_pool pool = vm_resource_pool pool = pool.get_hardware_pool if pool @@ -311,7 +341,7 @@ class Vm < ActiveRecord::Base # FIXME: what should memory min/max be? errors.add("memory_allocated_in_mb", "must be at least 256 MB") unless not(memory_allocated_in_mb) or memory_allocated_in_mb >=256 # FIXME: what should cpu min/max - errors.add("num_vcpus_allocated", "must be between 1 and 16") unless (num_vcpus_allocated >=1 and num_vcpus_allocated <= 16) + errors.add("num_vcpus_allocated", "must be between 1 and 16") unless (num_vcpus_allocated.nil? or (num_vcpus_allocated >=1 and num_vcpus_allocated <= 16)) errors.add("memory_allocated_in_mb", "violates quota") unless not(memory_allocated) or resources[:memory].nil? or memory_allocated <= resources[:memory] errors.add("num_vcpus_allocated", "violates quota") unless not(num_vcpus_allocated) or resources[:cpus].nil? or num_vcpus_allocated <= resources[:cpus] errors.add_to_base("No available nics in quota") unless resources[:nics].nil? or resources[:nics] >= 1 diff --git a/src/host-browser/host-browser.rb b/src/host-browser/host-browser.rb index 52d2999..13eb6fc 100755 --- a/src/host-browser/host-browser.rb +++ b/src/host-browser/host-browser.rb @@ -250,13 +250,13 @@ class HostBrowser puts "Saving new CPU records" cpu_info.collect do |cpu| detail = Cpu.new( - "cpu_number" => cpu['CPUNUM'], - "core_number" => cpu['CORENUM]'], - "number_of_cores" => cpu['NUMCORES'], + "cpu_number" => cpu['CPUNUM'].to_i, + "core_number" => cpu['CORENUM]'].to_i, + "number_of_cores" => cpu['NUMCORES'].to_i, "vendor" => cpu['VENDOR'], "model" => cpu['MODEL'], "family" => cpu['FAMILY'], - "cpuid_level" => cpu['CPUIDLVL'], + "cpuid_level" => cpu['CPUIDLVL'].to_i, "speed" => cpu['SPEED'], "cache" => cpu['CACHE'], "flags" => cpu['FLAGS']) diff --git a/src/test/fixtures/help_sections.yml b/src/test/fixtures/help_sections.yml index 5bf0293..d9f93e4 100644 --- a/src/test/fixtures/help_sections.yml +++ b/src/test/fixtures/help_sections.yml @@ -1,7 +1,11 @@ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -# one: -# column: value -# -# two: -# column: value +dashboard_help: + controller: dashboard + action: index + section: 'index.html' + +hardware_hosts_help: + controller: hardware + action: hosts + section: 'hardware_hosts.html' diff --git a/src/test/fixtures/hosts.yml b/src/test/fixtures/hosts.yml index 31e7580..4b97053 100644 --- a/src/test/fixtures/hosts.yml +++ b/src/test/fixtures/hosts.yml @@ -5,7 +5,7 @@ prod_corp_com: memory: 18384 is_disabled: 0 state: available - hypervisor_type: xen + hypervisor_type: KVM hardware_pool: corp_com workstation_corp_com: uuid: 1f2a8694-961d-11dc-9387-001558c41534 @@ -13,7 +13,8 @@ workstation_corp_com: arch: i386 memory: 2048 is_disabled: 0 - hypervisor_type: qemu + state: available + hypervisor_type: KVM hardware_pool: corp_com macworkstation_qa_corp_com: uuid: 58a85f44-75fd-4934-805f-88e45b40d4b4 @@ -21,7 +22,8 @@ macworkstation_qa_corp_com: arch: mips memory: 2048 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_qa fedoraworkstation_qa_corp_com: uuid: 520bbb34-6515-490e-9d07-0c8b14f76805 @@ -29,7 +31,8 @@ fedoraworkstation_qa_corp_com: arch: i386 memory: 2048 is_disabled: 1 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_qa pipeline_qa_corp_com: uuid: 2e422f66-324e-48d4-973f-0b91b33070f9 @@ -37,7 +40,8 @@ pipeline_qa_corp_com: arch: xeon memory: 1048576 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_qa app_qa_corp_com: uuid: bb0ce7c7-f234-49ae-84b5-6f4fd8bddcaa @@ -45,7 +49,8 @@ app_qa_corp_com: arch: xeon memory: 16384 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_qa issue_qa_corp_com: uuid: ec0d86de-657b-48f6-b7cc-e733a3f9a834 @@ -53,7 +58,8 @@ issue_qa_corp_com: arch: x86 memory: 4096 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_qa db_dev_corp_com: uuid: 81c15560-dbf4-45f5-9b75-106cdbd63aeb @@ -61,7 +67,8 @@ db_dev_corp_com: arch: x86 memory: 4096 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_dev mystation_dev_corp_com: uuid: 6ae3d22e-97e0-4d86-9712-5395b20a0f45 @@ -69,7 +76,8 @@ mystation_dev_corp_com: arch: i686 memory: 2048 is_disabled: 0 - hypervisor_type: xen + state: available + hypervisor_type: KVM hardware_pool: corp_com_dev node3_priv_ovirt_org: uuid: 75f8d5f3-faf0-4308-9f20-e4b03d013a27 @@ -77,16 +85,17 @@ node3_priv_ovirt_org: arch: x86_64 memory: 4194304 is_disabled: 0 - hypervisor_type: kvm - hardware_pool: default state: available + hypervisor_type: KVM + hardware_pool: default mailservers_managed_node: uuid: 182a8596-961d-11dc-9387-001558c41534 hostname: mail.mynetwork.com arch: i386 memory: 16384 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_prod fileserver_managed_node: uuid: 928ad8172-9723-11dc-9387-001558c41534 @@ -94,7 +103,8 @@ fileserver_managed_node: arch: x86_64 memory: 32768 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_prod ldapserver_managed_node: uuid: 919ae372-9156-11dc-9387-001558c41534 @@ -102,7 +112,8 @@ ldapserver_managed_node: arch: i386 memory: 16384 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_prod buildserver_managed_node: uuid: 6293acd9-2784-11dc-9387-001558c41534 @@ -110,7 +121,8 @@ buildserver_managed_node: arch: x86_64 memory: 65536 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_prod mediaserver_managed_node: uuid: 6293acd9-2784-11dc-9387-001558c41534 @@ -118,5 +130,6 @@ mediaserver_managed_node: arch: x86_64 memory: 65536 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_prod diff --git a/src/test/fixtures/storage_pools.yml b/src/test/fixtures/storage_pools.yml index ac72f99..35bfc88 100644 --- a/src/test/fixtures/storage_pools.yml +++ b/src/test/fixtures/storage_pools.yml @@ -5,14 +5,25 @@ corp_com_ovirtpriv_storage: port: 3260 target: ovirtpriv:storage state: available + capacity: 1024 corp_com_nfs_ovirtnfs: hardware_pool: corp_com type: NfsStoragePool ip_addr: 192.168.50.2 export_path: /ovirtnfs + capacity: 1024 + state: available corp_com_dev_nfs_ovirtnfs: hardware_pool: corp_com_dev type: NfsStoragePool ip_addr: 192.168.50.3 export_path: /devnfs state: available + capacity: 1024 +corp_com_dev_lvm_ovirtlvm: + hardware_pool: corp_com_dev + type: LvmStoragePool + ip_addr: 192.168.50.3 + export_path: /devnfs + state: available + capacity: 1024 diff --git a/src/test/fixtures/usages.yml b/src/test/fixtures/usages.yml index 5bf0293..3bd72e6 100644 --- a/src/test/fixtures/usages.yml +++ b/src/test/fixtures/usages.yml @@ -1,7 +1,9 @@ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -# one: -# column: value -# -# two: -# column: value +management_usage: + label: management + usage: management + +guest_usage: + label: guest + usage: guest diff --git a/src/test/functional/resources_controller_test.rb b/src/test/functional/resources_controller_test.rb index 8e3989b..0312c0c 100644 --- a/src/test/functional/resources_controller_test.rb +++ b/src/test/functional/resources_controller_test.rb @@ -45,7 +45,7 @@ class ResourcesControllerTest < ActionController::TestCase def test_create assert_difference('VmResourcePool.count') do - post :create, :vm_resource_pool => { :name => 'foo_resource_pool' }, :parent_id => pools(:default).id + post :create, :pool => { :name => 'foo_resource_pool'}, :parent_id => pools(:default).id end assert_response :success diff --git a/src/test/functional/storage_controller_test.rb b/src/test/functional/storage_controller_test.rb index a448fdf..f08fe1b 100644 --- a/src/test/functional/storage_controller_test.rb +++ b/src/test/functional/storage_controller_test.rb @@ -69,11 +69,11 @@ class StorageControllerTest < Test::Unit::TestCase assert_not_nil assigns(:storage_pools) end - def test_create + def test_create_storage_controller hw_pool = HardwarePool.get_default_pool num_storage_volumes = StoragePool.count - post :create, :storage_type => 'NFS', :storage_pool => { :hardware_pool => hw_pool, :ip_addr => '111.121.131.141', :export_path => '/tmp/path' } + post :create, :storage_type => 'NFS', :storage_pool => { :hardware_pool => hw_pool, :ip_addr => '111.121.131.141', :export_path => '/tmp/path', :state => 'available', :capacity => 1024 } assert_response :success diff --git a/src/test/unit/bonding_test.rb b/src/test/unit/bonding_test.rb index 8b90cd5..33bfd56 100644 --- a/src/test/unit/bonding_test.rb +++ b/src/test/unit/bonding_test.rb @@ -35,6 +35,7 @@ class BondingTest < ActiveSupport::TestCase :bonding_type_id => bonding_types(:failover_bonding_type), :host_id => hosts(:mailservers_managed_node)) @bonding.vlan = networks(:dhcp_vlan_one) + @bonding.bonding_type = bonding_types(:load_balancing_bonding_type) end # Ensures that the name is required. @@ -69,6 +70,40 @@ class BondingTest < ActiveSupport::TestCase flunk 'Bondings have to have a host.' if @bonding.valid? end + def test_valid_fails_without_bonding_type + @bonding.bonding_type = nil + flunk 'Bonding must specify bonding type' if @bonding.valid? + end + + def test_valid_fails_without_vlan + @bonding.vlan = nil + flunk 'Bonding must specify vlan' if @bonding.valid? + end + + # Ensures that an arp ping address must have the correct format + # + def test_valid_fails_with_bad_arp_ping_address + @bonding.arp_ping_address = 'foobar' + + flunk "An arp ping address must be in the format ##.##.##.##." if @bonding.valid? + end + + # Ensures that an arp interval is a numerical value >= 0 + # + def test_valid_fails_with_bad_arp_interval + @bonding.arp_interval = -1 + + flunk "An arp interval must be >= 0" if @bonding.valid? + end + + def test_static_network_bonding_must_have_ip + @bonding.vlan = networks(:static_vlan_one) + @bonding.ip_addresses.delete_if { true } + + flunk 'Bonding assigned to static networks must have at least one ip' if @bonding.valid? + end + + # Ensure that retrieving a bonding returns its associated objects. # def test_find_all_for_host diff --git a/src/test/unit/boot_type_test.rb b/src/test/unit/boot_type_test.rb index a30e258..778f75a 100644 --- a/src/test/unit/boot_type_test.rb +++ b/src/test/unit/boot_type_test.rb @@ -19,8 +19,36 @@ require File.dirname(__FILE__) + '/../test_helper' class BootTypeTest < ActiveSupport::TestCase - # Replace this with your real tests. - def test_truth - assert true - end + fixtures :boot_types + + def setup + @boot_type = BootType.new( + :label => 'TestBootType', + :proto => 'static' ) + end + + def test_valid_fails_without_label + @boot_type.label = '' + + flunk 'Boot type must have label' if @boot_type.valid? + end + + def test_valid_fails_without_unique_label + @boot_type.label = 'Static IP' + + flunk 'Boot type must have unique label' if @boot_type.valid? + end + + def test_valid_fails_with_bad_proto + @boot_type.proto = 'foobar' + + flunk 'Boot type must have valid proto' if @boot_type.valid? + end + + def test_find_all_for_boot_type + result = BootType.find(:all) + + assert_equal 3, result.size, "Did not find right number of boot types" + end + end diff --git a/src/test/unit/cpu_test.rb b/src/test/unit/cpu_test.rb index 9558525..56e2d5d 100644 --- a/src/test/unit/cpu_test.rb +++ b/src/test/unit/cpu_test.rb @@ -1,10 +1,99 @@ +# Copyright (C) 2008 Red Hat, Inc. +# Written by Mohammed Morsi +# +# 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 File.dirname(__FILE__) + '/../test_helper' class CpuTest < ActiveSupport::TestCase fixtures :cpus + fixtures :hosts + + def setup + @cpu = Cpu.new( + :cpu_number => 3, + :core_number => 1, + :number_of_cores => 1, + :cpuid_level => 0, + :speed => 2048, + :vendor => 'foo', + :model => 'bar', + :family => 'alpha') + @cpu.host = hosts(:prod_corp_com) + end + + def test_find_cpus + assert_equal Cpu.find(:all).size, 8, "Failure retrieving all cpus" + + result = Cpu.find(cpus(:prod_corp_com_1).id) + assert_equal result.host.id, hosts(:prod_corp_com).id + end + + def test_valid_without_host + @cpu.host = nil + + flunk "CPUs must be associated with hosts" if @cpu.valid? + end + + def test_valid_with_bad_cpu_numer + @cpu.cpu_number = -1 + + flunk "cpu number must be >= 0" if @cpu.valid? + end + + def test_valid_with_bad_core_number + @cpu.core_number = -1 + + flunk "cpu core number must be >= 0" if @cpu.valid? + end + + def test_valid_with_bad_number_of_cores + @cpu.number_of_cores = 0 - # Replace this with your real tests. - def test_truth - assert true + flunk "cpu number of cores must be > 0" if @cpu.valid? end + + def test_valid_with_bad_cpuid_level + @cpu.cpuid_level = -1 + + flunk "cpu id level must be >= 0" if @cpu.valid? + end + + def test_valid_with_bad_speed + @cpu.speed = 0 + + flunk "cpu speed must be > 0" if @cpu.valid? + end + + def test_valid_without_vendor + @cpu.vendor = '' + + flunk "cpu vendor must be specified" if @cpu.valid? + end + + def test_valid_without_model + @cpu.model = '' + + flunk "cpu model must be specified" if @cpu.valid? + end + + def test_valid_without_family + @cpu.family = '' + + flunk "cpu family must be specified" if @cpu.valid? + end + end diff --git a/src/test/unit/help_section_test.rb b/src/test/unit/help_section_test.rb index a0e6a08..1596262 100644 --- a/src/test/unit/help_section_test.rb +++ b/src/test/unit/help_section_test.rb @@ -1,8 +1,51 @@ +# Copyright (C) 2008 Red Hat, Inc. +# Written by Mohammed Morsi +# +# 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 'test_helper' class HelpSectionTest < ActiveSupport::TestCase - # Replace this with your real tests. - def test_truth - assert true - end + fixtures :help_sections + + def setup + @help_section = HelpSection.new( + :controller => 'foo', + :action => 'bar', + :section => 'foobar') + end + + def test_unique_controller_action + @help_section.controller = 'dashboard' + @help_section.action = 'index' + + flunk 'help section must have unique controller / action' if @help_section.valid? + end + + def test_valid_fails_without_controller + @help_section.controller = '' + flunk 'help section controller must be specified' if @help_section.valid? + end + + def test_valid_fails_without_action + @help_section.action = '' + flunk 'help section action must be specified' if @help_section.valid? + end + + def test_valid_fails_without_section + @help_section.section = '' + flunk 'help section section must be specified' if @help_section.valid? + end end diff --git a/src/test/unit/host_test.rb b/src/test/unit/host_test.rb index a4ead5d..338fbaf 100644 --- a/src/test/unit/host_test.rb +++ b/src/test/unit/host_test.rb @@ -21,9 +21,63 @@ require File.dirname(__FILE__) + '/../test_helper' class HostTest < Test::Unit::TestCase fixtures :hosts + fixtures :pools + fixtures :vms - # Replace this with your real tests. - def test_truth - assert true + def setup + @host = Host.new( + :uuid => 'foobar', + :hostname => 'foobar', + :arch => 'x86_64', + :hypervisor_type => 'KVM', + :state => 'available') + + @host.hardware_pool = pools(:corp_com) + end + + def test_valid_fails_without_hardware_pool + @host.hardware_pool = nil + + flunk "Hosts must be associated w/ a hardware pool" if @host.valid? + end + + def test_valid_without_uuid + @host.uuid = nil + + flunk "Hosts don't need to be associated w/ a uuid" unless @host.valid? end + + + def test_valid_fails_without_hostname + @host.hostname = '' + + flunk "Hosts must be associated w/ a hostname" if @host.valid? + end + + + def test_valid_fails_without_arch + @host.arch = '' + + flunk "Hosts must be associated w/ an arch" if @host.valid? + end + + def test_valid_fails_with_bad_hypervisor_type + @host.hypervisor_type = 'foobar' + + flunk "Hosts must be associated w/ a valid hypervisor type" if @host.valid? + end + + def test_valid_fails_with_bad_state + @host.state = 'foobar' + + flunk "Hosts must be associated w/ a valid state" if @host.valid? + end + + def test_host_movable + assert_equal @host.movable?, true, "Hosts are movable unless associated w/ vms" + + @host.vms << vms(:production_httpd_vm) + assert_equal @host.movable?, false, "Hosts with associated vms are not movable" + end + end diff --git a/src/test/unit/ip_address_test.rb b/src/test/unit/ip_address_test.rb index 5ecff77..4cfc694 100644 --- a/src/test/unit/ip_address_test.rb +++ b/src/test/unit/ip_address_test.rb @@ -10,4 +10,9 @@ class IpAddressTest < ActiveSupport::TestCase def test_can_get_ipaddress_object assert_equal ip_addresses(:ip_v4_mailserver_nic_one).address, '172.31.0.15' end + + def test_valid_fails_without_foreign_entity + @ip_address = IpAddress.new + flunk "Ip Address must be associated with network, nic, or bonding" if @ip_address.valid? + end end diff --git a/src/test/unit/ip_v4_address_test.rb b/src/test/unit/ip_v4_address_test.rb index 65a08d3..9cb7362 100644 --- a/src/test/unit/ip_v4_address_test.rb +++ b/src/test/unit/ip_v4_address_test.rb @@ -24,7 +24,8 @@ class IpV4AddressTest < ActiveSupport::TestCase @address = IpV4Address.new(:address => '192.168.50.2', :netmask => '255.255.255.0', :gateway => '192.168.50.1', - :broadcast => '192.168.50.255') + :broadcast => '192.168.50.255', + :nic_id => 1) end # Ensures that an address must be supplied. diff --git a/src/test/unit/ip_v6_address_test.rb b/src/test/unit/ip_v6_address_test.rb index 070f407..96f212a 100644 --- a/src/test/unit/ip_v6_address_test.rb +++ b/src/test/unit/ip_v6_address_test.rb @@ -23,7 +23,8 @@ class IpV6AddressTest < ActiveSupport::TestCase def setup @address = IpV6Address.new(:address => 'fe80:0:0:0:200:f8ff:fe21:67cf', :gateway => ':::::::717', - :prefix => '0000:0000:0000:0000:1234:1234:1234:1234') + :prefix => '0000:0000:0000:0000:1234:1234:1234:1234', + :nic_id => 1) end # Ensures that the address must be provided. diff --git a/src/test/unit/nic_test.rb b/src/test/unit/nic_test.rb index 1de1e00..2644148 100644 --- a/src/test/unit/nic_test.rb +++ b/src/test/unit/nic_test.rb @@ -22,9 +22,61 @@ require File.dirname(__FILE__) + '/../test_helper' class NicTest < Test::Unit::TestCase fixtures :ip_addresses fixtures :nics + fixtures :hosts + fixtures :networks - # Replace this with your real tests. - def test_truth - assert true + def setup + @nic = Nic.new( + :mac => '00:11:22:33:44:55', + :usage_type => 1, + :bandwidth => 100 ) + @nic.host = hosts(:prod_corp_com) + @nic.physical_network = networks(:static_physical_network_one) + + @ip_address = IpV4Address.new( + :address => '1.2.3.4', + :netmask => '2.3.4.5', + :gateway => '3.4.5.6', + :broadcast => '4.5.6.7' ) + + @nic.ip_addresses << @ip_address + end + + def test_valid_fails_without_mac + @nic.mac = '' + + flunk 'Nic must have a mac' if @nic.valid? + end + + def test_valid_fails_with_invalid_mac + @nic.mac = 'foobar' + + flunk 'Nic must have a valid mac' if @nic.valid? + end + + def test_valid_fails_without_host + @nic.host = nil + + flunk 'Nic must have a host' if @nic.valid? end + + def test_valid_fails_without_physical_network + @nic.physical_network = nil + + flunk 'Nic must have a physical network' if @nic.valid? + end + + def test_valid_fails_with_invalid_bandwidth + @nic.bandwidth = -1 + + flunk 'Nic bandwidth must be >= 0' if @nic.valid? + end + + def test_static_network_nic_must_have_ip + @nic.physical_network = networks(:static_physical_network_one) + @nic.ip_addresses.delete_if { true } + + flunk 'Nics assigned to static networks must have at least one ip' if @nic.valid? + end + end diff --git a/src/test/unit/permission_test.rb b/src/test/unit/permission_test.rb index 5e2c7ba..0c0f4c7 100644 --- a/src/test/unit/permission_test.rb +++ b/src/test/unit/permission_test.rb @@ -21,6 +21,14 @@ require File.dirname(__FILE__) + '/../test_helper' class PermissionTest < Test::Unit::TestCase fixtures :permissions + fixtures :pools + + def setup + @permission = Permission.new( + :uid => 'foobar', + :user_role => 'Super Admin' ) + @permission.pool = pools(:root_dir_pool) + end # Replace this with your real tests. def test_simple_permission @@ -32,4 +40,24 @@ class PermissionTest < Test::Unit::TestCase assert_equal permissions(:ovirtadmin_default).inherited_from_id, permissions(:ovirtadmin_root).id assert_equal permissions(:ovirtadmin_default).parent_permission, permissions(:ovirtadmin_root) end + + def test_valid_fails_without_pool + @permission.pool = nil + flunk 'Permission must specify pool' if @permission.valid? + end + + def test_valid_fails_without_uid + @permission.uid = '' + flunk 'Permission must specify uid' if @permission.valid? + end + + def test_valid_fails_without_user_role + @permission.user_role = '' + flunk 'Permission must specify user role' if @permission.valid? + end + + def test_valid_fails_with_invalid_user_role + @permission.user_role = 'foobar' + flunk 'Permission must specify valid user role' if @permission.valid? + end end diff --git a/src/test/unit/pool_test.rb b/src/test/unit/pool_test.rb index 6f20f9f..c9a5554 100644 --- a/src/test/unit/pool_test.rb +++ b/src/test/unit/pool_test.rb @@ -22,6 +22,12 @@ require File.dirname(__FILE__) + '/../test_helper' class PoolTest < Test::Unit::TestCase fixtures :pools + def setup + @pool = Pool.new( + :name => 'foobar', + :type => 'DirectoryPool' ) + end + # Replace this with your real tests. def test_get_name assert_equal(pools(:corp_com_prod).name, 'Production Operations') @@ -30,4 +36,19 @@ class PoolTest < Test::Unit::TestCase def test_get_parent assert_equal(pools(:corp_com_prod).parent.name, 'corp.com') end + + def test_valid_fails_without_name + @pool.name = '' + flunk "Pool must specify name" if @pool.valid? + end + + def test_valid_fails_without_unique_name + @pool.name = 'root' + flunk "Pool must specify unique name" if @pool.valid? + end + + def test_valid_fails_with_invalid_type + @pool.name = 'foobar' + flunk "Pool must specify valid type" if @pool.valid? + end end diff --git a/src/test/unit/quota_test.rb b/src/test/unit/quota_test.rb index ac0fae0..5903cc8 100644 --- a/src/test/unit/quota_test.rb +++ b/src/test/unit/quota_test.rb @@ -21,9 +21,40 @@ require File.dirname(__FILE__) + '/../test_helper' class QuotaTest < Test::Unit::TestCase fixtures :quotas + fixtures :pools - # Replace this with your real tests. - def test_truth - assert true + def setup + @quota = Quota.new + @quota.pool = pools(:root_dir_pool) + end + + def test_valid_fails_without_pool + @quota.pool = nil + flunk "Quota's must specify pool" if @quota.valid? + end + + def test_valid_fails_with_bad_total_vcpus + @quota.total_vcpus = -1 + flunk "Quota must specify valid total vcpus" if @quota.valid? + end + + def test_valid_fails_with_bad_total_vmemory + @quota.total_vmemory = -1 + flunk "Quota must specify valid total vmemory" if @quota.valid? + end + + def test_valid_fails_with_bad_total_vnics + @quota.total_vnics = -1 + flunk "Quota must specify valid total vnics" if @quota.valid? + end + + def test_valid_fails_with_bad_total_storage + @quota.total_storage = -1 + flunk "Quota must specify valid total storage" if @quota.valid? + end + + def test_valid_fails_with_bad_total_vms + @quota.total_vms = -1 + flunk "Quota must specify valid total vms" if @quota.valid? end end diff --git a/src/test/unit/storage_pool_test.rb b/src/test/unit/storage_pool_test.rb index 8cc8d1b..4e18a8c 100644 --- a/src/test/unit/storage_pool_test.rb +++ b/src/test/unit/storage_pool_test.rb @@ -21,8 +21,53 @@ require File.dirname(__FILE__) + '/../test_helper' class StoragePoolTest < Test::Unit::TestCase fixtures :storage_pools + fixtures :pools + fixtures :vms + + def setup + @storage_pool = StoragePool.new( + :type => 'IscsiStoragePool', + :capacity => 100, + :state => 'available' ) + @storage_pool.hardware_pool = pools(:default) + end + + def test_valid_fails_without_hardware_pool + @storage_pool.hardware_pool = nil + flunk "Storage pool must specify hardware pool" if @storage_pool.valid? + end + + def test_valid_fails_with_bad_type + @storage_pool.type = 'foobar' + flunk 'Storage pool must specify valid type' if @storage_pool.valid? + end + + def test_valid_fails_with_bad_capacity + @storage_pool.capacity = -1 + flunk 'Storage pool must specify valid capacity >= 0' if @storage_pool.valid? + end + + def test_valid_fails_with_bad_state + @storage_pool.state = 'foobar' + flunk 'Storage pool must specify valid state' if @storage_pool.valid? + end def test_hardware_pool_relationship assert_equal 'corp.com', storage_pools(:corp_com_ovirtpriv_storage).hardware_pool.name end + + def test_movable + assert_equal @storage_pool.movable?, true, "Storage pool without volumes should be movable" + + storage_volume = StorageVolume.new( + :size => 100, + :type => 'IscsiStorageVolume', + :state => 'available' ) + @storage_pool.storage_volumes << storage_volume + + assert_equal @storage_pool.movable?, true, "Storage pool w/ movable storage volumes should be movable" + + storage_volume.vms << vms(:production_httpd_vm) + assert_equal @storage_pool.movable?, false, "Storage pool w/ unmovable storage volumes should not be movable" + end end diff --git a/src/test/unit/storage_volume_test.rb b/src/test/unit/storage_volume_test.rb index d0a89f4..3978685 100644 --- a/src/test/unit/storage_volume_test.rb +++ b/src/test/unit/storage_volume_test.rb @@ -21,9 +21,95 @@ require File.dirname(__FILE__) + '/../test_helper' class StorageVolumeTest < Test::Unit::TestCase fixtures :storage_volumes + fixtures :storage_pools + fixtures :vms + + def setup + @storage_volume = StorageVolume.new( + :size => 100, + :type => 'IscsiStorageVolume', + :state => 'available' ) + + @iscsi_storage_volume = IscsiStorageVolume.new( + :lun => 'foobar', + :size => 100, + :state => 'available' ) + + @lvm_storage_volume = LvmStorageVolume.new( + :lv_name => 'foobar', + :lv_owner_perms => '0700', + :lv_group_perms => '0777', + :lv_mode_perms => '0000' ) + + @storage_volume.storage_pool = storage_pools(:corp_com_ovirtpriv_storage) + @iscsi_storage_volume.storage_pool = storage_pools(:corp_com_ovirtpriv_storage) + @lvm_storage_volume.storage_pool = storage_pools(:corp_com_dev_lvm_ovirtlvm) + end # Replace this with your real tests. def test_relationship_to_storage_pool assert_equal 'corp.com', storage_volumes(:ovirtpriv_storage_lun_1).storage_pool.hardware_pool.name end + + + def test_valid_fails_with_bad_size + @storage_volume.size = -1 + + flunk "Storage volume size must be >= 0" if @storage_volume.valid? + end + + def test_valid_fails_with_bad_type + @storage_volume.type = 'foobar' + + flunk "Storage volume type must be valid" if @storage_volume.valid? + end + + def test_valid_fails_with_bad_state + @storage_volume.state = 'foobar' + flunk "Storage volume state must be valid" if @storage_volume.valid? + end + + def test_valid_fails_without_storage_pool + @storage_volume.storage_pool = nil + + flunk "Storage volume must be associated with a storage pool" if @storage_volume.valid? + end + + def test_valid_fails_without_lun + @iscsi_storage_volume.lun = '' + + flunk "iscsi storage volume lun must be valid" if @iscsi_storage_volume.valid? + end + + def test_valid_fails_without_lv_name + @lvm_storage_volume.lv_name = '' + + flunk "lvm storage volume lv_name must be valid" if @lvm_storage_volume.valid? + end + + def test_valid_fails_without_lv_owner_perms + @lvm_storage_volume.lv_owner_perms = '' + + flunk "lvm storage volume lv_owner_perms must be valid" if @lvm_storage_volume.valid? + end + + def test_valid_fails_without_lv_group_perms + @lvm_storage_volume.lv_group_perms = '' + + flunk "lvm storage volume lv_group_perms must be valid" if @lvm_storage_volume.valid? + end + + def test_valid_fails_without_lv_model_perms + @lvm_storage_volume.lv_mode_perms = '' + + flunk "lvm storage volume lv_model_perms must be valid" if @lvm_storage_volume.valid? + end + + def test_movable + assert_equal @storage_volume.movable?, true, "Storage volume without vms should be movable" + @storage_volume.vms << vms(:production_httpd_vm) + + assert_equal @storage_volume.movable?, false, "Storage volume w/ vms should not be movable" + end + end diff --git a/src/test/unit/task_test.rb b/src/test/unit/task_test.rb index 33a3bd8..ba780e7 100644 --- a/src/test/unit/task_test.rb +++ b/src/test/unit/task_test.rb @@ -22,6 +22,20 @@ require File.dirname(__FILE__) + '/../test_helper' class TaskTest < Test::Unit::TestCase fixtures :pools, :hosts, :vms, :permissions, :tasks + def setup + @task = Task.new( :type => 'HostTask', :state => 'finished' ) + end + + def test_valid_fails_with_bad_type + @task.type = 'foobar' + flunk 'Task must specify valid type' if @task.valid? + end + + def test_valid_fails_with_bad_state + @task.state = 'foobar' + flunk 'Task must specify valid state' if @task.valid? + end + def test_exercise_task_relationships assert_equal tasks(:shutdown_production_httpd_appliance_task).task_target.vm_resource_pool.name, 'corp.com production vmpool' assert_equal tasks(:shutdown_production_httpd_appliance_task).task_target.host.hostname, 'prod.corp.com' diff --git a/src/test/unit/usage_test.rb b/src/test/unit/usage_test.rb index 9a8ec9b..d6c989e 100644 --- a/src/test/unit/usage_test.rb +++ b/src/test/unit/usage_test.rb @@ -1,8 +1,47 @@ +# Copyright (C) 2008 Red Hat, Inc. +# +# 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 'test_helper' class UsageTest < ActiveSupport::TestCase - # Replace this with your real tests. - def test_truth - assert true - end + fixtures :usages + + def setup + @usage = Usage.new( + :label => 'TestUsage', + :usage => 'foobar' ) + end + + def test_valid_fails_without_label + @usage.label = '' + + flunk 'Usage must have label' if @usage.valid? + end + + def test_valid_fails_without_usage + @usage.usage = '' + + flunk 'Usage must have usage' if @usage.valid? + end + + def test_valid_fails_without_unique_usage + @usage.usage = 'management' + + flunk 'Usage must have unique usage' if @usage.valid? + end + end diff --git a/src/test/unit/vm_test.rb b/src/test/unit/vm_test.rb index a196130..cba3188 100644 --- a/src/test/unit/vm_test.rb +++ b/src/test/unit/vm_test.rb @@ -21,6 +21,7 @@ require File.dirname(__FILE__) + '/../test_helper' class VmTest < Test::Unit::TestCase fixtures :vms + fixtures :pools def setup @vm_name = "Test" @@ -29,6 +30,69 @@ class VmTest < Test::Unit::TestCase "#{Vm::IMAGE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{@vm_name}" @cobbler_profile_provisioning = "#{Vm::PROFILE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{@vm_name}" + + @vm = Vm.new( + :uuid => '00000000-1111-2222-3333-444444444444', + :description => 'foobar', + :num_vcpus_allocated => 1, + :boot_device => 'hd', + :memory_allocated_in_mb => 1, + :memory_allocated => 1024, + :vnic_mac_addr => '11:22:33:44:55:66') + + @vm.vm_resource_pool = pools(:corp_com_production_vmpool) + end + + def test_valid_fails_with_bad_uuid + @vm.uuid = 'foobar' + flunk "Vm must specify valid uuid" if @vm.valid? + end + + def test_valid_fails_without_description + @vm.description = '' + flunk 'Vm must specify description' if @vm.valid? + end + + def test_valid_fails_without_num_vcpus_allocated + @vm.num_vcpus_allocated = nil + flunk 'Vm must specify num_vcpus_allocated' if @vm.valid? + end + + def test_valid_fails_without_boot_device + @vm.boot_device = '' + flunk 'Vm must specify boot_device' if @vm.valid? + end + + + def test_valid_fails_without_memory_allocated + @vm.memory_allocated = '' + flunk 'Vm must specify memory_allocated' if @vm.valid? + end + + + def test_valid_fails_without_memory_allocated_in_mb + @vm.memory_allocated_in_mb = '' + flunk 'Vm must specify memory_allocated_in_mb' if @vm.valid? + end + + def test_valid_fails_without_vnic_mac_addr + @vm.vnic_mac_addr = '' + flunk 'Vm must specify vnic_mac_addr' if @vm.valid? + end + + def test_valid_fails_without_vm_resources_pool_id + @vm.vm_resource_pool_id = '' + flunk 'Vm must specify vm_resources_pool_id' if @vm.valid? + end + + def test_valid_fails_with_bad_needs_restart + @vm.needs_restart = 5 + flunk 'Vm must specify valid needs_restart' if @vm.valid? + end + + def test_valid_fails_with_bad_state + @vm.state = 'foobar' + flunk 'Vm must specify valid state' if @vm.valid? end # Ensures that, if the VM does not contain the Cobbler prefix, that it -- 1.6.0.6 From dpierce at redhat.com Wed Jan 14 16:47:10 2009 From: dpierce at redhat.com (Darryl L. Pierce) Date: Wed, 14 Jan 2009 11:47:10 -0500 Subject: [Ovirt-devel] [PATCH node] Changed how max swap size is calculated. Message-ID: <1231951630-25195-1-git-send-email-dpierce@redhat.com> If ovirt_overcommit is present, then it is used as the factor, multiplied by memory on the server, to calculate maximum swap size. So if it is set to 5 then max swap size is 5 x memory. If overt_overcommit is not present, then the default value used is 1.5. The value calculated is then incremented by the values listed at . Signed-off-by: Darryl L. Pierce --- scripts/ovirt-config-storage | 30 +++++++++++++++++++++++++++--- scripts/ovirt-early | 13 ++++++++++++- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage index b3d87ae..1eb06f1 100755 --- a/scripts/ovirt-config-storage +++ b/scripts/ovirt-config-storage @@ -80,7 +80,7 @@ get_dev_name() done # if we didn't find any devices using HAL, so check for virtual devices - if [ -z $devices ]; then devices=$(ls -l /dev/[shv]d?); fi + if [ -z "$devices" ]; then devices=$(ls -l /dev/[shv]d?); fi # If there's only one device, use it. case $devices in @@ -285,13 +285,37 @@ do_confirm() done } +if [ -z "$OVIRT_OVERCOMMIT" ]; then OVIRT_OVERCOMMIT="1.5"; fi MEM_SIZE=$(cat /proc/meminfo | awk '/MemTotal:/ { print $2 }') case $MEM_SIZE in ''|*[^0-9]*) die failed to get system memory size;; esac - -MEM_SIZE=$(echo "scale=0; m=($MEM_SIZE / 1024 * 2); if (m < 2048) { m } else { 2048 }" | bc -l) +MEM_SIZE=$(echo "scale=0; $MEM_SIZE / 1024;" | bc -l) +# we multiply the overcommit coefficient by 10 then divide the +# product by 10 to avoid decimals in the result +MAX_SWAP_SIZE=$(echo "scale=0; (${MEM_SIZE} * (${OVIRT_OVERCOMMIT} * 10))/10;" | bc -l) SWAP_SIZE=${OVIRT_VOL_SWAP_SIZE:-$MEM_SIZE} +if [ $SWAP_SIZE -gt $MAX_SWAP_SIZE ]; then + SWAP_SIZE=$MAX_SWAP_SIZE +fi + +# if the swap size is 0, then set the size using minimum values +# from http://kbase.redhat.com/faq/docs/DOC-15252 +if [ $SWAP_SIZE -eq 0 ]; then + # convert mem size to GB + mgb=$(echo "scale=0; $MEM_SIZE/1024;" | bc -l) + if [ $mgb -le 4 ]; then + SWAP_SIZE=2 + elif [ $mgb -le 16 ]; then + SWAP_SIZE=4 + elif [ $mgb -le 64 ]; then + SWAP_SIZE=8 + else + SWAP_SIZE=16 + fi + + SWAP_SIZE=$(echo "scale=0; ${SWAP_SIZE} * 1024;" | bc -l) +fi BOOT_SIZE=${OVIRT_VOL_BOOT_SIZE:-$default_boot_size} ROOT_SIZE=${OVIRT_VOL_ROOT_SIZE:-$default_root_size} diff --git a/scripts/ovirt-early b/scripts/ovirt-early index 153c0c7..262acb6 100755 --- a/scripts/ovirt-early +++ b/scripts/ovirt-early @@ -117,6 +117,7 @@ start() { # BOOTIF=link|eth*| (appended by pxelinux) # ovirt_init=usb|scsi[:serial#] # ovirt_vol=BOOT_MB:SWAP_MB:ROOT_MB:CONFIG_MB:LOGGING_MB + # ovirt_overcommit # ovirt_local_boot # ovirt_standalone # pxelinux format: ip=::: @@ -156,6 +157,10 @@ start() { # install/update oVirt Node image on the local installation target disk local_boot=0 + # ovirt_overcommit + # set the swap size coefficient + overcommit=1.5 + # ovirt_standalone # force oVirt Node standalone mode standalone=0 @@ -245,6 +250,12 @@ start() { standalone=1 bootparams="$bootparams $i" ;; + + ovirt_overcommit*) + i=${i#ovirt_overcommit=} + eval $(printf $i|awk -F: '{print "overcommit="$1;}') + ;; + ip=*) i=${i#ip=} eval $(printf $i|awk -F: '{print "ip_address="$1; print "ip_gateway="$3; print "ip_netmask="$4}') @@ -278,7 +289,7 @@ start() { ip_gateway=$gateway fi # save boot parameters as defaults for ovirt-config-* - params="bootif init vol_boot_size vol_swap_size vol_root_size vol_config_size vol_logging_size local_boot standalone ip_address ip_netmask ip_gateway ipv6 syslog_server syslog_port bootparams hostname" + params="bootif init vol_boot_size vol_swap_size vol_root_size vol_config_size vol_logging_size local_boot standalone overcommit ip_address ip_netmask ip_gateway ipv6 syslog_server syslog_port bootparams hostname" mount_config if [ -e $OVIRT_DEFAULTS ]; then echo "update ovirt defaults" -- 1.6.0.6 From iheim at redhat.com Wed Jan 14 17:18:44 2009 From: iheim at redhat.com (Itamar Heim) Date: Wed, 14 Jan 2009 12:18:44 -0500 (EST) Subject: [Ovirt-devel] [PATCH node] Changed max swap size to allow for overcommitting. In-Reply-To: <496E0B73.1070604@redhat.com> References: <1231886021-16855-1-git-send-email-dpierce@redhat.com> <2be7262f0901131558t163d40e5na7bfb29a8d8a321f@mail.gmail.com> <496DC175.3090908@redhat.com> <2be7262f0901140739r4f80b06p796270b68e8c9bc9@mail.gmail.com> <496E0B73.1070604@redhat.com> Message-ID: <070701c9766c$8fbd6770$af383650$@com> > From: ovirt-devel-bounces at redhat.com [mailto:ovirt-devel- > bounces at redhat.com] On Behalf Of Dor Laor > Alan Pevec wrote: > > On Wed, Jan 14, 2009 at 11:41 AM, Dor Laor > > wrote: > > > > ok, to recap: > > > > swap = mem * overcommit + min_from_kbase_table(mem) > > where default overcommit=0.5 (in case ovirt_overcommit param isn't > > present) > > > If overcommit is not present you can use overcommit=0 like you guys > assumed before. [IH] that would mean we will have to specify it for all solidice deployments, since we except the =0 values to be too small From bkearney at redhat.com Wed Jan 14 18:29:44 2009 From: bkearney at redhat.com (Bryan Kearney) Date: Wed, 14 Jan 2009 13:29:44 -0500 Subject: [Ovirt-devel] [PATCH node] Bootup mounts the local log partition if it exists In-Reply-To: <496E06BF.6080505@redhat.com> References: <1231863234-1845-1-git-send-email-bkearney@redhat.com> <496E01F4.90303@redhat.com> <496E0388.1000008@redhat.com> <496E06BF.6080505@redhat.com> Message-ID: <496E2F18.6020105@redhat.com> Perry Myers wrote: > Bryan Kearney wrote: >> Perry Myers wrote: >>> The logs-backup directory is just to catch any logs that get created >>> between the system starting and ovirt-early coming up, correct? >>> Should be minimal messages and dmesg output probably. Any way to get >>> the log partition mounted earlier than ovirt-early So.. I dont know the use case well enough. Is the annoyance of the error message better/worse then a good documented step? >> >> >> ovirt early runs very early (01), and mounting of the logs is done >> first in that script. I believe that minimizes the impact. > > If /etc/fstab contained an entry to mount the log partition then there > would be no log discontinuity right? Would there be any harm to always > putting /var/HostVG/Logging /var/log into /etc/fstab during Node > creation? Before the partition is created (or if it is never created) > there will be an error on init saying that the partition couldn't be > mounted, but perhaps we can muck with init to swallow that error. > > If we do this then there is no log discontinuity and no need for the > logs-backup directory at all. Lemme play around with it. > >> so that we minimize log >>> discontinuity? Also it looks like logs-backup directory is itself >>> not persistent. So the early logs will always get lost. Perhaps we >>> should do: >>> >>> cp -R /var/log /var/logs-backup >>> mount /dev/HostVG/Logging /var/log >>> rm -Rf /var/log/logs-backup >>> mv /var/logs-backup /var/log >> >> I will add that to the patch and re-send it. > > This wouldn't be necessary if we do the fstab changes above. > >>> >>> That way the logs-backup is persisted at least for one boot. >>> >>> Also, what about logs created during firstboot? We need a patch that >>> makes it so immediately after the Node has the log partition created >>> from o-c-storage the log partition is mounted and logs in the >>> non-persistent log partition are moved over. Otherwise we lose all >>> of the log output from the firstboot scripts. >> >> Good catch..i will add that as well. Given the resolution above, these >> will be available for 1 reboot only. Unless we put in a rolling logic >> (keep logs for 3 reboots). Thoughts? > > This is the one case where fstab changes wouldn't remove need for > logs-backup directory. However, since this is a one time thing (only > during firstboot) we could make it a firstboot-logs directory that is in > /var/log and since firstboot is only done once the logs would never be > overwritten. > > Perry From dpierce at redhat.com Wed Jan 14 19:08:04 2009 From: dpierce at redhat.com (Darryl L. Pierce) Date: Wed, 14 Jan 2009 14:08:04 -0500 Subject: [Ovirt-devel] [PATCH node] Changed how max swap size is calculated. Message-ID: <1231960084-1917-1-git-send-email-dpierce@redhat.com> NOTE: this patch fixes where the additional memory wasn't being added when overcommit was NOT set to 0. If ovirt_overcommit is present, then it is used as the factor, multiplied by memory on the server, to calculate maximum swap size. So if it is set to 5 then max swap size is 5 x memory. If overt_overcommit is not present, then the default value used is 1.5. The value calculated is then incremented by the values listed at . Signed-off-by: Darryl L. Pierce --- scripts/ovirt-config-storage | 27 ++++++++++++++++++++++++--- scripts/ovirt-early | 13 ++++++++++++- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage index b3d87ae..4d50fdc 100755 --- a/scripts/ovirt-config-storage +++ b/scripts/ovirt-config-storage @@ -80,7 +80,7 @@ get_dev_name() done # if we didn't find any devices using HAL, so check for virtual devices - if [ -z $devices ]; then devices=$(ls -l /dev/[shv]d?); fi + if [ -z "$devices" ]; then devices=$(ls -l /dev/[shv]d?); fi # If there's only one device, use it. case $devices in @@ -285,13 +285,34 @@ do_confirm() done } +if [ -z "$OVIRT_OVERCOMMIT" ]; then OVIRT_OVERCOMMIT="1.5"; fi MEM_SIZE=$(cat /proc/meminfo | awk '/MemTotal:/ { print $2 }') case $MEM_SIZE in ''|*[^0-9]*) die failed to get system memory size;; esac - -MEM_SIZE=$(echo "scale=0; m=($MEM_SIZE / 1024 * 2); if (m < 2048) { m } else { 2048 }" | bc -l) +MEM_SIZE=$(echo "scale=0; $MEM_SIZE / 1024;" | bc -l) +# we multiply the overcommit coefficient by 10 then divide the +# product by 10 to avoid decimals in the result +MAX_SWAP_SIZE=$(echo "scale=0; (${MEM_SIZE} * (${OVIRT_OVERCOMMIT} * 10))/10;" | bc -l) SWAP_SIZE=${OVIRT_VOL_SWAP_SIZE:-$MEM_SIZE} +if [ $SWAP_SIZE -gt $MAX_SWAP_SIZE ]; then + SWAP_SIZE=$MAX_SWAP_SIZE +fi + +# add to the swap the amounts from http://kbase.redhat.com/faq/docs/DOC-15252 +# convert mem size to GB +mgb=$(echo "scale=0; $MEM_SIZE/1024;" | bc -l) +if [ $mgb -le 4 ]; then + SWAP_SIZE=2 +elif [ $mgb -le 16 ]; then + SWAP_SIZE=4 +elif [ $mgb -le 64 ]; then + SWAP_SIZE=8 +else + SWAP_SIZE=16 +fi + +SWAP_SIZE=$(echo "scale=0; ${SWAP_SIZE} * 1024;" | bc -l) BOOT_SIZE=${OVIRT_VOL_BOOT_SIZE:-$default_boot_size} ROOT_SIZE=${OVIRT_VOL_ROOT_SIZE:-$default_root_size} diff --git a/scripts/ovirt-early b/scripts/ovirt-early index 153c0c7..262acb6 100755 --- a/scripts/ovirt-early +++ b/scripts/ovirt-early @@ -117,6 +117,7 @@ start() { # BOOTIF=link|eth*| (appended by pxelinux) # ovirt_init=usb|scsi[:serial#] # ovirt_vol=BOOT_MB:SWAP_MB:ROOT_MB:CONFIG_MB:LOGGING_MB + # ovirt_overcommit # ovirt_local_boot # ovirt_standalone # pxelinux format: ip=::: @@ -156,6 +157,10 @@ start() { # install/update oVirt Node image on the local installation target disk local_boot=0 + # ovirt_overcommit + # set the swap size coefficient + overcommit=1.5 + # ovirt_standalone # force oVirt Node standalone mode standalone=0 @@ -245,6 +250,12 @@ start() { standalone=1 bootparams="$bootparams $i" ;; + + ovirt_overcommit*) + i=${i#ovirt_overcommit=} + eval $(printf $i|awk -F: '{print "overcommit="$1;}') + ;; + ip=*) i=${i#ip=} eval $(printf $i|awk -F: '{print "ip_address="$1; print "ip_gateway="$3; print "ip_netmask="$4}') @@ -278,7 +289,7 @@ start() { ip_gateway=$gateway fi # save boot parameters as defaults for ovirt-config-* - params="bootif init vol_boot_size vol_swap_size vol_root_size vol_config_size vol_logging_size local_boot standalone ip_address ip_netmask ip_gateway ipv6 syslog_server syslog_port bootparams hostname" + params="bootif init vol_boot_size vol_swap_size vol_root_size vol_config_size vol_logging_size local_boot standalone overcommit ip_address ip_netmask ip_gateway ipv6 syslog_server syslog_port bootparams hostname" mount_config if [ -e $OVIRT_DEFAULTS ]; then echo "update ovirt defaults" -- 1.6.0.6 From pmyers at redhat.com Wed Jan 14 19:54:35 2009 From: pmyers at redhat.com (Perry Myers) Date: Wed, 14 Jan 2009 14:54:35 -0500 Subject: [Ovirt-devel] [PATCH node] Bootup mounts the local log partition if it exists In-Reply-To: <496E2F18.6020105@redhat.com> References: <1231863234-1845-1-git-send-email-bkearney@redhat.com> <496E01F4.90303@redhat.com> <496E0388.1000008@redhat.com> <496E06BF.6080505@redhat.com> <496E2F18.6020105@redhat.com> Message-ID: <496E42FB.3090503@redhat.com> Bryan Kearney wrote: > Perry Myers wrote: >> Bryan Kearney wrote: >>> Perry Myers wrote: >>>> The logs-backup directory is just to catch any logs that get created >>>> between the system starting and ovirt-early coming up, correct? >>>> Should be minimal messages and dmesg output probably. Any way to >>>> get the log partition mounted earlier than ovirt-early > > > So.. I dont know the use case well enough. Is the annoyance of the error > message better/worse then a good documented step? We can do the following... in the Node kickstart %post we can edit the rc.sysinit script to (very early in script execution where it normally does the remount of all drives in /etc/fstab) mount specific Node partitions like /var/log and /data. We can check to make sure the partition exists before trying to mount it, and only show an error if the partition exists and it failed to mount it. Make sense? Alan mentioned that rc.sysinit has some hooks that we might be able to leverage to get around modifying the actual script. Perry From bkearney at redhat.com Wed Jan 14 19:56:51 2009 From: bkearney at redhat.com (Bryan Kearney) Date: Wed, 14 Jan 2009 14:56:51 -0500 Subject: [Ovirt-devel] [PATCH node] Added a wrapper script around the boot menu item to warn the users about the reboot In-Reply-To: <496E0594.5090906@redhat.com> References: <1231449766-28155-1-git-send-email-bkearney@redhat.com> <496E00CE.4020502@redhat.com> <496E02A3.6020304@redhat.com> <496E0594.5090906@redhat.com> Message-ID: <496E4383.2000503@redhat.com> Perry Myers wrote: > Bryan Kearney wrote: >> Perry Myers wrote: >>> Question on this patch, why did you create a separate script to wrap >>> the o-c-boot script instead of just putting a question at the top of >>> the main section of the o-c-boot script itself? You could just have >>> o-c-boot be executed directly by the firstboot menu and the first >>> thing it does is say "Are you sure" and if the user says No then it >>> just exits back to the main menu. >> >> This script is called several times, and it seemed ugly to put in an >> "Interactive" parameter to look for. Since it is called interactive in >> only one place, I figured it was cleaner to layer as opposed to add >> the if checks and flag. > > Ah, got it. I was only thinking about the interactive case. In the > non-interactive case the o-c-boot script is called directly w/o the > wrapper. Ok, given that this seems ok to me. > >>> >>> Also, do we have sanity checks in place for o-c-boot that check to >>> make sure that other things have been run like o-c-networking and >>> o-c-storage? If we don't have this, add that to the top of main in >>> o-c-boot along with the user question. >> >> We do some basic checking, but nothing rock-solid. Do we check for an >> initial state, or just provide text saying "You need to have done >> X,Y,Z for this to work" > > The latter won't work because o-c-storage doesn't guarantee that an > ovirt Node partition was created, correct? o-c-storage can be run just > to create partitions for config/logging but not hard disk boot. So the > user could run o-c-storage, elect not to create a partition to store the > Node itself and then try to run o-c-boot. In this case o-c-boot would > fail. > > So I think we want to do checks that ensure that the minimum partitions > are present with minimum recommended size I looked again, and o-c-boot does check for a basic partition structure, so I think we are good with that. Just to confirm, the additional check would be to see if there is at least network script like /etc/sysconfig/network-scripts/ifcfg-ovirtbr* Is that the correct logic? -- bk From bkearney at redhat.com Wed Jan 14 20:21:13 2009 From: bkearney at redhat.com (Bryan Kearney) Date: Wed, 14 Jan 2009 15:21:13 -0500 Subject: [Ovirt-devel] [PATCH node] Bootup mounts the local log partition if it exists In-Reply-To: <496E42FB.3090503@redhat.com> References: <1231863234-1845-1-git-send-email-bkearney@redhat.com> <496E01F4.90303@redhat.com> <496E0388.1000008@redhat.com> <496E06BF.6080505@redhat.com> <496E2F18.6020105@redhat.com> <496E42FB.3090503@redhat.com> Message-ID: <496E4939.1000000@redhat.com> Looking for Alan's input below Perry Myers wrote: > Bryan Kearney wrote: >> Perry Myers wrote: >>> Bryan Kearney wrote: >>>> Perry Myers wrote: >>>>> The logs-backup directory is just to catch any logs that get >>>>> created between the system starting and ovirt-early coming up, >>>>> correct? Should be minimal messages and dmesg output probably. >>>>> Any way to get the log partition mounted earlier than ovirt-early >> >> >> So.. I dont know the use case well enough. Is the annoyance of the >> error message better/worse then a good documented step? > > We can do the following... in the Node kickstart %post we can edit the > rc.sysinit script to (very early in script execution where it normally > does the remount of all drives in /etc/fstab) mount specific Node > partitions like /var/log and /data. We can check to make sure the > partition exists before trying to mount it, and only show an error if > the partition exists and it failed to mount it. > > Make sense? Alan mentioned that rc.sysinit has some hooks that we might > be able to leverage to get around modifying the actual script. So.. Alan.. were you thinking a custom module in /etc/sysconfig/modules which basically calls mount_config and mount_logs from the ovirt functions directory? -- bk From mmorsi at redhat.com Wed Jan 14 21:30:41 2009 From: mmorsi at redhat.com (Mohammed Morsi) Date: Wed, 14 Jan 2009 16:30:41 -0500 Subject: [Ovirt-devel] [PATCH server] comprehensive / up to date validations patch (revised) Message-ID: <1231968641-10286-1-git-send-email-mmorsi@redhat.com> (revision relates to small bug removed from validate in task.rb where the old 'time_created' was being used instead of 'created_at') this patch provides all the validation components included in the previous 3-patch patch-set, updated to incorporate recent changes to the rails application since they were originally sent out and to remove extraneous whitespace. This is the only patch that needs to be ack'd as it contains the validations, tests, and bug fixes Attached is additional validations, added to the rails model and controller layers verifying: bondings: arp related fields boot_types: label uniqueness and proto inclusion cpus: various fields are set and min values help_sections: presence and uniqueness of fields hosts: presence and format of various fields ip_addresses: fk existance / integrity nics: mac address format permissions: presence / inclusion of various fields pools: type inclusion quotas: minimum values smart_pool_tags: tagged_id / type fk present storage_pools: type, state field inclusion, min values storage_volumes: various fields, subclasses w/ various fields tasks: various fields present and consistensy maintained usages: label, other fields present, unique vms: uuid of correct format, min values, various fields present pools lft and rgt are not verified as they are added by acts_as_nested_set _after_ the pool is inserted into the db can only add / move host and storage volumes and pools to / from pools when you have sufficient permissions and target entities don't have associated vms can only destroy storage volumes / pools if there are no attached vms included are a few updates to the main server app and many updates to the test suite to fix a few various bits and assert all the new validations added. --- src/app/controllers/hardware_controller.rb | 28 ++++++- src/app/controllers/storage_controller.rb | 7 ++ src/app/models/bonding.rb | 15 +++- src/app/models/boot_type.rb | 5 + src/app/models/cpu.rb | 23 +++++ src/app/models/help_section.rb | 34 ++++++++ src/app/models/host.rb | 18 ++++ src/app/models/ip_address.rb | 4 + src/app/models/iscsi_storage_volume.rb | 2 + src/app/models/lvm_storage_volume.rb | 6 ++ src/app/models/nfs_storage_pool.rb | 1 + src/app/models/nic.rb | 15 +++- src/app/models/permission.rb | 7 ++ src/app/models/pool.rb | 3 + src/app/models/quota.rb | 22 +++++ src/app/models/smart_pool_tag.rb | 5 + src/app/models/storage_pool.rb | 17 ++++ src/app/models/storage_volume.rb | 21 +++++ src/app/models/task.rb | 16 ++++ src/app/models/usage.rb | 6 ++ src/app/models/vm.rb | 36 ++++++++- src/host-browser/host-browser.rb | 8 +- src/test/fixtures/help_sections.yml | 14 ++- src/test/fixtures/hosts.yml | 45 +++++++---- src/test/fixtures/storage_pools.yml | 11 +++ src/test/fixtures/usages.yml | 12 ++- src/test/functional/resources_controller_test.rb | 2 +- src/test/functional/storage_controller_test.rb | 4 +- src/test/unit/bonding_test.rb | 35 ++++++++ src/test/unit/boot_type_test.rb | 36 +++++++- src/test/unit/cpu_test.rb | 95 +++++++++++++++++++++- src/test/unit/help_section_test.rb | 51 +++++++++++- src/test/unit/host_test.rb | 60 +++++++++++++- src/test/unit/ip_address_test.rb | 5 + src/test/unit/ip_v4_address_test.rb | 3 +- src/test/unit/ip_v6_address_test.rb | 3 +- src/test/unit/nic_test.rb | 58 +++++++++++++- src/test/unit/permission_test.rb | 28 +++++++ src/test/unit/pool_test.rb | 21 +++++ src/test/unit/quota_test.rb | 37 ++++++++- src/test/unit/storage_pool_test.rb | 45 ++++++++++ src/test/unit/storage_volume_test.rb | 86 +++++++++++++++++++ src/test/unit/task_test.rb | 14 +++ src/test/unit/usage_test.rb | 47 ++++++++++- src/test/unit/vm_test.rb | 64 +++++++++++++++ 45 files changed, 1009 insertions(+), 66 deletions(-) diff --git a/src/app/controllers/hardware_controller.rb b/src/app/controllers/hardware_controller.rb index 7be67cc..5c14eec 100644 --- a/src/app/controllers/hardware_controller.rb +++ b/src/app/controllers/hardware_controller.rb @@ -293,15 +293,39 @@ class HardwareController < PoolController resource_ids_str = params[:resource_ids] resource_ids = resource_ids_str.split(",").collect {|x| x.to_i} + # if user doesn't have modify permission on both source and destination + unless @pool.can_modify(@user) and Pool.find(params[:target_pool_id]).can_modify(@user) + render :json => { :success => false, + :alert => "Cannot #{item_action.to_s} #{item_class.table_name.humanize} without admin permissions on both pools" } + return + end + + # relay error message if movable check fails for any resource + success = true + failed_resources = "" + resource_ids.each {|x| + unless item_class.find(x).movable? + success = false + failed_resources += x.to_s + " " + end + } + resource_ids.delete_if { |x| ! item_class.find(x).movable? } + begin @pool.transaction do @pool.send(item_method, resource_ids, target_pool_id) end + rescue + success = false + end + + if success render :json => { :success => true, :alert => "#{item_action.to_s} #{item_class.table_name.humanize} successful." } - rescue + else render :json => { :success => false, - :alert => "#{item_action.to_s} #{item_class.table_name.humanize} failed." } + :alert => "#{item_action.to_s} #{item_class.table_name.humanize} failed" + + (failed_resources == "" ? "." : " for " + failed_resources) } end end diff --git a/src/app/controllers/storage_controller.rb b/src/app/controllers/storage_controller.rb index 148d1be..e4b72f1 100644 --- a/src/app/controllers/storage_controller.rb +++ b/src/app/controllers/storage_controller.rb @@ -310,6 +310,13 @@ class StorageController < ApplicationController end def destroy + unless @storage_pool.movable? + format.json { render :json => { :object => "storage_pool", + :success => false, + :alert => "Cannot delete storage with associated vms" } } + return + end + pool = @storage_pool.hardware_pool if @storage_pool.destroy alert="Storage Pool was successfully deleted." diff --git a/src/app/models/bonding.rb b/src/app/models/bonding.rb index c9af38c..a67b97b 100644 --- a/src/app/models/bonding.rb +++ b/src/app/models/bonding.rb @@ -30,6 +30,8 @@ # interface. They can be ignored if not used. # class Bonding < ActiveRecord::Base + + belongs_to :host belongs_to :bonding_type belongs_to :vlan @@ -58,9 +60,20 @@ class Bonding < ActiveRecord::Base validates_presence_of :vlan_id, :message => 'A vlan must be specified.' + # verify arp ping address to be ipv4 if set + validates_format_of :arp_ping_address, + :with => %r{^(\d{1,3}\.){3}\d{1,3}$}, + :unless => Proc.new { |bonding| bonding.arp_ping_address.nil? } + + validates_numericality_of :arp_interval, + :greater_than_or_equal_to => 0, + :unless => Proc.new { |bonding| bonding.arp_interval.nil? } + protected def validate - if vlan.boot_type.proto == 'static' and ip_addresses.size == 0 + if ! vlan.nil? and + vlan.boot_type.proto == 'static' and + ip_addresses.size == 0 errors.add("vlan_id", "is static. Must create at least one static ip") end diff --git a/src/app/models/boot_type.rb b/src/app/models/boot_type.rb index 8ffbe67..6cfdb04 100644 --- a/src/app/models/boot_type.rb +++ b/src/app/models/boot_type.rb @@ -18,4 +18,9 @@ # also available at http://www.gnu.org/copyleft/gpl.html. class BootType < ActiveRecord::Base + validates_presence_of :label + validates_uniqueness_of :label, + :message => 'Label must be unique' + validates_inclusion_of :proto, + :in => %w( static dhcp bootp ) end diff --git a/src/app/models/cpu.rb b/src/app/models/cpu.rb index 1a7d3cf..714a8ed 100644 --- a/src/app/models/cpu.rb +++ b/src/app/models/cpu.rb @@ -21,4 +21,27 @@ # class Cpu < ActiveRecord::Base belongs_to :host + + validates_presence_of :host_id, + :message => 'A host must be specified.' + + validates_numericality_of :cpu_number, + :greater_than_or_equal_to => 0 + + validates_numericality_of :core_number, + :greater_than_or_equal_to => 0 + + validates_numericality_of :number_of_cores, + :greater_than_or_equal_to => 1 + + validates_numericality_of :cpuid_level, + :greater_than_or_equal_to => 0 + + validates_numericality_of :speed, + :greater_than => 0 + # also verify speed in MHz ? + + validates_presence_of :vendor + validates_presence_of :model + validates_presence_of :family end diff --git a/src/app/models/help_section.rb b/src/app/models/help_section.rb index a891383..bd3e27c 100644 --- a/src/app/models/help_section.rb +++ b/src/app/models/help_section.rb @@ -1,2 +1,36 @@ +# Copyright (C) 2008 Red Hat, Inc. +# Written by Mohammed Morsi +# +# 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. +# +# +HelpSection+ defines a section of the web help document to be +# available for a specific controller / action +# class HelpSection < ActiveRecord::Base + + validates_uniqueness_of :action, + :scope => :controller, + :message => 'Controller / Action must be unique' + + validates_presence_of :controller, + :message => 'A controller must be specified.' + + validates_presence_of :action, + :message => 'An action must be specified.' + + validates_presence_of :section, + :message => 'A section must be specified.' end diff --git a/src/app/models/host.rb b/src/app/models/host.rb index 813bc1d..ba7893a 100644 --- a/src/app/models/host.rb +++ b/src/app/models/host.rb @@ -60,6 +60,14 @@ class Host < ActiveRecord::Base [ :search_users, 'U', "search_users" ] ], :eager_load => :smart_pools + validates_presence_of :hardware_pool_id, + :message => 'A hardware pool id must be specified.' + + validates_presence_of :hostname, + :message => 'A hostname must be specified.' + + validates_presence_of :arch, + :message => 'An arch must be specified.' KVM_HYPERVISOR_TYPE = "KVM" HYPERVISOR_TYPES = [KVM_HYPERVISOR_TYPE] @@ -67,6 +75,12 @@ class Host < ActiveRecord::Base STATE_AVAILABLE = "available" STATES = [STATE_UNAVAILABLE, STATE_AVAILABLE] + validates_inclusion_of :hypervisor_type, + :in => HYPERVISOR_TYPES + + validates_inclusion_of :state, + :in => STATES + Task::COMPLETED_STATES + Task::WORKING_STATES + def memory_in_mb kb_to_mb(memory) end @@ -108,4 +122,8 @@ class Host < ActiveRecord::Base hardware_pool.search_users end + def movable? + return vms.size == 0 + end + end diff --git a/src/app/models/ip_address.rb b/src/app/models/ip_address.rb index 5d2e6af..3f246b1 100644 --- a/src/app/models/ip_address.rb +++ b/src/app/models/ip_address.rb @@ -24,4 +24,8 @@ class IpAddress < ActiveRecord::Base belongs_to :network belongs_to :nic belongs_to :bonding + + def validate + errors.add("id", "ip must be associated with foreign entity") if network_id.nil? and nic_id.nil? and bonding_id.nil? + end end diff --git a/src/app/models/iscsi_storage_volume.rb b/src/app/models/iscsi_storage_volume.rb index 48edbd8..fe2cbf5 100644 --- a/src/app/models/iscsi_storage_volume.rb +++ b/src/app/models/iscsi_storage_volume.rb @@ -31,4 +31,6 @@ class IscsiStorageVolume < StorageVolume return true end + validates_presence_of :lun + end diff --git a/src/app/models/lvm_storage_volume.rb b/src/app/models/lvm_storage_volume.rb index 8eb1f0e..38949ce 100644 --- a/src/app/models/lvm_storage_volume.rb +++ b/src/app/models/lvm_storage_volume.rb @@ -29,4 +29,10 @@ class LvmStorageVolume < StorageVolume def volume_create_params return lv_name, size, lv_owner_perms, lv_group_perms, lv_mode_perms end + + validates_presence_of :lv_name + validates_presence_of :lv_owner_perms + validates_presence_of :lv_group_perms + validates_presence_of :lv_mode_perms + end diff --git a/src/app/models/nfs_storage_pool.rb b/src/app/models/nfs_storage_pool.rb index 398e3f9..3b438c8 100644 --- a/src/app/models/nfs_storage_pool.rb +++ b/src/app/models/nfs_storage_pool.rb @@ -29,4 +29,5 @@ class NfsStoragePool < StoragePool def user_subdividable true end + end diff --git a/src/app/models/nic.rb b/src/app/models/nic.rb index 5649763..7ecfe6f 100644 --- a/src/app/models/nic.rb +++ b/src/app/models/nic.rb @@ -24,15 +24,28 @@ class Nic < ActiveRecord::Base has_and_belongs_to_many :bondings, :join_table => 'bondings_nics' + validates_presence_of :mac, + :message => 'A mac must be specified.' + + validates_format_of :mac, + :with => %r{^([0-9a-f]{2}([:-]|$)){6}$} + validates_presence_of :host_id, :message => 'A host must be specified.' validates_presence_of :physical_network_id, :message => 'A network must be specified.' + validates_numericality_of :bandwidth, + :greater_than_or_equal_to => 0 + + # validate 'bridge' or 'usage_type' attribute ? + protected def validate - if physical_network.boot_type.proto == 'static' and ip_addresses.size == 0 + if ! physical_network.nil? and + physical_network.boot_type.proto == 'static' and + ip_addresses.size == 0 errors.add("physical_network_id", "is static. Must create at least one static ip") end diff --git a/src/app/models/permission.rb b/src/app/models/permission.rb index ece3da5..b3929ad 100644 --- a/src/app/models/permission.rb +++ b/src/app/models/permission.rb @@ -24,9 +24,12 @@ class Permission < ActiveRecord::Base has_many :child_permissions, :dependent => :destroy, :class_name => "Permission", :foreign_key => "inherited_from_id" + validates_presence_of :pool_id + validates_presence_of :uid validates_uniqueness_of :uid, :scope => [:pool_id, :inherited_from_id] + ROLE_SUPER_ADMIN = "Super Admin" ROLE_ADMIN = "Administrator" ROLE_USER = "User" @@ -44,6 +47,10 @@ class Permission < ActiveRecord::Base ROLE_USER => [PRIV_VIEW, PRIV_VM_CONTROL], ROLE_MONITOR => [PRIV_VIEW]} + + validates_inclusion_of :user_role, + :in => ROLES.keys + def self.invert_roles return_hash = {} ROLES.each do |role, privs| diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb index 614325a..ed767dd 100644 --- a/src/app/models/pool.rb +++ b/src/app/models/pool.rb @@ -53,6 +53,9 @@ class Pool < ActiveRecord::Base validates_presence_of :name validates_uniqueness_of :name, :scope => :parent_id + validates_inclusion_of :type, + :in => %w( DirectoryPool HardwarePool VmResourcePool SmartPool ) + # overloading this method such that we can use permissions.admins to get all the admins for an object has_many :permissions, :dependent => :destroy, :order => "id ASC" do def super_admins diff --git a/src/app/models/quota.rb b/src/app/models/quota.rb index fc52177..2a9e0f0 100644 --- a/src/app/models/quota.rb +++ b/src/app/models/quota.rb @@ -22,6 +22,28 @@ require 'util/ovirt' class Quota < ActiveRecord::Base belongs_to :pool + validates_presence_of :pool_id + + + validates_numericality_of :total_vcpus, + :greater_than_or_equal_to => 0, + :unless => Proc.new{ |quota| quota.total_vcpus.nil? } + + validates_numericality_of :total_vmemory, + :greater_than_or_equal_to => 0, + :unless => Proc.new{ |quota| quota.total_vmemory.nil? } + + validates_numericality_of :total_vnics, + :greater_than_or_equal_to => 0, + :unless => Proc.new{ |quota| quota.total_vnics.nil? } + + validates_numericality_of :total_storage, + :greater_than_or_equal_to => 0, + :unless => Proc.new{ |quota| quota.total_storage.nil? } + + validates_numericality_of :total_vms, + :greater_than_or_equal_to => 0, + :unless => Proc.new{ |quota| quota.total_vms.nil? } def total_vmemory_in_mb kb_to_mb(total_vmemory) diff --git a/src/app/models/smart_pool_tag.rb b/src/app/models/smart_pool_tag.rb index e135ddf..00bb5a7 100644 --- a/src/app/models/smart_pool_tag.rb +++ b/src/app/models/smart_pool_tag.rb @@ -31,6 +31,11 @@ class SmartPoolTag < ActiveRecord::Base validates_uniqueness_of :smart_pool_id, :scope => [:tagged_id, :tagged_type] + validates_presence_of :tagged_id + + validates_inclusion_of :tagged_type, + :in => %w( Pool StoragePool Host Vm ) + def tagged_type=(sType) super(sType.to_s.classify.constantize.base_class.to_s) end diff --git a/src/app/models/storage_pool.rb b/src/app/models/storage_pool.rb index bab7031..f9abb55 100644 --- a/src/app/models/storage_pool.rb +++ b/src/app/models/storage_pool.rb @@ -39,6 +39,13 @@ class StoragePool < ActiveRecord::Base validates_presence_of :hardware_pool_id + validates_inclusion_of :type, + :in => %w( IscsiStoragePool LvmStoragePool NfsStoragePool ) + + + validates_numericality_of :capacity, + :greater_than_or_equal_to => 0 + acts_as_xapian :texts => [ :ip_addr, :target, :export_path, :type ], :terms => [ [ :search_users, 'U', "search_users" ] ], :eager_load => :smart_pools @@ -54,6 +61,9 @@ class StoragePool < ActiveRecord::Base STATE_PENDING_DELETION = "pending_deletion" STATE_AVAILABLE = "available" + validates_inclusion_of :state, + :in => [ STATE_PENDING_SETUP, STATE_PENDING_DELETION, STATE_AVAILABLE] + def self.factory(type, params = {}) params[:state] = STATE_PENDING_SETUP unless params[:state] case type @@ -121,4 +131,11 @@ class StoragePool < ActiveRecord::Base end return_hash end + + def movable? + storage_volumes.each{ |x| + return false unless x.movable? + } + return true + end end diff --git a/src/app/models/storage_volume.rb b/src/app/models/storage_volume.rb index 39b72d5..f8bd4fb 100644 --- a/src/app/models/storage_volume.rb +++ b/src/app/models/storage_volume.rb @@ -32,10 +32,23 @@ class StorageVolume < ActiveRecord::Base end end + validates_presence_of :storage_pool_id + + + validates_numericality_of :size, + :greater_than_or_equal_to => 0, + :unless => Proc.new { |storage_volume| storage_volume.nil? } + + validates_inclusion_of :type, + :in => %w( IscsiStorageVolume LvmStorageVolume NfsStorageVolume ) + STATE_PENDING_SETUP = "pending_setup" STATE_PENDING_DELETION = "pending_deletion" STATE_AVAILABLE = "available" + validates_inclusion_of :state, + :in => [ STATE_PENDING_SETUP, STATE_PENDING_DELETION, STATE_AVAILABLE] + def self.factory(type, params = {}) params[:state] = STATE_PENDING_SETUP unless params[:state] case type @@ -131,4 +144,12 @@ class StorageVolume < ActiveRecord::Base return_hash end + def movable? + if vms.size > 0 or + (not lvm_storage_pool.nil? and not lvm_stoage_pool.movable?) + return false + end + return true + end + end diff --git a/src/app/models/task.rb b/src/app/models/task.rb index dd24e6a..66cac33 100644 --- a/src/app/models/task.rb +++ b/src/app/models/task.rb @@ -45,6 +45,17 @@ class Task < ActiveRecord::Base COMPLETED_STATES = [STATE_FINISHED, STATE_FAILED, STATE_CANCELED] WORKING_STATES = [STATE_QUEUED, STATE_RUNNING, STATE_PAUSED] + validates_inclusion_of :type, + :in => %w( HostTask StorageTask StorageVolumeTask VmTask ) + + validates_inclusion_of :state, + :in => COMPLETED_STATES + WORKING_STATES + + # FIXME validate action depending on type / subclass + # validate task_target_id, task_type_id, arg, message + # depending on subclass, action, state + + TASK_TYPES_OPTIONS = [["VM Tasks", "VmTask"], ["Host Tasks", "HostTask"], ["Storage Tasks", "StorageTask"], @@ -89,4 +100,9 @@ class Task < ActiveRecord::Base ret_val += " #{args}" if args ret_val end + + def validate + errors.add("time_ended", "Tasks ends before its started") unless time_ended.nil? or time_started.nil? or time_ended > time_started + errors.add("time_started", "Tasks starts before its created") unless time_started.nil? or created_at.nil? or time_started > created_at + end end diff --git a/src/app/models/usage.rb b/src/app/models/usage.rb index 353e8f4..59b0e48 100644 --- a/src/app/models/usage.rb +++ b/src/app/models/usage.rb @@ -18,4 +18,10 @@ class Usage < ActiveRecord::Base has_and_belongs_to_many :networks, :join_table => 'networks_usages' + + validates_presence_of :label + validates_presence_of :usage + + validates_uniqueness_of :usage + end diff --git a/src/app/models/vm.rb b/src/app/models/vm.rb index 227f343..bf99e2d 100644 --- a/src/app/models/vm.rb +++ b/src/app/models/vm.rb @@ -34,7 +34,32 @@ class Vm < ActiveRecord::Base validates_presence_of :uuid, :description, :num_vcpus_allocated, :boot_device, :memory_allocated_in_mb, - :memory_allocated, :vnic_mac_addr + :memory_allocated, :vnic_mac_addr, + :vm_resource_pool_id + + validates_format_of :uuid, + :with => %r([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}) + + validates_numericality_of :needs_restart, + :greater_than_or_equal_to => 0, + :less_than_or_equal_to => 1, + :unless => Proc.new{ |vm| vm.needs_restart.nil? } + + validates_numericality_of :memory_used, + :greater_than_or_equal_to => 0, + :unless => Proc.new{ |vm| vm.memory_used.nil? } + + validates_numericality_of :vnc_port, + :greater_than_or_equal_to => 0, + :unless => Proc.new{ |vm| vm.vnc_port.nil? } + + validates_numericality_of :num_vcpus_allocated, + :greater_than_or_equal_to => 0, + :unless => Proc.new{ |vm| vm.num_vcpus_allocated.nil? } + + validates_numericality_of :memory_allocated, + :greater_than_or_equal_to => 0, + :unless => Proc.new{ |vm| vm.memory_allocated.nil? } acts_as_xapian :texts => [ :uuid, :description, :vnic_mac_addr, :state ], :terms => [ [ :search_users, 'U', "search_users" ] ], @@ -117,9 +142,14 @@ class Vm < ActiveRecord::Base STATE_SAVED => STATE_SAVED, STATE_RESTORING => STATE_RUNNING, STATE_MIGRATING => STATE_RUNNING, - STATE_CREATE_FAILED => STATE_CREATE_FAILED} + STATE_CREATE_FAILED => STATE_CREATE_FAILED, + STATE_INVALID => STATE_INVALID} TASK_STATE_TRANSITIONS = [] + validates_inclusion_of :state, + :in => EFFECTIVE_STATE.keys + + def get_hardware_pool pool = vm_resource_pool pool = pool.get_hardware_pool if pool @@ -311,7 +341,7 @@ class Vm < ActiveRecord::Base # FIXME: what should memory min/max be? errors.add("memory_allocated_in_mb", "must be at least 256 MB") unless not(memory_allocated_in_mb) or memory_allocated_in_mb >=256 # FIXME: what should cpu min/max - errors.add("num_vcpus_allocated", "must be between 1 and 16") unless (num_vcpus_allocated >=1 and num_vcpus_allocated <= 16) + errors.add("num_vcpus_allocated", "must be between 1 and 16") unless (num_vcpus_allocated.nil? or (num_vcpus_allocated >=1 and num_vcpus_allocated <= 16)) errors.add("memory_allocated_in_mb", "violates quota") unless not(memory_allocated) or resources[:memory].nil? or memory_allocated <= resources[:memory] errors.add("num_vcpus_allocated", "violates quota") unless not(num_vcpus_allocated) or resources[:cpus].nil? or num_vcpus_allocated <= resources[:cpus] errors.add_to_base("No available nics in quota") unless resources[:nics].nil? or resources[:nics] >= 1 diff --git a/src/host-browser/host-browser.rb b/src/host-browser/host-browser.rb index 52d2999..13eb6fc 100755 --- a/src/host-browser/host-browser.rb +++ b/src/host-browser/host-browser.rb @@ -250,13 +250,13 @@ class HostBrowser puts "Saving new CPU records" cpu_info.collect do |cpu| detail = Cpu.new( - "cpu_number" => cpu['CPUNUM'], - "core_number" => cpu['CORENUM]'], - "number_of_cores" => cpu['NUMCORES'], + "cpu_number" => cpu['CPUNUM'].to_i, + "core_number" => cpu['CORENUM]'].to_i, + "number_of_cores" => cpu['NUMCORES'].to_i, "vendor" => cpu['VENDOR'], "model" => cpu['MODEL'], "family" => cpu['FAMILY'], - "cpuid_level" => cpu['CPUIDLVL'], + "cpuid_level" => cpu['CPUIDLVL'].to_i, "speed" => cpu['SPEED'], "cache" => cpu['CACHE'], "flags" => cpu['FLAGS']) diff --git a/src/test/fixtures/help_sections.yml b/src/test/fixtures/help_sections.yml index 5bf0293..d9f93e4 100644 --- a/src/test/fixtures/help_sections.yml +++ b/src/test/fixtures/help_sections.yml @@ -1,7 +1,11 @@ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -# one: -# column: value -# -# two: -# column: value +dashboard_help: + controller: dashboard + action: index + section: 'index.html' + +hardware_hosts_help: + controller: hardware + action: hosts + section: 'hardware_hosts.html' diff --git a/src/test/fixtures/hosts.yml b/src/test/fixtures/hosts.yml index 31e7580..4b97053 100644 --- a/src/test/fixtures/hosts.yml +++ b/src/test/fixtures/hosts.yml @@ -5,7 +5,7 @@ prod_corp_com: memory: 18384 is_disabled: 0 state: available - hypervisor_type: xen + hypervisor_type: KVM hardware_pool: corp_com workstation_corp_com: uuid: 1f2a8694-961d-11dc-9387-001558c41534 @@ -13,7 +13,8 @@ workstation_corp_com: arch: i386 memory: 2048 is_disabled: 0 - hypervisor_type: qemu + state: available + hypervisor_type: KVM hardware_pool: corp_com macworkstation_qa_corp_com: uuid: 58a85f44-75fd-4934-805f-88e45b40d4b4 @@ -21,7 +22,8 @@ macworkstation_qa_corp_com: arch: mips memory: 2048 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_qa fedoraworkstation_qa_corp_com: uuid: 520bbb34-6515-490e-9d07-0c8b14f76805 @@ -29,7 +31,8 @@ fedoraworkstation_qa_corp_com: arch: i386 memory: 2048 is_disabled: 1 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_qa pipeline_qa_corp_com: uuid: 2e422f66-324e-48d4-973f-0b91b33070f9 @@ -37,7 +40,8 @@ pipeline_qa_corp_com: arch: xeon memory: 1048576 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_qa app_qa_corp_com: uuid: bb0ce7c7-f234-49ae-84b5-6f4fd8bddcaa @@ -45,7 +49,8 @@ app_qa_corp_com: arch: xeon memory: 16384 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_qa issue_qa_corp_com: uuid: ec0d86de-657b-48f6-b7cc-e733a3f9a834 @@ -53,7 +58,8 @@ issue_qa_corp_com: arch: x86 memory: 4096 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_qa db_dev_corp_com: uuid: 81c15560-dbf4-45f5-9b75-106cdbd63aeb @@ -61,7 +67,8 @@ db_dev_corp_com: arch: x86 memory: 4096 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_dev mystation_dev_corp_com: uuid: 6ae3d22e-97e0-4d86-9712-5395b20a0f45 @@ -69,7 +76,8 @@ mystation_dev_corp_com: arch: i686 memory: 2048 is_disabled: 0 - hypervisor_type: xen + state: available + hypervisor_type: KVM hardware_pool: corp_com_dev node3_priv_ovirt_org: uuid: 75f8d5f3-faf0-4308-9f20-e4b03d013a27 @@ -77,16 +85,17 @@ node3_priv_ovirt_org: arch: x86_64 memory: 4194304 is_disabled: 0 - hypervisor_type: kvm - hardware_pool: default state: available + hypervisor_type: KVM + hardware_pool: default mailservers_managed_node: uuid: 182a8596-961d-11dc-9387-001558c41534 hostname: mail.mynetwork.com arch: i386 memory: 16384 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_prod fileserver_managed_node: uuid: 928ad8172-9723-11dc-9387-001558c41534 @@ -94,7 +103,8 @@ fileserver_managed_node: arch: x86_64 memory: 32768 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_prod ldapserver_managed_node: uuid: 919ae372-9156-11dc-9387-001558c41534 @@ -102,7 +112,8 @@ ldapserver_managed_node: arch: i386 memory: 16384 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_prod buildserver_managed_node: uuid: 6293acd9-2784-11dc-9387-001558c41534 @@ -110,7 +121,8 @@ buildserver_managed_node: arch: x86_64 memory: 65536 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_prod mediaserver_managed_node: uuid: 6293acd9-2784-11dc-9387-001558c41534 @@ -118,5 +130,6 @@ mediaserver_managed_node: arch: x86_64 memory: 65536 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_prod diff --git a/src/test/fixtures/storage_pools.yml b/src/test/fixtures/storage_pools.yml index ac72f99..35bfc88 100644 --- a/src/test/fixtures/storage_pools.yml +++ b/src/test/fixtures/storage_pools.yml @@ -5,14 +5,25 @@ corp_com_ovirtpriv_storage: port: 3260 target: ovirtpriv:storage state: available + capacity: 1024 corp_com_nfs_ovirtnfs: hardware_pool: corp_com type: NfsStoragePool ip_addr: 192.168.50.2 export_path: /ovirtnfs + capacity: 1024 + state: available corp_com_dev_nfs_ovirtnfs: hardware_pool: corp_com_dev type: NfsStoragePool ip_addr: 192.168.50.3 export_path: /devnfs state: available + capacity: 1024 +corp_com_dev_lvm_ovirtlvm: + hardware_pool: corp_com_dev + type: LvmStoragePool + ip_addr: 192.168.50.3 + export_path: /devnfs + state: available + capacity: 1024 diff --git a/src/test/fixtures/usages.yml b/src/test/fixtures/usages.yml index 5bf0293..3bd72e6 100644 --- a/src/test/fixtures/usages.yml +++ b/src/test/fixtures/usages.yml @@ -1,7 +1,9 @@ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -# one: -# column: value -# -# two: -# column: value +management_usage: + label: management + usage: management + +guest_usage: + label: guest + usage: guest diff --git a/src/test/functional/resources_controller_test.rb b/src/test/functional/resources_controller_test.rb index 8e3989b..0312c0c 100644 --- a/src/test/functional/resources_controller_test.rb +++ b/src/test/functional/resources_controller_test.rb @@ -45,7 +45,7 @@ class ResourcesControllerTest < ActionController::TestCase def test_create assert_difference('VmResourcePool.count') do - post :create, :vm_resource_pool => { :name => 'foo_resource_pool' }, :parent_id => pools(:default).id + post :create, :pool => { :name => 'foo_resource_pool'}, :parent_id => pools(:default).id end assert_response :success diff --git a/src/test/functional/storage_controller_test.rb b/src/test/functional/storage_controller_test.rb index a448fdf..f08fe1b 100644 --- a/src/test/functional/storage_controller_test.rb +++ b/src/test/functional/storage_controller_test.rb @@ -69,11 +69,11 @@ class StorageControllerTest < Test::Unit::TestCase assert_not_nil assigns(:storage_pools) end - def test_create + def test_create_storage_controller hw_pool = HardwarePool.get_default_pool num_storage_volumes = StoragePool.count - post :create, :storage_type => 'NFS', :storage_pool => { :hardware_pool => hw_pool, :ip_addr => '111.121.131.141', :export_path => '/tmp/path' } + post :create, :storage_type => 'NFS', :storage_pool => { :hardware_pool => hw_pool, :ip_addr => '111.121.131.141', :export_path => '/tmp/path', :state => 'available', :capacity => 1024 } assert_response :success diff --git a/src/test/unit/bonding_test.rb b/src/test/unit/bonding_test.rb index 8b90cd5..33bfd56 100644 --- a/src/test/unit/bonding_test.rb +++ b/src/test/unit/bonding_test.rb @@ -35,6 +35,7 @@ class BondingTest < ActiveSupport::TestCase :bonding_type_id => bonding_types(:failover_bonding_type), :host_id => hosts(:mailservers_managed_node)) @bonding.vlan = networks(:dhcp_vlan_one) + @bonding.bonding_type = bonding_types(:load_balancing_bonding_type) end # Ensures that the name is required. @@ -69,6 +70,40 @@ class BondingTest < ActiveSupport::TestCase flunk 'Bondings have to have a host.' if @bonding.valid? end + def test_valid_fails_without_bonding_type + @bonding.bonding_type = nil + flunk 'Bonding must specify bonding type' if @bonding.valid? + end + + def test_valid_fails_without_vlan + @bonding.vlan = nil + flunk 'Bonding must specify vlan' if @bonding.valid? + end + + # Ensures that an arp ping address must have the correct format + # + def test_valid_fails_with_bad_arp_ping_address + @bonding.arp_ping_address = 'foobar' + + flunk "An arp ping address must be in the format ##.##.##.##." if @bonding.valid? + end + + # Ensures that an arp interval is a numerical value >= 0 + # + def test_valid_fails_with_bad_arp_interval + @bonding.arp_interval = -1 + + flunk "An arp interval must be >= 0" if @bonding.valid? + end + + def test_static_network_bonding_must_have_ip + @bonding.vlan = networks(:static_vlan_one) + @bonding.ip_addresses.delete_if { true } + + flunk 'Bonding assigned to static networks must have at least one ip' if @bonding.valid? + end + + # Ensure that retrieving a bonding returns its associated objects. # def test_find_all_for_host diff --git a/src/test/unit/boot_type_test.rb b/src/test/unit/boot_type_test.rb index a30e258..778f75a 100644 --- a/src/test/unit/boot_type_test.rb +++ b/src/test/unit/boot_type_test.rb @@ -19,8 +19,36 @@ require File.dirname(__FILE__) + '/../test_helper' class BootTypeTest < ActiveSupport::TestCase - # Replace this with your real tests. - def test_truth - assert true - end + fixtures :boot_types + + def setup + @boot_type = BootType.new( + :label => 'TestBootType', + :proto => 'static' ) + end + + def test_valid_fails_without_label + @boot_type.label = '' + + flunk 'Boot type must have label' if @boot_type.valid? + end + + def test_valid_fails_without_unique_label + @boot_type.label = 'Static IP' + + flunk 'Boot type must have unique label' if @boot_type.valid? + end + + def test_valid_fails_with_bad_proto + @boot_type.proto = 'foobar' + + flunk 'Boot type must have valid proto' if @boot_type.valid? + end + + def test_find_all_for_boot_type + result = BootType.find(:all) + + assert_equal 3, result.size, "Did not find right number of boot types" + end + end diff --git a/src/test/unit/cpu_test.rb b/src/test/unit/cpu_test.rb index 9558525..56e2d5d 100644 --- a/src/test/unit/cpu_test.rb +++ b/src/test/unit/cpu_test.rb @@ -1,10 +1,99 @@ +# Copyright (C) 2008 Red Hat, Inc. +# Written by Mohammed Morsi +# +# 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 File.dirname(__FILE__) + '/../test_helper' class CpuTest < ActiveSupport::TestCase fixtures :cpus + fixtures :hosts + + def setup + @cpu = Cpu.new( + :cpu_number => 3, + :core_number => 1, + :number_of_cores => 1, + :cpuid_level => 0, + :speed => 2048, + :vendor => 'foo', + :model => 'bar', + :family => 'alpha') + @cpu.host = hosts(:prod_corp_com) + end + + def test_find_cpus + assert_equal Cpu.find(:all).size, 8, "Failure retrieving all cpus" + + result = Cpu.find(cpus(:prod_corp_com_1).id) + assert_equal result.host.id, hosts(:prod_corp_com).id + end + + def test_valid_without_host + @cpu.host = nil + + flunk "CPUs must be associated with hosts" if @cpu.valid? + end + + def test_valid_with_bad_cpu_numer + @cpu.cpu_number = -1 + + flunk "cpu number must be >= 0" if @cpu.valid? + end + + def test_valid_with_bad_core_number + @cpu.core_number = -1 + + flunk "cpu core number must be >= 0" if @cpu.valid? + end + + def test_valid_with_bad_number_of_cores + @cpu.number_of_cores = 0 - # Replace this with your real tests. - def test_truth - assert true + flunk "cpu number of cores must be > 0" if @cpu.valid? end + + def test_valid_with_bad_cpuid_level + @cpu.cpuid_level = -1 + + flunk "cpu id level must be >= 0" if @cpu.valid? + end + + def test_valid_with_bad_speed + @cpu.speed = 0 + + flunk "cpu speed must be > 0" if @cpu.valid? + end + + def test_valid_without_vendor + @cpu.vendor = '' + + flunk "cpu vendor must be specified" if @cpu.valid? + end + + def test_valid_without_model + @cpu.model = '' + + flunk "cpu model must be specified" if @cpu.valid? + end + + def test_valid_without_family + @cpu.family = '' + + flunk "cpu family must be specified" if @cpu.valid? + end + end diff --git a/src/test/unit/help_section_test.rb b/src/test/unit/help_section_test.rb index a0e6a08..1596262 100644 --- a/src/test/unit/help_section_test.rb +++ b/src/test/unit/help_section_test.rb @@ -1,8 +1,51 @@ +# Copyright (C) 2008 Red Hat, Inc. +# Written by Mohammed Morsi +# +# 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 'test_helper' class HelpSectionTest < ActiveSupport::TestCase - # Replace this with your real tests. - def test_truth - assert true - end + fixtures :help_sections + + def setup + @help_section = HelpSection.new( + :controller => 'foo', + :action => 'bar', + :section => 'foobar') + end + + def test_unique_controller_action + @help_section.controller = 'dashboard' + @help_section.action = 'index' + + flunk 'help section must have unique controller / action' if @help_section.valid? + end + + def test_valid_fails_without_controller + @help_section.controller = '' + flunk 'help section controller must be specified' if @help_section.valid? + end + + def test_valid_fails_without_action + @help_section.action = '' + flunk 'help section action must be specified' if @help_section.valid? + end + + def test_valid_fails_without_section + @help_section.section = '' + flunk 'help section section must be specified' if @help_section.valid? + end end diff --git a/src/test/unit/host_test.rb b/src/test/unit/host_test.rb index a4ead5d..338fbaf 100644 --- a/src/test/unit/host_test.rb +++ b/src/test/unit/host_test.rb @@ -21,9 +21,63 @@ require File.dirname(__FILE__) + '/../test_helper' class HostTest < Test::Unit::TestCase fixtures :hosts + fixtures :pools + fixtures :vms - # Replace this with your real tests. - def test_truth - assert true + def setup + @host = Host.new( + :uuid => 'foobar', + :hostname => 'foobar', + :arch => 'x86_64', + :hypervisor_type => 'KVM', + :state => 'available') + + @host.hardware_pool = pools(:corp_com) + end + + def test_valid_fails_without_hardware_pool + @host.hardware_pool = nil + + flunk "Hosts must be associated w/ a hardware pool" if @host.valid? + end + + def test_valid_without_uuid + @host.uuid = nil + + flunk "Hosts don't need to be associated w/ a uuid" unless @host.valid? end + + + def test_valid_fails_without_hostname + @host.hostname = '' + + flunk "Hosts must be associated w/ a hostname" if @host.valid? + end + + + def test_valid_fails_without_arch + @host.arch = '' + + flunk "Hosts must be associated w/ an arch" if @host.valid? + end + + def test_valid_fails_with_bad_hypervisor_type + @host.hypervisor_type = 'foobar' + + flunk "Hosts must be associated w/ a valid hypervisor type" if @host.valid? + end + + def test_valid_fails_with_bad_state + @host.state = 'foobar' + + flunk "Hosts must be associated w/ a valid state" if @host.valid? + end + + def test_host_movable + assert_equal @host.movable?, true, "Hosts are movable unless associated w/ vms" + + @host.vms << vms(:production_httpd_vm) + assert_equal @host.movable?, false, "Hosts with associated vms are not movable" + end + end diff --git a/src/test/unit/ip_address_test.rb b/src/test/unit/ip_address_test.rb index 5ecff77..4cfc694 100644 --- a/src/test/unit/ip_address_test.rb +++ b/src/test/unit/ip_address_test.rb @@ -10,4 +10,9 @@ class IpAddressTest < ActiveSupport::TestCase def test_can_get_ipaddress_object assert_equal ip_addresses(:ip_v4_mailserver_nic_one).address, '172.31.0.15' end + + def test_valid_fails_without_foreign_entity + @ip_address = IpAddress.new + flunk "Ip Address must be associated with network, nic, or bonding" if @ip_address.valid? + end end diff --git a/src/test/unit/ip_v4_address_test.rb b/src/test/unit/ip_v4_address_test.rb index 65a08d3..9cb7362 100644 --- a/src/test/unit/ip_v4_address_test.rb +++ b/src/test/unit/ip_v4_address_test.rb @@ -24,7 +24,8 @@ class IpV4AddressTest < ActiveSupport::TestCase @address = IpV4Address.new(:address => '192.168.50.2', :netmask => '255.255.255.0', :gateway => '192.168.50.1', - :broadcast => '192.168.50.255') + :broadcast => '192.168.50.255', + :nic_id => 1) end # Ensures that an address must be supplied. diff --git a/src/test/unit/ip_v6_address_test.rb b/src/test/unit/ip_v6_address_test.rb index 070f407..96f212a 100644 --- a/src/test/unit/ip_v6_address_test.rb +++ b/src/test/unit/ip_v6_address_test.rb @@ -23,7 +23,8 @@ class IpV6AddressTest < ActiveSupport::TestCase def setup @address = IpV6Address.new(:address => 'fe80:0:0:0:200:f8ff:fe21:67cf', :gateway => ':::::::717', - :prefix => '0000:0000:0000:0000:1234:1234:1234:1234') + :prefix => '0000:0000:0000:0000:1234:1234:1234:1234', + :nic_id => 1) end # Ensures that the address must be provided. diff --git a/src/test/unit/nic_test.rb b/src/test/unit/nic_test.rb index 1de1e00..2644148 100644 --- a/src/test/unit/nic_test.rb +++ b/src/test/unit/nic_test.rb @@ -22,9 +22,61 @@ require File.dirname(__FILE__) + '/../test_helper' class NicTest < Test::Unit::TestCase fixtures :ip_addresses fixtures :nics + fixtures :hosts + fixtures :networks - # Replace this with your real tests. - def test_truth - assert true + def setup + @nic = Nic.new( + :mac => '00:11:22:33:44:55', + :usage_type => 1, + :bandwidth => 100 ) + @nic.host = hosts(:prod_corp_com) + @nic.physical_network = networks(:static_physical_network_one) + + @ip_address = IpV4Address.new( + :address => '1.2.3.4', + :netmask => '2.3.4.5', + :gateway => '3.4.5.6', + :broadcast => '4.5.6.7' ) + + @nic.ip_addresses << @ip_address + end + + def test_valid_fails_without_mac + @nic.mac = '' + + flunk 'Nic must have a mac' if @nic.valid? + end + + def test_valid_fails_with_invalid_mac + @nic.mac = 'foobar' + + flunk 'Nic must have a valid mac' if @nic.valid? + end + + def test_valid_fails_without_host + @nic.host = nil + + flunk 'Nic must have a host' if @nic.valid? end + + def test_valid_fails_without_physical_network + @nic.physical_network = nil + + flunk 'Nic must have a physical network' if @nic.valid? + end + + def test_valid_fails_with_invalid_bandwidth + @nic.bandwidth = -1 + + flunk 'Nic bandwidth must be >= 0' if @nic.valid? + end + + def test_static_network_nic_must_have_ip + @nic.physical_network = networks(:static_physical_network_one) + @nic.ip_addresses.delete_if { true } + + flunk 'Nics assigned to static networks must have at least one ip' if @nic.valid? + end + end diff --git a/src/test/unit/permission_test.rb b/src/test/unit/permission_test.rb index 5e2c7ba..0c0f4c7 100644 --- a/src/test/unit/permission_test.rb +++ b/src/test/unit/permission_test.rb @@ -21,6 +21,14 @@ require File.dirname(__FILE__) + '/../test_helper' class PermissionTest < Test::Unit::TestCase fixtures :permissions + fixtures :pools + + def setup + @permission = Permission.new( + :uid => 'foobar', + :user_role => 'Super Admin' ) + @permission.pool = pools(:root_dir_pool) + end # Replace this with your real tests. def test_simple_permission @@ -32,4 +40,24 @@ class PermissionTest < Test::Unit::TestCase assert_equal permissions(:ovirtadmin_default).inherited_from_id, permissions(:ovirtadmin_root).id assert_equal permissions(:ovirtadmin_default).parent_permission, permissions(:ovirtadmin_root) end + + def test_valid_fails_without_pool + @permission.pool = nil + flunk 'Permission must specify pool' if @permission.valid? + end + + def test_valid_fails_without_uid + @permission.uid = '' + flunk 'Permission must specify uid' if @permission.valid? + end + + def test_valid_fails_without_user_role + @permission.user_role = '' + flunk 'Permission must specify user role' if @permission.valid? + end + + def test_valid_fails_with_invalid_user_role + @permission.user_role = 'foobar' + flunk 'Permission must specify valid user role' if @permission.valid? + end end diff --git a/src/test/unit/pool_test.rb b/src/test/unit/pool_test.rb index 6f20f9f..c9a5554 100644 --- a/src/test/unit/pool_test.rb +++ b/src/test/unit/pool_test.rb @@ -22,6 +22,12 @@ require File.dirname(__FILE__) + '/../test_helper' class PoolTest < Test::Unit::TestCase fixtures :pools + def setup + @pool = Pool.new( + :name => 'foobar', + :type => 'DirectoryPool' ) + end + # Replace this with your real tests. def test_get_name assert_equal(pools(:corp_com_prod).name, 'Production Operations') @@ -30,4 +36,19 @@ class PoolTest < Test::Unit::TestCase def test_get_parent assert_equal(pools(:corp_com_prod).parent.name, 'corp.com') end + + def test_valid_fails_without_name + @pool.name = '' + flunk "Pool must specify name" if @pool.valid? + end + + def test_valid_fails_without_unique_name + @pool.name = 'root' + flunk "Pool must specify unique name" if @pool.valid? + end + + def test_valid_fails_with_invalid_type + @pool.name = 'foobar' + flunk "Pool must specify valid type" if @pool.valid? + end end diff --git a/src/test/unit/quota_test.rb b/src/test/unit/quota_test.rb index ac0fae0..5903cc8 100644 --- a/src/test/unit/quota_test.rb +++ b/src/test/unit/quota_test.rb @@ -21,9 +21,40 @@ require File.dirname(__FILE__) + '/../test_helper' class QuotaTest < Test::Unit::TestCase fixtures :quotas + fixtures :pools - # Replace this with your real tests. - def test_truth - assert true + def setup + @quota = Quota.new + @quota.pool = pools(:root_dir_pool) + end + + def test_valid_fails_without_pool + @quota.pool = nil + flunk "Quota's must specify pool" if @quota.valid? + end + + def test_valid_fails_with_bad_total_vcpus + @quota.total_vcpus = -1 + flunk "Quota must specify valid total vcpus" if @quota.valid? + end + + def test_valid_fails_with_bad_total_vmemory + @quota.total_vmemory = -1 + flunk "Quota must specify valid total vmemory" if @quota.valid? + end + + def test_valid_fails_with_bad_total_vnics + @quota.total_vnics = -1 + flunk "Quota must specify valid total vnics" if @quota.valid? + end + + def test_valid_fails_with_bad_total_storage + @quota.total_storage = -1 + flunk "Quota must specify valid total storage" if @quota.valid? + end + + def test_valid_fails_with_bad_total_vms + @quota.total_vms = -1 + flunk "Quota must specify valid total vms" if @quota.valid? end end diff --git a/src/test/unit/storage_pool_test.rb b/src/test/unit/storage_pool_test.rb index 8cc8d1b..4e18a8c 100644 --- a/src/test/unit/storage_pool_test.rb +++ b/src/test/unit/storage_pool_test.rb @@ -21,8 +21,53 @@ require File.dirname(__FILE__) + '/../test_helper' class StoragePoolTest < Test::Unit::TestCase fixtures :storage_pools + fixtures :pools + fixtures :vms + + def setup + @storage_pool = StoragePool.new( + :type => 'IscsiStoragePool', + :capacity => 100, + :state => 'available' ) + @storage_pool.hardware_pool = pools(:default) + end + + def test_valid_fails_without_hardware_pool + @storage_pool.hardware_pool = nil + flunk "Storage pool must specify hardware pool" if @storage_pool.valid? + end + + def test_valid_fails_with_bad_type + @storage_pool.type = 'foobar' + flunk 'Storage pool must specify valid type' if @storage_pool.valid? + end + + def test_valid_fails_with_bad_capacity + @storage_pool.capacity = -1 + flunk 'Storage pool must specify valid capacity >= 0' if @storage_pool.valid? + end + + def test_valid_fails_with_bad_state + @storage_pool.state = 'foobar' + flunk 'Storage pool must specify valid state' if @storage_pool.valid? + end def test_hardware_pool_relationship assert_equal 'corp.com', storage_pools(:corp_com_ovirtpriv_storage).hardware_pool.name end + + def test_movable + assert_equal @storage_pool.movable?, true, "Storage pool without volumes should be movable" + + storage_volume = StorageVolume.new( + :size => 100, + :type => 'IscsiStorageVolume', + :state => 'available' ) + @storage_pool.storage_volumes << storage_volume + + assert_equal @storage_pool.movable?, true, "Storage pool w/ movable storage volumes should be movable" + + storage_volume.vms << vms(:production_httpd_vm) + assert_equal @storage_pool.movable?, false, "Storage pool w/ unmovable storage volumes should not be movable" + end end diff --git a/src/test/unit/storage_volume_test.rb b/src/test/unit/storage_volume_test.rb index d0a89f4..3978685 100644 --- a/src/test/unit/storage_volume_test.rb +++ b/src/test/unit/storage_volume_test.rb @@ -21,9 +21,95 @@ require File.dirname(__FILE__) + '/../test_helper' class StorageVolumeTest < Test::Unit::TestCase fixtures :storage_volumes + fixtures :storage_pools + fixtures :vms + + def setup + @storage_volume = StorageVolume.new( + :size => 100, + :type => 'IscsiStorageVolume', + :state => 'available' ) + + @iscsi_storage_volume = IscsiStorageVolume.new( + :lun => 'foobar', + :size => 100, + :state => 'available' ) + + @lvm_storage_volume = LvmStorageVolume.new( + :lv_name => 'foobar', + :lv_owner_perms => '0700', + :lv_group_perms => '0777', + :lv_mode_perms => '0000' ) + + @storage_volume.storage_pool = storage_pools(:corp_com_ovirtpriv_storage) + @iscsi_storage_volume.storage_pool = storage_pools(:corp_com_ovirtpriv_storage) + @lvm_storage_volume.storage_pool = storage_pools(:corp_com_dev_lvm_ovirtlvm) + end # Replace this with your real tests. def test_relationship_to_storage_pool assert_equal 'corp.com', storage_volumes(:ovirtpriv_storage_lun_1).storage_pool.hardware_pool.name end + + + def test_valid_fails_with_bad_size + @storage_volume.size = -1 + + flunk "Storage volume size must be >= 0" if @storage_volume.valid? + end + + def test_valid_fails_with_bad_type + @storage_volume.type = 'foobar' + + flunk "Storage volume type must be valid" if @storage_volume.valid? + end + + def test_valid_fails_with_bad_state + @storage_volume.state = 'foobar' + flunk "Storage volume state must be valid" if @storage_volume.valid? + end + + def test_valid_fails_without_storage_pool + @storage_volume.storage_pool = nil + + flunk "Storage volume must be associated with a storage pool" if @storage_volume.valid? + end + + def test_valid_fails_without_lun + @iscsi_storage_volume.lun = '' + + flunk "iscsi storage volume lun must be valid" if @iscsi_storage_volume.valid? + end + + def test_valid_fails_without_lv_name + @lvm_storage_volume.lv_name = '' + + flunk "lvm storage volume lv_name must be valid" if @lvm_storage_volume.valid? + end + + def test_valid_fails_without_lv_owner_perms + @lvm_storage_volume.lv_owner_perms = '' + + flunk "lvm storage volume lv_owner_perms must be valid" if @lvm_storage_volume.valid? + end + + def test_valid_fails_without_lv_group_perms + @lvm_storage_volume.lv_group_perms = '' + + flunk "lvm storage volume lv_group_perms must be valid" if @lvm_storage_volume.valid? + end + + def test_valid_fails_without_lv_model_perms + @lvm_storage_volume.lv_mode_perms = '' + + flunk "lvm storage volume lv_model_perms must be valid" if @lvm_storage_volume.valid? + end + + def test_movable + assert_equal @storage_volume.movable?, true, "Storage volume without vms should be movable" + @storage_volume.vms << vms(:production_httpd_vm) + + assert_equal @storage_volume.movable?, false, "Storage volume w/ vms should not be movable" + end + end diff --git a/src/test/unit/task_test.rb b/src/test/unit/task_test.rb index 33a3bd8..ba780e7 100644 --- a/src/test/unit/task_test.rb +++ b/src/test/unit/task_test.rb @@ -22,6 +22,20 @@ require File.dirname(__FILE__) + '/../test_helper' class TaskTest < Test::Unit::TestCase fixtures :pools, :hosts, :vms, :permissions, :tasks + def setup + @task = Task.new( :type => 'HostTask', :state => 'finished' ) + end + + def test_valid_fails_with_bad_type + @task.type = 'foobar' + flunk 'Task must specify valid type' if @task.valid? + end + + def test_valid_fails_with_bad_state + @task.state = 'foobar' + flunk 'Task must specify valid state' if @task.valid? + end + def test_exercise_task_relationships assert_equal tasks(:shutdown_production_httpd_appliance_task).task_target.vm_resource_pool.name, 'corp.com production vmpool' assert_equal tasks(:shutdown_production_httpd_appliance_task).task_target.host.hostname, 'prod.corp.com' diff --git a/src/test/unit/usage_test.rb b/src/test/unit/usage_test.rb index 9a8ec9b..d6c989e 100644 --- a/src/test/unit/usage_test.rb +++ b/src/test/unit/usage_test.rb @@ -1,8 +1,47 @@ +# Copyright (C) 2008 Red Hat, Inc. +# +# 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 'test_helper' class UsageTest < ActiveSupport::TestCase - # Replace this with your real tests. - def test_truth - assert true - end + fixtures :usages + + def setup + @usage = Usage.new( + :label => 'TestUsage', + :usage => 'foobar' ) + end + + def test_valid_fails_without_label + @usage.label = '' + + flunk 'Usage must have label' if @usage.valid? + end + + def test_valid_fails_without_usage + @usage.usage = '' + + flunk 'Usage must have usage' if @usage.valid? + end + + def test_valid_fails_without_unique_usage + @usage.usage = 'management' + + flunk 'Usage must have unique usage' if @usage.valid? + end + end diff --git a/src/test/unit/vm_test.rb b/src/test/unit/vm_test.rb index a196130..cba3188 100644 --- a/src/test/unit/vm_test.rb +++ b/src/test/unit/vm_test.rb @@ -21,6 +21,7 @@ require File.dirname(__FILE__) + '/../test_helper' class VmTest < Test::Unit::TestCase fixtures :vms + fixtures :pools def setup @vm_name = "Test" @@ -29,6 +30,69 @@ class VmTest < Test::Unit::TestCase "#{Vm::IMAGE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{@vm_name}" @cobbler_profile_provisioning = "#{Vm::PROFILE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{@vm_name}" + + @vm = Vm.new( + :uuid => '00000000-1111-2222-3333-444444444444', + :description => 'foobar', + :num_vcpus_allocated => 1, + :boot_device => 'hd', + :memory_allocated_in_mb => 1, + :memory_allocated => 1024, + :vnic_mac_addr => '11:22:33:44:55:66') + + @vm.vm_resource_pool = pools(:corp_com_production_vmpool) + end + + def test_valid_fails_with_bad_uuid + @vm.uuid = 'foobar' + flunk "Vm must specify valid uuid" if @vm.valid? + end + + def test_valid_fails_without_description + @vm.description = '' + flunk 'Vm must specify description' if @vm.valid? + end + + def test_valid_fails_without_num_vcpus_allocated + @vm.num_vcpus_allocated = nil + flunk 'Vm must specify num_vcpus_allocated' if @vm.valid? + end + + def test_valid_fails_without_boot_device + @vm.boot_device = '' + flunk 'Vm must specify boot_device' if @vm.valid? + end + + + def test_valid_fails_without_memory_allocated + @vm.memory_allocated = '' + flunk 'Vm must specify memory_allocated' if @vm.valid? + end + + + def test_valid_fails_without_memory_allocated_in_mb + @vm.memory_allocated_in_mb = '' + flunk 'Vm must specify memory_allocated_in_mb' if @vm.valid? + end + + def test_valid_fails_without_vnic_mac_addr + @vm.vnic_mac_addr = '' + flunk 'Vm must specify vnic_mac_addr' if @vm.valid? + end + + def test_valid_fails_without_vm_resources_pool_id + @vm.vm_resource_pool_id = '' + flunk 'Vm must specify vm_resources_pool_id' if @vm.valid? + end + + def test_valid_fails_with_bad_needs_restart + @vm.needs_restart = 5 + flunk 'Vm must specify valid needs_restart' if @vm.valid? + end + + def test_valid_fails_with_bad_state + @vm.state = 'foobar' + flunk 'Vm must specify valid state' if @vm.valid? end # Ensures that, if the VM does not contain the Cobbler prefix, that it -- 1.6.0.6 From dpierce at redhat.com Wed Jan 14 21:37:41 2009 From: dpierce at redhat.com (Darryl L. Pierce) Date: Wed, 14 Jan 2009 16:37:41 -0500 Subject: [Ovirt-devel] [PATCH node] Changed how max swap size is calculated. Message-ID: <1231969061-15114-1-git-send-email-dpierce@redhat.com> Swap partition size is based on a calculated value added to a base value defined in . The calculated value is an overcommit value multiplied by the amount of memory on the device. If no overcommit value is specified then the default is 0.5. Signed-off-by: Darryl L. Pierce --- scripts/ovirt-config-storage | 30 +++++++++++++++++++++++++----- scripts/ovirt-early | 13 ++++++++++++- 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage index b3d87ae..7448452 100755 --- a/scripts/ovirt-config-storage +++ b/scripts/ovirt-config-storage @@ -80,7 +80,7 @@ get_dev_name() done # if we didn't find any devices using HAL, so check for virtual devices - if [ -z $devices ]; then devices=$(ls -l /dev/[shv]d?); fi + if [ -z "$devices" ]; then devices=$(ls -l /dev/[shv]d?); fi # If there's only one device, use it. case $devices in @@ -285,14 +285,34 @@ do_confirm() done } +if [ -z "$OVIRT_OVERCOMMIT" ]; then OVIRT_OVERCOMMIT="1.5"; fi MEM_SIZE=$(cat /proc/meminfo | awk '/MemTotal:/ { print $2 }') case $MEM_SIZE in ''|*[^0-9]*) die failed to get system memory size;; esac +MEM_SIZE=$(echo "scale=0; $MEM_SIZE / 1024;" | bc -l) +# we multiply the overcommit coefficient by 10 then divide the +# product by 10 to avoid decimals in the result +OVERCOMMIT_SWAP_SIZE=$(echo "scale=0; (${MEM_SIZE} * (${OVIRT_OVERCOMMIT} * 10))/10;" | bc -l) + +# add to the swap the amounts from http://kbase.redhat.com/faq/docs/DOC-15252 +mgb=$(echo "scale=0; $MEM_SIZE/1024;" | bc -l) +if [ $mgb -le 4 ]; then + BASE_SWAP_SIZE=2 +elif [ $mgb -le 16 ]; then + BASE_SWAP_SIZE=4 +elif [ $mgb -le 64 ]; then + BASE_SWAP_SIZE=8 +else + BASE_SWAP_SIZE=16 +fi -MEM_SIZE=$(echo "scale=0; m=($MEM_SIZE / 1024 * 2); if (m < 2048) { m } else { 2048 }" | bc -l) -SWAP_SIZE=${OVIRT_VOL_SWAP_SIZE:-$MEM_SIZE} +MAX_SWAP_SIZE=$(echo "scale=0; (${BASE_SWAP_SIZE} + ${OVERCOMMIT_SWAP_SIZE}) * 1024;" | bc -l) +SWAP_SIZE=${OVIRT_VOL_SWAP_SIZE:-$MAX_SWAP_SIZE} +if [ $SWAP_SIZE -gt $MAX_SWAP_SIZE ]; then + SWAP_SIZE=$MAX_SWAP_SIZE +fi BOOT_SIZE=${OVIRT_VOL_BOOT_SIZE:-$default_boot_size} ROOT_SIZE=${OVIRT_VOL_ROOT_SIZE:-$default_root_size} CONFIG_SIZE=${OVIRT_VOL_CONFIG_SIZE:-$default_config_size} diff --git a/scripts/ovirt-early b/scripts/ovirt-early index 153c0c7..95cf609 100755 --- a/scripts/ovirt-early +++ b/scripts/ovirt-early @@ -117,6 +117,7 @@ start() { # BOOTIF=link|eth*| (appended by pxelinux) # ovirt_init=usb|scsi[:serial#] # ovirt_vol=BOOT_MB:SWAP_MB:ROOT_MB:CONFIG_MB:LOGGING_MB + # ovirt_overcommit # ovirt_local_boot # ovirt_standalone # pxelinux format: ip=::: @@ -156,6 +157,10 @@ start() { # install/update oVirt Node image on the local installation target disk local_boot=0 + # ovirt_overcommit + # set the swap size coefficient + overcommit=0.5 + # ovirt_standalone # force oVirt Node standalone mode standalone=0 @@ -245,6 +250,12 @@ start() { standalone=1 bootparams="$bootparams $i" ;; + + ovirt_overcommit*) + i=${i#ovirt_overcommit=} + eval $(printf $i|awk -F: '{print "overcommit="$1;}') + ;; + ip=*) i=${i#ip=} eval $(printf $i|awk -F: '{print "ip_address="$1; print "ip_gateway="$3; print "ip_netmask="$4}') @@ -278,7 +289,7 @@ start() { ip_gateway=$gateway fi # save boot parameters as defaults for ovirt-config-* - params="bootif init vol_boot_size vol_swap_size vol_root_size vol_config_size vol_logging_size local_boot standalone ip_address ip_netmask ip_gateway ipv6 syslog_server syslog_port bootparams hostname" + params="bootif init vol_boot_size vol_swap_size vol_root_size vol_config_size vol_logging_size local_boot standalone overcommit ip_address ip_netmask ip_gateway ipv6 syslog_server syslog_port bootparams hostname" mount_config if [ -e $OVIRT_DEFAULTS ]; then echo "update ovirt defaults" -- 1.6.0.6 From apevec at gmail.com Wed Jan 14 21:37:57 2009 From: apevec at gmail.com (Alan Pevec) Date: Wed, 14 Jan 2009 22:37:57 +0100 Subject: [Ovirt-devel] [PATCH node] Changed how max swap size is calculated. In-Reply-To: <1231960084-1917-1-git-send-email-dpierce@redhat.com> References: <1231960084-1917-1-git-send-email-dpierce@redhat.com> Message-ID: <2be7262f0901141337j1cd65407t65880033975ee2f8@mail.gmail.com> On Wed, Jan 14, 2009 at 8:08 PM, Darryl L. Pierce wrote: > > If overt_overcommit is not present, then the default value used is 1.5. > overt -> ovirt - or should we rename the project to make spell-checkers happy? :) default should be 0.5 to get Dor's 150% - where 100% is real RAM and the rest is in swap # if we didn't find any devices using HAL, so check for virtual devices > - if [ -z $devices ]; then devices=$(ls -l /dev/[shv]d?); fi > + if [ -z "$devices" ]; then devices=$(ls -l /dev/[shv]d?); fi > please push that as a separate commit, otherwise we'll be confused few months from now when running git blame > +if [ -z "$OVIRT_OVERCOMMIT" ]; then OVIRT_OVERCOMMIT="1.5"; fi > 0.5 > SWAP_SIZE=${OVIRT_VOL_SWAP_SIZE:-$MEM_SIZE} > if OVIRT_VOL_SWAP_SIZE is defined, it should be used w/o changes, we don't try to correct admin input, so above line should come last > +if [ $SWAP_SIZE -gt $MAX_SWAP_SIZE ]; then > + SWAP_SIZE=$MAX_SWAP_SIZE > +fi > + > +# add to the swap the amounts from > http://kbase.redhat.com/faq/docs/DOC-15252 > +# convert mem size to GB > +mgb=$(echo "scale=0; $MEM_SIZE/1024;" | bc -l) > +if [ $mgb -le 4 ]; then > + SWAP_SIZE=2 > +elif [ $mgb -le 16 ]; then > + SWAP_SIZE=4 > +elif [ $mgb -le 64 ]; then > + SWAP_SIZE=8 > +else > + SWAP_SIZE=16 > +fi > + > +SWAP_SIZE=$(echo "scale=0; ${SWAP_SIZE} * 1024;" | bc -l) > > + # ovirt_overcommit > + # set the swap size coefficient > + overcommit=1.5 > 0.5 -------------- next part -------------- An HTML attachment was scrubbed... URL: From lutter at redhat.com Wed Jan 14 21:45:33 2009 From: lutter at redhat.com (David Lutterkort) Date: Wed, 14 Jan 2009 13:45:33 -0800 Subject: [Ovirt-devel] [PATCH node] Bootup mounts the local log partition if it exists In-Reply-To: <496E42FB.3090503@redhat.com> References: <1231863234-1845-1-git-send-email-bkearney@redhat.com> <496E01F4.90303@redhat.com> <496E0388.1000008@redhat.com> <496E06BF.6080505@redhat.com> <496E2F18.6020105@redhat.com> <496E42FB.3090503@redhat.com> Message-ID: <1231969533.16029.52.camel@localhost.localdomain> On Wed, 2009-01-14 at 14:54 -0500, Perry Myers wrote: > We can do the following... in the Node kickstart %post we can edit the > rc.sysinit script to (very early in script execution where it normally > does the remount of all drives in /etc/fstab) mount specific Node > partitions like /var/log and /data. Why isn't it enough to put appropriate entries into /etc/fstab when the partitions are created and let rc.sysinit do its usual thing ? Of course, that requires that /etc/fstab is persisted across reboots, though that seems to be the only sensible thing to do anyway, i.e. we need an entry for /etc/fstab in /etc/statetab.d. From a look at rc.sysinit, this all seems to happen early enough, but it would require some testing to make sure ;) David From dpierce at redhat.com Wed Jan 14 21:56:16 2009 From: dpierce at redhat.com (Darryl L. Pierce) Date: Wed, 14 Jan 2009 16:56:16 -0500 Subject: [Ovirt-devel] [PATCH node] Changed how max swap size is calculated. Message-ID: <1231970176-16594-1-git-send-email-dpierce@redhat.com> NOTE: this version removes the upper limit on swap size and only uses the calculated value if no size was specified. Swap partition size is based on a calculated value added to a base value defined in . The calculated value is an overcommit value multiplied by the amount of memory on the device. If no overcommit value is specified then the default is 0.5. Signed-off-by: Darryl L. Pierce --- scripts/ovirt-config-storage | 24 ++++++++++++++++++++---- scripts/ovirt-early | 13 ++++++++++++- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage index c7538a5..8e7cc14 100755 --- a/scripts/ovirt-config-storage +++ b/scripts/ovirt-config-storage @@ -289,10 +289,26 @@ MEM_SIZE=$(cat /proc/meminfo | awk '/MemTotal:/ { print $2 }') case $MEM_SIZE in ''|*[^0-9]*) die failed to get system memory size;; esac +MEM_SIZE=$(echo "scale=0; $MEM_SIZE / 1024;" | bc -l) +# we multiply the overcommit coefficient by 10 then divide the +# product by 10 to avoid decimals in the result +OVERCOMMIT_SWAP_SIZE=$(echo "scale=0; (${MEM_SIZE} * (${OVIRT_OVERCOMMIT} * 10))/10;" | bc -l) + +# add to the swap the amounts from http://kbase.redhat.com/faq/docs/DOC-15252 +mgb=$(echo "scale=0; $MEM_SIZE/1024;" | bc -l) +if [ $mgb -le 4 ]; then + BASE_SWAP_SIZE=2 +elif [ $mgb -le 16 ]; then + BASE_SWAP_SIZE=4 +elif [ $mgb -le 64 ]; then + BASE_SWAP_SIZE=8 +else + BASE_SWAP_SIZE=16 +fi -MEM_SIZE=$(echo "scale=0; m=($MEM_SIZE / 1024 * 2); if (m < 2048) { m } else { 2048 }" | bc -l) -SWAP_SIZE=${OVIRT_VOL_SWAP_SIZE:-$MEM_SIZE} +CALC_SWAP_SIZE=$(echo "scale=0; (${BASE_SWAP_SIZE} + ${OVERCOMMIT_SWAP_SIZE}) * 1024;" | bc -l) +SWAP_SIZE=${OVIRT_VOL_SWAP_SIZE:-$CALC_SWAP_SIZE} BOOT_SIZE=${OVIRT_VOL_BOOT_SIZE:-$default_boot_size} ROOT_SIZE=${OVIRT_VOL_ROOT_SIZE:-$default_root_size} CONFIG_SIZE=${OVIRT_VOL_CONFIG_SIZE:-$default_config_size} diff --git a/scripts/ovirt-early b/scripts/ovirt-early index 153c0c7..95cf609 100755 --- a/scripts/ovirt-early +++ b/scripts/ovirt-early @@ -117,6 +117,7 @@ start() { # BOOTIF=link|eth*| (appended by pxelinux) # ovirt_init=usb|scsi[:serial#] # ovirt_vol=BOOT_MB:SWAP_MB:ROOT_MB:CONFIG_MB:LOGGING_MB + # ovirt_overcommit # ovirt_local_boot # ovirt_standalone # pxelinux format: ip=::: @@ -156,6 +157,10 @@ start() { # install/update oVirt Node image on the local installation target disk local_boot=0 + # ovirt_overcommit + # set the swap size coefficient + overcommit=0.5 + # ovirt_standalone # force oVirt Node standalone mode standalone=0 @@ -245,6 +250,12 @@ start() { standalone=1 bootparams="$bootparams $i" ;; + + ovirt_overcommit*) + i=${i#ovirt_overcommit=} + eval $(printf $i|awk -F: '{print "overcommit="$1;}') + ;; + ip=*) i=${i#ip=} eval $(printf $i|awk -F: '{print "ip_address="$1; print "ip_gateway="$3; print "ip_netmask="$4}') @@ -278,7 +289,7 @@ start() { ip_gateway=$gateway fi # save boot parameters as defaults for ovirt-config-* - params="bootif init vol_boot_size vol_swap_size vol_root_size vol_config_size vol_logging_size local_boot standalone ip_address ip_netmask ip_gateway ipv6 syslog_server syslog_port bootparams hostname" + params="bootif init vol_boot_size vol_swap_size vol_root_size vol_config_size vol_logging_size local_boot standalone overcommit ip_address ip_netmask ip_gateway ipv6 syslog_server syslog_port bootparams hostname" mount_config if [ -e $OVIRT_DEFAULTS ]; then echo "update ovirt defaults" -- 1.6.0.6 From dpierce at redhat.com Wed Jan 14 22:01:28 2009 From: dpierce at redhat.com (Darryl L. Pierce) Date: Wed, 14 Jan 2009 17:01:28 -0500 Subject: [Ovirt-devel] [PATCH node] Changed how max swap size is calculated. In-Reply-To: <2be7262f0901141337j1cd65407t65880033975ee2f8@mail.gmail.com> References: <1231960084-1917-1-git-send-email-dpierce@redhat.com> <2be7262f0901141337j1cd65407t65880033975ee2f8@mail.gmail.com> Message-ID: <20090114220128.GC9741@mcpierce-laptop.rdu.redhat.com> On Wed, Jan 14, 2009 at 10:37:57PM +0100, Alan Pevec wrote: > > If overt_overcommit is not present, then the default value used is 1.5. > > overt -> ovirt - or should we rename the project to make spell-checkers > happy? :) D'oh! :) > # if we didn't find any devices using HAL, so check for virtual devices > > - if [ -z $devices ]; then devices=$(ls -l /dev/[shv]d?); fi > > + if [ -z "$devices" ]; then devices=$(ls -l /dev/[shv]d?); fi > > > > please push that as a separate commit, otherwise we'll be confused few > months from now when running git blame Done. > > +if [ -z "$OVIRT_OVERCOMMIT" ]; then OVIRT_OVERCOMMIT="1.5"; fi > > > 0.5 I removed this. It was some vestigial testing code. > > SWAP_SIZE=${OVIRT_VOL_SWAP_SIZE:-$MEM_SIZE} > > > > if OVIRT_VOL_SWAP_SIZE is defined, it should be used w/o changes, we don't > try to correct admin input, > so above line should come last Done, and the check for a maximum swap size have been removed. -- Darryl L. Pierce, Sr. Software Engineer @ Red Hat, Inc. Virtual Machine Management - http://www.ovirt.org/ "What do you care what other people think, Mr. Feynman?" -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 197 bytes Desc: not available URL: From pmyers at redhat.com Wed Jan 14 22:02:17 2009 From: pmyers at redhat.com (Perry Myers) Date: Wed, 14 Jan 2009 17:02:17 -0500 Subject: [Ovirt-devel] [PATCH node] Added a wrapper script around the boot menu item to warn the users about the reboot In-Reply-To: <496E4383.2000503@redhat.com> References: <1231449766-28155-1-git-send-email-bkearney@redhat.com> <496E00CE.4020502@redhat.com> <496E02A3.6020304@redhat.com> <496E0594.5090906@redhat.com> <496E4383.2000503@redhat.com> Message-ID: <496E60E9.6020602@redhat.com> Bryan Kearney wrote: > Perry Myers wrote: >> Bryan Kearney wrote: >>> Perry Myers wrote: >>>> Question on this patch, why did you create a separate script to wrap >>>> the o-c-boot script instead of just putting a question at the top of >>>> the main section of the o-c-boot script itself? You could just have >>>> o-c-boot be executed directly by the firstboot menu and the first >>>> thing it does is say "Are you sure" and if the user says No then it >>>> just exits back to the main menu. >>> >>> This script is called several times, and it seemed ugly to put in an >>> "Interactive" parameter to look for. Since it is called interactive >>> in only one place, I figured it was cleaner to layer as opposed to >>> add the if checks and flag. >> >> Ah, got it. I was only thinking about the interactive case. In the >> non-interactive case the o-c-boot script is called directly w/o the >> wrapper. Ok, given that this seems ok to me. >> >>>> >>>> Also, do we have sanity checks in place for o-c-boot that check to >>>> make sure that other things have been run like o-c-networking and >>>> o-c-storage? If we don't have this, add that to the top of main in >>>> o-c-boot along with the user question. >>> >>> We do some basic checking, but nothing rock-solid. Do we check for an >>> initial state, or just provide text saying "You need to have done >>> X,Y,Z for this to work" >> >> The latter won't work because o-c-storage doesn't guarantee that an >> ovirt Node partition was created, correct? o-c-storage can be run >> just to create partitions for config/logging but not hard disk boot. >> So the user could run o-c-storage, elect not to create a partition to >> store the Node itself and then try to run o-c-boot. In this case >> o-c-boot would fail. >> >> So I think we want to do checks that ensure that the minimum >> partitions are present with minimum recommended size > I looked again, and o-c-boot does check for a basic partition structure, > so I think we are good with that. Just to confirm, the additional check > would be to see if there is at least network script like > /etc/sysconfig/network-scripts/ifcfg-ovirtbr* > > Is that the correct logic? Hmm. Perhaps not. I suppose there is a use case for someone using standalone mode w/o a network at all. In this case you would not be able to configure a network interface or might not even have one present. But you would still need a virtual network to put your vm's on so they could talk to each other. So I think we just need the check for the partitions (which you say is already there). We should be all set then. Perry From pmyers at redhat.com Wed Jan 14 22:24:04 2009 From: pmyers at redhat.com (Perry Myers) Date: Wed, 14 Jan 2009 17:24:04 -0500 Subject: [Ovirt-devel] [PATCH node] Bootup mounts the local log partition if it exists In-Reply-To: <1231969533.16029.52.camel@localhost.localdomain> References: <1231863234-1845-1-git-send-email-bkearney@redhat.com> <496E01F4.90303@redhat.com> <496E0388.1000008@redhat.com> <496E06BF.6080505@redhat.com> <496E2F18.6020105@redhat.com> <496E42FB.3090503@redhat.com> <1231969533.16029.52.camel@localhost.localdomain> Message-ID: <496E6604.1080709@redhat.com> David Lutterkort wrote: > On Wed, 2009-01-14 at 14:54 -0500, Perry Myers wrote: >> We can do the following... in the Node kickstart %post we can edit the >> rc.sysinit script to (very early in script execution where it normally >> does the remount of all drives in /etc/fstab) mount specific Node >> partitions like /var/log and /data. > > Why isn't it enough to put appropriate entries into /etc/fstab when the > partitions are created and let rc.sysinit do its usual thing ? > > Of course, that requires that /etc/fstab is persisted across reboots, > though that seems to be the only sensible thing to do anyway, i.e. we > need an entry for /etc/fstab in /etc/statetab.d. From a look at > rc.sysinit, this all seems to happen early enough, but it would require > some testing to make sure ;) We can persist /etc/fstab but the logic to mount the persistent config files is done in ovirt-early init script since it needs to bind mount the right files. And this happens too late in init to catch all of the early boot log messages. That make sense? Perry From pmyers at redhat.com Wed Jan 14 22:36:03 2009 From: pmyers at redhat.com (Perry Myers) Date: Wed, 14 Jan 2009 17:36:03 -0500 Subject: [Ovirt-devel] [PATCH node-image] enable VLAN support in the Node image In-Reply-To: <1231929236-11349-1-git-send-email-apevec@redhat.com> References: <1231929236-11349-1-git-send-email-apevec@redhat.com> Message-ID: <496E68D3.6080705@redhat.com> ACK if this hasn't been pushed already :) Perry Alan Pevec wrote: > --- > common-blacklist.ks | 2 +- > common-pkgs.ks | 1 + > 2 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/common-blacklist.ks b/common-blacklist.ks > index 5b41982..3b20122 100644 > --- a/common-blacklist.ks > +++ b/common-blacklist.ks > @@ -49,7 +49,7 @@ fs_mods="fs/nls fs/9p fs/affs fs/autofs fs/autofs4 fs/befs fs/bfs fs/cifs \ > fs/jffs2 fs/jfs fs/minix fs/ncpfs fs/ocfs2 fs/qnx4 fs/reiserfs \ > fs/romfs fs/sysv fs/udf fs/ufs fs/xfs" > > -net_mods="net/8021q net/9p net/appletalk net/atm net/ax25 \ > +net_mods="net/9p net/appletalk net/atm net/ax25 \ > net/bluetooth net/dccp net/decnet net/ieee80211 net/ipx net/irda \ > net/mac80211 net/netrom net/rfkill net/rose net/sched net/tipc \ > net/wanrouter net/wireless" > diff --git a/common-pkgs.ks b/common-pkgs.ks > index dd60930..a46ad2b 100644 > --- a/common-pkgs.ks > +++ b/common-pkgs.ks > @@ -37,6 +37,7 @@ python-libs > gdbm > db4 > m2crypto > +vconfig > -audit-libs-python > -hdparm > -ustr -- |=- Red Hat, Engineering, Emerging Technologies, Boston -=| |=- Email: pmyers at redhat.com -=| |=- Office: +1 412 474 3552 Mobile: +1 703 362 9622 -=| |=- GnuPG: E65E4F3D 88F9 F1C9 C2F3 1303 01FE 817C C5D2 8B91 E65E 4F3D -=| From apevec at gmail.com Wed Jan 14 23:14:17 2009 From: apevec at gmail.com (Alan Pevec) Date: Thu, 15 Jan 2009 00:14:17 +0100 Subject: [Ovirt-devel] [PATCH node] Bootup mounts the local log partition if it exists In-Reply-To: <496E4939.1000000@redhat.com> References: <1231863234-1845-1-git-send-email-bkearney@redhat.com> <496E01F4.90303@redhat.com> <496E0388.1000008@redhat.com> <496E06BF.6080505@redhat.com> <496E2F18.6020105@redhat.com> <496E42FB.3090503@redhat.com> <496E4939.1000000@redhat.com> Message-ID: <2be7262f0901141514h31acd221gefbdad93c5a4fc0e@mail.gmail.com> On Wed, Jan 14, 2009 at 9:21 PM, Bryan Kearney wrote: > Make sense? Alan mentioned that rc.sysinit has some hooks that we might be > able to leverage to get around modifying the actual script. > > So.. Alan.. were you thinking a custom module in /etc/sysconfig/modules > which basically calls mount_config and mount_logs from the ovirt functions > directory? > yeah, that's one place I was considering, but after talking to dlutter I'll revamp the config presistence to use existing STATE_MOUNT mechanism in rc.sysinit and remove mount_* from ovirt-early. This will mount /config early enough so that persisted fstab with an entry for /var/log takes effect. -------------- next part -------------- An HTML attachment was scrubbed... URL: From imain at redhat.com Thu Jan 15 01:27:04 2009 From: imain at redhat.com (Ian Main) Date: Wed, 14 Jan 2009 17:27:04 -0800 Subject: [Ovirt-devel] Ovirt Node Authorization and Security Message-ID: <20090114172704.4d233985@tp.mains.net> So while setting up qpid to work with gssapi/kerberos, I've been doing a bit of thinking about how our security model is going to work. I think some of you may have this figured out already but I thought I'd post and just make sure we're all on the same page. As it stands now, ovirt nodes are set up to download the keytab from the server (in ovirt-awake script). This is then used by libvirt to authenticate the server. Once switched to qpidd it'll be much the same except we'll be grabbing a keytab for the qpidd service on the ovirt appliance. This is fine for a trusted network (where really, we don't even need encryption/host verification), but on an untrusted network it's quite possible for a malicious host to go through the same initialization process and then become one of the nodes and then have access to any VMs that are started/migrated to it. For the unprotected network case then, we want to control the distribution of the keytabs. We could have two levels of security based on how anal one wants to be. This would give us security settings that might look something like: Highest: For each new machine brought into ovirt pool one would be required to have a keytab generated in advance and either copied into persistent storage on the machine or put on a USB stick etc. Moderate: Each time a node registers with the wui, it is placed in an authorization queue and is required to be authorized by an administrator before a keytab is generated for the node and made available for download. Any pertinent information about the node will be displayed in the list (MAC, maybe hardware ID etc.). Open: As it is now, where a keytab is just downloaded automatically. I have a bit of a reservation around 'Moderate' as there may be multiple admins and someone might just assume a machine is fine and authorize it just because it's there. I guess that'd be up to the policy and SOP of the organization involved. I'm not sure what our requirements are for the release but as it stands currently we only implement the 'open' version. This sound reasonable to everyone? Ian From pmyers at redhat.com Thu Jan 15 01:32:43 2009 From: pmyers at redhat.com (Perry Myers) Date: Wed, 14 Jan 2009 20:32:43 -0500 Subject: [Ovirt-devel] Ovirt Node Authorization and Security In-Reply-To: <20090114172704.4d233985@tp.mains.net> References: <20090114172704.4d233985@tp.mains.net> Message-ID: <496E923B.1050204@redhat.com> Ian Main wrote: > So while setting up qpid to work with gssapi/kerberos, I've been doing > a bit of thinking about how our security model is going to work. I > think some of you may have this figured out already but I thought I'd > post and just make sure we're all on the same page. > > As it stands now, ovirt nodes are set up to download the keytab from the > server (in ovirt-awake script). This is then used by libvirt to > authenticate the server. Once switched to qpidd it'll be much the same > except we'll be grabbing a keytab for the qpidd service on the ovirt > appliance. > > This is fine for a trusted network (where really, we don't even need > encryption/host verification), but on an untrusted network it's quite > possible for a malicious host to go through the same initialization > process and then become one of the nodes and then have access to any VMs > that are started/migrated to it. > > For the unprotected network case then, we want to control the > distribution of the keytabs. We could have two levels of security > based on how anal one wants to be. This would give us security > settings that might look something like: > > Highest: For each new machine brought into ovirt pool one would be > required to have a keytab generated in advance and either copied into > persistent storage on the machine or put on a USB stick etc. > > Moderate: Each time a node registers with the wui, it is placed in an > authorization queue and is required to be authorized by an > administrator before a keytab is generated for the node and made > available for download. Any pertinent information about the node will be > displayed in the list (MAC, maybe hardware ID etc.). > > Open: As it is now, where a keytab is just downloaded automatically. > > I have a bit of a reservation around 'Moderate' as there may be > multiple admins and someone might just assume a machine is fine > and authorize it just because it's there. I guess that'd be up to > the policy and SOP of the organization involved. > > I'm not sure what our requirements are for the release but as it stands > currently we only implement the 'open' version. > > This sound reasonable to everyone? Sounds reasonable to me. :) Perry From clalance at redhat.com Thu Jan 15 07:53:14 2009 From: clalance at redhat.com (Chris Lalancette) Date: Thu, 15 Jan 2009 08:53:14 +0100 Subject: [Ovirt-devel] Ovirt Node Authorization and Security In-Reply-To: <20090114172704.4d233985@tp.mains.net> References: <20090114172704.4d233985@tp.mains.net> Message-ID: <496EEB6A.7030701@redhat.com> Ian Main wrote: > So while setting up qpid to work with gssapi/kerberos, I've been doing > a bit of thinking about how our security model is going to work. I > think some of you may have this figured out already but I thought I'd > post and just make sure we're all on the same page. > > As it stands now, ovirt nodes are set up to download the keytab from the > server (in ovirt-awake script). This is then used by libvirt to > authenticate the server. Once switched to qpidd it'll be much the same > except we'll be grabbing a keytab for the qpidd service on the ovirt > appliance. > > This is fine for a trusted network (where really, we don't even need > encryption/host verification), but on an untrusted network it's quite > possible for a malicious host to go through the same initialization > process and then become one of the nodes and then have access to any VMs > that are started/migrated to it. > > For the unprotected network case then, we want to control the > distribution of the keytabs. We could have two levels of security > based on how anal one wants to be. This would give us security > settings that might look something like: > > Highest: For each new machine brought into ovirt pool one would be > required to have a keytab generated in advance and either copied into > persistent storage on the machine or put on a USB stick etc. > > Moderate: Each time a node registers with the wui, it is placed in an > authorization queue and is required to be authorized by an > administrator before a keytab is generated for the node and made > available for download. Any pertinent information about the node will be > displayed in the list (MAC, maybe hardware ID etc.). > > Open: As it is now, where a keytab is just downloaded automatically. > > I have a bit of a reservation around 'Moderate' as there may be > multiple admins and someone might just assume a machine is fine > and authorize it just because it's there. I guess that'd be up to > the policy and SOP of the organization involved. > > I'm not sure what our requirements are for the release but as it stands > currently we only implement the 'open' version. > > This sound reasonable to everyone? Yes, it sounds about right. I'm also not sure about the "Moderate" case; besides the multiple admin problem, there is also the technical problem that we currently don't have a "waiting pattern" mode for the ovirt node, which we would need to implement to get it to work. But the idea is sane, and "Open" and "Highest" sound about how I thought about it. -- Chris Lalancette From iheim at redhat.com Thu Jan 15 08:21:11 2009 From: iheim at redhat.com (Itamar Heim) Date: Thu, 15 Jan 2009 03:21:11 -0500 (EST) Subject: [Ovirt-devel] [PATCH node] Changed how max swap size is calculated. In-Reply-To: <1231970176-16594-1-git-send-email-dpierce@redhat.com> References: <1231970176-16594-1-git-send-email-dpierce@redhat.com> Message-ID: <008f01c976ea$a18f2eb0$e4ad8c10$@com> > From: ovirt-devel-bounces at redhat.com [mailto:ovirt-devel- > bounces at redhat.com] On Behalf Of Darryl L. Pierce > > NOTE: this version removes the upper limit on swap size and only uses > the calculated value if no size was specified. [IH] I assume it can't be larger than (-)? do we fail in such a case, or do we auto adjust the swap size? From iheim at redhat.com Thu Jan 15 08:21:30 2009 From: iheim at redhat.com (Itamar Heim) Date: Thu, 15 Jan 2009 03:21:30 -0500 (EST) Subject: [Ovirt-devel] Ovirt Node Authorization and Security In-Reply-To: <20090114172704.4d233985@tp.mains.net> References: <20090114172704.4d233985@tp.mains.net> Message-ID: <009101c976ea$ad2ea570$078bf050$@com> > From: ovirt-devel-bounces at redhat.com [mailto:ovirt-devel- > bounces at redhat.com] On Behalf Of Ian Main ... > > Highest: For each new machine brought into ovirt pool one would be > required to have a keytab generated in advance and either copied into > persistent storage on the machine or put on a USB stick etc. [IH] why not use TPM? Maybe not to store the keytab, but to store a private key or a certificate which will allow authentication and encryption only to this machine? > > Moderate: Each time a node registers with the wui, it is placed in an > authorization queue and is required to be authorized by an > administrator before a keytab is generated for the node and made > available for download. Any pertinent information about the node will be > displayed in the list (MAC, maybe hardware ID etc.). [IH] if you don't persist the keytab (or at least persist some private key in TPM to encrypt to), then what prevents badnode1 from spoofing goodnode2 and get its keytab from the admin server? > > Open: As it is now, where a keytab is just downloaded automatically. > > I have a bit of a reservation around 'Moderate' as there may be > multiple admins and someone might just assume a machine is fine > and authorize it just because it's there. I guess that'd be up to > the policy and SOP of the organization involved. > > I'm not sure what our requirements are for the release but as it stands > currently we only implement the 'open' version. > > This sound reasonable to everyone? > > Ian > > > _______________________________________________ > Ovirt-devel mailing list > Ovirt-devel at redhat.com > https://www.redhat.com/mailman/listinfo/ovirt-devel From apevec at gmail.com Thu Jan 15 09:50:35 2009 From: apevec at gmail.com (Alan Pevec) Date: Thu, 15 Jan 2009 10:50:35 +0100 Subject: [Ovirt-devel] [PATCH node] Changed how max swap size is calculated. In-Reply-To: <008f01c976ea$a18f2eb0$e4ad8c10$@com> References: <1231970176-16594-1-git-send-email-dpierce@redhat.com> <008f01c976ea$a18f2eb0$e4ad8c10$@com> Message-ID: <2be7262f0901150150g2804c7fctff590102791599c0@mail.gmail.com> On Thu, Jan 15, 2009 at 9:21 AM, Itamar Heim wrote: > > From: ovirt-devel-bounces at redhat.com [mailto:ovirt-devel- > > bounces at redhat.com] On Behalf Of Darryl L. Pierce > > > > NOTE: this version removes the upper limit on swap size and only uses > > the calculated value if no size was specified. > [IH] I assume it can't be larger than (- other partitions>)? > do we fail in such a case, or do we auto adjust the swap size? > It would fail somewhere later: Swap LV is created first, then Root, Config and Logging and finally the rest of PV is allocated to Data LV. Sanity checks and error recovery are not implemented, there's FIXME comment in check_partition_sizes(): # FIXME: use this function before performing any partitioning, auto or > not > : > # Perform some sanity checks. E.g., > # What if DATA_SIZE ends up zero or negative? DATA_SIZE is not calculated, so Data LV creation with 100%FREE would fail # What if any of those partition sizes is smaller than > # the minimum size for an ext3 partition? Diagnose it here > # or just let the mke2fs failure suffice. > let mke2fs fail, but error conditions must be clearly reported. Currently perform_partitioning() has set -e and stops silently on any failure. To summarize, error recovery or sanity checks are not worth the effort IMO, but we need to improve error and progress report (currently all output goes to both logfile and console). -------------- next part -------------- An HTML attachment was scrubbed... URL: From my.nikkea at gmail.com Thu Jan 15 10:06:58 2009 From: my.nikkea at gmail.com (nikkea) Date: Thu, 15 Jan 2009 18:06:58 +0800 Subject: [Ovirt-devel] Questions about search feature and adding users Message-ID: <496F0AC2.200@gmail.com> Hey guys, Search feature seems not well. For simple example,I even can not use it to search a hardware pool. Right? And,User Access feature, I can create users of one named "Administrator(admin)" and a null user. Then,I cannot create any more. The user name is fixed up. How can I create more users? From bkearney at redhat.com Thu Jan 15 13:50:16 2009 From: bkearney at redhat.com (Bryan Kearney) Date: Thu, 15 Jan 2009 08:50:16 -0500 Subject: [Ovirt-devel] [PATCH node] Added a wrapper script around the boot menu item to warn the users about the reboot In-Reply-To: <496E60E9.6020602@redhat.com> References: <1231449766-28155-1-git-send-email-bkearney@redhat.com> <496E00CE.4020502@redhat.com> <496E02A3.6020304@redhat.com> <496E0594.5090906@redhat.com> <496E4383.2000503@redhat.com> <496E60E9.6020602@redhat.com> Message-ID: <496F3F18.5080509@redhat.com> Perry Myers wrote: > > Hmm. Perhaps not. I suppose there is a use case for someone using > standalone mode w/o a network at all. In this case you would not be > able to configure a network interface or might not even have one > present. But you would still need a virtual network to put your vm's on > so they could talk to each other. > > So I think we just need the check for the partitions (which you say is > already there). We should be all set then. > Let me re-work the wrapper patch and add better documentation. Prehaps that with the tests in place will work to ensure a larger number of correct installs. -- bk From apevec at redhat.com Thu Jan 15 14:16:55 2009 From: apevec at redhat.com (Alan Pevec) Date: Thu, 15 Jan 2009 15:16:55 +0100 Subject: [Ovirt-devel] [PATCH node-image] prepare for STATE_MOUNT in rc.sysinit Message-ID: <1232029015-11539-1-git-send-email-apevec@redhat.com> --- ovirt-node-image.ks | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/ovirt-node-image.ks b/ovirt-node-image.ks index cafbf34..84abeaa 100644 --- a/ovirt-node-image.ks +++ b/ovirt-node-image.ks @@ -14,6 +14,20 @@ rm -f /var/lib/rpm/__db* touch /.autorelabel +# prepare for STATE_MOUNT in rc.sysinit +augtool <> /etc/fstab %end %post -- 1.6.0.6 From apevec at redhat.com Thu Jan 15 14:20:25 2009 From: apevec at redhat.com (Alan Pevec) Date: Thu, 15 Jan 2009 15:20:25 +0100 Subject: [Ovirt-devel] [PATCH node] mounting of persistent config Message-ID: <1232029228-11726-1-git-send-email-apevec@redhat.com> This patch series reworks mounting of persistent config to use STATE_MOUNT in rc.sysinit so configs take effect early enough e.g. /etc/fstab From apevec at redhat.com Thu Jan 15 14:20:26 2009 From: apevec at redhat.com (Alan Pevec) Date: Thu, 15 Jan 2009 15:20:26 +0100 Subject: [Ovirt-devel] [PATCH node] augtool wrapper In-Reply-To: <1232029228-11726-1-git-send-email-apevec@redhat.com> References: <1232029228-11726-1-git-send-email-apevec@redhat.com> Message-ID: <1232029228-11726-2-git-send-email-apevec@redhat.com> workaround for bind-mounted files see https://fedorahosted.org/augeas/ticket/32 requires augeas 0.3.5 augtool [tmpaugscript] script MUST NOT include save, it is added by the wrapper with copy_if_rename_fails flag set 'tmpaugscript' is removed after successfull execution without a parameter, augtool commands are expected on standard input Signed-off-by: Alan Pevec --- ovirt-node.spec.in | 2 +- scripts/ovirt-config-hostname | 10 +++----- scripts/ovirt-config-networking | 4 +- scripts/ovirt-config-storage | 3 +- scripts/ovirt-early | 7 +----- scripts/ovirt-functions | 46 +++++++++++++++++++++----------------- scripts/ovirt-process-config | 9 +++---- 7 files changed, 38 insertions(+), 43 deletions(-) diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in index 501bf4f..ddccc2d 100644 --- a/ovirt-node.spec.in +++ b/ovirt-node.spec.in @@ -18,7 +18,7 @@ Requires(preun): /sbin/chkconfig BuildRequires: libvirt-devel >= 0.5.1 BuildRequires: dbus-devel hal-devel Requires: libvirt >= 0.5.1 -Requires: augeas +Requires: augeas >= 0.3.5 Requires: libvirt-qpid >= 0.2.3 Requires: hal Requires: collectd-virt diff --git a/scripts/ovirt-config-hostname b/scripts/ovirt-config-hostname index 8530843..f609b38 100755 --- a/scripts/ovirt-config-hostname +++ b/scripts/ovirt-config-hostname @@ -8,16 +8,14 @@ HOSTNAME_FILE="/etc/sysconfig/network" function set_hostname { - augtool > /dev/null < /dev/null < $config \ - && augtool < $config \ + cat "$WORKDIR"/augtool-* > $config \ + && augtool $config \ && service network restart } 2>&1 | tee $CONFIG_LOG_FILE diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage index f68e058..58734f4 100755 --- a/scripts/ovirt-config-storage +++ b/scripts/ovirt-config-storage @@ -120,14 +120,13 @@ do_configure() fi done # save input variables - augtool < /dev/null + augtool <> $tmpaug done - echo "save" >> $tmpaug - # augtool on bindmounted files fails - umount_config $OVIRT_DEFAULTS - augtool < $tmpaug > /dev/null - ovirt_store_config $OVIRT_DEFAULTS - rm $tmpaug + augtool $tmpaug else echo "initial startup" # dump all ovirt bootparams diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions index 9301678..57e6fd1 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -51,12 +51,9 @@ is_firstboot() { disable_firstboot() { if mount_config; then - umount_config $OVIRT_DEFAULTS - augtool > /dev/null < $tmpaug fi + cat >> $tmpaug < /dev/null + rc=$? + if [ $rc -eq 0 ]; then + rm $tmpaug + fi + return $rc } # persist configuration to /config diff --git a/scripts/ovirt-process-config b/scripts/ovirt-process-config index 8641fa0..dd1b7e5 100755 --- a/scripts/ovirt-process-config +++ b/scripts/ovirt-process-config @@ -5,6 +5,8 @@ # configuration file. It then restarts the networking service # and saves the configuration files. +. /etc/init.d/ovirt-functions + ME=$(basename "$0") warn() { printf '%s: %s\n' "$ME" "$*" >&2; } try_h() { printf "Try \`$ME -h' for more information.\n" >&2; exit 1;} @@ -57,17 +59,14 @@ networking=$(awk '/^[ \t]*ifcfg=/ { } } - - printf("save\n") - }' $CONFIG) echo "$networking" > $OVIRT_CONFIG_OUTPUT_FILE if [ -f $OVIRT_CONFIG_OUTPUT_FILE ]; then - umount_config /etc/sysconfig/network-scripts/ifcfg* - augtool < $OVIRT_CONFIG_OUTPUT_FILE \ + augtool $OVIRT_CONFIG_OUTPUT_FILE \ && RESULT=0 || RESULT=1 + # FIXME do not store ifcfg-lo if ls /etc/sysconfig/network-scripts/ifcfg* > /dev/null >2&1; then ovirt_store_config /etc/sysconfig/network-scripts/ifcfg* fi -- 1.6.0.6 From apevec at redhat.com Thu Jan 15 14:20:27 2009 From: apevec at redhat.com (Alan Pevec) Date: Thu, 15 Jan 2009 15:20:27 +0100 Subject: [Ovirt-devel] [PATCH node] register persisted configs in /config/files In-Reply-To: <1232029228-11726-1-git-send-email-apevec@redhat.com> References: <1232029228-11726-1-git-send-email-apevec@redhat.com> Message-ID: <1232029228-11726-3-git-send-email-apevec@redhat.com> used by STATE_MOUNT in rc.sysinit Signed-off-by: Alan Pevec --- scripts/ovirt-functions | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions index 57e6fd1..26dc556 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -230,12 +230,18 @@ ovirt_store_config() { printf " $f" # skip if already bind-mounted if grep -q " $f " /proc/mounts ; then - printf " already persisted\n" + printf "" else mkdir -p /config$(dirname $f) cp -a $f /config$f \ && mount -n --bind /config$f $f \ - || printf " failed to persist\n" + || printf " failed to persist" + fi + # register in /config/files used by rc.sysinit + if grep -q "^$f" /config/files 2> /dev/null ; then + printf "" + else + printf "$f\n" >> /config/files fi done echo -- 1.6.0.6 From apevec at redhat.com Thu Jan 15 14:20:28 2009 From: apevec at redhat.com (Alan Pevec) Date: Thu, 15 Jan 2009 15:20:28 +0100 Subject: [Ovirt-devel] [PATCH node] register created local filesystems in fstab In-Reply-To: <1232029228-11726-1-git-send-email-apevec@redhat.com> References: <1232029228-11726-1-git-send-email-apevec@redhat.com> Message-ID: <1232029228-11726-4-git-send-email-apevec@redhat.com> also persist /etc/fstab so that local filesystems are mounted early in boot process by in rc.sysinit Signed-off-by: Alan Pevec --- scripts/ovirt-config-storage | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage index 58734f4..3b1b947 100755 --- a/scripts/ovirt-config-storage +++ b/scripts/ovirt-config-storage @@ -218,6 +218,7 @@ perform_partitioning() if [ "$SWAP_SIZE" -gt 0 ]; then lvcreate --name Swap --size ${SWAP_SIZE}M /dev/HostVG mkswap -L "SWAP" /dev/HostVG/Swap + echo "/dev/HostVG/Swap swap swap defaults 0 0" >> /etc/fstab fi if [ "$ROOT_SIZE" -gt 0 ]; then lvcreate --name Root --size ${ROOT_SIZE}M /dev/HostVG @@ -233,10 +234,15 @@ perform_partitioning() lvcreate --name Logging --size ${LOGGING_SIZE}M /dev/HostVG mke2fs -T ext3 /dev/HostVG/Logging -L "LOGGING" tune2fs -c 0 -i 0 /dev/HostVG/Logging + echo "/dev/HostVG/Logging /var/log ext3 defaults 0 0" >> /etc/fstab fi lvcreate --name Data -l 100%FREE /dev/HostVG mke2fs -T ext3 /dev/HostVG/Data -L "DATA" tune2fs -c 0 -i 0 /dev/HostVG/Data + echo "/dev/HostVG/Data /data ext3 defaults 0 0" >> /etc/fstab + if mount_config; then + ovirt_store_config /etc/fstab + fi } 2>&1 | tee $LOG if [ $? -eq 0 ]; then -- 1.6.0.6 From pmyers at redhat.com Thu Jan 15 14:38:15 2009 From: pmyers at redhat.com (Perry Myers) Date: Thu, 15 Jan 2009 09:38:15 -0500 Subject: [Ovirt-devel] Ovirt Node Authorization and Security In-Reply-To: <009101c976ea$ad2ea570$078bf050$@com> References: <20090114172704.4d233985@tp.mains.net> <009101c976ea$ad2ea570$078bf050$@com> Message-ID: <496F4A57.6010907@redhat.com> Itamar Heim wrote: >> From: ovirt-devel-bounces at redhat.com [mailto:ovirt-devel- >> bounces at redhat.com] On Behalf Of Ian Main > ... >> Highest: For each new machine brought into ovirt pool one would be >> required to have a keytab generated in advance and either copied into >> persistent storage on the machine or put on a USB stick etc. > [IH] why not use TPM? Maybe not to store the keytab, but to store a > private key or a certificate which will allow authentication and > encryption only to this machine? We have plans to use the TPM but that doesn't solve the bootstrapping issue. You still need a way of getting the keytab from the ovirt server to the Node in a secure fashion. That is what Ian is describing. Once you get the keytab to the Node via USB thumbdrive (secure mode) or network transfer (less secure mode) it can certainly be stored in the TPM. >> Moderate: Each time a node registers with the wui, it is placed in an >> authorization queue and is required to be authorized by an >> administrator before a keytab is generated for the node and made >> available for download. Any pertinent information about the node will be >> displayed in the list (MAC, maybe hardware ID etc.). > [IH] if you don't persist the keytab (or at least persist some private key > in TPM to encrypt to), then what prevents badnode1 from spoofing goodnode2 > and get its keytab from the admin server? We can (and do) persist the keytab, it all depends on your threat model. If you are convinced you are on a 'secure management network' (does not really exist IMHO, but some people believe it) then you don't need kerberos for the Nodes at all really. But we don't want different transport mechanisms for the 'secure lan' vs. 'unsecure lan' cases so we do the automatic keytab transfer. If you're using an unsecure management lan then certainly you need persistent keytab via either TPM or hard disk. Again, these concepts are somewhat orthogonal to what Ian is discussing (bootstrap issue). The concepts at play are: 1. bootstrapping - how do you initially register a host and get the keytab from server to host (secure: sneakernet, unsecure: over the lan) 2. key storage/persistence: none, hard disk/usb drive, TPM Ian was just discussing point 1. For point 2 the only thing we're missing presently is usage of TPM if available. It's on the features roadmap, just not sure when we're going to get to it. Perry From bkearney at redhat.com Thu Jan 15 14:39:24 2009 From: bkearney at redhat.com (Bryan Kearney) Date: Thu, 15 Jan 2009 09:39:24 -0500 Subject: [Ovirt-devel] [PATCH node] Added a wrapper script around the boot menu item to describe In-Reply-To: <496F3F18.5080509@redhat.com> References: <496F3F18.5080509@redhat.com> Message-ID: <1232030364-29636-1-git-send-email-bkearney@redhat.com> This is a resend of the earlier patch. Based on discussions on the list, there is enough boundary condition testing, but we added a stronger reminder to do all the configuration before reboot. -- bk --- Makefile.am | 1 + ovirt-node.spec.in | 4 +++- scripts/ovirt-config-boot-wrapper | 21 +++++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletions(-) create mode 100755 scripts/ovirt-config-boot-wrapper diff --git a/Makefile.am b/Makefile.am index 6847234..c62774f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,6 +30,7 @@ EXTRA_DIST = \ scripts/ovirt \ scripts/ovirt-awake \ scripts/ovirt-config-boot \ + scripts/ovirt-config-boot-wrapper \ scripts/ovirt-config-hostname \ scripts/ovirt-config-logging \ scripts/ovirt-config-networking \ diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in index 501bf4f..f30dd62 100644 --- a/ovirt-node.spec.in +++ b/ovirt-node.spec.in @@ -132,6 +132,7 @@ cd - %{__install} -p -m0755 scripts/ovirt-awake %{buildroot}%{_sbindir} %{__install} -p -m0755 scripts/ovirt-config-boot %{buildroot}%{_sbindir} +%{__install} -p -m0755 scripts/ovirt-config-boot-wrapper %{buildroot}%{_sbindir} %{__install} -p -m0755 scripts/ovirt-config-hostname %{buildroot}%{_sbindir} %{__install} -p -m0755 scripts/ovirt-config-logging %{buildroot}%{_sbindir} %{__install} -p -m0755 scripts/ovirt-config-networking %{buildroot}%{_sbindir} @@ -191,7 +192,7 @@ install -p -m 644 images/syslinux-vesa-splash.jpg %{buildroot}/usr/lib/anaconda- %{__ln_s} ../..%{_sbindir}/ovirt-config-networking %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"15_Networking Setup" %{__ln_s} ../..%{_sbindir}/ovirt-config-storage %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"20_Disk Partitioning" %{__ln_s} ../..%{_sbindir}/ovirt-config-logging %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"30_Logging Setup" -%{__ln_s} ../..%{_sbindir}/ovirt-config-boot %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"99_Local install and reboot" +%{__ln_s} ../..%{_sbindir}/ovirt-config-boot-wrapper %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"99_Local install and reboot" %clean @@ -253,6 +254,7 @@ fi %defattr(-,root,root,0755) %{_sbindir}/ovirt-awake %{_sbindir}/ovirt-config-boot +%{_sbindir}/ovirt-config-boot-wrapper %{_sbindir}/ovirt-config-hostname %{_sbindir}/ovirt-config-logging %{_sbindir}/ovirt-config-networking diff --git a/scripts/ovirt-config-boot-wrapper b/scripts/ovirt-config-boot-wrapper new file mode 100755 index 0000000..d223599 --- /dev/null +++ b/scripts/ovirt-config-boot-wrapper @@ -0,0 +1,21 @@ +#!/bin/bash +# +# Wrapper function to make sure the user wishes to continue before +# rebooting the system + +while true; do + printf "\nThis option will exit the menu, and require a reboot. \n\ +Please ensure that you have configured the local storage \n\ +and networking correctly on the previous menu before \n\ +continuing." + printf "\n\n" + read -p "Do you wish to continue? (Y|N)? " + r=$(echo $REPLY|tr '[[:lower:]]' '[[:upper:]]') + if [ "$r" == "Y" ]; then + /usr/sbin/ovirt-config-boot + break + elif [ "$r" == "N" ]; then + printf "\nExiting back to the menu\n" + break + fi +done -- 1.6.0.6 From d.vasilets at peterhost.ru Thu Jan 15 15:15:10 2009 From: d.vasilets at peterhost.ru (=?koi8-r?Q?=F7=C1=D3=C9=CC=C5=C3_?= =?koi8-r?Q?=E4=CD=C9=D4=D2=C9=CA?=) Date: Thu, 15 Jan 2009 18:15:10 +0300 Subject: [Ovirt-devel] ovirt-server patch for error 'Attempted to update a stale object' Message-ID: <1232032510.24610.2.camel@dima-desktop> patch for error 'Attempted to update a stale object' diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb index c187287..fddc594 100644 --- a/src/task-omatic/task_vm.rb +++ b/src/task-omatic/task_vm.rb @@ -196,8 +196,18 @@ def create_vm_xml(name, uuid, memAllocated, memUsed, vcpus, bootDevice, end def setVmState(vm, state) - vm.state = state - vm.save! + attempts = 0 + begin + vm.state = state + vm.save! + rescue ActiveRecord::StaleObjectError + puts "error with stale object" + if attempts < 3 + attempts += 1 + vm.reload + retry + end + end end def setVmVncPort(vm, domain) From dpierce at redhat.com Thu Jan 15 15:59:38 2009 From: dpierce at redhat.com (Darryl L. Pierce) Date: Thu, 15 Jan 2009 10:59:38 -0500 Subject: [Ovirt-devel] [PATCH node] mounting of persistent config In-Reply-To: <1232029228-11726-1-git-send-email-apevec@redhat.com> References: <1232029228-11726-1-git-send-email-apevec@redhat.com> Message-ID: <20090115155938.GC20152@mcpierce-laptop.rdu.redhat.com> On Thu, Jan 15, 2009 at 03:20:25PM +0100, Alan Pevec wrote: > This patch series reworks mounting of persistent config > to use STATE_MOUNT in rc.sysinit so configs take effect early enough > e.g. /etc/fstab ACK to the series, it appears to work for me. -- Darryl L. Pierce, Sr. Software Engineer @ Red Hat, Inc. Virtual Machine Management - http://www.ovirt.org/ "What do you care what other people think, Mr. Feynman?" -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 197 bytes Desc: not available URL: From pmyers at redhat.com Thu Jan 15 16:32:24 2009 From: pmyers at redhat.com (Perry Myers) Date: Thu, 15 Jan 2009 11:32:24 -0500 Subject: [Ovirt-devel] [PATCH node] Updating menu labels In-Reply-To: <4965A442.3090601@redhat.com> References: <4965A307.1040009@redhat.com> <4965A442.3090601@redhat.com> Message-ID: <496F6518.8030008@redhat.com> Christopher Curran wrote: > Christopher Curran wrote: >> Can we use the word 'stand-alone' over 'standalone'. I know google >> will disagree with me but style guides and dictionaries support the >> stand-alone spelling. This is mainly to make my life easier by >> sticking to one consistent style. Here is a patch to fix it. >> >> > Stupid email clients... This one should work This patch doesn't apply. Appears that the mailer mangled it. I suggest using: git format-patch git send-email to send the patches since then you're guaranteed that the mailer will not damage the patch. Please resend like that and I'll try applying again. Thanks, Perry From bkearney at redhat.com Thu Jan 15 19:55:56 2009 From: bkearney at redhat.com (Bryan Kearney) Date: Thu, 15 Jan 2009 14:55:56 -0500 Subject: [Ovirt-devel] [PATCH node] BZ479378: Provide the user an option to mount the logging partition during the initial configuration of the logging configurations Message-ID: <1232049356-13772-1-git-send-email-bkearney@redhat.com> This is built off of Alan's patch stream, and replaces the earlier logging patch which was sent. --- scripts/ovirt-config-logging | 196 +++++++++++++++++++++++------------------- scripts/ovirt-functions | 31 +++++++ 2 files changed, 139 insertions(+), 88 deletions(-) diff --git a/scripts/ovirt-config-logging b/scripts/ovirt-config-logging index f1daf29..97551b0 100755 --- a/scripts/ovirt-config-logging +++ b/scripts/ovirt-config-logging @@ -7,6 +7,25 @@ RSYSLOG_FILE="/etc/rsyslog.conf" +function enable_local_logging { + if grep -q "/dev/mapper/HostVG-Logging " /proc/mounts; then + return 0 + else + while true; do + printf "\n" + read -p "Would you like to enable logging to the local disk? (Y/N)? " + r=$(echo $REPLY|tr '[[:lower:]]' '[[:upper:]]') + if [ "$r" == "Y" ]; then + mount_logging + return + elif [ "$r" == "N" ]; then + printf "\nNot mounting the local disk. All logs will be lost\n" + return + fi + done + fi +} + # Creates the rsyslog file based on the following inputs # $1 ipaddress of remote syslog server # $2 port of remote syslog server @@ -71,96 +90,96 @@ function is_numeric { function prompt_user { while true ; do - max_log_size="10" - syslog_server_ip="" - syslog_server_port="" - - while true; do - printf "\n" - read -p "What is the max size, in kilobytes, for local log files (def. ${max_log_size}k)? " - - if [ -n "$REPLY" ]; then - r=$REPLY - if [[ $r =~ ^[0-9]+$ ]] && [[ $r -gt 0 ]]; then - max_log_size=$r - printf "\nMaximum logging size will be ${max_log_size}k.\n" - break - else - printf "\nInvalid input.\n" - fi - else - printf "\nLeaving log size as ${max_log_size}k.\n" - break - fi - done - - printf "\n" - read -p "What is the IP address for the syslog server, hit Enter to skip? " - if [ -n "$REPLY" ]; then - syslog_server_ip=$REPLY - while true; do - read -p "Please enter the remote logging port used: " - r=$REPLY - if [ -n "$r" ]; then - if [[ $r =~ ^[0-9]+$ ]] && [[ $r -gt 0 ]]; then - syslog_server_port=$REPLY - break - else - printf "Invalid port.\n" - fi - fi - done - - printf "\n" - while true; do - read -p "Remote logging uses [t]cp or [u]dp? " - r=$(echo $REPLY|tr '[[:lower:]]' '[[:upper:]]') - if [ "$r" == "T" ]; then syslog_server_protocol="tcp"; break; fi - if [ "$r" == "U" ]; then syslog_server_protocol="udp"; break; fi - # else - printf "Invalid input.\n" - done - else - printf "\nDisabling remote logging.\n" - fi - - printf "\n" - printf "\nLogging will be configured as follows:" - printf "\n======================================" - printf "\n Max Logfile Size: $max_log_size" - if [ -n "$syslog_server_ip" ]; then - printf "\n Remote Server: $syslog_server_ip" - printf "\n Remote Port: $syslog_server_port" - printf "\n Logging Protocol: $syslog_server_protocol" - fi - printf "\n" - printf "\n" - while true; do - read -p "Is this correct (Y/N/A)? " - r=$(echo $REPLY|tr '[[:lower:]]' '[[:upper:]]') - if [ "$r" == "Y" ]; then - printf "\nSaving configuration.\n" - if [[ -n "$syslog_server_ip" ]] && - [[ -n "$syslog_server_port" ]] && - [[ -n "$syslog_server_protocol" ]]; then - ovirt_rsyslog $syslog_server_ip \ - $syslog_server_port \ - $syslog_server_protocol - fi - sed -i -e "s/^size=.*/size=${max_log_size}k/" \ - /etc/logrotate.d/ovirt-logrotate.conf - return - elif [ "$r" == "N" ]; then - printf "\nRestarting logging configuration.\n" - break - elif [ "$r" == "A" ]; then - printf "\nAborting logging configuration.\n" - return - fi - done + max_log_size="10" + syslog_server_ip="" + syslog_server_port="" + + while true; do + printf "\n" + read -p "What is the max size, in kilobytes, for local log files (def. ${max_log_size}k)? " + + if [ -n "$REPLY" ]; then + r=$REPLY + if [[ $r =~ ^[0-9]+$ ]] && [[ $r -gt 0 ]]; then + max_log_size=$r + printf "\nMaximum logging size will be ${max_log_size}k.\n" + break + else + printf "\nInvalid input.\n" + fi + else + printf "\nLeaving log size as ${max_log_size}k.\n" + break + fi + done + + printf "\n" + read -p "What is the IP address for the syslog server, hit Enter to skip? " + if [ -n "$REPLY" ]; then + syslog_server_ip=$REPLY + while true; do + read -p "Please enter the remote logging port used: " + r=$REPLY + if [ -n "$r" ]; then + if [[ $r =~ ^[0-9]+$ ]] && [[ $r -gt 0 ]]; then + syslog_server_port=$REPLY + break + else + printf "Invalid port.\n" + fi + fi + done + + printf "\n" + while true; do + read -p "Remote logging uses [t]cp or [u]dp? " + r=$(echo $REPLY|tr '[[:lower:]]' '[[:upper:]]') + if [ "$r" == "T" ]; then syslog_server_protocol="tcp"; break; fi + if [ "$r" == "U" ]; then syslog_server_protocol="udp"; break; fi + # else + printf "Invalid input.\n" + done + else + printf "\nDisabling remote logging.\n" + fi + + printf "\n" + printf "\nLogging will be configured as follows:" + printf "\n======================================" + printf "\n Max Logfile Size: $max_log_size" + if [ -n "$syslog_server_ip" ]; then + printf "\n Remote Server: $syslog_server_ip" + printf "\n Remote Port: $syslog_server_port" + printf "\n Logging Protocol: $syslog_server_protocol" + fi + printf "\n" + printf "\n" + while true; do + read -p "Is this correct (Y/N/A)? " + r=$(echo $REPLY|tr '[[:lower:]]' '[[:upper:]]') + if [ "$r" == "Y" ]; then + printf "\nSaving configuration.\n" + if [[ -n "$syslog_server_ip" ]] && + [[ -n "$syslog_server_port" ]] && + [[ -n "$syslog_server_protocol" ]]; then + ovirt_rsyslog $syslog_server_ip \ + $syslog_server_port \ + $syslog_server_protocol + fi + sed -i -e "s/^size=.*/size=${max_log_size}k/" \ + /etc/logrotate.d/ovirt-logrotate.conf + return + elif [ "$r" == "N" ]; then + printf "\nRestarting logging configuration.\n" + break + elif [ "$r" == "A" ]; then + printf "\nAborting logging configuration.\n" + return + fi + done done } - + # AUTO for auto-install if [ "$1" = "AUTO" ]; then if [ -z "$OVIRT_SYSLOG_SERVER" -o -z "$OVIRT_SYSLOG_PORT" ]; then @@ -178,6 +197,7 @@ if [ "$1" = "AUTO" ]; then fi else prompt_user + enable_local_logging fi exit 0 diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions index 26dc556..ec4cf89 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -193,6 +193,37 @@ mount_config() { fi } +# mount logging partition +mount_logging() { + if grep -q "/dev/mapper/HostVG-Logging " /proc/mounts; then + return 0 + fi + + if [ -e /dev/HostVG/Logging ] ; then + + # backup the logs + if [ -e /var/logs-backup ]; then + rm -rf /var/logs-backup + fi + cp -R /var/log /var/logs-backup + + mount /dev/HostVG/Logging /var/log + if [ -e /var/log/initialboot ]; then + rm -rf /var/log/initialboot + fi + + mkdir /var/log/initialboot + cp -R /var/logs-backup/* /var/log/initialboot + rm -rf /var/logs-backup + return 0 + else + # /var/log is not available + printf "\nThe logging partion has not been created. Please create it at the main menu.\n" + return 1 + fi +} + + # augtool wrapper # workaround for bind-mounted files # see https://fedorahosted.org/augeas/ticket/32 -- 1.6.0.6 From mmorsi at redhat.com Thu Jan 15 20:21:06 2009 From: mmorsi at redhat.com (Mohammed Morsi) Date: Thu, 15 Jan 2009 15:21:06 -0500 Subject: [Ovirt-devel] [PATCH server] comprehensive / up to date validations patch (revised again) Message-ID: <1232050866-8057-1-git-send-email-mmorsi@redhat.com> (revisions relate to small validation bugs in host, nic, task models and host-browser module) this patch provides all the validation components included in the previous 3-patch patch-set, updated to incorporate recent changes to the rails application since they were originally sent out and to remove extraneous whitespace. This is the only patch that needs to be ack'd as it contains the validations, tests, and bug fixes Attached is additional validations, added to the rails model and controller layers verifying: bondings: arp related fields boot_types: label uniqueness and proto inclusion cpus: various fields are set and min values help_sections: presence and uniqueness of fields hosts: presence and format of various fields ip_addresses: fk existance / integrity nics: mac address format permissions: presence / inclusion of various fields pools: type inclusion quotas: minimum values smart_pool_tags: tagged_id / type fk present storage_pools: type, state field inclusion, min values storage_volumes: various fields, subclasses w/ various fields tasks: various fields present and consistensy maintained usages: label, other fields present, unique vms: uuid of correct format, min values, various fields present pools lft and rgt are not verified as they are added by acts_as_nested_set _after_ the pool is inserted into the db can only add / move host and storage volumes and pools to / from pools when you have sufficient permissions and target entities don't have associated vms can only destroy storage volumes / pools if there are no attached vms included are a few updates to the main server app and many updates to the test suite to fix a few various bits and assert all the new validations added. --- src/app/controllers/hardware_controller.rb | 28 ++++++- src/app/controllers/storage_controller.rb | 7 ++ src/app/models/bonding.rb | 15 +++- src/app/models/boot_type.rb | 5 + src/app/models/cpu.rb | 23 +++++ src/app/models/help_section.rb | 34 ++++++++ src/app/models/host.rb | 22 +++++- src/app/models/ip_address.rb | 4 + src/app/models/iscsi_storage_volume.rb | 2 + src/app/models/lvm_storage_volume.rb | 6 ++ src/app/models/nfs_storage_pool.rb | 1 + src/app/models/nic.rb | 15 +++- src/app/models/permission.rb | 7 ++ src/app/models/pool.rb | 3 + src/app/models/quota.rb | 22 +++++ src/app/models/smart_pool_tag.rb | 5 + src/app/models/storage_pool.rb | 17 ++++ src/app/models/storage_volume.rb | 21 +++++ src/app/models/task.rb | 16 ++++ src/app/models/usage.rb | 6 ++ src/app/models/vm.rb | 36 ++++++++- src/host-browser/host-browser.rb | 12 ++-- src/test/fixtures/help_sections.yml | 14 ++- src/test/fixtures/hosts.yml | 45 +++++++---- src/test/fixtures/storage_pools.yml | 11 +++ src/test/fixtures/usages.yml | 12 ++- src/test/functional/resources_controller_test.rb | 2 +- src/test/functional/storage_controller_test.rb | 4 +- src/test/unit/bonding_test.rb | 35 ++++++++ src/test/unit/boot_type_test.rb | 36 +++++++- src/test/unit/cpu_test.rb | 95 +++++++++++++++++++++- src/test/unit/help_section_test.rb | 51 +++++++++++- src/test/unit/host_test.rb | 60 +++++++++++++- src/test/unit/ip_address_test.rb | 5 + src/test/unit/ip_v4_address_test.rb | 3 +- src/test/unit/ip_v6_address_test.rb | 3 +- src/test/unit/nic_test.rb | 58 +++++++++++++- src/test/unit/permission_test.rb | 28 +++++++ src/test/unit/pool_test.rb | 21 +++++ src/test/unit/quota_test.rb | 37 ++++++++- src/test/unit/storage_pool_test.rb | 45 ++++++++++ src/test/unit/storage_volume_test.rb | 86 +++++++++++++++++++ src/test/unit/task_test.rb | 14 +++ src/test/unit/usage_test.rb | 47 ++++++++++- src/test/unit/vm_test.rb | 64 +++++++++++++++ 45 files changed, 1014 insertions(+), 69 deletions(-) diff --git a/src/app/controllers/hardware_controller.rb b/src/app/controllers/hardware_controller.rb index 7be67cc..5c14eec 100644 --- a/src/app/controllers/hardware_controller.rb +++ b/src/app/controllers/hardware_controller.rb @@ -293,15 +293,39 @@ class HardwareController < PoolController resource_ids_str = params[:resource_ids] resource_ids = resource_ids_str.split(",").collect {|x| x.to_i} + # if user doesn't have modify permission on both source and destination + unless @pool.can_modify(@user) and Pool.find(params[:target_pool_id]).can_modify(@user) + render :json => { :success => false, + :alert => "Cannot #{item_action.to_s} #{item_class.table_name.humanize} without admin permissions on both pools" } + return + end + + # relay error message if movable check fails for any resource + success = true + failed_resources = "" + resource_ids.each {|x| + unless item_class.find(x).movable? + success = false + failed_resources += x.to_s + " " + end + } + resource_ids.delete_if { |x| ! item_class.find(x).movable? } + begin @pool.transaction do @pool.send(item_method, resource_ids, target_pool_id) end + rescue + success = false + end + + if success render :json => { :success => true, :alert => "#{item_action.to_s} #{item_class.table_name.humanize} successful." } - rescue + else render :json => { :success => false, - :alert => "#{item_action.to_s} #{item_class.table_name.humanize} failed." } + :alert => "#{item_action.to_s} #{item_class.table_name.humanize} failed" + + (failed_resources == "" ? "." : " for " + failed_resources) } end end diff --git a/src/app/controllers/storage_controller.rb b/src/app/controllers/storage_controller.rb index 148d1be..e4b72f1 100644 --- a/src/app/controllers/storage_controller.rb +++ b/src/app/controllers/storage_controller.rb @@ -310,6 +310,13 @@ class StorageController < ApplicationController end def destroy + unless @storage_pool.movable? + format.json { render :json => { :object => "storage_pool", + :success => false, + :alert => "Cannot delete storage with associated vms" } } + return + end + pool = @storage_pool.hardware_pool if @storage_pool.destroy alert="Storage Pool was successfully deleted." diff --git a/src/app/models/bonding.rb b/src/app/models/bonding.rb index c9af38c..a67b97b 100644 --- a/src/app/models/bonding.rb +++ b/src/app/models/bonding.rb @@ -30,6 +30,8 @@ # interface. They can be ignored if not used. # class Bonding < ActiveRecord::Base + + belongs_to :host belongs_to :bonding_type belongs_to :vlan @@ -58,9 +60,20 @@ class Bonding < ActiveRecord::Base validates_presence_of :vlan_id, :message => 'A vlan must be specified.' + # verify arp ping address to be ipv4 if set + validates_format_of :arp_ping_address, + :with => %r{^(\d{1,3}\.){3}\d{1,3}$}, + :unless => Proc.new { |bonding| bonding.arp_ping_address.nil? } + + validates_numericality_of :arp_interval, + :greater_than_or_equal_to => 0, + :unless => Proc.new { |bonding| bonding.arp_interval.nil? } + protected def validate - if vlan.boot_type.proto == 'static' and ip_addresses.size == 0 + if ! vlan.nil? and + vlan.boot_type.proto == 'static' and + ip_addresses.size == 0 errors.add("vlan_id", "is static. Must create at least one static ip") end diff --git a/src/app/models/boot_type.rb b/src/app/models/boot_type.rb index 8ffbe67..6cfdb04 100644 --- a/src/app/models/boot_type.rb +++ b/src/app/models/boot_type.rb @@ -18,4 +18,9 @@ # also available at http://www.gnu.org/copyleft/gpl.html. class BootType < ActiveRecord::Base + validates_presence_of :label + validates_uniqueness_of :label, + :message => 'Label must be unique' + validates_inclusion_of :proto, + :in => %w( static dhcp bootp ) end diff --git a/src/app/models/cpu.rb b/src/app/models/cpu.rb index 1a7d3cf..714a8ed 100644 --- a/src/app/models/cpu.rb +++ b/src/app/models/cpu.rb @@ -21,4 +21,27 @@ # class Cpu < ActiveRecord::Base belongs_to :host + + validates_presence_of :host_id, + :message => 'A host must be specified.' + + validates_numericality_of :cpu_number, + :greater_than_or_equal_to => 0 + + validates_numericality_of :core_number, + :greater_than_or_equal_to => 0 + + validates_numericality_of :number_of_cores, + :greater_than_or_equal_to => 1 + + validates_numericality_of :cpuid_level, + :greater_than_or_equal_to => 0 + + validates_numericality_of :speed, + :greater_than => 0 + # also verify speed in MHz ? + + validates_presence_of :vendor + validates_presence_of :model + validates_presence_of :family end diff --git a/src/app/models/help_section.rb b/src/app/models/help_section.rb index a891383..bd3e27c 100644 --- a/src/app/models/help_section.rb +++ b/src/app/models/help_section.rb @@ -1,2 +1,36 @@ +# Copyright (C) 2008 Red Hat, Inc. +# Written by Mohammed Morsi +# +# 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. +# +# +HelpSection+ defines a section of the web help document to be +# available for a specific controller / action +# class HelpSection < ActiveRecord::Base + + validates_uniqueness_of :action, + :scope => :controller, + :message => 'Controller / Action must be unique' + + validates_presence_of :controller, + :message => 'A controller must be specified.' + + validates_presence_of :action, + :message => 'An action must be specified.' + + validates_presence_of :section, + :message => 'A section must be specified.' end diff --git a/src/app/models/host.rb b/src/app/models/host.rb index 813bc1d..1e3a0e6 100644 --- a/src/app/models/host.rb +++ b/src/app/models/host.rb @@ -60,13 +60,29 @@ class Host < ActiveRecord::Base [ :search_users, 'U', "search_users" ] ], :eager_load => :smart_pools + validates_presence_of :hardware_pool_id, + :message => 'A hardware pool id must be specified.' + + validates_presence_of :hostname, + :message => 'A hostname must be specified.' + + validates_presence_of :arch, + :message => 'An arch must be specified.' KVM_HYPERVISOR_TYPE = "KVM" - HYPERVISOR_TYPES = [KVM_HYPERVISOR_TYPE] + QEMU_HYPERVISOR_TYPE = "QEMU" + HYPERVISOR_TYPES = [KVM_HYPERVISOR_TYPE, QEMU_HYPERVISOR_TYPE] STATE_UNAVAILABLE = "unavailable" STATE_AVAILABLE = "available" STATES = [STATE_UNAVAILABLE, STATE_AVAILABLE] + validates_inclusion_of :hypervisor_type, + :in => HYPERVISOR_TYPES, + :unless => Proc.new { |host| host.hypervisor_type.nil? or host.hypervisor_type == "" } + + validates_inclusion_of :state, + :in => STATES + Task::COMPLETED_STATES + Task::WORKING_STATES + def memory_in_mb kb_to_mb(memory) end @@ -108,4 +124,8 @@ class Host < ActiveRecord::Base hardware_pool.search_users end + def movable? + return vms.size == 0 + end + end diff --git a/src/app/models/ip_address.rb b/src/app/models/ip_address.rb index 5d2e6af..3f246b1 100644 --- a/src/app/models/ip_address.rb +++ b/src/app/models/ip_address.rb @@ -24,4 +24,8 @@ class IpAddress < ActiveRecord::Base belongs_to :network belongs_to :nic belongs_to :bonding + + def validate + errors.add("id", "ip must be associated with foreign entity") if network_id.nil? and nic_id.nil? and bonding_id.nil? + end end diff --git a/src/app/models/iscsi_storage_volume.rb b/src/app/models/iscsi_storage_volume.rb index 48edbd8..fe2cbf5 100644 --- a/src/app/models/iscsi_storage_volume.rb +++ b/src/app/models/iscsi_storage_volume.rb @@ -31,4 +31,6 @@ class IscsiStorageVolume < StorageVolume return true end + validates_presence_of :lun + end diff --git a/src/app/models/lvm_storage_volume.rb b/src/app/models/lvm_storage_volume.rb index 8eb1f0e..38949ce 100644 --- a/src/app/models/lvm_storage_volume.rb +++ b/src/app/models/lvm_storage_volume.rb @@ -29,4 +29,10 @@ class LvmStorageVolume < StorageVolume def volume_create_params return lv_name, size, lv_owner_perms, lv_group_perms, lv_mode_perms end + + validates_presence_of :lv_name + validates_presence_of :lv_owner_perms + validates_presence_of :lv_group_perms + validates_presence_of :lv_mode_perms + end diff --git a/src/app/models/nfs_storage_pool.rb b/src/app/models/nfs_storage_pool.rb index 398e3f9..3b438c8 100644 --- a/src/app/models/nfs_storage_pool.rb +++ b/src/app/models/nfs_storage_pool.rb @@ -29,4 +29,5 @@ class NfsStoragePool < StoragePool def user_subdividable true end + end diff --git a/src/app/models/nic.rb b/src/app/models/nic.rb index 5649763..cd21bb7 100644 --- a/src/app/models/nic.rb +++ b/src/app/models/nic.rb @@ -24,15 +24,28 @@ class Nic < ActiveRecord::Base has_and_belongs_to_many :bondings, :join_table => 'bondings_nics' + validates_presence_of :mac, + :message => 'A mac must be specified.' + + validates_format_of :mac, + :with => %r{^([0-9a-fA-F]{2}([:-]|$)){6}$} + validates_presence_of :host_id, :message => 'A host must be specified.' validates_presence_of :physical_network_id, :message => 'A network must be specified.' + validates_numericality_of :bandwidth, + :greater_than_or_equal_to => 0 + + # validate 'bridge' or 'usage_type' attribute ? + protected def validate - if physical_network.boot_type.proto == 'static' and ip_addresses.size == 0 + if ! physical_network.nil? and + physical_network.boot_type.proto == 'static' and + ip_addresses.size == 0 errors.add("physical_network_id", "is static. Must create at least one static ip") end diff --git a/src/app/models/permission.rb b/src/app/models/permission.rb index ece3da5..b3929ad 100644 --- a/src/app/models/permission.rb +++ b/src/app/models/permission.rb @@ -24,9 +24,12 @@ class Permission < ActiveRecord::Base has_many :child_permissions, :dependent => :destroy, :class_name => "Permission", :foreign_key => "inherited_from_id" + validates_presence_of :pool_id + validates_presence_of :uid validates_uniqueness_of :uid, :scope => [:pool_id, :inherited_from_id] + ROLE_SUPER_ADMIN = "Super Admin" ROLE_ADMIN = "Administrator" ROLE_USER = "User" @@ -44,6 +47,10 @@ class Permission < ActiveRecord::Base ROLE_USER => [PRIV_VIEW, PRIV_VM_CONTROL], ROLE_MONITOR => [PRIV_VIEW]} + + validates_inclusion_of :user_role, + :in => ROLES.keys + def self.invert_roles return_hash = {} ROLES.each do |role, privs| diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb index 614325a..ed767dd 100644 --- a/src/app/models/pool.rb +++ b/src/app/models/pool.rb @@ -53,6 +53,9 @@ class Pool < ActiveRecord::Base validates_presence_of :name validates_uniqueness_of :name, :scope => :parent_id + validates_inclusion_of :type, + :in => %w( DirectoryPool HardwarePool VmResourcePool SmartPool ) + # overloading this method such that we can use permissions.admins to get all the admins for an object has_many :permissions, :dependent => :destroy, :order => "id ASC" do def super_admins diff --git a/src/app/models/quota.rb b/src/app/models/quota.rb index fc52177..2a9e0f0 100644 --- a/src/app/models/quota.rb +++ b/src/app/models/quota.rb @@ -22,6 +22,28 @@ require 'util/ovirt' class Quota < ActiveRecord::Base belongs_to :pool + validates_presence_of :pool_id + + + validates_numericality_of :total_vcpus, + :greater_than_or_equal_to => 0, + :unless => Proc.new{ |quota| quota.total_vcpus.nil? } + + validates_numericality_of :total_vmemory, + :greater_than_or_equal_to => 0, + :unless => Proc.new{ |quota| quota.total_vmemory.nil? } + + validates_numericality_of :total_vnics, + :greater_than_or_equal_to => 0, + :unless => Proc.new{ |quota| quota.total_vnics.nil? } + + validates_numericality_of :total_storage, + :greater_than_or_equal_to => 0, + :unless => Proc.new{ |quota| quota.total_storage.nil? } + + validates_numericality_of :total_vms, + :greater_than_or_equal_to => 0, + :unless => Proc.new{ |quota| quota.total_vms.nil? } def total_vmemory_in_mb kb_to_mb(total_vmemory) diff --git a/src/app/models/smart_pool_tag.rb b/src/app/models/smart_pool_tag.rb index e135ddf..00bb5a7 100644 --- a/src/app/models/smart_pool_tag.rb +++ b/src/app/models/smart_pool_tag.rb @@ -31,6 +31,11 @@ class SmartPoolTag < ActiveRecord::Base validates_uniqueness_of :smart_pool_id, :scope => [:tagged_id, :tagged_type] + validates_presence_of :tagged_id + + validates_inclusion_of :tagged_type, + :in => %w( Pool StoragePool Host Vm ) + def tagged_type=(sType) super(sType.to_s.classify.constantize.base_class.to_s) end diff --git a/src/app/models/storage_pool.rb b/src/app/models/storage_pool.rb index bab7031..f9abb55 100644 --- a/src/app/models/storage_pool.rb +++ b/src/app/models/storage_pool.rb @@ -39,6 +39,13 @@ class StoragePool < ActiveRecord::Base validates_presence_of :hardware_pool_id + validates_inclusion_of :type, + :in => %w( IscsiStoragePool LvmStoragePool NfsStoragePool ) + + + validates_numericality_of :capacity, + :greater_than_or_equal_to => 0 + acts_as_xapian :texts => [ :ip_addr, :target, :export_path, :type ], :terms => [ [ :search_users, 'U', "search_users" ] ], :eager_load => :smart_pools @@ -54,6 +61,9 @@ class StoragePool < ActiveRecord::Base STATE_PENDING_DELETION = "pending_deletion" STATE_AVAILABLE = "available" + validates_inclusion_of :state, + :in => [ STATE_PENDING_SETUP, STATE_PENDING_DELETION, STATE_AVAILABLE] + def self.factory(type, params = {}) params[:state] = STATE_PENDING_SETUP unless params[:state] case type @@ -121,4 +131,11 @@ class StoragePool < ActiveRecord::Base end return_hash end + + def movable? + storage_volumes.each{ |x| + return false unless x.movable? + } + return true + end end diff --git a/src/app/models/storage_volume.rb b/src/app/models/storage_volume.rb index 39b72d5..f8bd4fb 100644 --- a/src/app/models/storage_volume.rb +++ b/src/app/models/storage_volume.rb @@ -32,10 +32,23 @@ class StorageVolume < ActiveRecord::Base end end + validates_presence_of :storage_pool_id + + + validates_numericality_of :size, + :greater_than_or_equal_to => 0, + :unless => Proc.new { |storage_volume| storage_volume.nil? } + + validates_inclusion_of :type, + :in => %w( IscsiStorageVolume LvmStorageVolume NfsStorageVolume ) + STATE_PENDING_SETUP = "pending_setup" STATE_PENDING_DELETION = "pending_deletion" STATE_AVAILABLE = "available" + validates_inclusion_of :state, + :in => [ STATE_PENDING_SETUP, STATE_PENDING_DELETION, STATE_AVAILABLE] + def self.factory(type, params = {}) params[:state] = STATE_PENDING_SETUP unless params[:state] case type @@ -131,4 +144,12 @@ class StorageVolume < ActiveRecord::Base return_hash end + def movable? + if vms.size > 0 or + (not lvm_storage_pool.nil? and not lvm_stoage_pool.movable?) + return false + end + return true + end + end diff --git a/src/app/models/task.rb b/src/app/models/task.rb index dd24e6a..17004df 100644 --- a/src/app/models/task.rb +++ b/src/app/models/task.rb @@ -45,6 +45,17 @@ class Task < ActiveRecord::Base COMPLETED_STATES = [STATE_FINISHED, STATE_FAILED, STATE_CANCELED] WORKING_STATES = [STATE_QUEUED, STATE_RUNNING, STATE_PAUSED] + validates_inclusion_of :type, + :in => %w( HostTask StorageTask StorageVolumeTask VmTask ) + + validates_inclusion_of :state, + :in => COMPLETED_STATES + WORKING_STATES + + # FIXME validate action depending on type / subclass + # validate task_target_id, task_type_id, arg, message + # depending on subclass, action, state + + TASK_TYPES_OPTIONS = [["VM Tasks", "VmTask"], ["Host Tasks", "HostTask"], ["Storage Tasks", "StorageTask"], @@ -89,4 +100,9 @@ class Task < ActiveRecord::Base ret_val += " #{args}" if args ret_val end + + def validate + errors.add("time_ended", "Tasks ends before its started") unless time_ended.nil? or time_started.nil? or time_ended > time_started + errors.add("time_started", "Tasks starts before its created") unless time_started.nil? or created_at.nil? or time_started > created_at + end end diff --git a/src/app/models/usage.rb b/src/app/models/usage.rb index 353e8f4..59b0e48 100644 --- a/src/app/models/usage.rb +++ b/src/app/models/usage.rb @@ -18,4 +18,10 @@ class Usage < ActiveRecord::Base has_and_belongs_to_many :networks, :join_table => 'networks_usages' + + validates_presence_of :label + validates_presence_of :usage + + validates_uniqueness_of :usage + end diff --git a/src/app/models/vm.rb b/src/app/models/vm.rb index 227f343..bf99e2d 100644 --- a/src/app/models/vm.rb +++ b/src/app/models/vm.rb @@ -34,7 +34,32 @@ class Vm < ActiveRecord::Base validates_presence_of :uuid, :description, :num_vcpus_allocated, :boot_device, :memory_allocated_in_mb, - :memory_allocated, :vnic_mac_addr + :memory_allocated, :vnic_mac_addr, + :vm_resource_pool_id + + validates_format_of :uuid, + :with => %r([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}) + + validates_numericality_of :needs_restart, + :greater_than_or_equal_to => 0, + :less_than_or_equal_to => 1, + :unless => Proc.new{ |vm| vm.needs_restart.nil? } + + validates_numericality_of :memory_used, + :greater_than_or_equal_to => 0, + :unless => Proc.new{ |vm| vm.memory_used.nil? } + + validates_numericality_of :vnc_port, + :greater_than_or_equal_to => 0, + :unless => Proc.new{ |vm| vm.vnc_port.nil? } + + validates_numericality_of :num_vcpus_allocated, + :greater_than_or_equal_to => 0, + :unless => Proc.new{ |vm| vm.num_vcpus_allocated.nil? } + + validates_numericality_of :memory_allocated, + :greater_than_or_equal_to => 0, + :unless => Proc.new{ |vm| vm.memory_allocated.nil? } acts_as_xapian :texts => [ :uuid, :description, :vnic_mac_addr, :state ], :terms => [ [ :search_users, 'U', "search_users" ] ], @@ -117,9 +142,14 @@ class Vm < ActiveRecord::Base STATE_SAVED => STATE_SAVED, STATE_RESTORING => STATE_RUNNING, STATE_MIGRATING => STATE_RUNNING, - STATE_CREATE_FAILED => STATE_CREATE_FAILED} + STATE_CREATE_FAILED => STATE_CREATE_FAILED, + STATE_INVALID => STATE_INVALID} TASK_STATE_TRANSITIONS = [] + validates_inclusion_of :state, + :in => EFFECTIVE_STATE.keys + + def get_hardware_pool pool = vm_resource_pool pool = pool.get_hardware_pool if pool @@ -311,7 +341,7 @@ class Vm < ActiveRecord::Base # FIXME: what should memory min/max be? errors.add("memory_allocated_in_mb", "must be at least 256 MB") unless not(memory_allocated_in_mb) or memory_allocated_in_mb >=256 # FIXME: what should cpu min/max - errors.add("num_vcpus_allocated", "must be between 1 and 16") unless (num_vcpus_allocated >=1 and num_vcpus_allocated <= 16) + errors.add("num_vcpus_allocated", "must be between 1 and 16") unless (num_vcpus_allocated.nil? or (num_vcpus_allocated >=1 and num_vcpus_allocated <= 16)) errors.add("memory_allocated_in_mb", "violates quota") unless not(memory_allocated) or resources[:memory].nil? or memory_allocated <= resources[:memory] errors.add("num_vcpus_allocated", "violates quota") unless not(num_vcpus_allocated) or resources[:cpus].nil? or num_vcpus_allocated <= resources[:cpus] errors.add_to_base("No available nics in quota") unless resources[:nics].nil? or resources[:nics] >= 1 diff --git a/src/host-browser/host-browser.rb b/src/host-browser/host-browser.rb index 52d2999..852d6bf 100755 --- a/src/host-browser/host-browser.rb +++ b/src/host-browser/host-browser.rb @@ -250,13 +250,13 @@ class HostBrowser puts "Saving new CPU records" cpu_info.collect do |cpu| detail = Cpu.new( - "cpu_number" => cpu['CPUNUM'], - "core_number" => cpu['CORENUM]'], - "number_of_cores" => cpu['NUMCORES'], + "cpu_number" => cpu['CPUNUM'].to_i, + "core_number" => cpu['CORENUM]'].to_i, + "number_of_cores" => cpu['NUMCORES'].to_i, "vendor" => cpu['VENDOR'], "model" => cpu['MODEL'], "family" => cpu['FAMILY'], - "cpuid_level" => cpu['CPUIDLVL'], + "cpuid_level" => cpu['CPUIDLVL'].to_i, "speed" => cpu['SPEED'], "cache" => cpu['CACHE'], "flags" => cpu['FLAGS']) @@ -290,7 +290,7 @@ class HostBrowser updated_nic = Nic.find_by_id(nic.id) - updated_nic.bandwidth = detail['BANDWIDTH'] + updated_nic.bandwidth = detail['BANDWIDTH'].to_i updated_nic.save! found=true @@ -310,7 +310,7 @@ class HostBrowser puts "Creating a new nic..." detail = Nic.new( 'mac' => nic['MAC'].upcase, - 'bandwidth' => nic['BANDWIDTH'], + 'bandwidth' => nic['BANDWIDTH'].to_i, 'usage_type' => 1) detail.physical_network = network diff --git a/src/test/fixtures/help_sections.yml b/src/test/fixtures/help_sections.yml index 5bf0293..d9f93e4 100644 --- a/src/test/fixtures/help_sections.yml +++ b/src/test/fixtures/help_sections.yml @@ -1,7 +1,11 @@ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -# one: -# column: value -# -# two: -# column: value +dashboard_help: + controller: dashboard + action: index + section: 'index.html' + +hardware_hosts_help: + controller: hardware + action: hosts + section: 'hardware_hosts.html' diff --git a/src/test/fixtures/hosts.yml b/src/test/fixtures/hosts.yml index 31e7580..4b97053 100644 --- a/src/test/fixtures/hosts.yml +++ b/src/test/fixtures/hosts.yml @@ -5,7 +5,7 @@ prod_corp_com: memory: 18384 is_disabled: 0 state: available - hypervisor_type: xen + hypervisor_type: KVM hardware_pool: corp_com workstation_corp_com: uuid: 1f2a8694-961d-11dc-9387-001558c41534 @@ -13,7 +13,8 @@ workstation_corp_com: arch: i386 memory: 2048 is_disabled: 0 - hypervisor_type: qemu + state: available + hypervisor_type: KVM hardware_pool: corp_com macworkstation_qa_corp_com: uuid: 58a85f44-75fd-4934-805f-88e45b40d4b4 @@ -21,7 +22,8 @@ macworkstation_qa_corp_com: arch: mips memory: 2048 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_qa fedoraworkstation_qa_corp_com: uuid: 520bbb34-6515-490e-9d07-0c8b14f76805 @@ -29,7 +31,8 @@ fedoraworkstation_qa_corp_com: arch: i386 memory: 2048 is_disabled: 1 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_qa pipeline_qa_corp_com: uuid: 2e422f66-324e-48d4-973f-0b91b33070f9 @@ -37,7 +40,8 @@ pipeline_qa_corp_com: arch: xeon memory: 1048576 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_qa app_qa_corp_com: uuid: bb0ce7c7-f234-49ae-84b5-6f4fd8bddcaa @@ -45,7 +49,8 @@ app_qa_corp_com: arch: xeon memory: 16384 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_qa issue_qa_corp_com: uuid: ec0d86de-657b-48f6-b7cc-e733a3f9a834 @@ -53,7 +58,8 @@ issue_qa_corp_com: arch: x86 memory: 4096 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_qa db_dev_corp_com: uuid: 81c15560-dbf4-45f5-9b75-106cdbd63aeb @@ -61,7 +67,8 @@ db_dev_corp_com: arch: x86 memory: 4096 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_dev mystation_dev_corp_com: uuid: 6ae3d22e-97e0-4d86-9712-5395b20a0f45 @@ -69,7 +76,8 @@ mystation_dev_corp_com: arch: i686 memory: 2048 is_disabled: 0 - hypervisor_type: xen + state: available + hypervisor_type: KVM hardware_pool: corp_com_dev node3_priv_ovirt_org: uuid: 75f8d5f3-faf0-4308-9f20-e4b03d013a27 @@ -77,16 +85,17 @@ node3_priv_ovirt_org: arch: x86_64 memory: 4194304 is_disabled: 0 - hypervisor_type: kvm - hardware_pool: default state: available + hypervisor_type: KVM + hardware_pool: default mailservers_managed_node: uuid: 182a8596-961d-11dc-9387-001558c41534 hostname: mail.mynetwork.com arch: i386 memory: 16384 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_prod fileserver_managed_node: uuid: 928ad8172-9723-11dc-9387-001558c41534 @@ -94,7 +103,8 @@ fileserver_managed_node: arch: x86_64 memory: 32768 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_prod ldapserver_managed_node: uuid: 919ae372-9156-11dc-9387-001558c41534 @@ -102,7 +112,8 @@ ldapserver_managed_node: arch: i386 memory: 16384 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_prod buildserver_managed_node: uuid: 6293acd9-2784-11dc-9387-001558c41534 @@ -110,7 +121,8 @@ buildserver_managed_node: arch: x86_64 memory: 65536 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_prod mediaserver_managed_node: uuid: 6293acd9-2784-11dc-9387-001558c41534 @@ -118,5 +130,6 @@ mediaserver_managed_node: arch: x86_64 memory: 65536 is_disabled: 0 - hypervisor_type: kvm + state: available + hypervisor_type: KVM hardware_pool: corp_com_prod diff --git a/src/test/fixtures/storage_pools.yml b/src/test/fixtures/storage_pools.yml index ac72f99..35bfc88 100644 --- a/src/test/fixtures/storage_pools.yml +++ b/src/test/fixtures/storage_pools.yml @@ -5,14 +5,25 @@ corp_com_ovirtpriv_storage: port: 3260 target: ovirtpriv:storage state: available + capacity: 1024 corp_com_nfs_ovirtnfs: hardware_pool: corp_com type: NfsStoragePool ip_addr: 192.168.50.2 export_path: /ovirtnfs + capacity: 1024 + state: available corp_com_dev_nfs_ovirtnfs: hardware_pool: corp_com_dev type: NfsStoragePool ip_addr: 192.168.50.3 export_path: /devnfs state: available + capacity: 1024 +corp_com_dev_lvm_ovirtlvm: + hardware_pool: corp_com_dev + type: LvmStoragePool + ip_addr: 192.168.50.3 + export_path: /devnfs + state: available + capacity: 1024 diff --git a/src/test/fixtures/usages.yml b/src/test/fixtures/usages.yml index 5bf0293..3bd72e6 100644 --- a/src/test/fixtures/usages.yml +++ b/src/test/fixtures/usages.yml @@ -1,7 +1,9 @@ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -# one: -# column: value -# -# two: -# column: value +management_usage: + label: management + usage: management + +guest_usage: + label: guest + usage: guest diff --git a/src/test/functional/resources_controller_test.rb b/src/test/functional/resources_controller_test.rb index 8e3989b..0312c0c 100644 --- a/src/test/functional/resources_controller_test.rb +++ b/src/test/functional/resources_controller_test.rb @@ -45,7 +45,7 @@ class ResourcesControllerTest < ActionController::TestCase def test_create assert_difference('VmResourcePool.count') do - post :create, :vm_resource_pool => { :name => 'foo_resource_pool' }, :parent_id => pools(:default).id + post :create, :pool => { :name => 'foo_resource_pool'}, :parent_id => pools(:default).id end assert_response :success diff --git a/src/test/functional/storage_controller_test.rb b/src/test/functional/storage_controller_test.rb index a448fdf..f08fe1b 100644 --- a/src/test/functional/storage_controller_test.rb +++ b/src/test/functional/storage_controller_test.rb @@ -69,11 +69,11 @@ class StorageControllerTest < Test::Unit::TestCase assert_not_nil assigns(:storage_pools) end - def test_create + def test_create_storage_controller hw_pool = HardwarePool.get_default_pool num_storage_volumes = StoragePool.count - post :create, :storage_type => 'NFS', :storage_pool => { :hardware_pool => hw_pool, :ip_addr => '111.121.131.141', :export_path => '/tmp/path' } + post :create, :storage_type => 'NFS', :storage_pool => { :hardware_pool => hw_pool, :ip_addr => '111.121.131.141', :export_path => '/tmp/path', :state => 'available', :capacity => 1024 } assert_response :success diff --git a/src/test/unit/bonding_test.rb b/src/test/unit/bonding_test.rb index 8b90cd5..33bfd56 100644 --- a/src/test/unit/bonding_test.rb +++ b/src/test/unit/bonding_test.rb @@ -35,6 +35,7 @@ class BondingTest < ActiveSupport::TestCase :bonding_type_id => bonding_types(:failover_bonding_type), :host_id => hosts(:mailservers_managed_node)) @bonding.vlan = networks(:dhcp_vlan_one) + @bonding.bonding_type = bonding_types(:load_balancing_bonding_type) end # Ensures that the name is required. @@ -69,6 +70,40 @@ class BondingTest < ActiveSupport::TestCase flunk 'Bondings have to have a host.' if @bonding.valid? end + def test_valid_fails_without_bonding_type + @bonding.bonding_type = nil + flunk 'Bonding must specify bonding type' if @bonding.valid? + end + + def test_valid_fails_without_vlan + @bonding.vlan = nil + flunk 'Bonding must specify vlan' if @bonding.valid? + end + + # Ensures that an arp ping address must have the correct format + # + def test_valid_fails_with_bad_arp_ping_address + @bonding.arp_ping_address = 'foobar' + + flunk "An arp ping address must be in the format ##.##.##.##." if @bonding.valid? + end + + # Ensures that an arp interval is a numerical value >= 0 + # + def test_valid_fails_with_bad_arp_interval + @bonding.arp_interval = -1 + + flunk "An arp interval must be >= 0" if @bonding.valid? + end + + def test_static_network_bonding_must_have_ip + @bonding.vlan = networks(:static_vlan_one) + @bonding.ip_addresses.delete_if { true } + + flunk 'Bonding assigned to static networks must have at least one ip' if @bonding.valid? + end + + # Ensure that retrieving a bonding returns its associated objects. # def test_find_all_for_host diff --git a/src/test/unit/boot_type_test.rb b/src/test/unit/boot_type_test.rb index a30e258..778f75a 100644 --- a/src/test/unit/boot_type_test.rb +++ b/src/test/unit/boot_type_test.rb @@ -19,8 +19,36 @@ require File.dirname(__FILE__) + '/../test_helper' class BootTypeTest < ActiveSupport::TestCase - # Replace this with your real tests. - def test_truth - assert true - end + fixtures :boot_types + + def setup + @boot_type = BootType.new( + :label => 'TestBootType', + :proto => 'static' ) + end + + def test_valid_fails_without_label + @boot_type.label = '' + + flunk 'Boot type must have label' if @boot_type.valid? + end + + def test_valid_fails_without_unique_label + @boot_type.label = 'Static IP' + + flunk 'Boot type must have unique label' if @boot_type.valid? + end + + def test_valid_fails_with_bad_proto + @boot_type.proto = 'foobar' + + flunk 'Boot type must have valid proto' if @boot_type.valid? + end + + def test_find_all_for_boot_type + result = BootType.find(:all) + + assert_equal 3, result.size, "Did not find right number of boot types" + end + end diff --git a/src/test/unit/cpu_test.rb b/src/test/unit/cpu_test.rb index 9558525..56e2d5d 100644 --- a/src/test/unit/cpu_test.rb +++ b/src/test/unit/cpu_test.rb @@ -1,10 +1,99 @@ +# Copyright (C) 2008 Red Hat, Inc. +# Written by Mohammed Morsi +# +# 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 File.dirname(__FILE__) + '/../test_helper' class CpuTest < ActiveSupport::TestCase fixtures :cpus + fixtures :hosts + + def setup + @cpu = Cpu.new( + :cpu_number => 3, + :core_number => 1, + :number_of_cores => 1, + :cpuid_level => 0, + :speed => 2048, + :vendor => 'foo', + :model => 'bar', + :family => 'alpha') + @cpu.host = hosts(:prod_corp_com) + end + + def test_find_cpus + assert_equal Cpu.find(:all).size, 8, "Failure retrieving all cpus" + + result = Cpu.find(cpus(:prod_corp_com_1).id) + assert_equal result.host.id, hosts(:prod_corp_com).id + end + + def test_valid_without_host + @cpu.host = nil + + flunk "CPUs must be associated with hosts" if @cpu.valid? + end + + def test_valid_with_bad_cpu_numer + @cpu.cpu_number = -1 + + flunk "cpu number must be >= 0" if @cpu.valid? + end + + def test_valid_with_bad_core_number + @cpu.core_number = -1 + + flunk "cpu core number must be >= 0" if @cpu.valid? + end + + def test_valid_with_bad_number_of_cores + @cpu.number_of_cores = 0 - # Replace this with your real tests. - def test_truth - assert true + flunk "cpu number of cores must be > 0" if @cpu.valid? end + + def test_valid_with_bad_cpuid_level + @cpu.cpuid_level = -1 + + flunk "cpu id level must be >= 0" if @cpu.valid? + end + + def test_valid_with_bad_speed + @cpu.speed = 0 + + flunk "cpu speed must be > 0" if @cpu.valid? + end + + def test_valid_without_vendor + @cpu.vendor = '' + + flunk "cpu vendor must be specified" if @cpu.valid? + end + + def test_valid_without_model + @cpu.model = '' + + flunk "cpu model must be specified" if @cpu.valid? + end + + def test_valid_without_family + @cpu.family = '' + + flunk "cpu family must be specified" if @cpu.valid? + end + end diff --git a/src/test/unit/help_section_test.rb b/src/test/unit/help_section_test.rb index a0e6a08..1596262 100644 --- a/src/test/unit/help_section_test.rb +++ b/src/test/unit/help_section_test.rb @@ -1,8 +1,51 @@ +# Copyright (C) 2008 Red Hat, Inc. +# Written by Mohammed Morsi +# +# 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 'test_helper' class HelpSectionTest < ActiveSupport::TestCase - # Replace this with your real tests. - def test_truth - assert true - end + fixtures :help_sections + + def setup + @help_section = HelpSection.new( + :controller => 'foo', + :action => 'bar', + :section => 'foobar') + end + + def test_unique_controller_action + @help_section.controller = 'dashboard' + @help_section.action = 'index' + + flunk 'help section must have unique controller / action' if @help_section.valid? + end + + def test_valid_fails_without_controller + @help_section.controller = '' + flunk 'help section controller must be specified' if @help_section.valid? + end + + def test_valid_fails_without_action + @help_section.action = '' + flunk 'help section action must be specified' if @help_section.valid? + end + + def test_valid_fails_without_section + @help_section.section = '' + flunk 'help section section must be specified' if @help_section.valid? + end end diff --git a/src/test/unit/host_test.rb b/src/test/unit/host_test.rb index a4ead5d..338fbaf 100644 --- a/src/test/unit/host_test.rb +++ b/src/test/unit/host_test.rb @@ -21,9 +21,63 @@ require File.dirname(__FILE__) + '/../test_helper' class HostTest < Test::Unit::TestCase fixtures :hosts + fixtures :pools + fixtures :vms - # Replace this with your real tests. - def test_truth - assert true + def setup + @host = Host.new( + :uuid => 'foobar', + :hostname => 'foobar', + :arch => 'x86_64', + :hypervisor_type => 'KVM', + :state => 'available') + + @host.hardware_pool = pools(:corp_com) + end + + def test_valid_fails_without_hardware_pool + @host.hardware_pool = nil + + flunk "Hosts must be associated w/ a hardware pool" if @host.valid? + end + + def test_valid_without_uuid + @host.uuid = nil + + flunk "Hosts don't need to be associated w/ a uuid" unless @host.valid? end + + + def test_valid_fails_without_hostname + @host.hostname = '' + + flunk "Hosts must be associated w/ a hostname" if @host.valid? + end + + + def test_valid_fails_without_arch + @host.arch = '' + + flunk "Hosts must be associated w/ an arch" if @host.valid? + end + + def test_valid_fails_with_bad_hypervisor_type + @host.hypervisor_type = 'foobar' + + flunk "Hosts must be associated w/ a valid hypervisor type" if @host.valid? + end + + def test_valid_fails_with_bad_state + @host.state = 'foobar' + + flunk "Hosts must be associated w/ a valid state" if @host.valid? + end + + def test_host_movable + assert_equal @host.movable?, true, "Hosts are movable unless associated w/ vms" + + @host.vms << vms(:production_httpd_vm) + assert_equal @host.movable?, false, "Hosts with associated vms are not movable" + end + end diff --git a/src/test/unit/ip_address_test.rb b/src/test/unit/ip_address_test.rb index 5ecff77..4cfc694 100644 --- a/src/test/unit/ip_address_test.rb +++ b/src/test/unit/ip_address_test.rb @@ -10,4 +10,9 @@ class IpAddressTest < ActiveSupport::TestCase def test_can_get_ipaddress_object assert_equal ip_addresses(:ip_v4_mailserver_nic_one).address, '172.31.0.15' end + + def test_valid_fails_without_foreign_entity + @ip_address = IpAddress.new + flunk "Ip Address must be associated with network, nic, or bonding" if @ip_address.valid? + end end diff --git a/src/test/unit/ip_v4_address_test.rb b/src/test/unit/ip_v4_address_test.rb index 65a08d3..9cb7362 100644 --- a/src/test/unit/ip_v4_address_test.rb +++ b/src/test/unit/ip_v4_address_test.rb @@ -24,7 +24,8 @@ class IpV4AddressTest < ActiveSupport::TestCase @address = IpV4Address.new(:address => '192.168.50.2', :netmask => '255.255.255.0', :gateway => '192.168.50.1', - :broadcast => '192.168.50.255') + :broadcast => '192.168.50.255', + :nic_id => 1) end # Ensures that an address must be supplied. diff --git a/src/test/unit/ip_v6_address_test.rb b/src/test/unit/ip_v6_address_test.rb index 070f407..96f212a 100644 --- a/src/test/unit/ip_v6_address_test.rb +++ b/src/test/unit/ip_v6_address_test.rb @@ -23,7 +23,8 @@ class IpV6AddressTest < ActiveSupport::TestCase def setup @address = IpV6Address.new(:address => 'fe80:0:0:0:200:f8ff:fe21:67cf', :gateway => ':::::::717', - :prefix => '0000:0000:0000:0000:1234:1234:1234:1234') + :prefix => '0000:0000:0000:0000:1234:1234:1234:1234', + :nic_id => 1) end # Ensures that the address must be provided. diff --git a/src/test/unit/nic_test.rb b/src/test/unit/nic_test.rb index 1de1e00..2644148 100644 --- a/src/test/unit/nic_test.rb +++ b/src/test/unit/nic_test.rb @@ -22,9 +22,61 @@ require File.dirname(__FILE__) + '/../test_helper' class NicTest < Test::Unit::TestCase fixtures :ip_addresses fixtures :nics + fixtures :hosts + fixtures :networks - # Replace this with your real tests. - def test_truth - assert true + def setup + @nic = Nic.new( + :mac => '00:11:22:33:44:55', + :usage_type => 1, + :bandwidth => 100 ) + @nic.host = hosts(:prod_corp_com) + @nic.physical_network = networks(:static_physical_network_one) + + @ip_address = IpV4Address.new( + :address => '1.2.3.4', + :netmask => '2.3.4.5', + :gateway => '3.4.5.6', + :broadcast => '4.5.6.7' ) + + @nic.ip_addresses << @ip_address + end + + def test_valid_fails_without_mac + @nic.mac = '' + + flunk 'Nic must have a mac' if @nic.valid? + end + + def test_valid_fails_with_invalid_mac + @nic.mac = 'foobar' + + flunk 'Nic must have a valid mac' if @nic.valid? + end + + def test_valid_fails_without_host + @nic.host = nil + + flunk 'Nic must have a host' if @nic.valid? end + + def test_valid_fails_without_physical_network + @nic.physical_network = nil + + flunk 'Nic must have a physical network' if @nic.valid? + end + + def test_valid_fails_with_invalid_bandwidth + @nic.bandwidth = -1 + + flunk 'Nic bandwidth must be >= 0' if @nic.valid? + end + + def test_static_network_nic_must_have_ip + @nic.physical_network = networks(:static_physical_network_one) + @nic.ip_addresses.delete_if { true } + + flunk 'Nics assigned to static networks must have at least one ip' if @nic.valid? + end + end diff --git a/src/test/unit/permission_test.rb b/src/test/unit/permission_test.rb index 5e2c7ba..0c0f4c7 100644 --- a/src/test/unit/permission_test.rb +++ b/src/test/unit/permission_test.rb @@ -21,6 +21,14 @@ require File.dirname(__FILE__) + '/../test_helper' class PermissionTest < Test::Unit::TestCase fixtures :permissions + fixtures :pools + + def setup + @permission = Permission.new( + :uid => 'foobar', + :user_role => 'Super Admin' ) + @permission.pool = pools(:root_dir_pool) + end # Replace this with your real tests. def test_simple_permission @@ -32,4 +40,24 @@ class PermissionTest < Test::Unit::TestCase assert_equal permissions(:ovirtadmin_default).inherited_from_id, permissions(:ovirtadmin_root).id assert_equal permissions(:ovirtadmin_default).parent_permission, permissions(:ovirtadmin_root) end + + def test_valid_fails_without_pool + @permission.pool = nil + flunk 'Permission must specify pool' if @permission.valid? + end + + def test_valid_fails_without_uid + @permission.uid = '' + flunk 'Permission must specify uid' if @permission.valid? + end + + def test_valid_fails_without_user_role + @permission.user_role = '' + flunk 'Permission must specify user role' if @permission.valid? + end + + def test_valid_fails_with_invalid_user_role + @permission.user_role = 'foobar' + flunk 'Permission must specify valid user role' if @permission.valid? + end end diff --git a/src/test/unit/pool_test.rb b/src/test/unit/pool_test.rb index 6f20f9f..c9a5554 100644 --- a/src/test/unit/pool_test.rb +++ b/src/test/unit/pool_test.rb @@ -22,6 +22,12 @@ require File.dirname(__FILE__) + '/../test_helper' class PoolTest < Test::Unit::TestCase fixtures :pools + def setup + @pool = Pool.new( + :name => 'foobar', + :type => 'DirectoryPool' ) + end + # Replace this with your real tests. def test_get_name assert_equal(pools(:corp_com_prod).name, 'Production Operations') @@ -30,4 +36,19 @@ class PoolTest < Test::Unit::TestCase def test_get_parent assert_equal(pools(:corp_com_prod).parent.name, 'corp.com') end + + def test_valid_fails_without_name + @pool.name = '' + flunk "Pool must specify name" if @pool.valid? + end + + def test_valid_fails_without_unique_name + @pool.name = 'root' + flunk "Pool must specify unique name" if @pool.valid? + end + + def test_valid_fails_with_invalid_type + @pool.name = 'foobar' + flunk "Pool must specify valid type" if @pool.valid? + end end diff --git a/src/test/unit/quota_test.rb b/src/test/unit/quota_test.rb index ac0fae0..5903cc8 100644 --- a/src/test/unit/quota_test.rb +++ b/src/test/unit/quota_test.rb @@ -21,9 +21,40 @@ require File.dirname(__FILE__) + '/../test_helper' class QuotaTest < Test::Unit::TestCase fixtures :quotas + fixtures :pools - # Replace this with your real tests. - def test_truth - assert true + def setup + @quota = Quota.new + @quota.pool = pools(:root_dir_pool) + end + + def test_valid_fails_without_pool + @quota.pool = nil + flunk "Quota's must specify pool" if @quota.valid? + end + + def test_valid_fails_with_bad_total_vcpus + @quota.total_vcpus = -1 + flunk "Quota must specify valid total vcpus" if @quota.valid? + end + + def test_valid_fails_with_bad_total_vmemory + @quota.total_vmemory = -1 + flunk "Quota must specify valid total vmemory" if @quota.valid? + end + + def test_valid_fails_with_bad_total_vnics + @quota.total_vnics = -1 + flunk "Quota must specify valid total vnics" if @quota.valid? + end + + def test_valid_fails_with_bad_total_storage + @quota.total_storage = -1 + flunk "Quota must specify valid total storage" if @quota.valid? + end + + def test_valid_fails_with_bad_total_vms + @quota.total_vms = -1 + flunk "Quota must specify valid total vms" if @quota.valid? end end diff --git a/src/test/unit/storage_pool_test.rb b/src/test/unit/storage_pool_test.rb index 8cc8d1b..4e18a8c 100644 --- a/src/test/unit/storage_pool_test.rb +++ b/src/test/unit/storage_pool_test.rb @@ -21,8 +21,53 @@ require File.dirname(__FILE__) + '/../test_helper' class StoragePoolTest < Test::Unit::TestCase fixtures :storage_pools + fixtures :pools + fixtures :vms + + def setup + @storage_pool = StoragePool.new( + :type => 'IscsiStoragePool', + :capacity => 100, + :state => 'available' ) + @storage_pool.hardware_pool = pools(:default) + end + + def test_valid_fails_without_hardware_pool + @storage_pool.hardware_pool = nil + flunk "Storage pool must specify hardware pool" if @storage_pool.valid? + end + + def test_valid_fails_with_bad_type + @storage_pool.type = 'foobar' + flunk 'Storage pool must specify valid type' if @storage_pool.valid? + end + + def test_valid_fails_with_bad_capacity + @storage_pool.capacity = -1 + flunk 'Storage pool must specify valid capacity >= 0' if @storage_pool.valid? + end + + def test_valid_fails_with_bad_state + @storage_pool.state = 'foobar' + flunk 'Storage pool must specify valid state' if @storage_pool.valid? + end def test_hardware_pool_relationship assert_equal 'corp.com', storage_pools(:corp_com_ovirtpriv_storage).hardware_pool.name end + + def test_movable + assert_equal @storage_pool.movable?, true, "Storage pool without volumes should be movable" + + storage_volume = StorageVolume.new( + :size => 100, + :type => 'IscsiStorageVolume', + :state => 'available' ) + @storage_pool.storage_volumes << storage_volume + + assert_equal @storage_pool.movable?, true, "Storage pool w/ movable storage volumes should be movable" + + storage_volume.vms << vms(:production_httpd_vm) + assert_equal @storage_pool.movable?, false, "Storage pool w/ unmovable storage volumes should not be movable" + end end diff --git a/src/test/unit/storage_volume_test.rb b/src/test/unit/storage_volume_test.rb index d0a89f4..3978685 100644 --- a/src/test/unit/storage_volume_test.rb +++ b/src/test/unit/storage_volume_test.rb @@ -21,9 +21,95 @@ require File.dirname(__FILE__) + '/../test_helper' class StorageVolumeTest < Test::Unit::TestCase fixtures :storage_volumes + fixtures :storage_pools + fixtures :vms + + def setup + @storage_volume = StorageVolume.new( + :size => 100, + :type => 'IscsiStorageVolume', + :state => 'available' ) + + @iscsi_storage_volume = IscsiStorageVolume.new( + :lun => 'foobar', + :size => 100, + :state => 'available' ) + + @lvm_storage_volume = LvmStorageVolume.new( + :lv_name => 'foobar', + :lv_owner_perms => '0700', + :lv_group_perms => '0777', + :lv_mode_perms => '0000' ) + + @storage_volume.storage_pool = storage_pools(:corp_com_ovirtpriv_storage) + @iscsi_storage_volume.storage_pool = storage_pools(:corp_com_ovirtpriv_storage) + @lvm_storage_volume.storage_pool = storage_pools(:corp_com_dev_lvm_ovirtlvm) + end # Replace this with your real tests. def test_relationship_to_storage_pool assert_equal 'corp.com', storage_volumes(:ovirtpriv_storage_lun_1).storage_pool.hardware_pool.name end + + + def test_valid_fails_with_bad_size + @storage_volume.size = -1 + + flunk "Storage volume size must be >= 0" if @storage_volume.valid? + end + + def test_valid_fails_with_bad_type + @storage_volume.type = 'foobar' + + flunk "Storage volume type must be valid" if @storage_volume.valid? + end + + def test_valid_fails_with_bad_state + @storage_volume.state = 'foobar' + flunk "Storage volume state must be valid" if @storage_volume.valid? + end + + def test_valid_fails_without_storage_pool + @storage_volume.storage_pool = nil + + flunk "Storage volume must be associated with a storage pool" if @storage_volume.valid? + end + + def test_valid_fails_without_lun + @iscsi_storage_volume.lun = '' + + flunk "iscsi storage volume lun must be valid" if @iscsi_storage_volume.valid? + end + + def test_valid_fails_without_lv_name + @lvm_storage_volume.lv_name = '' + + flunk "lvm storage volume lv_name must be valid" if @lvm_storage_volume.valid? + end + + def test_valid_fails_without_lv_owner_perms + @lvm_storage_volume.lv_owner_perms = '' + + flunk "lvm storage volume lv_owner_perms must be valid" if @lvm_storage_volume.valid? + end + + def test_valid_fails_without_lv_group_perms + @lvm_storage_volume.lv_group_perms = '' + + flunk "lvm storage volume lv_group_perms must be valid" if @lvm_storage_volume.valid? + end + + def test_valid_fails_without_lv_model_perms + @lvm_storage_volume.lv_mode_perms = '' + + flunk "lvm storage volume lv_model_perms must be valid" if @lvm_storage_volume.valid? + end + + def test_movable + assert_equal @storage_volume.movable?, true, "Storage volume without vms should be movable" + @storage_volume.vms << vms(:production_httpd_vm) + + assert_equal @storage_volume.movable?, false, "Storage volume w/ vms should not be movable" + end + end diff --git a/src/test/unit/task_test.rb b/src/test/unit/task_test.rb index 33a3bd8..ba780e7 100644 --- a/src/test/unit/task_test.rb +++ b/src/test/unit/task_test.rb @@ -22,6 +22,20 @@ require File.dirname(__FILE__) + '/../test_helper' class TaskTest < Test::Unit::TestCase fixtures :pools, :hosts, :vms, :permissions, :tasks + def setup + @task = Task.new( :type => 'HostTask', :state => 'finished' ) + end + + def test_valid_fails_with_bad_type + @task.type = 'foobar' + flunk 'Task must specify valid type' if @task.valid? + end + + def test_valid_fails_with_bad_state + @task.state = 'foobar' + flunk 'Task must specify valid state' if @task.valid? + end + def test_exercise_task_relationships assert_equal tasks(:shutdown_production_httpd_appliance_task).task_target.vm_resource_pool.name, 'corp.com production vmpool' assert_equal tasks(:shutdown_production_httpd_appliance_task).task_target.host.hostname, 'prod.corp.com' diff --git a/src/test/unit/usage_test.rb b/src/test/unit/usage_test.rb index 9a8ec9b..d6c989e 100644 --- a/src/test/unit/usage_test.rb +++ b/src/test/unit/usage_test.rb @@ -1,8 +1,47 @@ +# Copyright (C) 2008 Red Hat, Inc. +# +# 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 'test_helper' class UsageTest < ActiveSupport::TestCase - # Replace this with your real tests. - def test_truth - assert true - end + fixtures :usages + + def setup + @usage = Usage.new( + :label => 'TestUsage', + :usage => 'foobar' ) + end + + def test_valid_fails_without_label + @usage.label = '' + + flunk 'Usage must have label' if @usage.valid? + end + + def test_valid_fails_without_usage + @usage.usage = '' + + flunk 'Usage must have usage' if @usage.valid? + end + + def test_valid_fails_without_unique_usage + @usage.usage = 'management' + + flunk 'Usage must have unique usage' if @usage.valid? + end + end diff --git a/src/test/unit/vm_test.rb b/src/test/unit/vm_test.rb index a196130..cba3188 100644 --- a/src/test/unit/vm_test.rb +++ b/src/test/unit/vm_test.rb @@ -21,6 +21,7 @@ require File.dirname(__FILE__) + '/../test_helper' class VmTest < Test::Unit::TestCase fixtures :vms + fixtures :pools def setup @vm_name = "Test" @@ -29,6 +30,69 @@ class VmTest < Test::Unit::TestCase "#{Vm::IMAGE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{@vm_name}" @cobbler_profile_provisioning = "#{Vm::PROFILE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{@vm_name}" + + @vm = Vm.new( + :uuid => '00000000-1111-2222-3333-444444444444', + :description => 'foobar', + :num_vcpus_allocated => 1, + :boot_device => 'hd', + :memory_allocated_in_mb => 1, + :memory_allocated => 1024, + :vnic_mac_addr => '11:22:33:44:55:66') + + @vm.vm_resource_pool = pools(:corp_com_production_vmpool) + end + + def test_valid_fails_with_bad_uuid + @vm.uuid = 'foobar' + flunk "Vm must specify valid uuid" if @vm.valid? + end + + def test_valid_fails_without_description + @vm.description = '' + flunk 'Vm must specify description' if @vm.valid? + end + + def test_valid_fails_without_num_vcpus_allocated + @vm.num_vcpus_allocated = nil + flunk 'Vm must specify num_vcpus_allocated' if @vm.valid? + end + + def test_valid_fails_without_boot_device + @vm.boot_device = '' + flunk 'Vm must specify boot_device' if @vm.valid? + end + + + def test_valid_fails_without_memory_allocated + @vm.memory_allocated = '' + flunk 'Vm must specify memory_allocated' if @vm.valid? + end + + + def test_valid_fails_without_memory_allocated_in_mb + @vm.memory_allocated_in_mb = '' + flunk 'Vm must specify memory_allocated_in_mb' if @vm.valid? + end + + def test_valid_fails_without_vnic_mac_addr + @vm.vnic_mac_addr = '' + flunk 'Vm must specify vnic_mac_addr' if @vm.valid? + end + + def test_valid_fails_without_vm_resources_pool_id + @vm.vm_resource_pool_id = '' + flunk 'Vm must specify vm_resources_pool_id' if @vm.valid? + end + + def test_valid_fails_with_bad_needs_restart + @vm.needs_restart = 5 + flunk 'Vm must specify valid needs_restart' if @vm.valid? + end + + def test_valid_fails_with_bad_state + @vm.state = 'foobar' + flunk 'Vm must specify valid state' if @vm.valid? end # Ensures that, if the VM does not contain the Cobbler prefix, that it -- 1.6.0.6 From mmorsi at redhat.com Thu Jan 15 20:46:18 2009 From: mmorsi at redhat.com (Mohammed Morsi) Date: Thu, 15 Jan 2009 15:46:18 -0500 Subject: [Ovirt-devel] [PATCH server] add option to forward node's / vm's vnc port in server/taskomatic Message-ID: <1232052378-8554-1-git-send-email-mmorsi@redhat.com> this patch adds a 'Forward vnc port locally' checkbox and 'port' text box to the vm create / edit form. Fields are added to the database to support the user's selection and taskomatic is updated to configure the local firewall accordingly. this patch has been tested up to setting the fields via the wui and using these fields to correctly configure the firewall via taskomatic. testing connecting to the vm via vnc/virt/ovirt-viewer hasn't is in progress and thus this may need some additional work. --- src/app/controllers/vm_controller.rb | 2 + src/app/models/vm.rb | 4 + src/app/views/vm/_form.rhtml | 14 ++++ src/app/views/vm/show.rhtml | 4 + src/db/migrate/034_add_vm_vnc.rb | 30 +++++++++ src/task-omatic/task_vm.rb | 6 ++- src/task-omatic/vnc.rb | 109 ++++++++++++++++++++++++++++++++++ 7 files changed, 168 insertions(+), 1 deletions(-) create mode 100644 src/db/migrate/034_add_vm_vnc.rb create mode 100644 src/task-omatic/vnc.rb diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb index 701dea8..8622b89 100644 --- a/src/app/controllers/vm_controller.rb +++ b/src/app/controllers/vm_controller.rb @@ -116,6 +116,7 @@ class VmController < ApplicationController new_storage_ids = new_storage_ids.sort.collect {|x| x.to_i } needs_restart = true unless current_storage_ids == new_storage_ids end + params[:vm][:forward_vnc] = params[:forward_vnc] params[:vm][:needs_restart] = 1 if needs_restart @vm.update_attributes!(params[:vm]) _setup_vm_provision(params) @@ -346,6 +347,7 @@ class VmController < ApplicationController vm_resource_pool.create_with_parent(hardware_pool) params[:vm][:vm_resource_pool_id] = vm_resource_pool.id end + params[:vm][:forward_vnc] = params[:forward_vnc] @vm = Vm.new(params[:vm]) @perm_obj = @vm.vm_resource_pool @redir_controller = 'resources' diff --git a/src/app/models/vm.rb b/src/app/models/vm.rb index 227f343..cbc5ec0 100644 --- a/src/app/models/vm.rb +++ b/src/app/models/vm.rb @@ -36,6 +36,10 @@ class Vm < ActiveRecord::Base :boot_device, :memory_allocated_in_mb, :memory_allocated, :vnic_mac_addr + validates_numericality_of :forward_vnc_port, + :greater_than => 0, + :if => Proc.new { |vm| vm.forward_vnc } + acts_as_xapian :texts => [ :uuid, :description, :vnic_mac_addr, :state ], :terms => [ [ :search_users, 'U', "search_users" ] ], :eager_load => :smart_pools diff --git a/src/app/views/vm/_form.rhtml b/src/app/views/vm/_form.rhtml index 523e81e..ffc9dd7 100644 --- a/src/app/views/vm/_form.rhtml +++ b/src/app/views/vm/_form.rhtml @@ -51,6 +51,20 @@
    
    +
    + <%= check_box_tag_with_label "Forward vm's vnc port locally", "forward_vnc", 1, @vm.forward_vnc %> +
    +
    + <%= text_field_with_label "", "vm", "forward_vnc_port", { :style=>"width: 80px;", :size => 7, :disabled => ! @vm.forward_vnc } %> +
    +
    +
    + + <%= check_box_tag_with_label "Start VM Now? (pending current resource availability)", "start_now", nil if create or @vm.state == Vm::STATE_STOPPED %> <%= check_box_tag_with_label "Restart VM Now? (pending current resource availability)", "restart_now", nil if @vm.state == Vm::STATE_RUNNING %> diff --git a/src/app/views/vm/show.rhtml b/src/app/views/vm/show.rhtml index f361131..add29b4 100644 --- a/src/app/views/vm/show.rhtml +++ b/src/app/views/vm/show.rhtml @@ -88,6 +88,7 @@
    <%= @vm.id %>
    
    Uuid:
    + <%= @vm.forward_vnc ? "VNC uri:
    " : "" %> Num vcpus allocated:
    Num vcpus used:
    Memory allocated:
    @@ -100,6 +101,9 @@
    
    <%=h @vm.uuid %>
    + <%= url = request.url + url = request.url[0..(url.index('/', 8) - 1)] + ":" + @vm.forward_vnc_port.to_s + @vm.forward_vnc ? (url + "
    ") : "" %> <%=h @vm.num_vcpus_allocated %>
    <%=h @vm.num_vcpus_used %>
    <%=h @vm.memory_allocated_in_mb %> MB
    diff --git a/src/db/migrate/034_add_vm_vnc.rb b/src/db/migrate/034_add_vm_vnc.rb new file mode 100644 index 0000000..a93e457 --- /dev/null +++ b/src/db/migrate/034_add_vm_vnc.rb @@ -0,0 +1,30 @@ +# Copyright (C) 2008 Red Hat, Inc. +# Written by Mohammed Morsi +# +# 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. + +class AddVmVnc < ActiveRecord::Migration + def self.up + add_column :vms, :forward_vnc, :bool, :default => false + add_column :vms, :forward_vnc_port, :int, :default => 0 + end + + def self.down + drop_column :vms, :forward_vnc + drop_column :vms, :forward_vnc_port + end +end + diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb index c187287..8481dd0 100644 --- a/src/task-omatic/task_vm.rb +++ b/src/task-omatic/task_vm.rb @@ -20,6 +20,7 @@ require 'rexml/document' include REXML require 'utils' +require 'vnc' gem 'cobbler' require 'cobbler' @@ -286,6 +287,8 @@ def shut_or_destroy_vm(task, which) vm_orig_state = vm.state setVmState(vm, Vm::STATE_STOPPING) + closeVmVncPort(vm) + begin conn = Libvirt::open("qemu+tcp://" + vm.host.hostname + "/system") dom = conn.lookup_domain_by_uuid(vm.uuid) @@ -428,7 +431,8 @@ def start_vm(task) dom.create setVmVncPort(vm, dom) - rescue + forwardVmVncPort(vm) + rescue Exception => ex if dom != nil dom.undefine end diff --git a/src/task-omatic/vnc.rb b/src/task-omatic/vnc.rb new file mode 100644 index 0000000..d78485a --- /dev/null +++ b/src/task-omatic/vnc.rb @@ -0,0 +1,109 @@ +# Copyright (C) 2008 Red Hat, Inc. +# Written by Mohammed Morsi +# +# 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. + +# FIXME no ruby/libiptc wrapper exists, when +# it does replace iptables command w/ calls to it + at iptables_cmd='/sbin/iptables ' + +# FIXME replace this w/ dnsruby inclusion / call + at dns_lookup_cmd='/usr/bin/dig' + + at vnc_debug = false + +############################## 'private' methods + +def _debug(msg) + puts "\n" + msg + "\n" if @vnc_debug +end + +def _findVmHostIp(vm) + cmdout='/tmp/ovirtvnc' + vm.forward_vnc_port.to_s + cmd=@dns_lookup_cmd + ' ' + vm.host.hostname + + ' +noall +answer +short > ' + cmdout + + system(cmd) + + result = File.read(cmdout).rstrip + _debug( "vm host hostname resolved to " + result.to_s ) + return result +end + +def _vncPortOpen?(port) + cmdout='/tmp/ovirtvnc' + port.to_s + cmd=@iptables_cmd + ' -t nat -nL | grep ' + port.to_s + + ' > ' + cmdout + _debug("vncPortOpen? iptables command: " + cmd + + " cmdout " + cmdout) + + system(cmd) + + return File.size(cmdout) != 0 +end + +def _natRoutingFilter(vm) + return " -p tcp --dport " + vm.forward_vnc_port.to_s + + " -j DNAT --to " + _findVmHostIp(vm) + ":" + vm.forward_vnc_port.to_s + " " +end + +def _masqRoutingFilter(vm) + return " -d " + _findVmHostIp(vm) + " -j MASQUERADE " +end + +############################## 'public' methods + + +def forwardVmVncPort(vm) + return unless vm.forward_vnc + unless vm.forward_vnc_port > 0 + raise "Must specify valid port to forward " + vm.forward_vnc_port.to_s + end + + if _vncPortOpen?(vm.forward_vnc_port) + raise "Port already open " + vm.forward_vnc_port.to_s + end + + nat_rule = @iptables_cmd + " -t nat -A PREROUTING " + + _natRoutingFilter(vm) + masq_rule = @iptables_cmd + " -t nat -A POSTROUTING " + + _masqRoutingFilter(vm) + _debug("forwardVmVncPort nat_rule: " + nat_rule + + " masq_rule: " + masq_rule) + system(nat_rule) + system(masq_rule) +end + +def closeVmVncPort(vm) + # FIXME forward_vnc may have been changed while the vm is running + return unless vm.forward_vnc + unless vm.forward_vnc_port > 0 + raise "Must specify valid port to forward " + vm.forward_vnc_port.to_s + end + + unless _vncPortOpen?(vm.forward_vnc_port) + raise "Port not open " + vm.forward_vnc_port.to_s + end + + nat_rule = @iptables_cmd + " -t nat -D PREROUTING " + + _natRoutingFilter(vm) + masq_rule = @iptables_cmd + " -t nat -D POSTROUTING " + + _masqRoutingFilter(vm) + _debug("closeVmVncPort nat_rule: " + nat_rule + + " masq_rule: " + masq_rule) + system(nat_rule) + system(masq_rule) +end -- 1.6.0.6 From dpierce at redhat.com Thu Jan 15 21:03:46 2009 From: dpierce at redhat.com (Darryl L. Pierce) Date: Thu, 15 Jan 2009 16:03:46 -0500 Subject: [Ovirt-devel] [PATCH node] Neworking changes are stored to /config when saved. Message-ID: <1232053426-25860-1-git-send-email-dpierce@redhat.com> Signed-off-by: Darryl L. Pierce --- scripts/ovirt-config-networking | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/scripts/ovirt-config-networking b/scripts/ovirt-config-networking index 52af071..4065c2e 100755 --- a/scripts/ovirt-config-networking +++ b/scripts/ovirt-config-networking @@ -191,6 +191,7 @@ if [ "$RESTART" == "Y" ]; then { cat "$WORKDIR"/augtool-* && printf "save\n"; } > $config \ && augtool < $config \ && service network restart + ovirt_store_config } 2>&1 | tee $CONFIG_LOG_FILE fi -- 1.6.0.6 From pmyers at redhat.com Thu Jan 15 21:10:03 2009 From: pmyers at redhat.com (Perry Myers) Date: Thu, 15 Jan 2009 16:10:03 -0500 Subject: [Ovirt-devel] [PATCH node] Added a wrapper script around the boot menu item to describe In-Reply-To: <1232030364-29636-1-git-send-email-bkearney@redhat.com> References: <496F3F18.5080509@redhat.com> <1232030364-29636-1-git-send-email-bkearney@redhat.com> Message-ID: <496FA62B.6070500@redhat.com> Bryan Kearney wrote: > This is a resend of the earlier patch. Based on discussions on the list, there > is enough boundary condition testing, but we added a stronger reminder > to do all the configuration before reboot. ACK, this can be pushed. Thanks! Perry From imain at redhat.com Thu Jan 15 23:09:33 2009 From: imain at redhat.com (Ian Main) Date: Thu, 15 Jan 2009 15:09:33 -0800 Subject: [Ovirt-devel] ovirt-server patch for error 'Attempted to update a stale object' In-Reply-To: <1232032510.24610.2.camel@dima-desktop> References: <1232032510.24610.2.camel@dima-desktop> Message-ID: <20090115150933.620d24e0@tp.mains.net> On Thu, 15 Jan 2009 18:15:10 +0300 ??????? ??????? wrote: > patch for error 'Attempted to update a stale object' > > diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb > index c187287..fddc594 100644 > --- a/src/task-omatic/task_vm.rb > +++ b/src/task-omatic/task_vm.rb > @@ -196,8 +196,18 @@ def create_vm_xml(name, uuid, memAllocated, > memUsed, vcpus, bootDevice, > end > > def setVmState(vm, state) > - vm.state = state > - vm.save! > + attempts = 0 > + begin > + vm.state = state > + vm.save! > + rescue ActiveRecord::StaleObjectError > + puts "error with stale object" > + if attempts < 3 > + attempts += 1 > + vm.reload > + retry > + end > + end > end Interesting. I know when doing certain long operations it can fail; never considered catching that and doing a retry. I'll push a similar patch shortly. I may just remove the puts and I'm not sure how many attempts we want to make? Anyway I'll play with it. Thanks! Ian From bkearney at redhat.com Fri Jan 16 01:49:22 2009 From: bkearney at redhat.com (Bryan Kearney) Date: Thu, 15 Jan 2009 20:49:22 -0500 Subject: [Ovirt-devel] [PATCH node] mounting of persistent config In-Reply-To: <1232029228-11726-1-git-send-email-apevec@redhat.com> References: <1232029228-11726-1-git-send-email-apevec@redhat.com> Message-ID: <496FE7A2.9020509@redhat.com> Alan Pevec wrote: > This patch series reworks mounting of persistent config > to use STATE_MOUNT in rc.sysinit so configs take effect early enough > e.g. /etc/fstab > > _______________________________________________ > Ovirt-devel mailing list > Ovirt-devel at redhat.com > https://www.redhat.com/mailman/listinfo/ovirt-devel BTW... Ack on all these as well. -- bk From bkearney at redhat.com Fri Jan 16 01:49:47 2009 From: bkearney at redhat.com (Bryan Kearney) Date: Thu, 15 Jan 2009 20:49:47 -0500 Subject: [Ovirt-devel] [PATCH node-image] prepare for STATE_MOUNT in rc.sysinit In-Reply-To: <1232029015-11539-1-git-send-email-apevec@redhat.com> References: <1232029015-11539-1-git-send-email-apevec@redhat.com> Message-ID: <496FE7BB.9020002@redhat.com> Alan Pevec wrote: > --- > ovirt-node-image.ks | 14 ++++++++++++++ > 1 files changed, 14 insertions(+), 0 deletions(-) > > diff --git a/ovirt-node-image.ks b/ovirt-node-image.ks > index cafbf34..84abeaa 100644 > --- a/ovirt-node-image.ks > +++ b/ovirt-node-image.ks > @@ -14,6 +14,20 @@ rm -f /var/lib/rpm/__db* > > touch /.autorelabel > > +# prepare for STATE_MOUNT in rc.sysinit > +augtool < +set /files/etc/sysconfig/readonly-root/TEMPORARY_STATE yes > +set /files/etc/sysconfig/readonly-root/STATE_LABEL CONFIG > +set /files/etc/sysconfig/readonly-root/STATE_MOUNT /config > +save > +EOF > + > +# prepare mount points for local storage > +mkdir /boot > +mkdir /config > +mkdir /data > +mkdir /liveos > +echo "/dev/HostVG/Config /config ext3 defaults 0 0" >> /etc/fstab > %end > > %post ACK -- bk From clalance at redhat.com Fri Jan 16 07:55:34 2009 From: clalance at redhat.com (Chris Lalancette) Date: Fri, 16 Jan 2009 08:55:34 +0100 Subject: [Ovirt-devel] ovirt-server patch for error 'Attempted to update a stale object' In-Reply-To: <20090115150933.620d24e0@tp.mains.net> References: <1232032510.24610.2.camel@dima-desktop> <20090115150933.620d24e0@tp.mains.net> Message-ID: <49703D76.9000001@redhat.com> Ian Main wrote: > On Thu, 15 Jan 2009 18:15:10 +0300 ??????? ??????? > wrote: > >> patch for error 'Attempted to update a stale object' >> >> diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb index >> c187287..fddc594 100644 --- a/src/task-omatic/task_vm.rb +++ >> b/src/task-omatic/task_vm.rb @@ -196,8 +196,18 @@ def create_vm_xml(name, >> uuid, memAllocated, memUsed, vcpus, bootDevice, end >> >> def setVmState(vm, state) - vm.state = state - vm.save! + attempts = 0 + >> begin + vm.state = state + vm.save! + rescue >> ActiveRecord::StaleObjectError + puts "error with stale object" + if >> attempts < 3 + attempts += 1 + vm.reload + retry + end + >> end end > > Interesting. I know when doing certain long operations it can fail; never > considered catching that and doing a retry. I'll push a similar patch > shortly. I may just remove the puts and I'm not sure how many attempts we > want to make? Anyway I'll play with it. Thanks! This doesn't actually make sense to me, though; isn't a StaleObject exception actually a sign of some deeper problem? The last time I started getting these, it was indeed a problem; I was removing an object (with object.delete), and then later modifying the object, which was throwing these exceptions. I think we need to understand why we are getting a StaleObject first (or am I completely missing what's going on here?). -- Chris Lalancette From d.vasilets at peterhost.ru Fri Jan 16 11:48:15 2009 From: d.vasilets at peterhost.ru (=?koi8-r?Q?=F7=C1=D3=C9=CC=C5=C3_?= =?koi8-r?Q?=E4=CD=C9=D4=D2=C9=CA?=) Date: Fri, 16 Jan 2009 14:48:15 +0300 Subject: [Ovirt-devel] ovirt-server patch for error 'Attempted to update a stale object' In-Reply-To: <49703D76.9000001@redhat.com> References: <1232032510.24610.2.camel@dima-desktop> <20090115150933.620d24e0@tp.mains.net> <49703D76.9000001@redhat.com> Message-ID: <1232106495.13511.6.camel@dima-desktop> ? ???, 16/01/2009 ? 08:55 +0100, Chris Lalancette ?????: > Ian Main wrote: > > On Thu, 15 Jan 2009 18:15:10 +0300 ??????? ??????? > > wrote: > > > >> patch for error 'Attempted to update a stale object' > >> > >> diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb index > >> c187287..fddc594 100644 --- a/src/task-omatic/task_vm.rb +++ > >> b/src/task-omatic/task_vm.rb @@ -196,8 +196,18 @@ def create_vm_xml(name, > >> uuid, memAllocated, memUsed, vcpus, bootDevice, end > >> > >> def setVmState(vm, state) - vm.state = state - vm.save! + attempts = 0 + > >> begin + vm.state = state + vm.save! + rescue > >> ActiveRecord::StaleObjectError + puts "error with stale object" + if > >> attempts < 3 + attempts += 1 + vm.reload + retry + end + > >> end end > > > > Interesting. I know when doing certain long operations it can fail; never > > considered catching that and doing a retry. I'll push a similar patch > > shortly. I may just remove the puts and I'm not sure how many attempts we > > want to make? Anyway I'll play with it. Thanks! > > This doesn't actually make sense to me, though; isn't a StaleObject exception > actually a sign of some deeper problem? The last time I started getting these, > it was indeed a problem; I was removing an object (with object.delete), and then > later modifying the object, which was throwing these exceptions. I think we > need to understand why we are getting a StaleObject first (or am I completely > missing what's going on here?). > i think that method setVmState only do update state of vm. during migration very often appear staleObject error. => in database old data about vm and we can't manipulate it. From nigjones at redhat.com Fri Jan 16 14:53:29 2009 From: nigjones at redhat.com (Nigel Jones) Date: Fri, 16 Jan 2009 09:53:29 -0500 (EST) Subject: [Ovirt-devel] iSCSI LVM Issues (State remains pending_setup) In-Reply-To: <1952711617.1461671232117470414.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: <1543020689.1461891232117609427.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Hi Guys, Having a bit of an issue with oVirt and it's Logical Voluming of an iSCSI target. Problem Overview: Upon creating an adding an iSCSI target to the oVirt management interface and having it initialised, clicking the 'Add new volume' feature creates a logical volume in the interface with a status of 'pending_setup'. Reproduction: On the physical hardware: [root at physical ~]# lvcreate -n iSCSI3 -L +15G /dev/VolGroup00 [root at physical ~]# tgtadm --lld iscsi --op new --mode target --tid 3 -T ovirt1:iscsi1 [root at physical ~]# tgtadm --lld iscsi --op new --mode logicalunit --tid 3 --lun 1 -b /dev/VolGroup00/iSCSI3 [root at physical ~]# tgtadm --lld iscsi --op bind --mode target --tid 3 -I ALL tgtadm shows the following information: Target 3: ovirt1:iscsi1 System information: Driver: iscsi State: ready I_T nexus information: LUN information: LUN: 0 Type: controller SCSI ID: deadbeaf3:0 SCSI SN: beaf30 Size: 0 MB Online: Yes Removable media: No Backing store: No backing store LUN: 1 Type: disk SCSI ID: deadbeaf3:1 SCSI SN: beaf31 Size: 16106 MB Online: Yes Removable media: No Backing store: /dev/VolGroup00/iSCSI3 Account information: ACL information: ALL I then go to the oVirt interface, click on default, Storage, Add Storage Server. I choose: Type: iSCSI IP: 192.168.50.1 Port: Default Target: ovirt1:iscsi1 and add it. Upon switching to something else and back to the storage tab (seems like a workaround to a 'bug' :P), I get the + icon next to 'iSCSI: 192.168.50.1:ovirt1:iscsi1'. I then click on iSCSI: 192.168.50.1:ovirt:iscsi1:lun-1(15 GB) and choose 'Add New Volume'. Size: 5 GB LV Name: ovirttest Permissions, all 0744 Which creates a node under the tree: 'LVM: ovirt_vg_5:ovirttest(5 GB)' which has state showing as 'pending_setup'. If I click on Tasks, and change the filter to All and All, I see a failed entry for: Type: StorageVolume Item: LVM: ovirt_vg_5:ovirttest Action: create_volume State: failed User: ovirtadmin Created: recent timestamp Args: Message: Call to function virStoragePoolBuild failed (note that these LVMs are impossible to delete) They change to pending_deletion, action changes to 'delete_volume' and virStoragePoolBuild is the same. taskomatic.log has: libvir: Storage error : invalid storage volume pointer in no storage vol with matching path refresh_pool One of the logical volumes in VolGroup00 is not part of the pool of type IscsiStoragePool that we are scanning; ignore the previous error! done libvir: error : internal error '/sbin/vgcreate ovirt_vg_5 /dev/disk/by-id/scsi-S_beaf31' exited with non-zero status 5 and signal 0: No physical volume label read from /dev/disk/by-id/scsi-S_beaf31 /dev/disk/by-id/scsi-S_beaf31 not identified as an existing physical volume Unable to add physical volume '/dev/disk/by-id/scsi-S_beaf31' to volume group 'ovirt_vg_5'. create_volume Task action processing failed: Libvirt::Error: Call to function virStoragePoolBuild failed /usr/share/ovirt-server/task-omatic/./utils.rb:62:in `build' /usr/share/ovirt-server/task-omatic/./utils.rb:62:in `connect' /usr/share/ovirt-server/task-omatic/./task_storage.rb:225:in `create_volume' /usr/share/ovirt-server/task-omatic/taskomatic.rb:110 /usr/share/ovirt-server/task-omatic/taskomatic.rb:88:in `each' /usr/share/ovirt-server/task-omatic/taskomatic.rb:88 /usr/share/ovirt-server/task-omatic/taskomatic.rb:68:in `loop' /usr/share/ovirt-server/task-omatic/taskomatic.rb:68 done I wonder if a step is been missed? Regards, Nigel From slinabery at redhat.com Fri Jan 16 15:52:29 2009 From: slinabery at redhat.com (Steve Linabery) Date: Fri, 16 Jan 2009 09:52:29 -0600 Subject: [Ovirt-devel] ovirt-server patch for error 'Attempted to update a stale object' In-Reply-To: <49703D76.9000001@redhat.com> References: <1232032510.24610.2.camel@dima-desktop> <20090115150933.620d24e0@tp.mains.net> <49703D76.9000001@redhat.com> Message-ID: <20090116155228.GA7562@redhat.com> On Fri, Jan 16, 2009 at 08:55:34AM +0100, Chris Lalancette wrote: > Ian Main wrote: > > On Thu, 15 Jan 2009 18:15:10 +0300 ??????? ??????? > > wrote: > > > >> patch for error 'Attempted to update a stale object' > >> > >> diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb index > >> c187287..fddc594 100644 --- a/src/task-omatic/task_vm.rb +++ > >> b/src/task-omatic/task_vm.rb @@ -196,8 +196,18 @@ def create_vm_xml(name, > >> uuid, memAllocated, memUsed, vcpus, bootDevice, end > >> > >> def setVmState(vm, state) - vm.state = state - vm.save! + attempts = 0 + > >> begin + vm.state = state + vm.save! + rescue > >> ActiveRecord::StaleObjectError + puts "error with stale object" + if > >> attempts < 3 + attempts += 1 + vm.reload + retry + end + > >> end end > > > > Interesting. I know when doing certain long operations it can fail; never > > considered catching that and doing a retry. I'll push a similar patch > > shortly. I may just remove the puts and I'm not sure how many attempts we > > want to make? Anyway I'll play with it. Thanks! > > This doesn't actually make sense to me, though; isn't a StaleObject exception > actually a sign of some deeper problem? The last time I started getting these, > it was indeed a problem; I was removing an object (with object.delete), and then > later modifying the object, which was throwing these exceptions. I think we > need to understand why we are getting a StaleObject first (or am I completely > missing what's going on here?). > > -- > Chris Lalancette This is coming from Rails Transactions' optimistic locking support... http://api.rubyonrails.com/classes/ActiveRecord/Locking/Optimistic.html --steve From dpierce at redhat.com Fri Jan 16 19:42:45 2009 From: dpierce at redhat.com (Darryl L. Pierce) Date: Fri, 16 Jan 2009 14:42:45 -0500 Subject: [Ovirt-devel] [PATCH] Added an error message for when partitioning fails. Message-ID: <1232134965-15593-1-git-send-email-dpierce@redhat.com> Each call to create an LVM is checked to see if it completed successfully. If it fails, a message is shown to the user and the partition stops with a failure. Signed-off-by: Darryl L. Pierce --- scripts/ovirt-config-storage | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage index f68e058..3d2e70d 100755 --- a/scripts/ovirt-config-storage +++ b/scripts/ovirt-config-storage @@ -8,9 +8,18 @@ . /etc/init.d/ovirt-functions +PARTITION_LOG=/var/log/ovirt-partition.log + ME=$(basename "$0") warn() { printf '%s: %s\n' "$ME" "$*" >&2; } die() { warn "$*"; exit 1; } +fail() +{ + printf "\nFailed while creating the $1 partition.\n"; + printf "Please see $PARTITION_LOG for more information.\n"; + exit 1; +} + default_boot_size=50 default_root_size=256 @@ -178,13 +187,9 @@ perform_partitioning() printf "Preparing local storage. Please wait..." - LOG=/var/log/ovirt-partition.log { wipe_lvm_on_disk - # Exit upon any failure. - set -e - # FIXME: save a backup copy, just in case? dd if=/dev/zero of=$DRIVE bs=1024K count=1 blockdev --rereadpt $DRIVE @@ -217,34 +222,28 @@ perform_partitioning() ln -snf "${DRIVE}1" /dev/disk/by-label/BOOT if [ "$SWAP_SIZE" -gt 0 ]; then - lvcreate --name Swap --size ${SWAP_SIZE}M /dev/HostVG + lvcreate --name Swap --size ${SWAP_SIZE}M /dev/HostVG && test $? == 0 || fail "swap" mkswap -L "SWAP" /dev/HostVG/Swap fi if [ "$ROOT_SIZE" -gt 0 ]; then - lvcreate --name Root --size ${ROOT_SIZE}M /dev/HostVG + test lvcreate --name Root --size ${ROOT_SIZE}M /dev/HostVG || fail "root" mke2fs -T ext3 /dev/HostVG/Root -L "ROOT" tune2fs -c 0 -i 0 /dev/HostVG/Root fi if [ "$CONFIG_SIZE" -gt 0 ]; then - lvcreate --name Config --size ${CONFIG_SIZE}M /dev/HostVG + lvcreate --name Config --size ${CONFIG_SIZE}M /dev/HostVG && test $? == 0|| fail "config" mke2fs -T ext3 /dev/HostVG/Config -L "CONFIG" tune2fs -c 0 -i 0 /dev/HostVG/Config fi if [ "$LOGGING_SIZE" -gt 0 ]; then - lvcreate --name Logging --size ${LOGGING_SIZE}M /dev/HostVG + lvcreate --name Logging --size ${LOGGING_SIZE}M /dev/HostVG && test $? == 0|| fail "logging" mke2fs -T ext3 /dev/HostVG/Logging -L "LOGGING" tune2fs -c 0 -i 0 /dev/HostVG/Logging fi - lvcreate --name Data -l 100%FREE /dev/HostVG + lvcreate --name Data -l 100%FREE /dev/HostVG && test $? == 0 || fail "data" mke2fs -T ext3 /dev/HostVG/Data -L "DATA" tune2fs -c 0 -i 0 /dev/HostVG/Data - } 2>&1 | tee $LOG - - if [ $? -eq 0 ]; then - printf "Completed!\n\n" - else - printf "FAILED! See $LOG\n\n" - fi + } 2>&1 | tee $PARTITION_LOG } do_confirm() -- 1.6.0.6 From imain at redhat.com Fri Jan 16 19:43:56 2009 From: imain at redhat.com (Ian Main) Date: Fri, 16 Jan 2009 11:43:56 -0800 Subject: [Ovirt-devel] ovirt-server patch for error 'Attempted to update a stale object' In-Reply-To: <20090116155228.GA7562@redhat.com> References: <1232032510.24610.2.camel@dima-desktop> <20090115150933.620d24e0@tp.mains.net> <49703D76.9000001@redhat.com> <20090116155228.GA7562@redhat.com> Message-ID: <20090116114356.006c8be9@tp.mains.net> On Fri, 16 Jan 2009 09:52:29 -0600 Steve Linabery wrote: > On Fri, Jan 16, 2009 at 08:55:34AM +0100, Chris Lalancette wrote: > > Ian Main wrote: > > > On Thu, 15 Jan 2009 18:15:10 +0300 ??????? ??????? > > > wrote: > > > > > >> patch for error 'Attempted to update a stale object' > > >> > > >> diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb index > > >> c187287..fddc594 100644 --- a/src/task-omatic/task_vm.rb +++ > > >> b/src/task-omatic/task_vm.rb @@ -196,8 +196,18 @@ def create_vm_xml(name, > > >> uuid, memAllocated, memUsed, vcpus, bootDevice, end > > >> > > >> def setVmState(vm, state) - vm.state = state - vm.save! + attempts = 0 + > > >> begin + vm.state = state + vm.save! + rescue > > >> ActiveRecord::StaleObjectError + puts "error with stale object" + if > > >> attempts < 3 + attempts += 1 + vm.reload + retry + end + > > >> end end > > > > > > Interesting. I know when doing certain long operations it can fail; never > > > considered catching that and doing a retry. I'll push a similar patch > > > shortly. I may just remove the puts and I'm not sure how many attempts we > > > want to make? Anyway I'll play with it. Thanks! > > > > This doesn't actually make sense to me, though; isn't a StaleObject exception > > actually a sign of some deeper problem? The last time I started getting these, > > it was indeed a problem; I was removing an object (with object.delete), and then > > later modifying the object, which was throwing these exceptions. I think we > > need to understand why we are getting a StaleObject first (or am I completely > > missing what's going on here?). > > > > -- > > Chris Lalancette > > This is coming from Rails Transactions' optimistic locking support... > > http://api.rubyonrails.com/classes/ActiveRecord/Locking/Optimistic.html Thanks Steve, It's very likely coming from db-omatic updating the state before taskomatic completes. I was seeing this in the qpid taskomatic as well and fixed it in a few places. I should go through and make sure the rest are good. Really we should be grabbing a fresh db object every time we intend to write, not just at the top of a method/function. Ian From dpierce at redhat.com Fri Jan 16 19:47:03 2009 From: dpierce at redhat.com (Darryl L. Pierce) Date: Fri, 16 Jan 2009 14:47:03 -0500 Subject: [Ovirt-devel] [PATCH] Added an error message for when partitioning fails. Message-ID: <1232135223-16146-1-git-send-email-dpierce@redhat.com> NOTE: This supercedes the patch just sent. I had not rebased against next and found there were changes to o-c-storage that affected this patch. So I rebased, fixed and am resubmitting this update. Each call to create an LVM is checked to see if it completed successfully. If it fails, a message is shown to the user and the partition stops with a failure. Signed-off-by: Darryl L. Pierce --- scripts/ovirt-config-storage | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage index 3b1b947..851cf3a 100755 --- a/scripts/ovirt-config-storage +++ b/scripts/ovirt-config-storage @@ -8,9 +8,18 @@ . /etc/init.d/ovirt-functions +PARTITION_LOG=/var/log/ovirt-partition.log + ME=$(basename "$0") warn() { printf '%s: %s\n' "$ME" "$*" >&2; } die() { warn "$*"; exit 1; } +fail() +{ + printf "\nFailed while creating the $1 partition.\n"; + printf "Please see $PARTITION_LOG for more information.\n"; + exit 1; +} + default_boot_size=50 default_root_size=256 @@ -177,13 +186,9 @@ perform_partitioning() printf "Preparing local storage. Please wait..." - LOG=/var/log/ovirt-partition.log { wipe_lvm_on_disk - # Exit upon any failure. - set -e - # FIXME: save a backup copy, just in case? dd if=/dev/zero of=$DRIVE bs=1024K count=1 blockdev --rereadpt $DRIVE @@ -216,40 +221,35 @@ perform_partitioning() ln -snf "${DRIVE}1" /dev/disk/by-label/BOOT if [ "$SWAP_SIZE" -gt 0 ]; then - lvcreate --name Swap --size ${SWAP_SIZE}M /dev/HostVG + lvcreate --name Swap --size ${SWAP_SIZE}M /dev/HostVG && test $? == 0 || fail "swap" mkswap -L "SWAP" /dev/HostVG/Swap echo "/dev/HostVG/Swap swap swap defaults 0 0" >> /etc/fstab fi if [ "$ROOT_SIZE" -gt 0 ]; then - lvcreate --name Root --size ${ROOT_SIZE}M /dev/HostVG + test lvcreate --name Root --size ${ROOT_SIZE}M /dev/HostVG || fail "root" mke2fs -T ext3 /dev/HostVG/Root -L "ROOT" tune2fs -c 0 -i 0 /dev/HostVG/Root fi if [ "$CONFIG_SIZE" -gt 0 ]; then - lvcreate --name Config --size ${CONFIG_SIZE}M /dev/HostVG + lvcreate --name Config --size ${CONFIG_SIZE}M /dev/HostVG && test $? == 0|| fail "config" mke2fs -T ext3 /dev/HostVG/Config -L "CONFIG" tune2fs -c 0 -i 0 /dev/HostVG/Config fi if [ "$LOGGING_SIZE" -gt 0 ]; then - lvcreate --name Logging --size ${LOGGING_SIZE}M /dev/HostVG + lvcreate --name Logging --size ${LOGGING_SIZE}M /dev/HostVG && test $? == 0|| fail "logging" mke2fs -T ext3 /dev/HostVG/Logging -L "LOGGING" tune2fs -c 0 -i 0 /dev/HostVG/Logging echo "/dev/HostVG/Logging /var/log ext3 defaults 0 0" >> /etc/fstab fi - lvcreate --name Data -l 100%FREE /dev/HostVG + lvcreate --name Data -l 100%FREE /dev/HostVG && test $? == 0 || fail "data" mke2fs -T ext3 /dev/HostVG/Data -L "DATA" tune2fs -c 0 -i 0 /dev/HostVG/Data + echo "/dev/HostVG/Data /data ext3 defaults 0 0" >> /etc/fstab if mount_config; then ovirt_store_config /etc/fstab fi - } 2>&1 | tee $LOG - - if [ $? -eq 0 ]; then - printf "Completed!\n\n" - else - printf "FAILED! See $LOG\n\n" - fi + } 2>&1 | tee $PARTITION_LOG } do_confirm() -- 1.6.0.6 From pmyers at redhat.com Fri Jan 16 19:58:26 2009 From: pmyers at redhat.com (Perry Myers) Date: Fri, 16 Jan 2009 14:58:26 -0500 Subject: [Ovirt-devel] [PATCH node] BZ479378: Provide the user an option to mount the logging partition during the initial configuration of logging Message-ID: <1232135906-29202-1-git-send-email-pmyers@redhat.com> From: Bryan Kearney Signed-off-by: Bryan Kearney Signed-off-by: Perry Myers --- scripts/ovirt-config-logging | 20 ++++++++++++++++++++ scripts/ovirt-functions | 27 +++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 0 deletions(-) diff --git a/scripts/ovirt-config-logging b/scripts/ovirt-config-logging index c57c229..ae104a0 100755 --- a/scripts/ovirt-config-logging +++ b/scripts/ovirt-config-logging @@ -7,6 +7,25 @@ RSYSLOG_FILE="/etc/rsyslog.conf" +function enable_local_logging { + if grep -q "/dev/mapper/HostVG-Logging " /proc/mounts; then + return 0 + else + while true; do + printf "\n" + read -p "Would you like to enable logging to the local disk? (Y/N)? " + r=$(echo $REPLY|tr '[[:lower:]]' '[[:upper:]]') + if [ "$r" == "Y" ]; then + mount_logging + return + elif [ "$r" == "N" ]; then + printf "\nNot mounting the local disk. All logs will be lost\n" + return + fi + done + fi +} + # Creates the rsyslog file based on the following inputs # $1 ipaddress of remote syslog server # $2 port of remote syslog server @@ -178,6 +197,7 @@ if [ "$1" = "AUTO" ]; then fi else prompt_user + enable_local_logging fi exit 0 diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions index 26dc556..8df2fce 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -193,6 +193,33 @@ mount_config() { fi } +# mount logging partition +mount_logging() { + if grep -q "/dev/mapper/HostVG-Logging " /proc/mounts; then + return 0 + fi + + if [ -e /dev/HostVG/Logging ] ; then + # backup the logs + if [ -e /var/log.bak ]; then + rm -rf /var/log.bak + fi + cp -a /var/log /var/log.bak + + mount /dev/HostVG/Logging /var/log + restorecon -rv /var/log + mv /var/log.bak/* /var/log + rm -Rf /var/log.bak + service rsyslog restart + + return 0 + else + # /var/log is not available + printf "\nThe logging partion has not been created. Please create it at the main menu.\n" + return 1 + fi +} + # augtool wrapper # workaround for bind-mounted files # see https://fedorahosted.org/augeas/ticket/32 -- 1.6.0.6 From dpierce at redhat.com Fri Jan 16 20:29:09 2009 From: dpierce at redhat.com (Darryl L. Pierce) Date: Fri, 16 Jan 2009 15:29:09 -0500 Subject: [Ovirt-devel] [PATCH node] BZ479378: Provide the user an option to mount the logging partition during the initial configuration of logging In-Reply-To: <1232135906-29202-1-git-send-email-pmyers@redhat.com> References: <1232135906-29202-1-git-send-email-pmyers@redhat.com> Message-ID: <20090116202909.GI4255@mcpierce-laptop.rdu.redhat.com> On Fri, Jan 16, 2009 at 02:58:26PM -0500, Perry Myers wrote: > From: Bryan Kearney > > Signed-off-by: Bryan Kearney > Signed-off-by: Perry Myers ACK. -- Darryl L. Pierce, Sr. Software Engineer @ Red Hat, Inc. Virtual Machine Management - http://www.ovirt.org/ "What do you care what other people think, Mr. Feynman?" -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 197 bytes Desc: not available URL: From dpierce at redhat.com Fri Jan 16 20:46:39 2009 From: dpierce at redhat.com (Darryl L. Pierce) Date: Fri, 16 Jan 2009 15:46:39 -0500 Subject: [Ovirt-devel] [PATCH] Checks the request partitions against the size of the disk. Message-ID: <1232138799-307-1-git-send-email-dpierce@redhat.com> Before partitioning is performed, the request size of the partitions are compared to the size of the disk itself. If the partitions combined are larger than the disk then an error message is presented to the user and they are returned to the main menu. Signed-off-by: Darryl L. Pierce --- scripts/ovirt-config-storage | 51 +++++++++++++++++++++++++++++------------ 1 files changed, 36 insertions(+), 15 deletions(-) diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage index 3b1b947..10653c2 100755 --- a/scripts/ovirt-config-storage +++ b/scripts/ovirt-config-storage @@ -17,17 +17,6 @@ default_root_size=256 default_config_size=5 default_logging_size=256 -check_partition_sizes() -{ - # FIXME: use this function before performing any partitioning, auto or not - : - # Perform some sanity checks. E.g., - # What if DATA_SIZE ends up zero or negative? - # What if any of those partition sizes is smaller than - # the minimum size for an ext3 partition? Diagnose it here - # or just let the mke2fs failure suffice. -} - get_selected_drive_size() { local udi=$(hal-find-by-property --key block.device --string $DRIVE) @@ -44,6 +33,34 @@ get_selected_drive_size() echo "selected device: $DRIVE ($SPACE MB)" } +check_partition_sizes() +{ + local disk_size need_size + + get_selected_drive_size + disk_size=$SPACE + need_size=$(echo "scale=0; $BOOT_SIZE+$SWAP_SIZE+$ROOT_SIZE+$CONFIG_SIZE+$LOGGING_SIZE;" | bc -l) + + printf "disk_size=$disk_size\n" + printf "need_size=$need_size\n" + + if [ $need_size -gt $disk_size ]; then + gap_size=$(echo "scale=0; $need_size-$disk_size;" | bc -l) + printf "\n" + printf "=============================================================\n" + printf "The target storage device is too small for the desired sizes:\n" + printf " Size of target storage device: $disk_size MB\n" + printf " Total storage size to be used: $need_size MB\n" + printf "\n" + printf "You need an addition $gap_size MB of storage.\n" + printf "\n" + + return 1 + fi + + return 0 +} + # Find a usable/selected storage device. # If there are none, give a diagnostic and return nonzero. # If there is just one, e.g., /dev/sda, treat it as selected (see below). @@ -280,8 +297,10 @@ do_confirm() case $REPLY in Y|y) check_partition_sizes - perform_partitioning - exit 0 + if [ $? == 0 ]; then + perform_partitioning + exit 0 + fi break ;; N|n) return ;; @@ -334,8 +353,10 @@ fi if [ "$1" == "AUTO" ]; then check_partition_sizes - printf "Partitioning hard disk..." - perform_partitioning + if [ $? == 0 ]; then + printf "Partitioning hard disk..." + perform_partitioning + fi else while true; do -- 1.6.0.6 From imain at redhat.com Fri Jan 16 21:09:54 2009 From: imain at redhat.com (Ian Main) Date: Fri, 16 Jan 2009 13:09:54 -0800 Subject: [Ovirt-devel] Re: are 'migration' between hosts working ? In-Reply-To: <496C4479.90504@redhat.com> References: <639ce0480901120422j455be592oeb72ce3f3e2a2ac0@mail.gmail.com> <639ce0480901120537k6adbe870leb85b77316a7de33@mail.gmail.com> <496B6573.3000300@redhat.com> <639ce0480901120929t6b4d99cej1ad04f3a4d1960f5@mail.gmail.com> <496C4479.90504@redhat.com> Message-ID: <20090116130954.26676800@tp.mains.net> On Tue, 13 Jan 2009 08:36:25 +0100 Chris Lalancette wrote: > pronix pronix wrote: > > yes, it is working. > > > > i have a question: should destroy domain on old host ,when i migrate > > vm to new host, and create on new host ? > > because after reboot vm come back to old host. > > pardon my english :) > > Well, that depends on what you mean. Every time you shut down a guest, and > start it again, it re-runs the algorithm to decide what the "best" host to start > a guest is. If the best host is still the "old" host, then yes, it will restart > it over there. > > If you really don't want it to start on the old host, you can mark the old host > as "unavailable", which will make it automatically skip that host. > > In any case, thanks for the bug fix. Ian, can you give this a quick review/test > of this patch, and then we can commit it? Tested and pushed. Sorry it took me a while, I had things in an awkward state for a while there. Thanks very much for the patch! I'll make sure it's right in libvirt-qpid too though I'm pretty sure it is as I had tested migration with storage attached. Ian From imain at redhat.com Fri Jan 16 22:30:58 2009 From: imain at redhat.com (Ian Main) Date: Fri, 16 Jan 2009 14:30:58 -0800 Subject: [Ovirt-devel] Taskomatic Qpid Transition, LVM and Migration. Message-ID: <20090116143058.7bae7835@tp.mains.net> Howdy! So I did a little more playing around with volume scanning and found that it basically does work, except when you get multiple pools. To illustrate I did the following: - Created second storage pool named ovirtpriv:more_storage - Added the storage server to ovirt via the WUI. - Added a few LVM volumes to a few pools as seen in the screenshot below. - Added the more_storage pool to ovirt via the WUI. At this point you can see that the LVM volumes are getting picked up in both pools: http://stemwinder.org/messed_storage_pools.png I then: - Created another volume in ovirtpriv:storage under lun3 called underlun3_new. - Used 'Refresh' via the WUI to rescan ovirtpriv:more_storage At which point you see: http://stemwinder.org/another_messed_pool.png And creating volumes in the ovirtpriv:more_storage pool also causes them to show up in ovirtpriv:storage pool. Now, I'm really not sure if this can be fixed via more libvirt trickery or not but I'd really like to see the qpidified taskomatic get some testing time before the release. I also think that this should really be implemented within libvirt-qpid rather than using libvirt-style calls from taskomatic. So, I'd like to propose that I post a new patch on Monday with Chris's comments incorporated but with LVM scanning still removed so that we can get some testing of taskomatic/qpid. At that point I'll make it top priority to get the LVM scanning working again properly. This will likely mean a new version of libvirt-qpid that figures all this out and provides a nice pointer to a volumes LVM pool making it much easier for taskomatic to figure out. This sound reasonable? Chris, you ok with that? The other sticking point is migration. Currently we are still using ruby-qpid to do the migration via libvirt. I have spoken to the libvirt folks about the creation of a split (src and dst) API to allow migration to be set up over qpid but it sounds dubious. It is also likely that we will need libvirt to libvirt communications in the future anyway as that is the way they are headed. So for now I think we're going to need to carry the libvirt gssapi configuration going forward until a better solution is found. Ian From pmyers at redhat.com Sun Jan 18 08:02:58 2009 From: pmyers at redhat.com (Perry Myers) Date: Sun, 18 Jan 2009 03:02:58 -0500 Subject: [Ovirt-devel] [PATCH node] Reworked logging for standalone mode Message-ID: <1232265778-19654-1-git-send-email-pmyers@redhat.com> Entire firstboot is logged to both console/logfile using tee. Selected sections of the code are set to only log stdout/stderr to logfile to prevent data overload on console. In these cases log() function is used to write to the console. Signed-off-by: Perry Myers --- scripts/ovirt | 2 + scripts/ovirt-config-boot | 20 ++++++++++------- scripts/ovirt-config-collectd | 5 ++++ scripts/ovirt-config-hostname | 7 ++++++ scripts/ovirt-config-logging | 5 ++++ scripts/ovirt-config-networking | 28 +++++++++++++---------- scripts/ovirt-config-password | 15 +++++++++++- scripts/ovirt-config-setup | 6 +++- scripts/ovirt-config-storage | 45 +++++++++++++++++++++++++------------- scripts/ovirt-early | 2 + scripts/ovirt-firstboot | 11 ++++++--- scripts/ovirt-functions | 38 +++++++++++++++++++++++++++++++- scripts/ovirt-post | 2 + 13 files changed, 140 insertions(+), 46 deletions(-) diff --git a/scripts/ovirt b/scripts/ovirt index 6a48e47..f789d24 100755 --- a/scripts/ovirt +++ b/scripts/ovirt @@ -75,7 +75,9 @@ case "$1" in printf "Starting ovirt: " { + log "Starting ovirt" start + log "Completed ovirt" } >> $OVIRT_LOGFILE 2>&1 test $? == 0 && success || failure diff --git a/scripts/ovirt-config-boot b/scripts/ovirt-config-boot index 69e02d9..8c25d47 100755 --- a/scripts/ovirt-config-boot +++ b/scripts/ovirt-config-boot @@ -22,19 +22,21 @@ . /etc/init.d/functions . /etc/init.d/ovirt-functions +trap '__st=$?; stop_log; exit $__st' 0 +trap 'exit $?' 1 2 13 15 ovirt_boot_setup() { local disk=$1 local live=$2 local bootparams=$3 - printf "installing oVirt Node image ... " + log "installing oVirt Node image." mount_boot # check that /boot mounted ok and find partition number for GRUB BOOT=$(mount|awk '$3 == "/boot" {print $1}') BOOT=$(( ${BOOT#$disk} - 1 )) rc=$? if [ $rc -ne 0 -o $BOOT -lt 0 ]; then - printf "boot partition not available\n" + log "boot partition not available." return $rc fi mount_liveos @@ -54,7 +56,7 @@ ovirt_boot_setup() { && cp -p $live/$syslinux/vmlinuz0 /boot rc=$? if [ $rc -ne 0 ]; then - printf "image copy failed\n" + log "image copy failed." return $rc fi # append LVM support to the livecd initramfs @@ -113,7 +115,7 @@ setup --prefix=/grub (hd0) EOF rc=$? if [ $rc -ne 0 ]; then - printf "boot loader install failed\n" + log "boot loader install failed." return $rc fi umount /liveos @@ -121,14 +123,14 @@ EOF # caller decides when to reboot rm -rf $tmpdir - printf "done.\n" + log "done." # avoid reboot loops using Cobbler PXE only once # Cobbler XMLRPC post-install trigger (XXX is there cobbler SRV record?): # wget "http://192.168.50.2/cblr/svc/op/trig/mode/post/system/$(hostname)" # -O /dev/null } - +start_log disk=$1 live=$2 bootparams=$3 @@ -150,13 +152,15 @@ parted $disk -s "print all" > /dev/null if [ 0 -eq $? ]; then ovirt_boot_setup "$disk" "$live" "$bootparams" else - printf "Please configure $disk before attempting to install the node image.\n" - printf "Use the option 'Disk Partitioning' from the main menu.\n" + log "Please configure $disk before attempting to install the node image." + log "Use the option 'Disk Partitioning' from the main menu." doreboot="no" fi if [ -z "$doreboot" -o "$doreboot" = "yes" ]; then disable_firstboot ovirt_store_firstboot_config + stop_log reboot fi +stop_log diff --git a/scripts/ovirt-config-collectd b/scripts/ovirt-config-collectd index 6ece6be..bbc5a89 100755 --- a/scripts/ovirt-config-collectd +++ b/scripts/ovirt-config-collectd @@ -5,6 +5,9 @@ . /etc/init.d/functions . /etc/init.d/ovirt-functions +trap '__st=$?; stop_log; exit $__st' 0 +trap 'exit $?' 1 2 13 15 + collectd_conf="/etc/collectd.conf" # Creates the collectd file based on the following inputs @@ -15,6 +18,7 @@ ovirt_collectd() { local collectd_server=$1 local collectd_port=$2 + start_log if [ -f $collectd_conf.in ]; then sed -e "s/@COLLECTD_SERVER@/$collectd_server/" \ -e "s/@COLLECTD_PORT@/$collectd_port/" $collectd_conf.in \ @@ -26,6 +30,7 @@ ovirt_collectd() { chkconfig collectd on service collectd restart + stop_log } prompt_user() { diff --git a/scripts/ovirt-config-hostname b/scripts/ovirt-config-hostname index 2375675..bf60c70 100755 --- a/scripts/ovirt-config-hostname +++ b/scripts/ovirt-config-hostname @@ -5,18 +5,25 @@ . /etc/init.d/functions . /etc/init.d/ovirt-functions +trap '__st=$?; stop_log; exit $__st' 0 +trap 'exit $?' 1 2 13 15 + HOSTNAME_FILE="/etc/sysconfig/network" function set_hostname { + start_log augtool <&2 select NIC in $NICS do @@ -234,13 +233,18 @@ else done fi -{ - printf "Configuring network.\n" - if ls "$WORKDIR"/augtool-* > /dev/null 2>&1 ; then - config="$WORKDIR"/config-augtool - cat "$WORKDIR"/augtool-* > $config \ - && augtool $config \ - && service network restart +start_log +if ls "$WORKDIR"/augtool-* > /dev/null 2>&1 ; then + log "Configuring network" + config="$WORKDIR"/config-augtool + cat "$WORKDIR"/augtool-* > $config \ + && augtool $config \ + && service network restart + if [ $? = 0 ]; then + log "Network configured successfully" + else + log "Error configuring network, see $OVIRT_LOGFILE" fi - ovirt_store_config /etc/sysconfig/network-scripts/ifcfg* -} 2>&1 | tee $CONFIG_LOG_FILE +fi +ovirt_store_config /etc/sysconfig/network-scripts/ifcfg* +stop_log diff --git a/scripts/ovirt-config-password b/scripts/ovirt-config-password index 47be3f7..89b91da 100755 --- a/scripts/ovirt-config-password +++ b/scripts/ovirt-config-password @@ -1,12 +1,22 @@ #!/bin/bash # # Set the root password and others +# Source functions library +. /etc/init.d/functions +. /etc/init.d/ovirt-functions + +trap '__st=$?; stop_log; exit $__st' 0 +trap 'exit $?' 1 2 13 15 function sasl_password { user=$1 passwd=$2 - printf "adding user $user to the sasl list for libvirt\n" + + printf "\nadding user $user to the sasl list for libvirt\n" + + start_log printf '%s\n' "$passwd" | saslpasswd2 -a libvirt -p "$user" + stop_log } # Usage: set_sasl_password USER @@ -25,7 +35,9 @@ function set_sasl_password { local confirm=$REPLY if test "$passwd" = "$confirm"; then if [ "$user" = "root" ]; then + start_log printf '%s\n' "$passwd" | passwd --stdin "$user" + stop_log fi sasl_password "$user" "$passwd" return 0 @@ -53,4 +65,3 @@ set_sasl_password root printf "\nAdding new SASL users for libvirt" # TODO list existing users in /etc/libvirt/passwd.db while prompt_sasl_user; do :; done - diff --git a/scripts/ovirt-config-setup b/scripts/ovirt-config-setup index 380d79d..21e6b0e 100755 --- a/scripts/ovirt-config-setup +++ b/scripts/ovirt-config-setup @@ -2,6 +2,8 @@ # # Entry point for configuring an oVirt node when running in standalone mode. +. /etc/init.d/ovirt-functions + # symlinked scripts for menu options, link name is menu label CONFIG_DIR=/etc/ovirt-config-setup.d @@ -29,7 +31,7 @@ while true; do PS3="Please select an option: " while true ; do - printf "\n\n oVirt Node Standalone Configuration\n\n" + printf "\n\n oVirt Node Standalone Configuration\n\n" >&2 select OPTION in "${OPTIONS[@]}" do @@ -38,7 +40,7 @@ while true; do "$CONTINUE") exit 0 ;; *) clear; - $CONFIG_DIR/*"$OPTION"; + $CONFIG_DIR/*"$OPTION" 2>&1 | $TEE; break ;; esac done diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage index 9928920..7489c68 100755 --- a/scripts/ovirt-config-storage +++ b/scripts/ovirt-config-storage @@ -12,6 +12,9 @@ ME=$(basename "$0") warn() { printf '%s: %s\n' "$ME" "$*" >&2; } die() { warn "$*"; exit 1; } +trap '__st=$?; stop_log; exit $__st' 0 +trap 'exit $?' 1 2 13 15 + default_boot_size=50 default_root_size=256 default_config_size=5 @@ -178,24 +181,25 @@ perform_partitioning() DRIVE_FILE=$(echo $DRIVE | tr '/' '_') if [ -f /tmp/ovirt-config-storage-$DRIVE_FILE ]; then printf "\n\nERROR:\n" - printf "\nStorage Configuration has already been run for $DRIVE_FILE.\n" - printf "To run it again, please reboot the Node from\n USB/cdrom/PXE\n" + printf "Storage Configuration has already been run for $DRIVE.\n" + printf "To run it again, please reboot the Node from USB/cdrom/PXE\n" printf "in stand-alone mode.\n\n\n" return 1 fi touch /tmp/ovirt-config-storage-$DRIVE_FILE - printf "Preparing local storage. Please wait..." + start_log + log "Starting partitioning of $DRIVE" - LOG=/var/log/ovirt-partition.log - { + log "Removing old LVM partitions" wipe_lvm_on_disk # Exit upon any failure. set -e # FIXME: save a backup copy, just in case? + log "Wiping old boot sector" dd if=/dev/zero of=$DRIVE bs=1024K count=1 blockdev --rereadpt $DRIVE partprobe -s $DRIVE @@ -204,6 +208,7 @@ perform_partitioning() # ensure minimal BOOT partition BOOT_SIZE=10 fi + log "Creating boot partition" parted $DRIVE -s "mklabel ${LABEL_TYPE}" parted $DRIVE -s "mkpartfs primary ext2 0M ${BOOT_SIZE}M" parted $DRIVE -s "mkpart primary ext2 ${BOOT_SIZE}M ${SPACE}M" @@ -214,57 +219,65 @@ perform_partitioning() # sync GPT to the legacy MBR partitions if [ "gpt" == "$LABEL_TYPE" ]; then - gptsync $DRIVE + log "Running gptsync to create legacy mbr" + gptsync $DRIVE fi + log "Creating physical volume" pvcreate "${DRIVE}2" pvck + log "Creating volume group" vgcreate /dev/HostVG "${DRIVE}2" + log "Creating boot filesystem" mke2fs -T ext3 "${DRIVE}1" -L "BOOT" tune2fs -c 0 -i 0 "${DRIVE}1" mkdir -p /dev/disk/by-label ln -snf "${DRIVE}1" /dev/disk/by-label/BOOT if [ "$SWAP_SIZE" -gt 0 ]; then + log "Creating swap partition" lvcreate --name Swap --size ${SWAP_SIZE}M /dev/HostVG mkswap -L "SWAP" /dev/HostVG/Swap echo "/dev/HostVG/Swap swap swap defaults 0 0" >> /etc/fstab fi if [ "$ROOT_SIZE" -gt 0 ]; then + log "Creating root partition" lvcreate --name Root --size ${ROOT_SIZE}M /dev/HostVG mke2fs -T ext3 /dev/HostVG/Root -L "ROOT" tune2fs -c 0 -i 0 /dev/HostVG/Root fi if [ "$CONFIG_SIZE" -gt 0 ]; then + log "Creating config partition" lvcreate --name Config --size ${CONFIG_SIZE}M /dev/HostVG mke2fs -T ext3 /dev/HostVG/Config -L "CONFIG" tune2fs -c 0 -i 0 /dev/HostVG/Config fi if [ "$LOGGING_SIZE" -gt 0 ]; then + log "Creating log partition" lvcreate --name Logging --size ${LOGGING_SIZE}M /dev/HostVG mke2fs -T ext3 /dev/HostVG/Logging -L "LOGGING" tune2fs -c 0 -i 0 /dev/HostVG/Logging echo "/dev/HostVG/Logging /var/log ext3 defaults 0 0" >> /etc/fstab - mount_logging fi + log "Creating data partition" lvcreate --name Data -l 100%FREE /dev/HostVG mke2fs -T ext3 /dev/HostVG/Data -L "DATA" tune2fs -c 0 -i 0 /dev/HostVG/Data echo "/dev/HostVG/Data /data ext3 defaults 0 0" >> /etc/fstab echo "/data/images /var/lib/libvirt/images bind bind 0 0" >> /etc/fstab + log "Mounting data partition" mount_data + log "Mounting config partition" if mount_config; then ovirt_store_config /etc/fstab fi - } 2>&1 | tee $LOG - if [ $? -eq 0 ]; then - printf "Completed!\n\n" - else - printf "FAILED! See $LOG\n\n" - fi + mount_logging + log "Completed!" + + stop_log } do_confirm() @@ -297,7 +310,7 @@ do_confirm() Y|y) check_partition_sizes perform_partitioning - exit 0 + exit 0 break ;; N|n) return ;; @@ -357,7 +370,7 @@ else PS3="Choose an option: " while true; do - printf "\n\n oVirt Node Storage Configuration\n\n" + printf "\n\n oVirt Node Storage Configuration\n\n" >&2 select OPTION in $OPTIONS do @@ -365,7 +378,7 @@ else "Configure") do_configure ; break ;; "Review") do_review ; break ;; "Partition") do_confirm ; break ;; - "Quit") exit ;; + "Quit") exit ;; esac done done diff --git a/scripts/ovirt-early b/scripts/ovirt-early index f31e977..6c7b29b 100755 --- a/scripts/ovirt-early +++ b/scripts/ovirt-early @@ -391,7 +391,9 @@ case "$1" in printf "Starting ovirt-early: " { + log "Starting ovirt-early" start + log "Completed ovirt-early" } >> $OVIRT_LOGFILE 2>&1 test $? == 0 && success || failure diff --git a/scripts/ovirt-firstboot b/scripts/ovirt-firstboot index c7ddfe4..575fa89 100755 --- a/scripts/ovirt-firstboot +++ b/scripts/ovirt-firstboot @@ -27,6 +27,9 @@ . /etc/init.d/functions . /etc/init.d/ovirt-functions +trap '__st=$?; stop_log; exit $__st' 0 +trap 'exit $?' 1 2 13 15 + start () { if ! is_firstboot && ! is_auto_install; then @@ -57,7 +60,9 @@ start () fi disable_firstboot - ovirt_store_firstboot_config >> $OVIRT_LOGFILE 2>&1 + start_log + ovirt_store_firstboot_config + stop_log } case "$1" in @@ -68,9 +73,7 @@ case "$1" in printf "Starting ovirt-firstboot: " - { - start - } + start test $? == 0 && success || failure echo diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions index 814a8ae..13f9ad4 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -1,6 +1,8 @@ # -*-Shell-script-*- OVIRT_LOGFILE=/var/log/ovirt.log +TEE="tee -a $OVIRT_LOGFILE" +LOG_STATUS=0 # label of the oVirt partition OVIRT_LABEL=OVIRT @@ -28,6 +30,37 @@ OVIRT_CONFIG_FILES="\ /etc/collectd.conf " +# Save stdout to fd 6 and stderr to fd 7. Redirect normal stdout/stderr +# to log file +start_log() { + if [ $LOG_STATUS = 0 ]; then + exec 6>&1 + exec 7>&2 + exec 1>>$OVIRT_LOGFILE + exec 2>&1 + LOG_STATUS=1 + fi +} + +# Restore stdout/stderr from fd 6 and 7, respectively. Close fd 6 and 7 +stop_log() { + if [ $LOG_STATUS = 1 ]; then + exec 1>&6 6>&- + exec 2>&7 7>&- + LOG_STATUS=0 + fi +} + +log() { + printf "$(date +'%b %d %H:%M:%S') " + + if [ $LOG_STATUS = 1 ]; then + echo $@ >&6 + else + echo $@ + fi +} + ovirt_store_firstboot_config() { # persist config for standalone ovirt_store_config $OVIRT_CONFIG_FILES @@ -220,15 +253,16 @@ mount_logging() { fi if [ -e /dev/HostVG/Logging ] ; then + log "Mounting log partition" # backup the logs if [ -e /var/log.bak ]; then rm -rf /var/log.bak fi - cp -a /var/log /var/log.bak + cp -av /var/log /var/log.bak mount /dev/HostVG/Logging /var/log restorecon -rv /var/log - mv /var/log.bak/* /var/log + cp -av /var/log.bak/* /var/log rm -Rf /var/log.bak service rsyslog restart diff --git a/scripts/ovirt-post b/scripts/ovirt-post index 5c06927..3861973 100755 --- a/scripts/ovirt-post +++ b/scripts/ovirt-post @@ -34,7 +34,9 @@ case "$1" in printf "Starting ovirt-post: " { + log "Starting ovirt-post" start + log "Completed ovirt-post" } >> $OVIRT_LOGFILE 2>&1 test $? == 0 && success || failure -- 1.6.0.6 From pmyers at redhat.com Sun Jan 18 08:03:10 2009 From: pmyers at redhat.com (Perry Myers) Date: Sun, 18 Jan 2009 03:03:10 -0500 Subject: [Ovirt-devel] [PATCH node] Bump log rotation so logs can be up to 1MB for standalone mode Message-ID: <1232265790-19681-1-git-send-email-pmyers@redhat.com> 10k is a good default size for a completely stateless node, but in standalone mode or when we have local storage available we should use more of it for logs For ovirt-server managed mode, making max log size 1MB won't affect overall memory usage too badly. With ~10 log files, the max disk usage will be about 10MB Also persist ovirt-logrotate.conf file so that changes made in standalone mode will actually be persisted Signed-off-by: Perry Myers --- logrotate/ovirt-logrotate.conf | 4 ++-- scripts/ovirt-config-logging | 2 +- scripts/ovirt-functions | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/logrotate/ovirt-logrotate.conf b/logrotate/ovirt-logrotate.conf index 96fb87c..da4beee 100644 --- a/logrotate/ovirt-logrotate.conf +++ b/logrotate/ovirt-logrotate.conf @@ -1,11 +1,11 @@ /var/log/*.log { rotate 0 missingok - size=10k + size=1024k } /var/log/messages { rotate 0 missingok - size=10k + size=1024k } diff --git a/scripts/ovirt-config-logging b/scripts/ovirt-config-logging index ba91468..3b5b82b 100755 --- a/scripts/ovirt-config-logging +++ b/scripts/ovirt-config-logging @@ -76,7 +76,7 @@ function is_numeric { function prompt_user { while true ; do - max_log_size="10" + max_log_size="1024" syslog_server_ip="" syslog_server_port="" diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions index 13f9ad4..2e62fc4 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -27,7 +27,8 @@ OVIRT_CONFIG_FILES="\ /etc/ssh/ssh_host*_key* \ /etc/default/ovirt \ /etc/sysconfig/network \ - /etc/collectd.conf + /etc/collectd.conf \ + /etc/logrotate.d/ovirt-logrotate.conf " # Save stdout to fd 6 and stderr to fd 7. Redirect normal stdout/stderr -- 1.6.0.6 From pmyers at redhat.com Sun Jan 18 08:50:00 2009 From: pmyers at redhat.com (Perry Myers) Date: Sun, 18 Jan 2009 03:50:00 -0500 Subject: [Ovirt-devel] [PATCH node] Checks the request partitions against the size of the disk. Message-ID: <1232268600-20301-1-git-send-email-pmyers@redhat.com> NOTE: This is Darryl's patch rebased on top of recent pushes to next as well as the two patches I posted earlier this evening. I've tested this patch and it works for me. Unless I hear objections, I'll push this when I get ack's on my previous two patches. Before partitioning is performed, the request size of the partitions are compared to the size of the disk itself. If the partitions combined are larger than the disk then an error message is presented to the user and they are returned to the main menu. Signed-off-by: Darryl L. Pierce Signed-off-by: Perry Myers --- scripts/ovirt-config-storage | 49 +++++++++++++++++++++++++++++------------ 1 files changed, 34 insertions(+), 15 deletions(-) diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage index 7489c68..e3acc05 100755 --- a/scripts/ovirt-config-storage +++ b/scripts/ovirt-config-storage @@ -20,17 +20,6 @@ default_root_size=256 default_config_size=5 default_logging_size=256 -check_partition_sizes() -{ - # FIXME: use this function before performing any partitioning, auto or not - : - # Perform some sanity checks. E.g., - # What if DATA_SIZE ends up zero or negative? - # What if any of those partition sizes is smaller than - # the minimum size for an ext3 partition? Diagnose it here - # or just let the mke2fs failure suffice. -} - get_selected_drive_size() { local udi=$(hal-find-by-property --key block.device --string $DRIVE) @@ -47,6 +36,32 @@ get_selected_drive_size() echo "selected device: $DRIVE ($SPACE MB)" } +check_partition_sizes() +{ + local disk_size need_size + + get_selected_drive_size + disk_size=$SPACE + need_size=$(echo "scale=0; $BOOT_SIZE+$SWAP_SIZE+$ROOT_SIZE+$CONFIG_SIZE+$LOGGING_SIZE;" | bc -l) + printf "disk_size=$disk_size\n" + printf "need_size=$need_size\n" + + if [ $need_size -gt $disk_size ]; then + gap_size=$(echo "scale=0; $need_size-$disk_size;" | bc -l) + printf "\n" + printf "=============================================================\n" + printf "The target storage device is too small for the desired sizes:\n" + printf " Size of target storage device: $disk_size MB\n" + printf " Total storage size to be used: $need_size MB\n" + printf "\n" + printf "You need an addition $gap_size MB of storage.\n" + printf "\n" + return 1 + fi + + return 0 +} + # Find a usable/selected storage device. # If there are none, give a diagnostic and return nonzero. # If there is just one, e.g., /dev/sda, treat it as selected (see below). @@ -309,8 +324,10 @@ do_confirm() case $REPLY in Y|y) check_partition_sizes - perform_partitioning - exit 0 + if [ $? = 0 ]; then + perform_partitioning + exit 0 + fi break ;; N|n) return ;; @@ -363,8 +380,10 @@ fi if [ "$1" == "AUTO" ]; then check_partition_sizes - printf "Partitioning hard disk..." - perform_partitioning + if [ $? = 0 ]; then + printf "Partitioning hard disk..." + perform_partitioning + fi else OPTIONS="Configure Review Partition Quit" PS3="Choose an option: " -- 1.6.0.6 From jim at meyering.net Sun Jan 18 10:44:18 2009 From: jim at meyering.net (Jim Meyering) Date: Sun, 18 Jan 2009 11:44:18 +0100 Subject: [Ovirt-devel] [PATCH node] Checks the request partitions against the size of the disk. In-Reply-To: <1232268600-20301-1-git-send-email-pmyers@redhat.com> (Perry Myers's message of "Sun, 18 Jan 2009 03:50:00 -0500") References: <1232268600-20301-1-git-send-email-pmyers@redhat.com> Message-ID: <87y6x8sxkt.fsf@meyering.net> Perry Myers wrote: > NOTE: This is Darryl's patch rebased on top of recent pushes to next as well > as the two patches I posted earlier this evening. I've tested this patch and > it works for me. Unless I hear objections, I'll push this when I get ack's > on my previous two patches. > > Before partitioning is performed, the request size of the partitions are > compared to the size of the disk itself. If the partitions combined are > larger than the disk then an error message is presented to the user and > they are returned to the main menu. ACK. modulo minor suggestions > Signed-off-by: Darryl L. Pierce > Signed-off-by: Perry Myers > --- > scripts/ovirt-config-storage | 49 +++++++++++++++++++++++++++++------------ > 1 files changed, 34 insertions(+), 15 deletions(-) > > diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage > index 7489c68..e3acc05 100755 > --- a/scripts/ovirt-config-storage > +++ b/scripts/ovirt-config-storage > @@ -20,17 +20,6 @@ default_root_size=256 > default_config_size=5 > default_logging_size=256 > > -check_partition_sizes() > -{ > - # FIXME: use this function before performing any partitioning, auto or not > - : > - # Perform some sanity checks. E.g., > - # What if DATA_SIZE ends up zero or negative? > - # What if any of those partition sizes is smaller than > - # the minimum size for an ext3 partition? Diagnose it here > - # or just let the mke2fs failure suffice. > -} > - > get_selected_drive_size() > { > local udi=$(hal-find-by-property --key block.device --string $DRIVE) > @@ -47,6 +36,32 @@ get_selected_drive_size() > echo "selected device: $DRIVE ($SPACE MB)" > } > > +check_partition_sizes() > +{ > + local disk_size need_size > + > + get_selected_drive_size > + disk_size=$SPACE > + need_size=$(echo "scale=0; $BOOT_SIZE+$SWAP_SIZE+$ROOT_SIZE+$CONFIG_SIZE+$LOGGING_SIZE;" | bc -l) it's a little easier to read this way: need_size=$(echo "scale=0;" \ "$BOOT_SIZE + $SWAP_SIZE + $ROOT_SIZE" \ "+ $CONFIG_SIZE + $LOGGING_SIZE" | bc -l) > + printf "disk_size=$disk_size\n" > + printf "need_size=$need_size\n" > + > + if [ $need_size -gt $disk_size ]; then > + gap_size=$(echo "scale=0; $need_size-$disk_size;" | bc -l) > + printf "\n" > + printf "=============================================================\n" > + printf "The target storage device is too small for the desired sizes:\n" > + printf " Size of target storage device: $disk_size MB\n" > + printf " Total storage size to be used: $need_size MB\n" > + printf "\n" > + printf "You need an addition $gap_size MB of storage.\n" > + printf "\n" > + return 1 > + fi > + > + return 0 > +} > + > # Find a usable/selected storage device. > # If there are none, give a diagnostic and return nonzero. > # If there is just one, e.g., /dev/sda, treat it as selected (see below). > @@ -309,8 +324,10 @@ do_confirm() > case $REPLY in > Y|y) > check_partition_sizes > - perform_partitioning > - exit 0 > + if [ $? = 0 ]; then > + perform_partitioning > + exit 0 > + fi However, this is more maintainable: if check_partition_sizes; then perform_partitioning exit 0 fi ovirt has already seen cases where the command and the following test of "$?" were accidentally separated. When you combine running the command and testing its exit status on the same line, that can't happen. ... > if [ "$1" == "AUTO" ]; then > check_partition_sizes > - printf "Partitioning hard disk..." > - perform_partitioning > + if [ $? = 0 ]; then > + printf "Partitioning hard disk..." > + perform_partitioning > + fi if check_partition_sizes; then printf "Partitioning hard disk..." perform_partitioning fi From apevec at redhat.com Sun Jan 18 11:14:15 2009 From: apevec at redhat.com (Alan Pevec) Date: Sun, 18 Jan 2009 12:14:15 +0100 Subject: [Ovirt-devel] [PATCH node] Checks the request partitions against the size of the disk. In-Reply-To: <87y6x8sxkt.fsf@meyering.net> References: <87y6x8sxkt.fsf@meyering.net> Message-ID: <1232277255-10496-1-git-send-email-apevec@redhat.com> From: Perry Myers Before partitioning is performed, the request size of the partitions are compared to the size of the disk itself. If the partitions combined are larger than the disk then an error message is presented to the user and they are returned to the main menu. Signed-off-by: Darryl L. Pierce Signed-off-by: Perry Myers --- scripts/ovirt-config-storage | 53 ++++++++++++++++++++++++++++------------- 1 files changed, 36 insertions(+), 17 deletions(-) diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage index 7489c68..fce2a48 100755 --- a/scripts/ovirt-config-storage +++ b/scripts/ovirt-config-storage @@ -20,17 +20,6 @@ default_root_size=256 default_config_size=5 default_logging_size=256 -check_partition_sizes() -{ - # FIXME: use this function before performing any partitioning, auto or not - : - # Perform some sanity checks. E.g., - # What if DATA_SIZE ends up zero or negative? - # What if any of those partition sizes is smaller than - # the minimum size for an ext3 partition? Diagnose it here - # or just let the mke2fs failure suffice. -} - get_selected_drive_size() { local udi=$(hal-find-by-property --key block.device --string $DRIVE) @@ -47,6 +36,34 @@ get_selected_drive_size() echo "selected device: $DRIVE ($SPACE MB)" } +check_partition_sizes() +{ + local disk_size need_size + + get_selected_drive_size + disk_size=$SPACE + need_size=$(echo "scale=0;" \ + "$BOOT_SIZE + $SWAP_SIZE + $ROOT_SIZE" \ + "+ $CONFIG_SIZE + $LOGGING_SIZE" | bc -l) + printf "disk_size=$disk_size\n" + printf "need_size=$need_size\n" + + if [ $need_size -gt $disk_size ]; then + gap_size=$(echo "scale=0; $need_size-$disk_size;" | bc -l) + printf "\n" + printf "=============================================================\n" + printf "The target storage device is too small for the desired sizes:\n" + printf " Size of target storage device: $disk_size MB\n" + printf " Total storage size to be used: $need_size MB\n" + printf "\n" + printf "You need an addition $gap_size MB of storage.\n" + printf "\n" + return 1 + fi + + return 0 +} + # Find a usable/selected storage device. # If there are none, give a diagnostic and return nonzero. # If there is just one, e.g., /dev/sda, treat it as selected (see below). @@ -308,9 +325,10 @@ do_confirm() read -e case $REPLY in Y|y) - check_partition_sizes - perform_partitioning - exit 0 + if check_partition_sizes; then + perform_partitioning + exit 0 + fi break ;; N|n) return ;; @@ -362,9 +380,10 @@ else fi if [ "$1" == "AUTO" ]; then - check_partition_sizes - printf "Partitioning hard disk..." - perform_partitioning + if check_partition_sizes; then + printf "Partitioning hard disk..." + perform_partitioning + fi else OPTIONS="Configure Review Partition Quit" PS3="Choose an option: " -- 1.6.0.6 From jim at meyering.net Sun Jan 18 11:19:17 2009 From: jim at meyering.net (Jim Meyering) Date: Sun, 18 Jan 2009 12:19:17 +0100 Subject: [Ovirt-devel] [PATCH node] Checks the request partitions against the size of the disk. In-Reply-To: <1232277255-10496-1-git-send-email-apevec@redhat.com> (Alan Pevec's message of "Sun, 18 Jan 2009 12:14:15 +0100") References: <87y6x8sxkt.fsf@meyering.net> <1232277255-10496-1-git-send-email-apevec@redhat.com> Message-ID: <87skngsvyi.fsf@meyering.net> Alan Pevec wrote: > From: Perry Myers Looks perfect. Thanks. ACK From apevec at redhat.com Sun Jan 18 11:31:59 2009 From: apevec at redhat.com (Alan Pevec) Date: Sun, 18 Jan 2009 12:31:59 +0100 Subject: [Ovirt-devel] Re: [PATCH node] Reworked logging for standalone mode In-Reply-To: <1232265778-19654-1-git-send-email-pmyers@redhat.com> References: <1232265778-19654-1-git-send-email-pmyers@redhat.com> Message-ID: <4973132F.7010505@redhat.com> Perry Myers wrote: > Entire firstboot is logged to both console/logfile using tee. Selected > sections of the code are set to only log stdout/stderr to logfile to prevent > data overload on console. In these cases log() function is used to write > to the console. ACK just minor whitespace nits, which I'll fix and push > @@ -297,7 +310,7 @@ do_confirm() > Y|y) > check_partition_sizes > perform_partitioning > - exit 0 > + exit 0 whitespace damage - and it's changed in "Checks the request partitions" anyway > - "Quit") exit ;; > + "Quit") exit ;; same here > @@ -220,15 +253,16 @@ mount_logging() { > fi > > if [ -e /dev/HostVG/Logging ] ; then > + log "Mounting log partition" > # backup the logs > if [ -e /var/log.bak ]; then > rm -rf /var/log.bak > fi > - cp -a /var/log /var/log.bak > + cp -av /var/log /var/log.bak > > mount /dev/HostVG/Logging /var/log > restorecon -rv /var/log move to after cp, just in case > - mv /var/log.bak/* /var/log > + cp -av /var/log.bak/* /var/log > rm -Rf /var/log.bak > service rsyslog restart From apevec at gmail.com Sun Jan 18 11:35:39 2009 From: apevec at gmail.com (Alan Pevec) Date: Sun, 18 Jan 2009 12:35:39 +0100 Subject: [Ovirt-devel] [PATCH node] Bump log rotation so logs can be up to 1MB for standalone mode In-Reply-To: <1232265790-19681-1-git-send-email-pmyers@redhat.com> References: <1232265790-19681-1-git-send-email-pmyers@redhat.com> Message-ID: <2be7262f0901180335u393389f3lbc4cc0b2d3dac4b1@mail.gmail.com> ACK -------------- next part -------------- An HTML attachment was scrubbed... URL: From jim at meyering.net Sun Jan 18 11:59:03 2009 From: jim at meyering.net (Jim Meyering) Date: Sun, 18 Jan 2009 12:59:03 +0100 Subject: [Ovirt-devel] [PATCH node] Reworked logging for standalone mode In-Reply-To: <1232265778-19654-1-git-send-email-pmyers@redhat.com> (Perry Myers's message of "Sun, 18 Jan 2009 03:02:58 -0500") References: <1232265778-19654-1-git-send-email-pmyers@redhat.com> Message-ID: <87mydosu48.fsf@meyering.net> Perry Myers wrote: > Entire firstboot is logged to both console/logfile using tee. Selected > sections of the code are set to only log stdout/stderr to logfile to prevent > data overload on console. In these cases log() function is used to write > to the console. ... ACK, but for some missing quotes and name tweaks > diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions > index 814a8ae..13f9ad4 100644 > --- a/scripts/ovirt-functions > +++ b/scripts/ovirt-functions > @@ -1,6 +1,8 @@ > # -*-Shell-script-*- > > OVIRT_LOGFILE=/var/log/ovirt.log > +TEE="tee -a $OVIRT_LOGFILE" > +LOG_STATUS=0 > > # label of the oVirt partition > OVIRT_LABEL=OVIRT > @@ -28,6 +30,37 @@ OVIRT_CONFIG_FILES="\ > /etc/collectd.conf > " > > +# Save stdout to fd 6 and stderr to fd 7. Redirect normal stdout/stderr > +# to log file > +start_log() { > + if [ $LOG_STATUS = 0 ]; then It's better to quote all uses of LOG_STATUS, in case it's ever defined to something else, or empty. > + exec 6>&1 > + exec 7>&2 > + exec 1>>$OVIRT_LOGFILE > + exec 2>&1 > + LOG_STATUS=1 > + fi > +} > + > +# Restore stdout/stderr from fd 6 and 7, respectively. Close fd 6 and 7 > +stop_log() { > + if [ $LOG_STATUS = 1 ]; then It's slightly better to always use the same test. I.e., test against only one of 0 or 1, not both, and negate if needed. Otherwise, you have to wonder what happens if $LOG_STATUS is ever set to something like 2. E.g., you could test $LOG_STATUS != 1 in start_log, since there are two tests of $LOG_STATUS = 1 already. Or maybe you prefer "boolean" semantics and would want to test against 0. > + exec 1>&6 6>&- > + exec 2>&7 7>&- > + LOG_STATUS=0 > + fi > +} > + > +log() { > + printf "$(date +'%b %d %H:%M:%S') " > + > + if [ $LOG_STATUS = 1 ]; then > + echo $@ >&6 > + else > + echo $@ Whoops. this needs double quotes around each "$@". Otherwise, logs lose TABs and sequences of spaces. E.g., $ bash -c 'foo() { echo $@; }; foo "a b"' a b > + fi > +} All names defined/used above impinge on the name space of each script that sources ovirt-functions, so it'd be nice to use names that make collisions less likely e.g., _TEE, _log and $_LOG_STATUS. From jim at meyering.net Sun Jan 18 12:05:48 2009 From: jim at meyering.net (Jim Meyering) Date: Sun, 18 Jan 2009 13:05:48 +0100 Subject: [Ovirt-devel] [PATCH node] Bump log rotation so logs can be up to 1MB for standalone mode In-Reply-To: <1232265790-19681-1-git-send-email-pmyers@redhat.com> (Perry Myers's message of "Sun, 18 Jan 2009 03:03:10 -0500") References: <1232265790-19681-1-git-send-email-pmyers@redhat.com> Message-ID: <87hc3wstsz.fsf@meyering.net> Perry Myers wrote: > 10k is a good default size for a completely stateless node, but in standalone > mode or when we have local storage available we should use more of it for logs > > For ovirt-server managed mode, making max log size 1MB won't affect overall > memory usage too badly. With ~10 log files, the max disk usage will be about > 10MB ACK, w/suggestion > diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions > index 13f9ad4..2e62fc4 100644 > --- a/scripts/ovirt-functions > +++ b/scripts/ovirt-functions > @@ -27,7 +27,8 @@ OVIRT_CONFIG_FILES="\ > /etc/ssh/ssh_host*_key* \ > /etc/default/ovirt \ > /etc/sysconfig/network \ > - /etc/collectd.conf > + /etc/collectd.conf \ > + /etc/logrotate.d/ovirt-logrotate.conf As someone who recently made the mistake of omitting backslashes in a list just like that (it was in a libvirt Makefile), I feel obliged to suggest aligning them. Then it's harder for people like me to make the mistake ;-) /etc/ssh/ssh_host*_key* \ /etc/default/ovirt \ /etc/sysconfig/network \ /etc/collectd.conf \ /etc/logrotate.d/ovirt-logrotate.conf From apevec at redhat.com Sun Jan 18 15:46:57 2009 From: apevec at redhat.com (Alan Pevec) Date: Sun, 18 Jan 2009 16:46:57 +0100 Subject: [Ovirt-devel] [PATCH node] make it harder to omit backslashes in the lists In-Reply-To: <87hc3wstsz.fsf@meyering.net> References: <87hc3wstsz.fsf@meyering.net> Message-ID: <1232293617-12016-1-git-send-email-apevec@redhat.com> make them more visible by aligning them far right --- scripts/ovirt-functions | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions index 2e62fc4..13dcae0 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -17,17 +17,17 @@ OVIRT_STANDALONE=${OVIRT_STANDALONE:-0} OVIRT_BACKUP_DIR=/var/lib/ovirt-backup OVIRT_CONFIG_FILES="\ - /etc/sysconfig/network-scripts/ifcfg-* \ - /etc/rsyslog.conf \ - /etc/libvirt/libvirtd.conf \ - /etc/sasl2/libvirt.conf \ - /etc/libvirt/passwd.db \ - /etc/passwd \ - /etc/shadow \ - /etc/ssh/ssh_host*_key* \ - /etc/default/ovirt \ - /etc/sysconfig/network \ - /etc/collectd.conf \ + /etc/sysconfig/network-scripts/ifcfg-* \ + /etc/rsyslog.conf \ + /etc/libvirt/libvirtd.conf \ + /etc/sasl2/libvirt.conf \ + /etc/libvirt/passwd.db \ + /etc/passwd \ + /etc/shadow \ + /etc/ssh/ssh_host*_key* \ + /etc/default/ovirt \ + /etc/sysconfig/network \ + /etc/collectd.conf \ /etc/logrotate.d/ovirt-logrotate.conf " -- 1.6.0.6 From jim at meyering.net Sun Jan 18 15:59:12 2009 From: jim at meyering.net (Jim Meyering) Date: Sun, 18 Jan 2009 16:59:12 +0100 Subject: [Ovirt-devel] [PATCH node] make it harder to omit backslashes in the lists In-Reply-To: <1232293617-12016-1-git-send-email-apevec@redhat.com> (Alan Pevec's message of "Sun, 18 Jan 2009 16:46:57 +0100") References: <87hc3wstsz.fsf@meyering.net> <1232293617-12016-1-git-send-email-apevec@redhat.com> Message-ID: <87bpu4sizz.fsf@meyering.net> Alan Pevec wrote: > make them more visible by aligning them far right ACK, thanks! From apevec at redhat.com Sun Jan 18 16:21:12 2009 From: apevec at redhat.com (Alan Pevec) Date: Sun, 18 Jan 2009 17:21:12 +0100 Subject: [Ovirt-devel] [PATCH node] Reworked logging for standalone mode In-Reply-To: <87mydosu48.fsf@meyering.net> References: <87mydosu48.fsf@meyering.net> Message-ID: <1232295672-12638-1-git-send-email-apevec@redhat.com> From: Perry Myers Entire firstboot is logged to both console/logfile using tee. Selected sections of the code are set to only log stdout/stderr to logfile to prevent data overload on console. In these cases log() function is used to write to the console. TEE and log() must not be redefined in the scripts. Signed-off-by: Perry Myers --- scripts/ovirt | 2 + scripts/ovirt-config-boot | 20 +++++++++++------- scripts/ovirt-config-collectd | 5 ++++ scripts/ovirt-config-hostname | 7 ++++++ scripts/ovirt-config-logging | 5 ++++ scripts/ovirt-config-networking | 28 +++++++++++++++----------- scripts/ovirt-config-password | 15 ++++++++++++- scripts/ovirt-config-setup | 6 +++- scripts/ovirt-config-storage | 41 +++++++++++++++++++++++++------------- scripts/ovirt-early | 2 + scripts/ovirt-firstboot | 11 ++++++--- scripts/ovirt-functions | 38 ++++++++++++++++++++++++++++++++++- scripts/ovirt-post | 2 + 13 files changed, 138 insertions(+), 44 deletions(-) diff --git a/scripts/ovirt b/scripts/ovirt index 6a48e47..f789d24 100755 --- a/scripts/ovirt +++ b/scripts/ovirt @@ -75,7 +75,9 @@ case "$1" in printf "Starting ovirt: " { + log "Starting ovirt" start + log "Completed ovirt" } >> $OVIRT_LOGFILE 2>&1 test $? == 0 && success || failure diff --git a/scripts/ovirt-config-boot b/scripts/ovirt-config-boot index 69e02d9..8c25d47 100755 --- a/scripts/ovirt-config-boot +++ b/scripts/ovirt-config-boot @@ -22,19 +22,21 @@ . /etc/init.d/functions . /etc/init.d/ovirt-functions +trap '__st=$?; stop_log; exit $__st' 0 +trap 'exit $?' 1 2 13 15 ovirt_boot_setup() { local disk=$1 local live=$2 local bootparams=$3 - printf "installing oVirt Node image ... " + log "installing oVirt Node image." mount_boot # check that /boot mounted ok and find partition number for GRUB BOOT=$(mount|awk '$3 == "/boot" {print $1}') BOOT=$(( ${BOOT#$disk} - 1 )) rc=$? if [ $rc -ne 0 -o $BOOT -lt 0 ]; then - printf "boot partition not available\n" + log "boot partition not available." return $rc fi mount_liveos @@ -54,7 +56,7 @@ ovirt_boot_setup() { && cp -p $live/$syslinux/vmlinuz0 /boot rc=$? if [ $rc -ne 0 ]; then - printf "image copy failed\n" + log "image copy failed." return $rc fi # append LVM support to the livecd initramfs @@ -113,7 +115,7 @@ setup --prefix=/grub (hd0) EOF rc=$? if [ $rc -ne 0 ]; then - printf "boot loader install failed\n" + log "boot loader install failed." return $rc fi umount /liveos @@ -121,14 +123,14 @@ EOF # caller decides when to reboot rm -rf $tmpdir - printf "done.\n" + log "done." # avoid reboot loops using Cobbler PXE only once # Cobbler XMLRPC post-install trigger (XXX is there cobbler SRV record?): # wget "http://192.168.50.2/cblr/svc/op/trig/mode/post/system/$(hostname)" # -O /dev/null } - +start_log disk=$1 live=$2 bootparams=$3 @@ -150,13 +152,15 @@ parted $disk -s "print all" > /dev/null if [ 0 -eq $? ]; then ovirt_boot_setup "$disk" "$live" "$bootparams" else - printf "Please configure $disk before attempting to install the node image.\n" - printf "Use the option 'Disk Partitioning' from the main menu.\n" + log "Please configure $disk before attempting to install the node image." + log "Use the option 'Disk Partitioning' from the main menu." doreboot="no" fi if [ -z "$doreboot" -o "$doreboot" = "yes" ]; then disable_firstboot ovirt_store_firstboot_config + stop_log reboot fi +stop_log diff --git a/scripts/ovirt-config-collectd b/scripts/ovirt-config-collectd index 6ece6be..bbc5a89 100755 --- a/scripts/ovirt-config-collectd +++ b/scripts/ovirt-config-collectd @@ -5,6 +5,9 @@ . /etc/init.d/functions . /etc/init.d/ovirt-functions +trap '__st=$?; stop_log; exit $__st' 0 +trap 'exit $?' 1 2 13 15 + collectd_conf="/etc/collectd.conf" # Creates the collectd file based on the following inputs @@ -15,6 +18,7 @@ ovirt_collectd() { local collectd_server=$1 local collectd_port=$2 + start_log if [ -f $collectd_conf.in ]; then sed -e "s/@COLLECTD_SERVER@/$collectd_server/" \ -e "s/@COLLECTD_PORT@/$collectd_port/" $collectd_conf.in \ @@ -26,6 +30,7 @@ ovirt_collectd() { chkconfig collectd on service collectd restart + stop_log } prompt_user() { diff --git a/scripts/ovirt-config-hostname b/scripts/ovirt-config-hostname index 2375675..bf60c70 100755 --- a/scripts/ovirt-config-hostname +++ b/scripts/ovirt-config-hostname @@ -5,18 +5,25 @@ . /etc/init.d/functions . /etc/init.d/ovirt-functions +trap '__st=$?; stop_log; exit $__st' 0 +trap 'exit $?' 1 2 13 15 + HOSTNAME_FILE="/etc/sysconfig/network" function set_hostname { + start_log augtool <&2 select NIC in $NICS do @@ -234,13 +233,18 @@ else done fi -{ - printf "Configuring network.\n" - if ls "$WORKDIR"/augtool-* > /dev/null 2>&1 ; then - config="$WORKDIR"/config-augtool - cat "$WORKDIR"/augtool-* > $config \ - && augtool $config \ - && service network restart +start_log +if ls "$WORKDIR"/augtool-* > /dev/null 2>&1 ; then + log "Configuring network" + config="$WORKDIR"/config-augtool + cat "$WORKDIR"/augtool-* > $config \ + && augtool $config \ + && service network restart + if [ $? = 0 ]; then + log "Network configured successfully" + else + log "Error configuring network, see $OVIRT_LOGFILE" fi - ovirt_store_config /etc/sysconfig/network-scripts/ifcfg* -} 2>&1 | tee $CONFIG_LOG_FILE +fi +ovirt_store_config /etc/sysconfig/network-scripts/ifcfg* +stop_log diff --git a/scripts/ovirt-config-password b/scripts/ovirt-config-password index 47be3f7..89b91da 100755 --- a/scripts/ovirt-config-password +++ b/scripts/ovirt-config-password @@ -1,12 +1,22 @@ #!/bin/bash # # Set the root password and others +# Source functions library +. /etc/init.d/functions +. /etc/init.d/ovirt-functions + +trap '__st=$?; stop_log; exit $__st' 0 +trap 'exit $?' 1 2 13 15 function sasl_password { user=$1 passwd=$2 - printf "adding user $user to the sasl list for libvirt\n" + + printf "\nadding user $user to the sasl list for libvirt\n" + + start_log printf '%s\n' "$passwd" | saslpasswd2 -a libvirt -p "$user" + stop_log } # Usage: set_sasl_password USER @@ -25,7 +35,9 @@ function set_sasl_password { local confirm=$REPLY if test "$passwd" = "$confirm"; then if [ "$user" = "root" ]; then + start_log printf '%s\n' "$passwd" | passwd --stdin "$user" + stop_log fi sasl_password "$user" "$passwd" return 0 @@ -53,4 +65,3 @@ set_sasl_password root printf "\nAdding new SASL users for libvirt" # TODO list existing users in /etc/libvirt/passwd.db while prompt_sasl_user; do :; done - diff --git a/scripts/ovirt-config-setup b/scripts/ovirt-config-setup index 380d79d..21e6b0e 100755 --- a/scripts/ovirt-config-setup +++ b/scripts/ovirt-config-setup @@ -2,6 +2,8 @@ # # Entry point for configuring an oVirt node when running in standalone mode. +. /etc/init.d/ovirt-functions + # symlinked scripts for menu options, link name is menu label CONFIG_DIR=/etc/ovirt-config-setup.d @@ -29,7 +31,7 @@ while true; do PS3="Please select an option: " while true ; do - printf "\n\n oVirt Node Standalone Configuration\n\n" + printf "\n\n oVirt Node Standalone Configuration\n\n" >&2 select OPTION in "${OPTIONS[@]}" do @@ -38,7 +40,7 @@ while true; do "$CONTINUE") exit 0 ;; *) clear; - $CONFIG_DIR/*"$OPTION"; + $CONFIG_DIR/*"$OPTION" 2>&1 | $TEE; break ;; esac done diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage index 9928920..2424361 100755 --- a/scripts/ovirt-config-storage +++ b/scripts/ovirt-config-storage @@ -12,6 +12,9 @@ ME=$(basename "$0") warn() { printf '%s: %s\n' "$ME" "$*" >&2; } die() { warn "$*"; exit 1; } +trap '__st=$?; stop_log; exit $__st' 0 +trap 'exit $?' 1 2 13 15 + default_boot_size=50 default_root_size=256 default_config_size=5 @@ -178,24 +181,25 @@ perform_partitioning() DRIVE_FILE=$(echo $DRIVE | tr '/' '_') if [ -f /tmp/ovirt-config-storage-$DRIVE_FILE ]; then printf "\n\nERROR:\n" - printf "\nStorage Configuration has already been run for $DRIVE_FILE.\n" - printf "To run it again, please reboot the Node from\n USB/cdrom/PXE\n" + printf "Storage Configuration has already been run for $DRIVE.\n" + printf "To run it again, please reboot the Node from USB/cdrom/PXE\n" printf "in stand-alone mode.\n\n\n" return 1 fi touch /tmp/ovirt-config-storage-$DRIVE_FILE - printf "Preparing local storage. Please wait..." + start_log + log "Starting partitioning of $DRIVE" - LOG=/var/log/ovirt-partition.log - { + log "Removing old LVM partitions" wipe_lvm_on_disk # Exit upon any failure. set -e # FIXME: save a backup copy, just in case? + log "Wiping old boot sector" dd if=/dev/zero of=$DRIVE bs=1024K count=1 blockdev --rereadpt $DRIVE partprobe -s $DRIVE @@ -204,6 +208,7 @@ perform_partitioning() # ensure minimal BOOT partition BOOT_SIZE=10 fi + log "Creating boot partition" parted $DRIVE -s "mklabel ${LABEL_TYPE}" parted $DRIVE -s "mkpartfs primary ext2 0M ${BOOT_SIZE}M" parted $DRIVE -s "mkpart primary ext2 ${BOOT_SIZE}M ${SPACE}M" @@ -214,57 +219,65 @@ perform_partitioning() # sync GPT to the legacy MBR partitions if [ "gpt" == "$LABEL_TYPE" ]; then - gptsync $DRIVE + log "Running gptsync to create legacy mbr" + gptsync $DRIVE fi + log "Creating physical volume" pvcreate "${DRIVE}2" pvck + log "Creating volume group" vgcreate /dev/HostVG "${DRIVE}2" + log "Creating boot filesystem" mke2fs -T ext3 "${DRIVE}1" -L "BOOT" tune2fs -c 0 -i 0 "${DRIVE}1" mkdir -p /dev/disk/by-label ln -snf "${DRIVE}1" /dev/disk/by-label/BOOT if [ "$SWAP_SIZE" -gt 0 ]; then + log "Creating swap partition" lvcreate --name Swap --size ${SWAP_SIZE}M /dev/HostVG mkswap -L "SWAP" /dev/HostVG/Swap echo "/dev/HostVG/Swap swap swap defaults 0 0" >> /etc/fstab fi if [ "$ROOT_SIZE" -gt 0 ]; then + log "Creating root partition" lvcreate --name Root --size ${ROOT_SIZE}M /dev/HostVG mke2fs -T ext3 /dev/HostVG/Root -L "ROOT" tune2fs -c 0 -i 0 /dev/HostVG/Root fi if [ "$CONFIG_SIZE" -gt 0 ]; then + log "Creating config partition" lvcreate --name Config --size ${CONFIG_SIZE}M /dev/HostVG mke2fs -T ext3 /dev/HostVG/Config -L "CONFIG" tune2fs -c 0 -i 0 /dev/HostVG/Config fi if [ "$LOGGING_SIZE" -gt 0 ]; then + log "Creating log partition" lvcreate --name Logging --size ${LOGGING_SIZE}M /dev/HostVG mke2fs -T ext3 /dev/HostVG/Logging -L "LOGGING" tune2fs -c 0 -i 0 /dev/HostVG/Logging echo "/dev/HostVG/Logging /var/log ext3 defaults 0 0" >> /etc/fstab - mount_logging fi + log "Creating data partition" lvcreate --name Data -l 100%FREE /dev/HostVG mke2fs -T ext3 /dev/HostVG/Data -L "DATA" tune2fs -c 0 -i 0 /dev/HostVG/Data echo "/dev/HostVG/Data /data ext3 defaults 0 0" >> /etc/fstab echo "/data/images /var/lib/libvirt/images bind bind 0 0" >> /etc/fstab + log "Mounting data partition" mount_data + log "Mounting config partition" if mount_config; then ovirt_store_config /etc/fstab fi - } 2>&1 | tee $LOG - if [ $? -eq 0 ]; then - printf "Completed!\n\n" - else - printf "FAILED! See $LOG\n\n" - fi + mount_logging + log "Completed!" + + stop_log } do_confirm() @@ -357,7 +370,7 @@ else PS3="Choose an option: " while true; do - printf "\n\n oVirt Node Storage Configuration\n\n" + printf "\n\n oVirt Node Storage Configuration\n\n" >&2 select OPTION in $OPTIONS do diff --git a/scripts/ovirt-early b/scripts/ovirt-early index f31e977..6c7b29b 100755 --- a/scripts/ovirt-early +++ b/scripts/ovirt-early @@ -391,7 +391,9 @@ case "$1" in printf "Starting ovirt-early: " { + log "Starting ovirt-early" start + log "Completed ovirt-early" } >> $OVIRT_LOGFILE 2>&1 test $? == 0 && success || failure diff --git a/scripts/ovirt-firstboot b/scripts/ovirt-firstboot index c7ddfe4..575fa89 100755 --- a/scripts/ovirt-firstboot +++ b/scripts/ovirt-firstboot @@ -27,6 +27,9 @@ . /etc/init.d/functions . /etc/init.d/ovirt-functions +trap '__st=$?; stop_log; exit $__st' 0 +trap 'exit $?' 1 2 13 15 + start () { if ! is_firstboot && ! is_auto_install; then @@ -57,7 +60,9 @@ start () fi disable_firstboot - ovirt_store_firstboot_config >> $OVIRT_LOGFILE 2>&1 + start_log + ovirt_store_firstboot_config + stop_log } case "$1" in @@ -68,9 +73,7 @@ case "$1" in printf "Starting ovirt-firstboot: " - { - start - } + start test $? == 0 && success || failure echo diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions index 814a8ae..5016f79 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -1,6 +1,8 @@ # -*-Shell-script-*- OVIRT_LOGFILE=/var/log/ovirt.log +TEE="tee -a $OVIRT_LOGFILE" +_log_status=1 # label of the oVirt partition OVIRT_LABEL=OVIRT @@ -28,6 +30,37 @@ OVIRT_CONFIG_FILES="\ /etc/collectd.conf " +# Save stdout to fd 6 and stderr to fd 7. Redirect normal stdout/stderr +# to log file +start_log() { + if [ "$_log_status" = 1 ]; then + exec 6>&1 + exec 7>&2 + exec 1>>$OVIRT_LOGFILE + exec 2>&1 + _log_status=0 + fi +} + +# Restore stdout/stderr from fd 6 and 7, respectively. Close fd 6 and 7 +stop_log() { + if [ "$_log_status" != 1 ]; then + exec 1>&6 6>&- + exec 2>&7 7>&- + _log_status=1 + fi +} + +log() { + printf "$(date +'%b %d %H:%M:%S') " + + if [ "$_log_status" = 1 ]; then + echo "$@" + else + echo "$@" >&6 + fi +} + ovirt_store_firstboot_config() { # persist config for standalone ovirt_store_config $OVIRT_CONFIG_FILES @@ -220,15 +253,16 @@ mount_logging() { fi if [ -e /dev/HostVG/Logging ] ; then + log "Mounting log partition" # backup the logs if [ -e /var/log.bak ]; then rm -rf /var/log.bak fi - cp -a /var/log /var/log.bak + cp -av /var/log /var/log.bak mount /dev/HostVG/Logging /var/log + cp -av /var/log.bak/* /var/log restorecon -rv /var/log - mv /var/log.bak/* /var/log rm -Rf /var/log.bak service rsyslog restart diff --git a/scripts/ovirt-post b/scripts/ovirt-post index 5c06927..3861973 100755 --- a/scripts/ovirt-post +++ b/scripts/ovirt-post @@ -34,7 +34,9 @@ case "$1" in printf "Starting ovirt-post: " { + log "Starting ovirt-post" start + log "Completed ovirt-post" } >> $OVIRT_LOGFILE 2>&1 test $? == 0 && success || failure -- 1.6.0.6 From apevec at redhat.com Sun Jan 18 16:23:22 2009 From: apevec at redhat.com (Alan Pevec) Date: Sun, 18 Jan 2009 17:23:22 +0100 Subject: [Ovirt-devel] Re: [PATCH node] Reworked logging for standalone mode In-Reply-To: <87mydosu48.fsf@meyering.net> References: <1232265778-19654-1-git-send-email-pmyers@redhat.com> <87mydosu48.fsf@meyering.net> Message-ID: <4973577A.7080201@redhat.com> Jim Meyering wrote: > E.g., you could test $LOG_STATUS != 1 in start_log, > since there are two tests of $LOG_STATUS = 1 already. > Or maybe you prefer "boolean" semantics and would > want to test against 0. yes, boolean is more, err, logical :) > All names defined/used above impinge on the name space > of each script that sources ovirt-functions, so it'd be > nice to use names that make collisions less likely e.g., > _TEE, _log and $_LOG_STATUS. agreed for _log_status, that's ovirt-functions internal but TEE and log are public so I kept them with the remark that scripts should not redefine them From jim at meyering.net Sun Jan 18 16:33:57 2009 From: jim at meyering.net (Jim Meyering) Date: Sun, 18 Jan 2009 17:33:57 +0100 Subject: [Ovirt-devel] [PATCH node] Reworked logging for standalone mode In-Reply-To: <1232295672-12638-1-git-send-email-apevec@redhat.com> (Alan Pevec's message of "Sun, 18 Jan 2009 17:21:12 +0100") References: <87mydosu48.fsf@meyering.net> <1232295672-12638-1-git-send-email-apevec@redhat.com> Message-ID: <8763kcshe2.fsf@meyering.net> Alan Pevec wrote: > From: Perry Myers > > Entire firstboot is logged to both console/logfile using tee. Selected > sections of the code are set to only log stdout/stderr to logfile to prevent > data overload on console. In these cases log() function is used to write > to the console. > TEE and log() must not be redefined in the scripts. Looks good. ACK From clalance at redhat.com Mon Jan 19 08:02:46 2009 From: clalance at redhat.com (Chris Lalancette) Date: Mon, 19 Jan 2009 09:02:46 +0100 Subject: [Ovirt-devel] Taskomatic Qpid Transition, LVM and Migration. In-Reply-To: <20090116143058.7bae7835@tp.mains.net> References: <20090116143058.7bae7835@tp.mains.net> Message-ID: <497433A6.6040908@redhat.com> Ian Main wrote: > So, I'd like to propose that I post a new patch on Monday with > Chris's comments incorporated but with LVM scanning still removed so > that we can get some testing of taskomatic/qpid. At that point I'll > make it top priority to get the LVM scanning working again properly. > This will likely mean a new version of libvirt-qpid that figures all > this out and provides a nice pointer to a volumes LVM pool making it > much easier for taskomatic to figure out. > > This sound reasonable? Chris, you ok with that? I guess that is fine; we'll have a temporary break in functionality, but as long as we fix it up pretty quickly, it should be OK. As far as getting LVM working, I actually came up with another idea that may work and require no changes to libvirt itself. The basic problem with the current algorithm (besides the fact that it is complicated) is that pool.lookup_vol_by_name() works globally, not on a particular pool. I *think* we could actually write a quick wrapper to that call that does the right thing; after all, we do have the pool already, so we can fetch all of the volumes that are attached, and see if *this* volume matches up with one of the ones we already know about. It would have to be looked at in more detail, though. > > The other sticking point is migration. Currently we are still using > ruby-qpid to do the migration via libvirt. I have spoken to the > libvirt folks about the creation of a split (src and dst) API to allow > migration to be set up over qpid but it sounds dubious. It is also > likely that we will need libvirt to libvirt communications in the > future anyway as that is the way they are headed. > > So for now I think we're going to need to carry the libvirt gssapi > configuration going forward until a better solution is found. Just to be clear; by "libvirt gssapi configuration", you mean that you are still doing migration by directly connecting to dst and src on from the ovirt WUI, and then doing the transaction like that? If so, that makes sense; anything else is going to require a lot more thought and time to implement. -- Chris Lalancette From pmyers at redhat.com Mon Jan 19 08:24:45 2009 From: pmyers at redhat.com (Perry Myers) Date: Mon, 19 Jan 2009 03:24:45 -0500 Subject: [Ovirt-devel] [PATCH node] Change Quit to be Save & Exit in o-c-networking Message-ID: <1232353485-25770-1-git-send-email-pmyers@redhat.com> Signed-off-by: Perry Myers --- scripts/ovirt-config-networking | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/scripts/ovirt-config-networking b/scripts/ovirt-config-networking index 4b4ff10..0ae0b0c 100755 --- a/scripts/ovirt-config-networking +++ b/scripts/ovirt-config-networking @@ -208,7 +208,6 @@ function setup_menu NICS="" for d in $udi_list; do NICS="$NICS $(hal-get-property --udi "$d" --key net.interface)"; done - NICS="$NICS DNS Quit" PS3="Please select an interface or configuration option: " } @@ -221,7 +220,7 @@ else while true; do printf "\n\n oVirt Node Networking Configuration\n\n" >&2 - select NIC in $NICS + select NIC in $NICS "DNS" "Save & Exit" do printf "\n" case "$NIC" in -- 1.6.0.6 From pmyers at redhat.com Mon Jan 19 08:25:23 2009 From: pmyers at redhat.com (Perry Myers) Date: Mon, 19 Jan 2009 03:25:23 -0500 Subject: [Ovirt-devel] [PATCH node] Refactor o-c-password to use passwd/saslpasswd2 natively instead of manual prompts Message-ID: <1232353523-25972-1-git-send-email-pmyers@redhat.com> This has the advantage of allowing the admin to see any warnings about password lengths or complexity. Signed-off-by: Perry Myers --- scripts/ovirt-config-password | 38 ++++++++------------------------------ 1 files changed, 8 insertions(+), 30 deletions(-) diff --git a/scripts/ovirt-config-password b/scripts/ovirt-config-password index 89b91da..5070b49 100755 --- a/scripts/ovirt-config-password +++ b/scripts/ovirt-config-password @@ -8,42 +8,20 @@ trap '__st=$?; stop_log; exit $__st' 0 trap 'exit $?' 1 2 13 15 -function sasl_password { - user=$1 - passwd=$2 - - printf "\nadding user $user to the sasl list for libvirt\n" - - start_log - printf '%s\n' "$passwd" | saslpasswd2 -a libvirt -p "$user" - stop_log -} - # Usage: set_sasl_password USER # Prompt(twice) for a password for the specified USER. # If they match, set that user's system password, # and add USER to the SASL list for libvirt. function set_sasl_password { user=$1 - while : ; do - printf "\nPlease enter the password for $user (hit return to skip) " - read -es - test -z "$REPLY" && return 1 - local passwd=$REPLY - printf "\nPlease enter again to confirm " - read -es - local confirm=$REPLY - if test "$passwd" = "$confirm"; then - if [ "$user" = "root" ]; then - start_log - printf '%s\n' "$passwd" | passwd --stdin "$user" - stop_log - fi - sasl_password "$user" "$passwd" - return 0 - fi - printf "Paswords did not match. Please try again\n" - done + if [ "$user" = "root" ]; then + printf "\nSystem Administrator ($user):\n" + passwd "$user" + fi + + printf "\nNode SASL User ($user):\n" + saslpasswd2 -a libvirt "$user" + return 0 } # Prompts the user for a single username, password combo -- 1.6.0.6 From pmyers at redhat.com Mon Jan 19 08:25:53 2009 From: pmyers at redhat.com (Perry Myers) Date: Mon, 19 Jan 2009 03:25:53 -0500 Subject: [Ovirt-devel] [PATCH node] Add data partition to ovirt_vol parameter and o-c-storage Message-ID: <1232353553-26130-1-git-send-email-pmyers@redhat.com> data partition size can be specified as follows: -1 = data partition uses up remaining disk available 0 = no data partition X = positive number indicates exact size for data partition Signed-off-by: Perry Myers --- scripts/ovirt-config-storage | 96 +++++++++++++++++++++++++++++++++-------- scripts/ovirt-early | 12 ++++-- 2 files changed, 85 insertions(+), 23 deletions(-) diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage index a8d679e..efe55f5 100755 --- a/scripts/ovirt-config-storage +++ b/scripts/ovirt-config-storage @@ -1,7 +1,7 @@ #!/bin/bash # # To automate the partitioning, pass in the specific fields in this order -# ovirt-config-storage [swap size] [boot size] [root size] [logging size] +# ovirt-config-storage [swap size] [boot size] [root size] [logging size] [data size] # # All sizes are in megabytes # @@ -19,6 +19,15 @@ default_boot_size=50 default_root_size=256 default_config_size=5 default_logging_size=256 +# -1 indicates data partition should use remaining disk +default_data_size=-1 + +boot_min_size=50 +root_min_size=256 +config_min_size=5 +logging_min_size=5 +data_min_size=5 +swap_min_size=5 get_selected_drive_size() { @@ -33,20 +42,24 @@ get_selected_drive_size() size=$(hal-get-property --udi "$udi" --key storage.removable.media_size) fi SPACE=$(echo "scale=0; $size / (1024 * 1024)" | bc -l) - echo "selected device: $DRIVE ($SPACE MB)" + echo "Selected Device: $DRIVE ($SPACE MB)" } check_partition_sizes() { local disk_size need_size + local min_data_size=$DATA_SIZE + if [ "$DATA_SIZE" = -1 ]; then + min_data_size=5 + fi + + printf "\n" get_selected_drive_size disk_size=$SPACE need_size=$(echo "scale=0;" \ "$BOOT_SIZE + $SWAP_SIZE + $ROOT_SIZE" \ - "+ $CONFIG_SIZE + $LOGGING_SIZE" | bc -l) - printf "disk_size=$disk_size\n" - printf "need_size=$need_size\n" + "+ $CONFIG_SIZE + $LOGGING_SIZE + $min_data_size" | bc -l) if [ $need_size -gt $disk_size ]; then gap_size=$(echo "scale=0; $need_size-$disk_size;" | bc -l) @@ -59,6 +72,8 @@ check_partition_sizes() printf "You need an addition $gap_size MB of storage.\n" printf "\n" return 1 + else + printf "Required Space : $need_size MB\n\n" fi return 0 @@ -126,19 +141,40 @@ do_configure() DRIVE=$(get_dev_name) || exit 1 get_selected_drive_size - for i in boot swap root config logging ; do + printf "\n\nPlease configure storage partitions.\n\n" + printf "Enter partition sizes in MB.\n" + printf "A value of 0 indicates the partition should be disabled.\n" + printf "If the partition is enabled, it will have a minimum valid size.\n" + printf "For the Data partition, a size of -1 indicates that the\n" + printf "partition should use up the remaining space on the disk.\n\n" + + for i in boot swap root config logging data ; do + part_regexp="^0$" + if [ "$i" = "data" ]; then + part_regexp="^\-1|0$" + fi uc=$(echo $i|tr '[[:lower:]]' '[[:upper:]]') - var=${uc}_SIZE - eval "size=\$$var" - read -ep "Change $i partition size (Currently $size MB)? " + size_var=${uc}_SIZE + eval "size=\$$size_var" + min_size_var=${i}_min_size + eval "min_size=\$$min_size_var" + read -ep "Change $i partition size. (Current $size MB, Minimum $min_size MB)? " r=$REPLY test -z "$r" && r=$size - if [[ $r =~ ^[0-9]+$ ]] && [[ $r -ge 0 ]]; then - eval "$var=$r" + if [[ $r =~ ^-*[0-9]+$ ]] && [[ $r -ge $min_size || + $r =~ $part_regexp ]] ; then + eval "$size_var=$r" else printf "invalid $i size: '$r' retaining $size MB.\n" fi done + + if ! check_partition_sizes; then + printf "Please try partitioning again.\n" + DRIVE= + return 1 + fi + # save input variables augtool <> /etc/fstab fi - log "Creating data partition" - lvcreate --name Data -l 100%FREE /dev/HostVG - mke2fs -T ext3 /dev/HostVG/Data -L "DATA" - tune2fs -c 0 -i 0 /dev/HostVG/Data - echo "/dev/HostVG/Data /data ext3 defaults 0 0" >> /etc/fstab - echo "/data/images /var/lib/libvirt/images bind bind 0 0" >> /etc/fstab - log "Mounting data partition" - mount_data + + local use_data=1 + if [ "$DATA_SIZE" -eq -1 ]; then + log "Creating data partition with remaining free space" + lvcreate --name Data -l 100%FREE /dev/HostVG + use_data=0 + elif [ "$DATA_SIZE" -gt 0 ]; then + log "Creating data partition" + lvcreate --name Data --size ${DATA_SIZE}M /dev/HostVG + use_data=0 + fi + + if [ "$use_data" = 0 ]; then + mke2fs -T ext3 /dev/HostVG/Data -L "DATA" + tune2fs -c 0 -i 0 /dev/HostVG/Data + echo "/dev/HostVG/Data /data ext3 defaults 0 0" >> /etc/fstab + echo "/data/images /var/lib/libvirt/images bind bind 0 0" >> /etc/fstab + log "Mounting data partition" + mount_data + fi log "Mounting config partition" if mount_config; then @@ -365,6 +422,7 @@ BOOT_SIZE=${OVIRT_VOL_BOOT_SIZE:-$default_boot_size} ROOT_SIZE=${OVIRT_VOL_ROOT_SIZE:-$default_root_size} CONFIG_SIZE=${OVIRT_VOL_CONFIG_SIZE:-$default_config_size} LOGGING_SIZE=${OVIRT_VOL_LOGGING_SIZE:-$default_logging_size} +DATA_SIZE=${OVIRT_VOL_DATA_SIZE:-$default_data_size} if [ -n "$OVIRT_INIT" ]; then # if present, use the drive selected with 'ovirt_init' boot parameter diff --git a/scripts/ovirt-early b/scripts/ovirt-early index 6c7b29b..a7cf4dc 100755 --- a/scripts/ovirt-early +++ b/scripts/ovirt-early @@ -116,7 +116,7 @@ start() { # oVirt boot parameters # BOOTIF=link|eth*| (appended by pxelinux) # ovirt_init=usb|scsi[:serial#] - # ovirt_vol=BOOT_MB:SWAP_MB:ROOT_MB:CONFIG_MB:LOGGING_MB + # ovirt_vol=BOOT_MB:SWAP_MB:ROOT_MB:CONFIG_MB:LOGGING_MB:DATA_MB # ovirt_overcommit # ovirt_local_boot # ovirt_standalone @@ -147,13 +147,17 @@ start() { # e.g. ovirt_init=usb:Generic_STORAGE_DEVICE_0000145418-0:0 init= - # ovirt_vol=BOOT_MB:SWAP_MB:ROOT_MB:CONFIG_MB:LOGGING_MB + # ovirt_vol=BOOT_MB:SWAP_MB:ROOT_MB:CONFIG_MB:LOGGING_MB:DATA_MB # local partition sizes in MB vol_boot_size= vol_swap_size= vol_root_size= vol_config_size= vol_logging_size= + # data size can be set to 0 to disable data partition, -1 to use + # remaining free space after the other above partitions are defined + # or a specific positive number in MB + vol_data_size= # ovirt_local_boot # install/update oVirt Node image on the local installation target disk @@ -250,7 +254,7 @@ start() { ;; ovirt_vol=*) i=${i#ovirt_vol=} - eval $(printf $i|awk -F: '{print "vol_boot_size="$1; print "vol_swap_size="$2; print "vol_root_size="$3; print "vol_config_size="$4; print "vol_logging_size="$5;}') + eval $(printf $i|awk -F: '{print "vol_boot_size="$1; print "vol_swap_size="$2; print "vol_root_size="$3; print "vol_config_size="$4; print "vol_logging_size="$5; print "vol_data_size="$6;}') ;; ovirt_local_boot*) local_boot=1 @@ -305,7 +309,7 @@ start() { ip_gateway=$gateway fi # save boot parameters as defaults for ovirt-config-* - params="bootif init vol_boot_size vol_swap_size vol_root_size vol_config_size vol_logging_size local_boot standalone overcommit ip_address ip_netmask ip_gateway ipv6 dns syslog_server syslog_port collectd_server collectd_port bootparams hostname" + params="bootif init vol_boot_size vol_swap_size vol_root_size vol_config_size vol_logging_size vol_data_size local_boot standalone overcommit ip_address ip_netmask ip_gateway ipv6 dns syslog_server syslog_port collectd_server collectd_port bootparams hostname" mount_config if [ -e $OVIRT_DEFAULTS ]; then echo "update ovirt defaults" -- 1.6.0.6 From pmyers at redhat.com Mon Jan 19 08:26:02 2009 From: pmyers at redhat.com (Perry Myers) Date: Mon, 19 Jan 2009 03:26:02 -0500 Subject: [Ovirt-devel] [PATCH node] o-c-setup now catches and reports failures from called sub-scripts Message-ID: <1232353562-26192-1-git-send-email-pmyers@redhat.com> Signed-off-by: Perry Myers --- scripts/ovirt-config-setup | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/scripts/ovirt-config-setup b/scripts/ovirt-config-setup index 21e6b0e..3d1292f 100755 --- a/scripts/ovirt-config-setup +++ b/scripts/ovirt-config-setup @@ -40,7 +40,15 @@ while true; do "$CONTINUE") exit 0 ;; *) clear; - $CONFIG_DIR/*"$OPTION" 2>&1 | $TEE; + { + $CONFIG_DIR/*"$OPTION" + if [ $? = 0 ]; then + printf "\n$OPTION Completed Successfully\n\n" + else + printf "\nERROR: $OPTION FAILED. " + printf "See $OVIRT_LOGFILE\n\n" + fi + } 2>&1 | $TEE; break ;; esac done -- 1.6.0.6 From apevec at gmail.com Mon Jan 19 12:00:38 2009 From: apevec at gmail.com (Alan Pevec) Date: Mon, 19 Jan 2009 13:00:38 +0100 Subject: [Ovirt-devel] [PATCH node] Change Quit to be Save & Exit in o-c-networking In-Reply-To: <1232353485-25770-1-git-send-email-pmyers@redhat.com> References: <1232353485-25770-1-git-send-email-pmyers@redhat.com> Message-ID: <2be7262f0901190400v5f76de13j6464c07b139d943b@mail.gmail.com> ack and pushed -------------- next part -------------- An HTML attachment was scrubbed... URL: From apevec at gmail.com Mon Jan 19 12:04:23 2009 From: apevec at gmail.com (Alan Pevec) Date: Mon, 19 Jan 2009 13:04:23 +0100 Subject: [Ovirt-devel] [PATCH node] Refactor o-c-password to use passwd/saslpasswd2 natively instead of manual prompts In-Reply-To: <1232353523-25972-1-git-send-email-pmyers@redhat.com> References: <1232353523-25972-1-git-send-email-pmyers@redhat.com> Message-ID: <2be7262f0901190404y74c5e8cnbe781fafe551eea0@mail.gmail.com> ack and pushed -------------- next part -------------- An HTML attachment was scrubbed... URL: From apevec at gmail.com Mon Jan 19 12:43:40 2009 From: apevec at gmail.com (Alan Pevec) Date: Mon, 19 Jan 2009 13:43:40 +0100 Subject: [Ovirt-devel] [PATCH node] Change Quit to be Save & Exit in o-c-networking In-Reply-To: <2be7262f0901190400v5f76de13j6464c07b139d943b@mail.gmail.com> References: <1232353485-25770-1-git-send-email-pmyers@redhat.com> <2be7262f0901190400v5f76de13j6464c07b139d943b@mail.gmail.com> Message-ID: <2be7262f0901190443m75fae3a9kfd8b30441848b1d@mail.gmail.com> On Mon, Jan 19, 2009 at 1:00 PM, Alan Pevec wrote: > ack and pushed > oops, forgot this: - "Quit") break 2;; + "Save & Exit") break 2;; -------------- next part -------------- An HTML attachment was scrubbed... URL: From apevec at gmail.com Mon Jan 19 12:44:17 2009 From: apevec at gmail.com (Alan Pevec) Date: Mon, 19 Jan 2009 13:44:17 +0100 Subject: [Ovirt-devel] [PATCH node] Add data partition to ovirt_vol parameter and o-c-storage In-Reply-To: <1232353553-26130-1-git-send-email-pmyers@redhat.com> References: <1232353553-26130-1-git-send-email-pmyers@redhat.com> Message-ID: <2be7262f0901190444x243b56b3gcccf6a5631064e45@mail.gmail.com> ack and pushed -------------- next part -------------- An HTML attachment was scrubbed... URL: From apevec at gmail.com Mon Jan 19 12:46:36 2009 From: apevec at gmail.com (Alan Pevec) Date: Mon, 19 Jan 2009 13:46:36 +0100 Subject: [Ovirt-devel] [PATCH node] o-c-setup now catches and reports failures from called sub-scripts In-Reply-To: <1232353562-26192-1-git-send-email-pmyers@redhat.com> References: <1232353562-26192-1-git-send-email-pmyers@redhat.com> Message-ID: <2be7262f0901190446n23e87b03v179e7bf79a9f599d@mail.gmail.com> ack and pushed w/ a small change Jim suggested in the other review: + if $CONFIG_DIR/*"$OPTION" ; then instead of + $CONFIG_DIR/*"$OPTION" > + if [ $? = 0 ]; then > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From jim at meyering.net Mon Jan 19 13:30:54 2009 From: jim at meyering.net (Jim Meyering) Date: Mon, 19 Jan 2009 14:30:54 +0100 Subject: [Ovirt-devel] [PATCH node] o-c-setup now catches and reports failures from called sub-scripts In-Reply-To: <1232353562-26192-1-git-send-email-pmyers@redhat.com> (Perry Myers's message of "Mon, 19 Jan 2009 03:26:02 -0500") References: <1232353562-26192-1-git-send-email-pmyers@redhat.com> Message-ID: <874ozvbey9.fsf@meyering.net> Perry Myers wrote: > diff --git a/scripts/ovirt-config-setup b/scripts/ovirt-config-setup > index 21e6b0e..3d1292f 100755 > --- a/scripts/ovirt-config-setup > +++ b/scripts/ovirt-config-setup > @@ -40,7 +40,15 @@ while true; do > "$CONTINUE") exit 0 ;; > *) > clear; > - $CONFIG_DIR/*"$OPTION" 2>&1 | $TEE; > + { > + $CONFIG_DIR/*"$OPTION" > + if [ $? = 0 ]; then > + printf "\n$OPTION Completed Successfully\n\n" > + else > + printf "\nERROR: $OPTION FAILED. " > + printf "See $OVIRT_LOGFILE\n\n" > + fi > + } 2>&1 | $TEE; > break ;; > esac > done ACK, but put command and result-test on the same line, e.g., use this (also factoring out the printing and formatting): if $CONFIG_DIR/*"$OPTION; then msg="$OPTION Completed Successfully" else msg="ERROR: $OPTION FAILED. See $OVIRT_LOGFILE" fi printf "\n%s\n\n" "$msg" or this: $CONFIG_DIR/*"$OPTION \ && msg="$OPTION Completed Successfully" \ || msg="ERROR: $OPTION FAILED. See $OVIRT_LOGFILE" printf "\n%s\n\n" "$msg" From pmyers at redhat.com Mon Jan 19 16:46:19 2009 From: pmyers at redhat.com (Perry Myers) Date: Mon, 19 Jan 2009 11:46:19 -0500 Subject: [Ovirt-devel] [PATCH node] Replaced calls to echo with log so that we get datestamps in the log file Message-ID: <1232383579-4778-1-git-send-email-pmyers@redhat.com> Also, swallow output from mount_config in ovirt-early so that it doesn't confuse users into thinking that an error has occured. It's normal for this function to error out in two cases: 1. firstboot before /config partition is created 2. stateless mode when there is no /config partition Signed-off-by: Perry Myers --- scripts/ovirt | 14 +++++++------- scripts/ovirt-early | 28 ++++++++++++++-------------- scripts/ovirt-post | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/scripts/ovirt b/scripts/ovirt index f789d24..8694db9 100755 --- a/scripts/ovirt +++ b/scripts/ovirt @@ -21,11 +21,11 @@ start() { wget -q \ http://$SRV_HOST:$SRV_PORT/ipa/config/krb5.ini -O $krb5_conf.tmp if [ $? -ne 0 ]; then - echo "Failed to get $krb5_conf"; return 1 + log "Failed to get $krb5_conf"; return 1 fi mv $krb5_conf.tmp $krb5_conf else - echo "skipping Kerberos configuration" + log "skipping Kerberos configuration" fi find_srv identify tcp @@ -37,10 +37,10 @@ start() { fi ovirt-awake start $SRV_HOST $SRV_PORT $krb5_tab if [ $? -ne 0 ]; then - echo "ovirt-awake failed"; return 1 + log "ovirt-awake failed"; return 1 fi else - echo "skipping ovirt-awake, oVirt identify service not available" + log "skipping ovirt-awake, oVirt identify service not available" fi find_srv collectd tcp @@ -52,11 +52,11 @@ start() { -e //,/<\/Plugin>/d $collectd_conf.in \ > $collectd_conf if [ $? -ne 0 ]; then - echo "Failed to write $collectd_conf"; return 1 + log "Failed to write $collectd_conf"; return 1 fi fi else - echo "skipping collectd configuration, collectd service not available" + log "skipping collectd configuration, collectd service not available" fi find_srv qpidd tcp @@ -66,7 +66,7 @@ start() { echo "LIBVIRT_QPID_ARGS=\"--broker $SRV_HOST --port $SRV_PORT\"" >> $libvirt_qpid_conf fi else - echo "skipping libvirt-qpid configuration, could not find $libvirt_qpid_conf" + log "skipping libvirt-qpid configuration, could not find $libvirt_qpid_conf" fi } diff --git a/scripts/ovirt-early b/scripts/ovirt-early index a7cf4dc..4968ab1 100755 --- a/scripts/ovirt-early +++ b/scripts/ovirt-early @@ -21,36 +21,36 @@ get_mac_addresses() { configure_from_network() { DEVICE=$1 if [ -n "$DEVICE" ]; then - echo "Configuring network Using interface $DEVICE" + log "Configuring network Using interface $DEVICE" # setup temporary interface to retrieve configuration echo "network --device $DEVICE --bootproto dhcp" | nash if [ $? -eq 0 ]; then # from network-scripts/ifup-post IPADDR=$(LC_ALL=C ip -o -4 addr ls dev ${DEVICE} | awk '{ print $4 ; exit }') - echo "Interface brought up with $IPADDR" + log "Interface brought up with $IPADDR" eval $(ipcalc --silent --hostname ${IPADDR} ; echo "status=$?") if [ "$status" = "0" ]; then hostname $HOSTNAME - echo "Hostname resolved to $HOSTNAME" + log "Hostname resolved to $HOSTNAME" # retrieve remote config find_srv ovirt tcp if [ -n "$SRV_HOST" -a -n "$SRV_PORT" ]; then - echo "oVirt Server found at: $SRV_HOST:$SRV_PORT" + log "oVirt Server found at: $SRV_HOST:$SRV_PORT" cfgdb=$(mktemp) get_mac_addresses - echo "MACs to use: $macs" + log "MACs to use: $macs" wget -O $cfgdb \ "http://$SRV_HOST:$SRV_PORT/ovirt/managed_node/config?host=$(hostname)&macs=$macs" if [ $? -eq 0 ]; then - echo "Remote configuration bundle retrieved to $cfgdb" + log "Remote configuration bundle retrieved to $cfgdb" ovirt-process-config $cfgdb $BONDING_MODCONF_FILE $AUGTOOL_CONFIG if [ $? -eq 0 ]; then - echo "Remote configuration retrieved and applied" + log "Remote configuration retrieved and applied" else - echo "Failure to retrieve or apply remote configuration" + log "Failure to retrieve or apply remote configuration" fi else - echo "Failed to retrieve configuration bundle" + log "Failed to retrieve configuration bundle" fi rm $cfgdb fi @@ -62,14 +62,14 @@ configure_from_network() { ETHDEVS=$(cd /sys/class/net && ls -d eth*) for eth in $ETHDEVS; do BRIDGE=ovirtbr`echo $eth | cut -b4-` - echo "Applying default configuration to $eth and $BRIDGE" + log "Applying default configuration to $eth and $BRIDGE" printf '%s\n' "DEVICE=$eth" ONBOOT=yes "BRIDGE=$BRIDGE" \ > /etc/sysconfig/network-scripts/ifcfg-$eth printf '%s\n' "DEVICE=$BRIDGE" BOOTPROTO=dhcp \ ONBOOT=yes TYPE=Bridge PEERNTP=yes DELAY=0 \ > /etc/sysconfig/network-scripts/ifcfg-$BRIDGE done - echo "Default config applied" + log "Default config applied" } # $(get_live_disk) @@ -310,9 +310,9 @@ start() { fi # save boot parameters as defaults for ovirt-config-* params="bootif init vol_boot_size vol_swap_size vol_root_size vol_config_size vol_logging_size vol_data_size local_boot standalone overcommit ip_address ip_netmask ip_gateway ipv6 dns syslog_server syslog_port collectd_server collectd_port bootparams hostname" - mount_config + mount_config > /dev/null 2>&1 if [ -e $OVIRT_DEFAULTS ]; then - echo "update ovirt defaults" + log "update ovirt defaults" tmpaug=$(mktemp) for p in $params; do PARAM=$(uc $p) @@ -322,7 +322,7 @@ start() { done augtool $tmpaug else - echo "initial startup" + log "initial startup" # dump all ovirt bootparams mkdir -p $(dirname $OVIRT_DEFAULTS) echo > $OVIRT_DEFAULTS diff --git a/scripts/ovirt-post b/scripts/ovirt-post index 3861973..068c709 100755 --- a/scripts/ovirt-post +++ b/scripts/ovirt-post @@ -25,7 +25,7 @@ start() { if [ -n "$SRV_HOST" -a -n "$SRV_PORT" ]; then ovirt-identify-node -s $SRV_HOST -p $SRV_PORT else - echo "skipping ovirt-identify-node, oVirt registration service not available" + log "skipping ovirt-identify-node, oVirt registration service not available" fi } -- 1.6.0.6 From apevec at gmail.com Mon Jan 19 18:21:28 2009 From: apevec at gmail.com (Alan Pevec) Date: Mon, 19 Jan 2009 19:21:28 +0100 Subject: [Ovirt-devel] [PATCH node] Replaced calls to echo with log so that we get datestamps in the log file In-Reply-To: <1232383579-4778-1-git-send-email-pmyers@redhat.com> References: <1232383579-4778-1-git-send-email-pmyers@redhat.com> Message-ID: <2be7262f0901191021s7c1b1a1bwfb33a61f48945e3c@mail.gmail.com> ack to echo->log - mount_config > + mount_config > /dev/null 2>&1 > maybe better we fix mount_config to check /dev/HostVG/Config exists before mounting? -------------- next part -------------- An HTML attachment was scrubbed... URL: From sseago at redhat.com Mon Jan 19 20:09:52 2009 From: sseago at redhat.com (Scott Seago) Date: Mon, 19 Jan 2009 20:09:52 +0000 Subject: [Ovirt-devel] [PATCH] Updated tree nav layout to move smart pools above the main pools. Message-ID: <1232395792-28920-1-git-send-email-sseago@redhat.com> Dashboard and networks have their own links in the nav. Also updating reworked nav icons. Signed-off-by: Scott Seago --- src/app/controllers/network_controller.rb | 13 +++++- src/app/controllers/tree_controller.rb | 53 ++++++++++++++++--------- src/app/models/pool.rb | 12 +++++- src/app/views/layouts/_navigation_tabs.rhtml | 9 ++++ src/app/views/layouts/_tree.rhtml | 23 +++++++++-- src/public/images/icon_add_hardwarepool.png | Bin 1223 -> 1133 bytes src/public/images/icon_add_smartpool.png | Bin 1341 -> 948 bytes src/public/images/icon_add_vmpool.png | Bin 838 -> 741 bytes src/public/images/icon_dashboard.gif | Bin 14152 -> 0 bytes src/public/images/icon_dashboard.png | Bin 0 -> 4457 bytes src/public/images/icon_hdwarepool.png | Bin 1179 -> 4509 bytes src/public/images/icon_networks.png | Bin 0 -> 4223 bytes src/public/images/icon_smartpool.png | Bin 641 -> 4233 bytes src/public/images/icon_smartpools.png | Bin 0 -> 4117 bytes src/public/images/icon_smartpools_dir.png | Bin 0 -> 4228 bytes src/public/javascripts/ovirt.tree.js | 43 ++++++-------------- src/public/stylesheets/ovirt-tree/tree.css | 27 +++++++++++-- 17 files changed, 119 insertions(+), 61 deletions(-) delete mode 100644 src/public/images/icon_dashboard.gif create mode 100644 src/public/images/icon_dashboard.png create mode 100644 src/public/images/icon_networks.png create mode 100644 src/public/images/icon_smartpools.png create mode 100644 src/public/images/icon_smartpools_dir.png diff --git a/src/app/controllers/network_controller.rb b/src/app/controllers/network_controller.rb index 725e60d..e4faf7b 100644 --- a/src/app/controllers/network_controller.rb +++ b/src/app/controllers/network_controller.rb @@ -34,8 +34,17 @@ class NetworkController < ApplicationController end def list - @networks = Network.find(:all) - network_permissions + @networks = Network.find(:all) + network_permissions + respond_to do |format| + format.html { + render :layout => 'tabs-and-content' if params[:ajax] + render :layout => 'help-and-content' if params[:nolayout] + } + format.xml { + render :xml => @pool.to_xml(XML_OPTS) + } + end end def networks_json diff --git a/src/app/controllers/tree_controller.rb b/src/app/controllers/tree_controller.rb index 07d46f7..e2065ca 100644 --- a/src/app/controllers/tree_controller.rb +++ b/src/app/controllers/tree_controller.rb @@ -29,12 +29,19 @@ class TreeController < ApplicationController @clientHash[tempItem[0]] = itemHash } end - @serverHash = {:pools => build_json(HardwarePool.get_default_pool.full_set_nested(:method => :json_hash_element, - :privilege => Permission::PRIV_VIEW, :user => get_login_user)) - } - @serverHash[:smart_pools] = adjust_smart_pool_list(build_json(DirectoryPool.get_smart_root.full_set_nested(:method => :json_hash_element, - :privilege => Permission::PRIV_VIEW, :user => get_login_user, - :smart_pool_set => true))) + pools = build_json( + HardwarePool.get_default_pool.full_set_nested( + :method => :json_hash_element, + :privilege => Permission::PRIV_VIEW, + :user => get_login_user)) + smart_pools = adjust_smart_pool_list( + build_json( + DirectoryPool.get_smart_root.full_set_nested( + :method => :json_hash_element, + :privilege => Permission::PRIV_VIEW, + :user => get_login_user, + :smart_pool_set => true))) + @serverHash = {:pools => smart_pools + pools } @ids.each { |item| if @clientHash.has_key?(item.to_s) @clientHash.delete(item.to_s) @@ -69,19 +76,27 @@ class TreeController < ApplicationController end def adjust_smart_pool_list(list) - mySmartPools = Array.new - otherSmartPools = Array.new - list.each {|listItem| - if (listItem[:name] == get_login_user) - if listItem.has_key?(:children) - listItem[:children].each {|item| - mySmartPools.push(item) - } + # list should have a single element. If it doesn't, don't transform anything here + if list.size == 1 + smart_root = list[0] + smart_root[:name] = "Smart Pools" + smart_root[:type] = "SmartPoolRoot" + mySmartPools = Array.new + otherSmartPools = Array.new + smart_root[:children].each {|listItem| + if (listItem[:name] == get_login_user) + if listItem.has_key?(:children) + listItem[:children].each {|item| + item[:parent_id] = smart_root[:id] + mySmartPools.push(item) + } + end + else + otherSmartPools.push(listItem) end - else - otherSmartPools.push(listItem) - end - } - mySmartPools + otherSmartPools + } + smart_root[:children] = mySmartPools + otherSmartPools + end + list end end diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb index 614325a..27cc7ab 100644 --- a/src/app/models/pool.rb +++ b/src/app/models/pool.rb @@ -243,7 +243,9 @@ class Pool < ActiveRecord::Base current_id = opts.delete(:current_id) opts.delete(:order) subtree_list = full_set(opts) - subtree_list -= [self] if smart_pool_set + if (smart_pool_set and !subtree_list.include?(self)) + subtree_list.unshift(self) + end subtree_list = Pool.send(type, subtree_list) if type return_tree_list = [] ref_hash = {} @@ -260,7 +262,13 @@ class Pool < ActiveRecord::Base pool_parent = pool.parent parent_element = pool_parent.send(method) ref_hash[pool_parent.id] = parent_element - return_tree_list << parent_element + smart_root = ref_hash[pool_parent.parent_id] + if smart_root + smart_root[:children] ||= [] + smart_root[:children] << parent_element + else + return_tree_list << parent_element + end parent_element[:children] ||= [] parent_element[:children] << new_element else diff --git a/src/app/views/layouts/_navigation_tabs.rhtml b/src/app/views/layouts/_navigation_tabs.rhtml index 8d9e36a..70af098 100644 --- a/src/app/views/layouts/_navigation_tabs.rhtml +++ b/src/app/views/layouts/_navigation_tabs.rhtml @@ -60,4 +60,13 @@
    
    <%= link_to "Tasks", {:action => 'index', :nolayout => :true}, :title => "content area" %>
    
    +<% elsif controller.controller_name == "network" %> + +
    +
    <%= link_to "Networks", {:action => 'list', :nolayout => :true}, :title => "content area" %>
    +
    <% end %> \ No newline at end of file diff --git a/src/app/views/layouts/_tree.rhtml b/src/app/views/layouts/_tree.rhtml index 6129f0e..fa3effc 100644 --- a/src/app/views/layouts/_tree.rhtml +++ b/src/app/views/layouts/_tree.rhtml @@ -28,6 +28,20 @@ e.preventDefault(); } }) + $('div.nav-networks a').bind('click', function(e){ + if(this === e.target){ + var myURL = $(this).attr('href'); + $('.current').removeClass('current'); + $(this).parent().addClass('current'); + $.ajax({ + url: this.href, + dataType: 'html', + success: handleTabsAndContent, + error: function(xhr) {$.jGrowl(xhr.status + ' ' + xhr.statusText);} + }); + e.preventDefault(); + } + }) $('#nav_tree_form ul.ovirt-tree li').livequery( function(){ $(this) @@ -36,6 +50,7 @@ $('#nav_tree_form ul.ovirt-tree li div').removeClass('current'); var thisHref = (urlObj[$(this).attr('class')] !=null) ? urlObj[$(this).attr('class')] + '/' + this.id :null; $('div.nav-dashboard').removeClass('current'); + $('div.nav-networks').removeClass('current'); $(this).toggleClass('current'); currentNode = this.id; if ($tabs != null) { @@ -87,14 +102,14 @@
    <%= link_to "Dashboard", dashboard_url, { :id => "dashboard"} %>
    +<% network_selected = "current" if controller.controller_name == "network" %> +
    + <%= link_to "Networks", {:controller => "network", :action => "list", :ajax => true}, { :id => "networks"} %> +
    
    -
    - Smart Pools -
    -
    diff --git a/src/public/images/icon_add_hardwarepool.png b/src/public/images/icon_add_hardwarepool.png index 3e7431c9602cc829b712d12cccec89e87b90a09f..6eae0d566f10503c7a6a7f980a9d2b6d0e6353d0 100644 GIT binary patch delta 1112 zcmV-e1gHDQ3GE1wB!3xnMObuGZ)S9NVRB^vL1b at YWgtmyVP|DhWnpA_ami&o000CJ zNkltL3xLXKK_ at OvY7=w2pCS+aIH9V;!>DETni0v#}|NQ$g0g zK?a;E2X0KkjY>$_fh at fA!@$KV at 0$EFP$ zjVLKQoAcV|ffcPCcy2d`vvoSrGr|Ot*S`V-Z*ObO&wm^H$-l^mOG6_gC1p<;q+YI6 zP;9VS>b-DLFe|&Bc#>B#!b?VYnWH7)r~CHg`+aAA;O%EGKZU|wp$H+&1kM))8%u9* z?}7p)x0=Zq?Z$v(QroR&C|VZcjEJQF3-lj5j_R6C%Ys{)8ZkWl{p$Al(rC}-`@-Y| zW};ze8Gjk(N;|4)%;R~Gzmp{iQYy6sJT!C(x~`Q6_Z{uZ_n+_Sf~x6ckOooC;PUAJ zg2B6RI-LBy)8XK4Ob|Hu!Z#ObYiiK7Rl<#t- at 4~%96kOHLV}2 at N((B at 75rPrlPNyN zir;?~v&mU>Jkp8Ijz{wz`+Q$RBdDgTyq4v8ZGV*&I~pCh6S;?9gHxCe{*FviM1{2y zcJ8eUHk%#e<2P{Y_AfYipa%&tjx>D&m4P*t+A?L2iV{4oO?bTZ0d%yupzeOyAp14Q zDG8Gl3vO2f%oZy`6CpIWG$X~}ngUf(xe?{SWvkh2AG`C{BH0sC8WXVupU~dkiKgal z7=QoyIwT6Z#>TC43uTGRt at 5gr1;0Y)cz2=fiZp`_Nz^&DdE)B*1=-2 at bn-PTqBQF_RWlPwwS6bHx$9ADw_!$3<8DOYbC_3If`1>H@?x;*Tb^ueHtU?{+ML((TkZCm18zP~ z2co}?9}IaO>K7v+z8$MKJHd7}+s6!kcFTDvnascNbc#p1Mk>i_lKs at HYlhDoz-}s| z)V^sP-`~AA$I at qgy%Ra|Fh}5pb0SS}oerc-mY;h2mdow`b_Tyr)%&dXFk0I at _+a4F67Xs+6KjSSF~UvtSfR&jg5Uqs e at V|xsBftQJOI3E8R*<>?0000WdJlUF*q+UI2$jIGynhq9CSrkbW?9;ba!ELWdK2BZ(?O2 zMrm?ocW-iQb09-gGnm#!0{{R7AW1|)R7i>Kmt9O8RTze!X at 7SYSSYk*7qI-4Qe$cb zO)C9KynrT1T7oudnix&frtzwYjTgpN(<|eJsjZ1znbcIHHzp01xMC}IV at pzPx6nqk zjfvJ!SP*cR!ou#%?wm7cya2b$vLLK6T9nU|J$k(NR#h0|Ncn&MJCo3=3Y z1weWH%K+9#8W zeZDV|QX+*w3Xz at i!aNsS%01j0eZbEHBa9FHN+KFzwJQfV;PsS{o9m{p?>2Yt{>0ur zEq_c#CWspbLI|W32$7}jW04ruC2M)Q<`HVEN)X#0PqF<5x)Eb|c#zVPG8|49!NDMv zRh1ZqfsiJ`6o at R9>n?}G-Fxr%Ikr#6;tYl+0ob~=j*7~S^!;#)SS&_)`G%Pb^%zpj zfQ2x#f?tzLHK*Hd#->>1bm0cfc!Glb0)HACo0yoKK$Dp;%k&rMlYhU? ziwBUFMA?e->n~s?5)a{V11SYkNOTbecxBn}*#f$O?*4%Pjnwg`<_3FwJVbG^7h4Ey zrIO!?c-+8}771kl?9Q~e|I;(vZeM46=f|IXKsfvdmb8-1WhN4ff+6#M{%}&$7Mx3s zrsjr5;5DH2`PKu}Y_8`0wlnj^k6#w1*_comx!KP6`nn7X at 3Y?V?*_VQ(h$4z0dO!r4 zU!o5cmA$_8fW8C~1r-q#D%FQnFer)?B*e%E77d-R`P}~7{(q0#`EO0;YHQibFCIAD zd(S=G-}#+;&i!wUbB@^(9cEGHz-J$vF*c&H>V9}=Hxg1O#lhO{gM*Wh`1Wgz|;0no1R>>W-FGI?9=AeGX>X2FL+GT zM*~Oi5nGpi#eX)KG8St~XG*{|seJSSiEKCau7hb_=0eN-BCtR=>;+B(1#__MZ13H_ zPP<5K6R9SP*Or5iHbNa~MDD6`%~UZH<}4=D(-sHrya|o>53QeG3+_f3MjwESJz&dj zqv_fvsH$Qj_Q4saomz>#zPS;Bk*?EpP<8a3Q)+!Qn19l;?LzU9=a73^C{z_Xu>-k< zoAB*py`Oxd|FWNw-XN!cyK6A4%5NR zj?h$CP=5xVQG(W|RTy)3--ySY#rvdEv{z|3oWExCe8(~;RCgV?w<~c0nHGTAR$_EQ zkM_5;9>(j3%(#!C at n0o!-QcfH038B)!;zeXE(fJuz!U>*UspXi6c8?MI9CtiCRjE?Z_WZ z>IDniZ>9Q^T9IMVgUMcSNhVdmWrC7*;kl;4No1u7n(xt6gYUALiCj=5Ku%dVVA7|D zXM(^LV>pnYA2wr%`KnZd7ubv{fyht^*fpZyQ(pjG1Hs?>2n{CJj8LH{K1 z$s<6N*)sxNP1>z((&(gz at KWc9ZpbyRL%Lqp%o|b#UNtBRaC!ADDn}WC?TmFG+iC4; z`bD9Z{4~?`q%KqI^WW*K^N!+V{QlIJ%^&?^nFIfy@?C%d0K%5{zV?bS5C8xG07*qo IM6N<$f}H=uWB>pF delta 1330 zcmV-21k7R7l6|m3>T=Wf;bP&wCCB5e^>-Y9N`3m1rR-3Uj(tR<2f=)243vM`)|H za*fTk|texxLFVj>`#i5`@XBY$wx0Wbs1Je}!`e{g(M at wQp<036Moz3Z2+-cvG-yY{I z7<<-g4I@$2sM at -Qz6wcG=2l&-XhhkYQT0t&qQ~s+vjCvQ<)ciVn^xLB5x at Hy|032M zJR>3^wPoKgF4>qYhgQe^UUH;H4S3ihBCqZ}*(dn%^M7q9z?Qd>jAe!DwgLc$R>w-# zs^%`i>Uk(%Gok=X9AZhNqcteyKjy2ME9+Fh0suvuGd~M+S1-+&I2_Rhr4*PHC(Ev3 z8acmo)Jr?E;=+~dreo-ar}>;Y&Jx5?b6HN5U+4I#2AZob$xw?{5-b8>lx4&mRa{OrdId at rUv%@tkE;gd+mQ}ZG&xt;5 zXUCEZpoa4WA8_?TebG~I70>!Bxu;+jJ6Et{Nd|3hKd)=sp#1<`$Y#vcxmaToXWI6@ zAg6cEl77jqt7QP}e{DLcQ$mqTx!}?;>OLiHvVVmMGbUnE{{C}*GP`u#;q}RRR?F4L zCro-6P1CxPl1_BFj;%BgmuYmzEpHmY;SJ*?^`TB8t)X2(rP0>z=1lz%MlZlA_aG{X z at _!~BU)tJ5N8fL>KK8Dzer*gAFooa0MgRL2(Hq_KwWq$7!nLC$e>rk6$5ho_>?K>K zsk_lv1DUV-t^$BHFQ%ZBQbix8EDQ;c{K^_ at C1g-2L7z^0b9=z&axTbv$9CYJ%tb_& z?>lu{(w2qkxEc=;F)R~T<4I2M$rkG)bAQyt`CHXJoA>@+vhz3qd$XtZUFTSXq6IM? zz#UAXs^Ams<%O*#4I2tW3qi9)#xo>&9+O_)I_tKbyk|E`sr(!yJbD;2RyNS)4)k(# zgSQfzzC?M?gYH6U;S3(sO!~rgq`&e+4DR1%8i96v?RHx0%BVfI at 9xgrc3_3*-hWm+ zSC0`LZDQDnXo-#06h=E@=%7MTXrMGe5OgqnC}jdu6b^?$!<7~s4NYD{LO;)X&;I5e zo7>M};$eO!E_A31abj!0-|9>)4$E+yR5ZAsUHM7D6l< zgM0=NrXWq%EAdL`pn(h6P_sckKyM|%xO zp%=jx6A?TW4+T#i;-LpY1gmJIT4HQW+Wf6=X5(bD-Ry2cA%7rwFgr85GyA>o&G%-8 zS(b%fnSvf#AG{}~IXjFo*|uCtq;Kq`#p%oZ;j0}{yqr66=59Nz)MPvTI4)?vSWSq2 z{ARi%PrRb0xdvG6z$fNYEfdp7Se-iHHupMO^H1OUPFTHq0oc6`oLiGo2r}+uAaiad z2U}kw2i(zUXMb}Wj3cu^@Z{7**`9jxM%3%m<1U%1cKv0>AGKB_HXlQ$8gs6{bItMf z27hb&uV_skGMdc6tqv4FQ6XTacdPcgV`RIZIMTiXXnu5AX2Zt_ZE zma3)DVTWcMkF3jb`KqW#?(E3uMRXO>sD^ZDrb!d(4+jF)cBcZ*IJz8z^0+VGAn5mH?TDRa at lc~Th z14p}5lYgSkfyST%d#Iwo5WpH at oH5k~0skqKy9EEYnTXV-)Uo!69`BrT46?x^1RNzW z4k`+*d8t at IG}dj{g>gaclOrY1oE;pr9sIC38uX)Vhu}wC&-RW5 at 6F=U<WdJlUF*q+UI2$jIGynhq9CSrkbW?9;ba!ELWdK2BZ(?O2 zMrm?ocW-iQb09-gGnm#!0{{R5pGibPR7i>KmQP3&Q5?rVZ-3^^%$v1CK?&latH(S9 zf!FA&8+hmQzj?p6PiU<I@>w(Pk;wl%fZ8>vP$4bBJ+R8%PzKGk#0ANM?e z2f&NIj!GlL^qyb)Yg0>E$gRe{ifc7LI<2)1esjLv0e`d?zabCv at T(~Txs at UN8M3P& ztfRrh$`{H3>v$&tx)(q(1KZ0`*z%?fJ9brM6Vy6n*t{Fdef1{I;?i%@+tv4qSDoSq` z0cgGNoqvQv2pr4AbtO#+NmIh&ZGS63ONHyYaML2xA^0hmvXJ>0Sz<{O$1!o0iE=HJ zd&~{zml_R1>{md;-Vexs0a>aD&XOj|Hc-mMRTc>)ah!O}5#SO(QvkgOyKA5`pqloL zc05zVz_tyPk|bOUr6jf^`IFf at Cj8(q0Vr>Q-hTiK;9S7SgFCi?>qwN^|GAP}wt$;B zZrK4S0-IpuVte+&1uwu)qiyvZtv3kY1=2tnh(9c at -#E`eUpMJ=v8ordoCiZq1?Ots zOoR{&cGPOJN_}tc;@-#@&6h6va~nT@@pOEY*}3SyT3z^2rM1={mX~=l{&=0reqMht t at +h$7N_#tmdiF%`WR2?VUY*Y_{4dRk-6#cp%B27R002ovPDHLkV1gShas~hZ diff --git a/src/public/images/icon_dashboard.gif b/src/public/images/icon_dashboard.gif deleted file mode 100644 index 5ed7483685461cb65f00718a83b207af6187b545..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14152 zcmeI3X;>3S9EVq{6|q7vZPki(iL{E6Y%Y#$2{&j}yr7Clku}*sB$r7r0kuW2#e-V# z1QkJz7V!!dkBW+kCr<<3gUyIy%RhxS5 at mF)m)DrQwV$qhOMH?@Mr4-Cd zI*-Sm#A8kf^v97j#7&p$wk+3m*)f;sV|;B+QaH&|8 at Z~(Y~^9L;t-}d#FA%M2GW^P z2W|z at oujgxmt>U(&?^Gy*Zt{TJf2g;{_zsS72jdwNCP72D)AZSD9XI(W#>p_T=29T z8=m11mX3z)I486_BeeT?;r0_aZS?%KQK8#%1hk{>wj<|k$#%2NafO_ zsaVLE>k`BcQu&dQ(#f%EGB|d6h$uEnBoH&aJgq(SxL&T3lUf4R%Vi1;t`{;0v2rnq zQ_q%ejDfyDv{6EakL3kwnbS|HCQ&|%!xXW3e3b9X;<|AKZm!N~Frh`K5DJv*hH}|# z>W7PSI5?k!_B4j4HTC477EAEi{((JnQvZaENUc_dW0+2-W9fJ-r8)xR2m}I*&BeG} zCPgqcF$yiAXDT#fy9aqWjz6gpsii8dRH;BM;}VON(OMycVVS76^(>B1^-iSFuwE>b zB~r>UJ)y!lEH>6VGF9k7b>e<%lF%yEAxfppvwQi0QZ=bls-rZhUog+ZQu!LxH)~%# zNo^77N%?SRviZ~%!sXyR7o5wT|4Mx~^hSA*QY at 9kyk71e!m-ri9JikGSD>D956mLs z6)`WYTh{bO|NjXSi+X*jqSdk&+aeZWq>Pl43ay56#(CYDScFTIYB{0xl*)++5{r;Z zJg~mb|NOr0ucl%_#S-hy<;zd+-O9J}(C7WF4BtH{oCHWN)CF|`832M|x}Yu~13)lL z7t{r000 at TZg1UeV0KqU_P#2H^AQ+|#>H;zV1jBSeT|fqaV3;nb3&;Qv4ATX50T}>- zVY;9$AOk=!Oc&GzWB>?;>4Lg|3;@9}T~HU00U#Kr3+e(g00hHyL0v!wfMA#|s0+vd z5De1=bpaUwf?>L#E+7LyFiaQJ1!MpS{?Bw-_nq`071Z$#9d(YQUsq>Gd)xEYmgc5^ zo;`i?xbaa#{ofD&dT_t)-rYO3w`;1a{;d4t*6%kfZj}Fa{nxTzu3f$Ib7 at KO<)Xq% z7Yinl^RH=aVM|2Kf8=`gnVJ3Ox{9;O^$?!sl^0 zY>dTpo;bm2{J2j)aU9EVK*xMM+J4kWBS#GX at Pqg1!|Z6bHbdVVVm;Vu(7OW%ywkrQ zf;hAe=r;&ik2qV-+E@;VAy!?;@WJ+zjhUtdEBb_mMMlEciMB5^XHUTT;h3cK)Y9NV zh_4gkyUyOJY(rs!T~2t7d0=TOM^;gqwztk;as=EcICQl4I>)8vLW$1=flqSi ze(ahO%GPlx} z43nQV`X^QKrPX(C#wQP1du9P|4Pn}wQ|o1wXYgJakWj^os4g2K{A-WVS5u-egYziDN7 u^C;`Y%t=am91=g!1`QeEZAf>t$Cr0nG5oFUViFr`OEPBUdz#{q&;A8^{IuTy diff --git a/src/public/images/icon_dashboard.png b/src/public/images/icon_dashboard.png new file mode 100644 index 0000000000000000000000000000000000000000..57b933a8c84d500928f44a6156e4afdcb6dcf190 GIT binary patch literal 4457 zcmeAS at N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5n9Wp~AN+NuHtdjF{^%6m9^eS=-fVvqNZ0suv5|gu2OB9k) z(=+pImEP~(ucVNfVyhHx>TBRz;GCL~=}}db8eHWUl3bOYY?-2DZ^va*VFffGH?<^D zp&~aYuh^=>Rtapb6_5=Q)>l#hD=EpgRf0Gw!Z$#{Ilm}X!9>qU&qz1fz|2^|)L75h z)X2=pL`T8Mz`#P^z+B(hK-bX1%D~jh#83eWlHCStb$zJpw*7iAWdWaj57 zfXqxx$}cUkRZ;@VD?klTNrszUP+F7&HaR6(KQ$*cH#M)MSl>|3P#;-6FeHL9(=$qn z;o96Z~cnI0-zQH{UWd$6rBYb`6cI at QE<80UxFoRz>}hBK!5w7f zSXz>iUsN2BUz`aFN}xO_gcWR3lC2>A1al!l?wC^o;X$}LnV at jC%1O*iw^gdpO-W5l zEX^rV(ueBM2gM3Zi;X_2fgtmfi&7Iy@{5ox2u>|TwE)E|m at L>VWX&MMN-|4wQjv^; zSqx1rB)b)1o(&=-LyLj=F(kDpx0qTs;WXO at Io_?DAwlJw56lP2C7yX{`QT)ZswUGh zrO36SBr&B3mJKlFoij at +amxk)OAc at vz+rkoa()UhnL-jU7Q;)5a2XzwniHO11S~_a z>UGUc%)}=jS_G2?CkPvG(n2Z#fUyA)0~Rd6GEE;|s6kT`wEUqJ1r9A*84fdd)Dl=o z5Jis$7g50kQ#2Y}u#g~%9t|#{f(fQ*G`L_PK@>e2Tto#EOcB1|;zD$bQuBcA<8ol9 zr{$vbQw9d+{hlt4Ar-gggy!Z1hf37tz0bWKC!rl2!=59n)zW{$>5f57*T>r%BsqU` zaJ5PPJ@~`X$zj0}9mXjdAGq)IXiSu!tf+I?Ysw at CGmahyh0`iE9n9M;qRh5$D&79} zuhpFD+tr!n;m!NbPM$aKd+q$s^S(cxqS$gk;Qgad+N+exH9x*M_{el0!@PjHyB}ty zo}c!sxwx;o at Zp&zuJCowL((6I+sFUjm$&n%b9XbF^Q3^ztW^?i7Z(=ye$$@!?x at fD zj&s&`Q)LfkL_Y7Yo+WDd&-df2T*gJ4jjReE at ia~0PVbA at ELrBm@>rsM=Xucuiu|VV>)L?`J+; zRH4w3 at m|WIdI76hqCl5HONLIH_1 at Ya#WR{EB(Lz#2>zSdpmH**_VjTzy_%g(C0lB^ zt&cZu-CS@(_64td;lF-?bMtN3+$0)gDm!LK9KM?%QO;_;#N!cL?f&`3yH7a9Y)Dbv zc`Js$Pbm9A?4FgcdAT!o%O1KZ+?$~ErD3AMqeUI>{w01nVd>~8@#+5lC;yKq_-W76 z(Vn2fxrr^(E5!Ea$@1L+ru#YO=iX{aeZRi_(LAnc^BWE=-)#6_^WtHv&8Ib6FX!Cd zvTgzEwT`cLu8aKLz3ck8r!I}tsjCydmDl>g`?2EdbaFkUAG-?I+j0=+#oCH|uV1drrA7AH2JwNm5Ox5*g68{BH``7$Eeb)5H zhD|)}dPNH6zXF3Fo7H~yy65~PEkP>w-e#VTnUkKB*F9~Fcz5Zm at 5Ohgp9bw%UX^_J z-esxAwaX>5uRn{pG-G4M%p+9?_FbNLNz~%cWc$Vay#F1I#N|KbxId>)=hP*xbDT^k0%m593c)I$ztaD0e F0su%bp+W!v literal 0 HcmV?d00001 diff --git a/src/public/images/icon_hdwarepool.png b/src/public/images/icon_hdwarepool.png index 76e0a288ebacf3ff615763f12bb2b3f53a27abc4..1e55305f45e55b87d0733c504a325aa52b7eb71f 100644 GIT binary patch literal 4509 zcmeAS at N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5n9Wp~AN+NuHtdjF{^%6m9^eS=-fVvqNZ0suv5|gu2OB9k) z(=+pImEP~(ucVNfVyhHx>TBRz;GCL~=}}db8eHWUl3bOYY?-2DZ^va*VFffGH?<^D zp&~aYuh^=>Rtapb6_5=Q)>l#hD=EpgRf0Gw!Z$#{Ilm}X!9>qU&qz1fz|2^|)L75h z)X2=pL`T8Mz`#P^z+B(hK-bX1%D~jh#83eWlHCStb$zJpw*7iAWdWaj57 zfXqxx$}cUkRZ;@VD?klTNrszUP+F7&HaR6(KQ$*cH#M)MSl>|3P#;-6FeHL9(=$qn z;o96Z~cnI0-zQH{UWd$6rBYb`6cI at QE<80UxFoRz>}hBK!5w7f zSXz>iUsN2BUz`aFN}xO_gcWR3lC2>A1al!l?wC^o;X$}LnV at jC%1O*iw^gdpO-W5l zEX^rV(ueBM2gM3Zi;X_2fgtmfi&7Iy@{5ox2u>|TwE)E|m at L>VWX&MMN-|4wQjv^; zSqx1rB)b)1o(&=-LyLj=F(kDpx0qTs;WXO at Io_?DAwlJw56lP2C7yX{`QT)ZswUGh zrO36SBr&B3mJKlFoij at +amxk)OAc at vz+rkoa()UhnL-jU7Q;)5a2XzwniHO11S~_a z>UGUc%)}=jS_G2?CkPvG(n2Z#fUyA)0~Rd6GEE;|s6kT`wEUqJ1r9A*84fdd)Dl=o z5Jis$7g50kQ#2Y}u#g~%9t|#{f(fQ*G`L_PK@>e2Tto#EOcB1|;zD$bQuBcA<8ol9 zr{$vbQw9d+&z>%hAr-f#OnvJg9V&Bte{TN#Mx%^w)>FHh(tur(*|R^g>Npz37z-zT zS!yV?xbyv-$F21T=LyxOK638K7mrnPR`28R?pc={JTp3`Ano>~E}UpB`!bKYQ^~TTInY z3*Phh`_9E2aW*-(rh&6+i|K{pO6l(X*~qBrp8t^R0sc7E;Ot>xcjJNL*WKAw1SVX?^J ztslA`U7EPP at 00utuQW&3txgA at 8C*SDBC~V#{e}fMu1c?SS{KuoRP;*QY)+D7%#3-n zg>Otgn&s+v^}!}i8`i~X>D-#vR))VmoNhd3+QvUT%vRnlCaEQ(Klbc4OX zd}|)}+n4VSojKD#`(WF$g-0_FKV)v+A-BK%=uy{{V9yNKnPx=?eT$tI+U;|grsDDQ zkJyVZUszx43S(b3eX5XZ%b&Fsb>#xpzpWN#S$&V4(mmsEirmH!&)^ zxz8 at V-)HN8GxNe$D}!vm*`ncjf0>ux<=UO_ at LpO`rOG9x|MpUUSzqrg<*_mBIM}GZ z+Dl#iyrc4hWvgtqHOv&#9YccwZgdyhwlKU)6%b1Y#mPkQ)$^@JC!Wu>Ll#7_xrcX+xm zhw;CQdESb0;#tz5XR-F-sjX@}rb6ZYujJ4kEW8UOzL=f&#wwryLT z7KVHkiY>RgJx`2(O-b}iwh2iyMJ9`$NnUy`S*vw^@b<@-Lq4UX|2MvI^J1UabmqvN z4c4bK?Ix}?T39P>jmGhKODQV zr)*C8C+FIdD)5f?;o*M2+{V0L&;HI2+w91Gbfeq+W%aBQ3 at 0+2XYc*}Qvoz!;_2$= Jvd$@?2>^%N$yfjY literal 1179 zcmV;M1Z4Y(P)dbVG7wVRUJ4ZXi@?ZDjy7FEKbT zFgP18k2C-P0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q!|*>Mgsr<1N2Em zK~y-6m6hFZlT{qYKTrGgbz?8kZf@;LX_4S$8U=$ylR;b-rbZKPyfHzdF(G;1ndlDVEaHZ;vGtAKe$YZfno0ZJnDxd+ at Ps_&qw(Qsq_(OW9b;#w-6;^-uTN&%FEwez#tYx(u|Gjb+;y=}8ucj@|{Ut!1#o;nXRb z5@{(kO~c`ER9n+D%(}W1>NJt=k-)=vx`}B$*(!E|2^vJ zo9+pVghM0}Kb3(>N*a7_o_n&3ixamP85v=5b_!W4pnLq(0nzAs01Ej$dBeC1cKrB{ zSeC2+m0~uVC)(1)QyV+jvc4T5Es8>tEtEL<$q=d3IKe;=fM6g1Ksu8l5)SeGcgK*H z#F7;tfY0sX+_jtdJT5%C6HU{Y&lyZ+vH&ELKeLouV$;K2bZvU1YS!QXEmBIP5J(|z z0~>s9HiiORoB5kRQ`5|){-Tu2;&glP1HnKGUaz0w;a|CU=@0sLKFdOOo}ytOgg{Dx z5H*I&kvGTM*c53&Jn>LXfojTaw`8aD^*U;eivREiGK9d1J2!XN{FHS$tK==ogQh2 at YvY{;7 zRj$n?9iTGjhGs{G`zE6s4rFI0v2B~W<{$w;S`uX|4zE6nSt{KI77e5nNFgbR9Kf6U z@{O-d*dvWdQ6*oESXi_}9m|vUcI{dax={{T7tRKXhk?-u|7002ovPDHLkV1iS09jpKV diff --git a/src/public/images/icon_networks.png b/src/public/images/icon_networks.png new file mode 100644 index 0000000000000000000000000000000000000000..a2a2b878e8c3d6b8bfc93bad0991cccfad7a3985 GIT binary patch literal 4223 zcmeAS at N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5n9Wp~AN+NuHtdjF{^%6m9^eS=-fVvqNZ0suv5|gu2OB9k) z(=+pImEP~(ucVNfVyhHx>TBRz;GCL~=}}db8eHWUl3bOYY?-2DZ^va*VFffGH?<^D zp&~aYuh^=>Rtapb6_5=Q)>l#hD=EpgRf0Gw!Z$#{Ilm}X!9>qU&qz1fz|2^|)L75h z)X2=pL`T8Mz`#P^z+B(hK-bX1%D~jh#83eWlHCStb$zJpw*7iAWdWaj57 zfXqxx$}cUkRZ;@VD?klTNrszUP+F7&HaR6(KQ$*cH#M)MSl>|3P#;-6FeHL9(=$qn z;o96Z~cnI0-zQH{UWd$6rBYb`6cI at QE<80UxFoRz>}hBK!5w7f zSXz>iUsN2BUz`aFN}xO_gcWR3lC2>A1al!l?wC^o;X$}LnV at jC%1O*iw^gdpO-W5l zEX^rV(ueBM2gM3Zi;X_2fgtmfi&7Iy@{5ox2u>|TwE)E|m at L>VWX&MMN-|4wQjv^; zSqx1rB)b)1o(&=-LyLj=F(kDpx0qTs;WXO at Io_?DAwlJw56lP2C7yX{`QT)ZswUGh zrO36SBr&B3mJKlFoij at +amxk)OAc at vz+rkoa()UhnL-jU7Q;)5a2XzwniHO11S~_a z>UGUc%)}=jS_G2?CkPvG(n2Z#fUyA)0~Rd6GEE;|s6kT`wEUqJ1r9A*84fdd)Dl=o z5Jis$7g50kQ#2Y}u#g~%9t|#{f(fQ*G`L_PK@>e2Tto#EOcB1|;zD$bQuBcA<8ol9 zr{$vbQw9d6tDY{7Ar-f_OpWyjPLw$Q|8nlBeWzY7JJ;KyVdAlfce#*Psj`-9z+IP; z#DoBrS>lZ)qH!e?IUQ4l?v?~za19W5yVB~CxlmEX*g0qZwJR&r^U|&5*FE3U;ga(- z@=IU)_osWF|D5~(bN%_sWhYaNe#kq2Hvh18HnY{NF3rBk+;8q1kG`;svVXnr(&4|_ zKTLf6Ik;xu?K_$w!ot3EE{oZ`?_a)g-Tbu0GQrd&cFB$<469ek7|c48vwq1EmOZCi z6AXTs>=Kx{zCUSDG=@MoPE at u6Uzq*S+Y#gH>w+ zg!bHHt6Iub at wJG>@RRw}XD7?$YK%Hn&MO~O-?(erBEOGXjao8%- at 2|&O4 at w#NJCT5 zz8Ps at oIfKJ17_OHKjfFKSz;yI!=|k1lk-b!LoMq%-771Z)jj6woIH_X^ycw{M^-^| z5(1V at +w;xWH`#L6A2(5p2j3q*ZvWWZEXQxn>^W_M&nFh&Q3tJSuNyjEE)w<^o& zs^9dfcK1K8i#;cO+<#8f at _llLzvn9($U9g_?DWb!T>S56#J#&`BjW;d?6jRB_C3$iQooq@@86%QtVll>S8)8Xr at PX`Tf3e~Sa$90WpB7Ed*BZD4LN?r zOTT_y-%{GuYOj at NcV$ZG$L442qhFu9Xd5ZozpwWC(pT#>?|%$#U}R|Tp2W38b*c(z ONWjz8&t;ucLK6U}aTiAb literal 0 HcmV?d00001 diff --git a/src/public/images/icon_smartpool.png b/src/public/images/icon_smartpool.png index 4ed0af0d2f2da5b34d13491ebe06f64a9450b5ec..3a6688a7e0fb1e3dd1b4e177cc63c2c5296f1f0d 100644 GIT binary patch literal 4233 zcmeAS at N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5n9Wp~AN+NuHtdjF{^%6m9^eS=-fVvqNZ0suv5|gu2OB9k) z(=+pImEP~(ucVNfVyhHx>TBRz;GCL~=}}db8eHWUl3bOYY?-2DZ^va*VFffGH?<^D zp&~aYuh^=>Rtapb6_5=Q)>l#hD=EpgRf0Gw!Z$#{Ilm}X!9>qU&qz1fz|2^|)L75h z)X2=pL`T8Mz`#P^z+B(hK-bX1%D~jh#83eWlHCStb$zJpw*7iAWdWaj57 zfXqxx$}cUkRZ;@VD?klTNrszUP+F7&HaR6(KQ$*cH#M)MSl>|3P#;-6FeHL9(=$qn z;o96Z~cnI0-zQH{UWd$6rBYb`6cI at QE<80UxFoRz>}hBK!5w7f zSXz>iUsN2BUz`aFN}xO_gcWR3lC2>A1al!l?wC^o;X$}LnV at jC%1O*iw^gdpO-W5l zEX^rV(ueBM2gM3Zi;X_2fgtmfi&7Iy@{5ox2u>|TwE)E|m at L>VWX&MMN-|4wQjv^; zSqx1rB)b)1o(&=-LyLj=F(kDpx0qTs;WXO at Io_?DAwlJw56lP2C7yX{`QT)ZswUGh zrO36SBr&B3mJKlFoij at +amxk)OAc at vz+rkoa()UhnL-jU7Q;)5a2XzwniHO11S~_a z>UGUc%)}=jS_G2?CkPvG(n2Z#fUyA)0~Rd6GEE;|s6kT`wEUqJ1r9A*84fdd)Dl=o z5Jis$7g50kQ#2Y}u#g~%9t|#{f(fQ*G`L_PK@>e2Tto#EOcB1|;zD$bQuBcA<8ol9 zr{$vbQw9d6`<^b2Ar-gQO!4&y36yBN|J!=;V&lHFvnx^qtUQfo?kI3+Ibp_nOFlP8 z*hTta(Pgc!O-dQT-PZ)yDrp$3a80|Rbc;i5QHYo8Vr^suSgMb%YSnsX%onz?Uu z-?TG(LA at l4Me~YUr^>gCHUBSccln)LOBzIXo`v+DkoUaw6% z6*^>e?r=Xoe)x;X-LnGQw=(ugNpzl&vb}8Dvu8(NM8Otc1O1Md7Uy>^UHP%q3Nq%@lUH*&780> z{lUkL^?Lgfv|AtCYQM=Ushpn~R`trz(SPlizm-cl_qDHb*9+gbKWn=9stpVhpKq=V zV&u8lyZ*ishx;=hc5}|E|KAtfyvHS#;1IfGTGV`YGndTEJ*861Dh&S^w(OWDqms~k zb#}Rrc|?d&P=b!@{75-1x%LU??w@`tQ*QY=g`-NwW@)g*1FOUm!@Fk6J2|#H8*P1F z#5lj?=E;yCWr^ie12)W|zqTaq(#)0Cul;%FK0dSH`(ndrJMpzYIUd$??L0s0 czvcmkFT1KLwrfdW1`Q5)y85}Sb4q9e00%B0H2?qr literal 641 zcmV-{0)G98P)Px#32;bRa{vGe>i_@>>j8p`4O##I0wzgBK~yNuZIDYylwlNxpYI#zqK at T2S=JyC z*&>E6I%yZEa3L*)iWaScHm%y#Sj12vM9^iELAzSCYGDjC>WH_Ll*&tLv#6;-Yf=*( zLq~sS=07cl{z>v(edpsn?|FFPUrEF#`N at pOgCO?qQ8bXY*%b6TKMABl7yX+X_>W+dJjd z*#@*RiZ;R2Aa*aK{hv_)UHA6OiHbRtXp~Y6$A425SX5T*=MN#m*9wJ=6mE2hu{i-lQ(il?+3llCb?WH5XqfAlDo~YI=;a;xx=Hu(FnA ze0B{0UzvkKhmBHOn)qa=6{`O}igp}Qv4t#=AB9Z%9;({limDB+sD%Hy>P!?7TS%jw bB^KcyJ~ZgpH4FC800000NkvXXu0mjf6L=r` diff --git a/src/public/images/icon_smartpools.png b/src/public/images/icon_smartpools.png new file mode 100644 index 0000000000000000000000000000000000000000..8dc3aa10ad4720ed1f4a25090ace122183ce8362 GIT binary patch literal 4117 zcmeAS at N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5n9Wp~AN+NuHtdjF{^%6m9^eS=-fVvqNZ0suv5|gu2OB9k) z(=+pImEP~(ucVNfVyhHx>TBRz;GCL~=}}db8eHWUl3bOYY?-2DZ^va*VFffGH?<^D zp&~aYuh^=>Rtapb6_5=Q)>l#hD=EpgRf0Gw!Z$#{Ilm}X!9>qU&qz1fz|2^|)L75h z)X2=pL`T8Mz`#P^z+B(hK-bX1%D~jh#83eWlHCStb$zJpw*7iAWdWaj57 zfXqxx$}cUkRZ;@VD?klTNrszUP+F7&HaR6(KQ$*cH#M)MSl>|3P#;-6FeHL9(=$qn z;o96Z~cnI0-zQH{UWd$6rBYb`6cI at QE<80UxFoRz>}hBK!5w7f zSXz>iUsN2BUz`aFN}xO_gcWR3lC2>A1al!l?wC^o;X$}LnV at jC%1O*iw^gdpO-W5l zEX^rV(ueBM2gM3Zi;X_2fgtmfi&7Iy@{5ox2u>|TwE)E|m at L>VWX&MMN-|4wQjv^; zSqx1rB)b)1o(&=-LyLj=F(kDpx0qTs;WXO at Io_?DAwlJw56lP2C7yX{`QT)ZswUGh zrO36SBr&B3mJKlFoij at +amxk)OAc at vz+rkoa()UhnL-jU7Q;)5a2XzwniHO11S~_a z>UGUc%)}=jS_G2?CkPvG(n2Z#fUyA)0~Rd6GEE;|s6kT`wEUqJ1r9A*84fdd)Dl=o z5Jis$7g50kQ#2Y}u#g~%9t|#{f(fQ*G`L_PK@>e2Tto#EOcB1|;zD$bQuBcA<8ol9 zr{$vbQw9d6Y)==*kcwMdruh2^2MQe9f7eX)lGru2SrQ@{+9q*RG~AlalX>KJBqUvG zzPQ`%u&l4vJ=?-B2}z6CO^$T4^e-y9;Fh(9v71q8%C?YOTS~U4{=QauJ51~4e9 at Fi zC(q3`|NZvK_j`RGj at 7gL-st`P`l at HHG80UNO&Ata8-z>go$<@5HR`@4N z?VHrK>sl_AO22)x+vb{1=?l-oJ2$S|Y at T?oePOEjfv`Ad-+IkDThX?&uNwEB?mh8GCx-d at sY7#WV;?@a zmR9oT?&H_n{djl|UOaT*QR7 at KRR-Snjgp>6KDgGfWM*!&rct7i=-edXrzfJcT(i$|$^Q&V zZL)gyW~tF{m!QjYkJ}tS-+KK`s@(ex{kh6})~zXgZg~EqZCr8*hh*Y^L*3QsZ^U}P zzxbOSmN6?Vcx_S9#1qCTBRz;GCL~=}}db8eHWUl3bOYY?-2DZ^va*VFffGH?<^D zp&~aYuh^=>Rtapb6_5=Q)>l#hD=EpgRf0Gw!Z$#{Ilm}X!9>qU&qz1fz|2^|)L75h z)X2=pL`T8Mz`#P^z+B(hK-bX1%D~jh#83eWlHCStb$zJpw*7iAWdWaj57 zfXqxx$}cUkRZ;@VD?klTNrszUP+F7&HaR6(KQ$*cH#M)MSl>|3P#;-6FeHL9(=$qn z;o96Z~cnI0-zQH{UWd$6rBYb`6cI at QE<80UxFoRz>}hBK!5w7f zSXz>iUsN2BUz`aFN}xO_gcWR3lC2>A1al!l?wC^o;X$}LnV at jC%1O*iw^gdpO-W5l zEX^rV(ueBM2gM3Zi;X_2fgtmfi&7Iy@{5ox2u>|TwE)E|m at L>VWX&MMN-|4wQjv^; zSqx1rB)b)1o(&=-LyLj=F(kDpx0qTs;WXO at Io_?DAwlJw56lP2C7yX{`QT)ZswUGh zrO36SBr&B3mJKlFoij at +amxk)OAc at vz+rkoa()UhnL-jU7Q;)5a2XzwniHO11S~_a z>UGUc%)}=jS_G2?CkPvG(n2Z#fUyA)0~Rd6GEE;|s6kT`wEUqJ1r9A*84fdd)Dl=o z5Jis$7g50kQ#2Y}u#g~%9t|#{f(fQ*G`L_PK@>e2Tto#EOcB1|;zD$bQuBcA<8ol9 zr{$vbQw9d6Tb?eCAr-f_O!fB=36wd$KR<1bN%_^QF at _smx9bQpYie^@vAPOKmaJ$F z36NFNS{Pi?+0=J+VY2J;CZ?_4f+ZSWygq at 6{L9vAzPoj5o!;(q>t4T^U1z-c^1D~> zma)r!e*V4g{oeEMzt`=*KRa>OvP5I4+a?=Szu3Gxk-6}382 at b!gVTYsv(`T~j^J2x z-zUD}SDN{U-$CzYt`mPzTa*?XP+LCj_ at s|#*nN8?+pb^C+mkp;G)`Ejqc!|YjGoQB zkcJZ*6y20B^7J27vb9*Id$wZ9lb$bGl0TPe8$4B?dH7`vThit1oTUf} zldp-p`o^XHV5GJvgSeJf_e`G|6F>SKEd8)*X4CoPg1qUOeCHYUCK=0~D!aqgt}*-X zh47Zz;uS0GlSj_r&_z)wQF~q6;)8wp=dCW*{1DMPZSmtzKvnWb z#i*ADn(TS}@7os4tMOVW5nJu>L&9ZOWCn(>b6~bm^#-t98Z40d2x at YnCEge zi?qKRLqi#@Y&pbiwpxXRKH6~AgXKv?fX{rHXv>^QT&D9Hbe8^2soNi4U9s)ke)$=9 z^Q3P at pL(!P$Uykn49;2V>-Tv%)$VLKsc?MSH0=zVs at ZE_^C#7YtZ0b~o&KSCB8#)l z$-021Z_B?lA6>NVyk7Qxk(+zopr0BEclmjD0& literal 0 HcmV?d00001 diff --git a/src/public/javascripts/ovirt.tree.js b/src/public/javascripts/ovirt.tree.js index 13720b2..77d6c55 100644 --- a/src/public/javascripts/ovirt.tree.js +++ b/src/public/javascripts/ovirt.tree.js @@ -8,26 +8,19 @@ function processTree (){ $.each(response.deleted, function(name, value){ //FIXME: special case for other peoples smart pools //come up with better way or split out somewhere. - if($('#' + value.id).hasClass('SmartPool')) { - if($("#smart_nav_tree > li > div.SmartPool").size() > 1) { - $("#smart_nav_tree > li:first div").click(); - } else { - $('#nav_tree > li:first > div').click(); + + //check if the li is the only one. If so, remove its container as well + if ($('#' + value.id).parent("li").siblings().size() === 0 ) { + if($('#' + value.id).is(':visible')) { + $('#' + value.id).parent("li").parent("ul").siblings("div").click(); } + $('#' + value.id).parent("li").parent("ul").remove(); } else { - //check if the li is the only one. If so, remove its container as well - if ($('#' + value.id).parent("li").siblings().size() === 0 ) { - if($('#' + value.id).is(':visible')) { - $('#' + value.id).parent("li").parent("ul").siblings("div").click(); - } - $('#' + value.id).parent("li").parent("ul").remove(); - } else { - if($('#' + value.id).is(':visible')) { - $('#' + value.id).parent() - .siblings('li:first') - .children('div') - .click(); - } + if($('#' + value.id).is(':visible')) { + $('#' + value.id).parent() + .siblings('li:first') + .children('div') + .click(); } } $('#' + value.id).parent().remove(); @@ -35,12 +28,10 @@ function processTree (){ if(processRecursive) { $("#nav_tree").html(recursiveTreeTempl.process({"pools" : response.pools})); - $("#smart_nav_tree").html(recursiveTreeTempl.process({"pools" : response.smart_pools})); processRecursive = false; } else { // Loop through the items and decide if we need updated/new html for each item. processChildren(response.pools, treeItemTempl); - processChildren(response.smart_pools, treeItemTempl); } } }); @@ -64,16 +55,8 @@ function processChildren(list, templateObj){ if ($('#' + data.parent_id).siblings('ul').size() > 0) { $('#' + data.parent_id).siblings('ul').append(result); } else { - if (data.type === "SmartPool"){ //handle current user smart pools - if($('#smart_nav_tree > li:has(ul)').size() > 0) { - $(result).insertBefore('#smart_nav_tree > li:has(ul):first'); - } else { - $('#smart_nav_tree').append(result); - } - } else { - $('#' + data.parent_id).parent().append('
    ' + result + '
    '); - $('#' + data.parent_id).siblings('span').addClass('expanded'); - } + $('#' + data.parent_id).parent().append('
    ' + result + '
    '); + $('#' + data.parent_id).siblings('span').addClass('expanded'); } } else { diff --git a/src/public/stylesheets/ovirt-tree/tree.css b/src/public/stylesheets/ovirt-tree/tree.css index 7d5411f..de019f4 100644 --- a/src/public/stylesheets/ovirt-tree/tree.css +++ b/src/public/stylesheets/ovirt-tree/tree.css @@ -1,12 +1,12 @@ #nav_tree { - padding: 20px; + padding: 0px 20px; } .nav-tree { width: 222px; position: absolute; overflow: auto; - top: 25px; + top: 50px; bottom: 140px; } @@ -44,6 +44,15 @@ background-image: url('../../images/icon_smartpool.png'); } +.SmartPoolRoot { + padding: 4px 0 4px 28px !important; + background-image: url('../../images/icon_smartpools.png'); +} +.DirectoryPool { + padding: 4px 0 4px 28px !important; + background-image: url('../../images/icon_smartpools_dir.png'); +} + .hitarea { width: 16px; margin-left: -16px; @@ -81,11 +90,21 @@ } .nav-dashboard { - background-image: url('../../images/icon_dashboard.gif'); + background-image: url('../../images/icon_dashboard.png'); background-repeat: no-repeat; background-position: left; padding: 0px 0 0px 28px; position: absolute; height: 25px; top: 0; -} \ No newline at end of file +} + +.nav-networks { + background-image: url('../../images/icon_networks.png'); + background-repeat: no-repeat; + background-position: left; + padding: 0px 0 0px 28px; + position: absolute; + height: 25px; + top: 25px; +} -- 1.6.0.6 From imain at redhat.com Mon Jan 19 21:05:55 2009 From: imain at redhat.com (Ian Main) Date: Mon, 19 Jan 2009 13:05:55 -0800 Subject: [Ovirt-devel] Taskomatic Qpid Transition, LVM and Migration. In-Reply-To: <497433A6.6040908@redhat.com> References: <20090116143058.7bae7835@tp.mains.net> <497433A6.6040908@redhat.com> Message-ID: <20090119130555.0724ca02@tp.mains.net> On Mon, 19 Jan 2009 09:02:46 +0100 Chris Lalancette wrote: > Ian Main wrote: > > So, I'd like to propose that I post a new patch on Monday with > > Chris's comments incorporated but with LVM scanning still removed so > > that we can get some testing of taskomatic/qpid. At that point I'll > > make it top priority to get the LVM scanning working again properly. > > This will likely mean a new version of libvirt-qpid that figures all > > this out and provides a nice pointer to a volumes LVM pool making it > > much easier for taskomatic to figure out. > > > > This sound reasonable? Chris, you ok with that? > > I guess that is fine; we'll have a temporary break in functionality, but as long > as we fix it up pretty quickly, it should be OK. > > As far as getting LVM working, I actually came up with another idea that may > work and require no changes to libvirt itself. The basic problem with the > current algorithm (besides the fact that it is complicated) is that > pool.lookup_vol_by_name() works globally, not on a particular pool. I *think* > we could actually write a quick wrapper to that call that does the right thing; > after all, we do have the pool already, so we can fetch all of the volumes that > are attached, and see if *this* volume matches up with one of the ones we > already know about. It would have to be looked at in more detail, though. Yeah, that may be best. And then we can use that call from within libvirt-qpid to build the hierarchy. Part of the problem right now is that basically all the lookup calls don't exist in the qpid version because the objects just come/go from the server as they are created/destroyed and you can use the qpid lookup functions to find whatever you need. For that reason I actually don't know that it's possible to implement this right now.. it needs libvirt-qpid support. I think that's a good idea to add a new API and get this working properly. > > The other sticking point is migration. Currently we are still using > > ruby-qpid to do the migration via libvirt. I have spoken to the > > libvirt folks about the creation of a split (src and dst) API to allow > > migration to be set up over qpid but it sounds dubious. It is also > > likely that we will need libvirt to libvirt communications in the > > future anyway as that is the way they are headed. > > > > So for now I think we're going to need to carry the libvirt gssapi > > configuration going forward until a better solution is found. > > Just to be clear; by "libvirt gssapi configuration", you mean that you are still > doing migration by directly connecting to dst and src on from the ovirt WUI, and > then doing the transaction like that? If so, that makes sense; anything else is > going to require a lot more thought and time to implement. Yes that's right. New qpid rpms are pushed now, so I'm working on a patch to add gssapi support today. Hopefully I'll post a new taskomatic patch tomorrow. Ian From jeremy.perry at redhat.com Mon Jan 19 21:10:05 2009 From: jeremy.perry at redhat.com (Jeremy Perry) Date: Mon, 19 Jan 2009 16:10:05 -0500 Subject: [Ovirt-devel] [PATCH] Updated tree nav layout to move smart pools above the main pools. In-Reply-To: <1232395792-28920-1-git-send-email-sseago@redhat.com> References: <1232395792-28920-1-git-send-email-sseago@redhat.com> Message-ID: <525BD232-1E07-48C7-975C-E7A0BB503155@redhat.com> Hi Scott - I'd like suggest the following 3 style tweaks to the nav for the sake of alignment. This will make the non-tree nodes (Dashboard and Networks) have the same spacing and alignment as the tree parts. The result is shown in the attached image Complete new styles as follows - changes in red if you view this as html. A couple of declarations were removed. /* ----- tree.css (line 5) pushes tree down 1 px-------- */ .nav-tree { bottom:140px; overflow:auto; position:absolute; top:51px; width:222px; } /* ----- tree.css (line 92) adds top and bottom padding, removes "top" position attribute -------- */ .nav-dashboard { background-image:url(../../images/icon_dashboard.png); background-position:left center; background-repeat:no-repeat; padding:4px 0 4px 28px; position:absolute; } /* ----- tree.css (line 102)adds top and bottom padding, pushes top down 3 px -------- */ .nav-networks { background-image:url(../../images/icon_networks.png); background-position:left center; background-repeat:no-repeat; padding:4px 0 4px 28px; position:absolute; top:28px; } On Jan 19, 2009, at 3:09 PM, Scott Seago wrote: > Dashboard and networks have their own links in the nav. > Also updating reworked nav icons. > > Signed-off-by: Scott Seago > --- > src/app/controllers/network_controller.rb | 13 +++++- > src/app/controllers/tree_controller.rb | 53 +++++++++++++++ > +--------- > src/app/models/pool.rb | 12 +++++- > src/app/views/layouts/_navigation_tabs.rhtml | 9 ++++ > src/app/views/layouts/_tree.rhtml | 23 +++++++++-- > src/public/images/icon_add_hardwarepool.png | Bin 1223 -> 1133 bytes > src/public/images/icon_add_smartpool.png | Bin 1341 -> 948 bytes > src/public/images/icon_add_vmpool.png | Bin 838 -> 741 bytes > src/public/images/icon_dashboard.gif | Bin 14152 -> 0 bytes > src/public/images/icon_dashboard.png | Bin 0 -> 4457 bytes > src/public/images/icon_hdwarepool.png | Bin 1179 -> 4509 bytes > src/public/images/icon_networks.png | Bin 0 -> 4223 bytes > src/public/images/icon_smartpool.png | Bin 641 -> 4233 bytes > src/public/images/icon_smartpools.png | Bin 0 -> 4117 bytes > src/public/images/icon_smartpools_dir.png | Bin 0 -> 4228 bytes > src/public/javascripts/ovirt.tree.js | 43 +++++ > +-------------- > src/public/stylesheets/ovirt-tree/tree.css | 27 +++++++++++-- > 17 files changed, 119 insertions(+), 61 deletions(-) > delete mode 100644 src/public/images/icon_dashboard.gif > create mode 100644 src/public/images/icon_dashboard.png > create mode 100644 src/public/images/icon_networks.png > create mode 100644 src/public/images/icon_smartpools.png > create mode 100644 src/public/images/icon_smartpools_dir.png > > diff --git a/src/app/controllers/network_controller.rb b/src/app/ > controllers/network_controller.rb > index 725e60d..e4faf7b 100644 > --- a/src/app/controllers/network_controller.rb > +++ b/src/app/controllers/network_controller.rb > @@ -34,8 +34,17 @@ class NetworkController < ApplicationController > end > > def list > - @networks = Network.find(:all) > - network_permissions > + @networks = Network.find(:all) > + network_permissions > + respond_to do |format| > + format.html { > + render :layout => 'tabs-and-content' if params[:ajax] > + render :layout => 'help-and-content' if params[:nolayout] > + } > + format.xml { > + render :xml => @pool.to_xml(XML_OPTS) > + } > + end > end > > def networks_json > diff --git a/src/app/controllers/tree_controller.rb b/src/app/ > controllers/tree_controller.rb > index 07d46f7..e2065ca 100644 > --- a/src/app/controllers/tree_controller.rb > +++ b/src/app/controllers/tree_controller.rb > @@ -29,12 +29,19 @@ class TreeController < ApplicationController > @clientHash[tempItem[0]] = itemHash > } > end > - @serverHash = {:pools => > build_json(HardwarePool.get_default_pool.full_set_nested(:method > => :json_hash_element, > - :privilege => Permission::PRIV_VIEW, :user > => get_login_user)) > - } > - @serverHash[:smart_pools] = > adjust_smart_pool_list > (build_json(DirectoryPool.get_smart_root.full_set_nested(:method > => :json_hash_element, > - :privilege => Permission::PRIV_VIEW, :user => > get_login_user, > - :smart_pool_set => true))) > + pools = build_json( > + HardwarePool.get_default_pool.full_set_nested( > + :method => :json_hash_element, > + :privilege => Permission::PRIV_VIEW, > + :user => get_login_user)) > + smart_pools = adjust_smart_pool_list( > + build_json( > + > DirectoryPool.get_smart_root.full_set_nested( > + :method => :json_hash_element, > + :privilege => Permission::PRIV_VIEW, > + :user => get_login_user, > + :smart_pool_set => true))) > + @serverHash = {:pools => smart_pools + pools } > @ids.each { |item| > if @clientHash.has_key?(item.to_s) > @clientHash.delete(item.to_s) > @@ -69,19 +76,27 @@ class TreeController < ApplicationController > end > > def adjust_smart_pool_list(list) > - mySmartPools = Array.new > - otherSmartPools = Array.new > - list.each {|listItem| > - if (listItem[:name] == get_login_user) > - if listItem.has_key?(:children) > - listItem[:children].each {|item| > - mySmartPools.push(item) > - } > + # list should have a single element. If it doesn't, don't > transform anything here > + if list.size == 1 > + smart_root = list[0] > + smart_root[:name] = "Smart Pools" > + smart_root[:type] = "SmartPoolRoot" > + mySmartPools = Array.new > + otherSmartPools = Array.new > + smart_root[:children].each {|listItem| > + if (listItem[:name] == get_login_user) > + if listItem.has_key?(:children) > + listItem[:children].each {|item| > + item[:parent_id] = smart_root[:id] > + mySmartPools.push(item) > + } > + end > + else > + otherSmartPools.push(listItem) > end > - else > - otherSmartPools.push(listItem) > - end > - } > - mySmartPools + otherSmartPools > + } > + smart_root[:children] = mySmartPools + otherSmartPools > + end > + list > end > end > diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb > index 614325a..27cc7ab 100644 > --- a/src/app/models/pool.rb > +++ b/src/app/models/pool.rb > @@ -243,7 +243,9 @@ class Pool < ActiveRecord::Base > current_id = opts.delete(:current_id) > opts.delete(:order) > subtree_list = full_set(opts) > - subtree_list -= [self] if smart_pool_set > + if (smart_pool_set and !subtree_list.include?(self)) > + subtree_list.unshift(self) > + end > subtree_list = Pool.send(type, subtree_list) if type > return_tree_list = [] > ref_hash = {} > @@ -260,7 +262,13 @@ class Pool < ActiveRecord::Base > pool_parent = pool.parent > parent_element = pool_parent.send(method) > ref_hash[pool_parent.id] = parent_element > - return_tree_list << parent_element > + smart_root = ref_hash[pool_parent.parent_id] > + if smart_root > + smart_root[:children] ||= [] > + smart_root[:children] << parent_element > + else > + return_tree_list << parent_element > + end > parent_element[:children] ||= [] > parent_element[:children] << new_element > else > diff --git a/src/app/views/layouts/_navigation_tabs.rhtml b/src/app/ > views/layouts/_navigation_tabs.rhtml > index 8d9e36a..70af098 100644 > --- a/src/app/views/layouts/_navigation_tabs.rhtml > +++ b/src/app/views/layouts/_navigation_tabs.rhtml > @@ -60,4 +60,13 @@ >
    >
    <%= link_to > "Tasks", {:action => 'index', :nolayout => :true}, :title => > "content area" %>
    >
    > +<% elsif controller.controller_name == "network" %> > + > +
    > +
    <%= link_to > "Networks", {:action => 'list', :nolayout => :true}, :title => > "content area" %>
    > +
    > <% end %> > \ No newline at end of file > diff --git a/src/app/views/layouts/_tree.rhtml b/src/app/views/ > layouts/_tree.rhtml > index 6129f0e..fa3effc 100644 > --- a/src/app/views/layouts/_tree.rhtml > +++ b/src/app/views/layouts/_tree.rhtml > @@ -28,6 +28,20 @@ > e.preventDefault(); > } > }) > + $('div.nav-networks a').bind('click', function(e){ > + if(this === e.target){ > + var myURL = $(this).attr('href'); > + $('.current').removeClass('current'); > + $(this).parent().addClass('current'); > + $.ajax({ > + url: this.href, > + dataType: 'html', > + success: handleTabsAndContent, > + error: function(xhr) {$.jGrowl(xhr.status + ' ' + > xhr.statusText);} > + }); > + e.preventDefault(); > + } > + }) > $('#nav_tree_form ul.ovirt-tree li').livequery( > function(){ > $(this) > @@ -36,6 +50,7 @@ > $('#nav_tree_form ul.ovirt-tree li > div').removeClass('current'); > var thisHref = (urlObj[$(this).attr('class')] !=null) ? > urlObj[$(this).attr('class')] + '/' + this.id :null; > $('div.nav-dashboard').removeClass('current'); > + $('div.nav-networks').removeClass('current'); > $(this).toggleClass('current'); > currentNode = this.id; > if ($tabs != null) { > @@ -87,14 +102,14 @@ >
    > <%= link_to "Dashboard", dashboard_url, { :id => "dashboard"} %> >
    > +<% network_selected = "current" if controller.controller_name == > "network" %> > +
    > + <%= link_to "Networks", {:controller => "network", :action => > "list", :ajax => true}, { :id => "networks"} %> > +
    >
    >
    >
    >
    > -
    > - Smart Pools > -
    > -
    >
    > > > diff --git a/src/public/images/icon_add_hardwarepool.png b/src/ > public/images/icon_add_hardwarepool.png > index 3e7431c9602cc829b712d12cccec89e87b90a09f.. > 6eae0d566f10503c7a6a7f980a9d2b6d0e6353d0 100644 > GIT binary patch > delta 1112 > zcmV-e1gHDQ3GE1wB!3xnMObuGZ)S9NVRB^vL1b at YWgtmyVP|DhWnpA_ami&o000CJ > zNkltL3xL zRrVx4$lL_`Buu90i!kQISU2m6Yhk*@bi>XKK_ at OvY7=w2 zjSmIcfx|iX+;j5z{l52i&hNyO%jK|MWdqi++=s7AF&iIDCR4tjD~QC$p6NqMoaTL7 > z?G_}3$O-CR{L?=?x*AZiz&05N3*qlxxW)T#^>pCS+aIH9V;!>DETni0v#}|NQ$g0g > zK?a;E2X0 zbflC)rUHu=J at lWu!P^sucP?7=!oZhYfh^5VM8cT7>KkjY>$_fh at fA!@$KV at 0$EFP$ > zjVLKQoAcV|ffcPCcy2d`vvoSrGr|Ot*S`V-Z*ObO&wm^H$-l^mOG6_gC1p<;q+YI6 > zP;9VS>b-DLFe|&Bc#>B#!b?VYnWH7)r~CHg`+aAA;O%EGKZU|wp$H+&1kM))8%u9* > z?}7p)x0=Zq?Z$v(QroR&C|VZcjEJQF3-lj5j_R6C%Ys{)8ZkWl{p$Al(rC}-`@-Y| > zW};ze8Gjk(N;|4)%;R~Gzmp{iQYy6sJT!C(x~`Q6_Z{uZ_n+_Sf~x6ckOooC;PUAJ > zg2B6RI-LBy)8XK4Ob|Hu!Z#ObYiiK7Rl<#t- at 4~%96kOHLV}2 at N((B at 75rPrlPNyN > zir;?~v&mU>Jkp8Ijz{wz`+Q$RBdDgTyq4v8ZGV*&I~pCh6S;?9gHxCe{*FviM1{2y > zcJ8eUHk%#e<2P{Y_AfYipa%&tjx>D&m4P*t+A?L2iV{4oO?bTZ0d%yupzeOyAp14Q > zDG8Gl3vO2f%oZy`6CpIWG$X~}ngUf(xe?{SWvkh2AG`C{BH0sC8WXVupU~dkiKgal > z7=QoyIwT6Z#>TC43uTGRt at 5gr1;0Y)cz2=fiZp`_ zN|xur<$Hei@{fV;BM0^_E4xCn>Nz^&DdE)B*1=-2 at bn-PTqBQF_RW zC>lPwwS6bHx$9ADw_!$3<8DOYbC_3If`1>H@?x;*Tb^ueHtU?{+ML((TkZCm18zP~ > z2co}?9}IaO>K7v+z8$MKJHd7}+s6!kcFTDvnascNbc#p1Mk>i_lKs at HYlhDoz-}s| > z)V^sP-`~AA$I at qgy%Ra|Fh}5pb0SS}oerc-mY;h2mdow` z7J`eZPzqcupBKGStyD+>b_Tyr)%&dXFk0I at _+a4F67Xs+6KjSSF~UvtSfR&jg5Uqs > e at V|xsBftQJOI3E8R*<>?0000 > delta 1203 > zcmV;k1Wfzw2*(MKB!2{RLP=Bz2nYy#2xN!=000SaNLh0L01EH`01EH{Laa2H0000L > zbVXQnLvm$dbZKvHAXI5>WdJlUF*q+UI2$jIGynhq9CSrkbW?9;ba!ELWdK2BZ(?O2 > zMrm?ocW-iQb09-gGnm#!0{{R7AW1|)R7i>Kmt9O8RTze!X at 7SYSSYk*7qI-4Qe$cb > zO)C9KynrT1T7oudnix&frtzwYjTgpN(<|eJsjZ1znbcIHHzp01xMC}IV at pzPx6nqk > zjfvJ!SP*cR!ou#%?wm7cya2b$vLLK6T zqz`DCmdx$6Zhw60xkDI{aR71)*Aoqoo&qlQ2mIYjfu%RMHg6ye{?5fa0KC~!%f7ch > zB5zF*N-1I!A*MqkL`DXf4voCtAMl at 9E_|Ny^oR>9nU|J$k(NR#h0|Ncn&MJCo3=3Y > z zmbtC^BZrSNJ|4o?*$&W|TEySl4%n}L*0Wf_w7s~UgKZtywvDB165&Cjx4z)W;iGKY > zT$5badowVnh|679ucqE7qwPkD)eFUHO~V4jgQ1LIfchOfso$}a-kX6|UuSzOpry`d > zgr7aMD}R|EI` zT at FmCh)hL at 20rJ+@ss2itX&XXRZ))L|82&(C3L$==HcN%rpAVl2^~j{n|z?U`cVM% > zSd5rq%ma6IUB zesu|HNi4ZUcxw08?0S}CC*LL*j*yq*B*(EDP1Bf&8U(`;00M#QOh>1weWH%K+9#8W > zeZDV|QX+*w3Xz at i!aNsS%01j0eZbEHBa9FHN+KFzwJQfV;PsS{o9m{p?>2Yt{>0ur > zEq_c#CWspbLI|W32$7}jW04ruC2M)Q<`HVEN)X#0PqF<5x)Eb|c#zVPG8|49!NDMv > zRh1ZqfsiJ`6o at R9>n?}G-Fxr%Ikr#6;tYl+0ob~=j*7~S^!;#)SS&_)`G%Pb^%zpj > zfQ2x#f?tzLHK*Hd#->>1bm0cfc!Glb0)HACo0yoKK$ zXuD|&EL)*0MNwf9PNx&F(RCduOoS8&GmB^5AMl?8)_piObb7 zXczz?1j<(I8)>Dp;%k&rMlYhU? > ziwBUFMA?e->n~s?5)a{V11SYkNOTbecxBn}*#f$O?*4%Pjnwg`<_3FwJVbG^7h4Ey > zrIO!?c-+8}771kl?9Q~e|I;(vZeM46=f|IXKsfvdmb8-1WhN4ff+6#M{%}&$7Mx3s > zrsjr5;5DH2`PKu}Y_8`0wlnj RW=8-3002ovPDHLkV1jQ&K`j6P > > diff --git a/src/public/images/icon_add_smartpool.png b/src/public/ > images/icon_add_smartpool.png > index > d7cb7316596b1eafbcad54890971f42737d45a62 > ..6bb07d7cca9839042a779bf8a7203b16bc6cb830 100644 > GIT binary patch > delta 934 > zcmV;X16lmN3bY519De{Gt`<1}000?uMObuGZ)S9NVRB^vL1b at YWgtmyVP|DhWnpA_ > zami&o000A4Nkl^k6#w1*_comx!KP6`nn7X at 3Y?V?*_VQ(h$4z0dO!r4 > zU!o5cmA$_8fW8C~1r-q#D%FQnFer)?B*e%E77d-R`P}~7{(q0#`EO0;YHQibFCIAD > zd(S=G-}#+;&i!wUbB@^(9cEGHz-J$vF*c zqq!E6w=V>&H>V9}=Hxg1O#lhO{gM*Wh`1Wgz|;0no1R>>W-FGI?9=AeGX>X2FL+GT > zM*~Oi5nGpi#eX)KG8St~XG*{|seJSSiEKCau7hb_=0eN-BCtR=>;+B(1#__MZ13H_ > zPP<5K6R9SP*Or5iHbNa~MDD6`%~UZH<}4=D(-sHrya|o>53QeG3+_f3MjwESJz&dj > zqv_fvsH$Qj_Q4saomz>#zPS;Bk*?EpP<8a3Q)+!Qn19l;?LzU9=a73^C{z_Xu>-k< > zoAB*py`Ox zgS;*0nBp6-MxUk1qP6|y#YzgQfdZ&Yn0Dd|FWNw-XN!cyK6A4%5NR > zj?h$CP=5xVQG(W|RTy)3--ySY#rvdEv{z|3oWExCe8(~;RCgV?w<~c0nHGTAR$_EQ > zkM_5;9>(j3%(# zGCw9Lh$f>!C at n0o!-QcfH038B)!;zeXE(fJuz!U>*UspXi6c8?MI9CtiCRjE?Z_WZ > z>IDniZ>9Q^T9IMVgUMcSNhVdmWrC7*;kl;4No1u7n(xt6gYUALiCj=5Ku%dVVA7|D > zXM(^LV>pnYA2wr%`KnZd7ubv{fyht^*fpZyQ(pjG1Hs zN`JuVp#4?@*BjITL_bG+zl^?d-bx(vsIYQ9KK`!FtzeAaKQ09#>?>2n{CJj8LH{K1 > z$s<6N*)sxNP1>z((&(gz at KWc9ZpbyRL%Lqp%o|b#UNtBRaC!ADDn}WC?TmFG+iC4; > z`bD9Z{4~?`q%KqI^WW*K^N!+V{QlIJ%^&?^nFIfy@?C%d0K%5{zV?bS5C8xG07*qo > IM6N<$f}H=uWB>pF > > delta 1330 > zcmV-21 zm;e9-;z>k7R7l6|m3>T=Wf;bP&wCCB5e^>-Y9N`3m1rR-3Uj(tR<2f=)243vM`)|H > za*fTk|texxLFVj>`#i5`@XBY$w z&Fin{eeUPFuIGNA`?(+J4=cVoEq2>x0Wbs1Je}!`e{g(M at wQp<036Moz3Z2+- z9l3!%lg6=BasDv&Ptg;VL-E*;a7R$xgZa57vMJ at HB*xoR#W4eq*F)yg{GK?48&Y at 4 > z{sb}h#Y_46D1YG}MtAb|@=a2cvG-yY{I > z7<<-g4I@$2sM at -Qz6wcG=2l&-XhhkYQT0t&qQ~s+vjCvQ<)ciVn^xLB5x at Hy|032M > zJR>3^wPoKgF4>qYhgQe^UUH;H4S3ihBCqZ}*(dn%^M7q9z?Qd>jAe!DwgLc$R>w-# > zs^%`i>Uk(%Gok=X9AZhNqcteyKjy2ME9+Fh0suvuGd~M+S1-+&I2_Rhr4*PHC(Ev3 > z8acmo)Jr?E;=+~dreo-ar}>;Y&Jx5?b6HN5U+4I#2AZob$xw? z!7~DIwtqNRep)$Lia$!9e5>{5-b8>lx4&mRa{OrdId at rUv%@tkE;gd+mQ}ZG&xt;5 > zXUCEZpoa4WA8_?TebG~I70>!Bxu;+jJ6Et{Nd|3hKd)=sp#1<`$Y#vcxmaToXWI6@ > zAg6cEl77jqt7QP}e{DLcQ$mqTx!}?;>OLiHvVVmMGbUnE{{C}*GP`u#;q}RRR?F4L > zCro-6P1CxPl1_BFj;%BgmuYmzEpHmY;SJ*?^`TB8t)X2(rP0>z=1lz%MlZ zyveyI4lA_aG{X > z at _!~BU)tJ5N8fL>KK8Dzer*gAFooa0MgRL2(Hq_KwWq$7!nLC$e>rk6$5ho_>?K>K > zsk_lv1DUV-t^$BHFQ%ZBQbix8EDQ;c{K^_ at C1g-2L7z^0b9=z&axTbv$9CYJ%tb_& > z?>lu{(w2qkxEc=;F)R~T<4I2M$rkG)bAQyt`CHXJoA>@+vhz3qd$XtZUFTSXq6IM? > zz#UAXs^Ams<%O*#4I2tW3qi9)#xo>&9+O_)I_tKbyk|E`sr(!yJbD;2RyNS)4)k(# > zgSQfzzC?M?gYH6U;S3(sO!~rgq`&e+4DR1%8i96v?RHx0%BVfI at 9xgrc3_3*-hWm+ > zSC0`LZDQDnXo-#06h=E@=%7MTXrMGe5OgqnC}jdu6b^?$!<7~s4NYD{LO;)X&;I5e > zo7>M z95pm;X__fC(lcsoM$H}lc7PFMQh$0LjicM2^($Ws;;uzpouC4s3n+Ety-*+;Xa;(R > z2MGv~56w^zvOQ_S)3)0coOz&%>};$eO!E_A31abj!0-|9>)4$E+yR5ZAsUHM7D6l< > zgM0=NrXWq%EAdL`pn ol*J&#q#^!Jf&tI{F8$xcAIv&N^Zci at 82|tP07*qoM6N<$g4mLJod5s; > > diff --git a/src/public/images/icon_add_vmpool.png b/src/public/ > images/icon_add_vmpool.png > index > 6afffd1fb1a02dc763f9a9f1e6fff3c1586f89a2 > ..b0b73b08c3c794d66da088abcbab978c434f15e2 100644 > GIT binary patch > delta 717 > zcmV;;0y6!^2IU2iB!3xnMObuGZ)S9NVRB^vL1b at YWgtmyVP|DhWnpA_ami&o0007q > zNkl(h6P_sckKyM|%xO > zp%=jx6A?TW4+T#i;-LpY1gmJIT4HQW+Wf6=X5(bD-Ry2cA%7rwFgr85GyA>o&G%-8 > zS(b%fnSvf#AG{}~IXjFo*|uCtq;Kq`#p%oZ;j0}{yqr66=59Nz)MPvTI4)?vSWSq2 > z{ARi%PrRb0xdvG6z$fNYEfdp7Se-iHHupMO^H1OUPFTHq0oc6`oLiGo2r}+uAaiad > z2U}kw2i(zUXMb}Wj3cu^@Z{7**`9jxM%3%m<1U%1cKv0>AGKB_HXlQ$8gs6{bItMf > z27hb&uV_skGMdc6tqv4FQ6XTacdPcgV`RIZIM zXD at Tu+Ww7PzP(n|`XOqHxxDc_wd9v-vdxt|ac#6oOn)^bIZ2q>TiXXnu5AX2Zt_ZE > zma3)DVTWcMkF3jb`KqW#?(E3uMRXO>sD^ zH5HKvftxDKs4hxZf|H>ZDrb!d(4+jF)cBcZ*IJz8z^0+VGAn5mH?TDRa at lc~Th > z14p}5lYgSkfyST%d#Iwo5WpH at oH5k~0skqKy9EEYnTXV-)Uo!69`BrT46?x^1RNzW > z4k`+*d8t at IG}dj{g>gaclOrY1oE;pr9sIC38uX)Vhu}wC&-RW5 at 6F=U< z_04lAW-{nhYuRw-#u57J@@*)N+Y8GWI(tUG+eZ8G6OUFFv6=Ed)qKG_xhTBLWUL1( > z_p`2i&fZ > delta 815 > zcmV+~1JL~C1;z%DB!2{RLP=Bz2nYy#2xN!=000SaNLh0L01EH`01EH{Laa2H0000L > zbVXQnLvm$dbZKvHAXI5>WdJlUF*q+UI2$jIGynhq9CSrkbW?9;ba!ELWdK2BZ(?O2 > zMrm?ocW-iQb09-gGnm#!0{{R5pGibPR7i>KmQP3&Q5?rVZ-3^^%$v1CK?&latH(S9 > zf!FA&8+hm z%Qzj?p6PiU< z3KI(}vBCYTB7d2Ol`oY1aq3x at 2AH2r0?;*_YABL$)gth4se|y&p}7j%6iMA^071ol > zLp}8Jea%Iax30okFI=AXt58o}!>I@>w(Pk;wl%fZ8>vP$4bBJ+R8%PzKGk#0ANM?e > z2f&NIj!GlL^qyb)Yg0>E$gRe{ifc7LI<2)1esjLv0e`d?zabCv at T(~Txs at UN8M3P& > ztfRrh$`{H3>v$&tx)(q(1KZ0`*z%?fJ9brM6Vy6n*t{Fdef1{I;?i%@+tv4qS z)Y#1Hxkr935nln`{A7~O+ii!5nYN$Y0T=;`OFK+W&sGH=sQYGe0H_X+NZN;>DoSq` > z0cgGNoqvQv2pr4AbtO#+NmIh&ZGS63ONHyYaML2xA^0hmvXJ>0Sz<{O$1!o0iE=HJ > zd&~{zml_R1>{md;-Vexs0a>aD&XOj|Hc-mMRTc>)ah!O}5#SO(QvkgOyKA5`pqloL > zc05zVz_tyPk|bOUr6jf^`IFf at Cj8(q0Vr>Q-hTiK;9S7SgFCi?>qwN^|GAP}wt$;B > zZrK4S0-IpuVte+&1uwu)qiyvZtv3kY1=2tnh(9c at -#E`eUpMJ=v8ordoCiZq1?Ots > zOoR{&cGPOJN_}tc;@-#@&6h6va~nT@@pOEY*}3SyT3z^2rM1={mX~=l{&=0reqMht > t at +h$7N_#tmdiF%`WR2?VUY*Y_{4dRk-6#cp%B27R002ovPDHLkV1gShas~hZ > > diff --git a/src/public/images/icon_dashboard.gif b/src/public/ > images/icon_dashboard.gif > deleted file mode 100644 > index > 5ed7483685461cb65f00718a83b207af6187b545 > ..0000000000000000000000000000000000000000 > GIT binary patch > literal 0 > HcmV?d00001 > > literal 14152 > zcmeI3X;>3S9EVq{6|q7vZPki(iL{E6Y%Y#$2{&j}yr7Clku}*sB$r7r0kuW2#e-V# > z1QkJz7V!!dkBW+kC zJkVW0j6g;r%?Q$EX`Rh&olje-tK)HVM?+IbeN)H7XYKc&wBLKue)~~dRYO~4eOtv} > zZRHQ1U%S^@QrlW|yX9ha%Y{E%OqDIi${LMV8;n=#5C8n|VDbG!#ShX-yHblgvkLDX > zD7?G%a{HE|w#`M)_Z8G`ywtMk(sP5kCZ(V$rJy<4+?1JL`JL%m)4`Oa{3l8IPt)^$ > zN4k(Tc at 1f&ZX}-mJMnaVd~RL*@%wSPbt{auD~+`)j@({;q~_^nP0YcnW!aUw?8 at i^ > zx1zIdY4%ktHQZ3`Em!QhF3Tv>r<<3gUyIy%RhxS5 at mF)m)DrQwV$qhOMH?@Mr4-Cd > zI*-Sm#A8kf^v97j#7&p$wk+3m*)f;sV|;B+QaH&|8 at Z~(Y~^9L;t-}d#FA%M2GW^P > z2W|z at oujgxmt>U(&?^Gy*Zt{TJf2g;{_zsS72jdwNCP72D)AZSD9XI(W#>p_T=29T > z8=m11mX3z)I486_BeeT?;r0_aZS?%KQK8#%1hk{>wj<|k$#%2Na z9Ggwp(2dy8QiN)y)b?2Ju)Q4v4qZb+gJz=sgqEQ09$tDCA&Mfk=wdQLst__B<>fO_ > zsaVLE>k`BcQu&dQ(#f%EGB|d6h$uEnBoH&aJgq(SxL&T3lUf4R%Vi1;t`{;0v2rnq > zQ_q%ejDfyDv{6EakL3kwnbS|HCQ&|%!xXW3e3b9X;<|AKZm!N~Frh`K5DJv*hH}|# > z>W7PSI5?k!_B4j4HTC477EAEi{((JnQvZaENUc_dW0+2-W9fJ-r8)xR2m}I*&BeG} > zCPgqcF$yiAXDT#fy9aqWjz6gpsii8dRH;BM;}VON(OMycVVS76^(>B1^-iSFuwE>b > zB~r>UJ)y!lEH>6VGF9k7b>e<%lF%yEAxfppvwQi0QZ=bls-rZhUog+ZQu!LxH)~%# > zNo^77N%?SRviZ~%!sXyR7o5wT|4Mx~^hSA*QY at 9kyk71e!m-ri9JikGSD>D956mLs > z6)`WYTh{bO|NjXSi+X*jqSdk&+aeZWq>Pl43ay56#(CYDScFTIYB{0xl*)++5{r;Z > zJg~mb|NOr0ucl%_#S-hy<;zd+-O9J}(C7WF4BtH{oCHWN)CF|`832M|x}Yu~13)lL > z7t{r000 at TZg1UeV0KqU_P#2H^AQ+|#>H;zV1jBSeT|fqaV3;nb3&;Qv4ATX50T}>- > zVY;9$AOk=!Oc&GzWB>?;>4Lg|3;@9}T~HU00U#Kr3+e(g00hHyL0v!wfMA#|s0+vd > z5De1=bpaUwf?>L#E+7LyFiaQJ1!MpS{?Bw-_nq`071Z$#9d(YQUsq>Gd)xEYmgc5^ > zo;`i?xbaa#{ofD&dT_t)-rYO3w`;1a{;d4t*6%kfZj}Fa{nxTzu3f$Ib7 at KO<)Xq% > z7Yi zEt at xOOiBKJ!*@yR*R5TX`0Y2V6XI9Jef`zS70Y8|^txryT8( zw3rBA6!zu91 at q^H&Ykl`Nbu}gGiOW>nl^RH=aVM|2Kf8=`gnVJ3Ox{9;O^$?!sl^0 > zY>dTpo;bm2{J2j)aU9EVK*xMM+J4kWBS#GX at Pqg1!|Z6bHbdVVVm;Vu(7OW%ywkrQ > zf;hAe=r;&ik2qV-+E@;VAy!?;@WJ+zjhUtdEBb_mMMlEciMB5^XHUTT;h3cK)Y9NV > zh_4gkyUyOJY(rs!T~2t7d0=TOM^;gqwztk;as=EcICQl4I>)8vLW$1=flqSi > ze(ahO%GPlx} > z43nQV`X^QKrPX(C#wQP1du9P|4Pn}wQ|o1wXYgJakWj^os4g z$^G9OA4wx2K{A-WVS5u-egYziDN7 > u^C;`Y%t=am91=g!1`QeEZAf>t$Cr0nG5oFUViFr`OEPBUdz#{q&;A8^{IuTy > > diff --git a/src/public/images/icon_dashboard.png b/src/public/ > images/icon_dashboard.png > new file mode 100644 > index > 0000000000000000000000000000000000000000 > ..57b933a8c84d500928f44a6156e4afdcb6dcf190 > GIT binary patch > literal 4457 > zcmeAS at N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fk|nMYCBgY=CFO}lsSJ)O`AMk? > zp1FzXsX?iUDV2pMQ*D5n9Wp~AN+NuHtdjF{^%6m9^eS=-fVvqNZ0suv5|gu2OB9k) > z(=+pImEP~(ucVNfVyhHx>TBRz;GCL~=}}db8eHWUl3bOYY?-2DZ^va*VFffGH?<^D > zp&~aYuh^=>Rtapb6_5=Q)>l#hD=EpgRf0Gw!Z$#{Ilm}X!9>qU&qz1fz|2^|)L75h > z)X2=pL`T8Mz`#P^z+B(hK-bX1%D~jh#83eWlHCStb$zJpw z`sL;2dgaD?`9*7iAWdWaj57 > zfXqxx$}cUkRZ;@VD?klTNrszUP+F7&HaR6(KQ$*cH#M)MSl>|3P#;-6FeHL9(=$qn > z;o96Z~cnI0-zQH{UWd$6rBYb`6c zuad!zEiOsXM^*vW4vr^??QjQM`6d=+rvl^JEitD!6>I at QE<80UxFoRz>}hBK!5w7f > zSXz>iUsN2BUz`aFN}xO_gcWR3lC2>A1al!l?wC^o;X$}LnV at jC%1O*iw^gdpO-W5l > zEX^rV(ueBM2gM3Zi;X_2fgtmfi&7Iy@{5ox2u>|TwE)E|m at L>VWX&MMN-|4wQjv^; > zSqx1rB)b)1o(&=-LyLj=F(kDpx0qTs;WXO at Io_?DAwlJw56lP2C7yX{`QT)ZswUGh > zrO36SBr&B3mJKlFoij at +amxk)OAc at vz+rkoa()UhnL-jU7Q;)5a2XzwniHO11S~_a > z>UGUc%)}=jS_G2?CkPvG(n2Z#fUyA)0~Rd6GEE;|s6kT`wEUqJ1r9A*84fdd)Dl=o > z5Jis$7g50kQ#2Y}u#g~%9t|#{f(fQ*G`L_PK@>e2Tto#EOcB1|;zD$bQuBcA<8ol9 > zr{$vbQw9d+{hlt4Ar-gggy!Z1hf37tz0bWKC!rl2!=59n)zW{$>5f57*T>r%BsqU` > zaJ5PPJ@~`X$zj0}9mXjdAGq)IXiSu!tf+I?Ysw at CGmahyh0`iE9n9M;qRh5$D&79} > zuhpFD+tr!n;m!NbPM$aKd+q$s^S(cxqS$gk;Qgad+N+exH9x*M_{el0!@PjHyB}ty > zo}c!sxwx;o at Zp&zuJCowL((6I+sFUjm$&n%b9XbF^Q3^ztW^?i7Z(=ye$$@!?x at fD > zj&s&`Q)LfkL_Y7Yo+WDd&-df2T*gJ4jjReE at ia~0PVbA at ELrBm@>rsM=Xucui z?owM@@a);#S2mlTR~&zM{(eBH=qj%T8d|Kq5rM~5(t?U at -d@crTDDQ{?RU0<-$mMw > z{u|VV>)L?`J+; > zRH4w3 at m|WIdI76hqCl5HONLIH_1 at Ya#WR{EB(Lz#2>zSdpmH**_VjTzy_%g(C0lB^ > zt&cZu-CS@(_64td;lF-?bMtN3+$0)gDm!LK9KM?%QO;_;#N!cL?f&`3yH7a9Y)Dbv > zc`Js$Pbm9A?4FgcdAT!o%O1KZ+?$~ErD3AMqeUI>{w01nVd>~8@#+5lC;yKq_-W76 > z(Vn2fxrr^(E5!Ea$@1L+ru#YO=iX{aeZRi_(LAnc^BWE=-)#6_^WtHv&8Ib6FX!Cd > zvTgzEwT`cLu8aKLz3ck8r!I}tsjCydmDl>g`?2E z>dbaFkUAG-?I+j0=+#oCH|uV z-EG^x<=5tS%|5=0_57tewVCWLfg&Gl{5xG`-CDl6dJEjz8NB_c(iZ8JSIrmvOjDWG > z`tb4RQ`Z+h-EKDH?EEvu_t(W zpQpFamD<>1dr z%O?A}h97#rrA7AH2JwNm5Ox5*g68{BH``7$Eeb)5H > zhD|)}dPNH6zXF3Fo7H~yy65~PEkP>w-e#VTnUkKB*F9~Fcz5Zm at 5Ohgp9bw%UX^_J > z-esxAwaX>5uRn{pG-G4M%p+9?_FbNLNz~%cWc$Vay#F1I z at 8Yd#yb|Z)6iQ+%T%|L;Klc1z`(N>#N|KbxId>)=hP*xbDT^k0%m593c)I$ztaD0e > F0su%bp+W!v > > literal 0 > HcmV?d00001 > > diff --git a/src/public/images/icon_hdwarepool.png b/src/public/ > images/icon_hdwarepool.png > index > 76e0a288ebacf3ff615763f12bb2b3f53a27abc4 > ..1e55305f45e55b87d0733c504a325aa52b7eb71f 100644 > GIT binary patch > literal 4509 > zcmeAS at N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fk|nMYCBgY=CFO}lsSJ)O`AMk? > zp1FzXsX?iUDV2pMQ*D5n9Wp~AN+NuHtdjF{^%6m9^eS=-fVvqNZ0suv5|gu2OB9k) > z(=+pImEP~(ucVNfVyhHx>TBRz;GCL~=}}db8eHWUl3bOYY?-2DZ^va*VFffGH?<^D > zp&~aYuh^=>Rtapb6_5=Q)>l#hD=EpgRf0Gw!Z$#{Ilm}X!9>qU&qz1fz|2^|)L75h > z)X2=pL`T8Mz`#P^z+B(hK-bX1%D~jh#83eWlHCStb$zJpw z`sL;2dgaD?`9*7iAWdWaj57 > zfXqxx$}cUkRZ;@VD?klTNrszUP+F7&HaR6(KQ$*cH#M)MSl>|3P#;-6FeHL9(=$qn > z;o96Z~cnI0-zQH{UWd$6rBYb`6c zuad!zEiOsXM^*vW4vr^??QjQM`6d=+rvl^JEitD!6>I at QE<80UxFoRz>}hBK!5w7f > zSXz>iUsN2BUz`aFN}xO_gcWR3lC2>A1al!l?wC^o;X$}LnV at jC%1O*iw^gdpO-W5l > zEX^rV(ueBM2gM3Zi;X_2fgtmfi&7Iy@{5ox2u>|TwE)E|m at L>VWX&MMN-|4wQjv^; > zSqx1rB)b)1o(&=-LyLj=F(kDpx0qTs;WXO at Io_?DAwlJw56lP2C7yX{`QT)ZswUGh > zrO36SBr&B3mJKlFoij at +amxk)OAc at vz+rkoa()UhnL-jU7Q;)5a2XzwniHO11S~_a > z>UGUc%)}=jS_G2?CkPvG(n2Z#fUyA)0~Rd6GEE;|s6kT`wEUqJ1r9A*84fdd)Dl=o > z5Jis$7g50kQ#2Y}u#g~%9t|#{f(fQ*G`L_PK@>e2Tto#EOcB1|;zD$bQuBcA<8ol9 > zr{$vbQw9d+&z>%hAr-f#OnvJg9V&Bte{TN#Mx%^w)>FHh(tur(*|R^g>Npz37z-zT > zS!yV?xbyv-$F21T=LyxOK638K7mrnPR`28R?pc={JTp3`Ano z=Tel{$!DH*me036uQ~Vq``+h&)~yWDI+$YAxHa~-d)o@>>~E}UpB`!bKYQ^~TTInY > z3*Phh`_9E2aW*-(rh&6+i|K{pO zf6oWE1 at -6C`|bY9#FR14%A3-BU{~Oyg(BP at al2c-yq%r at t?J7D%)gvnB1d1&l-E0V > zwfU^{6l(X*~qBrp8t^R0sc7E;Ot>xcjJNL*WKAw1SVX?^J > ztslA`U7EPP at 00utuQW&3txgA at 8C*SDBC~V#{e}fMu1c?SS{KuoRP;*QY)+D7%#3-n > zg>Otgn&s+v^}!}i8`i~X>D-#vR))V z-YNAaGSXMcx_+DDmTkTL{o%)B3Qu167_x%7c>moNhd3+QvUT%vRnlCaEQ(Klbc4OX > zd}|)}+n4VSojKD#`(WF$g-0_FKV)v+A-BK%=uy{{V9yNKnPx=?eT$tI+U;|grsDDQ > zkJyVZUszx43S(b3eX5XZ%b&Fsb>#xpzpWN#S$&V4(mmsEirmH!&)^ > zxz8 at V-)HN8GxNe$D}!vm*`ncjf0>ux<=UO_ at LpO`rOG9x|MpUUSzqrg<*_mBIM}GZ > z+Dl#iyrc4hWvgtqHOv& z(OEyq_sjx^Z7X zWnQBx>#9YccwZgdyhwlKU)6%b1Y#mPkQ)$^@JC!Wu>Ll#7_xrcX+xm > zhw;CQdESb0;#tz5XR-F-sjX@}rb6ZYujJ4kEW8UOzL=f&#wwryLT > z7KVHkiY>RgJx`2(O-b}iwh2iyMJ9`$NnUy`S*vw^@b<@-Lq4UX|2MvI^J1UabmqvN > z4c4bK?Ix}? zuWsjmb7fQUsRQY^&INJm{$tmB^0V`ThIQmw!z;V5z6$% zjH8KR{d(Tz{xa%It-9Fu_p(Rku3LMYKZ|{3mT&FHr^h{(zb_1U>T39P>jmGhKODQV > zr)*C8C+FIdD)5f?;o*M2+{V0L&;HI2+w91Gbfeq+W%aBQ3 at 0+2XYc*}Qvoz!;_2$= > Jvd$@?2>^%N$yfjY > > literal 1179 > zcmV;M1Z4Y(P) zddbVG7wVRUJ4ZXi@?ZDjy7FEKbT > zFgP18k2C-P0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q!|*>Mgsr<1N2Em > zK~y-6m6hFZlT{qYKTrGgbz?8kZf@;LX_4S$8U=$ylR;b-rbZKPyfHzdF(G; zMXpVJiSf#WAc=E|U?VIcNF9h%K$wiJ+h7~*+`6 at W+UK0-JYKXb9Z1k$^1D2re7@)9 > zcQh)sZfj3B(6=hscEHHa0pM*|O)fL at 0dQ z`S~1ndlDVEaHZ;vGtAKe$YZfno0ZJnDxd+ at Ps_&qw(Qsq_(OW9b;#w- zu`92|8^tK_AutOZN}L!xRSR at Bhhy)@xAn$bn;WnJ+pcK z_uf#XBf8=0$mLgJ@#vOVJUV at SG&R0#Xut6KJ^-XrD5a{Frlqj$vSleVLGJuF?Ag7S > zb at 5o$=-e+!`Uj2x3;>6;^-uTN&%FEwez#tYx(u|Gjb+;y=}8ucj@|{Ut!1#o;nXRb > z5@{(kO~c`ER9n+D%(}W1>NJt=k-)=vx`}B$*(!E|2^vJ > zo9+pVghM0}Kb3(>N*a7_o_n&3ixamP85v=5b_!W4pnLq(0nzAs01Ej$dBeC1cKrB{ > zSeC2+m0~uVC)(1)QyV+jvc4T5Es8>tEtEL<$q=d3IKe;=fM6g1Ksu8l5)SeGcgK*H > z#F7;tfY0sX+_jtdJT5%C6HU{Y&lyZ+vH&ELKeLouV$;K2bZvU1YS!QXEmBIP5J(|z > z0~>s9HiiORoB5kRQ`5|){-Tu2;&glP1HnKGUaz0w;a|CU=@0sLKFdOOo}ytOgg{Dx > z5H*I&kvGTM*c53&Jn>LX zBQNBOOr#e8= zeO*1 zK$w+197`rX2bw>fojTaw`8aD^*U;eivREiGK9d1J2!XN{FHS$tK==ogQh2 at YvY{;7 > zRj$n?9iTGjhGs{G`zE6s4rFI0v2B~W<{$w;S`uX|4zE6nSt{KI77e5nNFgbR9Kf6U > z@{O-d*dvWdQ6*oESXi_}9m|vUc z92xlH%a6%qZedBQdH`mrv;qd;ydUlQXlnfWXzHt2JUV!F tD_~IhQ~po&^mcCt-U3>I{dax={{T7tRKXhk?-u|7002ovPDHLkV1iS09jpKV > > diff --git a/src/public/images/icon_networks.png b/src/public/images/ > icon_networks.png > new file mode 100644 > index > 0000000000000000000000000000000000000000 > ..a2a2b878e8c3d6b8bfc93bad0991cccfad7a3985 > GIT binary patch > literal 4223 > zcmeAS at N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fk|nMYCBgY=CFO}lsSJ)O`AMk? > zp1FzXsX?iUDV2pMQ*D5n9Wp~AN+NuHtdjF{^%6m9^eS=-fVvqNZ0suv5|gu2OB9k) > z(=+pImEP~(ucVNfVyhHx>TBRz;GCL~=}}db8eHWUl3bOYY?-2DZ^va*VFffGH?<^D > zp&~aYuh^=>Rtapb6_5=Q)>l#hD=EpgRf0Gw!Z$#{Ilm}X!9>qU&qz1fz|2^|)L75h > z)X2=pL`T8Mz`#P^z+B(hK-bX1%D~jh#83eWlHCStb$zJpw z`sL;2dgaD?`9*7iAWdWaj57 > zfXqxx$}cUkRZ;@VD?klTNrszUP+F7&HaR6(KQ$*cH#M)MSl>|3P#;-6FeHL9(=$qn > z;o96Z~cnI0-zQH{UWd$6rBYb`6c zuad!zEiOsXM^*vW4vr^??QjQM`6d=+rvl^JEitD!6>I at QE<80UxFoRz>}hBK!5w7f > zSXz>iUsN2BUz`aFN}xO_gcWR3lC2>A1al!l?wC^o;X$}LnV at jC%1O*iw^gdpO-W5l > zEX^rV(ueBM2gM3Zi;X_2fgtmfi&7Iy@{5ox2u>|TwE)E|m at L>VWX&MMN-|4wQjv^; > zSqx1rB)b)1o(&=-LyLj=F(kDpx0qTs;WXO at Io_?DAwlJw56lP2C7yX{`QT)ZswUGh > zrO36SBr&B3mJKlFoij at +amxk)OAc at vz+rkoa()UhnL-jU7Q;)5a2XzwniHO11S~_a > z>UGUc%)}=jS_G2?CkPvG(n2Z#fUyA)0~Rd6GEE;|s6kT`wEUqJ1r9A*84fdd)Dl=o > z5Jis$7g50kQ#2Y}u#g~%9t|#{f(fQ*G`L_PK@>e2Tto#EOcB1|;zD$bQuBcA<8ol9 > zr{$vbQw9d6tDY{7Ar-f_OpWyjPLw$Q|8nlBeWzY7JJ;KyVdAlfce#*Psj`-9z+IP; > z#DoBrS>lZ)qH!e?IUQ4l?v?~za19W5yVB~CxlmEX*g0qZwJR&r^U|&5*FE3U;ga(- > z@=IU)_osWF|D5~(bN%_sWhYaNe#kq2Hvh18HnY{NF3rBk+;8q1kG`;svVXnr(&4|_ > zKTLf6Ik;xu?K_$w!ot3EE{oZ`?_a)g-Tbu0GQrd&cFB$<469ek7|c48vwq1EmOZCi > z6AXTs>=Kx{z z zeh7B2RdC+VyUInRsF}N{@%`Ps&Hj at o3%CkatrhF;_U6&bXSy8Hs=@h6MB5-gS=i~J > zz_H`UFI>CUSDG=@MoPE at u6Uzq*S+Y#gH>w+ > zg!bHHt6Iub at wJG>@RRw}XD7?$YK%Hn&MO~O-?(erBEOGXjao8%- at 2|&O4 at w#NJCT5 > zz8Ps at oIfKJ17_OHKjfFKSz;yI!=|k1lk-b!LoMq%-771Z)jj6woIH_X^ycw{M^-^| > z5(1V at +w;xWH`#L6A2(5p2j3q*ZvWWZEXQxn>^W_M&nFh&Q3tJSuNyjEE)w<^o& > zs^9dfcK1K8i#;cO+<#8f at _llLzvn9($U9g_?DWb!T>S56#J#&`BjW;d? zo1cUIuY`omm7L}B;(s!YzdZhJe*aC5zxV0H9e3RmOr$<%f4TnaS6fC={;_KrrRNeX > z^%h@=>6jRB_C3$iQooq@@86%QtVll>S8)8Xr at PX`Tf3e~Sa$90WpB7Ed*BZD4LN?r > zOTT_y-%{GuYOj at NcV$ZG$L442qhFu9Xd5ZozpwWC(pT#>?|%$#U}R|Tp2W38b*c(z > ONWjz8&t;ucLK6U}aTiAb > > literal 0 > HcmV?d00001 > > diff --git a/src/public/images/icon_smartpool.png b/src/public/ > images/icon_smartpool.png > index 4ed0af0d2f2da5b34d13491ebe06f64a9450b5ec.. > 3a6688a7e0fb1e3dd1b4e177cc63c2c5296f1f0d 100644 > GIT binary patch > literal 4233 > zcmeAS at N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fk|nMYCBgY=CFO}lsSJ)O`AMk? > zp1FzXsX?iUDV2pMQ*D5n9Wp~AN+NuHtdjF{^%6m9^eS=-fVvqNZ0suv5|gu2OB9k) > z(=+pImEP~(ucVNfVyhHx>TBRz;GCL~=}}db8eHWUl3bOYY?-2DZ^va*VFffGH?<^D > zp&~aYuh^=>Rtapb6_5=Q)>l#hD=EpgRf0Gw!Z$#{Ilm}X!9>qU&qz1fz|2^|)L75h > z)X2=pL`T8Mz`#P^z+B(hK-bX1%D~jh#83eWlHCStb$zJpw z`sL;2dgaD?`9*7iAWdWaj57 > zfXqxx$}cUkRZ;@VD?klTNrszUP+F7&HaR6(KQ$*cH#M)MSl>|3P#;-6FeHL9(=$qn > z;o96Z~cnI0-zQH{UWd$6rBYb`6c zuad!zEiOsXM^*vW4vr^??QjQM`6d=+rvl^JEitD!6>I at QE<80UxFoRz>}hBK!5w7f > zSXz>iUsN2BUz`aFN}xO_gcWR3lC2>A1al!l?wC^o;X$}LnV at jC%1O*iw^gdpO-W5l > zEX^rV(ueBM2gM3Zi;X_2fgtmfi&7Iy@{5ox2u>|TwE)E|m at L>VWX&MMN-|4wQjv^; > zSqx1rB)b)1o(&=-LyLj=F(kDpx0qTs;WXO at Io_?DAwlJw56lP2C7yX{`QT)ZswUGh > zrO36SBr&B3mJKlFoij at +amxk)OAc at vz+rkoa()UhnL-jU7Q;)5a2XzwniHO11S~_a > z>UGUc%)}=jS_G2?CkPvG(n2Z#fUyA)0~Rd6GEE;|s6kT`wEUqJ1r9A*84fdd)Dl=o > z5Jis$7g50kQ#2Y}u#g~%9t|#{f(fQ*G`L_PK@>e2Tto#EOcB1|;zD$bQuBcA<8ol9 > zr{$vbQw9d6`<^b2Ar-gQO!4&y36yBN|J!=;V&lHFvnx^qtUQfo?kI3+Ibp_nOFlP8 > z*hTta(Pgc!O-dQT-PZ)yDrp$3a80|Rbc;i5QHYo8 zV3vP==l!1VmhXRxT0Gwn^lRNz(csYARh5r=MfYZiYTcH-xM zar4T z*_v(gIm_gqmcC6}mu-B&eS4TZQ~zG3?tN{W7jZ7qxH>Vr^suSgMb%YSnsX%onz?Uu > z-?TG(LA at l4Me~YUr^>gCHUBSccln)LOBzIXo`v+DkoUaw6% > z6*^>e?r=Xoe)x;X-LnGQw=(ugNpzl&vb}8Dvu8(NM8Otc1O1Md7Uy>^UH ziHFbkAM0;aU;f|dx)VoP{w;@0?H!vro&9$iic9U^{ix#WGr>P%q3Nq%@lUH*&780> > z{lUkL^?Lgfv|AtCYQM=Ushpn~R`trz(SPlizm-cl_qDHb*9+gbKWn=9stpVhpKq=V > zV&u8lyZ*ishx;=hc5}|E|KAtfyvHS#;1IfGTGV`YGndTEJ*861Dh&S^w(OWDqms~k > zb#}Rrc|?d&P=b!@{75-1x%LU??w@`tQ*QY=g`-NwW@)g*1FOUm!@Fk6J2|#H8*P1F > z#5lj?=E;yCWr^ie12)W z9{-mYN;}yeZ0OcpA at pX8darboXNgt(!%c^#Ez~XSX({zN_gV4Nw%KMYZKgeV-{#Er > zOvq&Ml~1c)e-4u=-xbRI&^5tC&GB;Ua+W*(hIwT{vL1$ae%L7cu|IbeIkjtM-ZrLp > z^De2dJpQEcI79WqM<2$gXSN>|zqTaq(#)0Cul;%FK0dSH`(ndrJMpzYIUd$??L0s0 > czvcmkFT1KLwrfdW1`Q5)y85}Sb4q9e00%B0H2?qr > > literal 641 > zcmV-{0)G98P) z=>Px#32;bRa{vGe>i_@>>j8p`4O##I0wzgBK~yNuZIDYylwlNxpYI#zqK at T2S=JyC > z*&>E6I%yZEa3L*)iWaScHm%y#Sj12vM9^iELAzSCYGDjC>WH_Ll*&tLv#6;-Yf=*( > zLq~sS=07cl{z>v(edpsn?|FFPUrEF#`N at p zXWrl1=*kUkH{2rM&r55dNVKW#5S_qN>OgCO?qQ8bXY*%b6TKMABl7yX+X_>W+dJjd > z*#@*RiZ;R2Aa*aK{hv_)UHA6OiHbRtXp~Y6$A425SX5T*=MN#m*9wJ=6mE2hu{ z at jmNMwFkFJ)<{x!wGGEoGp)_9P`ZGv)t8kTdg_;h$1A~@vNp1=1N6KM<$wn7mdfF3 > zFQ5UFj=o>i- zTZvLOW at A&Fyz*v4-#T?Ys*z~RIWboUM2ta+ww#gP$94a8qr#0YscHzYx#B2xS2=pq > z9{AY=O9LQ+xQ`&^H<9HpWKszhC*Lw0dVu;i65(s;k~nQi{Ks}-x7+fmN+FUvmPrfm > z`s1WBPU?fx%3|+(QZJ6=d;I%6>lQ(il?+3llCb?WH5XqfAlDo~YI=;a;xx=Hu(FnA > ze0B{0UzvkKhmBHOn)qa=6{`O}igp}Qv4t#=AB9Z%9;({limDB+sD%Hy>P!?7TS%jw > bB^KcyJ~ZgpH4FC800000NkvXXu0mjf6L=r` > > diff --git a/src/public/images/icon_smartpools.png b/src/public/ > images/icon_smartpools.png > new file mode 100644 > index > 0000000000000000000000000000000000000000 > ..8dc3aa10ad4720ed1f4a25090ace122183ce8362 > GIT binary patch > literal 4117 > zcmeAS at N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fk|nMYCBgY=CFO}lsSJ)O`AMk? > zp1FzXsX?iUDV2pMQ*D5n9Wp~AN+NuHtdjF{^%6m9^eS=-fVvqNZ0suv5|gu2OB9k) > z(=+pImEP~(ucVNfVyhHx>TBRz;GCL~=}}db8eHWUl3bOYY?-2DZ^va*VFffGH?<^D > zp&~aYuh^=>Rtapb6_5=Q)>l#hD=EpgRf0Gw!Z$#{Ilm}X!9>qU&qz1fz|2^|)L75h > z)X2=pL`T8Mz`#P^z+B(hK-bX1%D~jh#83eWlHCStb$zJpw z`sL;2dgaD?`9*7iAWdWaj57 > zfXqxx$}cUkRZ;@VD?klTNrszUP+F7&HaR6(KQ$*cH#M)MSl>|3P#;-6FeHL9(=$qn > z;o96Z~cnI0-zQH{UWd$6rBYb`6c zuad!zEiOsXM^*vW4vr^??QjQM`6d=+rvl^JEitD!6>I at QE<80UxFoRz>}hBK!5w7f > zSXz>iUsN2BUz`aFN}xO_gcWR3lC2>A1al!l?wC^o;X$}LnV at jC%1O*iw^gdpO-W5l > zEX^rV(ueBM2gM3Zi;X_2fgtmfi&7Iy@{5ox2u>|TwE)E|m at L>VWX&MMN-|4wQjv^; > zSqx1rB)b)1o(&=-LyLj=F(kDpx0qTs;WXO at Io_?DAwlJw56lP2C7yX{`QT)ZswUGh > zrO36SBr&B3mJKlFoij at +amxk)OAc at vz+rkoa()UhnL-jU7Q;)5a2XzwniHO11S~_a > z>UGUc%)}=jS_G2?CkPvG(n2Z#fUyA)0~Rd6GEE;|s6kT`wEUqJ1r9A*84fdd)Dl=o > z5Jis$7g50kQ#2Y}u#g~%9t|#{f(fQ*G`L_PK@>e2Tto#EOcB1|;zD$bQuBcA<8ol9 > zr{$vbQw9d6Y)==*kcwMdruh2^2MQe9f7eX)lGru2SrQ@{+9q*RG~AlalX>KJBqUvG > zzPQ`%u&l4vJ=?-B2}z6CO^$T4^e-y9;Fh(9v71q8%C?YOTS~U4{=QauJ51~4e9 at Fi > zC(q3`|NZvK_j`RGj at 7gL-st`P`l at HHG80UNO z{;%G!^V~hlmp5ANKmMH9y2^EC$+CqXG&Ata8-z>go$<@5HR`@4N > z?VHrK>sl_AO22)x+vb{1=?l- zI;~>oJ2$S|Y at T?oePOEjfv`Ad-+IkDThX?&uNwEB?mh8GCx-d at sY7#WV;?@a > zmR9oT?&H_n{djl|UOaT*QR7 at KRR-Snjgp> z3DG|!wH?mQoWSj?ym#r7&h1P2epfnu-Y}_fsq5aklY+CtHp~i8EQ at Io{B~#4$ z^Y$G-S{`rSu5lpKcy&T0TcEJxo5YsAS(beVj&#(;U48dawt6yyu6nZOQGxRrCW(vI > z9=Ug`qxQvK`Ie$NyLiKdzeTk$Ilboba{S at q`q#!&roJUjE%x2JvMD#k|3_;tTFB3# > zfAsK{Pr-jLNA2IDuh)Iv^9$F}zfV>6KDgGfWM*!&rct7i=-edXrzfJcT(i$|$^Q&V > zZL)gyW~tF{m!QjYkJ}tS-+KK`s@(ex{kh6})~zXgZg~EqZCr8*hh*Y^L*3QsZ^U}P > zzxbOSmN6?Vcx_S9#1qC KxvX > literal 0 > HcmV?d00001 > > diff --git a/src/public/images/icon_smartpools_dir.png b/src/public/ > images/icon_smartpools_dir.png > new file mode 100644 > index > 0000000000000000000000000000000000000000 > ..408aabc8f0cf0a74a30f58e1cd1d495011a71d7f > GIT binary patch > literal 4228 > zcmeAS at N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fk|nMYCBgY=CFO}lsSJ)O`AMk? > zp1FzXsX?iUDV2pMQ*D5n9Wp~AN+NuHtdjF{^%6m9^eS=-fVvqNZ0suv5|gu2OB9k) > z(=+pImEP~(ucVNfVyhHx>TBRz;GCL~=}}db8eHWUl3bOYY?-2DZ^va*VFffGH?<^D > zp&~aYuh^=>Rtapb6_5=Q)>l#hD=EpgRf0Gw!Z$#{Ilm}X!9>qU&qz1fz|2^|)L75h > z)X2=pL`T8Mz`#P^z+B(hK-bX1%D~jh#83eWlHCStb$zJpw z`sL;2dgaD?`9*7iAWdWaj57 > zfXqxx$}cUkRZ;@VD?klTNrszUP+F7&HaR6(KQ$*cH#M)MSl>|3P#;-6FeHL9(=$qn > z;o96Z~cnI0-zQH{UWd$6rBYb`6c zuad!zEiOsXM^*vW4vr^??QjQM`6d=+rvl^JEitD!6>I at QE<80UxFoRz>}hBK!5w7f > zSXz>iUsN2BUz`aFN}xO_gcWR3lC2>A1al!l?wC^o;X$}LnV at jC%1O*iw^gdpO-W5l > zEX^rV(ueBM2gM3Zi;X_2fgtmfi&7Iy@{5ox2u>|TwE)E|m at L>VWX&MMN-|4wQjv^; > zSqx1rB)b)1o(&=-LyLj=F(kDpx0qTs;WXO at Io_?DAwlJw56lP2C7yX{`QT)ZswUGh > zrO36SBr&B3mJKlFoij at +amxk)OAc at vz+rkoa()UhnL-jU7Q;)5a2XzwniHO11S~_a > z>UGUc%)}=jS_G2?CkPvG(n2Z#fUyA)0~Rd6GEE;|s6kT`wEUqJ1r9A*84fdd)Dl=o > z5Jis$7g50kQ#2Y}u#g~%9t|#{f(fQ*G`L_PK@>e2Tto#EOcB1|;zD$bQuBcA<8ol9 > zr{$vbQw9d6Tb?eCAr-f_O!fB=36wd$KR<1bN%_^QF at _smx9bQpYie^@vAPOKmaJ$F > z36NFNS{Pi?+0=J+VY2J;CZ?_4f+ZSWygq at 6{L9vAzPoj5o!;(q>t4T^U1z-c^1D~> > zma)r!e*V4g{oeEMzt`=*KRa>OvP5I4+a?=Szu3Gxk-6}382 at b!gVTYsv(`T~j^J2x > z-zUD}SDN{U-$CzYt`mPzTa*?XP+LCj_ at s|#*nN8?+pb^C+mkp;G)`Ejqc!|YjGoQB > zkcJZ*6y20B^7J27vb9*Id$wZ9lb$bGl0TPe8$4B?dH7`vThit1oTUf} > zldp-p`o^XHV5GJvgSeJf_e`G|6F>SKEd8)*X4CoPg1qUOeCHYUCK=0~D!aqgt}*-X > zh47Zz;uS0GlS z;uo()H8#5Ymh+eP+Mnn!JiW1=EkE8qY}&Skd)8gOaBb^bC(otQw_?^`%(ts!-*`b~ > zQR94zYYZCQo4<4B9gXliEa6 at 0*MCH2)odAw*K&=k|0*px!eWvtQ}fIA%84108$Yn* > zEX}(S+Z*t7u0+-CrK|5RJrGoun>j_r&_z)wQF~q6;)8wp=dCW*{1DMPZSmtzKvnWb > z#i*ADn(TS}@7os4tMOVW5nJu>L& zYaEsLx3A$A9ZOWCn(>b6~bm^#-t98Z40d2x at YnCEge > zi?qKRLqi#@Y&pbiwpxXRKH6~AgXKv?fX{rHXv>^QT&D9Hbe8^2soNi4U9s)ke)$=9 > z^Q3P at pL(!P$Uykn49;2V>-Tv%)$VLKsc?MSH0=zVs at ZE_^C#7YtZ0b~o&KSCB8#)l > z$-021Z_B?lA6>NVyk7Qxk(+ UgMV2|)j{I|p00i_>zopr0BEclmjD0& > > literal 0 > HcmV?d00001 > > diff --git a/src/public/javascripts/ovirt.tree.js b/src/public/ > javascripts/ovirt.tree.js > index 13720b2..77d6c55 100644 > --- a/src/public/javascripts/ovirt.tree.js > +++ b/src/public/javascripts/ovirt.tree.js > @@ -8,26 +8,19 @@ function processTree (){ > $.each(response.deleted, function(name, value){ > //FIXME: special case for other peoples smart pools > //come up with better way or split out somewhere. > - if($('#' + value.id).hasClass('SmartPool')) { > - if($("#smart_nav_tree > li > div.SmartPool").size() > > 1) { > - $("#smart_nav_tree > li:first div").click(); > - } else { > - $('#nav_tree > li:first > div').click(); > + > + //check if the li is the only one. If so, remove its > container as well > + if ($('#' + value.id).parent("li").siblings().size() === > 0 ) { > + if($('#' + value.id).is(':visible')) { > + $('#' + > value.id).parent("li").parent("ul").siblings("div").click(); > } > + $('#' + value.id).parent("li").parent("ul").remove(); > } else { > - //check if the li is the only one. If so, remove its > container as well > - if ($('#' + value.id).parent("li").siblings().size() > === 0 ) { > - if($('#' + value.id).is(':visible')) { > - $('#' + > value.id).parent("li").parent("ul").siblings("div").click(); > - } > - $('#' + value.id).parent("li").parent("ul").remove(); > - } else { > - if($('#' + value.id).is(':visible')) { > - $('#' + value.id).parent() > - .siblings('li:first') > - .children('div') > - .click(); > - } > + if($('#' + value.id).is(':visible')) { > + $('#' + value.id).parent() > + .siblings('li:first') > + .children('div') > + .click(); > } > } > $('#' + value.id).parent().remove(); > @@ -35,12 +28,10 @@ function processTree (){ > > if(processRecursive) { > $("#nav_tree").html(recursiveTreeTempl.process({"pools" : > response.pools})); > - $ > ("#smart_nav_tree").html(recursiveTreeTempl.process({"pools" : > response.smart_pools})); > processRecursive = false; > } else { > // Loop through the items and decide if we need updated/ > new html for each item. > processChildren(response.pools, treeItemTempl); > - processChildren(response.smart_pools, treeItemTempl); > } > } > }); > @@ -64,16 +55,8 @@ function processChildren(list, templateObj){ > if ($('#' + data.parent_id).siblings('ul').size() > 0) { > $('#' + data.parent_id).siblings('ul').append(result); > } else { > - if (data.type === "SmartPool"){ //handle current user > smart pools > - if($('#smart_nav_tree > li:has(ul)').size() > 0) { > - $(result).insertBefore('#smart_nav_tree > > li:has(ul):first'); > - } else { > - $('#smart_nav_tree').append(result); > - } > - } else { > - $('#' + data.parent_id).parent().append('
    ' + result > + '
    '); > - $('#' + > data.parent_id).siblings('span').addClass('expanded'); > - } > + $('#' + data.parent_id).parent().append('
    ' + result + > '
    '); > + $('#' + > data.parent_id).siblings('span').addClass('expanded'); > } > } > else { > diff --git a/src/public/stylesheets/ovirt-tree/tree.css b/src/public/ > stylesheets/ovirt-tree/tree.css > index 7d5411f..de019f4 100644 > --- a/src/public/stylesheets/ovirt-tree/tree.css > +++ b/src/public/stylesheets/ovirt-tree/tree.css > @@ -1,12 +1,12 @@ > #nav_tree { > - padding: 20px; > + padding: 0px 20px; > } > > .nav-tree { > width: 222px; > position: absolute; > overflow: auto; > - top: 25px; > + top: 50px; > bottom: 140px; > } > > @@ -44,6 +44,15 @@ > background-image: url('../../images/icon_smartpool.png'); > } > > +.SmartPoolRoot { > + padding: 4px 0 4px 28px !important; > + background-image: url('../../images/icon_smartpools.png'); > +} > +.DirectoryPool { > + padding: 4px 0 4px 28px !important; > + background-image: url('../../images/icon_smartpools_dir.png'); > +} > + > .hitarea { > width: 16px; > margin-left: -16px; > @@ -81,11 +90,21 @@ > } > > .nav-dashboard { > - background-image: url('../../images/icon_dashboard.gif'); > + background-image: url('../../images/icon_dashboard.png'); > background-repeat: no-repeat; > background-position: left; > padding: 0px 0 0px 28px; > position: absolute; > height: 25px; > top: 0; > -} > \ No newline at end of file > +} > + > +.nav-networks { > + background-image: url('../../images/icon_networks.png'); > + background-repeat: no-repeat; > + background-position: left; > + padding: 0px 0 0px 28px; > + position: absolute; > + height: 25px; > + top: 25px; > +} > -- > 1.6.0.6 > > _______________________________________________ > Ovirt-devel mailing list > Ovirt-devel at redhat.com > https://www.redhat.com/mailman/listinfo/ovirt-devel -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: nav-before-after.png Type: image/png Size: 13437 bytes Desc: not available URL: From dpierce at redhat.com Mon Jan 19 21:17:51 2009 From: dpierce at redhat.com (Darryl L. Pierce) Date: Mon, 19 Jan 2009 16:17:51 -0500 Subject: [Ovirt-devel] [PATCH node] Replaced calls to echo with log so that we get datestamps in the log file In-Reply-To: <1232383579-4778-1-git-send-email-pmyers@redhat.com> References: <1232383579-4778-1-git-send-email-pmyers@redhat.com> Message-ID: <20090119211751.GP4036@mcpierce-laptop.rdu.redhat.com> On Mon, Jan 19, 2009 at 11:46:19AM -0500, Perry Myers wrote: > Also, swallow output from mount_config in ovirt-early so that it doesn't > confuse users into thinking that an error has occured. It's normal for > this function to error out in two cases: > 1. firstboot before /config partition is created > 2. stateless mode when there is no /config partition > > Signed-off-by: Perry Myers > --- ACK. Though it's odd to see a mixture of log entries and console captures in the logfile. Maybe we should redirect console captures to some other file? -- Darryl L. Pierce, Sr. Software Engineer @ Red Hat, Inc. Virtual Machine Management - http://www.ovirt.org/ "What do you care what other people think, Mr. Feynman?" -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 197 bytes Desc: not available URL: From jeremy.perry at redhat.com Mon Jan 19 21:25:12 2009 From: jeremy.perry at redhat.com (Jeremy Perry) Date: Mon, 19 Jan 2009 16:25:12 -0500 Subject: [Ovirt-devel] [PATCH] Updated tree nav layout to move smart pools above the main pools. In-Reply-To: <525BD232-1E07-48C7-975C-E7A0BB503155@redhat.com> References: <1232395792-28920-1-git-send-email-sseago@redhat.com> <525BD232-1E07-48C7-975C-E7A0BB503155@redhat.com> Message-ID: <4DF3AB72-0717-47DE-83BA-0B68572160EA@redhat.com> > Hi Scott - I'd like suggest the following 3 style tweaks to the nav > for the sake of alignment. This will make the non-tree nodes > (Dashboard and Networks) have the same spacing and alignment as the > tree parts. > Sorry - one addition and I will shut up on this topic for now. This change to tree.css (line 56) puts the + and - image in the right spot, centered vertically. .hitarea cursor: pointer; float: left; margin: 4px 0 0 -16px; width: 16px; } - Jeremy -------------- next part -------------- An HTML attachment was scrubbed... URL: From dpierce at redhat.com Mon Jan 19 21:43:31 2009 From: dpierce at redhat.com (Darryl L. Pierce) Date: Mon, 19 Jan 2009 16:43:31 -0500 Subject: [Ovirt-devel] [PATCH node] Removes a confusing storage message. Message-ID: <1232401411-11238-1-git-send-email-dpierce@redhat.com> If interactively configuring storage, the user is shown this message when configuration the data partition: Change data partition size. (Current -1 MB, Minimum 5 MB) This is confusing to read, and is misleading since the data partition size can be 0, indicating the user does not want a data partition. So the minimum size is set to 0. When the prompt is show, only those partitions that have a non-zero minimum size are displayed with such a message. Signed-off-by: Darryl L. Pierce --- scripts/ovirt-config-storage | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage index efe55f5..e85f040 100755 --- a/scripts/ovirt-config-storage +++ b/scripts/ovirt-config-storage @@ -26,7 +26,7 @@ boot_min_size=50 root_min_size=256 config_min_size=5 logging_min_size=5 -data_min_size=5 +data_min_size=0 swap_min_size=5 get_selected_drive_size() @@ -158,7 +158,9 @@ do_configure() eval "size=\$$size_var" min_size_var=${i}_min_size eval "min_size=\$$min_size_var" - read -ep "Change $i partition size. (Current $size MB, Minimum $min_size MB)? " + min_msg="" + if [ $min_size != 0 ]; then min_msg=", Minimum $min_size MB"; fi + read -ep "Change $i partition size. (Current $size MB$min_msg)? " r=$REPLY test -z "$r" && r=$size if [[ $r =~ ^-*[0-9]+$ ]] && [[ $r -ge $min_size || -- 1.6.0.6 From pmyers at redhat.com Mon Jan 19 21:53:51 2009 From: pmyers at redhat.com (Perry Myers) Date: Mon, 19 Jan 2009 16:53:51 -0500 Subject: [Ovirt-devel] [PATCH node] Removes a confusing storage message. In-Reply-To: <1232401411-11238-1-git-send-email-dpierce@redhat.com> References: <1232401411-11238-1-git-send-email-dpierce@redhat.com> Message-ID: <4974F66F.9080709@redhat.com> Darryl L. Pierce wrote: > If interactively configuring storage, the user is shown this message > when configuration the data partition: > > Change data partition size. (Current -1 MB, Minimum 5 MB) > > This is confusing to read, and is misleading since the data partition > size can be 0, indicating the user does not want a data partition. > > So the minimum size is set to 0. When the prompt is show, only those > partitions that have a non-zero minimum size are displayed with such a > message. nack Problem with this is that sizes of 1-4MB for partitions will fail because not enough space for the journal. So there is a difference between the 5MB minimum size and the 0 indicating that you don't want a partition. basically the logic is this. 0 - means you don't want a partition min - is smallest partition size you can select, for some partitions this is 5MB (partition minimum size) for others it's set to a logical value based on what we need to put into the partition -1 - use all remaining space, in this case /data still needs at least 5MB so the 5MB number is used for size calculations > Signed-off-by: Darryl L. Pierce > --- > scripts/ovirt-config-storage | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage > index efe55f5..e85f040 100755 > --- a/scripts/ovirt-config-storage > +++ b/scripts/ovirt-config-storage > @@ -26,7 +26,7 @@ boot_min_size=50 > root_min_size=256 > config_min_size=5 > logging_min_size=5 > -data_min_size=5 > +data_min_size=0 > swap_min_size=5 > > get_selected_drive_size() > @@ -158,7 +158,9 @@ do_configure() > eval "size=\$$size_var" > min_size_var=${i}_min_size > eval "min_size=\$$min_size_var" > - read -ep "Change $i partition size. (Current $size MB, Minimum $min_size MB)? " > + min_msg="" > + if [ $min_size != 0 ]; then min_msg=", Minimum $min_size MB"; fi > + read -ep "Change $i partition size. (Current $size MB$min_msg)? " > r=$REPLY > test -z "$r" && r=$size > if [[ $r =~ ^-*[0-9]+$ ]] && [[ $r -ge $min_size || -- |=- Red Hat, Engineering, Emerging Technologies, Boston -=| |=- Email: pmyers at redhat.com -=| |=- Office: +1 412 474 3552 Mobile: +1 703 362 9622 -=| |=- GnuPG: E65E4F3D 88F9 F1C9 C2F3 1303 01FE 817C C5D2 8B91 E65E 4F3D -=| From slinabery at redhat.com Mon Jan 19 22:24:56 2009 From: slinabery at redhat.com (Steve Linabery) Date: Mon, 19 Jan 2009 16:24:56 -0600 Subject: [Ovirt-devel] Re: [PATCH server] comprehensive / up to date validations patch (revised again) In-Reply-To: <1232050866-8057-1-git-send-email-mmorsi@redhat.com> References: <1232050866-8057-1-git-send-email-mmorsi@redhat.com> Message-ID: <20090119222455.GA15459@redhat.com> On Thu, Jan 15, 2009 at 03:21:06PM -0500, Mohammed Morsi wrote: > (revisions relate to small validation bugs in host, nic, task models > and host-browser module) > snip > > # Ensures that, if the VM does not contain the Cobbler prefix, that it > -- > 1.6.0.6 > Line 379, maybe say "MAC address" just for clarity's sake in output if it fails: + :message => 'A mac must be specified.' Typo at line 569: + (not lvm_storage_pool.nil? and not lvm_stoage_pool.movable?) and 606-607 should read "Task ends before it's started" (grammar police): + errors.add("time_ended", "Tasks ends before its started") unless time_ended.nil? or time_started.nil? or time_ended > time_started + errors.add("time_started", "Tasks starts before its created") unless time_started.nil? or created_at.nil? or time_started > created_at Inconsistent indentation in boot_type_test.rb...and elsewhere...(I told you it was minor nitpicky stuff :) So, conditional ACK, but as we discussed, a few times I found myself thinking "Well, that validation *seems* to make sense, but I don't know the model well enough to be 100% certain." But it works and all unit tests passed. --Steve From dpierce at redhat.com Mon Jan 19 22:32:05 2009 From: dpierce at redhat.com (Darryl L. Pierce) Date: Mon, 19 Jan 2009 17:32:05 -0500 Subject: [Ovirt-devel] [PATCH node] Fixed check for whether the network restarted. Message-ID: <1232404325-14127-1-git-send-email-dpierce@redhat.com> The last network interface touched by the script is checked to see if it has active ARP entries. If not then the restart is considered a failure even through the service itself restarted. Signed-off-by: Darryl L. Pierce --- scripts/ovirt-config-networking | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/ovirt-config-networking b/scripts/ovirt-config-networking index 5727c47..646b36d 100755 --- a/scripts/ovirt-config-networking +++ b/scripts/ovirt-config-networking @@ -17,6 +17,7 @@ trap '__st=$?; rm -rf "$WORKDIR"; stop_log; exit $__st' 0 trap 'exit $?' 1 2 13 15 CONFIG_FILE_ROOT="/files/etc/sysconfig/network-scripts/ifcfg" +CONFIGURED_IFACE="" function configure_interface { @@ -34,6 +35,8 @@ function configure_interface local IF_FILENAME="$WORKDIR/augtool-$NIC" local BR_FILENAME="$WORKDIR/augtool-$BRIDGE" + CONFIGURED_IFACE=$BRIDGE + printf "\nConfigure $BRIDGE for use by $NIC..\n\n" local IF_ROOT="$CONFIG_FILE_ROOT-$NIC" @@ -239,10 +242,12 @@ if ls "$WORKDIR"/augtool-* > /dev/null 2>&1 ; then cat "$WORKDIR"/augtool-* > $config \ && augtool $config \ && service network restart - if [ $? = 0 ]; then - log "Network configured successfully" - else + # check of rthe bridge's existence + net_check=$(arp -i $CONFIGURED_IFACE) + if [[ $net_check =~ "no match found" ]]; then log "Error configuring network, see $OVIRT_LOGFILE" + else + log "Network configured successfully" fi fi ovirt_store_config /etc/sysconfig/network-scripts/ifcfg* -- 1.6.0.6 From pmyers at redhat.com Tue Jan 20 03:01:45 2009 From: pmyers at redhat.com (Perry Myers) Date: Mon, 19 Jan 2009 22:01:45 -0500 Subject: [Ovirt-devel] [PATCH node-image] Enhancements to fake node creation script to assist with testing Message-ID: <1232420505-10748-1-git-send-email-pmyers@redhat.com> Signed-off-by: Perry Myers --- create-ovirt-iso-nodes | 52 +++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 43 insertions(+), 9 deletions(-) diff --git a/create-ovirt-iso-nodes b/create-ovirt-iso-nodes index 80d6743..4d3876f 100755 --- a/create-ovirt-iso-nodes +++ b/create-ovirt-iso-nodes @@ -29,6 +29,10 @@ IMGDIR_DEFAULT=/var/lib/libvirt/images imgdir=$IMGDIR_DEFAULT NODEIMG_DEFAULT=/usr/share/ovirt-node-image/ovirt-node-image.iso nodeimg=$NODEIMG_DEFAULT +NUM_DISKS_DEFAULT=1 +RANGE_DEFAULT="6-9" +RAM_DEFAULT=512 +VCPUS_DEFAULT=1 NODE_DISK_FMT=qcow2 NODE_DISK_SIZE=6144M @@ -38,20 +42,31 @@ gen_fake_managed_node() { local nodeimg=$2 local last_mac=$(( 54 + $num )) + local os_variant=fedora10 + if [ "$no_virtio" = 1 ]; then + os_variant=fedora8 + fi + echo "Creating fake node$num using $nodeimg..." virsh destroy node$num > /dev/null 2>&1 virsh undefine node$num > /dev/null 2>&1 - rm -f $imgdir/node${i}-sda.$NODE_DISK_FMT - qemu-img create -f $NODE_DISK_FMT $imgdir/node${i}-sda.$NODE_DISK_FMT \ - $NODE_DISK_SIZE + + rm -f $imgdir/node${num}-* + + local disks= + for ((i=0;i<$num_disks;i+=1)); do + qemu-img create -f $NODE_DISK_FMT \ + $imgdir/node${num}-${i}.$NODE_DISK_FMT $NODE_DISK_SIZE + disks="$disks --disk path=$imgdir/node${num}-${i}.$NODE_DISK_FMT" + done + # FIXME: virt-install should be changed to have a --nostart parameter # that just defines the VM w/o starting it. - virt-install --name=node$num --ram=512 --vcpus=1 \ - --disk path=$imgdir/node${i}-sda.$NODE_DISK_FMT \ + virt-install --name=node$num --ram=$ram --vcpus=$vcpus $disks \ --cdrom=$nodeimg --livecd \ --network=bridge:$BRIDGENAME --mac=00:16:3e:12:34:$last_mac \ --vnc --accelerate --hvm --noautoconsole \ - --os-type=linux --os-variant=fedora10 \ + --os-type=linux --os-variant=$os_variant \ --force --noreboot virsh destroy node$num > /dev/null 2>&1 echo "node$num created" @@ -60,18 +75,34 @@ gen_fake_managed_node() { usage() { case $# in 1) warn "$1"; try_h; exit 1;; esac cat < Signed-off-by: Perry Myers --- common-blacklist.ks | 2 ++ common-install.ks | 2 +- common-pkgs.ks | 1 + 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/common-blacklist.ks b/common-blacklist.ks index 3b20122..977c0c9 100644 --- a/common-blacklist.ks +++ b/common-blacklist.ks @@ -26,6 +26,8 @@ RPMS="$RPMS gamin pm-utils kbd usermode vbetool ConsoleKit hdparm \ RPMS="$RPMS exim perl-version perl-Pod-Simple perl-libs perl-Module-Pluggable \ perl-Pod-Escapes perl" +RPMS="$RPMS sysklogd" + # Things we could probably remove if libvirt didn't link against them #RPMS="$RPMS avahi PolicyKit xen-libs" diff --git a/common-install.ks b/common-install.ks index dcfaf9a..9da4bf8 100644 --- a/common-install.ks +++ b/common-install.ks @@ -5,7 +5,7 @@ auth --useshadow --enablemd5 selinux --enforcing firewall --disabled part / --size 550 --fstype ext2 -services --enabled=ntpd,ntpdate,collectd,iptables,network +services --enabled=ntpd,ntpdate,collectd,iptables,network,rsyslog # This requires a new fixed version of livecd-creator to honor the --append settings. bootloader --timeout=5 --append="console=tty0 console=ttyS0,115200n8" rootpw --iscrypted Xa8QeYfWrtscM diff --git a/common-pkgs.ks b/common-pkgs.ks index a3fa22f..cdc779b 100644 --- a/common-pkgs.ks +++ b/common-pkgs.ks @@ -67,4 +67,5 @@ vconfig -hwdata -file -libvirt-python +-sysklogd /usr/sbin/lokkit -- 1.6.0.6 From pmyers at redhat.com Tue Jan 20 05:50:00 2009 From: pmyers at redhat.com (Perry Myers) Date: Tue, 20 Jan 2009 00:50:00 -0500 Subject: [Ovirt-devel] [PATCH node] Replaced calls to echo with log so that we get datestamps in the log file Message-ID: <1232430600-13848-1-git-send-email-pmyers@redhat.com> Fix mount_config to only try to mount /config if the host has persistent storage for Config defined. Signed-off-by: Perry Myers --- scripts/ovirt | 14 +++++++------- scripts/ovirt-early | 26 +++++++++++++------------- scripts/ovirt-functions | 11 +++++++---- scripts/ovirt-post | 2 +- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/scripts/ovirt b/scripts/ovirt index f789d24..8694db9 100755 --- a/scripts/ovirt +++ b/scripts/ovirt @@ -21,11 +21,11 @@ start() { wget -q \ http://$SRV_HOST:$SRV_PORT/ipa/config/krb5.ini -O $krb5_conf.tmp if [ $? -ne 0 ]; then - echo "Failed to get $krb5_conf"; return 1 + log "Failed to get $krb5_conf"; return 1 fi mv $krb5_conf.tmp $krb5_conf else - echo "skipping Kerberos configuration" + log "skipping Kerberos configuration" fi find_srv identify tcp @@ -37,10 +37,10 @@ start() { fi ovirt-awake start $SRV_HOST $SRV_PORT $krb5_tab if [ $? -ne 0 ]; then - echo "ovirt-awake failed"; return 1 + log "ovirt-awake failed"; return 1 fi else - echo "skipping ovirt-awake, oVirt identify service not available" + log "skipping ovirt-awake, oVirt identify service not available" fi find_srv collectd tcp @@ -52,11 +52,11 @@ start() { -e //,/<\/Plugin>/d $collectd_conf.in \ > $collectd_conf if [ $? -ne 0 ]; then - echo "Failed to write $collectd_conf"; return 1 + log "Failed to write $collectd_conf"; return 1 fi fi else - echo "skipping collectd configuration, collectd service not available" + log "skipping collectd configuration, collectd service not available" fi find_srv qpidd tcp @@ -66,7 +66,7 @@ start() { echo "LIBVIRT_QPID_ARGS=\"--broker $SRV_HOST --port $SRV_PORT\"" >> $libvirt_qpid_conf fi else - echo "skipping libvirt-qpid configuration, could not find $libvirt_qpid_conf" + log "skipping libvirt-qpid configuration, could not find $libvirt_qpid_conf" fi } diff --git a/scripts/ovirt-early b/scripts/ovirt-early index a7cf4dc..b99c26b 100755 --- a/scripts/ovirt-early +++ b/scripts/ovirt-early @@ -21,36 +21,36 @@ get_mac_addresses() { configure_from_network() { DEVICE=$1 if [ -n "$DEVICE" ]; then - echo "Configuring network Using interface $DEVICE" + log "Configuring network Using interface $DEVICE" # setup temporary interface to retrieve configuration echo "network --device $DEVICE --bootproto dhcp" | nash if [ $? -eq 0 ]; then # from network-scripts/ifup-post IPADDR=$(LC_ALL=C ip -o -4 addr ls dev ${DEVICE} | awk '{ print $4 ; exit }') - echo "Interface brought up with $IPADDR" + log "Interface brought up with $IPADDR" eval $(ipcalc --silent --hostname ${IPADDR} ; echo "status=$?") if [ "$status" = "0" ]; then hostname $HOSTNAME - echo "Hostname resolved to $HOSTNAME" + log "Hostname resolved to $HOSTNAME" # retrieve remote config find_srv ovirt tcp if [ -n "$SRV_HOST" -a -n "$SRV_PORT" ]; then - echo "oVirt Server found at: $SRV_HOST:$SRV_PORT" + log "oVirt Server found at: $SRV_HOST:$SRV_PORT" cfgdb=$(mktemp) get_mac_addresses - echo "MACs to use: $macs" + log "MACs to use: $macs" wget -O $cfgdb \ "http://$SRV_HOST:$SRV_PORT/ovirt/managed_node/config?host=$(hostname)&macs=$macs" if [ $? -eq 0 ]; then - echo "Remote configuration bundle retrieved to $cfgdb" + log "Remote configuration bundle retrieved to $cfgdb" ovirt-process-config $cfgdb $BONDING_MODCONF_FILE $AUGTOOL_CONFIG if [ $? -eq 0 ]; then - echo "Remote configuration retrieved and applied" + log "Remote configuration retrieved and applied" else - echo "Failure to retrieve or apply remote configuration" + log "Failure to retrieve or apply remote configuration" fi else - echo "Failed to retrieve configuration bundle" + log "Failed to retrieve configuration bundle" fi rm $cfgdb fi @@ -62,14 +62,14 @@ configure_from_network() { ETHDEVS=$(cd /sys/class/net && ls -d eth*) for eth in $ETHDEVS; do BRIDGE=ovirtbr`echo $eth | cut -b4-` - echo "Applying default configuration to $eth and $BRIDGE" + log "Applying default configuration to $eth and $BRIDGE" printf '%s\n' "DEVICE=$eth" ONBOOT=yes "BRIDGE=$BRIDGE" \ > /etc/sysconfig/network-scripts/ifcfg-$eth printf '%s\n' "DEVICE=$BRIDGE" BOOTPROTO=dhcp \ ONBOOT=yes TYPE=Bridge PEERNTP=yes DELAY=0 \ > /etc/sysconfig/network-scripts/ifcfg-$BRIDGE done - echo "Default config applied" + log "Default config applied" } # $(get_live_disk) @@ -312,7 +312,7 @@ start() { params="bootif init vol_boot_size vol_swap_size vol_root_size vol_config_size vol_logging_size vol_data_size local_boot standalone overcommit ip_address ip_netmask ip_gateway ipv6 dns syslog_server syslog_port collectd_server collectd_port bootparams hostname" mount_config if [ -e $OVIRT_DEFAULTS ]; then - echo "update ovirt defaults" + log "update ovirt defaults" tmpaug=$(mktemp) for p in $params; do PARAM=$(uc $p) @@ -322,7 +322,7 @@ start() { done augtool $tmpaug else - echo "initial startup" + log "initial startup" # dump all ovirt bootparams mkdir -p $(dirname $OVIRT_DEFAULTS) echo > $OVIRT_DEFAULTS diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions index 7728640..8f1694b 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -219,12 +219,13 @@ mount_liveos() { # mount config partition # /config for persistance mount_config() { - if ! grep -q " /config " /proc/mounts; then + # Only try to mount /config if the persistent storage exists + if [ -e /dev/HostVG/Config ] ; then mkdir -p /config - mount /dev/HostVG/Config /config - fi + if ! grep -q "/dev/mapper/HostVG-Config " /proc/mounts; then + mount /dev/HostVG/Config /config || return 1 + fi - if grep -q " /config " /proc/mounts; then # optional config embedded in the livecd image if [ -e /live/config ]; then cp -rv --update /live/config/* /config @@ -241,6 +242,8 @@ mount_config() { mount -n --bind $f "$target" fi done + + return 0 else # /config is not available return 1 diff --git a/scripts/ovirt-post b/scripts/ovirt-post index 3861973..068c709 100755 --- a/scripts/ovirt-post +++ b/scripts/ovirt-post @@ -25,7 +25,7 @@ start() { if [ -n "$SRV_HOST" -a -n "$SRV_PORT" ]; then ovirt-identify-node -s $SRV_HOST -p $SRV_PORT else - echo "skipping ovirt-identify-node, oVirt registration service not available" + log "skipping ovirt-identify-node, oVirt registration service not available" fi } -- 1.6.0.6 From pmyers at redhat.com Tue Jan 20 05:51:58 2009 From: pmyers at redhat.com (Perry Myers) Date: Tue, 20 Jan 2009 00:51:58 -0500 Subject: [Ovirt-devel] [PATCH node] Fix issues with detecting virtio storage Message-ID: <1232430718-13918-1-git-send-email-pmyers@redhat.com> systems withi older hal that does not properly handle virtio devices. Signed-off-by: Perry Myers --- scripts/ovirt-config-storage | 42 +++++++++++++++++++++++++----------------- 1 files changed, 25 insertions(+), 17 deletions(-) diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage index efe55f5..25c2e9e 100755 --- a/scripts/ovirt-config-storage +++ b/scripts/ovirt-config-storage @@ -31,18 +31,24 @@ swap_min_size=5 get_selected_drive_size() { + start_log local udi=$(hal-find-by-property --key block.device --string $DRIVE) if [ -z "$udi" ]; then - warn "ERROR: selected storage device is not available" - return 1 - fi - size=$(hal-get-property --udi "$udi" --key storage.size) - if [ $size -eq 0 ]; then - # disk is probably hot-swappable, use different HAL key - size=$(hal-get-property --udi "$udi" --key storage.removable.media_size) + # If hal didn't find the device, it could be a virtio block device + # In this case, use sfdisk -s to get the size + size=$(sfdisk -s $DRIVE) + SPACE=$(echo "scale=0; $size / 1024" | bc -l) + else + size=$(hal-get-property --udi "$udi" --key storage.size) + if [ $size -eq 0 ]; then + # disk is probably hot-swappable, use different HAL key + size=$(hal-get-property --udi "$udi" --key storage.removable.media_size) + fi + SPACE=$(echo "scale=0; $size / (1024 * 1024)" | bc -l) fi - SPACE=$(echo "scale=0; $size / (1024 * 1024)" | bc -l) - echo "Selected Device: $DRIVE ($SPACE MB)" + + log "Selected Device: $DRIVE ($SPACE MB)" + stop_log } check_partition_sizes() @@ -110,18 +116,20 @@ get_dev_name() " skipping"; continue;; esac test -z "$devices" \ - && devices=$block_dev \ + && devices="$block_dev" \ || devices="$devices $block_dev" done - # if we didn't find any devices using HAL, so check for virtual devices - if [ -z "$devices" ]; then devices=$(ls -l /dev/[shv]d?); fi + # FIXME: workaround for detecting virtio block devices + devices="$devices $(ls /dev/vd? | xargs)" + devices=$(echo $devices | tr ' ' '\n' | sort -u | xargs) + local num_devices=$(echo "$devices" | wc -w) # If there's only one device, use it. - case $devices in - '') warn "ERROR: found no usable block device"; return 1;; - *' '*) ;; # found more than one - *) echo "$devices"; return 0;; # just one + case $num_devices in + 0) warn "ERROR: found no usable block device"; return 1;; + 1) echo "$devices"; return 0;; + *) ;; # found more than one esac # There are two or more; make the user choose. @@ -138,7 +146,7 @@ get_dev_name() do_configure() { local name_and_size - DRIVE=$(get_dev_name) || exit 1 + DRIVE=$(get_dev_name) || return 0 get_selected_drive_size printf "\n\nPlease configure storage partitions.\n\n" -- 1.6.0.6 From pmyers at redhat.com Tue Jan 20 05:52:06 2009 From: pmyers at redhat.com (Perry Myers) Date: Tue, 20 Jan 2009 00:52:06 -0500 Subject: [Ovirt-devel] [PATCH node] Fix mke2fs calls to use -j to create ext3 filesystems instead of -T ext3 Message-ID: <1232430726-13944-1-git-send-email-pmyers@redhat.com> -T is supposed to be used for filsystem usage models like floppy, largefile, small, etc... -T ext3 doesn't even look to be a valid combination of options. So instead use -j to create ext3 filesystem. -t ext3 works in Fedora 10, but is a relatively new option and won't work on older OSes. Signed-off-by: Perry Myers --- scripts/ovirt-config-storage | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage index 25c2e9e..b8261cf 100755 --- a/scripts/ovirt-config-storage +++ b/scripts/ovirt-config-storage @@ -300,7 +300,7 @@ perform_partitioning() vgcreate /dev/HostVG "${DRIVE}2" log "Creating boot filesystem" - mke2fs -T ext3 "${DRIVE}1" -L "BOOT" + mke2fs -j "${DRIVE}1" -L "BOOT" tune2fs -c 0 -i 0 "${DRIVE}1" mkdir -p /dev/disk/by-label ln -snf "${DRIVE}1" /dev/disk/by-label/BOOT @@ -314,19 +314,19 @@ perform_partitioning() if [ "$ROOT_SIZE" -gt 0 ]; then log "Creating root partition" lvcreate --name Root --size ${ROOT_SIZE}M /dev/HostVG - mke2fs -T ext3 /dev/HostVG/Root -L "ROOT" + mke2fs -j /dev/HostVG/Root -L "ROOT" tune2fs -c 0 -i 0 /dev/HostVG/Root fi if [ "$CONFIG_SIZE" -gt 0 ]; then log "Creating config partition" lvcreate --name Config --size ${CONFIG_SIZE}M /dev/HostVG - mke2fs -T ext3 /dev/HostVG/Config -L "CONFIG" + mke2fs -j /dev/HostVG/Config -L "CONFIG" tune2fs -c 0 -i 0 /dev/HostVG/Config fi if [ "$LOGGING_SIZE" -gt 0 ]; then log "Creating log partition" lvcreate --name Logging --size ${LOGGING_SIZE}M /dev/HostVG - mke2fs -T ext3 /dev/HostVG/Logging -L "LOGGING" + mke2fs -j /dev/HostVG/Logging -L "LOGGING" tune2fs -c 0 -i 0 /dev/HostVG/Logging echo "/dev/HostVG/Logging /var/log ext3 defaults 0 0" >> /etc/fstab fi @@ -343,7 +343,7 @@ perform_partitioning() fi if [ "$use_data" = 0 ]; then - mke2fs -T ext3 /dev/HostVG/Data -L "DATA" + mke2fs -j /dev/HostVG/Data -L "DATA" tune2fs -c 0 -i 0 /dev/HostVG/Data echo "/dev/HostVG/Data /data ext3 defaults 0 0" >> /etc/fstab echo "/data/images /var/lib/libvirt/images bind bind 0 0" >> /etc/fstab -- 1.6.0.6 From pmyers at redhat.com Tue Jan 20 05:52:15 2009 From: pmyers at redhat.com (Perry Myers) Date: Tue, 20 Jan 2009 00:52:15 -0500 Subject: [Ovirt-devel] [PATCH node] Fix /proc/mounts checks to not use the /dev section Message-ID: <1232430735-13972-1-git-send-email-pmyers@redhat.com> since that can vary on different OSes. Instead use the mount point, but since the mount point for /var/log appears twice (one as tmpfs and one as ext3) also check for presence of ext3 in the query. Signed-off-by: Perry Myers --- scripts/ovirt-functions | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions index 8f1694b..7f97bb9 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -222,7 +222,7 @@ mount_config() { # Only try to mount /config if the persistent storage exists if [ -e /dev/HostVG/Config ] ; then mkdir -p /config - if ! grep -q "/dev/mapper/HostVG-Config " /proc/mounts; then + if ! grep -q " /config ext3 " /proc/mounts; then mount /dev/HostVG/Config /config || return 1 fi @@ -233,7 +233,7 @@ mount_config() { # bind mount all persisted configs to rootfs for f in $(find /config -type f); do target=${f#/config} - if grep -q " $target " /proc/mounts ; then + if grep -q " $target ext3" /proc/mounts ; then # skip if already bind-mounted true else @@ -252,7 +252,7 @@ mount_config() { # mount logging partition mount_logging() { - if grep -q "/dev/mapper/HostVG-Logging " /proc/mounts; then + if grep -q " /var/log ext3" /proc/mounts; then return 0 fi @@ -280,7 +280,7 @@ mount_logging() { # mount data partition mount_data() { - if grep -q "/dev/mapper/HostVG-Data " /proc/mounts; then + if grep -q " /data ext3" /proc/mounts; then return 0 fi @@ -330,7 +330,7 @@ EOF # ovirt_store_config /etc/config /etc/config2 ... # copy to /config and bind-mount back ovirt_store_config() { - if grep -q " /config " /proc/mounts; then + if grep -q " /config ext3" /proc/mounts; then printf "storing to /config :\n" for f in "$@"; do printf "$f" @@ -340,7 +340,7 @@ ovirt_store_config() { continue fi # skip if already bind-mounted - if grep -q " $f " /proc/mounts ; then + if grep -q " $f ext3" /proc/mounts ; then printf " Skipping, file already persisted\n" else mkdir -p /config$(dirname $f) -- 1.6.0.6 From jdong at redhat.com Tue Jan 20 07:42:07 2009 From: jdong at redhat.com (jdong) Date: Tue, 20 Jan 2009 15:42:07 +0800 Subject: [Ovirt-devel] Where to check about 500 Internal Server Error matter Message-ID: <4975804F.803@redhat.com> Hey guys, I was troubled by a matter these days. I installed ovirt-appliance successfully.But every time I shutdowned my computer, started it and started ovirt-appliance, it always got 500 internal server error. And if I "get-ovirt-appliance"--"create ovirt-appliance"--"virsh start ovirt-appliance",it can be ok.Obviously,all stored data disappeared. I asked one friend from GSS help me to install it and try.He got the same error. Did any one here meet the same condition? I guess it is a bug here.But it is hard to set steps to reproduce it. And how can I check this "Internal Server"?And can the shutdown and start actions destroy some configures? BTW:I notice that ovirt people publish some patches every day.Can I just download and run to fix some problem? Thanks, :-) Nikki From apevec at gmail.com Tue Jan 20 12:42:15 2009 From: apevec at gmail.com (Alan Pevec) Date: Tue, 20 Jan 2009 13:42:15 +0100 Subject: [Ovirt-devel] [PATCH node] Fixed check for whether the network restarted. In-Reply-To: <1232404325-14127-1-git-send-email-dpierce@redhat.com> References: <1232404325-14127-1-git-send-email-dpierce@redhat.com> Message-ID: <2be7262f0901200442l19bd9f18g958b2f4858463bdd@mail.gmail.com> On Mon, Jan 19, 2009 at 11:32 PM, Darryl L. Pierce wrote: > The last network interface touched by the script is checked to see if it > has active ARP entries. If not then the restart is considered a failure > even through the service itself restarted. > Background of this patch is that /etc/init.d/network script returns 0 even after printing FAILED for some interfaces. Unfortunately checking for ARP cache entries is fragile: works after successful DHCP session, but fails if we configured static IP + if [[ $net_check =~ "no match found" ]]; then > log "Error configuring network, see $OVIRT_LOGFILE" > should also return non-0 error code otherwise confusing success message is printed right after error: http://apevec.fedorapeople.org/o-c-netcfg-fail-no-dhcp.png -------------- next part -------------- An HTML attachment was scrubbed... URL: From apevec at gmail.com Tue Jan 20 12:58:00 2009 From: apevec at gmail.com (Alan Pevec) Date: Tue, 20 Jan 2009 13:58:00 +0100 Subject: [Ovirt-devel] [PATCH node] Replaced calls to echo with log so that we get datestamps in the log file In-Reply-To: <1232430600-13848-1-git-send-email-pmyers@redhat.com> References: <1232430600-13848-1-git-send-email-pmyers@redhat.com> Message-ID: <2be7262f0901200458sa689bedod888d17d7b7d78bb@mail.gmail.com> ack On Tue, Jan 20, 2009 at 6:50 AM, Perry Myers wrote: > Fix mount_config to only try to mount /config if the host has persistent > storage for Config defined. > pushed this fix as a separate commit -------------- next part -------------- An HTML attachment was scrubbed... URL: From apevec at gmail.com Tue Jan 20 13:06:11 2009 From: apevec at gmail.com (Alan Pevec) Date: Tue, 20 Jan 2009 14:06:11 +0100 Subject: [Ovirt-devel] [PATCH node] Fix issues with detecting virtio storage In-Reply-To: <1232430718-13918-1-git-send-email-pmyers@redhat.com> References: <1232430718-13918-1-git-send-email-pmyers@redhat.com> Message-ID: <2be7262f0901200506s698dcc79ue29319d2c1afff09@mail.gmail.com> ack and pushed just that we're pushing shell scripting to the limit with things like this :) > + devices="$devices $(ls /dev/vd? | xargs)" > + devices=$(echo $devices | tr ' ' '\n' | sort -u | xargs) > for the next round of features we should consider switching to Python since now we have it included in hte node image -------------- next part -------------- An HTML attachment was scrubbed... URL: From hbrock at redhat.com Tue Jan 20 13:14:19 2009 From: hbrock at redhat.com (Hugh O. Brock) Date: Tue, 20 Jan 2009 08:14:19 -0500 Subject: [Ovirt-devel] Where to check about 500 Internal Server Error matter In-Reply-To: <4975804F.803@redhat.com> References: <4975804F.803@redhat.com> Message-ID: <20090120131418.GP9671@redhat.com> On Tue, Jan 20, 2009 at 03:42:07PM +0800, jdong wrote: > Hey guys, > > I was troubled by a matter these days. > I installed ovirt-appliance successfully.But every time I shutdowned my > computer, started it and started ovirt-appliance, it always got 500 > internal server error. > And if I "get-ovirt-appliance"--"create ovirt-appliance"--"virsh start > ovirt-appliance",it can be ok.Obviously,all stored data disappeared. > I asked one friend from GSS help me to install it and try.He got the > same error. > Did any one here meet the same condition? > I guess it is a bug here.But it is hard to set steps to reproduce it. > And how can I check this "Internal Server"?And can the shutdown and > start actions destroy some configures? > BTW:I notice that ovirt people publish some patches every day.Can I > just download and run to fix some problem? > Thanks, :-) > > Nikki Hi Nikki. Are you shutting down the oVirt appliance before shutting down your computer? If not, that's probably a good idea, although I'm not 100% sure it will help. When you virsh start ovirt-appliance, can you ssh into the appliance? Let me know, --Hugh From pronix.service at gmail.com Tue Jan 20 13:33:31 2009 From: pronix.service at gmail.com (=?UTF-8?B?0JLQsNGB0LjQu9C10YYg0JTQvNC40YLRgNC40Lk=?=) Date: Tue, 20 Jan 2009 16:33:31 +0300 Subject: [Ovirt-devel] how to find host for running vm by qpid api ? Message-ID: <639ce0480901200533r3ec24288g6c8d4b99e29c065c@mail.gmail.com> hello is it possible find host where run vm if vm.host_id = nil ? -- ? ?????????, ???????. From apevec at gmail.com Tue Jan 20 13:45:11 2009 From: apevec at gmail.com (Alan Pevec) Date: Tue, 20 Jan 2009 14:45:11 +0100 Subject: [Ovirt-devel] [PATCH node] Fix mke2fs calls to use -j to create ext3 filesystems instead of -T ext3 In-Reply-To: <1232430726-13944-1-git-send-email-pmyers@redhat.com> References: <1232430726-13944-1-git-send-email-pmyers@redhat.com> Message-ID: <2be7262f0901200545xf08da3ds792654646121e580@mail.gmail.com> On Tue, Jan 20, 2009 at 6:52 AM, Perry Myers wrote: > -T is supposed to be used for filsystem usage models like floppy, > largefile, > small, etc... -T ext3 doesn't even look to be a valid combination of > options. > ACK yeah, for older versions it's not defined in /etc/mke2fs.conf -------------- next part -------------- An HTML attachment was scrubbed... URL: From pronix.service at gmail.com Tue Jan 20 14:36:08 2009 From: pronix.service at gmail.com (=?UTF-8?B?0JLQsNGB0LjQu9C10YYg0JTQvNC40YLRgNC40Lk=?=) Date: Tue, 20 Jan 2009 17:36:08 +0300 Subject: [Ovirt-devel] Re: how to find host for running vm by qpid api ? In-Reply-To: <639ce0480901200533r3ec24288g6c8d4b99e29c065c@mail.gmail.com> References: <639ce0480901200533r3ec24288g6c8d4b99e29c065c@mail.gmail.com> Message-ID: <639ce0480901200636y55e2511cpf67aad7ab090112d@mail.gmail.com> thanks, i found @cached_objects[objkey].node 2009/1/20 ??????? ??????? : > hello > is it possible find host where run vm if vm.host_id = nil ? > > -- > ? ?????????, ???????. > -- ? ?????????, ???????. From sseago at redhat.com Tue Jan 20 18:37:36 2009 From: sseago at redhat.com (Scott Seago) Date: Tue, 20 Jan 2009 18:37:36 +0000 Subject: [Ovirt-devel] [PATCH] fix for 468378: details pane for disabled hosts. Message-ID: <1232476657-1284-1-git-send-email-sseago@redhat.com> A prior refactoring removed the 'do' and 'end' around an association method -- this patch restores it. Signed-off-by: Scott Seago --- src/app/models/host.rb | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/models/host.rb b/src/app/models/host.rb index 813bc1d..e4ae5d6 100644 --- a/src/app/models/host.rb +++ b/src/app/models/host.rb @@ -35,11 +35,12 @@ class Host < ActiveRecord::Base has_many :cpus, :dependent => :destroy has_many :nics, :dependent => :destroy has_many :bondings, :dependent => :destroy - has_many :vms, :dependent => :nullify - + has_many :vms, :dependent => :nullify do def consuming_resources find(:all, :conditions=>{:state=>Vm::RUNNING_STATES}) end + end + has_many :tasks, :as => :task_target, :dependent => :destroy, :order => "id ASC" do def queued find(:all, :conditions=>{:state=>Task::STATE_QUEUED}) -- 1.6.0.6 From dpierce at redhat.com Tue Jan 20 19:20:15 2009 From: dpierce at redhat.com (Darryl L. Pierce) Date: Tue, 20 Jan 2009 14:20:15 -0500 Subject: [Ovirt-devel] [PATCH node] Fixed check for whether the network restarted. In-Reply-To: <2be7262f0901200442l19bd9f18g958b2f4858463bdd@mail.gmail.com> References: <1232404325-14127-1-git-send-email-dpierce@redhat.com> <2be7262f0901200442l19bd9f18g958b2f4858463bdd@mail.gmail.com> Message-ID: <20090120192015.GI4249@mcpierce-laptop.mcpierce.org> On Tue, Jan 20, 2009 at 01:42:15PM +0100, Alan Pevec wrote: > + if [[ $net_check =~ "no match found" ]]; then > > log "Error configuring network, see $OVIRT_LOGFILE" > > > > should also return non-0 error code otherwise confusing success message is > printed right after error: > > http://apevec.fedorapeople.org/o-c-netcfg-fail-no-dhcp.png Good catch. Fixed and patch is on its way. -- Darryl L. Pierce, Sr. Software Engineer @ Red Hat, Inc. Virtual Machine Management - http://www.ovirt.org/ "What do you care what other people think, Mr. Feynman?" -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 197 bytes Desc: not available URL: From dpierce at redhat.com Tue Jan 20 19:20:26 2009 From: dpierce at redhat.com (Darryl L. Pierce) Date: Tue, 20 Jan 2009 14:20:26 -0500 Subject: [Ovirt-devel] [PATCH node] Fixed check for whether the network restarted. Message-ID: <1232479226-32173-1-git-send-email-dpierce@redhat.com> The last network interface touched by the script is checked to see if it has active ARP entries. If not then the restart is considered a failure even through the service itself restarted. It then returns a result code of 1. Signed-off-by: Darryl L. Pierce --- scripts/ovirt-config-networking | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/ovirt-config-networking b/scripts/ovirt-config-networking index 5727c47..cad47e1 100755 --- a/scripts/ovirt-config-networking +++ b/scripts/ovirt-config-networking @@ -17,6 +17,7 @@ trap '__st=$?; rm -rf "$WORKDIR"; stop_log; exit $__st' 0 trap 'exit $?' 1 2 13 15 CONFIG_FILE_ROOT="/files/etc/sysconfig/network-scripts/ifcfg" +CONFIGURED_IFACE="" function configure_interface { @@ -34,6 +35,8 @@ function configure_interface local IF_FILENAME="$WORKDIR/augtool-$NIC" local BR_FILENAME="$WORKDIR/augtool-$BRIDGE" + CONFIGURED_IFACE=$BRIDGE + printf "\nConfigure $BRIDGE for use by $NIC..\n\n" local IF_ROOT="$CONFIG_FILE_ROOT-$NIC" @@ -239,10 +242,13 @@ if ls "$WORKDIR"/augtool-* > /dev/null 2>&1 ; then cat "$WORKDIR"/augtool-* > $config \ && augtool $config \ && service network restart - if [ $? = 0 ]; then - log "Network configured successfully" - else + # check of rthe bridge's existence + net_check=$(arp -i $CONFIGURED_IFACE) + if [[ $net_check =~ "no match found" ]]; then log "Error configuring network, see $OVIRT_LOGFILE" + exit 1 + else + log "Network configured successfully" fi fi ovirt_store_config /etc/sysconfig/network-scripts/ifcfg* -- 1.6.0.6 From slinabery at redhat.com Tue Jan 20 20:15:31 2009 From: slinabery at redhat.com (Steve Linabery) Date: Tue, 20 Jan 2009 14:15:31 -0600 Subject: [Ovirt-devel] [PATCH server] Add type check before nan? method in Stats.rb to avoid nosuchmethod in Fixnum class error Message-ID: <1232482531-28976-1-git-send-email-slinabery@redhat.com> --- src/app/util/stats/Stats.rb | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/util/stats/Stats.rb b/src/app/util/stats/Stats.rb index 5adc5b4..f6b0c7a 100644 --- a/src/app/util/stats/Stats.rb +++ b/src/app/util/stats/Stats.rb @@ -56,7 +56,7 @@ def fetchRollingAve?(rrdPath, start, endTime, interval, myFunction, lIndex, retu final = 0 value = 0 value = vdata[lIndex] - value = 0 if value.nan? + value = 0 if value.is_?(Float) && value.nan? roll.push(value) @@ -120,7 +120,7 @@ def fetchRollingCalcUsedData?(rrdPath, start, endTime, interval, myFunction, lIn final = 0 value = 0 value = vdata[lIndex] - value = 100 if value.nan? + value = 100 if value.is_a?(Float) && value.nan? if ( value > 100 ) value = 100 end @@ -183,7 +183,7 @@ def fetchCalcUsedData?(rrdPath, start, endTime, interval, myFunction, lIndex, re data.each do |vdata| i += 1 value = vdata[lIndex] - value = 100 if value.nan? + value = 100 if value.is_a?(Float) && value.nan? if ( value > 100 ) value = 100 end @@ -396,7 +396,7 @@ def getAggregateStatsData?(statRequestList) # them with extreme prejudice... value = d.get_value? - value = 0 if value.nan? + value = 0 if value.is_a?(Float) && value.nan? if (myMasterList.length > idx ) if ( d.get_timestamp? > myMasterList[idx].get_timestamp? ) -- 1.6.0.6 From mwagner at redhat.com Tue Jan 20 20:51:55 2009 From: mwagner at redhat.com (Mark Wagner) Date: Tue, 20 Jan 2009 15:51:55 -0500 Subject: [Ovirt-devel] [PATCH server] Add type check before nan? method in Stats.rb to avoid nosuchmethod in Fixnum class error In-Reply-To: <1232482531-28976-1-git-send-email-slinabery@redhat.com> References: <1232482531-28976-1-git-send-email-slinabery@redhat.com> Message-ID: <4976396B.6020606@redhat.com> ACK Steve Linabery wrote: > --- > src/app/util/stats/Stats.rb | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/src/app/util/stats/Stats.rb b/src/app/util/stats/Stats.rb > index 5adc5b4..f6b0c7a 100644 > --- a/src/app/util/stats/Stats.rb > +++ b/src/app/util/stats/Stats.rb > @@ -56,7 +56,7 @@ def fetchRollingAve?(rrdPath, start, endTime, interval, myFunction, lIndex, retu > final = 0 > value = 0 > value = vdata[lIndex] > - value = 0 if value.nan? > + value = 0 if value.is_?(Float) && value.nan? > > > roll.push(value) > @@ -120,7 +120,7 @@ def fetchRollingCalcUsedData?(rrdPath, start, endTime, interval, myFunction, lIn > final = 0 > value = 0 > value = vdata[lIndex] > - value = 100 if value.nan? > + value = 100 if value.is_a?(Float) && value.nan? > if ( value > 100 ) > value = 100 > end > @@ -183,7 +183,7 @@ def fetchCalcUsedData?(rrdPath, start, endTime, interval, myFunction, lIndex, re > data.each do |vdata| > i += 1 > value = vdata[lIndex] > - value = 100 if value.nan? > + value = 100 if value.is_a?(Float) && value.nan? > if ( value > 100 ) > value = 100 > end > @@ -396,7 +396,7 @@ def getAggregateStatsData?(statRequestList) > # them with extreme prejudice... > > value = d.get_value? > - value = 0 if value.nan? > + value = 0 if value.is_a?(Float) && value.nan? > > if (myMasterList.length > idx ) > if ( d.get_timestamp? > myMasterList[idx].get_timestamp? ) > From dpierce at redhat.com Tue Jan 20 21:06:29 2009 From: dpierce at redhat.com (Darryl L. Pierce) Date: Tue, 20 Jan 2009 16:06:29 -0500 Subject: [Ovirt-devel] [PATCH node] Fix issues with detecting virtio storage In-Reply-To: <2be7262f0901200506s698dcc79ue29319d2c1afff09@mail.gmail.com> References: <1232430718-13918-1-git-send-email-pmyers@redhat.com> <2be7262f0901200506s698dcc79ue29319d2c1afff09@mail.gmail.com> Message-ID: <20090120210629.GJ4249@mcpierce-laptop.mcpierce.org> On Tue, Jan 20, 2009 at 02:06:11PM +0100, Alan Pevec wrote: > for the next round of features we should consider switching to Python since > now we have it included in hte node image I absolutely agree. With some of the more complex logic points it's going to be a lot easier to read python than bash, evals, etc. -- Darryl L. Pierce, Sr. Software Engineer @ Red Hat, Inc. Virtual Machine Management - http://www.ovirt.org/ "What do you care what other people think, Mr. Feynman?" -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 197 bytes Desc: not available URL: From bkearney at redhat.com Tue Jan 20 21:49:38 2009 From: bkearney at redhat.com (Bryan Kearney) Date: Tue, 20 Jan 2009 16:49:38 -0500 Subject: [Ovirt-devel] [PATCH server] Add the installer files as a subpackage of the server package Message-ID: <1232488178-25739-1-git-send-email-bkearney@redhat.com> This is resend of the three earlier patches. I have combined them into a single patch, and addressed all the comments with the following excpetions: - Passwords are stills stored on the file system. I will add a patch ont this. - Changelog was not updtaed, since that seems to get done at release time. -- bk --- Makefile.am | 3 +- .../appliances/ovirt-appliance/ovirt-appliance.pp | 44 +++ installer/bin/ovirt-installer | 288 ++++++++++++++++++++ installer/modules/ovirt/files/collectd.conf | 23 ++ installer/modules/ovirt/files/dns_entries.sh | 2 + installer/modules/ovirt/files/modules.conf | 96 +++++++ installer/modules/ovirt/files/qpidd.conf | 4 + installer/modules/ovirt/manifests/cobbler.pp | 126 +++++++++ installer/modules/ovirt/manifests/dhcp.pp | 34 +++ installer/modules/ovirt/manifests/dns.pp | 99 +++++++ installer/modules/ovirt/manifests/freeipa.pp | 103 +++++++ installer/modules/ovirt/manifests/init.pp | 9 + installer/modules/ovirt/manifests/ovirt.pp | 154 +++++++++++ installer/modules/ovirt/manifests/postgres.pp | 114 ++++++++ installer/modules/ovirt/manifests/tftp.pp | 31 ++ installer/modules/ovirt/templates/digest_line.erb | 4 + .../modules/ovirt/templates/ovirt-dhcp.conf.erb | 9 + .../modules/ovirt/templates/ovirt-dns.conf.erb | 7 + .../modules/ovirt/templates/ovirt-tftp.conf.erb | 3 + ovirt-server.spec.in | 25 ++- 20 files changed, 1176 insertions(+), 2 deletions(-) create mode 100644 installer/appliances/ovirt-appliance/ovirt-appliance.pp create mode 100755 installer/bin/ovirt-installer create mode 100644 installer/modules/ovirt/files/collectd.conf create mode 100755 installer/modules/ovirt/files/dns_entries.sh create mode 100644 installer/modules/ovirt/files/modules.conf create mode 100644 installer/modules/ovirt/files/qpidd.conf create mode 100644 installer/modules/ovirt/manifests/cobbler.pp create mode 100644 installer/modules/ovirt/manifests/dhcp.pp create mode 100644 installer/modules/ovirt/manifests/dns.pp create mode 100644 installer/modules/ovirt/manifests/freeipa.pp create mode 100644 installer/modules/ovirt/manifests/init.pp create mode 100644 installer/modules/ovirt/manifests/ovirt.pp create mode 100644 installer/modules/ovirt/manifests/postgres.pp create mode 100644 installer/modules/ovirt/manifests/tftp.pp create mode 100644 installer/modules/ovirt/templates/digest_line.erb create mode 100644 installer/modules/ovirt/templates/ovirt-dhcp.conf.erb create mode 100644 installer/modules/ovirt/templates/ovirt-dns.conf.erb create mode 100644 installer/modules/ovirt/templates/ovirt-tftp.conf.erb diff --git a/Makefile.am b/Makefile.am index e11e636..f115c8f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,8 @@ EXTRA_DIST = \ ovirt-server.spec.in \ scripts \ conf \ - src + src \ + installer DISTCLEANFILES = $(PACKAGE)-$(VERSION).tar.gz diff --git a/installer/appliances/ovirt-appliance/ovirt-appliance.pp b/installer/appliances/ovirt-appliance/ovirt-appliance.pp new file mode 100644 index 0000000..630fa7f --- /dev/null +++ b/installer/appliances/ovirt-appliance/ovirt-appliance.pp @@ -0,0 +1,44 @@ +# Sample file as if the user had run the ovirt-installer program +import 'ovirt' +import 'firewall' + +firewall::setup{'setup': status => 'disabled'} + +# dns configuration +$mgmt_ipaddr = '192.168.222.211' +$prov_ipaddr = '' +$ovirt_host = 'management.priv.ovirt.org' +$ipa_host = 'management.priv.ovirt.org' + +dns::bundled{setup: mgmt_ipaddr=> $mgmt_ipaddr, prov_ipaddr=> $prov_ipaddr, mgmt_dev => 'eth0', prov_dev => 'eth1'} + +# dhcp configuration +$dhcp_interface = 'eth1' +$dhcp_network = '192.168.50' +$dhcp_start = '3' +$dhcp_stop = '10' +$dhcp_domain = 'priv.ovirt.org' +$ntp_server = '192.168.222.211' + +$prov_dns_server = '' +$prov_network_gateway = '192.168.50.1' +# cobbler configuration +$cobbler_hostname = 'localhost' +$cobbler_user_name = 'cobbler' +$cobbler_user_password = 'cobbler' + +# postgres configuration +$db_username = 'ovirt' +$db_password = 'cobbler' + +# FreeIPA configuration +$realm_name = 'priv.ovirt.org' +$freeipa_password = 'password' +$ldap_dn = 'cn=ipaConfig,cn=etc,dc=priv,dc=ovirt,dc=org' + +include cobbler::bundled +include dhcp::bundled +include tftp::bundled +include postgres::bundled +include freeipa::bundled +include ovirt::setup diff --git a/installer/bin/ovirt-installer b/installer/bin/ovirt-installer new file mode 100755 index 0000000..65dc522 --- /dev/null +++ b/installer/bin/ovirt-installer @@ -0,0 +1,288 @@ +#!/usr/bin/ruby +#-- +## Copyright (C) 2008 Red Hat Inc. +## +## This library is free software; you can redistribute it and/or +## modify it under the terms of the GNU Lesser General Public +## License as published by the Free Software Foundation; either +## version 2.1 of the License, or (at your option) any later version. +## +## This library 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 +## Lesser General Public License for more details. +## +## You should have received a copy of the GNU Lesser General Public +## License along with this library; if not, write to the Free Software +## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +## +## Author: Joey Boggs +##-- +## oVirt Installation Script + +require 'socket' +require 'fileutils' +require 'erb' +require 'rubygems' +require 'highline' + +# +# Input output controls +# + + at cli = HighLine.new() + +# prompt a user for a non-blank answer +def prompt_for_answer(prompt, options={}) + default = options[:default] + expression = options[:regex] + password = options[:password] + prompt = "\n#{prompt} " + + answer = @cli.ask(prompt, String) do |q| + q.default = default if default + q.validate = expression if expression + q.echo = "*" if password + q.responses[:not_valid] = 'Please enter a valid value.' + q.responses[:ask_on_error] = :question + end + + return answer +end + +# Allow a user to enter a Yes/No +# And repeat the prompt until they do +def prompt_yes_no(prompt, options={}) + default = options[:default] + prompt = "\n#{prompt} " + + answer = @cli.ask(prompt, lambda { |yn| yn.downcase[0] == ?y}) do |q| + q.default = default + q.validate = /\Ay(?:es)?|no?\Z/i + q.responses[:not_valid] = 'Please enter "yes" or "no".' + q.responses[:ask_on_error] = :question + q.whitespace = :chomp + end + + return answer ? "y" : "n" +end + +# +# The real script begins here +# + +# These regular expressions will be used to +# validate the user input +IP = /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/ +THREE_OCTETS = /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){2}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/ +FQDN = /(?=^.{1,254}$)(^(?:(?!\d+\.)[a-zA-Z0-9_\-]{1,63}\.?)+(?:[a-zA-Z]{2,})$)/ +IP_OR_FQDN = /(?=^.{1,254}$)(^((?:(?!\d+\.)[a-zA-Z0-9_\-]{1,63}\.?)+(?:[a-zA-Z]{2,})|(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))$)/ +OCTET = /^([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])$/ + +# Print a friendly welcome message +welcome = "This installer will configure the ovirt installation based on a series\n\ +of questions. When complete, you will be asked to install oVirt or\n\ +do the installation manually. Would you like to continue?" + +if (prompt_yes_no(welcome, :default => "y") == "n") + exit(0) +end + + +if File.exist?("/usr/sbin/sestatus") + sestatus = `/usr/sbin/sestatus` + if sestatus !~ /(Current mode: permissive|Current mode: disabled|SELinux status: disabled|SELinux status: permissive)/ + puts "SELinux enabled, please disable or set in permissive mode permanently by editing" + puts "/etc/selinux/config and rebooting" + exit + end +end + +# Networking Configuration +dev_ct = 0 +net_devs = `hal-find-by-capability --capability net` +net_devs.each_line do |dev| + dev_ct = dev_ct + 1 +end + +if dev_ct == 0 + @cli.say("Unable to install without a network interface") + exit +else + puts "" + @cli.say("Below are the detected networking devices\n\n") + @cli.say("mac address interface ip address") + net_devs.each_line do |dev| + dev = dev.chomp + interface = `hal-get-property --udi #{dev} --key net.interface` + mac = `hal-get-property --udi #{dev} --key net.address` + ip = `ifconfig #{interface}` + ipaddr = ip.scan(/\s*inet addr:([\d.]+)/) + puts (mac.chop + " : " + interface.chop + " : " + ipaddr.to_s) if interface.chop != "lo" + end +end + +mgmt_dev = prompt_for_answer("Enter your management interface (example: eth0):") +prov_dev = prompt_for_answer("Enter your provisioning interface, this may also be your management interface:", :default => mgmt_dev) + +sep_networks = (mgmt_dev == prov_dev) ? "n" : "y" + +ovirt_host = prompt_for_answer("Enter the hostname of the oVirt management server (example: management.example.com):", :regex => IP_OR_FQDN) +ipa_host = ovirt_host + +# DNS Configuration + at cli.say( "\nThe following DNS servers were found:") +File.open('/etc/resolv.conf').each_line{ |line| + line = line.chomp + puts line if line =~ /nameserver/ and line !~ /nameserver 127.0.0.1/ +} +dns_servers = prompt_yes_no("Use this systems's dns servers?") + +mgmt_ip = `ifconfig #{mgmt_dev}` +mgmt_ipaddr= mgmt_ip.scan(/\s*inet addr:([\d.]+)/) +prov_ip = `ifconfig #{prov_dev}` +prov_ipaddr= prov_ip.scan(/\s*inet addr:([\d.]+)/) + +if dns_servers == "y" + host_lookup = Socket.getaddrinfo(ipa_host,nil) + hostip = host_lookup[1][3] + if hostip.to_s != mgmt_ipaddr.to_s + @cli.say("Reverse dns lookup for #{ipa_host} failed, exiting") + exit + end +end + +# DHCP Configuration +dhcp_setup = prompt_yes_no("Does your provisioning network already have dhcp?") +if dhcp_setup == "n" + dhcp_interface = prov_dev + dhcp_network = prompt_for_answer("Enter the first 3 octets of the dhcp network you wish to use (example: 192.168.50):", :regex => THREE_OCTETS) + dhcp_start = prompt_for_answer("Enter the dhcp pool start address (example: 3):", :regex => OCTET) + dhcp_stop = prompt_for_answer("Enter the dhcp pool end addess (example: 100):", :regex => OCTET) + dhcp_domain = prompt_for_answer("Enter the dhcp domain you wish to use (example: example.com):", :regex => IP_OR_FQDN) + tftp_setup = prompt_yes_no("Provide pxe/tftp capability?") + + if sep_networks == "y" + prov_ip = `ifconfig #{prov_dev}` + prov_dns_server = prov_ip.scan(/\s*inet addr:([\d.]+)/) + prov_network_gateway = prompt_for_answer("Enter the network gateway for your provisioning network (example: 192.168.50.254):", :regex => IP_OR_FQDN) + end +end + +# Cobbler Configuration +cobbler_setup = prompt_yes_no("Do you have a cobbler already that you wish to use?") + +if cobbler_setup == "y" + cobbler_hostname = prompt_for_answer("Enter the hostname of your cobbler server:", :regex => IP_OR_FQDN) +elsif cobbler_setup == "n" + cobbler_hostname = "localhost" + @cli.say("\nWe will setup a cobbler instance, please provide the following information") +end + +cobbler_user_name= prompt_for_answer("Enter your cobbler username:") +cobbler_user_password = prompt_for_answer("Enter your cobbler user password:", :password => true) + +# Postgres Configuration +db_username = "ovirt" +db_password = prompt_for_answer("Enter a password for the ovirt postgres account:", :password => true) + +# FreeIPA Configuration +realm_name = prompt_for_answer("Enter your realm name (example: example.com):", :regex => FQDN) + +freeipa_password = prompt_for_answer("NOTE: The following pasword will also be you ovirtadmin password for the web management login\n\ +Enter an administrator password for FreeIPA:", :password => true) +ldap_dn = "cn=ipaConfig,cn=etc," +ldap_dn_temp = realm_name.split(".") +ldap_dn_temp.each do |i| + ldap_dn += "dc=#{i}," +end +ldap_dn = ldap_dn.chop + + +# +# Use ERB to spit out the puppet file whcih is used by ace. +# + +# Create the template +template = < +# + +import 'ovirt' +import 'firewall' +firewall::setup{'setup': + status => 'disabled' +} + +#DNS Configuration +$mgmt_ipaddr = '<%= mgmt_ipaddr %>' +$prov_ipaddr = '<%= prov_ipaddr %>' +$ovirt_host = '<%= ovirt_host %>' +$ipa_host = '<%= ipa_host %>' + +<% if dns_servers == "n" %> +dns::bundled{setup: +<% else %> +dns::remote{setup: +<% end %> + mgmt_ipaddr=> $mgmt_ipaddr, + prov_ipaddr=> $prov_ipaddr, + mgmt_dev => '<%= mgmt_dev %>', + prov_dev => '<%= prov_dev %>' +} + +# DHCP Configuration +<% if dhcp_setup == "n" %> +$dhcp_interface = '<%= dhcp_interface %>' +$dhcp_network = '<%= dhcp_network %>' +$dhcp_start = '<%= dhcp_start %>' +$dhcp_stop = '<%= dhcp_stop %>' +$dhcp_domain = '<%= dhcp_domain %>' +$ntp_server = '<%= mgmt_ipaddr %>' +<% if tftp_setup == "y" %> +include tftp::bundled +<% end %> +<% if sep_networks == "y" %> +$prov_dns_server = '<%= prov_dns_server %>' +$prov_network_gateway = '<%= prov_network_gateway %>' +<% end %> +<% end %> + + +# Cobbler configuration +$cobbler_hostname = '<%= cobbler_hostname %>' +$cobbler_user_name = '<%= cobbler_user_name %>' +$cobbler_user_password = '<%= cobbler_user_password %>' + +# Postgres Configuration +$db_username = '<%= db_username %>' +$db_password = '<%= db_password %>' + +# FreeIPA configuration +$realm_name = '<%= realm_name %>' +$freeipa_password = '<%= freeipa_password %>' +$ldap_dn = '<%= ldap_dn %>' + +<% if cobbler_setup == "n" %> +include cobbler::bundled +<% else %> +include cobbler::remote +<% end %> +<% if dhcp_setup == "n" %> +include dhcp::bundled +<% end %> +include postgres::bundled +include freeipa::bundled +include ovirt::setup +END_OF_TEMPLATE + +# Generate the file and output it. +FileUtils.mkdir_p("/usr/share/ace/appliances/ovirt") +config_file = File.new("/usr/share/ace/appliances/ovirt/ovirt.pp", "w") +config_file.write(ERB.new(template, 0, "%>").result) +config_file.close() + + +# Give a friendly reminder about what to do next +puts "\nTo start the installation run: ace install ovirt" diff --git a/installer/modules/ovirt/files/collectd.conf b/installer/modules/ovirt/files/collectd.conf new file mode 100644 index 0000000..0b327de --- /dev/null +++ b/installer/modules/ovirt/files/collectd.conf @@ -0,0 +1,23 @@ +LoadPlugin network +LoadPlugin logfile +LoadPlugin rrdtool +LoadPlugin unixsock + + + LogLevel info + File STDOUT + + + + Listen "0.0.0.0" + + + + DataDir "/var/lib/collectd/rrd" + CacheTimeout 120 + CacheFlush 900 + + + + SocketFile "/var/lib/collectd/unixsock" + diff --git a/installer/modules/ovirt/files/dns_entries.sh b/installer/modules/ovirt/files/dns_entries.sh new file mode 100755 index 0000000..65662d5 --- /dev/null +++ b/installer/modules/ovirt/files/dns_entries.sh @@ -0,0 +1,2 @@ +#!/bin/bash +for i in `seq $1 $2` ; do echo $3.$i node$i.$4 >> /etc/hosts; done diff --git a/installer/modules/ovirt/files/modules.conf b/installer/modules/ovirt/files/modules.conf new file mode 100644 index 0000000..236ef4c --- /dev/null +++ b/installer/modules/ovirt/files/modules.conf @@ -0,0 +1,96 @@ +# specifies what cobbler modules to load. + +# what file/data formats to use for metadata +# +# choices: +# serializer_catalog (fast, uses .d directories in /var/lib/cobbler/config) +# serializer_yaml (original serializer, uses a few text files) +# +# for 99% or more of all installations, use serializer_catalog. +# +# NOTE: serializer changes may remove your ability to access old data. +# serializer_yaml users can change to serializer_catalog w/o manual +# migration steps. Other changes are for new installs only. + +[serializers] +settings = serializer_catalog +distro = serializer_catalog +profile = serializer_catalog +system = serializer_catalog +repo = serializer_catalog +image = serializer_catalog + +# policy: what users can log into the WebUI and Read-Write XMLRPC? +# +# choices: +# authn_denyall -- no one (default) +# authn_configfile -- use /etc/cobbler/users.digest (for basic setups) +# authn_passthru -- ask Apache to handle it (used for kerberos) +# authn_ldap -- authenticate against LDAP +# authn_spacewalk -- ask Spacewalk/Satellite (experimental) +# authn_testing -- username/password is always testing/testing (debug) +# (user supplied) -- you may write your own module +# +# WARNING: this is a security setting, do not choose an option blindly. +# +# for more information: +# https://fedorahosted.org/cobbler/wiki/CobblerWebInterface +# https://fedorahosted.org/cobbler/wiki/CustomizableSecurity +# https://fedorahosted.org/cobbler/wiki/CobblerWithKerberos +# https://fedorahosted.org/cobbler/wiki/CobblerWithLdap + +[authentication] +module = authn_configfile + +# policy: once a user has been cleared by the WebUI/XMLRPC, what can they do? +# +# choices: +# authz_allowall -- full access for all authneticated users (default) +# authz_configfile -- determined by /etc/cobbler/users.conf +# authz_ownership -- use users.conf, but add object ownership semantics +# (user supplied) -- you may write your own module +# +# WARNING: this is a security setting, do not choose an option blindly. +# +# for more information: +# https://fedorahosted.org/cobbler/wiki/CobblerWebInterface +# https://fedorahosted.org/cobbler/wiki/CustomizableSecurity +# https://fedorahosted.org/cobbler/wiki/CustomizableAuthorization +# https://fedorahosted.org/cobbler/wiki/AuthorizationWithOwnership + +[authorization] +module = authz_allowall + +# chooses the DNS management engine if manage_dns is enabled +# in /etc/cobbler/settings, which is off by default. +# +# choices: +# manage_bind -- default, uses BIND/named +# manage_dnsmasq -- uses dnsmasq, also must select dnsmasq for dhcp below +# +# NOTE: more configuration is still required in /etc/cobbler +# +# for more information: +# https://fedorahosted.org/cobbler/wiki/ManageDns + +[dns] +module = manage_bind + +# chooses the DHCP management engine if manage_dhcp is enabled +# in /etc/cobbler/settings, which is off by default. +# +# choices: +# manage_isc -- default, uses ISC dhcpd +# manage_dnsmasq -- uses dnsmasq, also must select dnsmasq for dns above +# +# NOTE: more configuration is still required in /etc/cobbler +# +# for more information: +# https://fedorahosted.org/cobbler/wiki/ManageDhcp + +[dhcp] +module = manage_isc + + + + diff --git a/installer/modules/ovirt/files/qpidd.conf b/installer/modules/ovirt/files/qpidd.conf new file mode 100644 index 0000000..014b23c --- /dev/null +++ b/installer/modules/ovirt/files/qpidd.conf @@ -0,0 +1,4 @@ +# Configuration file for qpidd. Entries are of the form: +# name = value +# Using default settings: "qpidd --help" or "man qpidd" for more details. +auth=no diff --git a/installer/modules/ovirt/manifests/cobbler.pp b/installer/modules/ovirt/manifests/cobbler.pp new file mode 100644 index 0000000..ca83b38 --- /dev/null +++ b/installer/modules/ovirt/manifests/cobbler.pp @@ -0,0 +1,126 @@ +#-- +# Copyright (C) 2008 Red Hat Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library 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 +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# Author: Joey Boggs +#-- + +import "appliance_base" +#import "firewall" + + +define apache_htdigest($digest_file, $digest_username, $digest_password, $digest_realm="") +{ + file_append{"add_htdigest_for_$digest_username_in_$digest_realm": + file => $digest_file, + line => template("ovirt/digest_line.erb") + } + +} + + +define cobbler_user_config($cobbler_user_name="",$cobbler_user_password="",$cobbler_hostname="") { + + file_replacement{"cobbler_user_name_config": + file => "/usr/share/ovirt-server/config/cobbler.yml", + pattern => "^username.*$", + replacement => "username: $cobbler_user_name", + require => Package[ovirt-server] + } + + file_replacement{"cobbler_user_password_config": + file => "/usr/share/ovirt-server/config/cobbler.yml", + pattern => "^password.*$", + replacement => "password: $cobbler_user_password", + require => File_replacement[cobbler_user_name_config] + } + file_replacement{"cobbler_hostname_config": + file => "/usr/share/ovirt-server/config/cobbler.yml", + pattern => "^hostname.*$", + replacement => "hostname: $cobbler_hostname", + require => File_replacement[cobbler_user_name_config] + } + +} + +class cobbler::bundled { + package {"cobbler": + ensure => installed + } + + apache_htdigest{"cobbler_add_user": + digest_file => "/etc/cobbler/users.digest", + digest_username => "$cobbler_user_name", + digest_password => "$cobbler_user_password", + digest_realm => "Cobbler", + require => Package[cobbler] + } + + cobbler_user_config {"cobbler_bundled_user": + cobbler_user_name=> "$cobbler_user_name", + cobbler_user_password => "$cobbler_user_password", + cobbler_hostname => "localhost", + require => Package[cobbler] + } + + file_replacement{"settings_ip_address": + file => "/etc/cobbler/settings", + pattern => "127.0.0.1", + replacement => $ipaddress, + notify => Service[cobblerd], + require => Package[cobbler] + } + + file_replacement{"settings_xml_rpc": + file => "/etc/cobbler/settings", + pattern => "xmlrpc_rw_enabled: 0", + replacement => "xmlrpc_rw_enabled: 1", + require => File_replacement[settings_ip_address], + notify=> Service[cobblerd] + } + + service {"cobblerd" : + ensure => running, + enable => true, + require => File_replacement[settings_ip_address] + } + + file {"/etc/cobbler/modules.conf": + source => "puppet:///ovirt/modules.conf", + notify => Service[cobblerd], + require => Package["cobbler"] + } + +# firewall_rule{"69": destination_port => "69"} +# firewall_rule{"25150": destination_port => "25150"} +# firewall_rule{"25151": destination_port => "25151"} + +} + +class cobbler::remote { + +# On the remote cobbler server run the following command: +# htdigest /etc/cobbler/users.digest "Cobbler" $user_name +# Ensure the password is set to $cobbler_user_password + + + cobbler_user_config {"cobbler_remote_user": + cobbler_user_name => "$cobbler_user_name", + cobbler_user_password => "$cobbler_user_password", + cobbler_hostname => "$cobbler_hostname" + } +} + diff --git a/installer/modules/ovirt/manifests/dhcp.pp b/installer/modules/ovirt/manifests/dhcp.pp new file mode 100644 index 0000000..c5c8f9a --- /dev/null +++ b/installer/modules/ovirt/manifests/dhcp.pp @@ -0,0 +1,34 @@ +#-- +# Copyright (C) 2008 Red Hat Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library 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 +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# Author: Joey Boggs +#-- + +class dhcp::bundled { + + file {"/etc/dnsmasq.d/ovirt-dhcp.conf": + content => template("ovirt/ovirt-dhcp.conf.erb"), + mode => 644, + notify => Service[dnsmasq], + require => Package[dnsmasq] + } + + single_exec {"dns_entries": + command => "/usr/share/ace/modules/ovirt/files/dns_entries.sh $dhcp_start $dhcp_stop $dhcp_network $dhcp_domain", + } + +} diff --git a/installer/modules/ovirt/manifests/dns.pp b/installer/modules/ovirt/manifests/dns.pp new file mode 100644 index 0000000..5326c7c --- /dev/null +++ b/installer/modules/ovirt/manifests/dns.pp @@ -0,0 +1,99 @@ +#-- +# Copyright (C) 2008 Red Hat Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library 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 +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# Author: Joey Boggs +#-- + +# common featues +define dns::common($mgmt_ipaddr="", $prov_ipaddr="",$mgmt_dev="",$prov_dev="") { + + package {"dnsmasq": + ensure => installed, + require => [Single_exec["add_dns_server_to_resolv.conf"]] + } + + service {"dnsmasq" : + ensure => running, + enable => true, + require => [File["/etc/dnsmasq.d/ovirt-dns.conf"], Package["dnsmasq"]] + } + + file {"/etc/dnsmasq.d/ovirt-dns.conf": + content => template("ovirt/ovirt-dns.conf.erb"), + mode => 644, + notify => Service[dnsmasq], + require => Package["dnsmasq"] + } + + single_exec {"add_dns_server_to_resolv.conf": + command => "/bin/sed -e '1i nameserver $prov_ipaddr' -i /etc/resolv.conf", + require => [Single_exec["set_hostname"]] + } + + + file_replacement {"dnsmasq_configdir": + file => "/etc/dnsmasq.conf", + pattern => "^#conf-dir=*$", + replacement => "conf-dir=/etc/dnsmasq.d", + notify => Service[dnsmasq], + require => Package["dnsmasq"] + } + + file {"/etc/dhclient.conf": + ensure => present + } + + file_append {"dhclient_config": + file => "/etc/dhclient.conf", + line => "prepend domain-name-servers $prov_ipaddr", + require => [Single_exec["set_hostname"], Package["dnsmasq"], File["/etc/dhclient.conf"]] , + notify => Service[dnsmasq], + } + +} + +define dns::bundled($mgmt_ipaddr="", $prov_ipaddr="",$mgmt_dev="",$prov_dev="") { + + dns::common{"setup": mgmt_ipaddr=>$mgmt_ipaddr, prov_ipaddr=>$prov_ipaddr, mgmt_dev=>$mgmt_dev, prov_dev=>$prov_dev} + + single_exec {"add_mgmt_server_to_etc_hosts": + command => "/bin/echo $mgmt_ipaddr $ipa_host >> /etc/hosts", + notify => [Service[dnsmasq], Single_exec["add_dns_server_to_resolv.conf"]] + } +} + +define dns::remote($mgmt_ipaddr="", $prov_ipaddr="",$mgmt_dev="",$prov_dev="") { + +# On the pxe server you will need to ensure that the +# next server option points to the ip address of the tftp server + +# The following SRV records must be present in the dns server for everything +# to function properly. Replace example.com with the appropriate domain + +# _ovirt._tcp.example.com. SRV 0 5 80 ovirtwuiserver.example.com. +# _ipa._tcp.example.com. SRV 0 5 80 ipaserver.example.com. +# _ldap._tcp.example.com. SRV 0 5 389 ldapserver.example.com. +# _collectd._tcp.example.com. SRV 0 5 25826 ovirtwuiserver.example.com. +# _qpidd._tcp.example.com. SRV 0 5 5672 ovirtwuiserver.example.com. +# _identify._tcp.example.com. SRV 0 5 12120 ovirtwuiserver.example.com. + +# Also A records must be present for each oVirt node. Without this they are unable +# to determine their hostname and locate the management server. + + dns::common{"setup": mgmt_ipaddr=>$mgmt_ipaddr, prov_ipaddr=>$prov_ipaddr, mgmt_dev=>$mgmt_dev, prov_dev=>$prov_dev} + +} diff --git a/installer/modules/ovirt/manifests/freeipa.pp b/installer/modules/ovirt/manifests/freeipa.pp new file mode 100644 index 0000000..f639d46 --- /dev/null +++ b/installer/modules/ovirt/manifests/freeipa.pp @@ -0,0 +1,103 @@ +#-- +# Copyright (C) 2008 Red Hat Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library 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 +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# Author: Joey Boggs +#-- + +class freeipa::bundled{ + + package {"ipa-server": + ensure => installed, + require => [Exec[db_exists_file],Single_exec["set_hostname"]] + } + + single_exec {"set_hostname": + command => "/bin/hostname $ipa_host", + } + + exec {"set_kdc_defaults": + command => "/bin/sed -i '/\[kdcdefaults\]/a \ kdc_ports = 88' /usr/share/ipa/kdc.conf.template", + require => Package[ipa-server] + } + + exec {"replace_line_returns": + command => "/bin/sed -i -e 's/^/#/' /etc/httpd/conf.d/ipa-rewrite.conf", + require => Single_Exec[ipa_server_install] + } + + file_replacement{"ipa_proxy_config_1": + file => "/etc/httpd/conf.d/ipa.conf", + pattern => "^", + replacement => "", + require => Exec[replace_line_returns] + } + + file_replacement{"ipa_proxy_config_2": + file => "/etc/httpd/conf.d/ipa.conf", + pattern => "^", + replacement => "", + require => File_replacement[ipa_proxy_config_1], + notify => Service[httpd] + } + + single_exec {"dnsmasq_restart": + command => "/etc/init.d/dnsmasq restart", + require => Service["dnsmasq"] + } + + single_exec {"ipa_server_install": + command => "/usr/sbin/ipa-server-install -r $realm_name -p $freeipa_password -P $freeipa_password -a $freeipa_password --hostname $ipa_host -u dirsrv -U", + require => [Exec[set_kdc_defaults],Single_exec[dnsmasq_restart]] + } + + exec {"get_krb5_tkt": + command => "/bin/echo $freeipa_password|/usr/kerberos/bin/kinit admin", + require => Single_Exec[ipa_server_install] + } + + single_exec {"ipa_modify_username_length": + command => "/usr/sbin/ipa-defaultoptions --maxusername=12", + require => Exec["get_krb5_tkt"] + } + + single_exec {"ipa_add_ovirtadmin_user": + command => "/usr/sbin/ipa-adduser -f Ovirt -l Admin -p $freeipa_password ovirtadmin", + require => Single_exec[ipa_modify_username_length] + } + + single_exec {"ipa_ovirtadmin_group": + command => "/usr/sbin/ipa-modgroup -a ovirtadmin admins", + require => Single_exec[ipa_add_ovirtadmin_user] + } + + single_exec {"set_pw_expiration": + command => "/usr/sbin/ipa-moduser --setattr krbPasswordExpiration=19700101000000Z ovirtadmin", + require => Single_exec[ipa_ovirtadmin_group] + } + +# firewall_rule{"krb5": destination_port => "88"} +# firewall_rule {"ldap": destination_port => '389'} + +} + +class freeipa::remote { + +# oVirt is not configured at this time to support a remote freeipa server + +} + + diff --git a/installer/modules/ovirt/manifests/init.pp b/installer/modules/ovirt/manifests/init.pp new file mode 100644 index 0000000..87f6832 --- /dev/null +++ b/installer/modules/ovirt/manifests/init.pp @@ -0,0 +1,9 @@ +import "ovirt/cobbler.pp" +import "ovirt/dns.pp" +import "ovirt/dhcp.pp" +import "ovirt/tftp.pp" +import "ovirt/freeipa.pp" +import "ovirt/ovirt.pp" +import "ovirt/postgres.pp" +import "appliance_base/single_exec.pp" + diff --git a/installer/modules/ovirt/manifests/ovirt.pp b/installer/modules/ovirt/manifests/ovirt.pp new file mode 100644 index 0000000..c9d3aee --- /dev/null +++ b/installer/modules/ovirt/manifests/ovirt.pp @@ -0,0 +1,154 @@ +#-- +# Copyright (C) 2008 Red Hat Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library 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 +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# Author: Joey Boggs +#-- + +class ovirt::setup { + + package {"ovirt-server": + ensure => installed, + require => Single_exec[set_pw_expiration] + } + + package {"httpd": + ensure => installed; + } + + package {"rubygem-rake": + ensure => installed; + } + + package {"qpidd": + ensure => installed; + } + + package {"collectd": + ensure => installed; + } + + package {"collectd-rrdtool": + ensure => installed; + } + + package {"libvirt": + ensure => installed; + } + + package {"ruby-qpid": + ensure => installed; + } + + package {"ntp": + ensure => installed; + } + + file {"/etc/collectd.conf": + source => "puppet:///ovirt/collectd.conf", + notify => Service[collectd], + require => Package["collectd-rrdtool"] + } + + file {"/etc/qpidd.conf": + source => "puppet:///ovirt/qpidd.conf", + notify => Service[qpidd] + } + + single_exec { "db_migrate" : + cwd => "/usr/share/ovirt-server/", + command => "/usr/bin/rake db:migrate", + require => [File["/usr/share/ovirt-server/log"],Package[ovirt-server],Package[rubygem-rake],Postgres_execute_command["ovirt_db_grant_permissions"]], + environment => "RAILS_ENV=production" + } + + file { "/usr/share/ovirt-server/log" : + ensure => directory, + require => Package[ovirt-server] + } + + single_exec { "create_ovirtadmin_acct" : + command => "/usr/share/ovirt-server/script/grant_admin_privileges ovirtadmin", + require => Single_Exec[db_migrate] + } + + single_exec { "add_host" : + command => "/usr/bin/ovirt-add-host $ipa_host /usr/share/ovirt-server/ovirt.keytab", + require => Package[ovirt-server] + } + + exec { "disable_selinux" : + command => "/usr/sbin/lokkit --selinux=disabled", + require => Package["ovirt-server"] + } + + service {"httpd" : + enable => true, + require => Package[httpd], + ensure => running + } + + service {"libvirt" : + enable => false, + require => Package[libvirt], + } + + service {"ovirt-host-browser" : + enable => true, + require => [Package[ovirt-server],Single_Exec[db_migrate]], + ensure => running + } + + service {"ovirt-host-collect" : + enable => true, + require => [Package[ovirt-server],Single_Exec[db_migrate]], + ensure => running + } + + service {"ovirt-mongrel-rails" : + enable => true, + require => [Package[ovirt-server],Single_Exec[db_migrate]], + ensure => running, + notify => Service[httpd] + } + + service {"ovirt-taskomatic" : + enable => true, + require => [Package[ovirt-server],Single_Exec[db_migrate]], + ensure => running + } + + service {"qpidd" : + enable => true, + ensure => running, + require => Package[qpidd] + } + + service {"collectd" : + enable => true, + ensure => running, + require => Package[collectd] + } + + service {"ntpd" : + enable => true, + ensure => running, + require => Package[ntp] + } + +# firewall_rule{"http": destination_port => "80"} + +} diff --git a/installer/modules/ovirt/manifests/postgres.pp b/installer/modules/ovirt/manifests/postgres.pp new file mode 100644 index 0000000..af0f31b --- /dev/null +++ b/installer/modules/ovirt/manifests/postgres.pp @@ -0,0 +1,114 @@ +#-- +# Copyright (C) 2008 Red Hat Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library 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 +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# Author: Joey Boggs +#-- + +import "postgres" +import "appliance_base/single_exec.pp" + +class postgres::bundled{ + + + package {"postgresql-server": + ensure => installed, + } + package {"ace-postgres": + ensure => installed, + require => Package[postgresql-server] + } + + single_exec {"initialize_db": + command => "/sbin/service postgresql initdb", + creates => "/var/lib/pgsql/data/pg_hba.conf", + require => Package[postgresql-server] + } + + service {"postgresql" : + ensure => running, + enable => true, + require => Single_exec[initialize_db] + } + + single_exec {"create_ovirt_db": + command => "/usr/bin/createdb ovirt", + require => [Exec[postgres_add_all_trust], Service[postgresql]], + user => "postgres" + } + + single_exec {"create_ovirt_development_db": + command => "/usr/bin/createdb ovirt_development", + require => [Exec[postgres_add_all_trust], Service[postgresql]], + user => "postgres" + } + + postgres_execute_command {"ovirt_db_create_role": + cmd => "CREATE ROLE ovirt LOGIN PASSWORD '$db_password' NOINHERIT VALID UNTIL 'infinity'", + database => "ovirt", + require => Single_Exec[create_ovirt_db] + } + + postgres_execute_command {"ovirt_db_grant_permissions": + cmd => "GRANT ALL ON DATABASE ovirt TO ovirt;", + database => "ovirt", + require => Postgres_execute_command[ovirt_db_create_role] + } + + exec {"postgres_add_all_trust": + command => "/bin/echo 'local all all trust' > /var/lib/pgsql/data/pg_hba.conf", + require => Single_exec[initialize_db], + notify => Service[postgresql] + } + + exec {"postgres_add_localhost_trust": + command => "/bin/echo 'host all all 127.0.0.1 255.255.255.0 trust' >> /var/lib/pgsql/data/pg_hba.conf", + require => Exec[postgres_add_all_trust], + notify => Service[postgresql] + } + + file { "/etc/ovirt-server/" : + ensure => directory, + require => Exec[postgres_add_localhost_trust] + } + + file { "/etc/ovirt-server/db/" : + ensure => directory, + require => File["/etc/ovirt-server"] + } + + exec {"touch_dbaccess_file": + command => "/bin/touch /etc/ovirt-server/db/dbaccess", + require => File["/etc/ovirt-server/db"] + } + + file_append {"db_password_file": + file => "/etc/ovirt-server/db/dbaccess", + line => "$db_password", + require => Exec[touch_dbaccess_file] + } + exec {"db_exists_file": + command => "/bin/touch /etc/ovirt-server/db/exists", + require => File_append[db_password_file] + } +} + +class postgres::remote{ + +# oVirt is not configured at this time to support a remote postgres connection + +} + diff --git a/installer/modules/ovirt/manifests/tftp.pp b/installer/modules/ovirt/manifests/tftp.pp new file mode 100644 index 0000000..4f41d00 --- /dev/null +++ b/installer/modules/ovirt/manifests/tftp.pp @@ -0,0 +1,31 @@ +#-- +# Copyright (C) 2008 Red Hat Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library 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 +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# Author: Joey Boggs +#-- + +class tftp::bundled { + + file {"/etc/dnsmasq.d/ovirt-tftp.conf": + content => template("ovirt/ovirt-tftp.conf.erb"), + mode => 644, + notify => Service[dnsmasq], + require => Package[dnsmasq] + } +} + + diff --git a/installer/modules/ovirt/templates/digest_line.erb b/installer/modules/ovirt/templates/digest_line.erb new file mode 100644 index 0000000..4e98708 --- /dev/null +++ b/installer/modules/ovirt/templates/digest_line.erb @@ -0,0 +1,4 @@ +<% require 'digest/sha1' -%> +<% token = "#{digest_username}:#{digest_realm}:#{digest_password}" -%> +<% digested_password = Digest::MD5.hexdigest(token) -%> +<%= digest_username -%>:<%= digest_realm -%>:<%= digested_password -%> diff --git a/installer/modules/ovirt/templates/ovirt-dhcp.conf.erb b/installer/modules/ovirt/templates/ovirt-dhcp.conf.erb new file mode 100644 index 0000000..e10db40 --- /dev/null +++ b/installer/modules/ovirt/templates/ovirt-dhcp.conf.erb @@ -0,0 +1,9 @@ +interface=<%= dhcp_interface %> +dhcp-range=<%= dhcp_network %>.<%= dhcp_start %>,<%= dhcp_network%>.<%= dhcp_stop %> +domain=<%= dhcp_domain %> +dhcp-option=option:router,<%= prov_network_gateway %> +dhcp-option=option:ntp-server,<%= ntp_server %> +dhcp-option=12 +no-resolv +local=/<%= dhcp_domain %>/ +server=<%= prov_dns_server %> diff --git a/installer/modules/ovirt/templates/ovirt-dns.conf.erb b/installer/modules/ovirt/templates/ovirt-dns.conf.erb new file mode 100644 index 0000000..ae3eb48 --- /dev/null +++ b/installer/modules/ovirt/templates/ovirt-dns.conf.erb @@ -0,0 +1,7 @@ +srv-host=_ovirt._tcp,<%= ovirt_host %>,80 +srv-host=_ipa._tcp,<%= ipa_host %>,80 +srv-host=_ldap._tcp,<%= ipa_host %>,389 +srv-host=_collectd._tcp,<%= ovirt_host %>,25826 +srv-host=_qpidd._tcp,<%= ovirt_host %>,5672 +srv-host=_identify._tcp,<%= ovirt_host %>,12120 + diff --git a/installer/modules/ovirt/templates/ovirt-tftp.conf.erb b/installer/modules/ovirt/templates/ovirt-tftp.conf.erb new file mode 100644 index 0000000..3fa40f8 --- /dev/null +++ b/installer/modules/ovirt/templates/ovirt-tftp.conf.erb @@ -0,0 +1,3 @@ +enable-tftp +tftp-root=/var/lib/tftpboot +dhcp-boot=pxelinux.0 diff --git a/ovirt-server.spec.in b/ovirt-server.spec.in index 79a5adf..330203a 100644 --- a/ovirt-server.spec.in +++ b/ovirt-server.spec.in @@ -1,5 +1,6 @@ %define pbuild %{_builddir}/%{name}-%{version} %define app_root %{_datadir}/%{name} +%define acehome %{_datadir}/ace Summary: oVirt Server Suite Name: ovirt-server @@ -45,10 +46,20 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot URL: http://ovirt.org/ -%description +%package installer +Summary: Installer modules for the oVirt Server Suite +Requires: ruby(abi) = 1.8 +Requires: ace +Requires: ace-postgres +Requires: rubygem(highline) +Requires: hal +%description The Server Suite for oVirt. +%description installer +The Installer for the ovirt server suite + %prep %setup -q @@ -59,6 +70,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT mkdir %{buildroot} %{__install} -d -m0755 %{buildroot}%{_bindir} +%{__install} -d -m0755 %{buildroot}%{_datadir} %{__install} -d -m0755 %{buildroot}%{_sbindir} %{__install} -d -m0755 %{buildroot}%{_initrddir} %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/sysconfig @@ -69,6 +81,7 @@ mkdir %{buildroot} %{__install} -d -m0755 %{buildroot}%{_localstatedir}/log/%{name} %{__install} -d -m0755 %{buildroot}%{_localstatedir}/run/%{name} %{__install} -d -m0755 %{buildroot}%{app_root} +%{__install} -d -m0755 %{buildroot}/%{acehome} touch %{buildroot}%{_localstatedir}/log/%{name}/mongrel.log touch %{buildroot}%{_localstatedir}/log/%{name}/rails.log @@ -114,6 +127,12 @@ touch %{buildroot}%{_localstatedir}/log/%{name}/db-omatic.log %{__mkdir} %{buildroot}%{_localstatedir}/lib/%{name}/tmp %{__ln_s} %{_localstatedir}/lib/%{name}/tmp %{buildroot}%{app_root}/tmp +# Set up the installer +%{__cp} -pr %{pbuild}/installer/modules %{buildroot}/%{acehome} +%{__cp} -pr %{pbuild}/installer/appliances %{buildroot}/%{acehome} +%{__cp} -pr %{pbuild}/installer/bin/ovirt-installer %{buildroot}%{_sbindir} + + %clean rm -rf $RPM_BUILD_ROOT @@ -193,6 +212,10 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/production.rb %config(noreplace) %{_sysconfdir}/%{name}/test.rb +%files installer +%{_sbindir}/ovirt-installer +%{acehome} + %changelog * Thu May 29 2008 Alan Pevec - 0.0.5-0 - use rubygem-krb5-auth -- 1.6.0.6 From pmyers at redhat.com Tue Jan 20 21:56:35 2009 From: pmyers at redhat.com (Perry Myers) Date: Tue, 20 Jan 2009 16:56:35 -0500 Subject: [Ovirt-devel] [PATCH node] Add in better error reporting for o-c-networking and show network interface bringup Message-ID: <1232488595-9821-1-git-send-email-pmyers@redhat.com> Signed-off-by: Perry Myers --- scripts/ovirt-config-networking | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/scripts/ovirt-config-networking b/scripts/ovirt-config-networking index 5727c47..9ede511 100755 --- a/scripts/ovirt-config-networking +++ b/scripts/ovirt-config-networking @@ -233,17 +233,27 @@ else fi start_log +net_configured=1 if ls "$WORKDIR"/augtool-* > /dev/null 2>&1 ; then log "Configuring network" config="$WORKDIR"/config-augtool cat "$WORKDIR"/augtool-* > $config \ - && augtool $config \ - && service network restart + && augtool $config if [ $? = 0 ]; then log "Network configured successfully" + net_configured=0 + ovirt_store_config /etc/sysconfig/network-scripts/ifcfg* else log "Error configuring network, see $OVIRT_LOGFILE" + stop_log + exit 1 fi fi -ovirt_store_config /etc/sysconfig/network-scripts/ifcfg* stop_log + +if [ "$net_configured" = 0 ]; then + service network stop > /dev/null 2>&1 + service network start +fi + +exit 0 -- 1.6.0.6 From pmyers at redhat.com Tue Jan 20 21:56:49 2009 From: pmyers at redhat.com (Perry Myers) Date: Tue, 20 Jan 2009 16:56:49 -0500 Subject: [Ovirt-devel] [PATCH node] Add support for finding virtio interfaces that may not have been detected by hal Message-ID: <1232488609-9971-1-git-send-email-pmyers@redhat.com> Signed-off-by: Perry Myers --- scripts/ovirt-config-networking | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/scripts/ovirt-config-networking b/scripts/ovirt-config-networking index 9ede511..3ad8ee3 100755 --- a/scripts/ovirt-config-networking +++ b/scripts/ovirt-config-networking @@ -199,14 +199,17 @@ function configure_dns function setup_menu { + NICS="" udi_list=$(hal-find-by-capability --capability net.80203) - if [ -z "$udi_list" ]; then - warn "ERROR: no usable network devices were found" - exit 1 + if [ -n "$udi_list" ]; then + for d in $udi_list; do + NICS="$NICS $(hal-get-property --udi "$d" --key net.interface)" + done fi - NICS="" - for d in $udi_list; do NICS="$NICS $(hal-get-property --udi "$d" --key net.interface)"; done + # Add virtio NICs that were possibly not detected by hal + NICS="$NICS $(ifconfig -a | awk '/Ethernet/ {print $1}' | xargs)" + NICS=$(echo $NICS | tr ' ' '\n' | sort -u | xargs) PS3="Please select an interface or configuration option: " } -- 1.6.0.6 From pmyers at redhat.com Tue Jan 20 22:13:49 2009 From: pmyers at redhat.com (Perry Myers) Date: Tue, 20 Jan 2009 17:13:49 -0500 Subject: [Ovirt-devel] [PATCH node] Remove some redirects to /dev/null so we get better logs Message-ID: <1232489629-15722-1-git-send-email-pmyers@redhat.com> Signed-off-by: Perry Myers --- scripts/ovirt-config-boot | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/ovirt-config-boot b/scripts/ovirt-config-boot index 8c25d47..30ad8df 100755 --- a/scripts/ovirt-config-boot +++ b/scripts/ovirt-config-boot @@ -63,7 +63,7 @@ ovirt_boot_setup() { tmpdir=$(mktemp -d) cd $tmpdir gzip -dc $live/$syslinux/initrd0.img | - cpio -id init sbin/real-init 2> /dev/null + cpio -id init sbin/real-init init_script=init if [ -e sbin/real-init ]; then # Fedora 10 mkliveinitrd @@ -109,7 +109,7 @@ title oVirt Node EOF echo "(hd0) $disk" > /boot/grub/device.map ( cd /usr/share/grub/*; cp -p stage? e2fs_stage1_5 /boot/grub ) - grub --device-map=/boot/grub/device.map > /dev/null < /dev/null +parted $disk -s "print all" if [ 0 -eq $? ]; then ovirt_boot_setup "$disk" "$live" "$bootparams" -- 1.6.0.6 From apevec at gmail.com Tue Jan 20 22:29:07 2009 From: apevec at gmail.com (Alan Pevec) Date: Tue, 20 Jan 2009 23:29:07 +0100 Subject: [Ovirt-devel] [PATCH node] Add in better error reporting for o-c-networking and show network interface bringup In-Reply-To: <1232488595-9821-1-git-send-email-pmyers@redhat.com> References: <1232488595-9821-1-git-send-email-pmyers@redhat.com> Message-ID: <2be7262f0901201429w2c59d11s49e6bfd3702a031@mail.gmail.com> ack just: +net_configured=1 use normal boolean values where 1=true that twisted shell logic is just for return codes -------------- next part -------------- An HTML attachment was scrubbed... URL: From apevec at gmail.com Tue Jan 20 22:30:07 2009 From: apevec at gmail.com (Alan Pevec) Date: Tue, 20 Jan 2009 23:30:07 +0100 Subject: [Ovirt-devel] [PATCH node] Add support for finding virtio interfaces that may not have been detected by hal In-Reply-To: <1232488609-9971-1-git-send-email-pmyers@redhat.com> References: <1232488609-9971-1-git-send-email-pmyers@redhat.com> Message-ID: <2be7262f0901201430p4169de74n43c4abe4adc880b0@mail.gmail.com> ack as a temp. workaround -------------- next part -------------- An HTML attachment was scrubbed... URL: From jguiditt at redhat.com Tue Jan 20 22:49:49 2009 From: jguiditt at redhat.com (Jason Guiditta) Date: Tue, 20 Jan 2009 17:49:49 -0500 Subject: [Ovirt-devel] [PATCH] Updated tree nav layout to move smart pools above the main pools. In-Reply-To: <1232395792-28920-1-git-send-email-sseago@redhat.com> References: <1232395792-28920-1-git-send-email-sseago@redhat.com> Message-ID: <1232491789.4280.8.camel@physical.priv.ovirt.org> ACK but for the issue I hit if you have no smart pools, problem described inline and, one css fix inline. -j On Mon, 2009-01-19 at 20:09 +0000, Scott Seago wrote: > Dashboard and networks have their own links in the nav. > Also updating reworked nav icons. > > Signed-off-by: Scott Seago > --- > src/app/controllers/network_controller.rb | 13 +++++- > src/app/controllers/tree_controller.rb | 53 ++++++++++++++++--------- > src/app/models/pool.rb | 12 +++++- > src/app/views/layouts/_navigation_tabs.rhtml | 9 ++++ > src/app/views/layouts/_tree.rhtml | 23 +++++++++-- > src/public/images/icon_add_hardwarepool.png | Bin 1223 -> 1133 bytes > src/public/images/icon_add_smartpool.png | Bin 1341 -> 948 bytes > src/public/images/icon_add_vmpool.png | Bin 838 -> 741 bytes > src/public/images/icon_dashboard.gif | Bin 14152 -> 0 bytes > src/public/images/icon_dashboard.png | Bin 0 -> 4457 bytes > src/public/images/icon_hdwarepool.png | Bin 1179 -> 4509 bytes > src/public/images/icon_networks.png | Bin 0 -> 4223 bytes > src/public/images/icon_smartpool.png | Bin 641 -> 4233 bytes > src/public/images/icon_smartpools.png | Bin 0 -> 4117 bytes > src/public/images/icon_smartpools_dir.png | Bin 0 -> 4228 bytes > src/public/javascripts/ovirt.tree.js | 43 ++++++-------------- > src/public/stylesheets/ovirt-tree/tree.css | 27 +++++++++++-- > 17 files changed, 119 insertions(+), 61 deletions(-) > delete mode 100644 src/public/images/icon_dashboard.gif > create mode 100644 src/public/images/icon_dashboard.png > create mode 100644 src/public/images/icon_networks.png > create mode 100644 src/public/images/icon_smartpools.png > create mode 100644 src/public/images/icon_smartpools_dir.png > > diff --git a/src/app/controllers/tree_controller.rb b/src/app/controllers/tree_controller.rb > index 07d46f7..e2065ca 100644 > --- a/src/app/controllers/tree_controller.rb > +++ b/src/app/controllers/tree_controller.rb > @@ -29,12 +29,19 @@ class TreeController < ApplicationController > @clientHash[tempItem[0]] = itemHash > } > end > - @serverHash = {:pools => build_json(HardwarePool.get_default_pool.full_set_nested(:method => :json_hash_element, > - :privilege => Permission::PRIV_VIEW, :user => get_login_user)) > - } > - @serverHash[:smart_pools] = adjust_smart_pool_list(build_json(DirectoryPool.get_smart_root.full_set_nested(:method => :json_hash_element, > - :privilege => Permission::PRIV_VIEW, :user => get_login_user, > - :smart_pool_set => true))) > + pools = build_json( > + HardwarePool.get_default_pool.full_set_nested( > + :method => :json_hash_element, > + :privilege => Permission::PRIV_VIEW, > + :user => get_login_user)) > + smart_pools = adjust_smart_pool_list( > + build_json( > + DirectoryPool.get_smart_root.full_set_nested( > + :method => :json_hash_element, > + :privilege => Permission::PRIV_VIEW, > + :user => get_login_user, > + :smart_pool_set => true))) > + @serverHash = {:pools => smart_pools + pools } > @ids.each { |item| > if @clientHash.has_key?(item.to_s) > @clientHash.delete(item.to_s) > @@ -69,19 +76,27 @@ class TreeController < ApplicationController > end > > def adjust_smart_pool_list(list) > - mySmartPools = Array.new > - otherSmartPools = Array.new > - list.each {|listItem| > - if (listItem[:name] == get_login_user) > - if listItem.has_key?(:children) > - listItem[:children].each {|item| > - mySmartPools.push(item) > - } > + # list should have a single element. If it doesn't, don't transform anything here > + if list.size == 1 > + smart_root = list[0] > + smart_root[:name] = "Smart Pools" > + smart_root[:type] = "SmartPoolRoot" > + mySmartPools = Array.new > + otherSmartPools = Array.new The following line throws an error of you have no smart pools: NoMethodError (You have a nil object when you didn't expect it! You might have expected an instance of Array. The error occurred while evaluating nil.each) > + smart_root[:children].each {|listItem| > + if (listItem[:name] == get_login_user) > + if listItem.has_key?(:children) > + listItem[:children].each {|item| > + item[:parent_id] = smart_root[:id] > + mySmartPools.push(item) > + } > + end > + else > + otherSmartPools.push(listItem) > end > - else > - otherSmartPools.push(listItem) > - end > - } > - mySmartPools + otherSmartPools > + } > + smart_root[:children] = mySmartPools + otherSmartPools > + end > + list > end > end > diff --git a/src/public/stylesheets/ovirt-tree/tree.css > b/src/public/stylesheets/ovirt-tree/tree.css > index 7d5411f..de019f4 100644 > --- a/src/public/stylesheets/ovirt-tree/tree.css > +++ b/src/public/stylesheets/ovirt-tree/tree.css > @@ -1,12 +1,12 @@ > #nav_tree { > - padding: 20px; > + padding: 0px 20px; > } > > .nav-tree { > width: 222px; > position: absolute; > overflow: auto; > - top: 25px; > + top: 50px; if you get rid of the following line, the blank space that used to hold smart pools list will go away. Actually, I know jeremy had some style stuff for you to add that is not in this patch, so after this is in, I will fix a couple other things once I see what he has added. We can probably do away with most, if not all, of the absolute positioning. For now though, this next line needs to go. > bottom: 140px; > } > > @@ -44,6 +44,15 @@ > background-image: url('../../images/icon_smartpool.png'); > } > > +.SmartPoolRoot { > + padding: 4px 0 4px 28px !important; > + background-image: url('../../images/icon_smartpools.png'); > +} > +.DirectoryPool { > + padding: 4px 0 4px 28px !important; > + background-image: url('../../images/icon_smartpools_dir.png'); > +} > + > .hitarea { > width: 16px; > margin-left: -16px; > @@ -81,11 +90,21 @@ > } > > .nav-dashboard { > - background-image: url('../../images/icon_dashboard.gif'); > + background-image: url('../../images/icon_dashboard.png'); > background-repeat: no-repeat; > background-position: left; > padding: 0px 0 0px 28px; > position: absolute; > height: 25px; > top: 0; > -} > \ No newline at end of file > +} > + > +.nav-networks { > + background-image: url('../../images/icon_networks.png'); > + background-repeat: no-repeat; > + background-position: left; > + padding: 0px 0 0px 28px; > + position: absolute; > + height: 25px; > + top: 25px; > +} From jdong at redhat.com Wed Jan 21 01:57:02 2009 From: jdong at redhat.com (jdong) Date: Wed, 21 Jan 2009 09:57:02 +0800 Subject: [Ovirt-devel] Where to check about 500 Internal Server Error matter In-Reply-To: <20090120131418.GP9671@redhat.com> References: <4975804F.803@redhat.com> <20090120131418.GP9671@redhat.com> Message-ID: <497680EE.1040106@redhat.com> Hugh O. Brock wrote: > On Tue, Jan 20, 2009 at 03:42:07PM +0800, jdong wrote: > >> Hey guys, >> >> I was troubled by a matter these days. >> I installed ovirt-appliance successfully.But every time I shutdowned my >> computer, started it and started ovirt-appliance, it always got 500 >> internal server error. >> And if I "get-ovirt-appliance"--"create ovirt-appliance"--"virsh start >> ovirt-appliance",it can be ok.Obviously,all stored data disappeared. >> I asked one friend from GSS help me to install it and try.He got the >> same error. >> Did any one here meet the same condition? >> I guess it is a bug here.But it is hard to set steps to reproduce it. >> And how can I check this "Internal Server"?And can the shutdown and >> start actions destroy some configures? >> BTW:I notice that ovirt people publish some patches every day.Can I >> just download and run to fix some problem? >> Thanks, :-) >> >> Nikki >> > > Hi Nikki. Are you shutting down the oVirt appliance before shutting > down your computer? If not, that's probably a good idea, although I'm > not 100% sure it will help. When you virsh start ovirt-appliance, can > you ssh into the appliance? > > Let me know, > --Hugh > Yeah.I have tried "virsh shutdown ovirt-appliance".And I virsh start it.It also go to a problem of file system. I can ssh it. Even I cannot login to WUI,I can ssh it everytime.I will mount a cd-rom and go to rescue mode to try. From katzj at redhat.com Wed Jan 21 02:05:24 2009 From: katzj at redhat.com (Jeremy Katz) Date: Tue, 20 Jan 2009 21:05:24 -0500 Subject: [Ovirt-devel] [PATCH] get-ovirt-appliance uses wget, so Require it Message-ID: <1232503524-18437-1-git-send-email-katzj@redhat.com> --- ovirt-appliance.spec.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ovirt-appliance.spec.in b/ovirt-appliance.spec.in index c37d957..c44fd8e 100644 --- a/ovirt-appliance.spec.in +++ b/ovirt-appliance.spec.in @@ -16,6 +16,7 @@ Requires: kvm >= 78-4 Requires: qemu-img Requires: augeas Requires: virt-viewer-plugin +Requires: wget %define app_root %{_datadir}/%{name} -- 1.6.1 From apevec at redhat.com Wed Jan 21 09:32:29 2009 From: apevec at redhat.com (Alan Pevec) Date: Wed, 21 Jan 2009 10:32:29 +0100 Subject: [Ovirt-devel] Re: [PATCH] get-ovirt-appliance uses wget, so Require it In-Reply-To: <1232503524-18437-1-git-send-email-katzj@redhat.com> References: <1232503524-18437-1-git-send-email-katzj@redhat.com> Message-ID: <4976EBAD.9060009@redhat.com> ACK and thanks! It was against master branch, applied to 'next' see http://ovirt.org/scmrepo.html There are two important public branches: * master branch is golden - it should always contain stable features which are going to be included in the next release * next branch is where new development takes place, changes are merged to master once they are completed and tested From dpierce at redhat.com Wed Jan 21 12:30:23 2009 From: dpierce at redhat.com (Darryl L. Pierce) Date: Wed, 21 Jan 2009 07:30:23 -0500 Subject: [Ovirt-devel] [bugzilla@redhat.com: [Bug 480677] /etc/init/network sets result code to 0 even when the service fails] Message-ID: <20090121123023.GA7224@mcpierce-laptop.mcpierce.org> A proper fix for checking networking status will be available in an upcoming initscripts release (8.88). ----- Forwarded message from bugzilla at redhat.com ----- Date: Tue, 20 Jan 2009 22:38:35 -0500 From: bugzilla at redhat.com To: dpierce at redhat.com Subject: [Bug 480677] /etc/init/network sets result code to 0 even when the service fails Message-Id: <200901210338.n0L3cZ1h011575 at bz-web1.app.phx.redhat.com> Content-Type: text/plain; charset="UTF-8" Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=480677 Bill Nottingham changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |CLOSED Resolution| |RAWHIDE --- Comment #1 from Bill Nottingham 2009-01-20 22:38:34 EDT --- http://git.fedorahosted.org/git/?p=initscripts.git;a=commitdiff;h=06b375e57c82ca758edcad4c57a598c6329b8a69 Will be in 8.88-1. -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You reported the bug. ----- End forwarded message ----- -- Darryl L. Pierce, Sr. Software Engineer @ Red Hat, Inc. Virtual Machine Management - http://www.ovirt.org/ "What do you care what other people think, Mr. Feynman?" -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 197 bytes Desc: not available URL: From pronix.service at gmail.com Wed Jan 21 15:51:44 2009 From: pronix.service at gmail.com (=?UTF-8?B?0JLQsNGB0LjQu9C10YYg0JTQvNC40YLRgNC40Lk=?=) Date: Wed, 21 Jan 2009 18:51:44 +0300 Subject: [Ovirt-devel] ovirt-server patch for vm failover and actual data set to db Message-ID: <639ce0480901210751s5cd1991esa011e8776b530e48@mail.gmail.com> this patch restart vm from crashed host and set to db current data about vm. please test or criticize it. fencing is ipmi , when domain['state'] set 'crashed' i will reboot host diff --git a/src/db-omatic/db_omatic.rb b/src/db-omatic/db_omatic.rb index 4afffb1..bdab392 100755 --- a/src/db-omatic/db_omatic.rb +++ b/src/db-omatic/db_omatic.rb @@ -74,6 +76,65 @@ class DbOmatic < Qpid::Qmf::Console domain[:synced] = true end + #find hostname from values['node'] where values['class_type'] == 'domain' + def get_host_id(abank,bbank) #?????????? ???????? ?? ?? ??? ???? - ???????? ????????????? ???? ?????????? + begin + @cached_objects.keys.each do |objkey| + if @cached_objects[objkey][:agent_bank].to_s == abank and @cached_objects[objkey][:broker_bank].to_s == bbank and @cached_objects[objkey][:class_type].to_s == 'node' + return Host.find(:first, :conditions => ['hostname = ?', at cached_objects[objkey]["hostname"].to_s]).id + break + end + end + rescue => ex + log("error in get_host_id") + log(ex) + end + end + + def set_host(values,digit) + begin + vm = Vm.find(:first, :conditions => ['description = ?',values["name"].to_s]) + if vm and digit + vm.host_id = digit + vm.save! + else + log("this vm not exist #{values["name"]}") + end + rescue => ex + puts "error when set_host for #{values["name"]}" + puts ex + end + end + + def start_crashed_vm(vm) + task = VmTask.new( :user => 'db-omatic', :task_target => vm, :action => 'start_vm', :state => 'queued') + task.save! + log("set task for start crashed vm #{vm.id}") + end + + def set_domain_stopped(domain) + begin + vm = Vm.find(:first, :conditions => ['uuid = ?', domain['uuid']]) + if vm != nil + curstate = vm.state + vm.state = Vm::STATE_STOPPED + vm.host_id = nil + vm.save + domain['state'] = 'crashed' # and now i will use ipmi for reboot anavailable host - simple fencing + if curstate == Vm::STATE_RUNNING + start_crashed_vm(vm) + end + else + log('vm == nil ') + end + log("domain #{domain['id']} already stopped") + rescue => ex + log("can\'t set domain #{domain['id']} stopped") + log(ex) + end + end + + def update_host_state(host_info, state) db_host = Host.find(:first, :conditions => [ "hostname = ?", host_info['hostname'] ]) if db_host @@ -130,20 +190,36 @@ class DbOmatic < Qpid::Qmf::Console end domain_state_change = false - + change_node = false obj.properties.each do |key, newval| if values[key.to_s] != newval values[key.to_s] = newval #log "new value for property #{key} : #{newval}" if type == "domain" and key.to_s == "state" - domain_state_change = true + domain_state_change = true end + if type == "domain" and key.to_s == "node" + change_node = true + end + end end if domain_state_change update_domain_state(values) end + if change_node + values.each do |key,val| + if key == 'state' and val == 'running' + abank = values['node'].to_s.split('-')[3] + bbank = values['node'].to_s.split('-')[4] + @@host_id = get_host_id(abank,bbank) + set_host(values,@@host_id) + log("update node data for #{values['name']}") + break + end + end + end if new_object if type == "node" @@ -187,11 +263,6 @@ class DbOmatic < Qpid::Qmf::Console end end - - def del_agent(agent) - agent_disconnected(agent) - end - # This method marks objects associated with the given agent as timed out/invalid. Called either # when the agent heartbeats out, or we get a del_agent callback. def agent_disconnected(agent) @@ -204,11 +275,13 @@ class DbOmatic < Qpid::Qmf::Console if values[:timed_out] == false if values[:class_type] == 'node' update_host_state(values, Host::STATE_UNAVAILABLE) + values[:timed_out] = true elsif values[:class_type] == 'domain' - update_domain_state(values, Vm::STATE_UNREACHABLE) - end + set_domain_stopped(values) + values[:timed_out] = true + @cached_objects.delete(objkey) + end end - values[:timed_out] = true end end end @@ -248,6 +320,7 @@ class DbOmatic < Qpid::Qmf::Console db_vm = Vm.find(:all) db_vm.each do |vm| log "Marking vm #{vm.description} as stopped." + vm.host_id = nil vm.state = Vm::STATE_STOPPED vm.save end -- ? ?????????, ???????. From sseago at redhat.com Wed Jan 21 19:24:27 2009 From: sseago at redhat.com (Scott Seago) Date: Wed, 21 Jan 2009 19:24:27 +0000 Subject: [Ovirt-devel] [PATCH] Update search index every half hour. Message-ID: <1232565867-7825-1-git-send-email-sseago@redhat.com> Sets up a cron job to update the search index every half hour. With this in place it will be at most 30 minutes after new/updated content is generated before it will show up in search results. Signed-off-by: Scott Seago --- conf/ovirt-server.crontab | 2 ++ ovirt-server.spec.in | 3 +++ scripts/ovirt-reindex-search | 4 +++- scripts/ovirt-update-search | 4 +++- 4 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 conf/ovirt-server.crontab diff --git a/conf/ovirt-server.crontab b/conf/ovirt-server.crontab new file mode 100644 index 0000000..0f643ba --- /dev/null +++ b/conf/ovirt-server.crontab @@ -0,0 +1,2 @@ +MAILTO=root +0,30 * * * * root /usr/sbin/ovirt-update-search diff --git a/ovirt-server.spec.in b/ovirt-server.spec.in index 79a5adf..63e1b2a 100644 --- a/ovirt-server.spec.in +++ b/ovirt-server.spec.in @@ -65,6 +65,7 @@ mkdir %{buildroot} %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/httpd/conf.d %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/%{name} %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/%{name}/db +%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/cron.d %{__install} -d -m0755 %{buildroot}%{_localstatedir}/lib/%{name} %{__install} -d -m0755 %{buildroot}%{_localstatedir}/log/%{name} %{__install} -d -m0755 %{buildroot}%{_localstatedir}/run/%{name} @@ -75,6 +76,7 @@ touch %{buildroot}%{_localstatedir}/log/%{name}/rails.log touch %{buildroot}%{_localstatedir}/log/%{name}/taskomatic.log touch %{buildroot}%{_localstatedir}/log/%{name}/db-omatic.log %{__install} -p -m0644 %{pbuild}/conf/%{name}.conf %{buildroot}%{_sysconfdir}/httpd/conf.d +%{__install} -p -m0644 %{pbuild}/conf/%{name}.crontab %{buildroot}%{_sysconfdir}/cron.d/%{name} %{__install} -Dp -m0755 %{pbuild}/conf/ovirt-host-browser %{buildroot}%{_initrddir} %{__install} -Dp -m0755 %{pbuild}/conf/ovirt-db-omatic %{buildroot}%{_initrddir} @@ -177,6 +179,7 @@ fi %{_initrddir}/ovirt-host-collect %{_initrddir}/ovirt-mongrel-rails %{_initrddir}/ovirt-taskomatic +%{_sysconfdir}/cron.d/%{name} %config(noreplace) %{_sysconfdir}/sysconfig/ovirt-mongrel-rails %config(noreplace) %{_sysconfdir}/sysconfig/ovirt-rails %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf diff --git a/scripts/ovirt-reindex-search b/scripts/ovirt-reindex-search index c693300..cf4e38e 100755 --- a/scripts/ovirt-reindex-search +++ b/scripts/ovirt-reindex-search @@ -1,4 +1,6 @@ #!/bin/bash +[ -r /etc/sysconfig/ovirt-rails ] && . /etc/sysconfig/ovirt-rails +RAILS_ENV="${RAILS_ENV:-production}" RAKEFILE=/usr/share/ovirt-server/Rakefile MODELS="Host Vm IscsiStoragePool NfsStoragePool HardwarePool VmResourcePool" -rake -f $RAKEFILE xapian:rebuild_index models="$MODELS" +RAILS_ENV=$RAILS_ENV rake -f $RAKEFILE xapian:rebuild_index models="$MODELS" diff --git a/scripts/ovirt-update-search b/scripts/ovirt-update-search index ba4f6f2..2b2c107 100755 --- a/scripts/ovirt-update-search +++ b/scripts/ovirt-update-search @@ -1,4 +1,6 @@ #!/bin/bash +[ -r /etc/sysconfig/ovirt-rails ] && . /etc/sysconfig/ovirt-rails +RAILS_ENV="${RAILS_ENV:-production}" RAKEFILE=/usr/share/ovirt-server/Rakefile MODELS="Host Vm IscsiStoragePool NfsStoragePool HardwarePool VmResourcePool" -rake -f $RAKEFILE xapian:update_index models="$MODELS" +RAILS_ENV=$RAILS_ENV rake -f $RAKEFILE xapian:update_index models="$MODELS" -- 1.6.0.6 From dpierce at redhat.com Wed Jan 21 19:34:05 2009 From: dpierce at redhat.com (Darryl L. Pierce) Date: Wed, 21 Jan 2009 14:34:05 -0500 Subject: [Ovirt-devel] [PATCH node] Remove code that allowed ovirtbr0 to show up. Message-ID: <1232566445-16104-1-git-send-email-dpierce@redhat.com> Our method for naming bridges is to prepend "ovirtbr" to the name of the physical interface. This patch removes the previous practice of removing the first 3 letters from the interface name. Signed-off-by: Darryl L. Pierce --- scripts/ovirt-early | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/ovirt-early b/scripts/ovirt-early index 8422893..b098ba1 100755 --- a/scripts/ovirt-early +++ b/scripts/ovirt-early @@ -61,7 +61,7 @@ configure_from_network() { # bridge each ethernet device in the system ETHDEVS=$(cd /sys/class/net && ls -d eth*) for eth in $ETHDEVS; do - BRIDGE=ovirtbr`echo $eth | cut -b4-` + BRIDGE=ovirtbr$eth log "Applying default configuration to $eth and $BRIDGE" printf '%s\n' "DEVICE=$eth" ONBOOT=yes "BRIDGE=$BRIDGE" \ > /etc/sysconfig/network-scripts/ifcfg-$eth -- 1.6.0.6 From pmyers at redhat.com Wed Jan 21 20:20:56 2009 From: pmyers at redhat.com (Perry Myers) Date: Wed, 21 Jan 2009 15:20:56 -0500 Subject: [Ovirt-devel] [PATCH node] Remove code that allowed ovirtbr0 to show up. In-Reply-To: <1232566445-16104-1-git-send-email-dpierce@redhat.com> References: <1232566445-16104-1-git-send-email-dpierce@redhat.com> Message-ID: <497783A8.5030100@redhat.com> Darryl L. Pierce wrote: > Our method for naming bridges is to prepend "ovirtbr" to the name of the > physical interface. This patch removes the previous practice of removing > the first 3 letters from the interface name. > > Signed-off-by: Darryl L. Pierce > --- > scripts/ovirt-early | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/scripts/ovirt-early b/scripts/ovirt-early > index 8422893..b098ba1 100755 > --- a/scripts/ovirt-early > +++ b/scripts/ovirt-early > @@ -61,7 +61,7 @@ configure_from_network() { > # bridge each ethernet device in the system > ETHDEVS=$(cd /sys/class/net && ls -d eth*) > for eth in $ETHDEVS; do > - BRIDGE=ovirtbr`echo $eth | cut -b4-` > + BRIDGE=ovirtbr$eth > log "Applying default configuration to $eth and $BRIDGE" > printf '%s\n' "DEVICE=$eth" ONBOOT=yes "BRIDGE=$BRIDGE" \ > > /etc/sysconfig/network-scripts/ifcfg-$eth looks good to me, ack -- |=- Red Hat, Engineering, Emerging Technologies, Boston -=| |=- Email: pmyers at redhat.com -=| |=- Office: +1 412 474 3552 Mobile: +1 703 362 9622 -=| |=- GnuPG: E65E4F3D 88F9 F1C9 C2F3 1303 01FE 817C C5D2 8B91 E65E 4F3D -=| From berrange at redhat.com Wed Jan 21 20:52:30 2009 From: berrange at redhat.com (Daniel P. Berrange) Date: Wed, 21 Jan 2009 20:52:30 +0000 Subject: [Ovirt-devel] [PATCH node] Remove code that allowed ovirtbr0 to show up. In-Reply-To: <1232566445-16104-1-git-send-email-dpierce@redhat.com> References: <1232566445-16104-1-git-send-email-dpierce@redhat.com> Message-ID: <20090121205229.GG2921@redhat.com> On Wed, Jan 21, 2009 at 02:34:05PM -0500, Darryl L. Pierce wrote: > Our method for naming bridges is to prepend "ovirtbr" to the name of the > physical interface. This patch removes the previous practice of removing > the first 3 letters from the interface name. I've always wondered why we bother to include 'ovirt' in the bridge name at all. Far nicer just to call them br0, br1, br2, or if you want the main nic name, breth0, breth1, breth2 Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :| From berrange at redhat.com Wed Jan 21 20:55:46 2009 From: berrange at redhat.com (Daniel P. Berrange) Date: Wed, 21 Jan 2009 20:55:46 +0000 Subject: [Ovirt-devel] [PATCH] Update search index every half hour. In-Reply-To: <1232565867-7825-1-git-send-email-sseago@redhat.com> References: <1232565867-7825-1-git-send-email-sseago@redhat.com> Message-ID: <20090121205546.GH2921@redhat.com> On Wed, Jan 21, 2009 at 07:24:27PM +0000, Scott Seago wrote: > Sets up a cron job to update the search index every half hour. > With this in place it will be at most 30 minutes after new/ > updated content is generated before it will show up in search results. 30 minutes seems like quite a long time. Is there much CPU overhead from updating the search index ? If not I think it'd be nicer to do it every 5 minutes or more frequently still. Shame it can't be done "on demand" really - eg triggered when an indexable table is updated - albeit it with a small delay, so if multiple updates arrive in a short time it can coalleasce into one index update. Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :| From sseago at redhat.com Wed Jan 21 21:09:13 2009 From: sseago at redhat.com (Scott Seago) Date: Wed, 21 Jan 2009 16:09:13 -0500 Subject: [Ovirt-devel] [PATCH] Update search index every half hour. In-Reply-To: <20090121205546.GH2921@redhat.com> References: <1232565867-7825-1-git-send-email-sseago@redhat.com> <20090121205546.GH2921@redhat.com> Message-ID: <49778EF9.7030206@redhat.com> Daniel P. Berrange wrote: > On Wed, Jan 21, 2009 at 07:24:27PM +0000, Scott Seago wrote: > >> Sets up a cron job to update the search index every half hour. >> With this in place it will be at most 30 minutes after new/ >> updated content is generated before it will show up in search results. >> > > 30 minutes seems like quite a long time. Is there much CPU overhead > from updating the search index ? If not I think it'd be nicer to > do it every 5 minutes or more frequently still. Shame it can't be > done "on demand" really - eg triggered when an indexable table is > updated - albeit it with a small delay, so if multiple updates arrive > in a short time it can coalleasce into one index update. > > Daniel > 30 minutes was totally arbitrary. Overhead would depend mostly on how much content we've got -- and for now, we don't have a huge quantity -- just rows for VMs, storage volumes, hosts, and pools. 5 minutes is probably fine -- in any case, there's probably not much point in going longer than 5 minutes unless we have to. Search index updates are triggered from outside the DB, so there isn't a direct way of doing an on-demand update, although you could probably simulate this with a daemon of some sort. There's already a db table that gets rows added for objects that need to be updated. Index updates (rather than the reindex operation) only work on objects with an update -- so we could have a daemon that polled this table and forked a process to do the update after it observed a new row added to this table -- but with no new rows added after a set period of time. On my dev server it takes about 3 seconds to run the update index rake task when there's nothing to update -- so even running this task every minute might not have much of an impact on performance. Scott From sseago at redhat.com Wed Jan 21 22:02:10 2009 From: sseago at redhat.com (Scott Seago) Date: Wed, 21 Jan 2009 22:02:10 +0000 Subject: [Ovirt-devel] [PATCH] additional changes for Bug 466719. Message-ID: <1232575330-13745-1-git-send-email-sseago@redhat.com> Fixed incorrect column name for load_average -- so sorting works now. Also removed the ability to sort on num_cpus and cpu_speed. These are now stored in a separate object, so the prior code for this was broken, and it doesn't seem like it would be a high priority to support sorting on these fields. Signed-off-by: Scott Seago --- src/app/views/host/_grid.rhtml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/views/host/_grid.rhtml b/src/app/views/host/_grid.rhtml index 21b563e..663a55d 100644 --- a/src/app/views/host/_grid.rhtml +++ b/src/app/views/host/_grid.rhtml @@ -36,12 +36,12 @@ {display: 'UUID', name : 'uuid', width : 180, align: 'left'}<% if !is_popup %>,<% end %> <% if !is_popup %> {display: 'Hypervisor', name : 'hypervisor_type', width : 60, align: 'left'}, - {display: 'CPUs', name : 'num_cpus', width : 30, align: 'left'}, - {display: 'Speed (MHz)', name : 'cpu_speed', width : 70, align: 'right'}, + {display: 'CPUs', width : 30, align: 'left'}, + {display: 'Speed (MHz)', width : 70, align: 'right'}, {display: 'Arch', name : 'arch', width : 50, align: 'right'}, {display: 'RAM (MB)', name : 'memory', width : 60, align: 'right'}, {display: 'Status', name : 'is_disabled', width : 110, align: 'right'}, - {display: 'Load', name : 'load', width: 180, sortable : false, align: 'left', process: <%= table_id %>_load_widget } + {display: 'Load', name : 'load_average', width: 180, sortable : false, align: 'left', process: <%= table_id %>_load_widget } <% end %> ], sortname: "hostname", -- 1.6.0.6 From pmyers at redhat.com Thu Jan 22 04:16:32 2009 From: pmyers at redhat.com (Perry Myers) Date: Wed, 21 Jan 2009 23:16:32 -0500 Subject: [Ovirt-devel] [PATCH node] Refactoring of o-c-storage and logging in general to correct some bugs Message-ID: <1232597792-23999-1-git-send-email-pmyers@redhat.com> * Allow o-c-storage to be reentrant by properly wiping out old partitions and lvm after they have been created. Needed to fix firstboot scripts to use /tmp/ovirt.log to prevent open file descriptor when unmounting/ destroying /var/log partition/lvm. * Correct size calculation problems (1000 vs 1024 based MB) so that the LVM partition actually would use up the remainder of the disk * Cleanup of output for size configuration prompting including calculation of size remaining after each entry * If invalid size entries are entered, user is prompted until a valid entry is entered * set +e is done at end of perform_partitioning to undo set -e at top of function * MEM_SIZE_MB fixed (awk doesn't need file cat'd to it, can just open file directly) Signed-off-by: Perry Myers --- scripts/ovirt-config-setup | 6 ++- scripts/ovirt-config-storage | 103 +++++++++++++++++++++++------------------- scripts/ovirt-firstboot | 4 +- scripts/ovirt-functions | 25 +++++++++- 4 files changed, 86 insertions(+), 52 deletions(-) diff --git a/scripts/ovirt-config-setup b/scripts/ovirt-config-setup index c39c76a..270ce3d 100755 --- a/scripts/ovirt-config-setup +++ b/scripts/ovirt-config-setup @@ -47,7 +47,11 @@ while true; do printf "\nERROR: $OPTION FAILED. " printf "See $OVIRT_LOGFILE\n\n" fi - } 2>&1 | $TEE; + } 2>&1 | tee -a $OVIRT_TMP_LOGFILE; + if [ -f $OVIRT_TMP_LOGFILE ]; then + cat $OVIRT_TMP_LOGFILE >> $OVIRT_LOGFILE + rm -f $OVIRT_TMP_LOGFILE + fi break ;; esac done diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage index a34203b..3a49523 100755 --- a/scripts/ovirt-config-storage +++ b/scripts/ovirt-config-storage @@ -32,21 +32,22 @@ swap_min_size=5 get_selected_drive_size() { start_log + local size= local udi=$(hal-find-by-property --key block.device --string $DRIVE) if [ -z "$udi" ]; then # If hal didn't find the device, it could be a virtio block device # In this case, use sfdisk -s to get the size size=$(sfdisk -s $DRIVE) - SPACE=$(echo "scale=0; $size / 1024" | bc -l) + size=$(echo "scale=0; $size * 1024" | bc -l) else size=$(hal-get-property --udi "$udi" --key storage.size) if [ $size -eq 0 ]; then # disk is probably hot-swappable, use different HAL key size=$(hal-get-property --udi "$udi" --key storage.removable.media_size) fi - SPACE=$(echo "scale=0; $size / (1024 * 1024)" | bc -l) fi + SPACE=$(echo "scale=0; $size / (1024 * 1024)" | bc -l) log "Selected Device: $DRIVE ($SPACE MB)" stop_log } @@ -68,7 +69,7 @@ check_partition_sizes() "+ $CONFIG_SIZE + $LOGGING_SIZE + $min_data_size" | bc -l) if [ $need_size -gt $disk_size ]; then - gap_size=$(echo "scale=0; $need_size-$disk_size;" | bc -l) + local gap_size=$(echo "scale=0; $need_size-$disk_size;" | bc -l) printf "\n" printf "=============================================================\n" printf "The target storage device is too small for the desired sizes:\n" @@ -150,31 +151,49 @@ do_configure() get_selected_drive_size printf "\n\nPlease configure storage partitions.\n\n" - printf "Enter partition sizes in MB.\n" - printf "A value of 0 indicates the partition should be disabled.\n" - printf "If the partition is enabled, it will have a minimum valid size.\n" - printf "For the Data partition, a size of -1 indicates that the\n" - printf "partition should use up the remaining space on the disk.\n\n" - - for i in boot swap root config logging data ; do + printf "* Enter partition sizes in MB.\n" + printf "* A value of 0 indicates the partition should be disabled.\n" + printf "* If the partition is enabled, it will have a minimum valid size.\n" + printf "* Size remaining value is approximate due to cylinder rounding\n" + printf " during partitioning.\n" + printf "* For the Data partition, a size of -1 indicates that the\n" + printf " partition should use up the remaining space on the disk.\n\n" + + local space_left=$SPACE + for part in boot swap root config logging data ; do part_regexp="^0$" - if [ "$i" = "data" ]; then + if [ "$part" = "data" ]; then part_regexp="^\-1|0$" fi - uc=$(echo $i|tr '[[:lower:]]' '[[:upper:]]') + uc=$(echo $part|tr '[[:lower:]]' '[[:upper:]]') size_var=${uc}_SIZE eval "size=\$$size_var" - min_size_var=${i}_min_size + min_size_var=${part}_min_size eval "min_size=\$$min_size_var" - read -ep "Change $i partition size. (Current $size MB, Minimum $min_size MB)? " - r=$REPLY - test -z "$r" && r=$size - if [[ $r =~ ^-*[0-9]+$ ]] && [[ $r -ge $min_size || - $r =~ $part_regexp ]] ; then - eval "$size_var=$r" - else - printf "invalid $i size: '$r' retaining $size MB.\n" - fi + + while true; do + printf "\nChange $part partition size. (Def. $size MB), " + printf "Min. $min_size MB, " + printf "Max. ~$space_left MB)\n" + read -ep "? " + mb_input=$REPLY + test -z "$mb_input" && mb_input=$size + local size_used=0 + if [[ $mb_input =~ ^-*[0-9]+$ ]]; then + if [[ $mb_input -ge $min_size || $mb_input =~ $part_regexp ]] \ + && [[ $mb_input -le $space_left ]] ; then + eval "$size_var=$mb_input" + size_used=$mb_input + break; + else + printf "invalid $part size: $mb_input. " + printf "Does not fall into specified range.\n" + fi + else + printf "invalid $part size: '$mb_input'.\n" + fi + done + space_left=$(echo "scale=0;$space_left - $size_used" | bc -l) done if ! check_partition_sizes; then @@ -230,13 +249,17 @@ EOF # - remove LVM volumes and groups wipe_lvm_on_disk() { + unmount_logging for vg in $(pvdisplay -c $DRIVE* 2>/dev/null|awk -F: '{print $2}'|sort -u); do for d in $(grep $vg /proc/mounts|awk '{print $2}'); do + log "Unmounting $d" umount $d done for lv in $(lvdisplay -c $vg|awk -F: '{print $1}'); do + log "Removing $lv" lvremove -f $lv done + log "Removing $vg" vgremove -f $vg done } @@ -248,40 +271,27 @@ perform_partitioning() return fi - DRIVE_FILE=$(echo $DRIVE | tr '/' '_') - if [ -f /tmp/ovirt-config-storage-$DRIVE_FILE ]; then - printf "\n\nERROR:\n" - printf "Storage Configuration has already been run for $DRIVE.\n" - printf "To run it again, please reboot the Node from USB/cdrom/PXE\n" - printf "in stand-alone mode.\n\n\n" - return 1 - fi - - touch /tmp/ovirt-config-storage-$DRIVE_FILE - start_log log "Starting partitioning of $DRIVE" - log "Removing old LVM partitions" - wipe_lvm_on_disk - # Exit upon any failure. set -e + log "Removing old LVM partitions" + wipe_lvm_on_disk + # FIXME: save a backup copy, just in case? log "Wiping old boot sector" dd if=/dev/zero of=$DRIVE bs=1024K count=1 blockdev --rereadpt $DRIVE partprobe -s $DRIVE - if [ "$BOOT_SIZE" -lt 10 ]; then - # ensure minimal BOOT partition - BOOT_SIZE=10 - fi log "Creating boot partition" + MEM_SIZE_MB=$(echo "scale=0; $MEM_SIZE_MB / 1024;" | bc -l) + local boot_size_si=$(echo "scale=0; $BOOT_SIZE * (1024 * 1024) / (1000 * 1000)" | bc -l) parted $DRIVE -s "mklabel ${LABEL_TYPE}" - parted $DRIVE -s "mkpartfs primary ext2 0M ${BOOT_SIZE}M" - parted $DRIVE -s "mkpart primary ext2 ${BOOT_SIZE}M ${SPACE}M" + parted $DRIVE -s "mkpartfs primary ext2 0M ${boot_size_si}M" + parted $DRIVE -s "mkpart primary ext2 ${boot_size_si}M -1" parted $DRIVE -s "set 1 boot on" parted $DRIVE -s "set 2 lvm on" parted $DRIVE -s "print" @@ -307,19 +317,19 @@ perform_partitioning() if [ "$SWAP_SIZE" -gt 0 ]; then log "Creating swap partition" - lvcreate --name Swap --size ${SWAP_SIZE}M /dev/HostVG + lvcreate --name Swap --size ${SWAP_SIZE}M /dev/HostVG mkswap -L "SWAP" /dev/HostVG/Swap echo "/dev/HostVG/Swap swap swap defaults 0 0" >> /etc/fstab fi if [ "$ROOT_SIZE" -gt 0 ]; then log "Creating root partition" - lvcreate --name Root --size ${ROOT_SIZE}M /dev/HostVG + lvcreate --name Root --size ${ROOT_SIZE}M /dev/HostVG mke2fs -j /dev/HostVG/Root -L "ROOT" tune2fs -c 0 -i 0 /dev/HostVG/Root fi if [ "$CONFIG_SIZE" -gt 0 ]; then log "Creating config partition" - lvcreate --name Config --size ${CONFIG_SIZE}M /dev/HostVG + lvcreate --name Config --size ${CONFIG_SIZE}M /dev/HostVG mke2fs -j /dev/HostVG/Config -L "CONFIG" tune2fs -c 0 -i 0 /dev/HostVG/Config fi @@ -359,6 +369,7 @@ perform_partitioning() mount_logging log "Completed!" + set +e stop_log } @@ -402,7 +413,7 @@ do_confirm() done } -MEM_SIZE_MB=$(cat /proc/meminfo | awk '/MemTotal:/ { print $2 }') +MEM_SIZE_MB=$(awk '/MemTotal:/ { print $2 }' /proc/meminfo) case $MEM_SIZE_MB in ''|*[^0-9]*) die failed to get system memory size;; esac diff --git a/scripts/ovirt-firstboot b/scripts/ovirt-firstboot index 575fa89..403f66a 100755 --- a/scripts/ovirt-firstboot +++ b/scripts/ovirt-firstboot @@ -60,9 +60,7 @@ start () fi disable_firstboot - start_log - ovirt_store_firstboot_config - stop_log + ovirt_store_firstboot_config > $OVIRT_LOGFILE 2>&1 } case "$1" in diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions index 7f97bb9..fa2d025 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -1,7 +1,7 @@ # -*-Shell-script-*- OVIRT_LOGFILE=/var/log/ovirt.log -TEE="tee -a $OVIRT_LOGFILE" +OVIRT_TMP_LOGFILE=/tmp/ovirt.log _log_status=1 # label of the oVirt partition @@ -37,7 +37,7 @@ start_log() { if [ "$_log_status" = 1 ]; then exec 6>&1 exec 7>&2 - exec 1>>$OVIRT_LOGFILE + exec 1>>$OVIRT_TMP_LOGFILE exec 2>&1 _log_status=0 fi @@ -278,6 +278,27 @@ mount_logging() { fi } +unmount_logging() { + if ! grep -q " /var/log ext3" /proc/mounts; then + return 0 + fi + + log "Unmounting log partition" + service rsyslog stop + if [ -e /var/log.bak ]; then + rm -rf /var/log.bak + fi + cp -av /var/log /var/log.bak + + umount /var/log + cp -av /var/log.bak/* /var/log + restorecon -rv /var/log + rm -Rf /var/log.bak + service rsyslog start + + return 0 +} + # mount data partition mount_data() { if grep -q " /data ext3" /proc/mounts; then -- 1.6.0.6 From apevec at redhat.com Thu Jan 22 12:55:56 2009 From: apevec at redhat.com (Alan Pevec) Date: Thu, 22 Jan 2009 13:55:56 +0100 Subject: [Ovirt-devel] Re: [PATCH node] Refactoring of o-c-storage and logging in general to correct some bugs In-Reply-To: <1232597792-23999-1-git-send-email-pmyers@redhat.com> References: <1232597792-23999-1-git-send-email-pmyers@redhat.com> Message-ID: <49786CDC.5070806@redhat.com> ACK and pushed - nice, input is much more user friendly now! From dpierce at redhat.com Thu Jan 22 21:26:55 2009 From: dpierce at redhat.com (Darryl L. Pierce) Date: Thu, 22 Jan 2009 16:26:55 -0500 Subject: [Ovirt-devel] [PATCH node-image] Fix for BZ#481106. Message-ID: <1232659615-910-1-git-send-email-dpierce@redhat.com> Signed-off-by: Darryl L. Pierce --- common-post.ks | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/common-post.ks b/common-post.ks index 151cc95..629eb72 100644 --- a/common-post.ks +++ b/common-post.ks @@ -78,3 +78,8 @@ cat > /etc/sysconfig/iptables << \EOF -A FORWARD -m physdev ! --physdev-is-bridged -j REJECT --reject-with icmp-host-prohibited COMMIT EOF + +# BZ#481106 - remove errors from /sbin/dhclient-script +DHSCRIPT=/sbin/dhclient-script +cat $DHSCRIPT | sed 's/mv/cp -a/g' > $DHSCRIPT.tmp +mv -f $DHSCRIPT.tmp $DHSCRIPT -- 1.6.0.6 From dpierce at redhat.com Thu Jan 22 21:43:12 2009 From: dpierce at redhat.com (Darryl L. Pierce) Date: Thu, 22 Jan 2009 16:43:12 -0500 Subject: [Ovirt-devel] [PATCH node-image] Fixes errors in /sbin/dhclient-script. Message-ID: <1232660592-1956-1-git-send-email-dpierce@redhat.com> Files are mv'd and rm'd that are bindmounted. This patch replaces the offending mv's and rm's. Signed-off-by: Darryl L. Pierce --- common-post.ks | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/common-post.ks b/common-post.ks index 151cc95..c2cb6da 100644 --- a/common-post.ks +++ b/common-post.ks @@ -78,3 +78,8 @@ cat > /etc/sysconfig/iptables << \EOF -A FORWARD -m physdev ! --physdev-is-bridged -j REJECT --reject-with icmp-host-prohibited COMMIT EOF + +# remove errors from /sbin/dhclient-script +DHSCRIPT=/sbin/dhclient-script +sed -i 's/mv/cp -a/g' $DHSCRIPT +sed -i 's/rm.*rscf//g' $DHSCRIPT -- 1.6.0.6 From dpierce at redhat.com Thu Jan 22 21:58:12 2009 From: dpierce at redhat.com (Darryl L. Pierce) Date: Thu, 22 Jan 2009 16:58:12 -0500 Subject: [Ovirt-devel] [PATCH node-image] Fixes errors in /sbin/dhclient-script. Message-ID: <1232661492-2995-1-git-send-email-dpierce@redhat.com> All instances of "mv" are replaced by "cp -a". Four specific instances of rm are removed entirely. Signed-off-by: Darryl L. Pierce --- common-post.ks | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/common-post.ks b/common-post.ks index 151cc95..826a82f 100644 --- a/common-post.ks +++ b/common-post.ks @@ -78,3 +78,11 @@ cat > /etc/sysconfig/iptables << \EOF -A FORWARD -m physdev ! --physdev-is-bridged -j REJECT --reject-with icmp-host-prohibited COMMIT EOF + +# remove errors from /sbin/dhclient-script +DHSCRIPT=/sbin/dhclient-script +sed -i 's/mv/cp -a/g' $DHSCRIPT +sed -i 's/rm -f.*${interface}//' $DHSCRIPT +sed -i 's/rm -f \/etc\/localtime//' $DHSCRIPT +sed -i 's/rm -f \/etc\/ntp.conf//' $DHSCRIPT +sed -i 's/rm -f \/etc\/yp.conf//' $DHSCRIPT -- 1.6.0.6 From jguiditt at redhat.com Thu Jan 22 22:31:22 2009 From: jguiditt at redhat.com (Jason Guiditta) Date: Thu, 22 Jan 2009 17:31:22 -0500 Subject: [Ovirt-devel] [PATCH server] Create VM/Storage integration w/ tree widget enhancements Message-ID: <1232663482-3094-1-git-send-email-jguiditt@redhat.com> == Create VM/ Storage Flow == * Can add as many storage volumes as you need to, flow allows you to return to secondary form w/o limits. * Create VM form, along with its state and state of tree are stored in a temporary area and returned after create storage via pub/sub. == Tree enhancements == * Now stores state of selected (open) nodes, so if we have a need to reload or generate a new tree with certain nodes open, we now can. * Has ability to subscribe to messages via the 'channel' option * Added refresh method, which can be triggered by a message or fired manually. * Refresh adds newly returned items to tree, stubs in place for update and delete. * Added lookup object with references to all items in the tree to allow for easy recreation of tree w/o another call to server. * Added ui_parent and ui_object references (generated in model via a convenience method) to simplify finding nodes to update/add/delete. * Changed click behavior to use event delegation, which means we no longer need to use livequery, which scans the dom for changes. Event delegation is much faster and cleaner (can remove livequery entirely once all trees use widget). == Widget tests/files == * Adds the standard_tree (actual widget vs nav) test harness * Cleans up the tree.rhtml to account for some previous restructuring * Moves sample json data into a 'test' subfolder. I am looking into some more proper javascript testing systems, so this will undoubtedly be changing again in the near future. Signed-off-by: Jason Guiditta --- src/app/controllers/storage_controller.rb | 20 +- src/app/models/lvm_storage_volume.rb | 3 + src/app/models/pool.rb | 1 + src/app/models/storage_pool.rb | 28 +++- src/app/models/storage_volume.rb | 28 +++- src/app/views/hardware/show_storage.rhtml | 12 +- src/app/views/layouts/_tree.rhtml | 4 +- .../views/layouts/components/standard_tree.rhtml | 202 ++++++++++++++++++++ src/app/views/layouts/components/tree.rhtml | 11 +- src/app/views/smart_pools/show_storage.rhtml | 10 +- src/app/views/storage/new_volume.rhtml | 22 ++- src/app/views/vm/_form.rhtml | 24 ++- src/public/javascripts/ovirt.js | 59 ++++++- src/public/javascripts/ovirt.tree.js | 163 ++++++++++++---- src/public/javascripts/smart_nav_test_data.js | 151 --------------- .../javascripts/test/smart_nav_sample_data.js | 151 +++++++++++++++ .../javascripts/test/storage_tree_sample_data.js | 68 +++++++ src/test/fixtures/storage_volumes.yml | 10 + src/test/unit/storage_volume_test.rb | 21 ++- 19 files changed, 752 insertions(+), 236 deletions(-) create mode 100644 src/app/views/layouts/components/standard_tree.rhtml delete mode 100644 src/public/javascripts/smart_nav_test_data.js create mode 100644 src/public/javascripts/test/smart_nav_sample_data.js create mode 100644 src/public/javascripts/test/storage_tree_sample_data.js diff --git a/src/app/controllers/storage_controller.rb b/src/app/controllers/storage_controller.rb index e4b72f1..3c7d98a 100644 --- a/src/app/controllers/storage_controller.rb +++ b/src/app/controllers/storage_controller.rb @@ -1,4 +1,4 @@ -# +# # Copyright (C) 2008 Red Hat, Inc. # Written by Scott Seago # @@ -122,7 +122,8 @@ class StorageController < ApplicationController end def new_volume - @return_facebox = params[:return_facebox] + @return_to_workflow = params[:return_to_workflow] + @return_to_workflow ||= false if params[:storage_pool_id] @storage_pool = StoragePool.find(params[:storage_pool_id]) unless @storage_pool.user_subdividable @@ -170,7 +171,8 @@ class StorageController < ApplicationController respond_to do |format| format.json { render :json => { :object => "storage_volume", :success => true, - :alert => "Storage Volume was successfully created." } } + :alert => "Storage Volume was successfully created.", + :new_volume => @storage_volume.storage_tree_element({:filter_unavailable => false, :state => 'new'})} } format.xml { render :xml => @storage_volume, :status => :created, # FIXME: create storage_volume_url method if relevant @@ -240,7 +242,7 @@ class StorageController < ApplicationController end def edit - render :layout => 'popup' + render :layout => 'popup' end def update @@ -249,11 +251,11 @@ class StorageController < ApplicationController @storage_pool.update_attributes!(params[:storage_pool]) insert_refresh_task end - render :json => { :object => "storage_pool", :success => true, + render :json => { :object => "storage_pool", :success => true, :alert => "Storage Pool was successfully modified." } rescue # FIXME: need to distinguish pool vs. task save errors (but should mostly be pool) - render :json => { :object => "storage_pool", :success => false, + render :json => { :object => "storage_pool", :success => false, :errors => @storage_pool.errors.localize_error_messages.to_a } end end @@ -269,7 +271,7 @@ class StorageController < ApplicationController def addstorage add_internal - render :layout => 'popup' + render :layout => 'popup' end def add @@ -301,10 +303,10 @@ class StorageController < ApplicationController storage_pool.destroy end end - render :json => { :object => "storage_pool", :success => true, + render :json => { :object => "storage_pool", :success => true, :alert => "Storage Pools were successfully deleted." } rescue - render :json => { :object => "storage_pool", :success => true, + render :json => { :object => "storage_pool", :success => true, :alert => "Error deleting storage pools." } end end diff --git a/src/app/models/lvm_storage_volume.rb b/src/app/models/lvm_storage_volume.rb index 38949ce..5b6177b 100644 --- a/src/app/models/lvm_storage_volume.rb +++ b/src/app/models/lvm_storage_volume.rb @@ -35,4 +35,7 @@ class LvmStorageVolume < StorageVolume validates_presence_of :lv_group_perms validates_presence_of :lv_mode_perms + def ui_parent + storage_pool.source_volumes[0][:type].to_s + '_' +storage_pool.source_volumes[0].id.to_s + end end diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb index 62cb732..372cf54 100644 --- a/src/app/models/pool.rb +++ b/src/app/models/pool.rb @@ -180,6 +180,7 @@ class Pool < ActiveRecord::Base ["Disk", :storage_in_gb, "(gb)"]] #needed by tree widget for display + #FIXME: this can be removed once all instances of treeview are gone def hasChildren return (rgt - lft) != 1 end diff --git a/src/app/models/storage_pool.rb b/src/app/models/storage_pool.rb index f9abb55..a021a26 100644 --- a/src/app/models/storage_pool.rb +++ b/src/app/models/storage_pool.rb @@ -1,4 +1,4 @@ -# +# # Copyright (C) 2008 Red Hat, Inc. # Written by Scott Seago # @@ -97,16 +97,37 @@ class StoragePool < ActiveRecord::Base false end + #-- + #TODO: the following two methods should be moved out somewhere, perhaps an 'acts_as' plugin? + #Though ui_parent will have class specific impl + #++ + #This is a convenience method for use in the ui to simplify creating a unigue id for placement/retrieval + #in/from the DOM. This was added because there is a chance of duplicate ids between different object types, + #and multiple object type will appear concurrently in the ui. The combination of type and id should be unique. + def ui_object + self.class.to_s + '_' + id.to_s + end + + #This is a convenience method for use in the processing and manipulation of json in the ui. + #This serves as a key both for determining where to attached elements in the DOM and quickly + #accessing and updating a cached object on the client. + def ui_parent + nil + end + def storage_tree_element(params = {}) vm_to_include=params.fetch(:vm_to_include, nil) filter_unavailable = params.fetch(:filter_unavailable, true) include_used = params.fetch(:include_used, false) + state = params.fetch(:state,nil) return_hash = { :id => id, :type => self[:type], - :text => display_name, :name => display_name, + :ui_object => ui_object, + :state => state, :available => false, :create_volume => user_subdividable, + :ui_parent => ui_parent, :selected => false, :is_pool => true} conditions = nil @@ -117,7 +138,8 @@ class StoragePool < ActiveRecord::Base end end if filter_unavailable - availability_conditions = "storage_volumes.state = '#{StoragePool::STATE_AVAILABLE}'" + availability_conditions = "(storage_volumes.state = '#{StoragePool::STATE_AVAILABLE}' + or storage_volumes.state = '#{StoragePool::STATE_PENDING_SETUP}')" if conditions.nil? conditions = availability_conditions else diff --git a/src/app/models/storage_volume.rb b/src/app/models/storage_volume.rb index e289a96..59d166e 100644 --- a/src/app/models/storage_volume.rb +++ b/src/app/models/storage_volume.rb @@ -1,4 +1,4 @@ -# +# # Copyright (C) 2008 Red Hat, Inc. # Written by Scott Seago # @@ -97,20 +97,41 @@ class StorageVolume < ActiveRecord::Base storage_pool.user_subdividable and vms.empty? and (lvm_storage_pool.nil? or lvm_storage_pool.storage_volumes.empty?) end + #-- + #TODO: the following two methods should be moved out somewhere, perhaps an 'acts_as' plugin? + #Though ui_parent will have class specific impl + #++ + ##This is a convenience method for use in the ui to simplify creating a unigue id for placement/retrieval + #in/from the DOM. This was added because there is a chance of duplicate ids between different object types, + #and multiple object type will appear concurrently in the ui. The combination of type and id should be unique. + def ui_object + self.class.to_s + '_' + id.to_s + end + + #This is a convenience method for use in the processing and manipulation of json in the ui. + #This serves as a key both for determining where to attached elements in the DOM and quickly + #accessing and updating a cached object on the client. + def ui_parent + storage_pool[:type].to_s + '_' + storage_pool_id.to_s + end + def storage_tree_element(params = {}) vm_to_include=params.fetch(:vm_to_include, nil) filter_unavailable = params.fetch(:filter_unavailable, true) include_used = params.fetch(:include_used, false) vm_ids = vms.collect {|vm| vm.id} + state = params.fetch(:state,'new') return_hash = { :id => id, :type => self[:type], - :text => display_name, + :ui_object => ui_object, + :state => state, :name => display_name, :size => size_in_gb, :available => ((vm_ids.empty?) or (vm_to_include and vm_to_include.id and vm_ids.include?(vm_to_include.id))), :create_volume => supports_lvm_subdivision, + :ui_parent => ui_parent, :selected => (!vm_ids.empty? and vm_to_include and vm_to_include.id and (vm_ids.include?(vm_to_include.id))), :is_pool => false} @@ -126,7 +147,8 @@ class StorageVolume < ActiveRecord::Base end end if filter_unavailable - availability_conditions = "storage_volumes.state = '#{StoragePool::STATE_AVAILABLE}'" + availability_conditions = "(storage_volumes.state = '#{StoragePool::STATE_AVAILABLE}' + or storage_volumes.state = '#{StoragePool::STATE_PENDING_SETUP}')" if conditions.nil? conditions = availability_conditions else diff --git a/src/app/views/hardware/show_storage.rhtml b/src/app/views/hardware/show_storage.rhtml index 5643c83..35f0a55 100644 --- a/src/app/views/hardware/show_storage.rhtml +++ b/src/app/views/hardware/show_storage.rhtml @@ -111,11 +111,13 @@ ${htmlList(pools)} } function storage_select(e, elem) { - $('#storage_tree_form ul.ovirt-tree li div').removeClass('current'); - $(elem) - .addClass('current'); - $('#storage_selection').load('<%= url_for :controller => "search", :action => "single_result" %>', - { class_and_id: elem.id.substring(elem.id.indexOf("_")+1)}); + if ($(e.target).is('div') && $(e.target).parent().is('li')){ + $('#storage_tree_form .current').removeClass('current'); + $(e.target) + .addClass('current'); + $('#storage_selection').load('<%= url_for :controller => "search", :action => "single_result" %>', + { class_and_id: e.target.id.substring(e.target.id.indexOf("_")+1)}); + } } diff --git a/src/app/views/layouts/_tree.rhtml b/src/app/views/layouts/_tree.rhtml index fa3effc..8d5ce51 100644 --- a/src/app/views/layouts/_tree.rhtml +++ b/src/app/views/layouts/_tree.rhtml @@ -27,7 +27,7 @@ }); e.preventDefault(); } - }) + }); $('div.nav-networks a').bind('click', function(e){ if(this === e.target){ var myURL = $(this).attr('href'); @@ -41,7 +41,7 @@ }); e.preventDefault(); } - }) + }); $('#nav_tree_form ul.ovirt-tree li').livequery( function(){ $(this) diff --git a/src/app/views/layouts/components/standard_tree.rhtml b/src/app/views/layouts/components/standard_tree.rhtml new file mode 100644 index 0000000..02ea74e --- /dev/null +++ b/src/app/views/layouts/components/standard_tree.rhtml @@ -0,0 +1,202 @@ + + + + + + + <%= yield :title -%> + <%= stylesheet_link_tag 'ovirt-tree/tree' %> + <%= stylesheet_link_tag 'facebox' %> + + <%= javascript_include_tag "jquery-1.2.6.min.js" -%> + <%= javascript_include_tag "jquery.ui-1.5.2/ui/packed/ui.core.packed.js" -%> + <%= javascript_include_tag "test/storage_tree_sample_data.js" -%> + <%= javascript_include_tag "test/smart_nav_sample_data.js" -%> + <%= javascript_include_tag "jquery.form.js" -%> + <%= javascript_include_tag "trimpath-template-1.0.38.js" %> + <%= javascript_include_tag "ovirt.js" %> + <%= javascript_include_tag "ovirt.tree.js" %> + <%= javascript_include_tag "facebox.js" %> + + + + + + + + + + + + +
    +
    +
    +
    
    +
    +
    +
    + + {macro htmlList(list, optionalListType)} + {var listType = optionalListType != null ? optionalListType : "ul"} + <${listType} style="display:none;"> + {for item in list} + <li> + <input type="checkbox" name="item[]" value="${item.id}-${item.name}" style="display:none" checked="checked"/> + <span class="hitarea {if item.children} expandable{/if}"> </span><div id="${item.id}" class="${item.type}">${item.name}</div> + {if item.children} + ${htmlList(item.children)} + {/if} + </li> + {/for} + </${listType}> + {/macro} + + {for item in pools} + <li> + <input type="checkbox" name="item[]" value="${item.id}-${item.name}" style="display:none" checked="checked"/> + <span class="hitarea {if item.children} expandable{/if}"> </span><div id="${item.id}" class="${item.type}">${item.name}</div> + {if item.children} + ${htmlList(item.children)} + {/if} + </li> + {/for} + + +
    +
    + My Name: +
    +
    +
    +
    +
    + + {macro htmlList(list, id, isFullList)} + {if isFullList} + <ul style="display:none;"> + {/if} + {for item in list} + <li> + <span class="hitarea {if item.children.length > 0} expandable{/if}"> </span> + <div id="${id}-${item.ui_object}" class="{if !item.available} unclickable{/if}"> + <input type="checkbox" name="vm[storage_volume_ids][]" value="${item.id}" + {if !item.available}disabled="disabled" style="display:none"{/if} + {if item.selected}checked="checked"{/if}/> ${item.name} {if item.size}(${item.size} GB){/if} + {if item.create_volume} + <input type="hidden" name="return_item" value="true"/><%=image_tag("icon_addstorage.png")%> + <a href="<%= url_for :controller => 'storage', :action => 'new_volume'%>?source_volume_id=${item.id}" + class="selection_facebox"></a> + {/if} + </div> + {if item.children.length > 0} + ${htmlList(item.children, id, true)} + {/if} + </li> + {/for} + {if isFullList} + </ul> + {/if} + {/macro} + + ${htmlList(pools, id)} + + + diff --git a/src/app/views/layouts/components/tree.rhtml b/src/app/views/layouts/components/tree.rhtml index 063a6df..402c6e3 100644 --- a/src/app/views/layouts/components/tree.rhtml +++ b/src/app/views/layouts/components/tree.rhtml @@ -6,10 +6,15 @@ <%= yield :title -%> + <%= stylesheet_link_tag 'ovirt-tree/tree' %> + <%= javascript_include_tag "jquery-1.2.6.min.js" -%> <%= javascript_include_tag "jquery.livequery.min.js" -%> - <%= javascript_include_tag "smart_nav_test_data.js" -%> + <%= javascript_include_tag "jquery.ui-1.5.2/ui/packed/ui.core.packed.js" -%> + <%= javascript_include_tag "test/smart_nav_sample_data.js" -%> <%= javascript_include_tag "jquery.form.js" -%> + <%= javascript_include_tag "trimpath-template-1.0.38.js" %> + <%= javascript_include_tag "ovirt.tree.js" %> <%= javascript_include_tag "ovirt.js" -%> diff --git a/src/app/views/storage/new_volume.rhtml b/src/app/views/storage/new_volume.rhtml index 958c463..2e49d16 100644 --- a/src/app/views/storage/new_volume.rhtml +++ b/src/app/views/storage/new_volume.rhtml @@ -18,20 +18,26 @@

- <%= popup_footer("$('#storage_volume_form').submit()", "New Storage Volume") %> + <% if @return_to_workflow %> + <%# TODO: update this method in application_helper to take an array, so we can include + a callback or trigger to to go previous step in flow. %> + <%= popup_footer("$('#storage_volume_form').submit()", "New Storage Volume") %> + <% else %> + <%= popup_footer("$('#storage_volume_form').submit()", "New Storage Volume") %> + <% end %>

diff --git a/src/public/javascripts/ovirt.js b/src/public/javascripts/ovirt.js index a43f004..09d8bdc 100644 --- a/src/public/javascripts/ovirt.js +++ b/src/public/javascripts/ovirt.js @@ -173,7 +173,7 @@ function afterHwPool(response, status){ $tabs.tabs("load",$tabs.data('selected.tabs')); } } - + //FIXME: point all these refs at a widget so we dont need the functions in here processTree(); @@ -322,4 +322,61 @@ function afterNetwork(response, status){ function handleTabsAndContent(data) { $('#side-toolbar').html($(data).find('div.toolbar')); $('#tabs-and-content-container').html($(data).not('div#side-toolbar')); +} + +var VmCreator = { + checkedBoxesFromTree : [], + buildCheckboxList: function(id) { + var rawList = $('#'+ id + ' :checkbox:checked').parent('div'); + if (rawList.length >0) { + rawList.each(function(i) { + VmCreator.checkedBoxesFromTree.push(rawList.get(i).id); + }); + } else { + VmCreator.checkedBoxesFromTree.splice(0); + } + }, + clickCheckboxes: function() { + $.each(VmCreator.checkedBoxesFromTree, function(n, curBox){ + $('#' + curBox).children(':checkbox').click(); + }); + VmCreator.checkedBoxesFromTree = []; + }, + recreateTree: function(o){ + $('#storage_volumes_tree').tree({ + content: o.content, + template: "storage_volumes_template", + selectedNodes: o.selectedNodes, + clickHandler: VmCreator.goToCreateStorageHandler, + channel: 'STORAGE_VOLUME', + refresh: VmCreator.returnToVmForm + }); + }, + goToCreateStorageHandler: function goToCreateStorageHandler(e,elem){ + if ($(e.target).is('img') && $(e.target).parent().is('div')){ + //remove the temp form in case there is one hanging around for some reason + $('temp_create_vm_form').remove(); + VmCreator.buildCheckboxList(elem.element.get(0).id); + var storedOptions = $('#storage_volumes_tree').data('tree').options; + // copy/rename form + $('#window').clone(true).attr({style: 'display:none', id: 'temp_window'}).appendTo('body'); + $('#temp_window #vm_form').attr({id: 'temp_create_vm_form'}); + // continue standard calls to go to next step (create storage) + $(e.target).siblings('a').click(); + // empty tree + $('#temp_create_vm_form #storage_volumes_tree').empty(); + // reinitialize tree so it has data and is subscribed + VmCreator.recreateTree(storedOptions); + } + }, + returnToVmForm: function returnToVmForm(e,elem) { + //The item has now been added to the tree, now copy it into a facebox + var storedOptions = $('#storage_volumes_tree').data('tree').options; + $('#window').remove(); + $('#temp_window').clone(true).attr({style: 'display:block', id: 'window'}) + .appendTo('td.body > div.content').end().remove(); + $('#window #temp_create_vm_form').attr({id: 'vm_form'}); + VmCreator.recreateTree(storedOptions); + VmCreator.clickCheckboxes(); + } } \ No newline at end of file diff --git a/src/public/javascripts/ovirt.tree.js b/src/public/javascripts/ovirt.tree.js index 77d6c55..48f529c 100644 --- a/src/public/javascripts/ovirt.tree.js +++ b/src/public/javascripts/ovirt.tree.js @@ -75,60 +75,149 @@ function processChildren(list, templateObj){ this.setData('template', TrimPath.parseDOMTemplate(this.getData('template'))); }, init: function() { + var self = this, o = this.options; this.setTemplate(this.getTemplate()); - this.element.html(this.getTemplate().process(this.getData('content'))); - var self = this; + this.populate(); this.element - .find('li:has(ul)') - .children('span.hitarea') - .click(function(event){ - if (this == event.target) { - if($(this).siblings('ul').size() >0) { - if(self.getData('toggle') === 'toggle') { - self.toggle(event, this); //we need 'this' so we have the right element to toggle - } else { - self.element.triggerHandler('toggle',[event,this],self.getData('toggle')); - } - } - } + .bind('click', function(event){ + self.clickHandler(event, self); + if(self.getData('toggle') === 'toggle') { + self.toggle(event, this); + } else { + self.element.triggerHandler('toggle',[event,this],self.getData('toggle')); + } }); - this.element - .find('li > div') - .filter(':not(.unclickable)') - .bind('click', function(event) { - if (this == event.target) { - if(self.getData('clickHandler') === 'clickHandler') { - self.clickHandler(event, this); //we need 'this' so we have the right element to add click behavior to - } else { - self.element.triggerHandler('clickHandler',[event,this],self.getData('clickHandler')); - } - } + o.selectedNodes !== undefined? this.openToSelected() :o.selectedNodes=[]; + o.channel !== undefined? this.subscribe(o.channel): o.channel = ''; + if (o.cacheContent === true) this.buildLookup(); + }, + populate: function() { + var contentWithId = this.getData('content'); + contentWithId.id = this.element.get(0).id; + this.element.html(this.getTemplate().process(contentWithId)); + }, + buildLookup: function() { + this.setData('lookupList', this.walkTree(this.getData('content').pools, [], this)); + }, + walkTree: function(list, lookup, self) { + $.each(list, function(n,obj){ + lookup.push(obj); + if (obj.children.length > 0) self.walkTree(obj.children, lookup, self); }); - this.openToSelected(self); + return lookup; + }, + subscribe: function subscribe(channel) { + var self = this; + this.element.bind(channel, function(e,data){self.refresh(e,data);}); }, toggle: function(e, elem) { - $(elem) + if ($(e.target).is('span.hitarea')){ + $(e.target) .toggleClass('expanded') .toggleClass('expandable') .siblings('ul').slideToggle("normal"); + if ($(e.target).hasClass('expanded')) { + this.setSelectedNode(this.chop(e.target), true); + } else { + this.setSelectedNode(this.chop(e.target), false); + } + } + }, + chop: function(elem) { + var id = $(elem).siblings('div').get(0).id; + return id.substring(id.indexOf('-') +1); + }, + clickHandler: function(e,elem) { //TODO: make this a default impl if needed. + this.options.clickHandler !== undefined? this.element.triggerHandler('clickHandler',[e,this],this.getData('clickHandler')): null; + if ($(e.target).is('div') && $(e.target).parent().is('li')){} + }, + setSelectedNode: function(id, isOpen) { + if (isOpen) { + if($.inArray(id,this.getData('selectedNodes')) == -1){ + this.setData(this.getData('selectedNodes').push(id)); + } + } else { + if($.inArray(id,this.getData('selectedNodes')) != -1){ + this.setData(this.getData('selectedNodes').splice(this.getData('selectedNodes').indexOf(id),1)); + } + } + }, + openToSelected: function() { + for (var i = 0; i < this.getData('selectedNodes').length; i++){ + this.toggle($.event.fix({type: 'toggle', + target: this.element.find('#' +this.element.get(0).id + '-' + this.getData('selectedNodes')[i]).siblings('span').get(0)}) + , this); + } + }, + refresh: function(e, list) { + //NOTE: The widget expects the convention used elsewhere of {blah}-{ui_object} + //(where {blah} is the id of the container element, see above for an example soon), + //since there may be 2 items with the same db id. + var self = this; + list = $.makeArray(list); + $.each(list, function(n,data){ + switch(data.state) { + case 'deleted': { + self._delete(data); + break; + } + case 'changed': { + self._update(data); + break; + } + default: { + self._add(data); + break; + } + } + }); + self.options.refresh !== undefined? self.element.triggerHandler('refresh',[e,list],self.getData('refresh')): null; }, - clickHandler: function(e,elem) { - // make this a default impl if needed. + //methods meant to be called internally by widget + _add: function(data){ + var myLookupList = this.getData('lookupList'); + if (data.ui_parent !==null) { + var matchedItems = $.grep(myLookupList,function(value) {return value.ui_object == data.ui_parent;}); + var self = this; + $.each(matchedItems, function(n,obj){ + var existingObj = []; + if(obj.children.length >0) { + existingObj = $.grep(obj.children,function(value) {return value.ui_object == data.ui_object;}); + } + if (existingObj.length === 0){ + obj.children.push(data); + myLookupList.push(data); + self._addDomElem(data); + } else {} + }); + } else {myLookupList.push(data);} }, - openToSelected: function(self) { - //find 'selected' items and open tree accordingly. This may need to have a - //marker of some sort passed in since different trees may have different needs. + _delete: function(data){}, //TODO: implement + _update: function(data) {}, //TODO: implement + _addDomElem: function(data) { + var dataToInsert = this.getTemplate().process({"pools":[data], "id":this.element.get(0).id}); + if (data.ui_parent) { + var searchString = '#' + this.element.get(0).id + '-' + data.ui_parent; + var parentElem = this.element.find(searchString).siblings('ul'); + if (parentElem.size() === 0) { + this.element.find(searchString).parent().append('

' + dataToInsert + ''); + this.element.find(searchString).siblings('span').addClass('expanded'); + } else { + parentElem.append(dataToInsert); + } + } else { + this.element.append(dataToInsert); + } }, - off: function() { - this.element.css({background: 'none'}); - this.destroy(); // use the predefined function - } + _deleteDomElem: function(data) {}, //TODO: implement + _updateDomElem: function(data) {} //TODO: implement }; $.yi = $.yi || {}; // create the namespace $.widget("yi.tree", Tree); $.yi.tree.defaults = { template: 'tree_template', toggle: 'toggle', - clickHandler: 'clickHandler' + clickHandler: 'clickHandler', + cacheContent: true }; })(jQuery); \ No newline at end of file diff --git a/src/public/javascripts/smart_nav_test_data.js b/src/public/javascripts/smart_nav_test_data.js deleted file mode 100644 index 43e7dbc..0000000 --- a/src/public/javascripts/smart_nav_test_data.js +++ /dev/null @@ -1,151 +0,0 @@ -var pools3 = { - "deleted" : {}, - "pools" :[ - { "name": "default", - "text": "default", - "children": - [{ "name": "Engineering", - "text": "Engineering", - "children": - [{ "name": "Development", - "text": "Development", - "children": - [{ "name": "Project X", - "text": "Project X", - "id": 19, - "type": "VmResourcePool"}, - { "name": "Project Y", - "text": "Project Y", - "id": 20, - "type": "VmResourcePool"}], - "id": 9, - "type": "HardwarePool"}, - { "name": "QA", - "text": "QA", - "children": - [{ "name": "Bob's Team", - "text": "Bob's Team", - "children": - [{ "name": "Bob's VMs", - "text": "Bob's VMs", - "id": 21, - "type": "VmResourcePool"}], - "id": 17, - "type": "HardwarePool"}, - { "name": "Jim's Team", - "text": "Jim's Team", - "children": - [{ "name": "Jim's VMs", - "text": "Jim's VMs", - "id": 22, - "type": "VmResourcePool"}], - "id": 18, - "type": "HardwarePool"}, - { "name": "Sally's Team", - "text": "Sally's Team", - "children": - [{ "name": "Sally's VMs", - "text": "Sally's VMs", - "id": 33, - "type": "VmResourcePool"}], - "id": 32, - "type": "HardwarePool"}], - "id": 10, - "type": "HardwarePool"}, - { "name": "Stage", - "text": "Stage", - "children": - [{ "name": "stage1", - "text": "stage1", - "id": 45, - "type": "HardwarePool"}, - { "name": "stage2", - "text": "stage2", - "id": 46, - "type": "HardwarePool"}], - "id": 44, - "type": "HardwarePool"}], - "id": 5, - "type": "HardwarePool"}, - { "name": "Finance", - "text": "Finance", - "children": - [{ "name": "Payroll", - "text": "Payroll", - "children": - [{ "name": "Payroll VMs", - "text": "Payroll VMs", - "id": 23, - "type": "VmResourcePool"}], - "id": 11, - "type": "HardwarePool"}, - { "name": "Accts. Receivable", - "text": "Accts. Receivable", - "children": - [{ "name": "our VMs", - "text": "our VMs", - "id": 24, - "type": "VmResourcePool"}], - "id": 12, - "type": "HardwarePool"}], - "id": 6, - "type": "HardwarePool"}, - { "name": "HR", - "text": "HR", - "children": - [{ "name": "Hiring Team", - "text": "Hiring Team", - "id": 13, - "type": "HardwarePool"}, - { "name": "Benefits", - "text": "Benefits", - "id": 14, - "type": "HardwarePool"}], - "id": 7, - "type": "HardwarePool"}, - { "name": "External (DMZ)", - "text": "External (DMZ)", - "children": - [{ "name": "VMs", - "text": "VMs", - "id": 25, - "type": "VmResourcePool"}, - { "name": "DB Cluster", - "text": "DB Cluster", - "children": - [{ "name": "VMs", - "text": "VMs", - "id": 27, - "type": "VmResourcePool"}], - "id": 26, - "type": "HardwarePool"}], - "id": 8, - "type": "HardwarePool"}], - "id": 1, - "type": "HardwarePool"}], -"smart_pools":[{ "name": "ovirtadmin", - "text": "ovirtadmin", - "children": - [{ "name": "not so smart", - "text": "not so smart", - "id": 39, - "type": "SmartPool"}, - { "name": "a little smarter", - "text": "a little smarter", - "id": 40, - "type": "SmartPool"}, - { "name": "arrrrr", - "text": "arrrrr", - "id": 41, - "type": "SmartPool"}, - { "name": "huh?", - "text": "huh?", - "id": 42, - "type": "SmartPool"}, - { "name": "booya", - "text": "booya", - "id": 43, - "type": "SmartPool"}], - "id": 37, - "type": "DirectoryPool"}] -} \ No newline at end of file diff --git a/src/public/javascripts/test/smart_nav_sample_data.js b/src/public/javascripts/test/smart_nav_sample_data.js new file mode 100644 index 0000000..43e7dbc --- /dev/null +++ b/src/public/javascripts/test/smart_nav_sample_data.js @@ -0,0 +1,151 @@ +var pools3 = { + "deleted" : {}, + "pools" :[ + { "name": "default", + "text": "default", + "children": + [{ "name": "Engineering", + "text": "Engineering", + "children": + [{ "name": "Development", + "text": "Development", + "children": + [{ "name": "Project X", + "text": "Project X", + "id": 19, + "type": "VmResourcePool"}, + { "name": "Project Y", + "text": "Project Y", + "id": 20, + "type": "VmResourcePool"}], + "id": 9, + "type": "HardwarePool"}, + { "name": "QA", + "text": "QA", + "children": + [{ "name": "Bob's Team", + "text": "Bob's Team", + "children": + [{ "name": "Bob's VMs", + "text": "Bob's VMs", + "id": 21, + "type": "VmResourcePool"}], + "id": 17, + "type": "HardwarePool"}, + { "name": "Jim's Team", + "text": "Jim's Team", + "children": + [{ "name": "Jim's VMs", + "text": "Jim's VMs", + "id": 22, + "type": "VmResourcePool"}], + "id": 18, + "type": "HardwarePool"}, + { "name": "Sally's Team", + "text": "Sally's Team", + "children": + [{ "name": "Sally's VMs", + "text": "Sally's VMs", + "id": 33, + "type": "VmResourcePool"}], + "id": 32, + "type": "HardwarePool"}], + "id": 10, + "type": "HardwarePool"}, + { "name": "Stage", + "text": "Stage", + "children": + [{ "name": "stage1", + "text": "stage1", + "id": 45, + "type": "HardwarePool"}, + { "name": "stage2", + "text": "stage2", + "id": 46, + "type": "HardwarePool"}], + "id": 44, + "type": "HardwarePool"}], + "id": 5, + "type": "HardwarePool"}, + { "name": "Finance", + "text": "Finance", + "children": + [{ "name": "Payroll", + "text": "Payroll", + "children": + [{ "name": "Payroll VMs", + "text": "Payroll VMs", + "id": 23, + "type": "VmResourcePool"}], + "id": 11, + "type": "HardwarePool"}, + { "name": "Accts. Receivable", + "text": "Accts. Receivable", + "children": + [{ "name": "our VMs", + "text": "our VMs", + "id": 24, + "type": "VmResourcePool"}], + "id": 12, + "type": "HardwarePool"}], + "id": 6, + "type": "HardwarePool"}, + { "name": "HR", + "text": "HR", + "children": + [{ "name": "Hiring Team", + "text": "Hiring Team", + "id": 13, + "type": "HardwarePool"}, + { "name": "Benefits", + "text": "Benefits", + "id": 14, + "type": "HardwarePool"}], + "id": 7, + "type": "HardwarePool"}, + { "name": "External (DMZ)", + "text": "External (DMZ)", + "children": + [{ "name": "VMs", + "text": "VMs", + "id": 25, + "type": "VmResourcePool"}, + { "name": "DB Cluster", + "text": "DB Cluster", + "children": + [{ "name": "VMs", + "text": "VMs", + "id": 27, + "type": "VmResourcePool"}], + "id": 26, + "type": "HardwarePool"}], + "id": 8, + "type": "HardwarePool"}], + "id": 1, + "type": "HardwarePool"}], +"smart_pools":[{ "name": "ovirtadmin", + "text": "ovirtadmin", + "children": + [{ "name": "not so smart", + "text": "not so smart", + "id": 39, + "type": "SmartPool"}, + { "name": "a little smarter", + "text": "a little smarter", + "id": 40, + "type": "SmartPool"}, + { "name": "arrrrr", + "text": "arrrrr", + "id": 41, + "type": "SmartPool"}, + { "name": "huh?", + "text": "huh?", + "id": 42, + "type": "SmartPool"}, + { "name": "booya", + "text": "booya", + "id": 43, + "type": "SmartPool"}], + "id": 37, + "type": "DirectoryPool"}] +} \ No newline at end of file diff --git a/src/public/javascripts/test/storage_tree_sample_data.js b/src/public/javascripts/test/storage_tree_sample_data.js new file mode 100644 index 0000000..f798a45 --- /dev/null +++ b/src/public/javascripts/test/storage_tree_sample_data.js @@ -0,0 +1,68 @@ +var storage_pools = {"pools": +[ + { + "selected":false, + "name":"iSCSI: 192.168.50.2:ovirtpriv:storage", + "available":false, + "children": + [ + { + "selected":false, + "name":"iSCSI: 192.168.50.2:ovirtpriv:storage:lun-2", + "available":true, + "children":[], + "create_volume":true, + "text":"iSCSI: 192.168.50.2:ovirtpriv:storage:lun-2", + "id":5, + "type":"IscsiStorageVolume", + "ui_object": "IscsiStorageVolume_5", + "ui_parent": "IscsiStoragePool_2" + }, + + { + "selected":false, + "name":"iSCSI: 192.168.50.2:ovirtpriv:storage:lun-3", + "available":true, + "children":[], + "create_volume":true, + "text":"iSCSI: 192.168.50.2:ovirtpriv:storage:lun-3", + "id":4, + "type":"IscsiStorageVolume", + "ui_object": "IscsiStorageVolume_4", + "ui_parent": "IscsiStoragePool_2" + } + ], + "create_volume":false, + "text":"iSCSI: 192.168.50.2:ovirtpriv:storage", + "id":2, + "type":"IscsiStoragePool", + "ui_object": "IscsiStoragePool_2", + "ui_parent": null + }, + + { + "selected":false, + "name":"iSCSI: 192.68.60.2:/fred", + "available":false, + "children":[], + "create_volume":false, + "text":"iSCSI: 192.68.60.2:/fred", + "id":7, + "type":"IscsiStoragePool", + "ui_object": "IscsiStoragePool_7", + "ui_parent": null + }, + + { + "selected":false, + "name":"iSCSI: 192.168.60.4:/mo", + "available":false, + "children":[], + "create_volume":false, + "text":"iSCSI: 192.168.60.4:/mo", + "id":6, + "type":"IscsiStoragePool", + "ui_object": "IscsiStoragePool_6", + "ui_parent": null + } +]} \ No newline at end of file diff --git a/src/test/fixtures/storage_volumes.yml b/src/test/fixtures/storage_volumes.yml index a3711bf..8e5b60a 100644 --- a/src/test/fixtures/storage_volumes.yml +++ b/src/test/fixtures/storage_volumes.yml @@ -19,6 +19,16 @@ ovirtpriv_storage_lun_3: storage_pool: corp_com_ovirtpriv_storage type: IscsiStorageVolume state: available + lvm_pool_id: corp_com_dev_lvm_ovirtlvm +ovirtpriv_lvm_volume_1: + size: 1048576 + path: /dev/disk/by-id/scsi-S_beaf321013 + storage_pool: corp_com_dev_lvm_ovirtlvm + type: LvmStorageVolume + state: available + lv_owner_perms: 0744 + lv_group_perms: 0744 + lv_mode_perms: 0744 ovirt_nfs_disk_1: size: 3145728 path: /mnt/a3q49Sj4Sfmae1bV/disk1.dsk diff --git a/src/test/unit/storage_volume_test.rb b/src/test/unit/storage_volume_test.rb index 3978685..16be0fb 100644 --- a/src/test/unit/storage_volume_test.rb +++ b/src/test/unit/storage_volume_test.rb @@ -1,4 +1,4 @@ -# +# # Copyright (C) 2008 Red Hat, Inc. # Written by Scott Seago # @@ -112,4 +112,23 @@ class StorageVolumeTest < Test::Unit::TestCase assert_equal @storage_volume.movable?, false, "Storage volume w/ vms should not be movable" end + def test_create_valid_lvm_volume +# FIXME: Write this test, using similer steps as in storage_controller#new_volume. +# Also add validation to model to make sure the lvm volume's lvm pool has a source volume + end + def test_return_correct_lvm_ui_parent + #test lvm volume values + assert_equal storage_volumes(:ovirtpriv_storage_lun_3).type.to_s + '_' +storage_volumes(:ovirtpriv_storage_lun_3).id.to_s, + storage_volumes(:ovirtpriv_lvm_volume_1).ui_parent, + 'Incorrect ui parent returned' + #test isci volume values + assert_equal storage_volumes(:corp_com_ovirtpriv_storage).type.to_s + '_' +storage_volumes(:corp_com_ovirtpriv_storage).id.to_s, + storage_volumes(:ovirtpriv_storage_lun_3).ui_parent, + 'Incorrect ui parent returned' + #test nfs volume values + assert_equal storage_volumes(:corp_com_nfs_ovirtnfs).type.to_s + '_' +storage_volumes(:corp_com_nfs_ovirtnfs).id.to_s, + storage_volumes(:ovirt_nfs_disk_3).ui_parent, + 'Incorrect ui parent returned' + end + end -- 1.5.6.6 From sseago at redhat.com Thu Jan 22 23:01:59 2009 From: sseago at redhat.com (Scott Seago) Date: Thu, 22 Jan 2009 23:01:59 +0000 Subject: [Ovirt-devel] [PATCH] more permissions validation for non-privileged users. Message-ID: <1232665319-23405-1-git-send-email-sseago@redhat.com> Fixed some of the error handling for popup and json ajax responses, and hid action links from non-privileged users where those actions were not appropriate for them. Signed-off-by: Scott Seago --- src/app/controllers/application.rb | 40 +++++++++++++-------- src/app/controllers/dashboard_controller.rb | 1 + src/app/controllers/hardware_controller.rb | 5 +-- src/app/controllers/host_controller.rb | 9 +++++ src/app/controllers/network_controller.rb | 25 ++++++++----- src/app/controllers/pool_controller.rb | 8 ++-- src/app/controllers/quota_controller.rb | 3 -- src/app/controllers/resources_controller.rb | 2 - src/app/controllers/smart_pools_controller.rb | 3 +- src/app/controllers/storage_controller.rb | 25 ++++--------- src/app/controllers/vm_controller.rb | 3 -- src/app/models/smart_pool.rb | 8 +++-- src/app/views/hardware/show_hosts.rhtml | 24 +++++++----- src/app/views/hardware/show_storage.rhtml | 28 +++++++++------ src/app/views/hardware/show_vms.rhtml | 14 +++++-- src/app/views/layouts/_side_toolbar.rhtml | 4 +- src/app/views/layouts/_tree.rhtml | 9 +++-- src/app/views/layouts/popup-error.rhtml | 5 +++ src/app/views/resources/show_vms.rhtml | 46 ++++++++++++++---------- src/app/views/user/_grid.rhtml | 11 ++++-- src/app/views/user/_show.rhtml | 9 +++-- src/public/stylesheets/ovirt-tree/tree.css | 8 ++--- 22 files changed, 167 insertions(+), 123 deletions(-) create mode 100644 src/app/views/layouts/popup-error.rhtml diff --git a/src/app/controllers/application.rb b/src/app/controllers/application.rb index 3f75979..1c3f99e 100644 --- a/src/app/controllers/application.rb +++ b/src/app/controllers/application.rb @@ -82,26 +82,36 @@ class ApplicationController < ActionController::Base def pre_show end - def authorize_user - authorize_action(false) + def authorize_user(msg=nil) + authorize_action(false,msg) end - def authorize_admin - authorize_action(true) + def authorize_admin(msg=nil) + authorize_action(true,msg) end - def authorize_action(is_modify_action) + def authorize_action(is_modify_action, msg=nil) + msg ||= 'You do not have permission to create or modify this item ' if @perm_obj set_perms(@perm_obj) unless (is_modify_action ? @can_modify : @can_control_vms) - @redir_obj = @perm_obj unless @redir_obj - flash[:notice] = 'You do not have permission to create or modify this item ' - if @json_hash - @json_hash[:success] = false - @json_hash[:alert] = flash[:notice] - render :json => @json_hash - elsif @redir_controller - redirect_to :controller => @redir_controller, :action => 'show', :id => @redir_obj - else - redirect_to :action => 'show', :id => @redir_obj + respond_to do |format| + format.html do + @title = "Access denied" + @errmsg = msg + if params[:ajax] + render :template => 'layouts/popup-error', :layout => 'tabs-and-content' + elsif params[:nolayout] + render :template => 'layouts/popup-error', :layout => 'help-and-content' + else + render :template => 'layouts/popup-error', :layout => 'popup' + end + end + format.json do + @json_hash ||= {} + @json_hash[:success] = false + @json_hash[:alert] = msg + render :json => @json_hash + end + format.xml { head :forbidden } end false end diff --git a/src/app/controllers/dashboard_controller.rb b/src/app/controllers/dashboard_controller.rb index 00398a5..821fb3f 100644 --- a/src/app/controllers/dashboard_controller.rb +++ b/src/app/controllers/dashboard_controller.rb @@ -29,6 +29,7 @@ class DashboardController < ApplicationController def index @task_types = Task::TASK_TYPES_OPTIONS + @user = get_login_user show_tasks end diff --git a/src/app/controllers/hardware_controller.rb b/src/app/controllers/hardware_controller.rb index 5c14eec..fc16a27 100644 --- a/src/app/controllers/hardware_controller.rb +++ b/src/app/controllers/hardware_controller.rb @@ -29,7 +29,8 @@ class HardwareController < PoolController before_filter :pre_modify, :only => [:add_hosts, :move_hosts, :add_storage, :move_storage, - :create_storage, :delete_storage] + :create_storage, :delete_storage, + :move, :removestorage] def index if params[:path] @@ -174,7 +175,6 @@ class HardwareController < PoolController end def move - pre_modify @resource_type = params[:resource_type] @id = params[:id] @pools = HardwarePool.get_default_pool.full_set_nested(:method => :json_hash_element, @@ -330,7 +330,6 @@ class HardwareController < PoolController end def removestorage - pre_modify render :layout => 'popup' end diff --git a/src/app/controllers/host_controller.rb b/src/app/controllers/host_controller.rb index da630f7..02ad8c9 100644 --- a/src/app/controllers/host_controller.rb +++ b/src/app/controllers/host_controller.rb @@ -31,6 +31,7 @@ class HostController < ApplicationController end before_filter :pre_action, :only => [:host_action, :enable, :disable, :clear_vms, :edit_network] + before_filter :pre_addhost, :only => [:addhost] # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html) verify :method => [:post, :put], :only => [ :create, :update ], @@ -85,6 +86,14 @@ class HostController < ApplicationController render :layout => 'popup' end + def pre_addhost + @pool = Pool.find(params[:hardware_pool_id]) + @parent = @pool.parent + @perm_obj = @pool + @current_pool_id=@pool.id + authorize_admin + end + def add_to_smart_pool @pool = SmartPool.find(params[:smart_pool_id]) render :layout => 'popup' diff --git a/src/app/controllers/network_controller.rb b/src/app/controllers/network_controller.rb index e4faf7b..7328e66 100644 --- a/src/app/controllers/network_controller.rb +++ b/src/app/controllers/network_controller.rb @@ -20,22 +20,24 @@ class NetworkController < ApplicationController ########################## Networks related actions - def network_permissions + before_filter :pre_list, :only => [:list] + + def authorize_admin # TODO more robust permission system # either by subclassing network from pool # or by extending permission model to accomodate # any object @default_pool = HardwarePool.get_default_pool - set_perms(@default_pool) - unless @can_modify - flash[:notice] = 'You do not have permission to view networks' - redirect_to :controller => 'dashboard' - end + @perm_obj=@default_pool + super('You do not have permission to access networks') end - def list + def pre_list @networks = Network.find(:all) - network_permissions + authorize_admin + end + + def list respond_to do |format| format.html { render :layout => 'tabs-and-content' if params[:ajax] @@ -51,9 +53,12 @@ class NetworkController < ApplicationController json_list(Network.find(:all), [:id, :name, :type, [:boot_type, :label]]) end + def pre_show + @network = Network.find(params[:id]) + authorize_admin + end + def show - @network = Network.find(params[:id]) - network_permissions respond_to do |format| format.html { render :layout => 'selection' } format.xml { render :xml => @network.to_xml } diff --git a/src/app/controllers/pool_controller.rb b/src/app/controllers/pool_controller.rb index b8d0f10..2809d6d 100644 --- a/src/app/controllers/pool_controller.rb +++ b/src/app/controllers/pool_controller.rb @@ -62,8 +62,10 @@ class PoolController < ApplicationController end def users_json - json_list(@pool.permissions, - [:grid_id, :uid, :user_role, :source]) + attr_list = [] + attr_list << :grid_id if params[:checkboxes] + attr_list += [:uid, :user_role, :source] + json_list(@pool.permissions, attr_list) end def hosts_json(args) @@ -103,7 +105,6 @@ class PoolController < ApplicationController def pre_new @parent = Pool.find(params[:parent_id]) @perm_obj = @parent - @redir_controller = @perm_obj.get_controller @current_pool_id=@parent.id end def pre_create @@ -114,7 +115,6 @@ class PoolController < ApplicationController @parent = Pool.find(params[:parent_id]) end @perm_obj = @parent - @redir_controller = @perm_obj.get_controller @current_pool_id=@parent.id end def pre_show_pool diff --git a/src/app/controllers/quota_controller.rb b/src/app/controllers/quota_controller.rb index 58446d4..17fdc20 100644 --- a/src/app/controllers/quota_controller.rb +++ b/src/app/controllers/quota_controller.rb @@ -84,12 +84,10 @@ class QuotaController < ApplicationController def pre_new @quota = Quota.new( { :pool_id => params[:pool_id]}) @perm_obj = @quota.pool - @redir_controller = @perm_obj.get_controller end def pre_create @quota = Quota.new(params[:quota]) @perm_obj = @quota.pool - @redir_controller = @perm_obj.get_controller end def pre_show @quota = Quota.find(params[:id]) @@ -98,7 +96,6 @@ class QuotaController < ApplicationController def pre_edit @quota = Quota.find(params[:id]) @perm_obj = @quota.pool - @redir_controller = @perm_obj.get_controller end end diff --git a/src/app/controllers/resources_controller.rb b/src/app/controllers/resources_controller.rb index 3c6e3ee..7bed533 100644 --- a/src/app/controllers/resources_controller.rb +++ b/src/app/controllers/resources_controller.rb @@ -167,7 +167,6 @@ class ResourcesController < PoolController @pool = VmResourcePool.find(params[:id]) @parent = @pool.parent @perm_obj = @pool.parent - @redir_obj = @pool @current_pool_id=@pool.id end def pre_show @@ -179,7 +178,6 @@ class ResourcesController < PoolController @pool = VmResourcePool.find(params[:id]) @parent = @pool.parent @perm_obj = @pool - @redir_obj = @pool authorize_user end diff --git a/src/app/controllers/smart_pools_controller.rb b/src/app/controllers/smart_pools_controller.rb index 10dbf9a..cbfbd1c 100644 --- a/src/app/controllers/smart_pools_controller.rb +++ b/src/app/controllers/smart_pools_controller.rb @@ -24,7 +24,7 @@ class SmartPoolsController < PoolController :add_storage, :remove_storage, :add_vms, :remove_vms, :add_pools, :remove_pools, - :add_items] + :add_items, :add_pool_dialog] def show_vms show end @@ -65,7 +65,6 @@ class SmartPoolsController < PoolController end def add_pool_dialog - pre_modify @selected_pools = @pool.tagged_pools.collect {|pool| pool.id} render :layout => 'popup' end diff --git a/src/app/controllers/storage_controller.rb b/src/app/controllers/storage_controller.rb index e4b72f1..2b76f44 100644 --- a/src/app/controllers/storage_controller.rb +++ b/src/app/controllers/storage_controller.rb @@ -26,6 +26,7 @@ class StorageController < ApplicationController before_filter :pre_new2, :only => [:new2] before_filter :pre_json, :only => [:storage_volumes_json] before_filter :pre_create_volume, :only => [:create_volume] + before_filter :pre_add, :only => [:add, :addstorage] def index list @@ -258,27 +259,15 @@ class StorageController < ApplicationController end end - def add_internal - @hardware_pool = HardwarePool.find(params[:hardware_pool_id]) - @perm_obj = @hardware_pool - @redir_controller = @perm_obj.get_controller - authorize_admin - @storage_pools = @hardware_pool.storage_volumes - @storage_types = StoragePool::STORAGE_TYPE_PICKLIST - end - def addstorage - add_internal render :layout => 'popup' end def add - add_internal render :layout => false end def new - add_internal render :layout => false end @@ -396,7 +385,13 @@ class StorageController < ApplicationController def pre_new @hardware_pool = HardwarePool.find(params[:hardware_pool_id]) @perm_obj = @hardware_pool - @redir_controller = @perm_obj.get_controller + authorize_admin + @storage_pools = @hardware_pool.storage_volumes + @storage_types = StoragePool::STORAGE_TYPE_PICKLIST + end + + def pre_add + pre_new end def pre_new2 @@ -406,7 +401,6 @@ class StorageController < ApplicationController end @storage_pool = StoragePool.factory(params[:storage_type], new_params) @perm_obj = @storage_pool.hardware_pool - @redir_controller = @storage_pool.hardware_pool.get_controller authorize_admin end def pre_create @@ -416,12 +410,10 @@ class StorageController < ApplicationController end @storage_pool = StoragePool.factory(type, pool) @perm_obj = @storage_pool.hardware_pool - @redir_controller = @storage_pool.hardware_pool.get_controller end def pre_edit @storage_pool = StoragePool.find(params[:id]) @perm_obj = @storage_pool.hardware_pool - @redir_obj = @storage_pool end def pre_create_volume volume = params[:storage_volume] @@ -430,7 +422,6 @@ class StorageController < ApplicationController end @storage_volume = StorageVolume.factory(type, volume) @perm_obj = @storage_volume.storage_pool.hardware_pool - @redir_controller = @storage_volume.storage_pool.hardware_pool.get_controller authorize_admin end def pre_json diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb index 701dea8..56501fd 100644 --- a/src/app/controllers/vm_controller.rb +++ b/src/app/controllers/vm_controller.rb @@ -332,7 +332,6 @@ class VmController < ApplicationController @vm.vm_resource_pool = @vm_resource_pool end @perm_obj = @vm.vm_resource_pool - @redir_controller = 'resources' @current_pool_id=@perm_obj.id _setup_provisioning_options end @@ -348,7 +347,6 @@ class VmController < ApplicationController end @vm = Vm.new(params[:vm]) @perm_obj = @vm.vm_resource_pool - @redir_controller = 'resources' @current_pool_id=@perm_obj.id end def pre_show @@ -359,7 +357,6 @@ class VmController < ApplicationController def pre_edit @vm = Vm.find(params[:id]) @perm_obj = @vm.vm_resource_pool - @redir_obj = @vm @current_pool_id=@perm_obj.id _setup_provisioning_options end diff --git a/src/app/models/smart_pool.rb b/src/app/models/smart_pool.rb index 772ffef..7df26fa 100644 --- a/src/app/models/smart_pool.rb +++ b/src/app/models/smart_pool.rb @@ -87,9 +87,11 @@ class SmartPool < Pool user_pools <<[child_pool.name, child_pool.id] end else - pool_element[:children].each do |child_element| - child_pool = child_element[:obj] - other_pools << [pool.name + " > " + child_pool.name, child_pool.id] + if pool_element.has_key?(:children) + pool_element[:children].each do |child_element| + child_pool = child_element[:obj] + other_pools << [pool.name + " > " + child_pool.name, child_pool.id] + end end end end diff --git a/src/app/views/hardware/show_hosts.rhtml b/src/app/views/hardware/show_hosts.rhtml index 2fd29bc..64e5d91 100644 --- a/src/app/views/hardware/show_hosts.rhtml +++ b/src/app/views/hardware/show_hosts.rhtml @@ -1,11 +1,13 @@

<%= image_tag "icon_addhost.png", :style=>"vertical-align:middle;" %> Add Host
- <%= image_tag "icon_move.png", :style=>"vertical-align:middle;" %> Move - -
+ <%if @can_modify -%> +
<%= image_tag "icon_addhost.png", :style=>"vertical-align:middle;" %> Add Host
+ <%= image_tag "icon_move.png", :style=>"vertical-align:middle;" %> Move + +
<%= image_tag "icon_smartpool.png", :style => "vertical-align:middle;" %> Add to Smart Pool <%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %>
-
<%= image_tag "icon_remove.png" %> Remove

@@ -111,8 +113,10 @@

No hosts found in this pool.

- <%= image_tag "icon_addhost.png", :style=>"vertical-align:middle;" %> - Add first host to this hardware pool + <%if @can_modify -%> + <%= image_tag "icon_addhost.png", :style=>"vertical-align:middle;" %> + Add first host to this hardware pool + <% end -%>

diff --git a/src/app/views/hardware/show_storage.rhtml b/src/app/views/hardware/show_storage.rhtml index 5643c83..5180be6 100644 --- a/src/app/views/hardware/show_storage.rhtml +++ b/src/app/views/hardware/show_storage.rhtml @@ -1,10 +1,12 @@

<%= image_tag "icon_addstorage.png", :style => "vertical-align:middle;" %> Add Storage Server
- <%= image_tag "icon_move.png", :style=>"vertical-align:middle;" %> Move - -
<%= image_tag "icon_addstorage.png", :style => "vertical-align:middle;" %> Add Storage Server
+ <%= image_tag "icon_move.png", :style=>"vertical-align:middle;" %> Move + +
<%= image_tag "icon_smartpool.png", :style => "vertical-align:middle;" %> Add to Smart Pool <%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %>
- <%= image_tag "icon_remove.png", :style=>"vertical-align:middle;" %> Remove - -
+ <%= image_tag "icon_remove.png", :style=>"vertical-align:middle;" %> Remove + +

@@ -141,8 +145,10 @@ ${htmlList(pools)}

No storage Volumes found in this pool.

- <%= image_tag "icon_addhost.png", :style=>"vertical-align:middle;" %> - Add first storage volume to this hardware pool + <%if @can_modify -%> + <%= image_tag "icon_addhost.png", :style=>"vertical-align:middle;" %> + Add first storage volume to this hardware pool + <% end -%>