From apevec at redhat.com  Wed Oct  1 11:06:59 2008
From: apevec at redhat.com (Alan Pevec)
Date: Wed,  1 Oct 2008 13:06:59 +0200
Subject: [Ovirt-devel] [PATCH ovirt-node-image] use rawhide repos for Fedora
	10
In-Reply-To: <1222811813-20710-1-git-send-email-apevec@redhat.com>
References: <1222811813-20710-1-git-send-email-apevec@redhat.com>
Message-ID: <1222859219-23982-1-git-send-email-apevec@redhat.com>

for experimental builds, until it gets released

Signed-off-by: Alan Pevec <apevec at redhat.com>
---
 ovirt-node-image.spec.in |   36 ++++++++++++++++++++++++++----------
 1 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/ovirt-node-image.spec.in b/ovirt-node-image.spec.in
index dbe8834..5a874f7 100644
--- a/ovirt-node-image.spec.in
+++ b/ovirt-node-image.spec.in
@@ -36,22 +36,38 @@ The PXE boot image for oVirt Node network boot from oVirt Server.
 %setup -q
 
 %build
-if [ -n "%{?fedora_url}" ]; then
-   cat > repos.ks << EOF
-repo --name=f%{fedora} --baseurl=%{fedora_url}/releases/%{fedora}/Everything/%{_arch}/os
-repo --name=f%{fedora}-updates --baseurl=%{fedora_url}/updates/%{fedora}/%{_arch}
-repo --name=f%{fedora}-updates-newkey --baseurl=%{fedora_url}/updates/%{fedora}/%{_arch}.newkey
+%if 0%{?fedora} == 010
+ # XXX current rawhide
+ %if "%{?fedora_url}" == ""
+cat > repos.ks << EOF
+repo --name=rawhide --mirrorlist=%{fedora_mirror}?repo=rawhide&arch=%{_arch}
+EOF
+ %else
+cat > repos.ks << EOF
+repo --name=rawhide --baseurl=%{fedora_url}/development/%{_arch}/os
 EOF
-else
-  cat > repos.ks << EOF
+ %endif
+cat >> repos.ks << EOF
+repo --name=ovirt-org --baseurl=%{ovirt_url}/development/%{_arch}
+EOF
+%else
+ %if "%{?fedora_url}" == ""
+cat > repos.ks << EOF
 repo --name=f%{fedora} --mirrorlist=%{fedora_mirror}?repo=fedora-%{fedora}&arch=%{_arch}
-repo --name=f%{fedora}-updates --mirrorlist=%{fedora_mirror}?repo=updates-released-f%{fedora}&arch=%{_arch}
 repo --name=f%{fedora}-updates-newkey --mirrorlist=%{fedora_mirror}?repo=updates-released-f%{fedora}.newkey&arch=%{_arch}
 EOF
-fi
-
+ %else
+cat > repos.ks << EOF
+repo --name=f%{fedora} --baseurl=%{fedora_url}/releases/%{fedora}/Everything/%{_arch}/os
+repo --name=f%{fedora}-updates-newkey --baseurl=%{fedora_url}/updates/%{fedora}/%{_arch}.newkey
+EOF
+ %endif
 cat >> repos.ks << EOF
 repo --name=ovirt-org --baseurl=%{ovirt_url}/%{fedora}/%{_arch}
+EOF
+%endif
+
+cat >> repos.ks << EOF
 repo --name=ovirt-local --baseurl=%{ovirt_local_repo}
 EOF
 
-- 
1.5.5.1



From fujimura.toshifumi at np.css.fujitsu.com  Wed Oct  1 11:18:40 2008
From: fujimura.toshifumi at np.css.fujitsu.com (Toshifumi Fujimura)
Date: Wed, 01 Oct 2008 20:18:40 +0900
Subject: [Ovirt-devel] =?iso-2022-jp?b?GyRCJWEhPCVqJXMlMCVqJTklSCROGyhC?=
	=?iso-2022-jp?b?GyRCSjhMTBsoQg==?=
Message-ID: <48E35C90.9070508@np.css.fujitsu.com>

??????????????????
??????Question for oVirt-0.9.4????????????


Hello!

I've installed oVirt-0.9.4.
But I have some questions about oVirt WUI.

(1)
Host's UUID of node3 is same as that of node4 in WUI. And each UUIDs in
WUI is different from that in "virsh list".
What does these UUID intend?
(2)
Node4 isn't contained UUID's host list in spite of starting. Why?

Works for me.

Toshifumi Fujimura.







From fujimura.toshifumi at np.css.fujitsu.com  Wed Oct  1 11:34:48 2008
From: fujimura.toshifumi at np.css.fujitsu.com (Toshifumi Fujimura)
Date: Wed, 01 Oct 2008 20:34:48 +0900
Subject: [Ovirt-devel] Question for oVirt-0.9.4
Message-ID: <48E36058.60205@np.css.fujitsu.com>

I have some questions about latest oVirt WUI.

(1)
Node4 can see from virsh list command.
But it isn't displayed on WUI interface.
Why?

(2)
Would you explain the UUID difference between
the output of virsh dumpxml and WUI's?

I successfully run the oVirt.
But I saw that the UUID is same between node3 and node5.
So I compare the virsh dumpxml UUID with WUI's UUID.
I raise this question.


Works for me.

Toshifumi Fujimura.



From apevec at redhat.com  Wed Oct  1 11:46:23 2008
From: apevec at redhat.com (Alan Pevec)
Date: Wed,  1 Oct 2008 13:46:23 +0200
Subject: [Ovirt-devel] [PATCH ovirt-node-image] use rawhide repos for Fedora
	10
In-Reply-To: <1222859219-23982-1-git-send-email-apevec@redhat.com>
References: <1222859219-23982-1-git-send-email-apevec@redhat.com>
Message-ID: <1222861583-11511-1-git-send-email-apevec@redhat.com>

for experimental builds, until it gets released

Signed-off-by: Alan Pevec <apevec at redhat.com>
---
 ovirt-node-image.ks      |    2 ++
 ovirt-node-image.spec.in |   36 ++++++++++++++++++++++++++----------
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/ovirt-node-image.ks b/ovirt-node-image.ks
index f5695d8..32bd055 100644
--- a/ovirt-node-image.ks
+++ b/ovirt-node-image.ks
@@ -8,6 +8,8 @@
 %end
 
 %post
+# cleanup rpmdb to allow non-matching host and chroot RPM versions
+rm -f /var/lib/rpm/__db*
 %include common-post.ks
 
 touch /.autorelabel
diff --git a/ovirt-node-image.spec.in b/ovirt-node-image.spec.in
index dbe8834..5a874f7 100644
--- a/ovirt-node-image.spec.in
+++ b/ovirt-node-image.spec.in
@@ -36,22 +36,38 @@ The PXE boot image for oVirt Node network boot from oVirt Server.
 %setup -q
 
 %build
-if [ -n "%{?fedora_url}" ]; then
-   cat > repos.ks << EOF
-repo --name=f%{fedora} --baseurl=%{fedora_url}/releases/%{fedora}/Everything/%{_arch}/os
-repo --name=f%{fedora}-updates --baseurl=%{fedora_url}/updates/%{fedora}/%{_arch}
-repo --name=f%{fedora}-updates-newkey --baseurl=%{fedora_url}/updates/%{fedora}/%{_arch}.newkey
+%if 0%{?fedora} == 010
+ # XXX current rawhide
+ %if "%{?fedora_url}" == ""
+cat > repos.ks << EOF
+repo --name=rawhide --mirrorlist=%{fedora_mirror}?repo=rawhide&arch=%{_arch}
+EOF
+ %else
+cat > repos.ks << EOF
+repo --name=rawhide --baseurl=%{fedora_url}/development/%{_arch}/os
 EOF
-else
-  cat > repos.ks << EOF
+ %endif
+cat >> repos.ks << EOF
+repo --name=ovirt-org --baseurl=%{ovirt_url}/development/%{_arch}
+EOF
+%else
+ %if "%{?fedora_url}" == ""
+cat > repos.ks << EOF
 repo --name=f%{fedora} --mirrorlist=%{fedora_mirror}?repo=fedora-%{fedora}&arch=%{_arch}
-repo --name=f%{fedora}-updates --mirrorlist=%{fedora_mirror}?repo=updates-released-f%{fedora}&arch=%{_arch}
 repo --name=f%{fedora}-updates-newkey --mirrorlist=%{fedora_mirror}?repo=updates-released-f%{fedora}.newkey&arch=%{_arch}
 EOF
-fi
-
+ %else
+cat > repos.ks << EOF
+repo --name=f%{fedora} --baseurl=%{fedora_url}/releases/%{fedora}/Everything/%{_arch}/os
+repo --name=f%{fedora}-updates-newkey --baseurl=%{fedora_url}/updates/%{fedora}/%{_arch}.newkey
+EOF
+ %endif
 cat >> repos.ks << EOF
 repo --name=ovirt-org --baseurl=%{ovirt_url}/%{fedora}/%{_arch}
+EOF
+%endif
+
+cat >> repos.ks << EOF
 repo --name=ovirt-local --baseurl=%{ovirt_local_repo}
 EOF
 
-- 
1.5.5.1



From dpierce at redhat.com  Wed Oct  1 14:17:24 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Wed,  1 Oct 2008 10:17:24 -0400
Subject: [Ovirt-devel] [PATCH server] Added support for booting a VM from an
	ISO image.
Message-ID: <1222870644-15710-1-git-send-email-dpierce@redhat.com>

Also added a few helper methods to Vm to contain the knowledge
of how Cobbler integration is contained.

When a user adds an ISO image to the Cobbler server on the appliance,
they will need to do so using the full NFS URL for where the virtual
image will go to mount it; i.e., nfs://hostname:/path/to/filename.iso

If the filename ends in ".iso" then the virtual machine will mount the
file as a CDROM device and boot it. Otherwise, it mounts it as a hard
disk device.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 src/app/controllers/vm_controller.rb |   13 +++++--
 src/app/models/vm.rb                 |   31 +++++++++++++++-
 src/task-omatic/task_vm.rb           |   63 ++++++++++++++++++++++++++++------
 src/test/unit/vm_test.rb             |   57 +++++++++++++++++++++++++++++--
 4 files changed, 144 insertions(+), 20 deletions(-)

diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb
index f5c0845..8b16c94 100644
--- a/src/app/controllers/vm_controller.rb
+++ b/src/app/controllers/vm_controller.rb
@@ -223,13 +223,18 @@ class VmController < ApplicationController
   def _setup_provisioning_options
     @provisioning_options = [[Vm::PXE_OPTION_LABEL, Vm::PXE_OPTION_VALUE],
                              [Vm::HD_OPTION_LABEL, Vm::HD_OPTION_VALUE]]
-    # FIXME add cobbler images too
+
     begin
+      @provisioning_options += Cobbler::Image.find.collect do |image|
+        [image.name + Vm::COBBLER_IMAGE_SUFFIX,
+          "#{Vm::IMAGE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{image.name}"]
+      end
+
       @provisioning_options += Cobbler::Profile.find.collect do |profile|
         [profile.name + Vm::COBBLER_PROFILE_SUFFIX,
-         Vm::COBBLER_PREFIX + Vm::PROVISIONING_DELIMITER +
-         Vm::PROFILE_PREFIX + Vm::PROVISIONING_DELIMITER + profile.name]
-      end
+          "#{Vm::PROFILE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{profile.name}"]
+
+    end
     rescue
       #if cobbler doesn't respond/is misconfigured/etc just don't add profiles
     end
diff --git a/src/app/models/vm.rb b/src/app/models/vm.rb
index ace6fb1..2e2ddb5 100644
--- a/src/app/models/vm.rb
+++ b/src/app/models/vm.rb
@@ -49,7 +49,7 @@ class Vm < ActiveRecord::Base
   PROFILE_PREFIX         = "profile"
   IMAGE_PREFIX           = "image"
   COBBLER_PROFILE_SUFFIX = " (Cobbler Profile)"
-  COBBLER_IMAGE_SUFFIX   = " (Cobbler Profile)"
+  COBBLER_IMAGE_SUFFIX   = " (Cobbler Image)"
 
   PXE_OPTION_LABEL       = "PXE Boot"
   PXE_OPTION_VALUE       = "pxe"
@@ -139,7 +139,12 @@ class Vm < ActiveRecord::Base
   end
 
   def provisioning_and_boot_settings=(settings)
-    if settings==PXE_OPTION_VALUE
+    # if the settings have a prefix that matches cobber settings, then process
+    # those details
+    if settings =~ /\@#{COBBLER_PREFIX}/
+      self[:boot_device] = BOOT_DEV_NETWORK
+      self[:provisioning] = settings
+    elsif settings==PXE_OPTION_VALUE
       self[:boot_device]= BOOT_DEV_NETWORK
       self[:provisioning]= nil
     elsif settings==HD_OPTION_VALUE
@@ -242,6 +247,28 @@ class Vm < ActiveRecord::Base
     vm_resource_pool.search_users
   end
 
+  # Reports whether the VM is uses Cobbler for booting.
+  #
+  def uses_cobbler?
+    self.provisioning.include? COBBLER_PREFIX
+  end
+
+  # Returns the cobbler type.
+  #
+  def cobbler_type
+    if self.uses_cobbler?
+      self.provisioning[/^(.*)@/,1]
+    end
+  end
+
+  # Returns the cobbler provisioning name.
+  #
+  def cobbler_name
+    if self.uses_cobbler?
+      self.provisioning[/^.*@.*:(.*)/,1]
+    end
+  end
+
   protected
   def validate
     resources = vm_resource_pool.max_resources_for_vm(self)
diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb
index 3588224..101878b 100644
--- a/src/task-omatic/task_vm.rb
+++ b/src/task-omatic/task_vm.rb
@@ -25,7 +25,7 @@ gem 'cobbler'
 require 'cobbler'
 
 def create_vm_xml(name, uuid, memAllocated, memUsed, vcpus, bootDevice,
-                  macAddr, bridge, diskDevices)
+                  macAddr, bridge, diskDevices, bootdrive)
   doc = Document.new
 
   doc.add_element("domain", {"type" => "kvm"})
@@ -65,16 +65,28 @@ def create_vm_xml(name, uuid, memAllocated, memUsed, vcpus, bootDevice,
   doc.root.elements["devices"].add_element("emulator")
   doc.root.elements["devices"].elements["emulator"].text = "/usr/bin/qemu-kvm"
 
-  devs = [ 'hda', 'hdb', 'hdc', 'hdd' ]
-  i = 0
+  devs = [ 'hda', 'hdb', 'hdc', 'hdd', 'hde', 'hdf' ]
+  which_device = 0
   diskDevices.each do |disk|
     diskdev = Element.new("disk")
     diskdev.add_attribute("type", "block")
     diskdev.add_attribute("device", "disk")
     diskdev.add_element("source", {"dev" => disk})
-    diskdev.add_element("target", {"dev" => devs[i]})
+    diskdev.add_element("target", {"dev" => devs[which_device]})
     doc.root.elements["devices"] << diskdev
-    i += 1
+    which_device += 1
+  end
+
+  if bootdrive
+    bootdisk = Element.new("disk")
+
+    bootdisk.add_attribute("type", bootdisk[:type])
+    bootdisk.add_attribute("device", bootdisk[:device])
+    bootdisk.add_element("source", {"file" => bootdrive[:source]})
+    bootdisk.add_element("target", {"dev" => devs[which_device], "bus" => "ide"})
+    bootdisk.add_element("readonly") if bootdrive[:readonly]
+
+    doc.root.elements["devices"] << bootdisk
   end
 
   doc.root.elements["devices"].add_element("interface", {"type" => "bridge"})
@@ -154,15 +166,12 @@ def create_vm(task)
   # create cobbler system profile
   begin
     if vm.provisioning and !vm.provisioning.empty?
-      provisioning_arr = vm.provisioning.split(Vm::PROVISIONING_DELIMITER)
-      if provisioning_arr[0]==Vm::COBBLER_PREFIX
-        if provisioning_arr[1]==Vm::PROFILE_PREFIX
+      if vm.uses_cobbler?
+        if vm.cobbler_type == Vm::PROFILE_PREFIX:
           system = Cobbler::System.new('name' => vm.uuid,
                                        'profile' => provisioning_arr[2])
           system.interfaces=[Cobbler::NetworkInterface.new({'mac_address' => vm.vnic_mac_addr})]
           system.save
-        elsif provisioning_arr[1]==Vm::IMAGE_PREFIX
-          #FIXME handle cobbler images
         end
       end
     end
@@ -268,12 +277,44 @@ def start_vm(task)
 
     conn = Libvirt::open("qemu+tcp://" + host.hostname + "/system")
 
+    # if the VM is an image, then prepare things
+    if vm.uses_cobbler? && (vm.cobbler_type == Vm.IMAGE_PREFIX)
+        details = Cobbler::Image.find_one(vm.cobbler_name)
+
+        raise Exception.new("Image #{vm.cobbler_name} not found in Cobbler server") unless details
+
+        ignored, protocol, sharepath, filename = details.filename(/(.*):\/\/(.*)\/(.*)/)
+
+        raise Exception.new("Only NFS mounts are supported currently") unless protocol == 'nfs'
+
+        # if the file's an .ISO then we'll have to mount as a CDrom, otherwise
+        # we'll mount as a hard drive
+        bootdrive[:type]     = 'file'
+        bootdrive[:source]   = filename
+        bootdrive[:path]     = sharepath
+        if details.file[/.iso/]
+          bootdrive[:readonly] = true
+          bootdrive[:device]   = 'cdrom'
+        else
+          bootdrive[:readonly] = false
+          bootdrive[:device]   = 'disk'
+        end
+
+        # mount the filesystem
+        mountpoint = `mktemp -d`
+        bootdrive[:mountpoint] = mountpoint
+
+        unless system("mount #{sharepath} #{mountpoint}")
+          raise Exception.new "Unable to mount #{details.file}"
+        end
+    end
+
     storagedevs = connect_storage_pools(conn, vm)
 
     # FIXME: get rid of the hardcoded bridge
     xml = create_vm_xml(vm.description, vm.uuid, vm.memory_allocated,
                         vm.memory_used, vm.num_vcpus_allocated, vm.boot_device,
-                        vm.vnic_mac_addr, "ovirtbr0", storagedevs)
+                        vm.vnic_mac_addr, "ovirtbr0", storagedevs, bootdrive)
 
     dom = conn.define_domain_xml(xml.to_s)
     dom.create
diff --git a/src/test/unit/vm_test.rb b/src/test/unit/vm_test.rb
index 4a5e353..c226c63 100644
--- a/src/test/unit/vm_test.rb
+++ b/src/test/unit/vm_test.rb
@@ -22,8 +22,59 @@ require File.dirname(__FILE__) + '/../test_helper'
 class VmTest < Test::Unit::TestCase
   fixtures :vms
 
-  # Replace this with your real tests.
-  def test_truth
-    assert true
+  def setup
+    @vm_name = "Test"
+    @no_cobbler_provisioning = "#{@vm_name}"
+    @cobbler_image_provisioning =
+      "#{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}"
+
+  end
+
+  # Ensures that, if the VM does not contain the Cobbler prefix, that it
+  # does not claim to be a Cobbler VM.
+  #
+  def test_uses_cobbler_without_cobbler_prefix
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings=@no_cobbler_provisioning
+
+    flunk "VM is not a Cobbler provisioned one." if vm.uses_cobbler?
+    assert_equal @vm_name, vm.provisioning, "Wrong name reported."
+  end
+
+  # Ensures that the VM reports that it uses Cobbler if the provisioning
+  # is for a Cobbler profile.
+  #
+  def test_uses_cobbler_with_cobbler_profile
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings = @cobbler_profile_provisioning
+
+    flunk "VM did not report that it's Cobbler provisioned." unless vm.uses_cobbler?
+    assert_equal Vm::PROFILE_PREFIX,
+      vm.cobbler_type,
+      "Wrong cobbler type reported."
+    assert_equal @vm_name,
+      vm.cobbler_name,
+      "Wrong name reported."
+  end
+
+  # Ensures that the VM reports that it uses Cobbler if the provisioning
+  # is for a Cobbler image.
+  #
+  def test_uses_cobbler_With_cobbler_image
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings = @cobbler_image_provisioning
+
+    flunk "VM did not report that it's Cobbler provisioned." unless vm.uses_cobbler?
+    assert_equal Vm::IMAGE_PREFIX,
+      vm.cobbler_type,
+      "Wrong cobbler type reported."
+    assert_equal @vm_name,
+      vm.cobbler_name,
+      "Wrong name reported."
   end
 end
-- 
1.5.5.1



From mmorsi at redhat.com  Wed Oct  1 18:14:48 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Wed,  1 Oct 2008 14:14:48 -0400
Subject: [Ovirt-devel] oVirt Server Help Document Patch Set
Message-ID: <1222884890-12367-1-git-send-email-mmorsi@redhat.com>


The following two patches integrate the "Using oVirt" document 
provided by the docs rpm into the oVirt server appliance and
rails application. Overall this consists of the following steps
  
  * add ovirt-doc rpm dependency to ovirt-recipe rpm
  * use recipe to make "Using oVirt" doc available to rails
  * add help_sections table to db
  * set application.rb to always lookup appropriate help 
    section based on controller / action being requested.
    if none is found, a default is used
  * integrate correct help link into wui, requires various
    template / css tweaks



From mmorsi at redhat.com  Wed Oct  1 18:14:49 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Wed,  1 Oct 2008 14:14:49 -0400
Subject: [Ovirt-devel] [PATCH] integrate docs into appliance / server
In-Reply-To: <1222884890-12367-1-git-send-email-mmorsi@redhat.com>
References: <1222884890-12367-1-git-send-email-mmorsi@redhat.com>
Message-ID: <1222884890-12367-2-git-send-email-mmorsi@redhat.com>

---
 appliances/ovirt/ovirt.pp.in |    4 ++++
 ovirt-recipe.spec.in         |    1 +
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/appliances/ovirt/ovirt.pp.in b/appliances/ovirt/ovirt.pp.in
index 1ee8b48..e24c046 100644
--- a/appliances/ovirt/ovirt.pp.in
+++ b/appliances/ovirt/ovirt.pp.in
@@ -168,6 +168,10 @@ single_exec {"ovirt_installation":
     require => [Service["postgresql"],Single_exec["ovirt_appliance_installation"]]
 }
 
+single_exec {"ovirt_docs_accesible_from_server":
+    command => "/bin/ln -s /usr/share/doc/ovirt-docs-${appliance_version}/Using_oVirt/ /usr/share/ovirt-server/public/help"
+}
+
 #
 # Cobbler Configuration
 #
diff --git a/ovirt-recipe.spec.in b/ovirt-recipe.spec.in
index 7013b3b..cb134c4 100644
--- a/ovirt-recipe.spec.in
+++ b/ovirt-recipe.spec.in
@@ -29,6 +29,7 @@ Requires: iscsi-initiator-utils
 Requires: ovirt-server
 Requires: ovirt-node-image-pxe
 Requires: ovirt-release
+Requires: ovirt-docs
 Requires: rhpl
 Requires: cobbler
 Requires: rubygem-cobbler
-- 
1.5.4.1



From mmorsi at redhat.com  Wed Oct  1 18:14:50 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Wed,  1 Oct 2008 14:14:50 -0400
Subject: [Ovirt-devel] [PATCH] integrate 'using ovirt' doc into a wui help
	section
In-Reply-To: <1222884890-12367-2-git-send-email-mmorsi@redhat.com>
References: <1222884890-12367-1-git-send-email-mmorsi@redhat.com>
	<1222884890-12367-2-git-send-email-mmorsi@redhat.com>
Message-ID: <1222884890-12367-3-git-send-email-mmorsi@redhat.com>

this will work as is, but until help_sections table is populated
all pages will link to main document body (and not particular
sections)
---
 src/app/controllers/application.rb           |    7 ++++++-
 src/app/controllers/pool_controller.rb       |    2 +-
 src/app/models/help_section.rb               |    2 ++
 src/app/views/layouts/_header_redux.rhtml    |    1 -
 src/app/views/layouts/help-and-content.rhtml |    4 ++++
 src/app/views/layouts/redux.rhtml            |    4 ++++
 src/app/views/layouts/tabs-and-content.rhtml |    6 +++++-
 src/db/migrate/023_create_help_sections.rb   |   13 +++++++++++++
 src/public/stylesheets/layout.css            |    8 +++++++-
 src/test/fixtures/help_sections.yml          |    7 +++++++
 src/test/unit/help_section_test.rb           |    8 ++++++++
 11 files changed, 57 insertions(+), 5 deletions(-)
 create mode 100644 src/app/models/help_section.rb
 create mode 100644 src/app/views/layouts/help-and-content.rhtml
 create mode 100644 src/db/migrate/023_create_help_sections.rb
 create mode 100644 src/test/fixtures/help_sections.yml
 create mode 100644 src/test/unit/help_section_test.rb

diff --git a/src/app/controllers/application.rb b/src/app/controllers/application.rb
index 6dcf6f8..0d5521a 100644
--- a/src/app/controllers/application.rb
+++ b/src/app/controllers/application.rb
@@ -31,7 +31,7 @@ class ApplicationController < ActionController::Base
   before_filter :pre_edit, :only => [:edit, :update, :destroy]
   before_filter :pre_show, :only => [:show]
   before_filter :authorize_admin, :only => [:new, :create, :edit, :update, :destroy]
-  before_filter :is_logged_in
+  before_filter :is_logged_in, :get_help_section
 
   def is_logged_in
     redirect_to(:controller => "login", :action => "login") unless get_login_user
@@ -40,6 +40,11 @@ class ApplicationController < ActionController::Base
   def get_login_user
     (ENV["RAILS_ENV"] == "production") ? session[:user] : "ovirtadmin"
   end
+
+  def get_help_section
+      help = HelpSection.find(:first, :conditions => [ "controller = ? AND action = ?", controller_name, action_name ])
+      @help_section = help ? help.section : ""
+  end
   
   def set_perms(hwpool)
     @user = get_login_user
diff --git a/src/app/controllers/pool_controller.rb b/src/app/controllers/pool_controller.rb
index 02ef290..1a574b1 100644
--- a/src/app/controllers/pool_controller.rb
+++ b/src/app/controllers/pool_controller.rb
@@ -35,7 +35,7 @@ class PoolController < ApplicationController
     respond_to do |format|
       format.html {
         render :layout => 'tabs-and-content' if params[:ajax]
-        render :layout => false if params[:nolayout]
+        render :layout => 'help-and-content' if params[:nolayout]
       }
       format.xml {
         render :xml => @pool.to_xml(XML_OPTS)
diff --git a/src/app/models/help_section.rb b/src/app/models/help_section.rb
new file mode 100644
index 0000000..a891383
--- /dev/null
+++ b/src/app/models/help_section.rb
@@ -0,0 +1,2 @@
+class HelpSection < ActiveRecord::Base
+end
diff --git a/src/app/views/layouts/_header_redux.rhtml b/src/app/views/layouts/_header_redux.rhtml
index 18014ab..a12d567 100644
--- a/src/app/views/layouts/_header_redux.rhtml
+++ b/src/app/views/layouts/_header_redux.rhtml
@@ -6,7 +6,6 @@
     <input id="textfield_effect" name="terms" value="Search" onkeypress="" onfocus="if( this.value == this.defaultValue ) this.value='';" type="text">
     <input id="searchbox-button" src="<%= image_path "icon_search.png"%>" title="Search" type="image">&nbsp;&nbsp;|
   </form>
-  <a id="help-link" href="#" ><%= image_tag "icon_help.png" %></a> <!-- FIXME wire link correctly -->
 </div>
 
 <div class="header_titlebar">Resource Pools</div>
diff --git a/src/app/views/layouts/help-and-content.rhtml b/src/app/views/layouts/help-and-content.rhtml
new file mode 100644
index 0000000..67989b7
--- /dev/null
+++ b/src/app/views/layouts/help-and-content.rhtml
@@ -0,0 +1,4 @@
+<div id="help-div">
+ <a id="help-link" href="help/<%= @help_section %>" ><%= image_tag "icon_help.png" %></a>
+</div>
+<%= yield %>
diff --git a/src/app/views/layouts/redux.rhtml b/src/app/views/layouts/redux.rhtml
index 01540d4..f6b4657 100644
--- a/src/app/views/layouts/redux.rhtml
+++ b/src/app/views/layouts/redux.rhtml
@@ -109,11 +109,15 @@
    </div>
 
    <div id="tabs-and-content-container">
+
      <div id="navigation-tabs" style="position:absolute; top:40px; left:250px;">
        <%= render :partial => '/layouts/navigation_tabs' %>
      </div> 
      <div id="main">
         <div id="content_area">
+          <div id="help-div">
+            <a id="help-link" href="help/<%= @help_section %>" ><%= image_tag "icon_help.png" %></a>
+          </div>
           <%= yield  %> <%# the rest of the center and right hand side %>
         </div>
      </div>
diff --git a/src/app/views/layouts/tabs-and-content.rhtml b/src/app/views/layouts/tabs-and-content.rhtml
index 8aa4183..e55b5ea 100644
--- a/src/app/views/layouts/tabs-and-content.rhtml
+++ b/src/app/views/layouts/tabs-and-content.rhtml
@@ -1,3 +1,4 @@
+
 <div id="side-toolbar" class="header_menu_wrapper">
   <%= render :partial => '/layouts/side_toolbar' %>
 </div>
@@ -6,5 +7,8 @@
 </div> 
 <div id="main">
   <div id="content_area">
+   <div id="help-div">
+     <a id="help-link" href="help/<%= @help_section %>" ><%= image_tag "icon_help.png" %></a>
+   </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/db/migrate/023_create_help_sections.rb b/src/db/migrate/023_create_help_sections.rb
new file mode 100644
index 0000000..963e8bd
--- /dev/null
+++ b/src/db/migrate/023_create_help_sections.rb
@@ -0,0 +1,13 @@
+class CreateHelpSections < ActiveRecord::Migration
+  def self.up
+    create_table :help_sections do |t|
+      t.string :controller, :null => false, :limit => 25
+      t.string :action, :null => false, :limit => 25
+      t.string :section, :null => false, :limit => 100
+    end
+  end
+
+  def self.down
+    drop_table :help_sections
+  end
+end
diff --git a/src/public/stylesheets/layout.css b/src/public/stylesheets/layout.css
index 9471cdc..013c959 100644
--- a/src/public/stylesheets/layout.css
+++ b/src/public/stylesheets/layout.css
@@ -128,7 +128,7 @@ a { color:#000000; text-decoration: none;}
 /*  ----- Right side of Header --------  */
 
 .header_info {
-  padding: 10px 20px 0px 10px;
+  padding: 10px 30px 0px 10px;
   margin: 0;
   float: right;
   text-align: right;
@@ -140,6 +140,12 @@ a { color:#000000; text-decoration: none;}
 .header_info a:visited { color: #B5B5B5; text-decoration: none; }
 .header_info a:hover   { color: #FFFFFF; text-decoration: none; }
 
+#help-div {
+  position: fixed;
+  top: 10px;
+  right: -1px;
+}
+
 #textfield_effect {
     border-width: 1px;
     border-style: solid;
diff --git a/src/test/fixtures/help_sections.yml b/src/test/fixtures/help_sections.yml
new file mode 100644
index 0000000..5bf0293
--- /dev/null
+++ b/src/test/fixtures/help_sections.yml
@@ -0,0 +1,7 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+# one:
+#   column: value
+#
+# two:
+#   column: value
diff --git a/src/test/unit/help_section_test.rb b/src/test/unit/help_section_test.rb
new file mode 100644
index 0000000..a0e6a08
--- /dev/null
+++ b/src/test/unit/help_section_test.rb
@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class HelpSectionTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end
-- 
1.5.4.1



From mmorsi at redhat.com  Thu Oct  2 01:09:01 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Wed, 01 Oct 2008 21:09:01 -0400
Subject: [Ovirt-devel] [PATCH server] Fixed the tests for host-browser.
In-Reply-To: <1222704330-11127-1-git-send-email-dpierce@redhat.com>
References: <1222704330-11127-1-git-send-email-dpierce@redhat.com>
Message-ID: <48E41F2D.6020809@redhat.com>

Hey Darryl,
    I tried applying and running this patch today but ran into some
issues. Comments embedded below.



Darryl L. Pierce wrote:
> A change to the identify protocol was overlooked. When an empty value was
> submitted, host-browser would throw an exception. But, a change allowed
> empty values to get by without notice. Fixed.
>
> Also added a BuildRequires dependency on ruby-flexmock so that the RPM is
> correctly installed when building the server RPM.
>
> Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
>   
> ---
>  ovirt-server.spec.in                      |    1 +
>  src/host-browser/host-browser.rb          |    9 +++++++--
>  src/test/unit/host_browser_awaken_test.rb |    2 +-
>  3 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/ovirt-server.spec.in b/ovirt-server.spec.in
> index a65e628..f351e77 100644
> --- a/ovirt-server.spec.in
> +++ b/ovirt-server.spec.in
> @@ -35,6 +35,7 @@ Requires(preun): /sbin/chkconfig
>  Requires(preun): /sbin/service
>  BuildRequires: ruby >= 1.8.1
>  BuildRequires: ruby-devel
> +BuildRequires: ruby-flexmock
>  BuildRequires: ruby-gettext-package
>  BuildRequires: rubygem(rake) >= 0.7
>  Provides: ovirt-server
>   
git-am reported some conflict with this file when I applied the patch.
Luckily this file contained a simple one line change so I was able to
manually copy it over and remove the file from the patch.

> diff --git a/src/host-browser/host-browser.rb b/src/host-browser/host-browser.rb
> index 3adea03..a33e657 100755
> --- a/src/host-browser/host-browser.rb
> +++ b/src/host-browser/host-browser.rb
> @@ -46,10 +46,15 @@ class HostBrowser
>      def initialize(session)
>          @session = session
>          @keytab_dir = '/usr/share/ipa/html/'
> +        set_peeraddr @session.peeraddr[3]
> +    end
> +    
>   
This previous line, though blank, has trailing whitespace.


> +    def set_peeraddr(peeraddr)
> +      @peeraddr = peeraddr
>      end
>  
>      def prefix(session)
> -      "#{Time.now.strftime('%b %d %H:%M:%S')} #{session.peeraddr[3]} "
> +      "#{Time.now.strftime('%b %d %H:%M:%S')} #{@peeraddr} "
>      end
>  
>      # Ensures the conversation starts properly.
> @@ -113,7 +118,7 @@ class HostBrowser
>                  nic_info << nic
>              else
>  
> -                raise Exception.new("ERRINFO! Expected key=value : #{info}\n") unless info =~ /[\w]+[\s]*=[\w]*/
> +                raise Exception.new("ERRINFO! Expected key=value : #{info}\n") unless info =~ /[\w]+[\s]*=[\w]+/
>  
>                  key, value = info.split("=")
>  
> diff --git a/src/test/unit/host_browser_awaken_test.rb b/src/test/unit/host_browser_awaken_test.rb
> index 5340e01..55a3458 100644
> --- a/src/test/unit/host_browser_awaken_test.rb
> +++ b/src/test/unit/host_browser_awaken_test.rb
> @@ -64,7 +64,7 @@ class HostBrowserAwakenTest < Test::Unit::TestCase
>    # Ensures that the server is satisfied if the remote system is
>    # making a wakeup call.
>    #
> -  def test_get_mode_with_awaken_request
> +  def test_get_mode_with_awaken_request    
>   
Same issue with trailing whitespace here.


>      @session.should_receive(:write).with("MODE?\n").once().returns { |request| request.length }
>      @session.should_receive(:readline).once().returns { "AWAKEN\n" }
>  
>   


After applying the patch, I tried running the test cases but to no
avail, many were still broken. Doing a bit of debugging myself, I see
that when you recently added tests for the stuff fixed with this patch,
you added a few references to a variable named "@first_id" to the code.
Looking at this variable I see that it is null everywhere I looked. I'm
not sure if I'm doing something wrong, but I tried googling around for
it but could not find any reference to a preset @first_id provided by
ruby's unit test suite. Adding a "@first_id = 1" to the "setup" function
of one of the problematic functional tests seemed to mitigate those
errors there (though there were others, not sure the cause). Perhaps you
could provide some insight into this issue.

cc'ing Scott on this email because I also noticed during this process
that some of the tests were still broken due to the recent smart pool
changes. More specifically with the recent commit updating the pool test
fixture, I believe several of the other fixtures, specifically those
with foreign key references to the pools table, are not valid. Grepping
"test/fixtures/" for "pool_id" brings these forward.


In any case, feel free to shout out via email or irc if you want to
figure out / debug this together. Thanks alot!

   -Mo



From fujimura.toshifumi at np.css.fujitsu.com  Thu Oct  2 09:05:41 2008
From: fujimura.toshifumi at np.css.fujitsu.com (Toshifumi Fujimura)
Date: Thu, 02 Oct 2008 18:05:41 +0900
Subject: [Ovirt-devel] Question about managing strage server on latest oVirt
Message-ID: <48E48EE5.8060508@np.css.fujitsu.com>

Hello!

I attempt to install a guest OS with WUI follows "Using oVirt".
But I cannot add Strage Pool to Hardware Pool.
I can't oparate in the way of stage 6 in "Using
oVirt"(http://www.ovirt.org/docs/Using_oVirt/Add-Storage.html).
Because "Using oVirt" is a little bit old.

Would you suggest me a latest instruction of the way to add Strage Pool
to Hardware Pool.


P.S.
I think Smart Pool causes this problem.
Please tell me how to use Smart Pool.



Works for me.

Toshifumi Fujimura.



From dpierce at redhat.com  Thu Oct  2 13:03:55 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Thu, 02 Oct 2008 09:03:55 -0400
Subject: [Ovirt-devel] [PATCH server] Fixed the tests for host-browser.
In-Reply-To: <48E41F2D.6020809@redhat.com>
References: <1222704330-11127-1-git-send-email-dpierce@redhat.com>
	<48E41F2D.6020809@redhat.com>
Message-ID: <48E4C6BB.8050404@redhat.com>

Mohammed Morsi wrote:
>>  BuildRequires: ruby-devel
>> +BuildRequires: ruby-flexmock
>>  BuildRequires: ruby-gettext-package
>>  BuildRequires: rubygem(rake) >= 0.7
>>  Provides: ovirt-server
>>   
> git-am reported some conflict with this file when I applied the patch.
> Luckily this file contained a simple one line change so I was able to
> manually copy it over and remove the file from the patch.

Weird. I only added the ruby-flexmock dependency since it's come up a
few times.

>> diff --git a/src/test/unit/host_browser_awaken_test.rb b/src/test/unit/host_browser_awaken_test.rb
>> index 5340e01..55a3458 100644
>> --- a/src/test/unit/host_browser_awaken_test.rb
>> +++ b/src/test/unit/host_browser_awaken_test.rb
>> @@ -64,7 +64,7 @@ class HostBrowserAwakenTest < Test::Unit::TestCase
>>    # Ensures that the server is satisfied if the remote system is
>>    # making a wakeup call.
>>    #
>> -  def test_get_mode_with_awaken_request
>> +  def test_get_mode_with_awaken_request    
>>   
> Same issue with trailing whitespace here.

I made sure to remove trailing whitespaces in these files since they'd
creeped in previously.

> 
> 
>>      @session.should_receive(:write).with("MODE?\n").once().returns { |request| request.length }
>>      @session.should_receive(:readline).once().returns { "AWAKEN\n" }
>>  
>>   
> 
> 
> After applying the patch, I tried running the test cases but to no
> avail, many were still broken. 

This patch was only to fix the HostBrowser tests, none others; such bugs
as the one to do with @first_id are outside of its scope. The tests that
I fixed with this run without error.

I'm sending an updated patch now.

-- 
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081002/0da8853d/attachment.vcf>

From dpierce at redhat.com  Thu Oct  2 13:05:04 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Thu,  2 Oct 2008 09:05:04 -0400
Subject: [Ovirt-devel] [PATCH server] Fixed the tests for host-browser.
Message-ID: <1222952704-4877-1-git-send-email-dpierce@redhat.com>

A change to the identify protocol was overlooked. When an empty value was
submitted, host-browser would throw an exception. But, a change allowed
empty values to get by without notice. Fixed.

Also added a BuildRequires dependency on ruby-flexmock so that the RPM is
correctly installed when building the server RPM.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 ovirt-server.spec.in             |    1 +
 src/host-browser/host-browser.rb |    9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ovirt-server.spec.in b/ovirt-server.spec.in
index 114b52d..5650e01 100644
--- a/ovirt-server.spec.in
+++ b/ovirt-server.spec.in
@@ -36,6 +36,7 @@ Requires(preun): /sbin/service
 BuildRequires: ruby >= 1.8.1
 BuildRequires: ruby-devel
 BuildRequires: rubygem(gettext)
+BuildRequires: ruby-flexmock
 BuildRequires: rubygem(rake) >= 0.7
 Provides: ovirt-server
 BuildArch: noarch
diff --git a/src/host-browser/host-browser.rb b/src/host-browser/host-browser.rb
index 3adea03..2241614 100755
--- a/src/host-browser/host-browser.rb
+++ b/src/host-browser/host-browser.rb
@@ -46,10 +46,15 @@ class HostBrowser
     def initialize(session)
         @session = session
         @keytab_dir = '/usr/share/ipa/html/'
+        set_peeraddr @session.peeraddr[3]
+    end
+
+    def set_peeraddr(peeraddr)
+      @peeraddr = peeraddr
     end
 
     def prefix(session)
-      "#{Time.now.strftime('%b %d %H:%M:%S')} #{session.peeraddr[3]} "
+      "#{Time.now.strftime('%b %d %H:%M:%S')} #{@peeraddr} "
     end
 
     # Ensures the conversation starts properly.
@@ -113,7 +118,7 @@ class HostBrowser
                 nic_info << nic
             else
 
-                raise Exception.new("ERRINFO! Expected key=value : #{info}\n") unless info =~ /[\w]+[\s]*=[\w]*/
+                raise Exception.new("ERRINFO! Expected key=value : #{info}\n") unless info =~ /[\w]+[\s]*=[\w]+/
 
                 key, value = info.split("=")
 
-- 
1.5.5.1



From dpierce at redhat.com  Thu Oct  2 13:24:15 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Thu,  2 Oct 2008 09:24:15 -0400
Subject: [Ovirt-devel] [PATCH server] Added support for booting a VM from an
	ISO image.
Message-ID: <1222953855-6319-1-git-send-email-dpierce@redhat.com>

Also added a few helper methods to Vm to contain the knowledge
of how Cobbler integration is contained.

When a user adds an ISO image to the Cobbler server on the appliance,
they will need to do so using the full NFS path for where the virtual
image will go to mount it; i.e., hostname:/path/to/filename.iso

If the filename ends in ".iso" then the virtual machine will mount the
file as a CDROM device and boot it. Otherwise, it mounts it as a hard
disk device.

To add an image to Cobbler, do the following:

1. Download an ISO image, such as the KDE LiveImage from Fedora.
2. Copy it to the NFS directory on the server:
  cp *.iso /ovirtnfs/kde-live-cd.iso
3. Add that image to your Cobbler instance:
  cobbler image add --name=KDE-LiveCD --file=management.priv.ovirt.org:/ovirtnfs/kde-live-cd.iso
4. Create a new VM in your server.
5. Select "KDE-LiveCD" from the list of operating systems.
6. Save the VM.
7. Start the VM.

It should run the selected ISO.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 src/app/controllers/vm_controller.rb |   13 +++++--
 src/app/models/vm.rb                 |   31 +++++++++++++++-
 src/task-omatic/task_vm.rb           |   63 ++++++++++++++++++++++++++++------
 src/test/unit/vm_test.rb             |   57 +++++++++++++++++++++++++++++--
 4 files changed, 144 insertions(+), 20 deletions(-)

diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb
index f5c0845..8b16c94 100644
--- a/src/app/controllers/vm_controller.rb
+++ b/src/app/controllers/vm_controller.rb
@@ -223,13 +223,18 @@ class VmController < ApplicationController
   def _setup_provisioning_options
     @provisioning_options = [[Vm::PXE_OPTION_LABEL, Vm::PXE_OPTION_VALUE],
                              [Vm::HD_OPTION_LABEL, Vm::HD_OPTION_VALUE]]
-    # FIXME add cobbler images too
+
     begin
+      @provisioning_options += Cobbler::Image.find.collect do |image|
+        [image.name + Vm::COBBLER_IMAGE_SUFFIX,
+          "#{Vm::IMAGE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{image.name}"]
+      end
+
       @provisioning_options += Cobbler::Profile.find.collect do |profile|
         [profile.name + Vm::COBBLER_PROFILE_SUFFIX,
-         Vm::COBBLER_PREFIX + Vm::PROVISIONING_DELIMITER +
-         Vm::PROFILE_PREFIX + Vm::PROVISIONING_DELIMITER + profile.name]
-      end
+          "#{Vm::PROFILE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{profile.name}"]
+
+    end
     rescue
       #if cobbler doesn't respond/is misconfigured/etc just don't add profiles
     end
diff --git a/src/app/models/vm.rb b/src/app/models/vm.rb
index ace6fb1..2e2ddb5 100644
--- a/src/app/models/vm.rb
+++ b/src/app/models/vm.rb
@@ -49,7 +49,7 @@ class Vm < ActiveRecord::Base
   PROFILE_PREFIX         = "profile"
   IMAGE_PREFIX           = "image"
   COBBLER_PROFILE_SUFFIX = " (Cobbler Profile)"
-  COBBLER_IMAGE_SUFFIX   = " (Cobbler Profile)"
+  COBBLER_IMAGE_SUFFIX   = " (Cobbler Image)"
 
   PXE_OPTION_LABEL       = "PXE Boot"
   PXE_OPTION_VALUE       = "pxe"
@@ -139,7 +139,12 @@ class Vm < ActiveRecord::Base
   end
 
   def provisioning_and_boot_settings=(settings)
-    if settings==PXE_OPTION_VALUE
+    # if the settings have a prefix that matches cobber settings, then process
+    # those details
+    if settings =~ /\@#{COBBLER_PREFIX}/
+      self[:boot_device] = BOOT_DEV_NETWORK
+      self[:provisioning] = settings
+    elsif settings==PXE_OPTION_VALUE
       self[:boot_device]= BOOT_DEV_NETWORK
       self[:provisioning]= nil
     elsif settings==HD_OPTION_VALUE
@@ -242,6 +247,28 @@ class Vm < ActiveRecord::Base
     vm_resource_pool.search_users
   end
 
+  # Reports whether the VM is uses Cobbler for booting.
+  #
+  def uses_cobbler?
+    self.provisioning.include? COBBLER_PREFIX
+  end
+
+  # Returns the cobbler type.
+  #
+  def cobbler_type
+    if self.uses_cobbler?
+      self.provisioning[/^(.*)@/,1]
+    end
+  end
+
+  # Returns the cobbler provisioning name.
+  #
+  def cobbler_name
+    if self.uses_cobbler?
+      self.provisioning[/^.*@.*:(.*)/,1]
+    end
+  end
+
   protected
   def validate
     resources = vm_resource_pool.max_resources_for_vm(self)
diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb
index 3588224..101878b 100644
--- a/src/task-omatic/task_vm.rb
+++ b/src/task-omatic/task_vm.rb
@@ -25,7 +25,7 @@ gem 'cobbler'
 require 'cobbler'
 
 def create_vm_xml(name, uuid, memAllocated, memUsed, vcpus, bootDevice,
-                  macAddr, bridge, diskDevices)
+                  macAddr, bridge, diskDevices, bootdrive)
   doc = Document.new
 
   doc.add_element("domain", {"type" => "kvm"})
@@ -65,16 +65,28 @@ def create_vm_xml(name, uuid, memAllocated, memUsed, vcpus, bootDevice,
   doc.root.elements["devices"].add_element("emulator")
   doc.root.elements["devices"].elements["emulator"].text = "/usr/bin/qemu-kvm"
 
-  devs = [ 'hda', 'hdb', 'hdc', 'hdd' ]
-  i = 0
+  devs = [ 'hda', 'hdb', 'hdc', 'hdd', 'hde', 'hdf' ]
+  which_device = 0
   diskDevices.each do |disk|
     diskdev = Element.new("disk")
     diskdev.add_attribute("type", "block")
     diskdev.add_attribute("device", "disk")
     diskdev.add_element("source", {"dev" => disk})
-    diskdev.add_element("target", {"dev" => devs[i]})
+    diskdev.add_element("target", {"dev" => devs[which_device]})
     doc.root.elements["devices"] << diskdev
-    i += 1
+    which_device += 1
+  end
+
+  if bootdrive
+    bootdisk = Element.new("disk")
+
+    bootdisk.add_attribute("type", bootdisk[:type])
+    bootdisk.add_attribute("device", bootdisk[:device])
+    bootdisk.add_element("source", {"file" => bootdrive[:source]})
+    bootdisk.add_element("target", {"dev" => devs[which_device], "bus" => "ide"})
+    bootdisk.add_element("readonly") if bootdrive[:readonly]
+
+    doc.root.elements["devices"] << bootdisk
   end
 
   doc.root.elements["devices"].add_element("interface", {"type" => "bridge"})
@@ -154,15 +166,12 @@ def create_vm(task)
   # create cobbler system profile
   begin
     if vm.provisioning and !vm.provisioning.empty?
-      provisioning_arr = vm.provisioning.split(Vm::PROVISIONING_DELIMITER)
-      if provisioning_arr[0]==Vm::COBBLER_PREFIX
-        if provisioning_arr[1]==Vm::PROFILE_PREFIX
+      if vm.uses_cobbler?
+        if vm.cobbler_type == Vm::PROFILE_PREFIX:
           system = Cobbler::System.new('name' => vm.uuid,
                                        'profile' => provisioning_arr[2])
           system.interfaces=[Cobbler::NetworkInterface.new({'mac_address' => vm.vnic_mac_addr})]
           system.save
-        elsif provisioning_arr[1]==Vm::IMAGE_PREFIX
-          #FIXME handle cobbler images
         end
       end
     end
@@ -268,12 +277,44 @@ def start_vm(task)
 
     conn = Libvirt::open("qemu+tcp://" + host.hostname + "/system")
 
+    # if the VM is an image, then prepare things
+    if vm.uses_cobbler? && (vm.cobbler_type == Vm.IMAGE_PREFIX)
+        details = Cobbler::Image.find_one(vm.cobbler_name)
+
+        raise Exception.new("Image #{vm.cobbler_name} not found in Cobbler server") unless details
+
+        ignored, protocol, sharepath, filename = details.filename(/(.*):\/\/(.*)\/(.*)/)
+
+        raise Exception.new("Only NFS mounts are supported currently") unless protocol == 'nfs'
+
+        # if the file's an .ISO then we'll have to mount as a CDrom, otherwise
+        # we'll mount as a hard drive
+        bootdrive[:type]     = 'file'
+        bootdrive[:source]   = filename
+        bootdrive[:path]     = sharepath
+        if details.file[/.iso/]
+          bootdrive[:readonly] = true
+          bootdrive[:device]   = 'cdrom'
+        else
+          bootdrive[:readonly] = false
+          bootdrive[:device]   = 'disk'
+        end
+
+        # mount the filesystem
+        mountpoint = `mktemp -d`
+        bootdrive[:mountpoint] = mountpoint
+
+        unless system("mount #{sharepath} #{mountpoint}")
+          raise Exception.new "Unable to mount #{details.file}"
+        end
+    end
+
     storagedevs = connect_storage_pools(conn, vm)
 
     # FIXME: get rid of the hardcoded bridge
     xml = create_vm_xml(vm.description, vm.uuid, vm.memory_allocated,
                         vm.memory_used, vm.num_vcpus_allocated, vm.boot_device,
-                        vm.vnic_mac_addr, "ovirtbr0", storagedevs)
+                        vm.vnic_mac_addr, "ovirtbr0", storagedevs, bootdrive)
 
     dom = conn.define_domain_xml(xml.to_s)
     dom.create
diff --git a/src/test/unit/vm_test.rb b/src/test/unit/vm_test.rb
index 4a5e353..c226c63 100644
--- a/src/test/unit/vm_test.rb
+++ b/src/test/unit/vm_test.rb
@@ -22,8 +22,59 @@ require File.dirname(__FILE__) + '/../test_helper'
 class VmTest < Test::Unit::TestCase
   fixtures :vms
 
-  # Replace this with your real tests.
-  def test_truth
-    assert true
+  def setup
+    @vm_name = "Test"
+    @no_cobbler_provisioning = "#{@vm_name}"
+    @cobbler_image_provisioning =
+      "#{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}"
+
+  end
+
+  # Ensures that, if the VM does not contain the Cobbler prefix, that it
+  # does not claim to be a Cobbler VM.
+  #
+  def test_uses_cobbler_without_cobbler_prefix
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings=@no_cobbler_provisioning
+
+    flunk "VM is not a Cobbler provisioned one." if vm.uses_cobbler?
+    assert_equal @vm_name, vm.provisioning, "Wrong name reported."
+  end
+
+  # Ensures that the VM reports that it uses Cobbler if the provisioning
+  # is for a Cobbler profile.
+  #
+  def test_uses_cobbler_with_cobbler_profile
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings = @cobbler_profile_provisioning
+
+    flunk "VM did not report that it's Cobbler provisioned." unless vm.uses_cobbler?
+    assert_equal Vm::PROFILE_PREFIX,
+      vm.cobbler_type,
+      "Wrong cobbler type reported."
+    assert_equal @vm_name,
+      vm.cobbler_name,
+      "Wrong name reported."
+  end
+
+  # Ensures that the VM reports that it uses Cobbler if the provisioning
+  # is for a Cobbler image.
+  #
+  def test_uses_cobbler_With_cobbler_image
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings = @cobbler_image_provisioning
+
+    flunk "VM did not report that it's Cobbler provisioned." unless vm.uses_cobbler?
+    assert_equal Vm::IMAGE_PREFIX,
+      vm.cobbler_type,
+      "Wrong cobbler type reported."
+    assert_equal @vm_name,
+      vm.cobbler_name,
+      "Wrong name reported."
   end
 end
-- 
1.5.5.1



From imain at redhat.com  Thu Oct  2 17:42:30 2008
From: imain at redhat.com (Ian Main)
Date: Thu,  2 Oct 2008 10:42:30 -0700
Subject: [Ovirt-devel] [PATCH node] Add libvirt-qpid to the node
Message-ID: <1222969350-29823-1-git-send-email-imain@redhat.com>

This patch adds libvirt-qpid to the node image and sets it up
so it will connect to the server in the given DNS SRV record.

Signed-off-by: Ian Main <imain at redhat.com>
---
 ovirt-node.spec.in |    1 +
 scripts/ovirt      |   10 ++++++++++
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index be8d8f5..3dc4e1d 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -14,6 +14,7 @@ BuildRequires:  libvirt-devel
 BuildRequires:  dbus-devel hal-devel
 Requires:       augeas
 Requires:       libvirt
+Requires:       libvirt-qpid
 Requires:       hal
 Requires:       collectd
 Requires:       cyrus-sasl-gssapi
diff --git a/scripts/ovirt b/scripts/ovirt
index d81a72e..3c120a0 100644
--- a/scripts/ovirt
+++ b/scripts/ovirt
@@ -76,6 +76,16 @@ start() {
     else
         echo "skipping collectd configuration, collectd service not available"
     fi
+
+    find_srv qpidd tcp
+    if [ -n "$SRV_HOST" -a -n "$SRV_PORT" ]; then
+        libvirt_qpid_conf=/etc/sysconfig/libvirt-qpid
+        if [ -f $libvirt_qpid_conf ]; then
+            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"
+    fi
 }
 
 case "$1" in
-- 
1.5.5.1



From imain at redhat.com  Thu Oct  2 17:44:25 2008
From: imain at redhat.com (Ian Main)
Date: Thu,  2 Oct 2008 10:44:25 -0700
Subject: [Ovirt-devel] [PATCH recipe] Add qpidd to the wui
Message-ID: <1222969465-29898-1-git-send-email-imain@redhat.com>

This patch adds qpidd to the wui, configures a DNS SRV record for
its address, opens up the firewall port, creates a config for qpidd
etc.

Signed-off-by: Ian Main <imain at redhat.com>
---
 Makefile.am                                   |    1 +
 appliances/ovirt/files/ovirt-server-appliance |    1 +
 appliances/ovirt/files/qpidd.conf             |    5 +++++
 appliances/ovirt/ovirt.pp.in                  |   10 ++++++++++
 ovirt-recipe.spec.in                          |    4 ++++
 5 files changed, 21 insertions(+), 0 deletions(-)
 create mode 100644 appliances/ovirt/files/qpidd.conf

diff --git a/Makefile.am b/Makefile.am
index 0b4e2b9..37751af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,7 @@ EXTRA_DIST =			\
   appliances/ovirt/ovirt.pp	\
   appliances/ovirt/ovirt.pp.in	\
   appliances/ovirt/files/collectd.conf	\
+  appliances/ovirt/files/qpidd.conf	\
   appliances/ovirt/files/ovirt-cfgdb	\
   appliances/ovirt/files/ovirt.repo	\
   appliances/ovirt/files/ovirt-server-appliance	\
diff --git a/appliances/ovirt/files/ovirt-server-appliance b/appliances/ovirt/files/ovirt-server-appliance
index 0f48402..778d0ce 100644
--- a/appliances/ovirt/files/ovirt-server-appliance
+++ b/appliances/ovirt/files/ovirt-server-appliance
@@ -19,6 +19,7 @@ start() {
         -W _ipa._tcp,management.priv.ovirt.org,80 \
         -W _ldap._tcp,management.priv.ovirt.org,389 \
         -W _collectd._tcp,management.priv.ovirt.org,25826 \
+        -W _qpidd._tcp,management.priv.ovirt.org,5672 \
         -W _identify._tcp,management.priv.ovirt.org,12120 \
         --enable-tftp --tftp-root=/var/lib/tftpboot -M pxelinux.0 \
         -O option:router,192.168.50.2 -O option:ntp-server,192.168.50.2 \
diff --git a/appliances/ovirt/files/qpidd.conf b/appliances/ovirt/files/qpidd.conf
new file mode 100644
index 0000000..a7e34bb
--- /dev/null
+++ b/appliances/ovirt/files/qpidd.conf
@@ -0,0 +1,5 @@
+# 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/appliances/ovirt/ovirt.pp.in b/appliances/ovirt/ovirt.pp.in
index 1ee8b48..5d7e9e8 100644
--- a/appliances/ovirt/ovirt.pp.in
+++ b/appliances/ovirt/ovirt.pp.in
@@ -83,6 +83,10 @@ file {"/etc/collectd.conf":
     source => "puppet:///ovirt/collectd.conf"
 }
 
+file {"/etc/qpidd.conf":
+    source => "puppet:///ovirt/qpidd.conf"
+}
+
 file {"/var/www/html/ovirt-cfgdb":
     source => "puppet:///ovirt/ovirt-cfgdb"
 }
@@ -109,6 +113,7 @@ firewall_rule {"nfsd": destination_port => '2049'}
 firewall_rule {"rpcbind": destination_port => '111'}
 firewall_rule {"rpcbind-udp": destination_port => '111', protocol => 'udp'}
 firewall_rule {"host-browser": destination_port => '12120'}
+firewall_rule {"qpidd": destination_port => '5672'}
 firewall_rule {"rpc.mountd": destination_port => '892'}
 firewall_rule {"rpc.mountd-udp": destination_port => '892', protocol => 'udp'}
 firewall_rule {"rpc.statd": destination_port => '662'}
@@ -152,6 +157,11 @@ service {"nfslock":
     require => [Service["network"]]
 }
 
+service {"qpidd":
+    ensure => "running",
+    enable => true
+}
+
 file {"/usr/sbin/ovirt-server-appliance-setup":
     content => template("ovirt-server-appliance-setup.erb"),
     mode => 755
diff --git a/ovirt-recipe.spec.in b/ovirt-recipe.spec.in
index c257e84..9fef6af 100644
--- a/ovirt-recipe.spec.in
+++ b/ovirt-recipe.spec.in
@@ -37,6 +37,10 @@ Requires: augeas
 Requires: syslinux
 Requires: lokkit
 Requires: curl
+Requires: qpidd
+Requires: qpidc
+Requires: qmf
+Requires: python-qpid
 
 %description
 Thincrust oVirt Server Appliance Recipe
-- 
1.5.5.1



From imain at redhat.com  Thu Oct  2 17:55:11 2008
From: imain at redhat.com (Ian Main)
Date: Thu,  2 Oct 2008 10:55:11 -0700
Subject: [Ovirt-devel] [PATCH recipe] Add qpidd to the wui
In-Reply-To: <1222969465-29898-1-git-send-email-imain@redhat.com>
References: <1222969465-29898-1-git-send-email-imain@redhat.com>
Message-ID: <1222970111-30065-1-git-send-email-imain@redhat.com>

This patch adds qpidd to the wui, configures a DNS SRV record for
its address, opens up the firewall port, creates a config for qpidd
etc.

Amended: Seems I missed restarting qpidd so it will take
         configuration changes.

Signed-off-by: Ian Main <imain at redhat.com>
---
 Makefile.am                                   |    1 +
 appliances/ovirt/files/ovirt-server-appliance |    1 +
 appliances/ovirt/files/qpidd.conf             |    5 +++++
 appliances/ovirt/ovirt.pp.in                  |   11 +++++++++++
 ovirt-recipe.spec.in                          |    4 ++++
 5 files changed, 22 insertions(+), 0 deletions(-)
 create mode 100644 appliances/ovirt/files/qpidd.conf

diff --git a/Makefile.am b/Makefile.am
index 0b4e2b9..37751af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,7 @@ EXTRA_DIST =			\
   appliances/ovirt/ovirt.pp	\
   appliances/ovirt/ovirt.pp.in	\
   appliances/ovirt/files/collectd.conf	\
+  appliances/ovirt/files/qpidd.conf	\
   appliances/ovirt/files/ovirt-cfgdb	\
   appliances/ovirt/files/ovirt.repo	\
   appliances/ovirt/files/ovirt-server-appliance	\
diff --git a/appliances/ovirt/files/ovirt-server-appliance b/appliances/ovirt/files/ovirt-server-appliance
index 0f48402..778d0ce 100644
--- a/appliances/ovirt/files/ovirt-server-appliance
+++ b/appliances/ovirt/files/ovirt-server-appliance
@@ -19,6 +19,7 @@ start() {
         -W _ipa._tcp,management.priv.ovirt.org,80 \
         -W _ldap._tcp,management.priv.ovirt.org,389 \
         -W _collectd._tcp,management.priv.ovirt.org,25826 \
+        -W _qpidd._tcp,management.priv.ovirt.org,5672 \
         -W _identify._tcp,management.priv.ovirt.org,12120 \
         --enable-tftp --tftp-root=/var/lib/tftpboot -M pxelinux.0 \
         -O option:router,192.168.50.2 -O option:ntp-server,192.168.50.2 \
diff --git a/appliances/ovirt/files/qpidd.conf b/appliances/ovirt/files/qpidd.conf
new file mode 100644
index 0000000..a7e34bb
--- /dev/null
+++ b/appliances/ovirt/files/qpidd.conf
@@ -0,0 +1,5 @@
+# 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/appliances/ovirt/ovirt.pp.in b/appliances/ovirt/ovirt.pp.in
index 1ee8b48..9340e8b 100644
--- a/appliances/ovirt/ovirt.pp.in
+++ b/appliances/ovirt/ovirt.pp.in
@@ -83,6 +83,11 @@ file {"/etc/collectd.conf":
     source => "puppet:///ovirt/collectd.conf"
 }
 
+file {"/etc/qpidd.conf":
+    source => "puppet:///ovirt/qpidd.conf"
+    notify => Service["qpidd"]
+}
+
 file {"/var/www/html/ovirt-cfgdb":
     source => "puppet:///ovirt/ovirt-cfgdb"
 }
@@ -109,6 +114,7 @@ firewall_rule {"nfsd": destination_port => '2049'}
 firewall_rule {"rpcbind": destination_port => '111'}
 firewall_rule {"rpcbind-udp": destination_port => '111', protocol => 'udp'}
 firewall_rule {"host-browser": destination_port => '12120'}
+firewall_rule {"qpidd": destination_port => '5672'}
 firewall_rule {"rpc.mountd": destination_port => '892'}
 firewall_rule {"rpc.mountd-udp": destination_port => '892', protocol => 'udp'}
 firewall_rule {"rpc.statd": destination_port => '662'}
@@ -152,6 +158,11 @@ service {"nfslock":
     require => [Service["network"]]
 }
 
+service {"qpidd":
+    ensure => "running",
+    enable => true
+}
+
 file {"/usr/sbin/ovirt-server-appliance-setup":
     content => template("ovirt-server-appliance-setup.erb"),
     mode => 755
diff --git a/ovirt-recipe.spec.in b/ovirt-recipe.spec.in
index c257e84..9fef6af 100644
--- a/ovirt-recipe.spec.in
+++ b/ovirt-recipe.spec.in
@@ -37,6 +37,10 @@ Requires: augeas
 Requires: syslinux
 Requires: lokkit
 Requires: curl
+Requires: qpidd
+Requires: qpidc
+Requires: qmf
+Requires: python-qpid
 
 %description
 Thincrust oVirt Server Appliance Recipe
-- 
1.5.5.1



From mmorsi at redhat.com  Thu Oct  2 18:02:50 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Thu, 02 Oct 2008 14:02:50 -0400
Subject: [Ovirt-devel] [PATCH server] Fixed the tests for host-browser.
In-Reply-To: <48E4C6BB.8050404@redhat.com>
References: <1222704330-11127-1-git-send-email-dpierce@redhat.com>
	<48E41F2D.6020809@redhat.com> <48E4C6BB.8050404@redhat.com>
Message-ID: <48E50CCA.1010509@redhat.com>

Darryl,

I haven't tried the latest patch that you sent yet, but noticed a few
things while doing some further testing.


Darryl Pierce wrote:
> Mohammed Morsi wrote:
>   
>>>  BuildRequires: ruby-devel
>>> +BuildRequires: ruby-flexmock
>>>  BuildRequires: ruby-gettext-package
>>>  BuildRequires: rubygem(rake) >= 0.7
>>>  Provides: ovirt-server
>>>   
>>>       
>> git-am reported some conflict with this file when I applied the patch.
>> Luckily this file contained a simple one line change so I was able to
>> manually copy it over and remove the file from the patch.
>>     
>
> Weird. I only added the ruby-flexmock dependency since it's come up a
> few times.
>   
First off, shouldn't this just be a 'Requires'? I think BuildRequires
implies that this needs to be on the machine hosting the appliance when
the rpms are being build where as 'Requires' implies it needs to be on
the appliance for this rpm to be installed which is what we want (since
its on the appliance that 'rake test' requires ruby-flexmock).

>   
>>> diff --git a/src/test/unit/host_browser_awaken_test.rb b/src/test/unit/host_browser_awaken_test.rb
>>> index 5340e01..55a3458 100644
>>> --- a/src/test/unit/host_browser_awaken_test.rb
>>> +++ b/src/test/unit/host_browser_awaken_test.rb
>>> @@ -64,7 +64,7 @@ class HostBrowserAwakenTest < Test::Unit::TestCase
>>>    # Ensures that the server is satisfied if the remote system is
>>>    # making a wakeup call.
>>>    #
>>> -  def test_get_mode_with_awaken_request
>>> +  def test_get_mode_with_awaken_request    
>>>   
>>>       
>> Same issue with trailing whitespace here.
>>     
>
> I made sure to remove trailing whitespaces in these files since they'd
> creeped in previously.
>
>   
>>     
>>>      @session.should_receive(:write).with("MODE?\n").once().returns { |request| request.length }
>>>      @session.should_receive(:readline).once().returns { "AWAKEN\n" }
>>>  
>>>   
>>>       
>> After applying the patch, I tried running the test cases but to no
>> avail, many were still broken. 
>>     
>
> This patch was only to fix the HostBrowser tests, none others; such bugs
> as the one to do with @first_id are outside of its scope. The tests that
> I fixed with this run without error.
>
>   
I see here
http://git.et.redhat.com/?p=ovirt-server.git;a=commitdiff;h=0453e0e65bb0232acadbe3bf0e59cabf0df2f3f0
that you removed where @first_id is set in the nic_controller_test. I
was able to get all the tests running successfully (see below) except
for test_show in the nic_controller_test which depends on @first_id
being set (and thus reports an "Couldn't find Nic without an ID" error).


> I'm sending an updated patch now.
>
>   

I discovered the reason everything was foobar was that the pools table
wasn't being populated in the ovirt_test database. This was caused by an
error earlier in the test process which in return caused 'rake test' to
abort and skip over the remaining test db population stuff. The error
was a path issue, eg test/unit/host_browser_identify_test.rb was unable
to find dutils.rb and host_browser.rb. Adding the following to
host_browser_identify_test.rb solves the problem:

$: << File.join(File.dirname(__FILE__), "../../dutils")
$: << File.join(File.dirname(__FILE__), "../../host-browser")

As previously mentioned, once this is done the only remaining error is
that due to the missing nic id. If we can get these fixes in today and
everything works, I'll uncomment the 'rake test' thats in the appliance
autobuild so that our continuous autobuild process will report any new
errors caused by subsequent changes immediately.

   -Mo
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081002/bf1be5cb/attachment.htm>

From imain at redhat.com  Thu Oct  2 18:11:16 2008
From: imain at redhat.com (Ian Main)
Date: Thu, 2 Oct 2008 11:11:16 -0700
Subject: [Ovirt-devel] libvirt-qpid patches
Message-ID: <20081002111116.7efb0b82@tp.mains.net>


I just wanted to say a few words about the last few patches I posted.
These patches integrate libvirt-qpid into ovirt.

libvirt-qpid provides an interface with libvirt using QMF (qpid modeling
framework) which utilizes the AMQP protocol.  The Advanced Message Queuing
Protocol (AMQP) is an open standard application layer protocol providing
reliable transport of messages.

QMF provides a modeling framework layer on top of qpid (which implements
AMQP).  This interface allows you to manage hosts, domains, pools etc. as
a set of objects with properties and methods.

It is very nice because it gives you a single source of information
representing the whole distributed system, and is updated in a fairly
timely manner (currently every 5 seconds).

Note that at this time, only the node is qpid/amqp enabled.  We are
presently working on a ruby qpid client to allow us to make use of this
on the WUI.  Also note that qpidd authentication is disabled for now.
The qpid folks are working on having gssapi integrated into qpid in a
few weeks and we will switch to that when it's ready.

With this patch in place, you can log into the WUI, and use qpid-tool (a
generic qpid QMF client) to view and manipulate nodes/domains/pools etc.
Here is an example session:

[root at management etc]# qpid-tool
Management Tool for QPID
qpid: list
Waiting for next periodic update

(sometimes it takes a few seconds to get an update, keep trying)

qpid: list
Management Object Types:
    ObjectType                         Active  Deleted
    ====================================================
    com.redhat.libvirt:node            2       0
    org.apache.qpid.broker:agent       2       0
... (more qpid stuff)

qpid: show node
Object of type com.redhat.libvirt:node: (last sample time: 17:56:03)
    Type      Element             101                     133
    ==============================================================================
    property  hostname            node136.priv.ovirt.org  node123.priv.ovirt.org
    property  uri                 qemu:///system          qemu:///system
    property  libvirt_version     0.4.6                   0.4.6
    property  api_version         0.4.6                   0.4.6
    property  hypervisor_version  Unknown                 Unknown
    property  hypervisor_type     QEMU                    QEMU

(after firing up a storage pool and a vm)

qpid: list
Management Object Types:
    ObjectType                         Active  Deleted
    ====================================================
    com.redhat.libvirt:domain          1       0
    com.redhat.libvirt:node            2       0
    com.redhat.libvirt:pool            1       0
    com.redhat.libvirt:volume          3       0
...

qpid: show domain
Object of type com.redhat.libvirt:domain: (last sample time: 18:06:16)
    Type       Element         138
    =================================================================
    property   uuid            c922d718-4caf-bc56-3358-62d62bee4c5d
    property   name            test_vm
    property   node            137
    property   state           running
    property   num_vcpus       1
    property   active          true
    statistic  maximum_memory  524288
    statistic  memory          524288
    statistic  cpu_time        149060000000

And a demo of calling methods:

qpid: call 138 destroy
qpid: Call Result: destroy  0 (OK) {}
qpid: show domain
Object of type com.redhat.libvirt:domain: (last sample time: 18:06:56)
    Type       Element         103
    =================================================================
    property   uuid            c922d718-4caf-bc56-3358-62d62bee4c5d
    property   name            test_vm
    property   node            102
    property   state           shutoff
    property   num_vcpus       1
    property   active          false
    statistic  maximum_memory  524288
    statistic  memory          524288
    statistic  cpu_time        0



From dpierce at redhat.com  Thu Oct  2 18:17:04 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Thu, 02 Oct 2008 14:17:04 -0400
Subject: [Ovirt-devel] [PATCH server] Fixed the tests for host-browser.
In-Reply-To: <48E50CCA.1010509@redhat.com>
References: <1222704330-11127-1-git-send-email-dpierce@redhat.com>
	<48E41F2D.6020809@redhat.com> <48E4C6BB.8050404@redhat.com>
	<48E50CCA.1010509@redhat.com>
Message-ID: <48E51020.1060204@redhat.com>

Mohammed Morsi wrote:
> Darryl,
> 
> I haven't tried the latest patch that you sent yet, but noticed a few
> things while doing some further testing.
> 
> 
> Darryl Pierce wrote:
>> Mohammed Morsi wrote:
>>   
>>>>  BuildRequires: ruby-devel
>>>> +BuildRequires: ruby-flexmock
>>>>  BuildRequires: ruby-gettext-package
>>>>  BuildRequires: rubygem(rake) >= 0.7
>>>>  Provides: ovirt-server
>>>>   
>>>>       
>>> git-am reported some conflict with this file when I applied the patch.
>>> Luckily this file contained a simple one line change so I was able to
>>> manually copy it over and remove the file from the patch.
>>>     
>>
>> Weird. I only added the ruby-flexmock dependency since it's come up a
>> few times.
>>   
> First off, shouldn't this just be a 'Requires'? I think BuildRequires
> implies that this needs to be on the machine hosting the appliance when
> the rpms are being build where as 'Requires' implies it needs to be on
> the appliance for this rpm to be installed which is what we want (since
> its on the appliance that 'rake test' requires ruby-flexmock).

I didn't realize we were running the tests in a live environment, and
thought these were only being run when the RPM was being bundled.

>>>> diff --git a/src/test/unit/host_browser_awaken_test.rb b/src/test/unit/host_browser_awaken_test.rb
>>>> index 5340e01..55a3458 100644
>>>> --- a/src/test/unit/host_browser_awaken_test.rb
>>>> +++ b/src/test/unit/host_browser_awaken_test.rb
>>>> @@ -64,7 +64,7 @@ class HostBrowserAwakenTest < Test::Unit::TestCase
>>>>    # Ensures that the server is satisfied if the remote system is
>>>>    # making a wakeup call.
>>>>    #
>>>> -  def test_get_mode_with_awaken_request
>>>> +  def test_get_mode_with_awaken_request    
>>>>   
>>>>       
>>> Same issue with trailing whitespace here.
>>>     
>>
>> I made sure to remove trailing whitespaces in these files since they'd
>> creeped in previously.
>>
>>   
>>>     
>>>>      @session.should_receive(:write).with("MODE?\n").once().returns { |request| request.length }
>>>>      @session.should_receive(:readline).once().returns { "AWAKEN\n" }
>>>>  
>>>>   
>>>>       
>>> After applying the patch, I tried running the test cases but to no
>>> avail, many were still broken. 
>>>     
>>
>> This patch was only to fix the HostBrowser tests, none others; such bugs
>> as the one to do with @first_id are outside of its scope. The tests that
>> I fixed with this run without error.
>>
>>   
> I see here
> http://git.et.redhat.com/?p=ovirt-server.git;a=commitdiff;h=0453e0e65bb0232acadbe3bf0e59cabf0df2f3f0
> that you removed where @first_id is set in the nic_controller_test. I
> was able to get all the tests running successfully (see below) except
> for test_show in the nic_controller_test which depends on @first_id
> being set (and thus reports an "Couldn't find Nic without an ID" error).

Okay, that was in a different patch. I deserve a halibut for that one.

> 
> 
>> I'm sending an updated patch now.
>>
>>   
> 
> I discovered the reason everything was foobar was that the pools table
> wasn't being populated in the ovirt_test database. This was caused by an
> error earlier in the test process which in return caused 'rake test' to
> abort and skip over the remaining test db population stuff. The error
> was a path issue, eg test/unit/host_browser_identify_test.rb was unable
> to find dutils.rb and host_browser.rb. Adding the following to
> host_browser_identify_test.rb solves the problem:
> 
> $: << File.join(File.dirname(__FILE__), "../../dutils")
> $: << File.join(File.dirname(__FILE__), "../../host-browser")
> 
> As previously mentioned, once this is done the only remaining error is
> that due to the missing nic id. If we can get these fixes in today and
> everything works, I'll uncomment the 'rake test' thats in the appliance
> autobuild so that our continuous autobuild process will report any new
> errors caused by subsequent changes immediately.

Okay, I've taken these into consideration and am sending out a patch
that addresses those issues.

-- 
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081002/2247ef04/attachment.vcf>

From dpierce at redhat.com  Thu Oct  2 18:19:56 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Thu,  2 Oct 2008 14:19:56 -0400
Subject: [Ovirt-devel] [PATCH server] Fixed the tests for host-browser.
Message-ID: <1222971596-23395-1-git-send-email-dpierce@redhat.com>

A change to the identify protocol was overlooked. When an empty value was
submitted, host-browser would throw an exception. But, a change allowed
empty values to get by without notice. Fixed.

Also added a Requires dependency on ruby-flexmock so that the RPM is
correctly installed when building the server RPM.

Finally, reintroduced a line that was deleted by mistaken from NicControllerTest.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 ovirt-server.spec.in                        |    1 +
 src/host-browser/host-browser.rb            |    9 +++++++--
 src/test/functional/nic_controller_test.rb  |    2 ++
 src/test/unit/host_browser_awaken_test.rb   |    3 +++
 src/test/unit/host_browser_identify_test.rb |    3 +++
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ovirt-server.spec.in b/ovirt-server.spec.in
index 114b52d..1339b52 100644
--- a/ovirt-server.spec.in
+++ b/ovirt-server.spec.in
@@ -19,6 +19,7 @@ Requires: rubygem(mongrel) >= 1.0.1
 Requires: rubygem(krb5-auth) >= 0.6
 Requires: rubygem(cobbler) >= 0.0.2
 Requires: rubygem(gettext)
+Requires: ruby-flexmock
 Requires: postgresql-server
 Requires: ruby-postgres
 Requires: xapian-bindings-ruby
diff --git a/src/host-browser/host-browser.rb b/src/host-browser/host-browser.rb
index 3adea03..2241614 100755
--- a/src/host-browser/host-browser.rb
+++ b/src/host-browser/host-browser.rb
@@ -46,10 +46,15 @@ class HostBrowser
     def initialize(session)
         @session = session
         @keytab_dir = '/usr/share/ipa/html/'
+        set_peeraddr @session.peeraddr[3]
+    end
+
+    def set_peeraddr(peeraddr)
+      @peeraddr = peeraddr
     end
 
     def prefix(session)
-      "#{Time.now.strftime('%b %d %H:%M:%S')} #{session.peeraddr[3]} "
+      "#{Time.now.strftime('%b %d %H:%M:%S')} #{@peeraddr} "
     end
 
     # Ensures the conversation starts properly.
@@ -113,7 +118,7 @@ class HostBrowser
                 nic_info << nic
             else
 
-                raise Exception.new("ERRINFO! Expected key=value : #{info}\n") unless info =~ /[\w]+[\s]*=[\w]*/
+                raise Exception.new("ERRINFO! Expected key=value : #{info}\n") unless info =~ /[\w]+[\s]*=[\w]+/
 
                 key, value = info.split("=")
 
diff --git a/src/test/functional/nic_controller_test.rb b/src/test/functional/nic_controller_test.rb
index 74a80f4..1fa34ff 100644
--- a/src/test/functional/nic_controller_test.rb
+++ b/src/test/functional/nic_controller_test.rb
@@ -30,6 +30,8 @@ class NicControllerTest < Test::Unit::TestCase
     @controller = NicController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
+    
+    @first_id = nics(:one).id
   end
 
   def test_show
diff --git a/src/test/unit/host_browser_awaken_test.rb b/src/test/unit/host_browser_awaken_test.rb
index 5340e01..53711ee 100644
--- a/src/test/unit/host_browser_awaken_test.rb
+++ b/src/test/unit/host_browser_awaken_test.rb
@@ -18,6 +18,9 @@
 # MA  02110-1301, USA.  A copy of the GNU General Public License is
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
+$: << File.join(File.dirname(__FILE__), "../../dutils")
+$: << File.join(File.dirname(__FILE__), "../../host-browser")
+ 
 require File.dirname(__FILE__) + '/../test_helper'
 require 'test/unit'
 require 'flexmock/test_unit'
diff --git a/src/test/unit/host_browser_identify_test.rb b/src/test/unit/host_browser_identify_test.rb
index 87c6f0b..86f5a73 100644
--- a/src/test/unit/host_browser_identify_test.rb
+++ b/src/test/unit/host_browser_identify_test.rb
@@ -18,6 +18,9 @@
 # MA  02110-1301, USA.  A copy of the GNU General Public License is
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
+$: << File.join(File.dirname(__FILE__), "../../dutils")
+$: << File.join(File.dirname(__FILE__), "../../host-browser")
+ 
 require File.dirname(__FILE__) + '/../test_helper'
 
 require 'test/unit'
-- 
1.5.5.1



From mmorsi at redhat.com  Thu Oct  2 18:56:36 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Thu, 02 Oct 2008 14:56:36 -0400
Subject: [Ovirt-devel] [PATCH server] Fixed the tests for host-browser.
In-Reply-To: <1222971596-23395-1-git-send-email-dpierce@redhat.com>
References: <1222971596-23395-1-git-send-email-dpierce@redhat.com>
Message-ID: <48E51964.408@redhat.com>

Darryl L. Pierce wrote:
> A change to the identify protocol was overlooked. When an empty value was
> submitted, host-browser would throw an exception. But, a change allowed
> empty values to get by without notice. Fixed.
>
> Also added a Requires dependency on ruby-flexmock so that the RPM is
> correctly installed when building the server RPM.
>
> Finally, reintroduced a line that was deleted by mistaken from NicControllerTest.
>
> Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
> ---
>  ovirt-server.spec.in                        |    1 +
>  src/host-browser/host-browser.rb            |    9 +++++++--
>  src/test/functional/nic_controller_test.rb  |    2 ++
>  src/test/unit/host_browser_awaken_test.rb   |    3 +++
>  src/test/unit/host_browser_identify_test.rb |    3 +++
>  5 files changed, 16 insertions(+), 2 deletions(-)
>
> diff --git a/ovirt-server.spec.in b/ovirt-server.spec.in
> index 114b52d..1339b52 100644
> --- a/ovirt-server.spec.in
> +++ b/ovirt-server.spec.in
> @@ -19,6 +19,7 @@ Requires: rubygem(mongrel) >= 1.0.1
>  Requires: rubygem(krb5-auth) >= 0.6
>  Requires: rubygem(cobbler) >= 0.0.2
>  Requires: rubygem(gettext)
> +Requires: ruby-flexmock
>  Requires: postgresql-server
>  Requires: ruby-postgres
>  Requires: xapian-bindings-ruby
> diff --git a/src/host-browser/host-browser.rb b/src/host-browser/host-browser.rb
> index 3adea03..2241614 100755
> --- a/src/host-browser/host-browser.rb
> +++ b/src/host-browser/host-browser.rb
> @@ -46,10 +46,15 @@ class HostBrowser
>      def initialize(session)
>          @session = session
>          @keytab_dir = '/usr/share/ipa/html/'
> +        set_peeraddr @session.peeraddr[3]
> +    end
> +
> +    def set_peeraddr(peeraddr)
> +      @peeraddr = peeraddr
>      end
>  
>      def prefix(session)
> -      "#{Time.now.strftime('%b %d %H:%M:%S')} #{session.peeraddr[3]} "
> +      "#{Time.now.strftime('%b %d %H:%M:%S')} #{@peeraddr} "
>      end
>  
>      # Ensures the conversation starts properly.
> @@ -113,7 +118,7 @@ class HostBrowser
>                  nic_info << nic
>              else
>  
> -                raise Exception.new("ERRINFO! Expected key=value : #{info}\n") unless info =~ /[\w]+[\s]*=[\w]*/
> +                raise Exception.new("ERRINFO! Expected key=value : #{info}\n") unless info =~ /[\w]+[\s]*=[\w]+/
>  
>                  key, value = info.split("=")
>  
> diff --git a/src/test/functional/nic_controller_test.rb b/src/test/functional/nic_controller_test.rb
> index 74a80f4..1fa34ff 100644
> --- a/src/test/functional/nic_controller_test.rb
> +++ b/src/test/functional/nic_controller_test.rb
> @@ -30,6 +30,8 @@ class NicControllerTest < Test::Unit::TestCase
>      @controller = NicController.new
>      @request    = ActionController::TestRequest.new
>      @response   = ActionController::TestResponse.new
> +    
> +    @first_id = nics(:one).id
>    end
>  
>    def test_show
> diff --git a/src/test/unit/host_browser_awaken_test.rb b/src/test/unit/host_browser_awaken_test.rb
> index 5340e01..53711ee 100644
> --- a/src/test/unit/host_browser_awaken_test.rb
> +++ b/src/test/unit/host_browser_awaken_test.rb
> @@ -18,6 +18,9 @@
>  # MA  02110-1301, USA.  A copy of the GNU General Public License is
>  # also available at http://www.gnu.org/copyleft/gpl.html.
>  
> +$: << File.join(File.dirname(__FILE__), "../../dutils")
> +$: << File.join(File.dirname(__FILE__), "../../host-browser")
> + 
>  require File.dirname(__FILE__) + '/../test_helper'
>  require 'test/unit'
>  require 'flexmock/test_unit'
> diff --git a/src/test/unit/host_browser_identify_test.rb b/src/test/unit/host_browser_identify_test.rb
> index 87c6f0b..86f5a73 100644
> --- a/src/test/unit/host_browser_identify_test.rb
> +++ b/src/test/unit/host_browser_identify_test.rb
> @@ -18,6 +18,9 @@
>  # MA  02110-1301, USA.  A copy of the GNU General Public License is
>  # also available at http://www.gnu.org/copyleft/gpl.html.
>  
> +$: << File.join(File.dirname(__FILE__), "../../dutils")
> +$: << File.join(File.dirname(__FILE__), "../../host-browser")
> + 
>  require File.dirname(__FILE__) + '/../test_helper'
>  
>  require 'test/unit'
>   
ACK, with a few caveats.

Applying this patch once again complains about whitespace issues. It
didn't affect my testing it as it applied fine, and figure you'll catch
this as if you try to push with extraneous whitespace our repo won't let
you.

This takes care of all the outstanding errors I noticed up to this
point. Unfortunately it seems that since these nic / browser issues are
fixed, other errors are now apparent, particularly that pertaining to
bonding. I attached the output of my 'rake test' run, so as to help in
debugging. It seems the most prominent issue is 'type_id' which is
attempted to be set in the bonding_test "setup" method, but which
doesn't exist in the bondings database table. The last three errors
(6,7,8) seem to indicate another problem which I'm not sure the cause of.

   -Mo
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: rake-test-output
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081002/be8008ea/attachment.ksh>

From dpierce at redhat.com  Thu Oct  2 19:01:36 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Thu, 02 Oct 2008 15:01:36 -0400
Subject: [Ovirt-devel] [PATCH server] Fixed the tests for host-browser.
In-Reply-To: <48E51964.408@redhat.com>
References: <1222971596-23395-1-git-send-email-dpierce@redhat.com>
	<48E51964.408@redhat.com>
Message-ID: <48E51A90.7050902@redhat.com>

Mohammed Morsi wrote:
> ACK, with a few caveats.
> 
> Applying this patch once again complains about whitespace issues. It
> didn't affect my testing it as it applied fine, and figure you'll catch
> this as if you try to push with extraneous whitespace our repo won't let
> you.
> 

Gah, I'm starting to hate this editor (Netbeans) for the whitespaces.
I've removed the whitespaces and will push without them.

> This takes care of all the outstanding errors I noticed up to this
> point. Unfortunately it seems that since these nic / browser issues are
> fixed, other errors are now apparent, particularly that pertaining to
> bonding. I attached the output of my 'rake test' run, so as to help in
> debugging. It seems the most prominent issue is 'type_id' which is
> attempted to be set in the bonding_test "setup" method, but which
> doesn't exist in the bondings database table. The last three errors
> (6,7,8) seem to indicate another problem which I'm not sure the cause of.

I'll fix that test shortly.

-- 
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081002/0ad4bc2e/attachment.vcf>

From mmorsi at redhat.com  Thu Oct  2 20:28:58 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Thu, 02 Oct 2008 16:28:58 -0400
Subject: [Ovirt-devel] RRD Data Gen Script
Message-ID: <48E52F0A.40308@redhat.com>


-------------- next part --------------
A non-text attachment was scrubbed...
Name: demo-rrd-data.rb
Type: application/x-ruby
Size: 11788 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081002/dded99e7/attachment.bin>

From sseago at redhat.com  Fri Oct  3 05:45:37 2008
From: sseago at redhat.com (Scott Seago)
Date: Fri,  3 Oct 2008 01:45:37 -0400
Subject: [Ovirt-devel] [PATCH] initial model work for lvm storage
Message-ID: <1223012737-31092-1-git-send-email-sseago@redhat.com>

This includes the model classes w/ migrations for the lvm storage pools and volumes, and some changes required to support Storage Volume tasks. This patch does not include all of the necessary model API methods to support lvm, but it's a starting point -- some changes to clalance's taskomatic bits will be required to support this, and we will need additional model enhancements when the UI work is done, and when the taskomatic back end is finalized.

Signed-off-by: Scott Seago <sseago at redhat.com>
---
 src/app/models/host.rb                             |    2 +-
 src/app/models/host_task.rb                        |   11 ++-
 src/app/models/iscsi_storage_pool.rb               |    2 +-
 .../models/{host_task.rb => lvm_storage_pool.rb}   |   30 ++++--
 .../{nfs_storage_pool.rb => lvm_storage_volume.rb} |   12 +--
 src/app/models/nfs_storage_pool.rb                 |    2 +-
 src/app/models/storage_pool.rb                     |   11 ++-
 src/app/models/storage_task.rb                     |   11 ++-
 src/app/models/storage_volume.rb                   |   15 +++-
 .../{host_task.rb => storage_volume_task.rb}       |   22 +++-
 src/app/models/task.rb                             |   15 ++-
 src/app/models/vm.rb                               |    2 +-
 src/app/models/vm_task.rb                          |   15 ++-
 src/db/migrate/023_add_lvm_storage.rb              |  106 ++++++++++++++++++++
 src/dutils/active_record_env.rb                    |    2 +
 15 files changed, 219 insertions(+), 39 deletions(-)
 copy src/app/models/{host_task.rb => lvm_storage_pool.rb} (62%)
 copy src/app/models/{nfs_storage_pool.rb => lvm_storage_volume.rb} (82%)
 copy src/app/models/{host_task.rb => storage_volume_task.rb} (69%)
 create mode 100644 src/db/migrate/023_add_lvm_storage.rb

diff --git a/src/app/models/host.rb b/src/app/models/host.rb
index de5c5ee..546da19 100644
--- a/src/app/models/host.rb
+++ b/src/app/models/host.rb
@@ -31,7 +31,7 @@ class Host < ActiveRecord::Base
     def consuming_resources
       find(:all, :conditions=>{:state=>Vm::RUNNING_STATES})
     end
-  has_many :tasks, :class_name => "HostTask", :dependent => :destroy, :order => "id DESC" do
+  has_many :tasks, :as => :task_target, :dependent => :destroy, :order => "id ASC" do
     def queued
       find(:all, :conditions=>{:state=>Task::STATE_QUEUED})
     end
diff --git a/src/app/models/host_task.rb b/src/app/models/host_task.rb
index 0aea41b..82298db 100644
--- a/src/app/models/host_task.rb
+++ b/src/app/models/host_task.rb
@@ -22,11 +22,20 @@ class HostTask < Task
   ACTION_CLEAR_VMS = "clear_vms"
 
   def after_initialize
-    self.hardware_pool = host.hardware_pool if self.host
+    self.hardware_pool = task_target.hardware_pool if self.task_target_type=="Host"
   end
 
   def task_obj
     "Host;;;#{self.host.id};;;#{self.host.hostname}"
   end
 
+  def vm
+    nil
+  end
+  def storage_volume
+    nil
+  end
+  def storage_pool
+    nil
+  end
 end
diff --git a/src/app/models/iscsi_storage_pool.rb b/src/app/models/iscsi_storage_pool.rb
index 1280834..7802a90 100644
--- a/src/app/models/iscsi_storage_pool.rb
+++ b/src/app/models/iscsi_storage_pool.rb
@@ -19,7 +19,7 @@
 
 class IscsiStoragePool < StoragePool
   
-  validates_presence_of :port, :target
+  validates_presence_of :ip_addr, :port, :target
   validates_uniqueness_of :ip_addr, :scope => [:port, :target]
   
   def label_components
diff --git a/src/app/models/host_task.rb b/src/app/models/lvm_storage_pool.rb
similarity index 62%
copy from src/app/models/host_task.rb
copy to src/app/models/lvm_storage_pool.rb
index 0aea41b..08b8938 100644
--- a/src/app/models/host_task.rb
+++ b/src/app/models/lvm_storage_pool.rb
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 Red Hat, Inc.
 # Written by Scott Seago <sseago at redhat.com>
 #
@@ -17,16 +17,32 @@
 # MA  02110-1301, USA.  A copy of the GNU General Public License is
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
-class HostTask < Task
+require 'util/ovirt'
+
+class LvmStoragePool < StoragePool
+
+  has_many :source_volumes, :class_name => "StorageVolume",
+                            :foreign_key => "lvm_pool_id",
+                            :dependent => :nullify do
+    def total_size
+      find(:all).inject(0){ |sum, sv| sum + sv.size }
+    end
+  end
 
-  ACTION_CLEAR_VMS = "clear_vms"
+  validates_presence_of :vg_name
+  validates_uniqueness_of :vg_name
 
-  def after_initialize
-    self.hardware_pool = host.hardware_pool if self.host
+  def display_name
+    "#{get_type_label}: #{vg_name}"
   end
 
-  def task_obj
-    "Host;;;#{self.host.id};;;#{self.host.hostname}"
+  def size
+    source_volums.total_size
   end
 
+  def size_in_gb
+    kb_to_gb(size)
+  end
+
+
 end
diff --git a/src/app/models/nfs_storage_pool.rb b/src/app/models/lvm_storage_volume.rb
similarity index 82%
copy from src/app/models/nfs_storage_pool.rb
copy to src/app/models/lvm_storage_volume.rb
index 2d05305..7dde2d1 100644
--- a/src/app/models/nfs_storage_pool.rb
+++ b/src/app/models/lvm_storage_volume.rb
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 Red Hat, Inc.
 # Written by Scott Seago <sseago at redhat.com>
 #
@@ -17,12 +17,8 @@
 # MA  02110-1301, USA.  A copy of the GNU General Public License is
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
-class NfsStoragePool < StoragePool
-
-  validates_presence_of :export_path
-  validates_uniqueness_of :ip_addr, :scope => :export_path
-
-  def label_components
-    "#{export_path}"
+class LvmStorageVolume < StorageVolume
+  def display_name
+    "#{get_type_label}: #{storage_pool.vg_name}:#{lv_name}"
   end
 end
diff --git a/src/app/models/nfs_storage_pool.rb b/src/app/models/nfs_storage_pool.rb
index 2d05305..a27944b 100644
--- a/src/app/models/nfs_storage_pool.rb
+++ b/src/app/models/nfs_storage_pool.rb
@@ -19,7 +19,7 @@
 
 class NfsStoragePool < StoragePool
 
-  validates_presence_of :export_path
+  validates_presence_of :ip_addr, :export_path
   validates_uniqueness_of :ip_addr, :scope => :export_path
 
   def label_components
diff --git a/src/app/models/storage_pool.rb b/src/app/models/storage_pool.rb
index bc98f8e..c49e090 100644
--- a/src/app/models/storage_pool.rb
+++ b/src/app/models/storage_pool.rb
@@ -19,7 +19,7 @@
 
 class StoragePool < ActiveRecord::Base
   belongs_to              :hardware_pool
-  has_many :tasks, :class_name => "StorageTask", :dependent => :destroy, :order => "id DESC" do
+  has_many :tasks, :as => :task_target, :dependent => :destroy, :order => "id ASC" do
     def queued
       find(:all, :conditions=>{:state=>Task::STATE_QUEUED})
     end
@@ -33,14 +33,17 @@ class StoragePool < ActiveRecord::Base
   has_many :smart_pool_tags, :as => :tagged, :dependent => :destroy
   has_many :smart_pools, :through => :smart_pool_tags
 
-  validates_presence_of :ip_addr, :hardware_pool_id
+
+  validates_presence_of :hardware_pool_id
 
   acts_as_xapian :texts => [ :ip_addr, :target, :export_path, :type ],
                  :terms => [ [ :search_users, 'U', "search_users" ] ]
   ISCSI = "iSCSI"
   NFS   = "NFS"
+  LVM   = "LVM"
   STORAGE_TYPES = { ISCSI => "Iscsi",
-                    NFS   => "Nfs" }
+                    NFS   => "Nfs",
+                    LVM   => "Lvm" }
 
   def self.factory(type, params = nil)
     case type
@@ -48,6 +51,8 @@ class StoragePool < ActiveRecord::Base
       return IscsiStoragePool.new(params)
     when NFS
       return NfsStoragePool.new(params)
+    when LVM
+      return LvmStoragePool.new(params)
     else
       return nil
     end
diff --git a/src/app/models/storage_task.rb b/src/app/models/storage_task.rb
index db604d5..785f0ea 100644
--- a/src/app/models/storage_task.rb
+++ b/src/app/models/storage_task.rb
@@ -22,10 +22,19 @@ class StorageTask < Task
   ACTION_REFRESH_POOL = "refresh_pool"
 
   def after_initialize
-    self.hardware_pool = storage_pool.hardware_pool if self.storage_pool
+    self.hardware_pool = task_target.hardware_pool if self.task_target_type=="StoragePool"
   end
 
   def task_obj
     "StoragePool;;;#{self.storage_pool.id};;;#{self.storage_pool.display_name}"
   end
+  def host
+    nil
+  end
+  def vm
+    nil
+  end
+  def storage_volume
+    nil
+  end
 end
diff --git a/src/app/models/storage_volume.rb b/src/app/models/storage_volume.rb
index ef9cd6e..378b58f 100644
--- a/src/app/models/storage_volume.rb
+++ b/src/app/models/storage_volume.rb
@@ -23,12 +23,23 @@ class StorageVolume < ActiveRecord::Base
   belongs_to              :storage_pool
   has_and_belongs_to_many :vms
 
+  belongs_to :lvm_storage_pool, :class_name => "LvmStoragePool",
+                            :foreign_key => "lvm_pool_id"
+
+  has_many :tasks, :as => :task_target, :dependent => :destroy, :order => "id ASC" do
+    def queued
+      find(:all, :conditions=>{:state=>Task::STATE_QUEUED})
+    end
+  end
+
   def self.factory(type, params = nil)
     case type
-    when "iSCSI"
+    when StoragePool::ISCSI
       return IscsiStorageVolume.new(params)
-    when "NFS"
+    when StoragePool::NFS
       return NfsStorageVolume.new(params)
+    when StoragePool::LVM
+      return LvmStorageVolume.new(params)
     else
       return nil
     end
diff --git a/src/app/models/host_task.rb b/src/app/models/storage_volume_task.rb
similarity index 69%
copy from src/app/models/host_task.rb
copy to src/app/models/storage_volume_task.rb
index 0aea41b..78f2895 100644
--- a/src/app/models/host_task.rb
+++ b/src/app/models/storage_volume_task.rb
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 Red Hat, Inc.
 # Written by Scott Seago <sseago at redhat.com>
 #
@@ -17,16 +17,26 @@
 # MA  02110-1301, USA.  A copy of the GNU General Public License is
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
-class HostTask < Task
+class StorageVolumeTask < Task
 
-  ACTION_CLEAR_VMS = "clear_vms"
+  ACTION_CREATE_VOLUME = "create_volume"
+  ACTION_EDIT_VOLUME = "edit_volume"
 
   def after_initialize
-    self.hardware_pool = host.hardware_pool if self.host
+    self.hardware_pool = task_target.storage_pool.hardware_pool if self.task_target_type=="StorageVolume"
   end
 
   def task_obj
-    "Host;;;#{self.host.id};;;#{self.host.hostname}"
+    "StorageVolume;;;#{self.storage_volume.id};;;#{self.storage_volume.display_name}"
+  end
+  end
+  def host
+    nil
+  end
+  def vm
+    nil
+  end
+  def storage_pool
+    nil
   end
-
 end
diff --git a/src/app/models/task.rb b/src/app/models/task.rb
index efbed64..f231c18 100644
--- a/src/app/models/task.rb
+++ b/src/app/models/task.rb
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 Red Hat, Inc.
 # Written by Scott Seago <sseago at redhat.com>
 #
@@ -20,13 +20,20 @@
 class Task < ActiveRecord::Base
   belongs_to :hardware_pool
   belongs_to :vm_resource_pool
+  belongs_to :task_target,       :polymorphic => true
   # moved associations here so that nested set :include directives work
   # StorageTask association
-  belongs_to :storage_pool
+  belongs_to :storage_pool,   :class_name => "StoragePool",
+                              :foreign_key => "task_target_id"
+  # StorageVolumeTask association
+  belongs_to :storage_volume, :class_name => "StorageVolume",
+                              :foreign_key => "task_target_id"
   # HostTask association
-  belongs_to :host
+  belongs_to :host,           :class_name => "Host",
+                              :foreign_key => "task_target_id"
   # VmTask association
-  belongs_to :vm
+  belongs_to :vm,             :class_name => "Vm",
+                              :foreign_key => "task_target_id"
 
   STATE_QUEUED       = "queued"
   STATE_RUNNING      = "running"
diff --git a/src/app/models/vm.rb b/src/app/models/vm.rb
index ace6fb1..73e78f8 100644
--- a/src/app/models/vm.rb
+++ b/src/app/models/vm.rb
@@ -22,7 +22,7 @@ require 'util/ovirt'
 class Vm < ActiveRecord::Base
   belongs_to :vm_resource_pool
   belongs_to :host
-  has_many :tasks, :class_name => "VmTask", :dependent => :destroy, :order => "id ASC" do
+  has_many :tasks, :as => :task_target, :dependent => :destroy, :order => "id ASC" do
     def queued
       find(:all, :conditions=>{:state=>Task::STATE_QUEUED})
     end
diff --git a/src/app/models/vm_task.rb b/src/app/models/vm_task.rb
index 31c4ac8..2d93af2 100644
--- a/src/app/models/vm_task.rb
+++ b/src/app/models/vm_task.rb
@@ -107,9 +107,9 @@ class VmTask < Task
                                       :popup_action => 'migrate'} }
 
   def after_initialize
-    if self.vm
-      self.vm_resource_pool = vm.vm_resource_pool
-      self.hardware_pool = vm.get_hardware_pool
+    if self.task_target_type=="Vm"
+      self.vm_resource_pool = task_target.vm_resource_pool
+      self.hardware_pool = task_target.get_hardware_pool
     end
   end
 
@@ -144,4 +144,13 @@ class VmTask < Task
   def self.label_and_action(action)
     return [action_label(action), action, action_icon(action)]
   end
+  def host
+    nil
+  end
+  def storage_volume
+    nil
+  end
+  def storage_pool
+    nil
+  end
 end
diff --git a/src/db/migrate/023_add_lvm_storage.rb b/src/db/migrate/023_add_lvm_storage.rb
new file mode 100644
index 0000000..697df4d
--- /dev/null
+++ b/src/db/migrate/023_add_lvm_storage.rb
@@ -0,0 +1,106 @@
+#
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Scott Seago <sseago at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+class AddLvmStorage < ActiveRecord::Migration
+  def self.up
+    #LVM pool does not use ip_addr
+
+    # VG Name
+    add_column :storage_pools, :vg_name, :string
+
+    # LV name
+    add_column :storage_volumes, :lv_name, :string
+    # LV capacity==existing size attr
+
+    # LV <target><permissions>
+    # FIXME: do we want to make these user-determined, or should
+    # these be defined by the model itself?
+    add_column :storage_volumes, :lv_owner_perms, :string
+    add_column :storage_volumes, :lv_group_perms, :string
+    add_column :storage_volumes, :lv_mode_perms, :string
+
+    # VG pool ID
+    add_column :storage_volumes, :lvm_pool_id, :integer
+    execute "alter table storage_volumes add constraint fk_storage_volumes_lvm_pools
+             foreign key (lvm_pool_id) references storage_pools(id)"
+
+    # use polymorphic tasks association
+    add_column :tasks, :task_target_id, :integer
+    add_column :tasks, :task_target_type, :string
+    begin
+      Task.transaction do
+        HostTask.find(:all).each do |task|
+          task.task_target_type = 'Host'
+          task.task_target_id = task.host_id
+          task.save!
+        end
+        StorageTask.find(:all).each do |task|
+          task.task_target_type = 'StoragePool'
+          task.task_target_id = task.storage_pool_id
+          task.save!
+        end
+        VmTask.find(:all).each do |task|
+          task.task_target_type = 'Vm'
+          task.task_target_id = task.vm_id
+          task.save!
+        end
+      end
+      remove_column :tasks, :vm_id
+      remove_column :tasks, :storage_pool_id
+      remove_column :tasks, :host_id
+    rescue
+      puts "could not update tasks..."
+    end
+
+  end
+
+  def self.down
+    remove_column :storage_pools, :vg_name
+
+    remove_column :storage_volumes, :lv_name
+    remove_column :storage_volumes, :lv_owner_perms
+    remove_column :storage_volumes, :lv_group_perms
+    remove_column :storage_volumes, :lv_mode_perms
+    remove_column :storage_volumes, :lvm_pool_id
+
+    add_column :tasks, :vm_id, :integer
+    add_column :tasks, :storage_pool_id, :integer
+    add_column :tasks, :host_id, :integer
+    begin
+      Task.transaction do
+        HostTask.find(:all).each do |task|
+          task.host_id = task.task_target_id
+          task.save!
+        end
+        StorageTask.find(:all).each do |task|
+          task.storage_pool_id = task.task_target_id
+          task.save!
+        end
+        VmTask.find(:all).each do |task|
+          task.vm_id = task.task_target_id
+          task.save!
+        end
+      end
+      remove_column :tasks, :task_target_id
+      remove_column :tasks, :task_target_type
+    rescue
+      puts "could not update tasks..."
+    end
+  end
+end
diff --git a/src/dutils/active_record_env.rb b/src/dutils/active_record_env.rb
index c6f37eb..bcec565 100644
--- a/src/dutils/active_record_env.rb
+++ b/src/dutils/active_record_env.rb
@@ -78,10 +78,12 @@ require 'models/vm_task.rb'
 require 'models/storage_pool.rb'
 require 'models/iscsi_storage_pool.rb'
 require 'models/nfs_storage_pool.rb'
+require 'models/lvm_storage_pool.rb'
 
 require 'models/storage_volume.rb'
 require 'models/iscsi_storage_volume.rb'
 require 'models/nfs_storage_volume.rb'
+require 'models/lvm_storage_volume.rb'
 require 'models/smart_pool.rb'
 require 'models/smart_pool_tag.rb'
 
-- 
1.5.5.1



From jeffschroed at gmail.com  Fri Oct  3 05:35:31 2008
From: jeffschroed at gmail.com (Jeff Schroeder)
Date: Thu,  2 Oct 2008 22:35:31 -0700
Subject: [Ovirt-devel] [PATCH] Add trivial error() function and change code
	to use it
In-Reply-To: <Jeff Schroeder <jeffschroeder@computer.org>
References: <Jeff Schroeder <jeffschroeder@computer.org>
Message-ID: <1223012131-10557-1-git-send-email-jeffschroeder@computer.org>

Remove the multiple echo ... && exit 1 references and replace
them with a simple function. This makes the code a bit cleaner.

Signed-off-by: Jeff Schroeder <jeffschroeder at computer.org>
---
 wui/scripts/ovirt-wui-install |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/wui/scripts/ovirt-wui-install b/wui/scripts/ovirt-wui-install
index 44798fc..1f5e1eb 100755
--- a/wui/scripts/ovirt-wui-install
+++ b/wui/scripts/ovirt-wui-install
@@ -31,6 +31,11 @@ usage() {
     exit 1
 } >&2
 
+error() {
+    echo $* >&2
+    exit 1
+}
+
 find_srv() {
     local dnsreply
     
@@ -112,7 +117,7 @@ find_srv ldap tcp
 if [ -n "$SRV_HOST" -a -n "$SRV_PORT" ]; then
     SRV_HOST=${SRV_HOST%.}
     srv_base=$(find_ldap_base)
-    [ $? != 0 ] && echo "Failed to determine base for ldap" && exit 1
+    [ $? != 0 ] && error "Failed to determine base for ldap"
     
     sed -i -e "s/host: .*/host: $SRV_HOST/g" \
         -e "s/port: .*/port: $SRV_PORT/g" \
@@ -121,7 +126,7 @@ if [ -n "$SRV_HOST" -a -n "$SRV_PORT" ]; then
 else
     # FIXME: Eventually this script should prompt for things that can't
     # be found in DNS SRV records.
-    echo "Failed to get ldap host/port" && exit 1
+    error "Failed to get ldap host/port"
 fi
 
 # setup an NTP step-ticker
@@ -153,7 +158,7 @@ echo "local all all trust" > /var/lib/pgsql/data/pg_hba.conf
 echo "host all all 127.0.0.1 255.255.255.0 trust" >> /var/lib/pgsql/data/pg_hba.conf 
 service postgresql stop > /dev/null 2>&1
 service postgresql start
-[ $? != 0 ] && echo "Failed to start database" && exit 1
+[ $? != 0 ] && error "Failed to start database"
 wait_for_service 'psql -l -U postgres' 10 2 || exit 1
 
 if [ -z $PASSWD ]; then
@@ -168,7 +173,7 @@ su - postgres -c "/usr/bin/dropdb $DATABASE > /dev/null 2>&1"
 
 # create new DB
 su - postgres -c "/usr/bin/createdb $DATABASE"
-[ $? != 0 ] && echo "Failed to create database $DATABASE" && exit 1
+[ $? != 0 ] && error "Failed to create database $DATABASE"
 
 su - postgres -c "psql --dbname $DATABASE <<EOF
     DROP ROLE $USERNAME;
@@ -180,7 +185,7 @@ su - postgres -c "psql --dbname $DATABASE <<EOF
     VALID UNTIL 'infinity';
     GRANT ALL ON DATABASE $DATABASE TO $USERNAME;
 EOF"
-[ $? != 0 ] && echo "Failed to run database setup" && exit 1
+[ $? != 0 ] && error "Failed to run database setup"
 
 touch $EXISTS_FILE
 
@@ -190,7 +195,7 @@ rake db:migrate
 cd -
 
 ${OVIRT_DIR}/script/grant_admin_privileges ovirtadmin
-[ $? != 0 ] && echo "Failed to grant ovirtadmin privileges" && exit 1
+[ $? != 0 ] && error "Failed to grant ovirtadmin privileges"
 
 ovirt-add-host $(hostname) ${OVIRT_DIR}/ovirt.keytab
 
-- 
1.5.6.3



From pmyers at redhat.com  Fri Oct  3 13:34:59 2008
From: pmyers at redhat.com (Perry N. Myers)
Date: Fri, 03 Oct 2008 09:34:59 -0400
Subject: [Ovirt-devel] [PATCH] Add trivial error() function and change
	code	to use it
In-Reply-To: <1223012131-10557-1-git-send-email-jeffschroeder@computer.org>
References: <Jeff Schroeder <jeffschroeder@computer.org>
	<1223012131-10557-1-git-send-email-jeffschroeder@computer.org>
Message-ID: <48E61F83.7040605@redhat.com>

Jeff Schroeder wrote:
> Remove the multiple echo ... && exit 1 references and replace
> them with a simple function. This makes the code a bit cleaner.

No problem with this patch in concept, but this patch appears to be 
against the old repository.  See the instructions on:
http://ovirt.org/build-instructions.html

for getting access to the new repositories.

The file you're patching is now located in the ovirt-server repository and 
it's location is:

scripts/ovirt-server-install

Thanks!

Perry

> Signed-off-by: Jeff Schroeder <jeffschroeder at computer.org>
> ---
>  wui/scripts/ovirt-wui-install |   17 +++++++++++------
>  1 files changed, 11 insertions(+), 6 deletions(-)
> 
> diff --git a/wui/scripts/ovirt-wui-install b/wui/scripts/ovirt-wui-install
> index 44798fc..1f5e1eb 100755
> --- a/wui/scripts/ovirt-wui-install
> +++ b/wui/scripts/ovirt-wui-install
> @@ -31,6 +31,11 @@ usage() {
>      exit 1
>  } >&2
>  
> +error() {
> +    echo $* >&2
> +    exit 1
> +}
> +
>  find_srv() {
>      local dnsreply
>      
> @@ -112,7 +117,7 @@ find_srv ldap tcp
>  if [ -n "$SRV_HOST" -a -n "$SRV_PORT" ]; then
>      SRV_HOST=${SRV_HOST%.}
>      srv_base=$(find_ldap_base)
> -    [ $? != 0 ] && echo "Failed to determine base for ldap" && exit 1
> +    [ $? != 0 ] && error "Failed to determine base for ldap"
>      
>      sed -i -e "s/host: .*/host: $SRV_HOST/g" \
>          -e "s/port: .*/port: $SRV_PORT/g" \
> @@ -121,7 +126,7 @@ if [ -n "$SRV_HOST" -a -n "$SRV_PORT" ]; then
>  else
>      # FIXME: Eventually this script should prompt for things that can't
>      # be found in DNS SRV records.
> -    echo "Failed to get ldap host/port" && exit 1
> +    error "Failed to get ldap host/port"
>  fi
>  
>  # setup an NTP step-ticker
> @@ -153,7 +158,7 @@ echo "local all all trust" > /var/lib/pgsql/data/pg_hba.conf
>  echo "host all all 127.0.0.1 255.255.255.0 trust" >> /var/lib/pgsql/data/pg_hba.conf 
>  service postgresql stop > /dev/null 2>&1
>  service postgresql start
> -[ $? != 0 ] && echo "Failed to start database" && exit 1
> +[ $? != 0 ] && error "Failed to start database"
>  wait_for_service 'psql -l -U postgres' 10 2 || exit 1
>  
>  if [ -z $PASSWD ]; then
> @@ -168,7 +173,7 @@ su - postgres -c "/usr/bin/dropdb $DATABASE > /dev/null 2>&1"
>  
>  # create new DB
>  su - postgres -c "/usr/bin/createdb $DATABASE"
> -[ $? != 0 ] && echo "Failed to create database $DATABASE" && exit 1
> +[ $? != 0 ] && error "Failed to create database $DATABASE"
>  
>  su - postgres -c "psql --dbname $DATABASE <<EOF
>      DROP ROLE $USERNAME;
> @@ -180,7 +185,7 @@ su - postgres -c "psql --dbname $DATABASE <<EOF
>      VALID UNTIL 'infinity';
>      GRANT ALL ON DATABASE $DATABASE TO $USERNAME;
>  EOF"
> -[ $? != 0 ] && echo "Failed to run database setup" && exit 1
> +[ $? != 0 ] && error "Failed to run database setup"
>  
>  touch $EXISTS_FILE
>  
> @@ -190,7 +195,7 @@ rake db:migrate
>  cd -
>  
>  ${OVIRT_DIR}/script/grant_admin_privileges ovirtadmin
> -[ $? != 0 ] && echo "Failed to grant ovirtadmin privileges" && exit 1
> +[ $? != 0 ] && error "Failed to grant ovirtadmin privileges"
>  
>  ovirt-add-host $(hostname) ${OVIRT_DIR}/ovirt.keytab
>  

-- 
|=-        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 mwagner at redhat.com  Fri Oct  3 13:56:22 2008
From: mwagner at redhat.com (Mark Wagner)
Date: Fri, 03 Oct 2008 09:56:22 -0400
Subject: [Ovirt-devel] RRD Data Gen Script
In-Reply-To: <48E52F0A.40308@redhat.com>
References: <48E52F0A.40308@redhat.com>
Message-ID: <48E62486.60600@redhat.com>

Mohammed Morsi wrote:
> ------------------------------------------------------------------------
>
> _______________________________________________
> Ovirt-devel mailing list
> Ovirt-devel at redhat.com
> https://www.redhat.com/mailman/listinfo/ovirt-devel
>   
Looks like the exact same patch I NACK'd back in August

Will look at fixing this over the weekend

NACK



From jguiditt at redhat.com  Fri Oct  3 20:39:14 2008
From: jguiditt at redhat.com (Jason Guiditta)
Date: Fri,  3 Oct 2008 16:39:14 -0400
Subject: [Ovirt-devel] [PATCH server] Version 1 of Revamped Tree Navigation.
Message-ID: <1223066354-21940-1-git-send-email-jguiditt@redhat.com>

The new javascript tree widget contains the following features/changes from previous implementation:

* The html for the list is dynamically generated using a javascript template system.  This will allow us to plug in different layouts per tree as the widget matures.
* Updates to the tree are now incremental, rather than a full rip and replace as earlier. We have 2 states we currently look for - 'new' and 'changed'.  The first generates new html and appends it to the DOM, the second just does a replacement of the content of existing nodes.
* Vastly simplified the markup and css.
* Added calls where appropriate to refresh the tree before next planned call (for instance, if you add a new hardware pool).
* Added slide effect when opening and closing a node of the tree.
* Clicking the plus/minus opens/close the node only, does not load main content area.
* Clicking anywhere to the right of that on a given node will load content area.
* Added interim icons for 'smartpool' and 'add smartpool'

Note that aside from the nav area, this should not impact the existing trees which have not been converted yet (all popups that have one), as this is a completely separate codebase with it's own js and css files.

Related, but not technically part of the tree, I added a choose_layout method to allow testing of javascript components as we are building them to help eliminate possible side effects from other code.  When not in a production environment, you can pass in ?component_layout=[name] where [name] is the name of a shell rhtml file you have put in views/layouts/components.  As our UI is growing increasingly complex, I think this will be a very useful way to facilitate building components.

Signed-off-by: Jason Guiditta <jguiditt at redhat.com>
---
 src/app/controllers/application.rb                 |   19 +-
 src/app/controllers/tree_controller.rb             |   70 ++++-
 src/app/models/pool.rb                             |   18 +-
 src/app/views/layouts/_side_toolbar.rhtml          |    2 +-
 src/app/views/layouts/_tree.rhtml                  |  148 ++++++--
 src/app/views/layouts/components/tree.rhtml        |   61 +++
 src/app/views/layouts/redux.rhtml                  |   40 +--
 src/public/images/icon_add_smartpool.png           |  Bin 0 -> 1341 bytes
 src/public/images/icon_smartpool.png               |  Bin 0 -> 641 bytes
 src/public/javascripts/ovirt.js                    |   28 +-
 src/public/javascripts/ovirt.tree.js               |   71 ++++
 src/public/javascripts/smart_nav_test_data.js      |  151 ++++++++
 src/public/javascripts/trimpath-template-1.0.38.js |  397 ++++++++++++++++++++
 src/public/stylesheets/ovirt-tree/tree.css         |   83 ++++
 14 files changed, 994 insertions(+), 94 deletions(-)
 create mode 100644 src/app/views/layouts/components/tree.rhtml
 create mode 100644 src/public/images/icon_add_smartpool.png
 create mode 100644 src/public/images/icon_smartpool.png
 create mode 100644 src/public/javascripts/ovirt.tree.js
 create mode 100644 src/public/javascripts/smart_nav_test_data.js
 create mode 100644 src/public/javascripts/trimpath-template-1.0.38.js
 create mode 100644 src/public/stylesheets/ovirt-tree/tree.css

diff --git a/src/app/controllers/application.rb b/src/app/controllers/application.rb
index 6dcf6f8..a751768 100644
--- a/src/app/controllers/application.rb
+++ b/src/app/controllers/application.rb
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 Red Hat, Inc.
 # Written by Scott Seago <sseago at redhat.com>
 #
@@ -24,7 +24,7 @@ class ApplicationController < ActionController::Base
   # Pick a unique cookie name to distinguish our session data from others'
   session :session_key => '_ovirt_session_id'
   init_gettext "ovirt"
-  layout 'redux'
+  layout :choose_layout
 
   before_filter :pre_new, :only => [:new]
   before_filter :pre_create, :only => [:create]
@@ -33,6 +33,13 @@ class ApplicationController < ActionController::Base
   before_filter :authorize_admin, :only => [:new, :create, :edit, :update, :destroy]
   before_filter :is_logged_in
 
+  def choose_layout
+    if(params[:component_layout])
+      return (ENV["RAILS_ENV"] != "production")?'components/' << params[:component_layout]:'redux'
+    end
+    return 'redux'
+  end
+
   def is_logged_in
     redirect_to(:controller => "login", :action => "login") unless get_login_user
   end
@@ -40,7 +47,7 @@ class ApplicationController < ActionController::Base
   def get_login_user
     (ENV["RAILS_ENV"] == "production") ? session[:user] : "ovirtadmin"
   end
-  
+
   def set_perms(hwpool)
     @user = get_login_user
     @can_view = hwpool.can_view(@user)
@@ -91,8 +98,8 @@ class ApplicationController < ActionController::Base
   # don't define find_opts for array inputs
   def json_hash(full_items, attributes, arg_list=[], find_opts={}, id_method=:id)
     page = params[:page].to_i
-    paginate_opts = {:page => page, 
-                     :order => "#{params[:sortname]} #{params[:sortorder]}", 
+    paginate_opts = {:page => page,
+                     :order => "#{params[:sortname]} #{params[:sortorder]}",
                      :per_page => params[:rp]}
     arg_list << find_opts.merge(paginate_opts)
     item_list = full_items.paginate(*arg_list)
@@ -102,7 +109,7 @@ class ApplicationController < ActionController::Base
     json_hash[:rows] = item_list.collect do |item|
       item_hash = {}
       item_hash[:id] = item.send(id_method)
-      item_hash[:cell] = attributes.collect do |attr| 
+      item_hash[:cell] = attributes.collect do |attr|
         if attr.is_a? Array
           value = item
           attr.each { |attr_item| value = value.send(attr_item)}
diff --git a/src/app/controllers/tree_controller.rb b/src/app/controllers/tree_controller.rb
index 1aed544..bc423b7 100644
--- a/src/app/controllers/tree_controller.rb
+++ b/src/app/controllers/tree_controller.rb
@@ -1,5 +1,4 @@
 class TreeController < ApplicationController
-
   def get_pools
     # TODO: split these into separate hash elements for HW and smart pools
     pools = HardwarePool.get_default_pool.full_set_nested(:method => :json_hash_element,
@@ -8,11 +7,78 @@ class TreeController < ApplicationController
                        :privilege => Permission::PRIV_VIEW, :user => get_login_user,
                        :smart_pool_set => true)
   end
+
   def fetch_nav
     @pools = get_pools
   end
-  
+
   def fetch_json
     render :json => get_pools.to_json
   end
+
+  def return_filtered_list
+    @ids = Array.new
+    @clientHash = {}
+    if (params[:item])
+      params[:item].each { |item|
+        tempItem = item.split("-")
+        itemHash = {
+          :id => tempItem[0].to_s,
+          :name =>tempItem[1]
+        }
+        @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)))
+    @ids.each { |item|
+      if @clientHash.has_key?(item.to_s)
+        @clientHash.delete(item.to_s)
+      end
+    }
+    @serverHash[:deleted] = @clientHash
+    render :json => @serverHash.to_json
+  end
+
+  private
+  def build_json(list)
+    list.each {|listItem|
+      process_list_item(listItem)
+      if listItem.has_key?(:children)
+          build_json(listItem[:children])
+      end
+    }
+    list
+  end
+
+  def process_list_item(list)
+    if @clientHash.has_key?(list[:id].to_s)
+      unless @clientHash[list[:id].to_s][:name] == list[:name]
+        list[:state] = "changed"
+      else
+        list[:state] = "unchanged"
+      end
+    else
+      list[:state] = "new"
+    end
+    @ids = @ids.push(list[:id])
+  end
+
+  def adjust_smart_pool_list(list)
+    adjustedList = Array.new
+    list.each {|listItem|
+      if (listItem[:name] == get_login_user)
+        listItem[:children].each {|item|
+          adjustedList.push(item)
+        }
+      else
+        adjustedList.push(listItem)
+      end
+    }
+    adjustedList
+  end
 end
diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb
index eb71be8..d189649 100644
--- a/src/app/models/pool.rb
+++ b/src/app/models/pool.rb
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 Red Hat, Inc.
 # Written by Scott Seago <sseago at redhat.com>
 #
@@ -45,7 +45,7 @@ class Pool < ActiveRecord::Base
   has_many :smart_pool_tags, :as => :tagged, :dependent => :destroy
   has_many :smart_pools, :through => :smart_pool_tags
 
-  # used to allow parent traversal before obj is saved to the db 
+  # used to allow parent traversal before obj is saved to the db
   # (needed for view code 'create' form)
   attr_accessor :tmp_parent
 
@@ -168,10 +168,10 @@ class Pool < ActiveRecord::Base
     end
   end
 
-  RESOURCE_LABELS = [["CPUs", :cpus, ""], 
-                     ["Memory", :memory_in_mb, "(mb)"], 
-                     ["NICs", :nics, ""], 
-                     ["VMs", :vms, ""], 
+  RESOURCE_LABELS = [["CPUs", :cpus, ""],
+                     ["Memory", :memory_in_mb, "(mb)"],
+                     ["NICs", :nics, ""],
+                     ["VMs", :vms, ""],
                      ["Disk", :storage_in_gb, "(gb)"]]
 
   #needed by tree widget for display
@@ -195,7 +195,7 @@ class Pool < ActiveRecord::Base
       found = false
       open_list.each do |open_pool|
         if pool.id == open_pool.id
-          new_open_list = open_list[(open_list.index(open_pool)+1)..-1]          
+          new_open_list = open_list[(open_list.index(open_pool)+1)..-1]
           unless new_open_list.empty?
             pool_children = pool.children unless pool_children
             hash[:children] = pool_hash(pool_children, new_open_list, filter_vm_pools)
@@ -210,7 +210,7 @@ class Pool < ActiveRecord::Base
   end
 
   def json_hash_element
-    { :id => id, :type => self[:type], :text => name, :name => name}
+    { :id => id, :type => self[:type], :text => name, :name => name, :parent_id => parent_id}
   end
 
   def hash_element
@@ -272,7 +272,7 @@ class Pool < ActiveRecord::Base
     obj = args.shift
     method = args.shift
     obj.send(method, *args)
-  end    
+  end
 
   def display_name
     name
diff --git a/src/app/views/layouts/_side_toolbar.rhtml b/src/app/views/layouts/_side_toolbar.rhtml
index e1958f1..4b92bcf 100644
--- a/src/app/views/layouts/_side_toolbar.rhtml
+++ b/src/app/views/layouts/_side_toolbar.rhtml
@@ -25,7 +25,7 @@
 <% end -%>
 <div class="toolbar" style="float:left;">
    <a href="<%= url_for :controller => :smart_pools, :action => 'new' %>" rel="facebox[.bolder]">
-     <%=image_tag "icon_add_hardwarepool.png", :title=>"Add Smart Pool"  %>
+     <%=image_tag "icon_add_smartpool.png", :title=>"Add Smart Pool"  %>
    </a>
 </div>
 <%if pool -%>
diff --git a/src/app/views/layouts/_tree.rhtml b/src/app/views/layouts/_tree.rhtml
index 0e6e138..a6bde14 100644
--- a/src/app/views/layouts/_tree.rhtml
+++ b/src/app/views/layouts/_tree.rhtml
@@ -1,32 +1,124 @@
-<div style=" float:left; padding:0 0 0 5px;"><%= image_tag("icon_dashboard.gif")%></div>
-  <% selected = "selected" if controller.controller_name == "dashboard" && params[:action] == "index" %>
-<div style=" float:left; padding:5px 0 0 5px;">
-    <%= link_to "Dashboard", { :controller => "dashboard" }, { :id => "dashboard", :class => "#{selected}" } %>
-</div>
-<div style="clear:both"></div>
-<%= javascript_include_tag "jquery.ovirt.treeview.js" -%>
-<script type="text/javascript">    
-    $(document).ready(function(){         
-        $("#test-tree").ovirt_treeview({
-            collapsed: true,
-            //animated: "normal",
-            url: "<%=  url_for :controller =>'/tree', :action => 'fetch_json' %>",
-            hardware_url: "<%=  url_for :controller =>'/hardware', :action => 'show' %>",
-            resource_url: "<%=  url_for :controller =>'/resources', :action => 'show' %>",
-            smart_url: "<%=  url_for :controller =>'/smart_pools', :action => 'show' %>"
-	});
-        var tree_reload = {
-            url: "<%=  url_for :controller =>'/tree', :action => 'fetch_json' %>",
-            hardware_url: "<%=  url_for :controller =>'/hardware', :action => 'show' %>",
-            resource_url: "<%=  url_for :controller =>'/resources', :action => 'show' %>",
-            smart_url: "<%=  url_for :controller =>'/smart_pools', :action => 'show' %>"
+<%= javascript_include_tag "trimpath-template-1.0.38.js" %>
+<%= javascript_include_tag "ovirt.tree.js" %>
+<%= stylesheet_link_tag 'ovirt-tree/tree' %>
+<script type="text/javascript">
+    var treeTimer, urlObj;
+    var processRecursive = true;
+    var recursiveTreeTempl, treeItemTempl, tree_url;
+    $(document).ready(function(){
+      recursiveTreeTempl = TrimPath.parseDOMTemplate("nav_tree_template");
+      treeItemTempl = TrimPath.parseDOMTemplate("nav_tree_updater_template");
+      urlObj = {
+        "HardwarePool" : "<%=  url_for :controller =>'/hardware', :action => 'show' %>",
+        "VmResourcePool" : "<%=  url_for :controller =>'/resources', :action => 'show' %>",
+        "SmartPool" : "<%=  url_for :controller =>'/smart_pools', :action => 'show' %>",
+        "DirectoryPool" : null
+      }
+      tree_url = "<%=  url_for :controller =>"/tree", :action => "return_filtered_list" %>";
+      processTree();
+      treeTimer = setInterval(processTree,15000);
+      $('ul.ovirt-tree li').livequery(
+        function(){
+          $(this)
+          .children('div')
+          .bind('click',function(){
+            $('ul.ovirt-tree li div').removeClass('current');
+            var thisHref = (urlObj[$(this).attr('class')] !=null) ? urlObj[$(this).attr('class')] + '/' + this.id :null;
+            $(this).toggleClass('current');
+            currentNode = this.id;
+            if ($tabs != null) {
+              var tabType = $tabs.data("pool_type.tabs");
+              ($(this).attr('class').toLowerCase().indexOf(tabType) == -1) ?selected_tab = 0 :selected_tab = $tabs.data("selected.tabs");
+            }
+            if (thisHref != null) {
+              $.ajax({
+                url: thisHref,
+                type: 'GET',
+                data: {ajax:true,tab:selected_tab},
+                dataType: 'html',
+                success: function(data) {
+                  $('#side-toolbar').html($(data).find('div.toolbar'));
+                  $('#tabs-and-content-container').html($(data).not('div#side-toolbar'));
+                },
+                error: function(xhr) {$.jGrowl(xhr.status + ' ' + xhr.statusText);}
+              });
+            }
+          });
+        },function(){
+          $(this)
+          .children('div')
+          .unbind('click');
         }
-        $('#test-tree').everyTime(15000,function(){
-          load(tree_reload, {}, this, this);
-        })
+      );
+      $('ul.ovirt-tree li:has(ul)').livequery(
+        function(){
+          $(this)
+            .children('span.hitarea')
+            .click(function(event){
+              if (this == event.target) {
+                  if($(this).siblings('ul').size() >0) {
+                      $(this)
+                        .toggleClass('expanded')
+                        .toggleClass('expandable')
+                        .siblings('ul').slideToggle("normal");
+                  }
+              }
+            });
+        },function(){
+            $(this).children('span.hitarea')
+              .removeClass('expanded expandable')
+              .unbind('click');
+        }
+      );
     });
 </script>
 
-<ul id="test-tree" class="filetree treeview-famfamfam treeview">
-</ul>
-<!--<ul id="tree" class="filetree treeview-famfamfam treeview"></ul>-->
+<!-- Output elements -->
+<div class="nav-dashboard">
+  <% selected = "selected" if controller.controller_name == "dashboard" && params[:action] == "index" %>
+  <%= link_to "Dashboard", { :controller => "dashboard" }, { :id => "dashboard", :class => "#{selected}" } %>
+</div>
+<form id="nav_tree_form">
+  <div class="nav-tree">
+    <ul id="nav_tree" class="ovirt-tree"></ul>
+  </div>
+  <div class="nav-smart-pool">
+    <span class="nav-smart-pool-header">Smart Pools</span> <!--FIXME: replace with i18n text -->
+    <ul id="smart_nav_tree" class="ovirt-tree"></ul>
+  </div>
+</form>
+
+<!-- Template content -->
+<!-- TODO: possibly move these templates into external files-->
+<textarea id="nav_tree_updater_template" style="display:none;">
+  <li>
+    <input type="checkbox" name="item[]" value="${id}-${name}" style="display:none" checked="checked"/>
+    <span class="hitarea {if defined('children')} expandable{/if}">&nbsp;</span><div id="${id}" class="${type}">${name}</div>
+  </li>
+</textarea>
+<textarea id="nav_tree_template" style="display:none;">
+  {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}">&nbsp;</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}">&nbsp;</span><div id="${item.id}" class="${item.type}">${item.name}</div>
+      {if item.children}
+        ${htmlList(item.children)}
+      {/if}
+    </li>
+  {/for}
+</textarea>
diff --git a/src/app/views/layouts/components/tree.rhtml b/src/app/views/layouts/components/tree.rhtml
new file mode 100644
index 0000000..063a6df
--- /dev/null
+++ b/src/app/views/layouts/components/tree.rhtml
@@ -0,0 +1,61 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+  <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
+  <title><%= yield :title -%></title>
+  <%= 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.form.js" -%>
+  <%= javascript_include_tag "ovirt.js" -%>
+
+  <script type="text/javascript">
+      var $tabs, selected_tab;
+      function delete_vm_pool(id, parent) {
+        $(document).trigger('close.facebox');
+        $.post('<%= url_for :controller => "resources", :action => "destroy" %>',
+               {id: id},
+                function(data,status){
+                  $("#vmpools_grid").flexReload();
+                  processTree();
+                  if (data.alert) {
+                    $.jGrowl(data.alert);
+                  }
+                 }, 'json');
+      }
+      function delete_hw_pool(id, parent) {
+        $(document).trigger('close.facebox');
+        $.post('<%= url_for :controller => "hardware", :action => "destroy" %>',
+               {id: id},
+                function(data,status){
+                  processTree();
+                  if (data.alert) {
+                    $.jGrowl(data.alert);
+                  }
+                 }, 'json');
+      }
+   </script>
+   <%= yield :scripts -%>
+ </head>
+
+ <body>
+   <div id="side">
+     <button id="stop">Stop!</button>
+     <%= render :partial => '/layouts/tree' %>
+   </div>
+   <div id="side-toolbar" class="header_menu_wrapper">
+     <%= render :partial => '/layouts/side_toolbar' %>
+   </div>
+
+   <div id="tabs-and-content-container">
+     <div id="main">
+        <div id="content_area">
+
+        </div>
+     </div>
+   </div>
+ </body>
+</html>
diff --git a/src/app/views/layouts/redux.rhtml b/src/app/views/layouts/redux.rhtml
index 01540d4..a985cdd 100644
--- a/src/app/views/layouts/redux.rhtml
+++ b/src/app/views/layouts/redux.rhtml
@@ -16,20 +16,18 @@
   <%= stylesheet_link_tag 'flexigrid/flexigrid.css' %>
   <%= stylesheet_link_tag 'facebox' %>
   <%= stylesheet_link_tag 'jquery.jgrowl.css' %>
-  <!--%= stylesheet_link_tag 'jquery.ui-1.5b4/themes/flora/flora.tabs.css' %-->
+
   <%= javascript_include_tag "jquery-1.2.6.min.js" -%>
   <%= javascript_include_tag "jquery-treeview/jquery.treeview.js" -%>
   <%= javascript_include_tag "jquery-treeview/jquery.treeview.async.js" -%>
   <%= javascript_include_tag "flexigrid.js" -%>
   <%= javascript_include_tag "facebox.js" -%>
-  <%= javascript_include_tag "jquery.timers.js" -%>
+  <%#= javascript_include_tag "jquery.timers.js" -%>
   <%= javascript_include_tag "jquery-svg/jquery.svg.pack.js" -%>
   <!--%= javascript_include_tag "jquery-svg/jquery.svgfilter.js" -%-->
   <%= javascript_include_tag "jquery-svg/jquery.svggraph.js" -%>
-  <!--%= javascript_include_tag "jquery.ui-1.5b4/ui.core.js" -%>
-  < %= javascript_include_tag "jquery.ui-1.5b4/ui.tabs.js" -%-->
   <%= javascript_include_tag "jquery.cookie.js" -%>
-  <%= javascript_include_tag "jquery.livequery.pack.js" -%>
+  <%= javascript_include_tag "jquery.livequery.min.js" -%>
   <%= javascript_include_tag "jquery.form.js" -%>
   <%= javascript_include_tag "jquery.jgrowl.js" -%>
 
@@ -40,37 +38,9 @@
   <%= javascript_include_tag "ovirt.js" -%>
     <script type="text/javascript">
       var $tabs, selected_tab;
-      $(document).ready(function(){  
+      $(document).ready(function(){
+         $.ajaxSetup({error: function(xhr) {$.jGrowl(xhr.status + ' ' + xhr.statusText);}});
             $('a[rel*=facebox]').livequery(function(){$(this).facebox();},function(){});
-            $('#side a').livequery(function(){
-                $(this).bind('click', function(){ 
-                    currentNode = $(this).parent().parent()[0].id;
-                    if ($tabs != null) {
-                    var tabType = $tabs.data("pool_type.tabs");
-                    ($(this).attr('href').indexOf(tabType) == -1) ?selected_tab = 0 :selected_tab = $tabs.data("selected.tabs");
-                    }
-                    $('#side span').each(function(){
-                        var nodeType = $(this).attr('class');
-                        if (nodeType.indexOf('_') != -1){
-                            nodeType = nodeType.substr(nodeType.indexOf('_') +1);
-                            $(this).attr('class', nodeType);
-                        }                        
-                    });
-                    var nodeType = $(this).parent().attr('class');
-                    $(this).parent().attr('class', 'current_' + nodeType);
-                    $.ajax({
-                        url: $(this).attr('href'),
-                        type: 'GET',
-                        data: {ajax:true,tab:selected_tab},
-                        //data: {nolayout:true},
-                        dataType: 'html',
-                        success: function(data) {
-                          $('#side-toolbar').html($(data).find('div.toolbar'));
-                          $('#tabs-and-content-container').html($(data).not('div#side-toolbar'));
-                        },
-                        error: function(xhr) {$.jGrowl(xhr.status + ' ' + xhr.statusText);}
-                    });
-                    return false;})},function(){});
             $('.dialog_tab_nav a').livequery(function(){
                 $(this).bind('click', function(){
                     $('.dialog_tab_nav li').removeClass('current');
diff --git a/src/public/images/icon_add_smartpool.png b/src/public/images/icon_add_smartpool.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7cb7316596b1eafbcad54890971f42737d45a62
GIT binary patch
literal 1341
zcmV-D1;YA?P)<h;3K|Lk000e1NJLTq0018V0018d1^@s7XsITz00001b5ch_0Itp)
z=>Px#32;bRa{vGe at Bjb`@Bu=sG?)MY1ma0VK~zY`?Uj8 at m1P*lf6sdk2N4b*32Gpj
ziIr#}C<=4BR93E5nbW3j`bTK1wQ`NkwdGP<I&+%SGMr_8v}Lp5DrT%42!5m_a$+JN
znu#8ik0Ws4aK7L7?hk|@QFOLy&Fin{eeUPFuIGNA`?(+J4=cVoEq2>x0Wbs1Je}!`
ze{g(M at wQp<036Moz3Z2+-<aJm9l3!%lg6=BasDv&Ptg;VL-E*;a7R$xgZa57vMJ at H
zB*xoR#W4eq*F)yg{GK?48&Y at 4{sb}h#Y_46DB&MQck=e~O;WZ$r?PiU1312IIsgf=
zWyB>6O)lU4OwT6G0K?PY9_K6=d)8_VBT?0;+Pa3m3Q1GuR$Z)UMA at 5B^-Wl!$L#L2
z0HDR?qfDNgR at y!hzxx{hBGw%|BO)TTW#2C@*_bScR>%Eba->ELc-SH$ukJnBC;0L6
zZ79H&w~>rxh3d8f0Ebq`O4h38F2U+~C|@(8081QVNu;ASDCIxqtC=h7RKEfMMVm7}
z3v*X5&6qeG(FLUxm=q_=u3;KEzjV|~JF?=!mFuQs=!U2HoH@=C#8GouPLyBg_^Ae(
zt1ih<i%wH at UUhHsef*u5aoxc)0&uoCSAJSKSc*SNpM0zJ=H5hrHn+cLJaYVK`8ju4
zX|uyMEG{;p>6TTuY|n{4ZD+ at l44{Vd1s`zrLVeLwZxzq_E4im&7CTq4V at U>WZa=SU
z+o1gbT*zk3)VWw=5@*`>z96S}&XRt~uB&AL?0;=KsZ&CcOS$0EFzP-fZL)<4GbUnE
z{{C}*GP`u#;q}RRR?F4LCro-6P1CxPl1_BFj;%BgmuYmzEpHmY;SJ*?^`TB8t)X2(
zrP0>z=1lz%MlZ<EN=Qg3yveyI4<m^3ctHFJ3Z*nOw+D at AdK3F4<7p(=VQ{{|OT9ma
z1ha!7krC(}b=>lA_aG{X at +KW$+S)}&-*2=&_O7meZ444Hh2OtL|N9ov8{PA at r@ocK
zwWB0|IdU+^RMlPVC0nMcyU|wznXme;0)RCyrl6EkMIWXt3<;0?${K4WWKbwUpH6#o
zd%)*%F35VvcHo}OMMReGJ9S&qmWAoK8V?aMEE8AbNlx#{7V9H()WrE))jgZ{{$8^4
zH~@RIr}kavSc9SkF&@AjOrfga6YS-MttJf{3PTG)vqZ)-BzYc_Ufw$Eww=6ZH%h7e
z93(t?7&BHj(B=;Ga&&{Y5}Lk5dC!CHLTTX)9 at I?w!gZv-@<a^o-)0(tc6{x2TI<TF
zJ+|-e&fIojh3MW^JXenq9c^ORh-it8)f7fMV(6ekQD~qvKoE2=d?;lCQxpz|LBo|6
z91TrgLqb2#de8pm9h=+FS6EFU5&GqV9NlrH=nIRPMKO_P9!-kH8Wo1<Mpvu9L01Tv
zG&-CfYA-lwX>mzJ(i}B3ZE2b*G}1F_Y(~u;{dRy6V^Vq^jicM2^($Ws;;uzpouC4s
z3n+Ety-*+;Xa;(R2MGv~56w^zvOQ_S)3)0coOz&%>};$eO!E_A31abj!0-|9>)4$E
z+yR5ZAsUHM7D6l<gM0=NrXWq%EAdL`pn<dpG&h2sVA4ShE;jjb1~i<yMJ$68I+Ugb
zb+5~OuGMLcH2YMP#UR9_A^uK+0nhy|{olkN%sNK%{HL at T00000NkvXXu0mjfQ2usz

literal 0
HcmV?d00001

diff --git a/src/public/images/icon_smartpool.png b/src/public/images/icon_smartpool.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ed0af0d2f2da5b34d13491ebe06f64a9450b5ec
GIT binary patch
literal 641
zcmV-{0)G98P)<h;3K|Lk000e1NJLTq000gE000gM1^@s7XiptS00001b5ch_0Itp)
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<B=)fr2A^FZ9B_&;-y<D&ygAEwlUu?8
zXWrl1=*kUkH{2rM&r55dNVKW#5S_qN>OgCO?qQ8bXY*%b6TKMABl7yX+X_>W+dJjd
z*#@*RiZ;R2Aa*aK{hv_)UHA6OiHbRtXp~Y6$A425SX5T*=MN#m*9wJ=6mE2hu{<L2
z at jmNMwFkFJ)<{x!wGGEoGp)_9P`ZGv)t8kTdg_;h$1A~@vNp1=1N6KM<$wn7mdfF3
zFQ5UFj=o>i-<nYc0CrI at H=iq6OkAGbzzhWd#X3#<*edoCFI&t6sZ=xvv=Mpt{VFNj
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`

literal 0
HcmV?d00001

diff --git a/src/public/javascripts/ovirt.js b/src/public/javascripts/ovirt.js
index 28585fd..4579c80 100644
--- a/src/public/javascripts/ovirt.js
+++ b/src/public/javascripts/ovirt.js
@@ -1,6 +1,5 @@
 // ovirt-specific javascript functions are defined here
 
-
 // helper functions for dialogs and action links
 
 
@@ -41,7 +40,7 @@ function add_hosts(url)
     if (validate_selected(hosts, "host")) {
       $.post(url,
              { resource_ids: hosts.toString() },
-              function(data,status){ 
+              function(data,status){
                 $(document).trigger('close.facebox');
 	        grid = $("#hosts_grid");
                 if (grid.size()>0 && grid != null) {
@@ -142,11 +141,11 @@ function ajax_validation(response, status)
     $(".fieldWithErrors").removeClass("fieldWithErrors");
     $("div.errorExplanation").remove();
     if (!response.success && response.errors ) {
-      for(i=0; i<response.errors.length; i++) { 
+      for(i=0; i<response.errors.length; i++) {
         var element = $("div.form_field:has(#"+response.object + "_" + response.errors[i][0]+")");
         if (element) {
           element.addClass("fieldWithErrors");
-          for(j=0; j<response.errors[i][1].length; j++) { 
+          for(j=0; j<response.errors[i][1].length; j++) {
             element.append('<div class="errorExplanation">'+response.errors[i][1][j]+'</div>');
           }
         }
@@ -163,9 +162,7 @@ function afterHwPool(response, status){
     ajax_validation(response, status);
     if (response.success) {
       $(document).trigger('close.facebox');
-      // FIXME do we need to reload the tree here
-
-      // this is for reloading the host/storage grid when 
+      // this is for reloading the host/storage grid when
       // adding hosts/storage to a new HW pool
       if (response.resource_type) {
         grid = $('#' + response.resource_type + '_grid');
@@ -176,9 +173,12 @@ function afterHwPool(response, status){
         }
       }
       
+      //FIXME: point all these refs at a widget so we dont need the functions in here
+      processTree();
+
       if ((response.resource_type == 'hosts' ? get_selected_hosts() : get_selected_storage()).indexOf($('#'+response.resource_type+'_selection_id').html()) != -1){
 	  empty_summary(response.resource_type +'_selection', (response.resource_type == 'hosts' ? 'Host' : 'Storage Pool'));
-      }   
+      }
       // do we have HW pools grid?
       //$("#vmpools_grid").flexReload()
     }
@@ -193,12 +193,14 @@ function afterVmPool(response, status){
       } else {
         $tabs.tabs("load",$tabs.data('selected.tabs'));
       }
+      processTree();
     }
 }
 function afterSmartPool(response, status){
     ajax_validation(response, status);
     if (response.success) {
       $(document).trigger('close.facebox');
+      processTree();
     }
 }
 function afterStoragePool(response, status){
@@ -208,7 +210,7 @@ function afterStoragePool(response, status){
       grid = $("#storage_grid");
       if (grid.size()>0 && grid != null) {
         grid.flexReload();
-      } else {;
+      } else {
         $tabs.tabs("load",$tabs.data('selected.tabs'));
       }
     }
@@ -238,7 +240,7 @@ function afterVm(response, status){
     }
 }
 
-//selection detail refresh 
+//selection detail refresh
 function refresh_summary(element_id, url, obj_id){
   $('#'+element_id+'').load(url, { id: obj_id})
 }
@@ -289,10 +291,10 @@ function delete_pool(delete_url, id)
   $.post(delete_url,
          {id: id},
           function(data,status){
+            //no more flex reload?
+            processTree();
             if (data.alert) {
               $.jGrowl(data.alert);
             }
            }, 'json');
-}
-
-
+}
\ No newline at end of file
diff --git a/src/public/javascripts/ovirt.tree.js b/src/public/javascripts/ovirt.tree.js
new file mode 100644
index 0000000..77f0233
--- /dev/null
+++ b/src/public/javascripts/ovirt.tree.js
@@ -0,0 +1,71 @@
+function processTree (){
+  $("#nav_tree_form").ajaxSubmit({
+    url: tree_url,
+    type: "POST",
+    dataType: "json",
+    success: function(response){
+      // First, remove any deleted items from the tree
+      $.each(response.deleted, function(name, value){
+          //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:last')
+              .children('div')
+              .click();
+            }
+            $('#' + value.id).parent().remove();
+          }
+      });
+
+      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);
+      }
+    }
+  });
+}
+
+function processChildren(list, templateObj){
+/*  TODO: In future, we may need an additional state here of 'moved' which deletes
+ *  the item where it was in the tree and adds it to its new parent.
+*/
+  $.each(list, function(n,data){
+    var updatedNode;
+    if(data.state === 'changed'){
+      $('input[value^=' + data.id + '-]').attr('value', data.id + '-' + data.name);
+      $('#' + data.id).html(data.name);
+    } else if(data.state === 'new') {
+        /* If the elem with id matching the parent id has a sibling that is a ul,
+         * we should append the result of processing the template to the existing
+         * sublist.  Otherwise, we need to add a new sublist and add it there.
+        */
+       var result  = templateObj.process(data);
+       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
+           $('#smart_nav_tree > li:last:not(:has(ul))').append(result);
+         } else {
+           $('#' + data.parent_id).parent().append('<ul>' + result + '</ul>');
+           $('#' + data.parent_id).siblings('span').addClass('expanded');
+         }
+       }
+      }
+    else {
+      if (data.children) {
+          processChildren(data.children, templateObj);
+      }
+    }
+  });
+}
\ 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
new file mode 100644
index 0000000..43e7dbc
--- /dev/null
+++ b/src/public/javascripts/smart_nav_test_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/trimpath-template-1.0.38.js b/src/public/javascripts/trimpath-template-1.0.38.js
new file mode 100644
index 0000000..fd0898d
--- /dev/null
+++ b/src/public/javascripts/trimpath-template-1.0.38.js
@@ -0,0 +1,397 @@
+/**
+ * TrimPath Template. Release 1.0.38.
+ * Copyright (C) 2004, 2005 Metaha.
+ *
+ * TrimPath Template is licensed under the GNU General Public License
+ * and the Apache License, Version 2.0, as follows:
+ *
+ * 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; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+var TrimPath;
+
+// TODO: Debugging mode vs stop-on-error mode - runtime flag.
+// TODO: Handle || (or) characters and backslashes.
+// TODO: Add more modifiers.
+
+(function() {               // Using a closure to keep global namespace clean.
+    if (TrimPath == null)
+        TrimPath = new Object();
+    if (TrimPath.evalEx == null)
+        TrimPath.evalEx = function(src) { return eval(src); };
+
+    var UNDEFINED;
+    if (Array.prototype.pop == null)  // IE 5.x fix from Igor Poteryaev.
+        Array.prototype.pop = function() {
+            if (this.length === 0) {return UNDEFINED;}
+            return this[--this.length];
+        };
+    if (Array.prototype.push == null) // IE 5.x fix from Igor Poteryaev.
+        Array.prototype.push = function() {
+            for (var i = 0; i < arguments.length; ++i) {this[this.length] = arguments[i];}
+            return this.length;
+        };
+
+    TrimPath.parseTemplate = function(tmplContent, optTmplName, optEtc) {
+        if (optEtc == null)
+            optEtc = TrimPath.parseTemplate_etc;
+        var funcSrc = parse(tmplContent, optTmplName, optEtc);
+        var func = TrimPath.evalEx(funcSrc, optTmplName, 1);
+        if (func != null)
+            return new optEtc.Template(optTmplName, tmplContent, funcSrc, func, optEtc);
+        return null;
+    }
+
+    try {
+        String.prototype.process = function(context, optFlags) {
+            var template = TrimPath.parseTemplate(this, null);
+            if (template != null)
+                return template.process(context, optFlags);
+            return this;
+        }
+    } catch (e) { // Swallow exception, such as when String.prototype is sealed.
+    }
+
+    TrimPath.parseTemplate_etc = {};            // Exposed for extensibility.
+    TrimPath.parseTemplate_etc.statementTag = "forelse|for|if|elseif|else|var|macro";
+    TrimPath.parseTemplate_etc.statementDef = { // Lookup table for statement tags.
+        "if"     : { delta:  1, prefix: "if (", suffix: ") {", paramMin: 1 },
+        "else"   : { delta:  0, prefix: "} else {" },
+        "elseif" : { delta:  0, prefix: "} else if (", suffix: ") {", paramDefault: "true" },
+        "/if"    : { delta: -1, prefix: "}" },
+        "for"    : { delta:  1, paramMin: 3,
+            prefixFunc : function(stmtParts, state, tmplName, etc) {
+                if (stmtParts[2] != "in")
+                    throw new etc.ParseError(tmplName, state.line, "bad for loop statement: " + stmtParts.join(' '));
+                var iterVar = stmtParts[1];
+                var listVar = "__LIST__" + iterVar;
+                return [ "var ", listVar, " = ", stmtParts[3], ";",
+                    // Fix from Ross Shaull for hash looping, make sure that we have an array of loop lengths to treat like a stack.
+                    "var __LENGTH_STACK__;",
+                    "if (typeof(__LENGTH_STACK__) == 'undefined' || !__LENGTH_STACK__.length) __LENGTH_STACK__ = new Array();",
+                    "__LENGTH_STACK__[__LENGTH_STACK__.length] = 0;", // Push a new for-loop onto the stack of loop lengths.
+                    "if ((", listVar, ") != null) { ",
+                    "var ", iterVar, "_ct = 0;",       // iterVar_ct variable, added by B. Bittman
+                    "for (var ", iterVar, "_index in ", listVar, ") { ",
+                    iterVar, "_ct++;",
+                    "if (typeof(", listVar, "[", iterVar, "_index]) == 'function') {continue;}", // IE 5.x fix from Igor Poteryaev.
+                    "__LENGTH_STACK__[__LENGTH_STACK__.length - 1]++;",
+                    "var ", iterVar, " = ", listVar, "[", iterVar, "_index];" ].join("");
+            } },
+        "forelse" : { delta:  0, prefix: "} } if (__LENGTH_STACK__[__LENGTH_STACK__.length - 1] == 0) { if (", suffix: ") {", paramDefault: "true" },
+        "/for"    : { delta: -1, prefix: "} }; delete __LENGTH_STACK__[__LENGTH_STACK__.length - 1];" }, // Remove the just-finished for-loop from the stack of loop lengths.
+        "var"     : { delta:  0, prefix: "var ", suffix: ";" },
+        "macro"   : { delta:  1,
+            prefixFunc : function(stmtParts, state, tmplName, etc) {
+                var macroName = stmtParts[1].split('(')[0];
+                return [ "var ", macroName, " = function",
+                    stmtParts.slice(1).join(' ').substring(macroName.length),
+                    "{ var _OUT_arr = []; var _OUT = { write: function(m) { if (m) _OUT_arr.push(m); } }; " ].join('');
+            } },
+        "/macro"  : { delta: -1, prefix: " return _OUT_arr.join(''); };" }
+    }
+    TrimPath.parseTemplate_etc.modifierDef = {
+        "eat"        : function(v)    { return ""; },
+        "escape"     : function(s)    { return String(s).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;"); },
+        "capitalize" : function(s)    { return String(s).toUpperCase(); },
+        "default"    : function(s, d) { return s != null ? s : d; }
+    }
+    TrimPath.parseTemplate_etc.modifierDef.h = TrimPath.parseTemplate_etc.modifierDef.escape;
+
+    TrimPath.parseTemplate_etc.Template = function(tmplName, tmplContent, funcSrc, func, etc) {
+        this.process = function(context, flags) {
+            if (context == null)
+                context = {};
+            if (context._MODIFIERS == null)
+                context._MODIFIERS = {};
+            if (context.defined == null)
+                context.defined = function(str) { return (context[str] != undefined); };
+            for (var k in etc.modifierDef) {
+                if (context._MODIFIERS[k] == null)
+                    context._MODIFIERS[k] = etc.modifierDef[k];
+            }
+            if (flags == null)
+                flags = {};
+            var resultArr = [];
+            var resultOut = { write: function(m) { resultArr.push(m); } };
+            try {
+                func(resultOut, context, flags);
+            } catch (e) {
+                if (flags.throwExceptions == true)
+                    throw e;
+                var result = new String(resultArr.join("") + "[ERROR: " + e.toString() + (e.message ? '; ' + e.message : '') + "]");
+                result["exception"] = e;
+                return result;
+            }
+            return resultArr.join("");
+        }
+        this.name       = tmplName;
+        this.source     = tmplContent;
+        this.sourceFunc = funcSrc;
+        this.toString   = function() { return "TrimPath.Template [" + tmplName + "]"; }
+    }
+    TrimPath.parseTemplate_etc.ParseError = function(name, line, message) {
+        this.name    = name;
+        this.line    = line;
+        this.message = message;
+    }
+    TrimPath.parseTemplate_etc.ParseError.prototype.toString = function() {
+        return ("TrimPath template ParseError in " + this.name + ": line " + this.line + ", " + this.message);
+    }
+
+    var parse = function(body, tmplName, etc) {
+        body = cleanWhiteSpace(body);
+        var funcText = [ "var TrimPath_Template_TEMP = function(_OUT, _CONTEXT, _FLAGS) { with (_CONTEXT) {" ];
+        var state    = { stack: [], line: 1 };                              // TODO: Fix line number counting.
+        var endStmtPrev = -1;
+        while (endStmtPrev + 1 < body.length) {
+            var begStmt = endStmtPrev;
+            // Scan until we find some statement markup.
+            begStmt = body.indexOf("{", begStmt + 1);
+            while (begStmt >= 0) {
+                var endStmt = body.indexOf('}', begStmt + 1);
+                var stmt = body.substring(begStmt, endStmt);
+                var blockrx = stmt.match(/^\{(cdata|minify|eval)/); // From B. Bittman, minify/eval/cdata implementation.
+                if (blockrx) {
+                    var blockType = blockrx[1];
+                    var blockMarkerBeg = begStmt + blockType.length + 1;
+                    var blockMarkerEnd = body.indexOf('}', blockMarkerBeg);
+                    if (blockMarkerEnd >= 0) {
+                        var blockMarker;
+                        if( blockMarkerEnd - blockMarkerBeg <= 0 ) {
+                            blockMarker = "{/" + blockType + "}";
+                        } else {
+                            blockMarker = body.substring(blockMarkerBeg + 1, blockMarkerEnd);
+                        }
+
+                        var blockEnd = body.indexOf(blockMarker, blockMarkerEnd + 1);
+                        if (blockEnd >= 0) {
+                            emitSectionText(body.substring(endStmtPrev + 1, begStmt), funcText);
+
+                            var blockText = body.substring(blockMarkerEnd + 1, blockEnd);
+                            if (blockType == 'cdata') {
+                                emitText(blockText, funcText);
+                            } else if (blockType == 'minify') {
+                                emitText(scrubWhiteSpace(blockText), funcText);
+                            } else if (blockType == 'eval') {
+                                if (blockText != null && blockText.length > 0) // From B. Bittman, eval should not execute until process().
+                                    funcText.push('_OUT.write( (function() { ' + blockText + ' })() );');
+                            }
+                            begStmt = endStmtPrev = blockEnd + blockMarker.length - 1;
+                        }
+                    }
+                } else if (body.charAt(begStmt - 1) != '$' &&               // Not an expression or backslashed,
+                body.charAt(begStmt - 1) != '\\') {              // so check if it is a statement tag.
+                    var offset = (body.charAt(begStmt + 1) == '/' ? 2 : 1); // Close tags offset of 2 skips '/'.
+                    // 10 is larger than maximum statement tag length.
+                    if (body.substring(begStmt + offset, begStmt + 10 + offset).search(TrimPath.parseTemplate_etc.statementTag) == 0)
+                        break;                                              // Found a match.
+                }
+                begStmt = body.indexOf("{", begStmt + 1);
+            }
+            if (begStmt < 0)                              // In "a{for}c", begStmt will be 1.
+                break;
+            var endStmt = body.indexOf("}", begStmt + 1); // In "a{for}c", endStmt will be 5.
+            if (endStmt < 0)
+                break;
+            emitSectionText(body.substring(endStmtPrev + 1, begStmt), funcText);
+            emitStatement(body.substring(begStmt, endStmt + 1), state, funcText, tmplName, etc);
+            endStmtPrev = endStmt;
+        }
+        emitSectionText(body.substring(endStmtPrev + 1), funcText);
+        if (state.stack.length != 0)
+            throw new etc.ParseError(tmplName, state.line, "unclosed, unmatched statement(s): " + state.stack.join(","));
+        funcText.push("}}; TrimPath_Template_TEMP");
+        return funcText.join("");
+    }
+
+    var emitStatement = function(stmtStr, state, funcText, tmplName, etc) {
+        var parts = stmtStr.slice(1, -1).split(' ');
+        var stmt = etc.statementDef[parts[0]]; // Here, parts[0] == for/if/else/...
+        if (stmt == null) {                    // Not a real statement.
+            emitSectionText(stmtStr, funcText);
+            return;
+        }
+        if (stmt.delta < 0) {
+            if (state.stack.length <= 0)
+                throw new etc.ParseError(tmplName, state.line, "close tag does not match any previous statement: " + stmtStr);
+            state.stack.pop();
+        }
+        if (stmt.delta > 0)
+            state.stack.push(stmtStr);
+
+        if (stmt.paramMin != null &&
+            stmt.paramMin >= parts.length)
+            throw new etc.ParseError(tmplName, state.line, "statement needs more parameters: " + stmtStr);
+        if (stmt.prefixFunc != null)
+            funcText.push(stmt.prefixFunc(parts, state, tmplName, etc));
+        else
+            funcText.push(stmt.prefix);
+        if (stmt.suffix != null) {
+            if (parts.length <= 1) {
+                if (stmt.paramDefault != null)
+                    funcText.push(stmt.paramDefault);
+            } else {
+                for (var i = 1; i < parts.length; i++) {
+                    if (i > 1)
+                        funcText.push(' ');
+                    funcText.push(parts[i]);
+                }
+            }
+            funcText.push(stmt.suffix);
+        }
+    }
+
+    var emitSectionText = function(text, funcText) {
+        if (text.length <= 0)
+            return;
+        var nlPrefix = 0;               // Index to first non-newline in prefix.
+        var nlSuffix = text.length - 1; // Index to first non-space/tab in suffix.
+        while (nlPrefix < text.length && (text.charAt(nlPrefix) == '\n'))
+            nlPrefix++;
+        while (nlSuffix >= 0 && (text.charAt(nlSuffix) == ' ' || text.charAt(nlSuffix) == '\t'))
+            nlSuffix--;
+        if (nlSuffix < nlPrefix)
+            nlSuffix = nlPrefix;
+        if (nlPrefix > 0) {
+            funcText.push('if (_FLAGS.keepWhitespace == true) _OUT.write("');
+            var s = text.substring(0, nlPrefix).replace('\n', '\\n'); // A macro IE fix from BJessen.
+            if (s.charAt(s.length - 1) == '\n')
+              s = s.substring(0, s.length - 1);
+            funcText.push(s);
+            funcText.push('");');
+        }
+        var lines = text.substring(nlPrefix, nlSuffix + 1).split('\n');
+        for (var i = 0; i < lines.length; i++) {
+            emitSectionTextLine(lines[i], funcText);
+            if (i < lines.length - 1)
+                funcText.push('_OUT.write("\\n");\n');
+        }
+        if (nlSuffix + 1 < text.length) {
+            funcText.push('if (_FLAGS.keepWhitespace == true) _OUT.write("');
+            var s = text.substring(nlSuffix + 1).replace('\n', '\\n');
+            if (s.charAt(s.length - 1) == '\n')
+              s = s.substring(0, s.length - 1);
+            funcText.push(s);
+            funcText.push('");');
+        }
+    }
+
+    var emitSectionTextLine = function(line, funcText) {
+        var endMarkPrev = '}';
+        var endExprPrev = -1;
+        while (endExprPrev + endMarkPrev.length < line.length) {
+            var begMark = "${", endMark = "}";
+            var begExpr = line.indexOf(begMark, endExprPrev + endMarkPrev.length); // In "a${b}c", begExpr == 1
+            if (begExpr < 0)
+                break;
+            if (line.charAt(begExpr + 2) == '%') {
+                begMark = "${%";
+                endMark = "%}";
+            }
+            var endExpr = line.indexOf(endMark, begExpr + begMark.length);         // In "a${b}c", endExpr == 4;
+            if (endExpr < 0)
+                break;
+            emitText(line.substring(endExprPrev + endMarkPrev.length, begExpr), funcText);
+            // Example: exprs == 'firstName|default:"John Doe"|capitalize'.split('|')
+            var exprArr = line.substring(begExpr + begMark.length, endExpr).replace(/\|\|/g, "#@@#").split('|');
+            for (var k in exprArr) {
+                if (exprArr[k].replace) // IE 5.x fix from Igor Poteryaev.
+                    exprArr[k] = exprArr[k].replace(/#@@#/g, '||');
+            }
+            funcText.push('_OUT.write(');
+            emitExpression(exprArr, exprArr.length - 1, funcText);
+            funcText.push(');');
+            endExprPrev = endExpr;
+            endMarkPrev = endMark;
+        }
+        emitText(line.substring(endExprPrev + endMarkPrev.length), funcText);
+    }
+
+    var emitText = function(text, funcText) {
+        if (text == null ||
+            text.length <= 0)
+            return;
+        text = text.replace(/\\/g, '\\\\');
+        text = text.replace(/\n/g, '\\n');
+        text = text.replace(/"/g,  '\\"');
+        funcText.push('_OUT.write("');
+        funcText.push(text);
+        funcText.push('");');
+    }
+
+    var emitExpression = function(exprArr, index, funcText) {
+        // Ex: foo|a:x|b:y1,y2|c:z1,z2 is emitted as c(b(a(foo,x),y1,y2),z1,z2)
+        var expr = exprArr[index]; // Ex: exprArr == [firstName,capitalize,default:"John Doe"]
+        if (index <= 0) {          // Ex: expr    == 'default:"John Doe"'
+            funcText.push(expr);
+            return;
+        }
+        var parts = expr.split(':');
+        funcText.push('_MODIFIERS["');
+        funcText.push(parts[0]); // The parts[0] is a modifier function name, like capitalize.
+        funcText.push('"](');
+        emitExpression(exprArr, index - 1, funcText);
+        if (parts.length > 1) {
+            funcText.push(',');
+            funcText.push(parts[1]);
+        }
+        funcText.push(')');
+    }
+
+    var cleanWhiteSpace = function(result) {
+        result = result.replace(/\t/g,   "    ");
+        result = result.replace(/\r\n/g, "\n");
+        result = result.replace(/\r/g,   "\n");
+        result = result.replace(/^(\s*\S*(\s+\S+)*)\s*$/, '$1'); // Right trim by Igor Poteryaev.
+        return result;
+    }
+
+    var scrubWhiteSpace = function(result) {
+        result = result.replace(/^\s+/g,   "");
+        result = result.replace(/\s+$/g,   "");
+        result = result.replace(/\s+/g,   " ");
+        result = result.replace(/^(\s*\S*(\s+\S+)*)\s*$/, '$1'); // Right trim by Igor Poteryaev.
+        return result;
+    }
+
+    // The DOM helper functions depend on DOM/DHTML, so they only work in a browser.
+    // However, these are not considered core to the engine.
+    //
+    TrimPath.parseDOMTemplate = function(elementId, optDocument, optEtc) {
+        if (optDocument == null)
+            optDocument = document;
+        var element = optDocument.getElementById(elementId);
+        var content = element.value;     // Like textarea.value.
+        if (content == null)
+            content = element.innerHTML; // Like textarea.innerHTML.
+        content = content.replace(/&lt;/g, "<").replace(/&gt;/g, ">");
+        return TrimPath.parseTemplate(content, elementId, optEtc);
+    }
+
+    TrimPath.processDOMTemplate = function(elementId, context, optFlags, optDocument, optEtc) {
+        return TrimPath.parseDOMTemplate(elementId, optDocument, optEtc).process(context, optFlags);
+    }
+}) ();
diff --git a/src/public/stylesheets/ovirt-tree/tree.css b/src/public/stylesheets/ovirt-tree/tree.css
new file mode 100644
index 0000000..bd89cb2
--- /dev/null
+++ b/src/public/stylesheets/ovirt-tree/tree.css
@@ -0,0 +1,83 @@
+#nav_tree {
+   padding: 20px;
+}
+
+.nav-tree {
+    width: 222px;
+    position: absolute;
+    overflow: auto;
+    top: 25px;
+    bottom: 140px;
+}
+
+.ovirt-tree, .ovirt-tree ul {
+    list-style: none;
+    margin:0;
+    padding:5px 0 5px 16px;
+    margin-right: 8px;
+}
+
+.ovirt-tree div {
+    background-repeat: no-repeat;
+    background-position: left;
+    padding: 4px 0 4px 28px;
+    cursor: pointer;
+}
+
+.HardwarePool {
+    background-image: url('/images/icon_hdwarepool.png');
+}
+
+.VmResourcePool {
+    background-image: url('/images/icon_vmpool.png');
+}
+
+.SmartPool {
+    background-image: url('/images/icon_smartpool.png');
+}
+
+.hitarea {
+	width: 16px;
+	margin-left: -16px;
+	float: left;
+	cursor: pointer;
+}
+
+.expandable {
+    background: url('/images/plus.gif') no-repeat left;
+}
+
+.expanded {
+    background: url('/images/minus.gif') no-repeat left;
+}
+
+ul.ovirt-tree .current {
+    background-color: #698FA6;
+    color:#000000;
+    width: 100%;
+}
+
+.nav-smart-pool {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    height: 130px;
+    background: #CCCCCC;
+    width: 218px;
+    padding: 5px 5px 5px 5px;
+    overflow: auto;
+}
+
+.nav-smart-pool-header {
+    color: #666666;
+}
+
+.nav-dashboard {
+    background-image: url('/images/icon_dashboard.gif');
+    background-repeat: no-repeat;
+    background-position: left;
+    padding: 0px 0 0px 28px;
+    position: absolute;
+    height: 25px;
+    top: 0;
+}
\ No newline at end of file
-- 
1.5.5.2



From dpierce at redhat.com  Fri Oct  3 20:46:38 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Fri,  3 Oct 2008 16:46:38 -0400
Subject: [Ovirt-devel] [PATCH server] Added support for booting a VM from an
	ISO image.
Message-ID: <1223066798-11393-1-git-send-email-dpierce@redhat.com>

*** NOTE ***
This is a work in progress. I'm at the point now where the NFS image is properly
being mounted and the ISO being booted. But, for whatever reason, the VM is 
refusing to actually boot the CDROM. I'm sure it's something simple but I 
haven't figured out how to get past it.

As it stands now, I can boot from an ISO on a cobbler server if I manually 
intervene and tell the VM to boot the CDROM.

A pointer would be nice if someone can apply the patch and see what's going on.
*** NOTE ***

Also added a few helper methods to Vm to contain the knowledge
of how Cobbler integration is contained.

When a user adds an ISO image to the Cobbler server on the appliance,
they will need to do so using the full NFS path for where the virtual
image will go to mount it; i.e., hostname:/path/to/filename.iso

If the filename ends in ".iso" then the virtual machine will mount the
file as a CDROM device and boot it. Otherwise, it mounts it as a hard
disk device.

To add an image to Cobbler, do the following:

1. Download an ISO image, such as the KDE LiveImage from Fedora.
2. Copy it to the NFS directory on the server:
  cp *.iso /ovirtnfs/kde-live-cd.iso
3. Add that image to your Cobbler instance:
  cobbler image add --name=KDE-LiveCD --file=management.priv.ovirt.org:/ovirtnfs/kde-live-cd.iso
4. Create a new VM in your server.
5. Select "KDE-LiveCD" from the list of operating systems.
6. Save the VM.
7. Start the VM.

It should run the selected ISO.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 src/app/controllers/vm_controller.rb |   13 ++++--
 src/app/models/vm.rb                 |   31 ++++++++++++-
 src/task-omatic/task_vm.rb           |   85 ++++++++++++++++++++++++++++-----
 src/test/unit/vm_test.rb             |   56 +++++++++++++++++++++-
 4 files changed, 163 insertions(+), 22 deletions(-)

diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb
index f5c0845..8b16c94 100644
--- a/src/app/controllers/vm_controller.rb
+++ b/src/app/controllers/vm_controller.rb
@@ -223,13 +223,18 @@ class VmController < ApplicationController
   def _setup_provisioning_options
     @provisioning_options = [[Vm::PXE_OPTION_LABEL, Vm::PXE_OPTION_VALUE],
                              [Vm::HD_OPTION_LABEL, Vm::HD_OPTION_VALUE]]
-    # FIXME add cobbler images too
+
     begin
+      @provisioning_options += Cobbler::Image.find.collect do |image|
+        [image.name + Vm::COBBLER_IMAGE_SUFFIX,
+          "#{Vm::IMAGE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{image.name}"]
+      end
+
       @provisioning_options += Cobbler::Profile.find.collect do |profile|
         [profile.name + Vm::COBBLER_PROFILE_SUFFIX,
-         Vm::COBBLER_PREFIX + Vm::PROVISIONING_DELIMITER +
-         Vm::PROFILE_PREFIX + Vm::PROVISIONING_DELIMITER + profile.name]
-      end
+          "#{Vm::PROFILE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{profile.name}"]
+
+    end
     rescue
       #if cobbler doesn't respond/is misconfigured/etc just don't add profiles
     end
diff --git a/src/app/models/vm.rb b/src/app/models/vm.rb
index ace6fb1..963da84 100644
--- a/src/app/models/vm.rb
+++ b/src/app/models/vm.rb
@@ -49,7 +49,7 @@ class Vm < ActiveRecord::Base
   PROFILE_PREFIX         = "profile"
   IMAGE_PREFIX           = "image"
   COBBLER_PROFILE_SUFFIX = " (Cobbler Profile)"
-  COBBLER_IMAGE_SUFFIX   = " (Cobbler Profile)"
+  COBBLER_IMAGE_SUFFIX   = " (Cobbler Image)"
 
   PXE_OPTION_LABEL       = "PXE Boot"
   PXE_OPTION_VALUE       = "pxe"
@@ -139,7 +139,12 @@ class Vm < ActiveRecord::Base
   end
 
   def provisioning_and_boot_settings=(settings)
-    if settings==PXE_OPTION_VALUE
+    # if the settings have a prefix that matches cobber settings, then process
+    # those details
+    if settings =~ /\@#{COBBLER_PREFIX}/
+      self[:boot_device] = BOOT_DEV_NETWORK
+      self[:provisioning] = settings
+    elsif settings==PXE_OPTION_VALUE
       self[:boot_device]= BOOT_DEV_NETWORK
       self[:provisioning]= nil
     elsif settings==HD_OPTION_VALUE
@@ -242,6 +247,28 @@ class Vm < ActiveRecord::Base
     vm_resource_pool.search_users
   end
 
+  # Reports whether the VM is uses Cobbler for booting.
+  #
+  def uses_cobbler?
+    (self.provisioning != nil) && (self.provisioning.include? COBBLER_PREFIX)
+  end
+
+  # Returns the cobbler type.
+  #
+  def cobbler_type
+    if self.uses_cobbler?
+      self.provisioning[/^(.*)@/,1]
+    end
+  end
+
+  # Returns the cobbler provisioning name.
+  #
+  def cobbler_name
+    if self.uses_cobbler?
+      self.provisioning[/^.*@.*:(.*)/,1]
+    end
+  end
+
   protected
   def validate
     resources = vm_resource_pool.max_resources_for_vm(self)
diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb
index 3588224..0c1be3a 100644
--- a/src/task-omatic/task_vm.rb
+++ b/src/task-omatic/task_vm.rb
@@ -65,16 +65,26 @@ def create_vm_xml(name, uuid, memAllocated, memUsed, vcpus, bootDevice,
   doc.root.elements["devices"].add_element("emulator")
   doc.root.elements["devices"].elements["emulator"].text = "/usr/bin/qemu-kvm"
 
-  devs = [ 'hda', 'hdb', 'hdc', 'hdd' ]
-  i = 0
+  devs = [ 'hda', 'hdb', 'hdd', 'hde', 'hdf' ]
+  which_device = 0
   diskDevices.each do |disk|
+    is_cdrom = (disk =~ /\.iso/) ? true : false
+    
     diskdev = Element.new("disk")
-    diskdev.add_attribute("type", "block")
-    diskdev.add_attribute("device", "disk")
-    diskdev.add_element("source", {"dev" => disk})
-    diskdev.add_element("target", {"dev" => devs[i]})
+    diskdev.add_attribute("type", is_cdrom ? "file" : "block")
+    diskdev.add_attribute("device", is_cdrom ? "cdrom" : "disk")
+
+    if is_cdrom
+      diskdev.add_element("readonly")
+      diskdev.add_element("source", {"file" => disk})
+      diskdev.add_element("target", {"dev" => "hdc", "bus" => "ide"})
+    else
+      diskdev.add_element("source", {"dev" => disk})
+      diskdev.add_element("target", {"dev" => devs[which_device]})
+    end
+
     doc.root.elements["devices"] << diskdev
-    i += 1
+    which_device += 1 unless is_cdrom
   end
 
   doc.root.elements["devices"].add_element("interface", {"type" => "bridge"})
@@ -154,15 +164,12 @@ def create_vm(task)
   # create cobbler system profile
   begin
     if vm.provisioning and !vm.provisioning.empty?
-      provisioning_arr = vm.provisioning.split(Vm::PROVISIONING_DELIMITER)
-      if provisioning_arr[0]==Vm::COBBLER_PREFIX
-        if provisioning_arr[1]==Vm::PROFILE_PREFIX
+      if vm.uses_cobbler?
+        if vm.cobbler_type == Vm::PROFILE_PREFIX:
           system = Cobbler::System.new('name' => vm.uuid,
                                        'profile' => provisioning_arr[2])
           system.interfaces=[Cobbler::NetworkInterface.new({'mac_address' => vm.vnic_mac_addr})]
           system.save
-        elsif provisioning_arr[1]==Vm::IMAGE_PREFIX
-          #FIXME handle cobbler images
         end
       end
     end
@@ -231,6 +238,22 @@ def shutdown_vm(task)
   setVmShutdown(vm)
 end
 
+# Find thes storage pool with the given ip address and export path.
+#
+def find_storage_pool(ip_addr, export_path)
+  result = StoragePool.find(:first, 
+    :conditions => 
+      ['ip_addr = ? and export_path = ?',ip_addr, export_path])
+
+  if result
+    puts "Found #{ip_addr}:#{export_path}"
+  else
+    puts "FUCK!"
+  end
+  
+  return result
+end
+
 def start_vm(task)
   puts "start_vm"
 
@@ -268,8 +291,44 @@ def start_vm(task)
 
     conn = Libvirt::open("qemu+tcp://" + host.hostname + "/system")
 
-    storagedevs = connect_storage_pools(conn, vm)
+    # if the VM is an image, then prepare things
+    if vm.uses_cobbler? && (vm.cobbler_type == Vm::IMAGE_PREFIX)
+      details = Cobbler::Image.find_one(vm.cobbler_name)
+      raise Exception.new("Image #{vm.cobbler_name} not found in Cobbler server") unless details
+
+      ignored, ip_addr, export_path, filename =
+        details.file.split(/(.*):(.*)\/(.*)/)
 
+      found = false
+
+      vm.storage_volumes.each do |volume|
+        if volume.filename == filename
+          if (volume.storage_pool.ip_addr == ip_addr) &&
+          (volume.storage_pool.export_path == export_path)
+            found = true
+          end
+        end
+      end
+
+      unless found
+        puts "Creating a new NFS storage volume"
+        image_volume = StorageVolume.factory("NFS",
+          :filename => filename
+        )
+        
+        image_volume.storage_pool  
+        image_pool = find_storage_pool(ip_addr, export_path)
+        if image_pool
+          image_pool.storage_volumes << image_volume
+          image_pool.save!
+        end
+        vm.storage_volumes << image_volume
+        vm.save!
+      end
+    end
+
+    storagedevs = connect_storage_pools(conn, vm)
+    
     # FIXME: get rid of the hardcoded bridge
     xml = create_vm_xml(vm.description, vm.uuid, vm.memory_allocated,
                         vm.memory_used, vm.num_vcpus_allocated, vm.boot_device,
diff --git a/src/test/unit/vm_test.rb b/src/test/unit/vm_test.rb
index 4a5e353..0186c5f 100644
--- a/src/test/unit/vm_test.rb
+++ b/src/test/unit/vm_test.rb
@@ -22,8 +22,58 @@ require File.dirname(__FILE__) + '/../test_helper'
 class VmTest < Test::Unit::TestCase
   fixtures :vms
 
-  # Replace this with your real tests.
-  def test_truth
-    assert true
+  def setup
+    @vm_name = "Test"
+    @no_cobbler_provisioning = "#{@vm_name}"
+    @cobbler_image_provisioning =
+      "#{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}"
+  end
+
+  # Ensures that, if the VM does not contain the Cobbler prefix, that it
+  # does not claim to be a Cobbler VM.
+  #
+  def test_uses_cobbler_without_cobbler_prefix
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings=@no_cobbler_provisioning
+
+    flunk "VM is not a Cobbler provisioned one." if vm.uses_cobbler?
+    assert_equal @vm_name, vm.provisioning, "Wrong name reported."
+  end
+  
+  # Ensures that the VM reports that it uses Cobbler if the provisioning
+  # is for a Cobbler profile.
+  #
+  def test_uses_cobbler_with_cobbler_profile
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings = @cobbler_profile_provisioning
+
+    flunk "VM did not report that it's Cobbler provisioned." unless vm.uses_cobbler?
+    assert_equal Vm::PROFILE_PREFIX,
+      vm.cobbler_type,
+      "Wrong cobbler type reported."
+    assert_equal @vm_name,
+      vm.cobbler_name,
+      "Wrong name reported."
+  end
+
+  # Ensures that the VM reports that it uses Cobbler if the provisioning
+  # is for a Cobbler image.
+  #
+  def test_uses_cobbler_with_cobbler_image
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings = @cobbler_image_provisioning
+
+    flunk "VM did not report that it's Cobbler provisioned." unless vm.uses_cobbler?
+    assert_equal Vm::IMAGE_PREFIX,
+      vm.cobbler_type,
+      "Wrong cobbler type reported."
+    assert_equal @vm_name,
+      vm.cobbler_name,
+      "Wrong name reported."
   end
 end
-- 
1.5.5.1



From jim at meyering.net  Sat Oct  4 08:40:02 2008
From: jim at meyering.net (Jim Meyering)
Date: Sat, 04 Oct 2008 10:40:02 +0200
Subject: [Ovirt-devel] PATCH: make "warn" function more robust
Message-ID: <87tzbsda8t.fsf@rho.meyering.net>

I noticed that the warn shell function (and hence die, too) would
misbehave when operating on something containing a % (or, far less
likely, a \c sequence that printf recognizes).

These fix the four definitions I found,
3 in node-image/, 1 in appliance/.

>From fc3baab76f26db9e1565a065f8fc42820d483465 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Sat, 4 Oct 2008 10:34:30 +0200
Subject: [PATCH node-image] warn: robustify

---
 ovirt-flash        |    2 +-
 ovirt-flash-static |    2 +-
 ovirt-pxe          |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ovirt-flash b/ovirt-flash
index bb5b9be..0b9c793 100755
--- a/ovirt-flash
+++ b/ovirt-flash
@@ -18,7 +18,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

 ME=$(basename "$0")
-warn() { printf "$ME: $@\n" >&2; }
+warn() { printf '%s: %s\n' "$ME" "$*" >&2; }
 die() { warn "$@"; exit 1; }

 test $# != 2 && die "Usage: $ME <usbdevice> <iso-image>"
diff --git a/ovirt-flash-static b/ovirt-flash-static
index be9c7c9..4c2bb22 100755
--- a/ovirt-flash-static
+++ b/ovirt-flash-static
@@ -18,7 +18,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

 ME=$(basename "$0")
-warn() { printf "$ME: $@\n" >&2; }
+warn() { printf '%s: %s\n' "$ME" "$*" >&2; }
 die() { warn "$@"; exit 1; }

 test $# != 2 && die "Usage: $ME <usbdevice> <iso-image>"
diff --git a/ovirt-pxe b/ovirt-pxe
index facca5b..5223990 100755
--- a/ovirt-pxe
+++ b/ovirt-pxe
@@ -18,7 +18,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

 ME=$(basename "$0")
-warn() { printf "$ME: $@\n" >&2; }
+warn() { printf '%s: %s\n' "$ME" "$*" >&2; }
 die() { warn "$@"; exit 1; }

 test $# != 1 && die "Usage: $ME <iso-image>"
--
1.6.0.2.307.gc427


>From 209369f1430f763510d716238bba2d6a09458dd6 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Sat, 4 Oct 2008 10:34:17 +0200
Subject: [PATCH appliance] warn: robustify

---
 create-ovirt-appliance |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/create-ovirt-appliance b/create-ovirt-appliance
index 2689a49..88d0188 100755
--- a/create-ovirt-appliance
+++ b/create-ovirt-appliance
@@ -2,8 +2,8 @@

 PATH=$PATH:/sbin:/usr/sbin

-ME=$(basename "$0") 
-warn() { printf "$ME: $@\n" >&2; }
+ME=$(basename "$0")
+warn() { printf '%s: %s\n' "$ME" "$*" >&2; }
 try_h() { printf "Try \`$ME -h' for more information.\n" >&2; }
 die() { warn "$@"; try_h; exit 1; }

--
1.6.0.2.307.gc427



From jim at meyering.net  Sat Oct  4 08:46:52 2008
From: jim at meyering.net (Jim Meyering)
Date: Sat, 04 Oct 2008 10:46:52 +0200
Subject: [Ovirt-devel] [PATCH] Add trivial error() function and change
	code	to use it
In-Reply-To: <48E61F83.7040605@redhat.com> (Perry N. Myers's message of "Fri, 
	03 Oct 2008 09:34:59 -0400")
References: <jeffschroeder@computer.org>
	<1223012131-10557-1-git-send-email-jeffschroeder@computer.org>
	<48E61F83.7040605@redhat.com>
Message-ID: <87r66wd9xf.fsf@rho.meyering.net>

"Perry N. Myers" <pmyers at redhat.com> wrote:
> Jeff Schroeder wrote:
>> Remove the multiple echo ... && exit 1 references and replace
>> them with a simple function. This makes the code a bit cleaner.
>
> No problem with this patch in concept, but this patch appears to be
> against the old repository.  See the instructions on:
> http://ovirt.org/build-instructions.html
>
> for getting access to the new repositories.
>
> The file you're patching is now located in the ovirt-server repository
> and it's location is:
>
> scripts/ovirt-server-install

...
>>  +error() {
>> +    echo $* >&2
>> +    exit 1
>> +}

Hi Jeff,

Thanks for the clean up.

However, the above use of $* is underquoted.
Here are a couple examples of what can go wrong:

  shell tokenization
    $ bash -c 'error() { echo $*; }; error "a          b"'
    a b

  ok when no file matches the "a*" glob:
    $ bash -c 'error() { echo $*; }; error "a*"'
    a*

  but when one does, ...
    $ touch a-file
    $ bash -c 'error() { echo $*; }; error "a*"'
    a-file

So, please use something like the existing "die",
which also prints the usual "$program_name: " prefix.

The following appears in several files:

  ME=$(basename "$0")
  warn() { printf "$ME: $@\n" >&2; }
  die() { warn "$@"; exit 1; }

But I've just realized that's not quite correct, in case $ME or $@ ever
expand to something containing a % (or, far less likely, a \c sequence
that printf recognizes), so this is better:

  ME=$(basename "$0")
  warn() { printf '%s: %s\n' "$ME" "$*" >&2; }
  die() { warn "$@"; exit 1; }

For the record, none of our existing uses of warn or die
would trigger the malfunction.

I've just posted a patch to fix those warn definitions.

paranoid^W defensively, ...
Jim



From jeffschroed at gmail.com  Sat Oct  4 22:54:02 2008
From: jeffschroed at gmail.com (Jeff Schroeder)
Date: Sat, 4 Oct 2008 15:54:02 -0700
Subject: [Ovirt-devel] [PATCH] Add trivial error() function and change
	code to use it
In-Reply-To: <87r66wd9xf.fsf@rho.meyering.net>
References: <jeffschroeder@computer.org>
	<1223012131-10557-1-git-send-email-jeffschroeder@computer.org>
	<48E61F83.7040605@redhat.com> <87r66wd9xf.fsf@rho.meyering.net>
Message-ID: <c24352ca0810041554k43558b31mc821b4d2309910a4@mail.gmail.com>

re-sending after subscribing to the list... Sorry if this appears in
your inbox twice somehow.

On Sat, Oct 4, 2008 at 1:46 AM, Jim Meyering <jim at meyering.net> wrote:
> "Perry N. Myers" <pmyers at redhat.com> wrote:
>> Jeff Schroeder wrote:
>>> Remove the multiple echo ... && exit 1 references and replace
>>> them with a simple function. This makes the code a bit cleaner.
>>
>> No problem with this patch in concept, but this patch appears to be
>> against the old repository.  See the instructions on:
>> http://ovirt.org/build-instructions.html
>>
>> for getting access to the new repositories.
>>
>> The file you're patching is now located in the ovirt-server repository
>> and it's location is:
>>
>> scripts/ovirt-server-install
>
> ...
>>>  +error() {
>>> +    echo $* >&2
>>> +    exit 1
>>> +}
>
> Hi Jeff,
>
> Thanks for the clean up.
>
> However, the above use of $* is underquoted.
> Here are a couple examples of what can go wrong:
>
>  shell tokenization
>    $ bash -c 'error() { echo $*; }; error "a          b"'
>    a b
>
>  ok when no file matches the "a*" glob:
>    $ bash -c 'error() { echo $*; }; error "a*"'
>    a*
>
>  but when one does, ...
>    $ touch a-file
>    $ bash -c 'error() { echo $*; }; error "a*"'
>    a-file
>
> So, please use something like the existing "die",
> which also prints the usual "$program_name: " prefix.
>
> The following appears in several files:
>
>  ME=$(basename "$0")
>  warn() { printf "$ME: $@\n" >&2; }
>  die() { warn "$@"; exit 1; }
>
> But I've just realized that's not quite correct, in case $ME or $@ ever
> expand to something containing a % (or, far less likely, a \c sequence
> that printf recognizes), so this is better:
>
>  ME=$(basename "$0")
>  warn() { printf '%s: %s\n' "$ME" "$*" >&2; }
>  die() { warn "$@"; exit 1; }

Uggg, you write perl in bourne shell! That looks hideous, but you are
completely right. Good catch. The split up repositories make this more
difficult, but what do you think of putting obvious helper functions like
this in a small utility library and sourcing it from the scripts? Is there any
way we could share these among the various ovirt-* projects? Does
git have a svn:externals equivalent?

> For the record, none of our existing uses of warn or die
> would trigger the malfunction.
>
> I've just posted a patch to fix those warn definitions.

Speaking of that, I've got a few silly ideas that you might have a better
way of doing. While looking at the ovirt-server-install script, there is a
FIXME that asks for input if it can't find something like the dns srv
records. I would love your input on this and especially on validate().
Is there a better way to do it? The code is rife with bashisms such as
[[ ]], ==, local varname, and the shebang is bash so a few more won't hurt.

prompt() {
   # Bourne shell's "return" doesn't support strings so use a global
   unset answer
   local question="$1";    shift
   test -z "$question" && return
   while [ -z "$answer" ]; do
       printf '%s?: ' "$question"
       read answer
   done
}

validate() {
   local text=$1;       shift
   local pattern="$1"; shift
   test -z "$pattern" -o -z "$text" && return 1
   printf '%s\n' "$text" | egrep -qs "$pattern" &>/dev/null
   return $?
}

The use case would be something like this, but obviously it needs work.
Validating an ldap base dn with regexp might not be worth the hassle.

diff --git a/scripts/ovirt-server-install b/scripts/ovirt-server-install
index a4faa4b..13f9a1d 100755
--- a/scripts/ovirt-server-install
+++ b/scripts/ovirt-server-install
@@ -114,21 +114,26 @@ done

 # grab ldap server from DNS
 find_srv ldap tcp
-if [ -n "$SRV_HOST" -a -n "$SRV_PORT" ]; then
-    SRV_HOST=${SRV_HOST%.}
-    srv_base=$(find_ldap_base)
-    [ $? != 0 ] && error "Failed to determine base for ldap"
-
-    sed -i -e "s/host: .*/host: $SRV_HOST/g" \
-        -e "s/port: .*/port: $SRV_PORT/g" \
-        -e "s/base: .*/base: $srv_base/g" \
-        $LDAP_CFG
-else
-    # FIXME: Eventually this script should prompt for things that can't
-    # be found in DNS SRV records.
-    error "Failed to get ldap host/port"
+
+# Ignore this if find_srv was successful
+if [ -z "$SRV_HOST" -o -z "$SRV_PORT" ]; then
+    prompt 'Enter the LDAP hostname:port info (ie: ldap.example.com:389)'
+    validate "$answer" '^[[:alpha:]].*:[0-9]+$' || \
+    error "Failed to get a valid ldap host/port"
 fi

+SRV_HOST=$(echo $answer | awk -F: '{print $1}')
+SRV_PORT=$(echo $answer | awk -F: '{print $2}')
+
+SRV_HOST=${SRV_HOST%.}
+srv_base=$(find_ldap_base)
+[ $? != 0 ] && error "Failed to determine base for ldap"
+
+sed -i -e "s/host: .*/host: $SRV_HOST/g" \
+    -e "s/port: .*/port: $SRV_PORT/g" \
+    -e "s/base: .*/base: $srv_base/g" \
+    $LDAP_CFG
+
 # setup an NTP step-ticker
 if [ -f $STEP_FILE ]; then
     if ! grep "^$${STEP_TICKER}$" $STEP_FILE > /dev/null 2>&1 ; then

> paranoid^W defensively, ...

Paranoid is good. Thanks for the great reviews and pointing out subtle gotchas!
They won't be forgotten anytime soon. Once again though, these should be in a
utility lib somewhere so that all scripts can take advantage of them.
Thats why I
haven't yet posted an updated patch. Do you have any words of wisdom on this?

> Jim

-- 
Jeff Schroeder

Don't drink and derive, alcohol and analysis don't mix.
http://www.digitalprognosis.com



From jeffschroed at gmail.com  Sat Oct  4 10:20:08 2008
From: jeffschroed at gmail.com (Jeff Schroeder)
Date: Sat, 4 Oct 2008 03:20:08 -0700
Subject: [Ovirt-devel] [PATCH] Add trivial error() function and change
	code to use it
In-Reply-To: <87r66wd9xf.fsf@rho.meyering.net>
References: <jeffschroeder@computer.org>
	<1223012131-10557-1-git-send-email-jeffschroeder@computer.org>
	<48E61F83.7040605@redhat.com> <87r66wd9xf.fsf@rho.meyering.net>
Message-ID: <c24352ca0810040320s393fcbdft2467265a60cd7a75@mail.gmail.com>

On Sat, Oct 4, 2008 at 1:46 AM, Jim Meyering <jim at meyering.net> wrote:
> "Perry N. Myers" <pmyers at redhat.com> wrote:
>> Jeff Schroeder wrote:
>>> Remove the multiple echo ... && exit 1 references and replace
>>> them with a simple function. This makes the code a bit cleaner.
>>
>> No problem with this patch in concept, but this patch appears to be
>> against the old repository.  See the instructions on:
>> http://ovirt.org/build-instructions.html
>>
>> for getting access to the new repositories.
>>
>> The file you're patching is now located in the ovirt-server repository
>> and it's location is:
>>
>> scripts/ovirt-server-install
>
> ...
>>>  +error() {
>>> +    echo $* >&2
>>> +    exit 1
>>> +}
>
> Hi Jeff,
>
> Thanks for the clean up.
>
> However, the above use of $* is underquoted.
> Here are a couple examples of what can go wrong:
>
>  shell tokenization
>    $ bash -c 'error() { echo $*; }; error "a          b"'
>    a b
>
>  ok when no file matches the "a*" glob:
>    $ bash -c 'error() { echo $*; }; error "a*"'
>    a*
>
>  but when one does, ...
>    $ touch a-file
>    $ bash -c 'error() { echo $*; }; error "a*"'
>    a-file
>
> So, please use something like the existing "die",
> which also prints the usual "$program_name: " prefix.
>
> The following appears in several files:
>
>  ME=$(basename "$0")
>  warn() { printf "$ME: $@\n" >&2; }
>  die() { warn "$@"; exit 1; }
>
> But I've just realized that's not quite correct, in case $ME or $@ ever
> expand to something containing a % (or, far less likely, a \c sequence
> that printf recognizes), so this is better:
>
>  ME=$(basename "$0")
>  warn() { printf '%s: %s\n' "$ME" "$*" >&2; }
>  die() { warn "$@"; exit 1; }

Uggg, you write perl in bourne shell! That looks hideous, but you are
completely right. Good catch. The split up repositories make this more
difficult, but what do you think of putting obvious helper functions like
this in a small utility library and sourcing it from the scripts? Is there any
way we could share these among the various ovirt-* projects? Does
git have a svn:externals equivalent?

> For the record, none of our existing uses of warn or die
> would trigger the malfunction.
>
> I've just posted a patch to fix those warn definitions.

Speaking of that, I've got a few silly ideas that you might have a better
way of doing. While looking at the ovirt-server-install script, there is a
FIXME that asks for input if it can't find something like the dns srv
records. I would love your input on this and especially on validate().
Is there a better way to do it? The code is rife with bashisms such as
[[ ]], ==, local varname, and the shebang is bash so a few more won't hurt.

prompt() {
    # Bourne shell's "return" doesn't support strings so use a global
    unset answer
    local question="$1";    shift
    test -z "$question" && return
    while [ -z "$answer" ]; do
        printf '%s?: ' "$question"
        read answer
    done
}

validate() {
    local text=$1;       shift
    local pattern="$1"; shift
    test -z "$pattern" -o -z "$text" && return 1
    printf '%s\n' "$text" | egrep -qs "$pattern" &>/dev/null
    return $?
}

A use case would be something like this probably whitespace damaged patch:
--- a/scripts/ovirt-server-install
+++ b/scripts/ovirt-server-install
@@ -124,9 +124,9 @@ if [ -n "$SRV_HOST" -a -n "$SRV_PORT" ]; then
         -e "s/base: .*/base: $srv_base/g" \
         $LDAP_CFG
 else
-    # FIXME: Eventually this script should prompt for things that can't
-    # be found in DNS SRV records.
-    error "Failed to get ldap host/port"
+    prompt 'Enter the LDAP hostname:port info (ie: ldap.example.com:389)'
+    validate "$answer" '^[[:alpha:]].*:[0-9]+$' || \
+    error "Failed to get a valid ldap host/port"
 fi

 # setup an NTP step-ticker

> paranoid^W defensively, ...

Paranoid is good. Thanks for the great reviews and pointing out subtle gotchas!
They won't be forgotten anytime soon. Once again though, these should be in a
utility lib somewhere so that all scripts can take advantage of them.
Thats why I
haven't yet posted an updated patch. Do you have any words of wisdom on this?

> Jim

-- 
Jeff Schroeder

Don't drink and derive, alcohol and analysis don't mix.
http://www.digitalprognosis.com



From jim at meyering.net  Mon Oct  6 13:39:20 2008
From: jim at meyering.net (Jim Meyering)
Date: Mon, 06 Oct 2008 15:39:20 +0200
Subject: [Ovirt-devel] [PATCH] Add trivial error() function and change
	code to use it
In-Reply-To: <c24352ca0810040320s393fcbdft2467265a60cd7a75@mail.gmail.com>
	(Jeff Schroeder's message of "Sat, 4 Oct 2008 03:20:08 -0700")
References: <jeffschroeder@computer.org>
	<1223012131-10557-1-git-send-email-jeffschroeder@computer.org>
	<48E61F83.7040605@redhat.com> <87r66wd9xf.fsf@rho.meyering.net>
	<c24352ca0810040320s393fcbdft2467265a60cd7a75@mail.gmail.com>
Message-ID: <87ej2tderb.fsf@rho.meyering.net>

"Jeff Schroeder" <jeffschroed at gmail.com> wrote:
...
>>  ME=$(basename "$0")
>>  warn() { printf '%s: %s\n' "$ME" "$*" >&2; }
>>  die() { warn "$@"; exit 1; }
>
> Uggg, you write perl in bourne shell! That looks hideous, but you are

Getting it right is its own reward ;-)
And when writing bourne shell code, you can't expect it to be pretty.

> completely right. Good catch. The split up repositories make this more
> difficult, but what do you think of putting obvious helper functions like
> this in a small utility library and sourcing it from the scripts? Is there any
> way we could share these among the various ovirt-* projects? Does
> git have a svn:externals equivalent?

We could put pieces in a git submodule, and use that from the two
affected modules.  But even then, so far, these shared pieces are so
small that it might be hard to justify adding Make rules to init/update
the submodule.  The three uses in node-image/ scripts could be pulled
out, at the expense of making the scripts dependent on being able to
source the factored-out definitions.

For now, I'm inclined to fix these, and just keep a tally.  If the amount
of duplication increases much more, then invest in some factorization
work.  But if you're motivated, go for it.



From jim at meyering.net  Mon Oct  6 14:00:57 2008
From: jim at meyering.net (Jim Meyering)
Date: Mon, 06 Oct 2008 16:00:57 +0200
Subject: [Ovirt-devel] [PATCH] Add trivial error() function and change
	code to use it
In-Reply-To: <c24352ca0810040320s393fcbdft2467265a60cd7a75@mail.gmail.com>
	(Jeff Schroeder's message of "Sat, 4 Oct 2008 03:20:08 -0700")
References: <jeffschroeder@computer.org>
	<1223012131-10557-1-git-send-email-jeffschroeder@computer.org>
	<48E61F83.7040605@redhat.com> <87r66wd9xf.fsf@rho.meyering.net>
	<c24352ca0810040320s393fcbdft2467265a60cd7a75@mail.gmail.com>
Message-ID: <878wt1ddra.fsf@rho.meyering.net>

"Jeff Schroeder" <jeffschroed at gmail.com> wrote:
...
> Speaking of that, I've got a few silly ideas that you might have a better
> way of doing. While looking at the ovirt-server-install script, there is a
> FIXME that asks for input if it can't find something like the dns srv
> records. I would love your input on this and especially on validate().
> Is there a better way to do it? The code is rife with bashisms such as
> [[ ]], ==, local varname, and the shebang is bash so a few more won't hurt.
>
> prompt() {
>     # Bourne shell's "return" doesn't support strings so use a global
>     unset answer
>     local question="$1";    shift
>     test -z "$question" && return
>     while [ -z "$answer" ]; do
>         printf '%s?: ' "$question"
>         read answer
>     done
> }

Better not to rely on a global variable like $answer.
Instead, just return the result.
That makes the calling code more readable.

A prompt function is more useful when you can provide a default value.
That makes it convenient to prompt with "Ok to rm -rf /? (y/N)" where
"no" is the default.  Otherwise, each caller has to handle any default
mapping manually.

> validate() {
>     local text=$1;       shift
>     local pattern="$1"; shift

No need for shifts here.
And the double quotes are not needed, so use this:
     local text=$1
     local pattern=$2

>     test -z "$pattern" -o -z "$text" && return 1
>     printf '%s\n' "$text" | egrep -qs "$pattern" &>/dev/null

It'd be nice to diagnose-and-die upon invalid pattern or any other error,
Similarly, it'd be better not to discard stderr.
Using "grep -E" is generally preferred to using "egrep".

Of course, all of this can be prefaced with...
if you really want to write maintainable and robust scripts,
you shouldn't be using the bourne shell ;-)



From sseago at redhat.com  Mon Oct  6 14:48:01 2008
From: sseago at redhat.com (Scott Seago)
Date: Mon,  6 Oct 2008 10:48:01 -0400
Subject: [Ovirt-devel] [PATCH] fix for BZ 464395
Message-ID: <1223304481-10254-1-git-send-email-sseago@redhat.com>

'add first pool to this smart pool' link was constructed incorrectly.

Signed-off-by: Scott Seago <sseago at redhat.com>
---
 src/app/views/smart_pools/show_pools.rhtml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/app/views/smart_pools/show_pools.rhtml b/src/app/views/smart_pools/show_pools.rhtml
index 8e89701..fbf6858 100644
--- a/src/app/views/smart_pools/show_pools.rhtml
+++ b/src/app/views/smart_pools/show_pools.rhtml
@@ -67,7 +67,7 @@
           <div class="no-grid-items-text">
             No pools found in this pool. <br/><br/>
             <%= image_tag "icon_addpool.png", :style=>"vertical-align:middle;" %>&nbsp;&nbsp;
-            <a href="<%= url_for :controller => 'pool', :action => 'add_to_smart_pool', :smart_pool_id => @pool %>" rel="facebox[.bolder]">Add first Pool to this smart pool</a>
+            <a href="<%= url_for :controller => 'smart_pools', :action => 'add_pool_dialog', :id => @pool %>" rel="facebox[.bolder]">Add first Pool to this smart pool</a>
           </div>
        </div>
    </div>
-- 
1.5.5.1



From dpierce at redhat.com  Mon Oct  6 15:30:44 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Mon,  6 Oct 2008 11:30:44 -0400
Subject: [Ovirt-devel] [PATCH server] Added a link from bonding to a boot
	type.
Message-ID: <1223307044-9850-1-git-send-email-dpierce@redhat.com>

Previously the bondings had one of two paths: it could either
explicitly set a static IP address or else fallback to an implicit
DHCP boot.

This change will require that bondings be explicitly configured
in the same way as a standard network interface.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 src/app/models/bonding.rb                      |   10 +++++++
 src/db/migrate/023_add_boot_type_to_bonding.rb |   31 ++++++++++++++++++++++++
 src/test/fixtures/bondings.yml                 |    1 +
 src/test/unit/bonding_test.rb                  |   20 +++++++++++----
 4 files changed, 57 insertions(+), 5 deletions(-)
 create mode 100644 src/db/migrate/023_add_boot_type_to_bonding.rb

diff --git a/src/app/models/bonding.rb b/src/app/models/bonding.rb
index 941e2cd..1be2f92 100644
--- a/src/app/models/bonding.rb
+++ b/src/app/models/bonding.rb
@@ -32,12 +32,22 @@
 class Bonding < ActiveRecord::Base
   validates_presence_of :name,
     :message => 'A name is required.'
+  
+  validates_presence_of :host_id,
+    :message => 'A host must be specified.'
 
   validates_presence_of :interface_name,
     :message => 'An interface name is required.'
+  
+  validates_presence_of :boot_type_id,
+    :message => 'A boot type must be specified.'
+  
+  validates_presence_of :bonding_type_id,
+    :message => 'A bonding type must be specified.'
 
   belongs_to :host
   belongs_to :bonding_type
+  belongs_to :boot_type
 
   has_and_belongs_to_many :nics,
     :join_table  => 'bondings_nics',
diff --git a/src/db/migrate/023_add_boot_type_to_bonding.rb b/src/db/migrate/023_add_boot_type_to_bonding.rb
new file mode 100644
index 0000000..2947661
--- /dev/null
+++ b/src/db/migrate/023_add_boot_type_to_bonding.rb
@@ -0,0 +1,31 @@
+#
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+class AddBootTypeToBonding < ActiveRecord::Migration
+  def self.up
+    add_column :bondings, :boot_type_id, :integer, :null => false
+    
+    execute 'alter table bondings add constraint fk_bondings_boot_type
+             foreign key (boot_type_id) references boot_types(id)'
+  end
+
+  def self.down
+    remove_column :bondings, :boot_type_id
+  end
+end
diff --git a/src/test/fixtures/bondings.yml b/src/test/fixtures/bondings.yml
index c2a47b5..29473c7 100644
--- a/src/test/fixtures/bondings.yml
+++ b/src/test/fixtures/bondings.yml
@@ -3,6 +3,7 @@ mailservers_managed_node_bonding:
     interface_name: bond0
     bonding_type_id: <%= Fixtures.identify(:link_aggregation_bonding_type) %>
     host_id: <%= Fixtures.identify(:mailservers_managed_node) %>
+    boot_type_id: <%= Fixtures.identify(:boot_type_static) %>
     ip_addr: 172.31.0.15
     netmask: 255.255.255.
     broadcast: 172.31.0.255
diff --git a/src/test/unit/bonding_test.rb b/src/test/unit/bonding_test.rb
index 4bdb079..bacf2bc 100644
--- a/src/test/unit/bonding_test.rb
+++ b/src/test/unit/bonding_test.rb
@@ -23,15 +23,17 @@ class BondingTest < ActiveSupport::TestCase
   fixtures :bondings
   fixtures :bonding_types
   fixtures :bondings_nics
+  fixtures :boot_types
   fixtures :hosts
   fixtures :nics
 
   def setup
     @bonding = Bonding.new(
-      :name           => 'Bonding1',
-      :interface_name => 'bond0',
-      :type_id        => bonding_types(:failover_bonding_type),
-      :host_id        => hosts(:mailservers_managed_node))
+      :name            => 'Bonding1',
+      :interface_name  => 'bond0',
+      :bonding_type_id => bonding_types(:failover_bonding_type),
+      :boot_type_id    => boot_types(:boot_type_dhcp),
+      :host_id         => hosts(:mailservers_managed_node))
   end
 
   # Ensures that the name is required.
@@ -49,11 +51,19 @@ class BondingTest < ActiveSupport::TestCase
 
     flunk 'Bondings have to have an interface name.' if @bonding.valid?
   end
+  
+  # Ensures that the bonding requires a boot type.
+  #
+  def test_valid_fails_without_boot_type
+    @bonding.boot_type_id = nil
+    
+    flunk 'Bondings have to have a boot type.' if @bonding.valid?
+  end
 
   # Ensures that the bonding type is required.
   #
   def test_valid_fails_without_type
-    @bonding.type_id = nil
+    @bonding.bonding_type_id = nil
 
     flunk 'Bondings have to have a valid type.' if @bonding.valid?
   end
-- 
1.5.5.1



From mmorsi at redhat.com  Mon Oct  6 17:17:23 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Mon,  6 Oct 2008 13:17:23 -0400
Subject: [Ovirt-devel] [PATCH] integrate "which vm is running on which node"
	in ui
Message-ID: <1223313443-20541-1-git-send-email-mmorsi@redhat.com>

---
 src/app/controllers/application.rb     |    2 +-
 src/app/controllers/pool_controller.rb |    1 +
 src/app/views/host/show.rhtml          |    2 ++
 src/app/views/vm/_grid.rhtml           |    3 +++
 4 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/app/controllers/application.rb b/src/app/controllers/application.rb
index 6dcf6f8..593210e 100644
--- a/src/app/controllers/application.rb
+++ b/src/app/controllers/application.rb
@@ -105,7 +105,7 @@ class ApplicationController < ActionController::Base
       item_hash[:cell] = attributes.collect do |attr| 
         if attr.is_a? Array
           value = item
-          attr.each { |attr_item| value = value.send(attr_item)}
+          attr.each { |attr_item| value = (value.nil? ? nil : value.send(attr_item))}
           value
         else
           item.send(attr)
diff --git a/src/app/controllers/pool_controller.rb b/src/app/controllers/pool_controller.rb
index 02ef290..efdcf91 100644
--- a/src/app/controllers/pool_controller.rb
+++ b/src/app/controllers/pool_controller.rb
@@ -110,6 +110,7 @@ class PoolController < ApplicationController
     attr_list = [:id, :description, :uuid,
                  :num_vcpus_allocated, :memory_allocated_in_mb,
                  :vnic_mac_addr, :state, :id]
+    attr_list.insert(3, [:host, :hostname]) if @pool.get_hardware_pool.can_view(@user)
     json_list(args[:full_items], attr_list, [:all], args[:find_opts])
   end
 
diff --git a/src/app/views/host/show.rhtml b/src/app/views/host/show.rhtml
index b5582f6..b8267ea 100644
--- a/src/app/views/host/show.rhtml
+++ b/src/app/views/host/show.rhtml
@@ -46,6 +46,7 @@
 	Architecture:<br/>    
 	Hypervisor Type:<br/> 
         Status:<br/>
+        VMs:<br/>
     </div>
     <div class="selection_value">
     	<%=h @host.uuid %><br/>
@@ -55,6 +56,7 @@
         <%=h @host.arch %><br/>
 	<%=h @host.hypervisor_type %><br/>
 	<%=h @host.status_str %><br/>
+        <%= @host.vms.collect{|x| x.uuid }.join(" <br/> ") %><br/>
 
 <!-- FIXME: need styling
 <h3>Network Interfaces</h3>
diff --git a/src/app/views/vm/_grid.rhtml b/src/app/views/vm/_grid.rhtml
index a322ea3..8e92934 100644
--- a/src/app/views/vm/_grid.rhtml
+++ b/src/app/views/vm/_grid.rhtml
@@ -29,6 +29,9 @@
         {display: '', name : 'id', width : 20, sortable : false, align: 'left', process: <%= table_id %>checkbox},
         {display: 'Description', name : 'description', width : 180, sortable : true, align: 'left'},
         {display: 'UUID', name : 'uuid', width : 180, sortable : true, align: 'left'},
+        <% if @pool.get_hardware_pool.can_view(@user) %>
+          {display: 'Host', name : 'host', width: 180, sortable : true, align: 'left' },
+        <% end %>
         {display: 'CPUs', name : 'num_vcpus_allocated', width : 40, sortable : true, align: 'left'},
         {display: 'Memory (MB)', name : 'memory_allocated', width : 60, sortable : true, align: 'right'},
         {display: 'vNIC Mac Addr', name : 'vnic_mac_addr', width : 60, sortable : true, align: 'right'},
-- 
1.5.4.1



From dpierce at redhat.com  Mon Oct  6 17:39:33 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Mon,  6 Oct 2008 13:39:33 -0400
Subject: [Ovirt-devel] [PATCH server] Replaced the config scripts with
	configuration encoding.
Message-ID: <1223314773-18127-1-git-send-email-dpierce@redhat.com>

*** NOTE ***
This patch is a request for comments. I'm looking for some feedback on the encoding
strategy I'm using below. The goal is to get away from using embedded scripts and to
instead just describe the desired state to the node.
*** NOTE ***

Rather than sending the node a series of scripts that load
kernel modules, or are tightly coupled to tools like augeas,
this patch introduces an encoding scheme for data.

A line that begins with "kmod" describes a kernel module that
needs to be loaded. It will containing the module's name, an
optional alias for the module, and then the module options
if such are required.

A line that begins with "ifcfg" describes an network
interface. It will contain the mac address and interface name,
followed by all needed configuration values to bring the
interface up.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 src/app/models/bonding.rb                          |    1 +
 src/lib/managed_node_configuration.rb              |   72 +++++++++------
 src/test/fixtures/bondings.yml                     |    8 ++-
 src/test/fixtures/bondings_nics.yml                |    8 ++
 src/test/fixtures/hosts.yml                        |   10 ++
 src/test/fixtures/nics.yml                         |   14 +++
 .../functional/managed_node_configuration_test.rb  |   94 ++++++++------------
 7 files changed, 118 insertions(+), 89 deletions(-)

diff --git a/src/app/models/bonding.rb b/src/app/models/bonding.rb
index 941e2cd..7bef2f8 100644
--- a/src/app/models/bonding.rb
+++ b/src/app/models/bonding.rb
@@ -38,6 +38,7 @@ class Bonding < ActiveRecord::Base
 
   belongs_to :host
   belongs_to :bonding_type
+  belongs_to :boot_type
 
   has_and_belongs_to_many :nics,
     :join_table  => 'bondings_nics',
diff --git a/src/lib/managed_node_configuration.rb b/src/lib/managed_node_configuration.rb
index 4ade235..7a1ceac 100644
--- a/src/lib/managed_node_configuration.rb
+++ b/src/lib/managed_node_configuration.rb
@@ -23,36 +23,57 @@
 
 require 'stringio'
 
+# +ManagedNodeConfiguration+ generates a configuration file for an oVirt node
+# based on information about the hardware submitted by the node and the 
+# configuration details held in the database.
+# 
+# The configuration is returned as a series of encoded lines.
+# 
+# For a kernel module, the formation of the line is as follows:
+# 
+# kmod=[module name]|[module alias]|[module options]
+# 
+# An example would be for loading the +bonding+ kernel module to setup a bonded
+# interface for load balancing. In this example, the bonded interface would be
+# named +failover0+ on the node:
+# 
+# kmod=bonding|failover0|mode=2 miimon=100 downdelay=200
+#  
+# For a network interface (including a bonded interface) an example would be:
+# 
+# ifcfg=00:11:22:33:44|eth0|BOOTPROTO=dhcp|bridge=ovirtbr0|ONBOOT=yes
+# 
+# In this line, the network interface +eth0+ has a hardware MAC address of 
+# +00:11:22:33:44+. It will use DHCP for retrieving it's IP address details, 
+# and will use the +ovirtbr0+ interface as a bridge.
+#
 class ManagedNodeConfiguration
   NIC_ENTRY_PREFIX='/files/etc/sysconfig/network-scripts'
 
   def self.generate(host, macs)
     result = StringIO.new
 
-    result.puts "#!/bin/bash"
     result.puts "# THIS FILE IS GENERATED!"
 
     # first process any bondings that're defined
     unless host.bondings.empty?
-      result.puts "cat <<\EOF > /var/tmp/pre-config-script"
-      result.puts "#!/bin/bash"
-      result.puts "# THIS FILE IS GENERATED!"
-
       host.bondings.each do |bonding|
-        result.puts "/sbin/modprobe bonding mode=#{bonding.bonding_type.mode}"
+        result.puts "kmod=bonding|#{bonding.interface_name}|mode=#{bonding.bonding_type.mode} miimon=100 downdelay=200"
       end
-
-      result.puts "EOF"
     end
 
     # now process the network interfaces  and bondings
-    result.puts "cat <<\EOF > /var/tmp/node-augtool"
 
     host.bondings.each do |bonding|
-      result.puts "rm #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}"
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/DEVICE #{bonding.interface_name}"
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/IPADDR #{bonding.ip_addr}" if bonding.ip_addr
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/ONBOOT yes"
+      entry = "ifcfg=none|#{bonding.interface_name}"
+      
+      if bonding.ip_addr == nil || bonding.ip_addr.empty?
+        entry += "|BOOTPROTO=dhcp" 
+      else
+        entry += "|BOOTPROTO=static|IPADDR=#{bonding.ip_addr}|NETMASK=#{bonding.netmask}|BROADCAST=#{bonding.broadcast}" 
+      end
+      
+      result.puts "#{entry}|ONBOOT=yes"
 
       bonding.nics.each do |nic|
         process_nic result, nic, macs, bonding
@@ -66,9 +87,6 @@ class ManagedNodeConfiguration
       end
     end
 
-    result.puts "save"
-    result.puts "EOF"
-
     result.string
   end
 
@@ -78,24 +96,18 @@ class ManagedNodeConfiguration
     iface_name = macs[nic.mac]
 
     if iface_name
-      result.puts "rm #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}"
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/DEVICE #{iface_name}"
+      entry = "ifcfg=#{nic.mac}|#{iface_name}"
 
       if bonding
-        result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/MASTER #{bonding.interface_name}"
-        result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/SLAVE yes"
+        entry += "|MASTER=#{bonding.interface_name}|SLAVE=yes" 
       else
-        result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BOOTPROTO #{nic.boot_type.proto}"
-
-        if nic.boot_type.proto == 'static'
-          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/IPADDR #{nic.ip_addr}"
-          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/NETMASK #{nic.netmask}"
-          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BROADCAST #{nic.broadcast}"
-        end
+        entry += "|BOOTPROTO=#{nic.boot_type.proto}" 
+        entry += "|IPADDR=#{nic.ip_addr}|NETMASK=#{nic.netmask}|BROADCAST=#{nic.broadcast}" if nic.boot_type.proto == 'static'
+        entry += "|BRIDGE=#{nic.bridge}" if nic.bridge
       end
-
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BRIDGE #{nic.bridge}"     if nic.bridge
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/ONBOOT yes"
+      entry += "|ONBOOT=yes"
     end
+    
+    result.puts entry if defined? entry
   end
 end
diff --git a/src/test/fixtures/bondings.yml b/src/test/fixtures/bondings.yml
index c2a47b5..7023e08 100644
--- a/src/test/fixtures/bondings.yml
+++ b/src/test/fixtures/bondings.yml
@@ -1,6 +1,6 @@
 mailservers_managed_node_bonding:
     name: Production Network
-    interface_name: bond0
+    interface_name: mailbonding0
     bonding_type_id: <%= Fixtures.identify(:link_aggregation_bonding_type) %>
     host_id: <%= Fixtures.identify(:mailservers_managed_node) %>
     ip_addr: 172.31.0.15
@@ -8,3 +8,9 @@ mailservers_managed_node_bonding:
     broadcast: 172.31.0.255
     arp_ping_address: 172.31.0.100
     arp_interval: 0
+
+mediaserver_managed_node_bonding:
+    name: Fileserver Network
+    interface_name: mediabonding0
+    bonding_type_id: <%= Fixtures.identify(:link_aggregation_bonding_type) %>
+    host_id: <%= Fixtures.identify(:mediaserver_managed_node) %>
diff --git a/src/test/fixtures/bondings_nics.yml b/src/test/fixtures/bondings_nics.yml
index 11a3d1a..607ff8b 100644
--- a/src/test/fixtures/bondings_nics.yml
+++ b/src/test/fixtures/bondings_nics.yml
@@ -5,3 +5,11 @@ mailservers_managed_node_bonding_nic_1:
 mailservers_managed_node_bonding_nic_2:
     bonding_id: <%= Fixtures.identify(:mailservers_managed_node_bonding) %>
     nic_id: <%= Fixtures.identify(:mailserver_nic_two) %>
+
+mediaservers_managed_node_bonding_nic_1:
+    bonding_id: <%= Fixtures.identify(:mediaserver_managed_node_bonding) %>
+    nic_id: <%= Fixtures.identify(:mediaserver_nic_one) %>
+
+mediaservers_managed_node_bonding_nic_2:
+    bonding_id: <%= Fixtures.identify(:mediaserver_managed_node_bonding) %>
+    nic_id: <%= Fixtures.identify(:mediaserver_nic_two) %>
diff --git a/src/test/fixtures/hosts.yml b/src/test/fixtures/hosts.yml
index 5b8af15..28282c2 100644
--- a/src/test/fixtures/hosts.yml
+++ b/src/test/fixtures/hosts.yml
@@ -125,3 +125,13 @@ buildserver_managed_node:
     is_disabled: 0
     hypervisor_type: 'kvm'
     hardware_pool_id: <%= Fixtures.identify(:prodops_pool) %>
+
+mediaserver_managed_node:
+    uuid: '6293acd9-2784-11dc-9387-001558c41534'
+    hostname: 'build.mynetwork.com'
+    arch: 'x86_64'
+    memory: 65536
+    is_disabled: 0
+    hypervisor_type: 'kvm'
+    hardware_pool_id: <%= Fixtures.identify(:prodops_pool) %>
+
diff --git a/src/test/fixtures/nics.yml b/src/test/fixtures/nics.yml
index ccf71d2..5b2cecc 100644
--- a/src/test/fixtures/nics.yml
+++ b/src/test/fixtures/nics.yml
@@ -78,3 +78,17 @@ buildserver_nic_two:
     broadcast: '172.31.0.255'
     host_id: <%= Fixtures.identify(:buildserver_managed_node) %>
     boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
+
+mediaserver_nic_one:
+    mac: '07:17:19:65:03:32'
+    usage_type: '1'
+    bandwidth: 100
+    host_id: <%= Fixtures.identify(:mediaserver_managed_node) %>
+    boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
+
+mediaserver_nic_two:
+    mac: '07:17:19:65:03:31'
+    usage_type: '1'
+    bandwidth: 100
+    host_id: <%= Fixtures.identify(:mediaserver_managed_node) %>
+    boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
diff --git a/src/test/functional/managed_node_configuration_test.rb b/src/test/functional/managed_node_configuration_test.rb
index b5a7ec5..0cad09b 100644
--- a/src/test/functional/managed_node_configuration_test.rb
+++ b/src/test/functional/managed_node_configuration_test.rb
@@ -36,6 +36,7 @@ class ManagedNodeConfigurationTest < Test::Unit::TestCase
     @host_with_ip_address = hosts(:ldapserver_managed_node)
     @host_with_multiple_nics = hosts(:buildserver_managed_node)
     @host_with_bondings = hosts(:mailservers_managed_node)
+    @host_with_dhcp_bondings = hosts(:mediaserver_managed_node)
   end
 
   # Ensures that network interfaces uses DHCP when no IP address is specified.
@@ -44,15 +45,8 @@ class ManagedNodeConfigurationTest < Test::Unit::TestCase
     nic = @host_with_dhcp_card.nics.first
 
     expected = <<-HERE
-#!/bin/bash
 # THIS FILE IS GENERATED!
-cat <<\EOF > /var/tmp/node-augtool
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BOOTPROTO #{nic.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
-save
-EOF
+ifcfg=#{nic.mac}|eth0|BOOTPROTO=dhcp|ONBOOT=yes
     HERE
 
     result = ManagedNodeConfiguration.generate(
@@ -69,19 +63,8 @@ EOF
     nic = @host_with_ip_address.nics.first
 
     expected = <<-HERE
-#!/bin/bash
 # THIS FILE IS GENERATED!
-cat <<\EOF > /var/tmp/node-augtool
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BOOTPROTO #{nic.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/IPADDR #{nic.ip_addr}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/NETMASK #{nic.netmask}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BROADCAST #{nic.broadcast}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BRIDGE ovirtbr0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
-save
-EOF
+ifcfg=#{nic.mac}|eth0|BOOTPROTO=#{nic.boot_type.proto}|IPADDR=#{nic.ip_addr}|NETMASK=#{nic.netmask}|BROADCAST=#{nic.broadcast}|BRIDGE=#{nic.bridge}|ONBOOT=yes
     HERE
 
     result = ManagedNodeConfiguration.generate(
@@ -99,22 +82,9 @@ EOF
     nic2 = @host_with_multiple_nics.nics[1]
 
     expected = <<-HERE
-#!/bin/bash
 # THIS FILE IS GENERATED!
-cat <<\EOF > /var/tmp/node-augtool
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BOOTPROTO #{nic1.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/IPADDR #{nic1.ip_addr}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/NETMASK #{nic1.netmask}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BROADCAST #{nic1.broadcast}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth1
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/DEVICE eth1
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/BOOTPROTO #{nic2.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/ONBOOT yes
-save
-EOF
+ifcfg=#{nic1.mac}|eth0|BOOTPROTO=#{nic1.boot_type.proto}|IPADDR=#{nic1.ip_addr}|NETMASK=#{nic1.netmask}|BROADCAST=#{nic1.broadcast}|ONBOOT=yes
+ifcfg=#{nic2.mac}|eth1|BOOTPROTO=#{nic2.boot_type.proto}|ONBOOT=yes
     HERE
 
     result = ManagedNodeConfiguration.generate(
@@ -137,30 +107,11 @@ EOF
     nic2 = bonding.nics[1]
 
     expected = <<-HERE
-#!/bin/bash
 # THIS FILE IS GENERATED!
-cat <<\EOF > /var/tmp/pre-config-script
-#!/bin/bash
-# THIS FILE IS GENERATED!
-/sbin/modprobe bonding mode=#{bonding.bonding_type.mode}
-EOF
-cat <<\EOF > /var/tmp/node-augtool
-rm /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}
-set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/DEVICE #{bonding.interface_name}
-set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/IPADDR 172.31.0.15
-set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/ONBOOT yes
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/MASTER #{bonding.interface_name}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/SLAVE yes
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth1
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/DEVICE eth1
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/MASTER #{bonding.interface_name}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/SLAVE yes
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/ONBOOT yes
-save
-EOF
+kmod=bonding|#{bonding.interface_name}|mode=#{bonding.bonding_type.mode} miimon=100 downdelay=200
+ifcfg=none|#{bonding.interface_name}|BOOTPROTO=static|IPADDR=#{bonding.ip_addr}|NETMASK=#{bonding.netmask}|BROADCAST=#{bonding.broadcast}|ONBOOT=yes
+ifcfg=#{nic1.mac}|eth0|MASTER=#{bonding.interface_name}|SLAVE=yes|ONBOOT=yes
+ifcfg=#{nic2.mac}|eth1|MASTER=#{bonding.interface_name}|SLAVE=yes|ONBOOT=yes
 HERE
 
     result = ManagedNodeConfiguration.generate(
@@ -173,4 +124,31 @@ HERE
     assert_equal expected, result
   end
 
+  # Ensures that the generated bonding supports DHCP boot protocol.
+  #
+  def test_generate_with_dhcp_bonding
+    bonding = @host_with_dhcp_bondings.bondings.first
+
+    bonding.ip_addr=nil
+    nic1 = bonding.nics[0]
+    nic2 = bonding.nics[1]
+
+    expected = <<-HERE
+# THIS FILE IS GENERATED!
+kmod=bonding|#{bonding.interface_name}|mode=#{bonding.bonding_type.mode} miimon=100 downdelay=200
+ifcfg=none|#{bonding.interface_name}|BOOTPROTO=dhcp|ONBOOT=yes
+ifcfg=#{nic1.mac}|eth0|MASTER=#{bonding.interface_name}|SLAVE=yes|ONBOOT=yes
+ifcfg=#{nic2.mac}|eth1|MASTER=#{bonding.interface_name}|SLAVE=yes|ONBOOT=yes
+HERE
+
+    result = ManagedNodeConfiguration.generate(
+      @host_with_dhcp_bondings,
+      {
+        "#{nic1.mac}" => 'eth0',
+        "#{nic2.mac}" => 'eth1'
+      })
+
+    assert_equal expected, result
+  end
+
 end
-- 
1.5.5.1



From sseago at redhat.com  Tue Oct  7 14:30:16 2008
From: sseago at redhat.com (Scott Seago)
Date: Tue,  7 Oct 2008 10:30:16 -0400
Subject: [Ovirt-devel] [PATCH] move dialog fix.
Message-ID: <1223389816-28541-1-git-send-email-sseago@redhat.com>

fixes a problem in the move (and add pool to smart pool) dialogs when permission was granted to the top level DirectoryPool rather than to individual HW pools. This code will be going away soon anyway, as we need to migrate the dialog tree view away from the legacy implementation to jguiditta's new tree code.

This fixes BZ 464273 and 464398.

Signed-off-by: Scott Seago <sseago at redhat.com>
---
 src/app/controllers/hardware_controller.rb |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/app/controllers/hardware_controller.rb b/src/app/controllers/hardware_controller.rb
index 42ff9cb..9c04210 100644
--- a/src/app/controllers/hardware_controller.rb
+++ b/src/app/controllers/hardware_controller.rb
@@ -76,6 +76,14 @@ class HardwareController < PoolController
       open_list = []
     else
       pools = Pool.list_for_user(get_login_user,Permission::PRIV_VIEW)
+      hw_root = HardwarePool.get_default_pool
+      if !(pools.include?(hw_root))
+        if pools.include?(DirectoryPool.get_directory_root)
+          pools << hw_root
+        elsif pools.include?(DirectoryPool.get_hardware_root)
+          pools << hw_root
+        end
+      end
       current_id = params[:current_id]
       if current_id
         current_pool = Pool.find(current_id)
-- 
1.5.5.1



From dpierce at redhat.com  Tue Oct  7 14:42:52 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Tue, 07 Oct 2008 10:42:52 -0400
Subject: [Ovirt-devel] Re: [PATCH server] Added support for booting a VM
	from an ISO image.
In-Reply-To: <1223066798-11393-1-git-send-email-dpierce@redhat.com>
References: <1223066798-11393-1-git-send-email-dpierce@redhat.com>
Message-ID: <48EB756C.8090108@redhat.com>

Darryl L. Pierce wrote:
> *** NOTE ***
> This is a work in progress. I'm at the point now where the NFS image is properly
> being mounted and the ISO being booted. But, for whatever reason, the VM is 
> refusing to actually boot the CDROM. I'm sure it's something simple but I 
> haven't figured out how to get past it.
> 
> As it stands now, I can boot from an ISO on a cobbler server if I manually 
> intervene and tell the VM to boot the CDROM.
> 
> A pointer would be nice if someone can apply the patch and see what's going on.
> *** NOTE ***

Any ideas on this issue? This patch is ready to roll if I can get the VM
to boot the CDROM image that's been mounted.

-- 
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081007/390320bc/attachment.vcf>

From dpierce at redhat.com  Tue Oct  7 14:44:22 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Tue,  7 Oct 2008 10:44:22 -0400
Subject: [Ovirt-devel] [PATCH server] Added a link from bonding to a boot
	type.
Message-ID: <1223390662-16536-1-git-send-email-dpierce@redhat.com>

Previously the bondings had one of two paths: it could either
explicitly set a static IP address or else fallback to an implicit
DHCP boot.

This change will require that bondings be explicitly configured
in the same way as a standard network interface.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 src/app/models/bonding.rb                      |   10 +++++++
 src/db/migrate/023_add_boot_type_to_bonding.rb |   31 ++++++++++++++++++++++++
 src/test/fixtures/bondings.yml                 |    1 +
 src/test/unit/bonding_test.rb                  |   20 +++++++++++----
 4 files changed, 57 insertions(+), 5 deletions(-)
 create mode 100644 src/db/migrate/023_add_boot_type_to_bonding.rb

diff --git a/src/app/models/bonding.rb b/src/app/models/bonding.rb
index 941e2cd..1be2f92 100644
--- a/src/app/models/bonding.rb
+++ b/src/app/models/bonding.rb
@@ -32,12 +32,22 @@
 class Bonding < ActiveRecord::Base
   validates_presence_of :name,
     :message => 'A name is required.'
+  
+  validates_presence_of :host_id,
+    :message => 'A host must be specified.'
 
   validates_presence_of :interface_name,
     :message => 'An interface name is required.'
+  
+  validates_presence_of :boot_type_id,
+    :message => 'A boot type must be specified.'
+  
+  validates_presence_of :bonding_type_id,
+    :message => 'A bonding type must be specified.'
 
   belongs_to :host
   belongs_to :bonding_type
+  belongs_to :boot_type
 
   has_and_belongs_to_many :nics,
     :join_table  => 'bondings_nics',
diff --git a/src/db/migrate/023_add_boot_type_to_bonding.rb b/src/db/migrate/023_add_boot_type_to_bonding.rb
new file mode 100644
index 0000000..2947661
--- /dev/null
+++ b/src/db/migrate/023_add_boot_type_to_bonding.rb
@@ -0,0 +1,31 @@
+#
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+class AddBootTypeToBonding < ActiveRecord::Migration
+  def self.up
+    add_column :bondings, :boot_type_id, :integer, :null => false
+    
+    execute 'alter table bondings add constraint fk_bondings_boot_type
+             foreign key (boot_type_id) references boot_types(id)'
+  end
+
+  def self.down
+    remove_column :bondings, :boot_type_id
+  end
+end
diff --git a/src/test/fixtures/bondings.yml b/src/test/fixtures/bondings.yml
index c2a47b5..29473c7 100644
--- a/src/test/fixtures/bondings.yml
+++ b/src/test/fixtures/bondings.yml
@@ -3,6 +3,7 @@ mailservers_managed_node_bonding:
     interface_name: bond0
     bonding_type_id: <%= Fixtures.identify(:link_aggregation_bonding_type) %>
     host_id: <%= Fixtures.identify(:mailservers_managed_node) %>
+    boot_type_id: <%= Fixtures.identify(:boot_type_static) %>
     ip_addr: 172.31.0.15
     netmask: 255.255.255.
     broadcast: 172.31.0.255
diff --git a/src/test/unit/bonding_test.rb b/src/test/unit/bonding_test.rb
index 4bdb079..bacf2bc 100644
--- a/src/test/unit/bonding_test.rb
+++ b/src/test/unit/bonding_test.rb
@@ -23,15 +23,17 @@ class BondingTest < ActiveSupport::TestCase
   fixtures :bondings
   fixtures :bonding_types
   fixtures :bondings_nics
+  fixtures :boot_types
   fixtures :hosts
   fixtures :nics
 
   def setup
     @bonding = Bonding.new(
-      :name           => 'Bonding1',
-      :interface_name => 'bond0',
-      :type_id        => bonding_types(:failover_bonding_type),
-      :host_id        => hosts(:mailservers_managed_node))
+      :name            => 'Bonding1',
+      :interface_name  => 'bond0',
+      :bonding_type_id => bonding_types(:failover_bonding_type),
+      :boot_type_id    => boot_types(:boot_type_dhcp),
+      :host_id         => hosts(:mailservers_managed_node))
   end
 
   # Ensures that the name is required.
@@ -49,11 +51,19 @@ class BondingTest < ActiveSupport::TestCase
 
     flunk 'Bondings have to have an interface name.' if @bonding.valid?
   end
+  
+  # Ensures that the bonding requires a boot type.
+  #
+  def test_valid_fails_without_boot_type
+    @bonding.boot_type_id = nil
+    
+    flunk 'Bondings have to have a boot type.' if @bonding.valid?
+  end
 
   # Ensures that the bonding type is required.
   #
   def test_valid_fails_without_type
-    @bonding.type_id = nil
+    @bonding.bonding_type_id = nil
 
     flunk 'Bondings have to have a valid type.' if @bonding.valid?
   end
-- 
1.5.5.1



From imain at redhat.com  Tue Oct  7 18:07:01 2008
From: imain at redhat.com (Ian Main)
Date: Tue,  7 Oct 2008 11:07:01 -0700
Subject: [Ovirt-devel] [PATCH node-image] Clean up dependancies from
	libvirt-qpid install.
Message-ID: <1223402821-30794-1-git-send-email-imain@redhat.com>

Clean up libicu (unicode library - 6MB rpm) and various libboost libraries
after installation of libvirt-qpid.  This brings the libvirt-qpid addition
to the node down to 3MB (52MB to 55MB) rpm size.

Signed-off-by: Ian Main <imain at redhat.com>
---
 common-post.ks |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/common-post.ks b/common-post.ks
index 0a1c60f..deee9a5 100644
--- a/common-post.ks
+++ b/common-post.ks
@@ -62,7 +62,7 @@ $RPM gamin pm-utils kbd libuser passwd usermode \
     vbetool ConsoleKit hdparm \
     efibootmgr krb5-workstation linux-atm-libs fedora-release-notes \
     slang psmisc gdbm cryptsetup-luks pciutils mtools syslinux db4 \
-    wireless-tools radeontool cracklib-dicts cracklib
+    wireless-tools radeontool cracklib-dicts cracklib libicu
 
 # Things we could probably remove if libvirt didn't link against them
 #$RPM avahi PolicyKit xen-libs
@@ -148,4 +148,11 @@ eval $RM $blacklist $blacklist_lib $blacklist_pango $blacklist_hal \
 echo "Cleanup empty directory structures in /usr/share"
 find /usr/share -type d -exec rmdir {} \; > /dev/null 2>&1
 
-echo "Finished Kickstart Post"
+echo "Running image-minimizer..."
+%post --nochroot --interpreter image-minimizer
+drop /usr/lib/libboost*
+keep /usr/lib/libboost_program_options.so*
+keep /usr/lib/libboost_filesystem.so*
+drop /usr/lib64/libboost*
+keep /usr/lib64/libboost_program_options.so*
+keep /usr/lib64/libboost_filesystem.so*
-- 
1.5.5.1



From jguiditt at redhat.com  Tue Oct  7 18:12:33 2008
From: jguiditt at redhat.com (Jason Guiditta)
Date: Tue,  7 Oct 2008 14:12:33 -0400
Subject: [Ovirt-devel] [PATCH server] Version 1 of Revamped Tree Navigation.
	Fixed css urls 
Message-ID: <1223403153-14490-1-git-send-email-jguiditt@redhat.com>

The new javascript tree widget contains the following features/changes from previous implementation:

* The html for the list is dynamically generated using a javascript template system.  This will allow us to plug in different layouts per tree as the widget matures.
* Updates to the tree are now incremental, rather than a full rip and replace as earlier. We have 2 states we currently look for - 'new' and 'changed'.  The first generates new html and appends it to the DOM, the second just does a replacement of the content of existing nodes.
* Vastly simplified the markup and css.
* Added calls where appropriate to refresh the tree before next planned call (for instance, if you add a new hardware pool).
* Added slide effect when opening and closing a node of the tree.
* Clicking the plus/minus opens/close the node only, does not load main content area.
* Clicking anywhere to the right of that on a given node will load content area.
* Added interim icons for 'smartpool' and 'add smartpool'

Note that aside from the nav area, this should not impact the existing trees which have not been converted yet (all popups that have one), as this is a completely separate codebase with it's own js and css files.

Related, but not technically part of the tree, I added a choose_layout method to allow testing of javascript components as we are building them to help eliminate possible side effects from other code.  When not in a production environment, you can pass in ?component_layout=[name] where [name] is the name of a shell rhtml file you have put in views/layouts/components.  As our UI is growing increasingly complex, I think this will be a very useful way to facilitate building components.

Signed-off-by: Jason Guiditta <jguiditt at redhat.com>
---
 src/app/controllers/application.rb                 |   19 +-
 src/app/controllers/tree_controller.rb             |   70 ++++-
 src/app/models/pool.rb                             |   18 +-
 src/app/views/layouts/_side_toolbar.rhtml          |    2 +-
 src/app/views/layouts/_tree.rhtml                  |  148 ++++++--
 src/app/views/layouts/components/tree.rhtml        |   61 +++
 src/app/views/layouts/redux.rhtml                  |   40 +--
 src/public/images/icon_add_smartpool.png           |  Bin 0 -> 1341 bytes
 src/public/images/icon_smartpool.png               |  Bin 0 -> 641 bytes
 src/public/javascripts/ovirt.js                    |   28 +-
 src/public/javascripts/ovirt.tree.js               |   71 ++++
 src/public/javascripts/smart_nav_test_data.js      |  151 ++++++++
 src/public/javascripts/trimpath-template-1.0.38.js |  397 ++++++++++++++++++++
 src/public/stylesheets/ovirt-tree/tree.css         |   83 ++++
 14 files changed, 994 insertions(+), 94 deletions(-)
 create mode 100644 src/app/views/layouts/components/tree.rhtml
 create mode 100644 src/public/images/icon_add_smartpool.png
 create mode 100644 src/public/images/icon_smartpool.png
 create mode 100644 src/public/javascripts/ovirt.tree.js
 create mode 100644 src/public/javascripts/smart_nav_test_data.js
 create mode 100644 src/public/javascripts/trimpath-template-1.0.38.js
 create mode 100644 src/public/stylesheets/ovirt-tree/tree.css

diff --git a/src/app/controllers/application.rb b/src/app/controllers/application.rb
index 6dcf6f8..a751768 100644
--- a/src/app/controllers/application.rb
+++ b/src/app/controllers/application.rb
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 Red Hat, Inc.
 # Written by Scott Seago <sseago at redhat.com>
 #
@@ -24,7 +24,7 @@ class ApplicationController < ActionController::Base
   # Pick a unique cookie name to distinguish our session data from others'
   session :session_key => '_ovirt_session_id'
   init_gettext "ovirt"
-  layout 'redux'
+  layout :choose_layout
 
   before_filter :pre_new, :only => [:new]
   before_filter :pre_create, :only => [:create]
@@ -33,6 +33,13 @@ class ApplicationController < ActionController::Base
   before_filter :authorize_admin, :only => [:new, :create, :edit, :update, :destroy]
   before_filter :is_logged_in
 
+  def choose_layout
+    if(params[:component_layout])
+      return (ENV["RAILS_ENV"] != "production")?'components/' << params[:component_layout]:'redux'
+    end
+    return 'redux'
+  end
+
   def is_logged_in
     redirect_to(:controller => "login", :action => "login") unless get_login_user
   end
@@ -40,7 +47,7 @@ class ApplicationController < ActionController::Base
   def get_login_user
     (ENV["RAILS_ENV"] == "production") ? session[:user] : "ovirtadmin"
   end
-  
+
   def set_perms(hwpool)
     @user = get_login_user
     @can_view = hwpool.can_view(@user)
@@ -91,8 +98,8 @@ class ApplicationController < ActionController::Base
   # don't define find_opts for array inputs
   def json_hash(full_items, attributes, arg_list=[], find_opts={}, id_method=:id)
     page = params[:page].to_i
-    paginate_opts = {:page => page, 
-                     :order => "#{params[:sortname]} #{params[:sortorder]}", 
+    paginate_opts = {:page => page,
+                     :order => "#{params[:sortname]} #{params[:sortorder]}",
                      :per_page => params[:rp]}
     arg_list << find_opts.merge(paginate_opts)
     item_list = full_items.paginate(*arg_list)
@@ -102,7 +109,7 @@ class ApplicationController < ActionController::Base
     json_hash[:rows] = item_list.collect do |item|
       item_hash = {}
       item_hash[:id] = item.send(id_method)
-      item_hash[:cell] = attributes.collect do |attr| 
+      item_hash[:cell] = attributes.collect do |attr|
         if attr.is_a? Array
           value = item
           attr.each { |attr_item| value = value.send(attr_item)}
diff --git a/src/app/controllers/tree_controller.rb b/src/app/controllers/tree_controller.rb
index 1aed544..bc423b7 100644
--- a/src/app/controllers/tree_controller.rb
+++ b/src/app/controllers/tree_controller.rb
@@ -1,5 +1,4 @@
 class TreeController < ApplicationController
-
   def get_pools
     # TODO: split these into separate hash elements for HW and smart pools
     pools = HardwarePool.get_default_pool.full_set_nested(:method => :json_hash_element,
@@ -8,11 +7,78 @@ class TreeController < ApplicationController
                        :privilege => Permission::PRIV_VIEW, :user => get_login_user,
                        :smart_pool_set => true)
   end
+
   def fetch_nav
     @pools = get_pools
   end
-  
+
   def fetch_json
     render :json => get_pools.to_json
   end
+
+  def return_filtered_list
+    @ids = Array.new
+    @clientHash = {}
+    if (params[:item])
+      params[:item].each { |item|
+        tempItem = item.split("-")
+        itemHash = {
+          :id => tempItem[0].to_s,
+          :name =>tempItem[1]
+        }
+        @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)))
+    @ids.each { |item|
+      if @clientHash.has_key?(item.to_s)
+        @clientHash.delete(item.to_s)
+      end
+    }
+    @serverHash[:deleted] = @clientHash
+    render :json => @serverHash.to_json
+  end
+
+  private
+  def build_json(list)
+    list.each {|listItem|
+      process_list_item(listItem)
+      if listItem.has_key?(:children)
+          build_json(listItem[:children])
+      end
+    }
+    list
+  end
+
+  def process_list_item(list)
+    if @clientHash.has_key?(list[:id].to_s)
+      unless @clientHash[list[:id].to_s][:name] == list[:name]
+        list[:state] = "changed"
+      else
+        list[:state] = "unchanged"
+      end
+    else
+      list[:state] = "new"
+    end
+    @ids = @ids.push(list[:id])
+  end
+
+  def adjust_smart_pool_list(list)
+    adjustedList = Array.new
+    list.each {|listItem|
+      if (listItem[:name] == get_login_user)
+        listItem[:children].each {|item|
+          adjustedList.push(item)
+        }
+      else
+        adjustedList.push(listItem)
+      end
+    }
+    adjustedList
+  end
 end
diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb
index eb71be8..d189649 100644
--- a/src/app/models/pool.rb
+++ b/src/app/models/pool.rb
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 Red Hat, Inc.
 # Written by Scott Seago <sseago at redhat.com>
 #
@@ -45,7 +45,7 @@ class Pool < ActiveRecord::Base
   has_many :smart_pool_tags, :as => :tagged, :dependent => :destroy
   has_many :smart_pools, :through => :smart_pool_tags
 
-  # used to allow parent traversal before obj is saved to the db 
+  # used to allow parent traversal before obj is saved to the db
   # (needed for view code 'create' form)
   attr_accessor :tmp_parent
 
@@ -168,10 +168,10 @@ class Pool < ActiveRecord::Base
     end
   end
 
-  RESOURCE_LABELS = [["CPUs", :cpus, ""], 
-                     ["Memory", :memory_in_mb, "(mb)"], 
-                     ["NICs", :nics, ""], 
-                     ["VMs", :vms, ""], 
+  RESOURCE_LABELS = [["CPUs", :cpus, ""],
+                     ["Memory", :memory_in_mb, "(mb)"],
+                     ["NICs", :nics, ""],
+                     ["VMs", :vms, ""],
                      ["Disk", :storage_in_gb, "(gb)"]]
 
   #needed by tree widget for display
@@ -195,7 +195,7 @@ class Pool < ActiveRecord::Base
       found = false
       open_list.each do |open_pool|
         if pool.id == open_pool.id
-          new_open_list = open_list[(open_list.index(open_pool)+1)..-1]          
+          new_open_list = open_list[(open_list.index(open_pool)+1)..-1]
           unless new_open_list.empty?
             pool_children = pool.children unless pool_children
             hash[:children] = pool_hash(pool_children, new_open_list, filter_vm_pools)
@@ -210,7 +210,7 @@ class Pool < ActiveRecord::Base
   end
 
   def json_hash_element
-    { :id => id, :type => self[:type], :text => name, :name => name}
+    { :id => id, :type => self[:type], :text => name, :name => name, :parent_id => parent_id}
   end
 
   def hash_element
@@ -272,7 +272,7 @@ class Pool < ActiveRecord::Base
     obj = args.shift
     method = args.shift
     obj.send(method, *args)
-  end    
+  end
 
   def display_name
     name
diff --git a/src/app/views/layouts/_side_toolbar.rhtml b/src/app/views/layouts/_side_toolbar.rhtml
index e1958f1..4b92bcf 100644
--- a/src/app/views/layouts/_side_toolbar.rhtml
+++ b/src/app/views/layouts/_side_toolbar.rhtml
@@ -25,7 +25,7 @@
 <% end -%>
 <div class="toolbar" style="float:left;">
    <a href="<%= url_for :controller => :smart_pools, :action => 'new' %>" rel="facebox[.bolder]">
-     <%=image_tag "icon_add_hardwarepool.png", :title=>"Add Smart Pool"  %>
+     <%=image_tag "icon_add_smartpool.png", :title=>"Add Smart Pool"  %>
    </a>
 </div>
 <%if pool -%>
diff --git a/src/app/views/layouts/_tree.rhtml b/src/app/views/layouts/_tree.rhtml
index 0e6e138..a6bde14 100644
--- a/src/app/views/layouts/_tree.rhtml
+++ b/src/app/views/layouts/_tree.rhtml
@@ -1,32 +1,124 @@
-<div style=" float:left; padding:0 0 0 5px;"><%= image_tag("icon_dashboard.gif")%></div>
-  <% selected = "selected" if controller.controller_name == "dashboard" && params[:action] == "index" %>
-<div style=" float:left; padding:5px 0 0 5px;">
-    <%= link_to "Dashboard", { :controller => "dashboard" }, { :id => "dashboard", :class => "#{selected}" } %>
-</div>
-<div style="clear:both"></div>
-<%= javascript_include_tag "jquery.ovirt.treeview.js" -%>
-<script type="text/javascript">    
-    $(document).ready(function(){         
-        $("#test-tree").ovirt_treeview({
-            collapsed: true,
-            //animated: "normal",
-            url: "<%=  url_for :controller =>'/tree', :action => 'fetch_json' %>",
-            hardware_url: "<%=  url_for :controller =>'/hardware', :action => 'show' %>",
-            resource_url: "<%=  url_for :controller =>'/resources', :action => 'show' %>",
-            smart_url: "<%=  url_for :controller =>'/smart_pools', :action => 'show' %>"
-	});
-        var tree_reload = {
-            url: "<%=  url_for :controller =>'/tree', :action => 'fetch_json' %>",
-            hardware_url: "<%=  url_for :controller =>'/hardware', :action => 'show' %>",
-            resource_url: "<%=  url_for :controller =>'/resources', :action => 'show' %>",
-            smart_url: "<%=  url_for :controller =>'/smart_pools', :action => 'show' %>"
+<%= javascript_include_tag "trimpath-template-1.0.38.js" %>
+<%= javascript_include_tag "ovirt.tree.js" %>
+<%= stylesheet_link_tag 'ovirt-tree/tree' %>
+<script type="text/javascript">
+    var treeTimer, urlObj;
+    var processRecursive = true;
+    var recursiveTreeTempl, treeItemTempl, tree_url;
+    $(document).ready(function(){
+      recursiveTreeTempl = TrimPath.parseDOMTemplate("nav_tree_template");
+      treeItemTempl = TrimPath.parseDOMTemplate("nav_tree_updater_template");
+      urlObj = {
+        "HardwarePool" : "<%=  url_for :controller =>'/hardware', :action => 'show' %>",
+        "VmResourcePool" : "<%=  url_for :controller =>'/resources', :action => 'show' %>",
+        "SmartPool" : "<%=  url_for :controller =>'/smart_pools', :action => 'show' %>",
+        "DirectoryPool" : null
+      }
+      tree_url = "<%=  url_for :controller =>"/tree", :action => "return_filtered_list" %>";
+      processTree();
+      treeTimer = setInterval(processTree,15000);
+      $('ul.ovirt-tree li').livequery(
+        function(){
+          $(this)
+          .children('div')
+          .bind('click',function(){
+            $('ul.ovirt-tree li div').removeClass('current');
+            var thisHref = (urlObj[$(this).attr('class')] !=null) ? urlObj[$(this).attr('class')] + '/' + this.id :null;
+            $(this).toggleClass('current');
+            currentNode = this.id;
+            if ($tabs != null) {
+              var tabType = $tabs.data("pool_type.tabs");
+              ($(this).attr('class').toLowerCase().indexOf(tabType) == -1) ?selected_tab = 0 :selected_tab = $tabs.data("selected.tabs");
+            }
+            if (thisHref != null) {
+              $.ajax({
+                url: thisHref,
+                type: 'GET',
+                data: {ajax:true,tab:selected_tab},
+                dataType: 'html',
+                success: function(data) {
+                  $('#side-toolbar').html($(data).find('div.toolbar'));
+                  $('#tabs-and-content-container').html($(data).not('div#side-toolbar'));
+                },
+                error: function(xhr) {$.jGrowl(xhr.status + ' ' + xhr.statusText);}
+              });
+            }
+          });
+        },function(){
+          $(this)
+          .children('div')
+          .unbind('click');
         }
-        $('#test-tree').everyTime(15000,function(){
-          load(tree_reload, {}, this, this);
-        })
+      );
+      $('ul.ovirt-tree li:has(ul)').livequery(
+        function(){
+          $(this)
+            .children('span.hitarea')
+            .click(function(event){
+              if (this == event.target) {
+                  if($(this).siblings('ul').size() >0) {
+                      $(this)
+                        .toggleClass('expanded')
+                        .toggleClass('expandable')
+                        .siblings('ul').slideToggle("normal");
+                  }
+              }
+            });
+        },function(){
+            $(this).children('span.hitarea')
+              .removeClass('expanded expandable')
+              .unbind('click');
+        }
+      );
     });
 </script>
 
-<ul id="test-tree" class="filetree treeview-famfamfam treeview">
-</ul>
-<!--<ul id="tree" class="filetree treeview-famfamfam treeview"></ul>-->
+<!-- Output elements -->
+<div class="nav-dashboard">
+  <% selected = "selected" if controller.controller_name == "dashboard" && params[:action] == "index" %>
+  <%= link_to "Dashboard", { :controller => "dashboard" }, { :id => "dashboard", :class => "#{selected}" } %>
+</div>
+<form id="nav_tree_form">
+  <div class="nav-tree">
+    <ul id="nav_tree" class="ovirt-tree"></ul>
+  </div>
+  <div class="nav-smart-pool">
+    <span class="nav-smart-pool-header">Smart Pools</span> <!--FIXME: replace with i18n text -->
+    <ul id="smart_nav_tree" class="ovirt-tree"></ul>
+  </div>
+</form>
+
+<!-- Template content -->
+<!-- TODO: possibly move these templates into external files-->
+<textarea id="nav_tree_updater_template" style="display:none;">
+  <li>
+    <input type="checkbox" name="item[]" value="${id}-${name}" style="display:none" checked="checked"/>
+    <span class="hitarea {if defined('children')} expandable{/if}">&nbsp;</span><div id="${id}" class="${type}">${name}</div>
+  </li>
+</textarea>
+<textarea id="nav_tree_template" style="display:none;">
+  {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}">&nbsp;</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}">&nbsp;</span><div id="${item.id}" class="${item.type}">${item.name}</div>
+      {if item.children}
+        ${htmlList(item.children)}
+      {/if}
+    </li>
+  {/for}
+</textarea>
diff --git a/src/app/views/layouts/components/tree.rhtml b/src/app/views/layouts/components/tree.rhtml
new file mode 100644
index 0000000..063a6df
--- /dev/null
+++ b/src/app/views/layouts/components/tree.rhtml
@@ -0,0 +1,61 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+  <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
+  <title><%= yield :title -%></title>
+  <%= 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.form.js" -%>
+  <%= javascript_include_tag "ovirt.js" -%>
+
+  <script type="text/javascript">
+      var $tabs, selected_tab;
+      function delete_vm_pool(id, parent) {
+        $(document).trigger('close.facebox');
+        $.post('<%= url_for :controller => "resources", :action => "destroy" %>',
+               {id: id},
+                function(data,status){
+                  $("#vmpools_grid").flexReload();
+                  processTree();
+                  if (data.alert) {
+                    $.jGrowl(data.alert);
+                  }
+                 }, 'json');
+      }
+      function delete_hw_pool(id, parent) {
+        $(document).trigger('close.facebox');
+        $.post('<%= url_for :controller => "hardware", :action => "destroy" %>',
+               {id: id},
+                function(data,status){
+                  processTree();
+                  if (data.alert) {
+                    $.jGrowl(data.alert);
+                  }
+                 }, 'json');
+      }
+   </script>
+   <%= yield :scripts -%>
+ </head>
+
+ <body>
+   <div id="side">
+     <button id="stop">Stop!</button>
+     <%= render :partial => '/layouts/tree' %>
+   </div>
+   <div id="side-toolbar" class="header_menu_wrapper">
+     <%= render :partial => '/layouts/side_toolbar' %>
+   </div>
+
+   <div id="tabs-and-content-container">
+     <div id="main">
+        <div id="content_area">
+
+        </div>
+     </div>
+   </div>
+ </body>
+</html>
diff --git a/src/app/views/layouts/redux.rhtml b/src/app/views/layouts/redux.rhtml
index 01540d4..a985cdd 100644
--- a/src/app/views/layouts/redux.rhtml
+++ b/src/app/views/layouts/redux.rhtml
@@ -16,20 +16,18 @@
   <%= stylesheet_link_tag 'flexigrid/flexigrid.css' %>
   <%= stylesheet_link_tag 'facebox' %>
   <%= stylesheet_link_tag 'jquery.jgrowl.css' %>
-  <!--%= stylesheet_link_tag 'jquery.ui-1.5b4/themes/flora/flora.tabs.css' %-->
+
   <%= javascript_include_tag "jquery-1.2.6.min.js" -%>
   <%= javascript_include_tag "jquery-treeview/jquery.treeview.js" -%>
   <%= javascript_include_tag "jquery-treeview/jquery.treeview.async.js" -%>
   <%= javascript_include_tag "flexigrid.js" -%>
   <%= javascript_include_tag "facebox.js" -%>
-  <%= javascript_include_tag "jquery.timers.js" -%>
+  <%#= javascript_include_tag "jquery.timers.js" -%>
   <%= javascript_include_tag "jquery-svg/jquery.svg.pack.js" -%>
   <!--%= javascript_include_tag "jquery-svg/jquery.svgfilter.js" -%-->
   <%= javascript_include_tag "jquery-svg/jquery.svggraph.js" -%>
-  <!--%= javascript_include_tag "jquery.ui-1.5b4/ui.core.js" -%>
-  < %= javascript_include_tag "jquery.ui-1.5b4/ui.tabs.js" -%-->
   <%= javascript_include_tag "jquery.cookie.js" -%>
-  <%= javascript_include_tag "jquery.livequery.pack.js" -%>
+  <%= javascript_include_tag "jquery.livequery.min.js" -%>
   <%= javascript_include_tag "jquery.form.js" -%>
   <%= javascript_include_tag "jquery.jgrowl.js" -%>
 
@@ -40,37 +38,9 @@
   <%= javascript_include_tag "ovirt.js" -%>
     <script type="text/javascript">
       var $tabs, selected_tab;
-      $(document).ready(function(){  
+      $(document).ready(function(){
+         $.ajaxSetup({error: function(xhr) {$.jGrowl(xhr.status + ' ' + xhr.statusText);}});
             $('a[rel*=facebox]').livequery(function(){$(this).facebox();},function(){});
-            $('#side a').livequery(function(){
-                $(this).bind('click', function(){ 
-                    currentNode = $(this).parent().parent()[0].id;
-                    if ($tabs != null) {
-                    var tabType = $tabs.data("pool_type.tabs");
-                    ($(this).attr('href').indexOf(tabType) == -1) ?selected_tab = 0 :selected_tab = $tabs.data("selected.tabs");
-                    }
-                    $('#side span').each(function(){
-                        var nodeType = $(this).attr('class');
-                        if (nodeType.indexOf('_') != -1){
-                            nodeType = nodeType.substr(nodeType.indexOf('_') +1);
-                            $(this).attr('class', nodeType);
-                        }                        
-                    });
-                    var nodeType = $(this).parent().attr('class');
-                    $(this).parent().attr('class', 'current_' + nodeType);
-                    $.ajax({
-                        url: $(this).attr('href'),
-                        type: 'GET',
-                        data: {ajax:true,tab:selected_tab},
-                        //data: {nolayout:true},
-                        dataType: 'html',
-                        success: function(data) {
-                          $('#side-toolbar').html($(data).find('div.toolbar'));
-                          $('#tabs-and-content-container').html($(data).not('div#side-toolbar'));
-                        },
-                        error: function(xhr) {$.jGrowl(xhr.status + ' ' + xhr.statusText);}
-                    });
-                    return false;})},function(){});
             $('.dialog_tab_nav a').livequery(function(){
                 $(this).bind('click', function(){
                     $('.dialog_tab_nav li').removeClass('current');
diff --git a/src/public/images/icon_add_smartpool.png b/src/public/images/icon_add_smartpool.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7cb7316596b1eafbcad54890971f42737d45a62
GIT binary patch
literal 1341
zcmV-D1;YA?P)<h;3K|Lk000e1NJLTq0018V0018d1^@s7XsITz00001b5ch_0Itp)
z=>Px#32;bRa{vGe at Bjb`@Bu=sG?)MY1ma0VK~zY`?Uj8 at m1P*lf6sdk2N4b*32Gpj
ziIr#}C<=4BR93E5nbW3j`bTK1wQ`NkwdGP<I&+%SGMr_8v}Lp5DrT%42!5m_a$+JN
znu#8ik0Ws4aK7L7?hk|@QFOLy&Fin{eeUPFuIGNA`?(+J4=cVoEq2>x0Wbs1Je}!`
ze{g(M at wQp<036Moz3Z2+-<aJm9l3!%lg6=BasDv&Ptg;VL-E*;a7R$xgZa57vMJ at H
zB*xoR#W4eq*F)yg{GK?48&Y at 4{sb}h#Y_46DB&MQck=e~O;WZ$r?PiU1312IIsgf=
zWyB>6O)lU4OwT6G0K?PY9_K6=d)8_VBT?0;+Pa3m3Q1GuR$Z)UMA at 5B^-Wl!$L#L2
z0HDR?qfDNgR at y!hzxx{hBGw%|BO)TTW#2C@*_bScR>%Eba->ELc-SH$ukJnBC;0L6
zZ79H&w~>rxh3d8f0Ebq`O4h38F2U+~C|@(8081QVNu;ASDCIxqtC=h7RKEfMMVm7}
z3v*X5&6qeG(FLUxm=q_=u3;KEzjV|~JF?=!mFuQs=!U2HoH@=C#8GouPLyBg_^Ae(
zt1ih<i%wH at UUhHsef*u5aoxc)0&uoCSAJSKSc*SNpM0zJ=H5hrHn+cLJaYVK`8ju4
zX|uyMEG{;p>6TTuY|n{4ZD+ at l44{Vd1s`zrLVeLwZxzq_E4im&7CTq4V at U>WZa=SU
z+o1gbT*zk3)VWw=5@*`>z96S}&XRt~uB&AL?0;=KsZ&CcOS$0EFzP-fZL)<4GbUnE
z{{C}*GP`u#;q}RRR?F4LCro-6P1CxPl1_BFj;%BgmuYmzEpHmY;SJ*?^`TB8t)X2(
zrP0>z=1lz%MlZ<EN=Qg3yveyI4<m^3ctHFJ3Z*nOw+D at AdK3F4<7p(=VQ{{|OT9ma
z1ha!7krC(}b=>lA_aG{X at +KW$+S)}&-*2=&_O7meZ444Hh2OtL|N9ov8{PA at r@ocK
zwWB0|IdU+^RMlPVC0nMcyU|wznXme;0)RCyrl6EkMIWXt3<;0?${K4WWKbwUpH6#o
zd%)*%F35VvcHo}OMMReGJ9S&qmWAoK8V?aMEE8AbNlx#{7V9H()WrE))jgZ{{$8^4
zH~@RIr}kavSc9SkF&@AjOrfga6YS-MttJf{3PTG)vqZ)-BzYc_Ufw$Eww=6ZH%h7e
z93(t?7&BHj(B=;Ga&&{Y5}Lk5dC!CHLTTX)9 at I?w!gZv-@<a^o-)0(tc6{x2TI<TF
zJ+|-e&fIojh3MW^JXenq9c^ORh-it8)f7fMV(6ekQD~qvKoE2=d?;lCQxpz|LBo|6
z91TrgLqb2#de8pm9h=+FS6EFU5&GqV9NlrH=nIRPMKO_P9!-kH8Wo1<Mpvu9L01Tv
zG&-CfYA-lwX>mzJ(i}B3ZE2b*G}1F_Y(~u;{dRy6V^Vq^jicM2^($Ws;;uzpouC4s
z3n+Ety-*+;Xa;(R2MGv~56w^zvOQ_S)3)0coOz&%>};$eO!E_A31abj!0-|9>)4$E
z+yR5ZAsUHM7D6l<gM0=NrXWq%EAdL`pn<dpG&h2sVA4ShE;jjb1~i<yMJ$68I+Ugb
zb+5~OuGMLcH2YMP#UR9_A^uK+0nhy|{olkN%sNK%{HL at T00000NkvXXu0mjfQ2usz

literal 0
HcmV?d00001

diff --git a/src/public/images/icon_smartpool.png b/src/public/images/icon_smartpool.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ed0af0d2f2da5b34d13491ebe06f64a9450b5ec
GIT binary patch
literal 641
zcmV-{0)G98P)<h;3K|Lk000e1NJLTq000gE000gM1^@s7XiptS00001b5ch_0Itp)
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<B=)fr2A^FZ9B_&;-y<D&ygAEwlUu?8
zXWrl1=*kUkH{2rM&r55dNVKW#5S_qN>OgCO?qQ8bXY*%b6TKMABl7yX+X_>W+dJjd
z*#@*RiZ;R2Aa*aK{hv_)UHA6OiHbRtXp~Y6$A425SX5T*=MN#m*9wJ=6mE2hu{<L2
z at jmNMwFkFJ)<{x!wGGEoGp)_9P`ZGv)t8kTdg_;h$1A~@vNp1=1N6KM<$wn7mdfF3
zFQ5UFj=o>i-<nYc0CrI at H=iq6OkAGbzzhWd#X3#<*edoCFI&t6sZ=xvv=Mpt{VFNj
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`

literal 0
HcmV?d00001

diff --git a/src/public/javascripts/ovirt.js b/src/public/javascripts/ovirt.js
index 28585fd..4579c80 100644
--- a/src/public/javascripts/ovirt.js
+++ b/src/public/javascripts/ovirt.js
@@ -1,6 +1,5 @@
 // ovirt-specific javascript functions are defined here
 
-
 // helper functions for dialogs and action links
 
 
@@ -41,7 +40,7 @@ function add_hosts(url)
     if (validate_selected(hosts, "host")) {
       $.post(url,
              { resource_ids: hosts.toString() },
-              function(data,status){ 
+              function(data,status){
                 $(document).trigger('close.facebox');
 	        grid = $("#hosts_grid");
                 if (grid.size()>0 && grid != null) {
@@ -142,11 +141,11 @@ function ajax_validation(response, status)
     $(".fieldWithErrors").removeClass("fieldWithErrors");
     $("div.errorExplanation").remove();
     if (!response.success && response.errors ) {
-      for(i=0; i<response.errors.length; i++) { 
+      for(i=0; i<response.errors.length; i++) {
         var element = $("div.form_field:has(#"+response.object + "_" + response.errors[i][0]+")");
         if (element) {
           element.addClass("fieldWithErrors");
-          for(j=0; j<response.errors[i][1].length; j++) { 
+          for(j=0; j<response.errors[i][1].length; j++) {
             element.append('<div class="errorExplanation">'+response.errors[i][1][j]+'</div>');
           }
         }
@@ -163,9 +162,7 @@ function afterHwPool(response, status){
     ajax_validation(response, status);
     if (response.success) {
       $(document).trigger('close.facebox');
-      // FIXME do we need to reload the tree here
-
-      // this is for reloading the host/storage grid when 
+      // this is for reloading the host/storage grid when
       // adding hosts/storage to a new HW pool
       if (response.resource_type) {
         grid = $('#' + response.resource_type + '_grid');
@@ -176,9 +173,12 @@ function afterHwPool(response, status){
         }
       }
       
+      //FIXME: point all these refs at a widget so we dont need the functions in here
+      processTree();
+
       if ((response.resource_type == 'hosts' ? get_selected_hosts() : get_selected_storage()).indexOf($('#'+response.resource_type+'_selection_id').html()) != -1){
 	  empty_summary(response.resource_type +'_selection', (response.resource_type == 'hosts' ? 'Host' : 'Storage Pool'));
-      }   
+      }
       // do we have HW pools grid?
       //$("#vmpools_grid").flexReload()
     }
@@ -193,12 +193,14 @@ function afterVmPool(response, status){
       } else {
         $tabs.tabs("load",$tabs.data('selected.tabs'));
       }
+      processTree();
     }
 }
 function afterSmartPool(response, status){
     ajax_validation(response, status);
     if (response.success) {
       $(document).trigger('close.facebox');
+      processTree();
     }
 }
 function afterStoragePool(response, status){
@@ -208,7 +210,7 @@ function afterStoragePool(response, status){
       grid = $("#storage_grid");
       if (grid.size()>0 && grid != null) {
         grid.flexReload();
-      } else {;
+      } else {
         $tabs.tabs("load",$tabs.data('selected.tabs'));
       }
     }
@@ -238,7 +240,7 @@ function afterVm(response, status){
     }
 }
 
-//selection detail refresh 
+//selection detail refresh
 function refresh_summary(element_id, url, obj_id){
   $('#'+element_id+'').load(url, { id: obj_id})
 }
@@ -289,10 +291,10 @@ function delete_pool(delete_url, id)
   $.post(delete_url,
          {id: id},
           function(data,status){
+            //no more flex reload?
+            processTree();
             if (data.alert) {
               $.jGrowl(data.alert);
             }
            }, 'json');
-}
-
-
+}
\ No newline at end of file
diff --git a/src/public/javascripts/ovirt.tree.js b/src/public/javascripts/ovirt.tree.js
new file mode 100644
index 0000000..77f0233
--- /dev/null
+++ b/src/public/javascripts/ovirt.tree.js
@@ -0,0 +1,71 @@
+function processTree (){
+  $("#nav_tree_form").ajaxSubmit({
+    url: tree_url,
+    type: "POST",
+    dataType: "json",
+    success: function(response){
+      // First, remove any deleted items from the tree
+      $.each(response.deleted, function(name, value){
+          //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:last')
+              .children('div')
+              .click();
+            }
+            $('#' + value.id).parent().remove();
+          }
+      });
+
+      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);
+      }
+    }
+  });
+}
+
+function processChildren(list, templateObj){
+/*  TODO: In future, we may need an additional state here of 'moved' which deletes
+ *  the item where it was in the tree and adds it to its new parent.
+*/
+  $.each(list, function(n,data){
+    var updatedNode;
+    if(data.state === 'changed'){
+      $('input[value^=' + data.id + '-]').attr('value', data.id + '-' + data.name);
+      $('#' + data.id).html(data.name);
+    } else if(data.state === 'new') {
+        /* If the elem with id matching the parent id has a sibling that is a ul,
+         * we should append the result of processing the template to the existing
+         * sublist.  Otherwise, we need to add a new sublist and add it there.
+        */
+       var result  = templateObj.process(data);
+       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
+           $('#smart_nav_tree > li:last:not(:has(ul))').append(result);
+         } else {
+           $('#' + data.parent_id).parent().append('<ul>' + result + '</ul>');
+           $('#' + data.parent_id).siblings('span').addClass('expanded');
+         }
+       }
+      }
+    else {
+      if (data.children) {
+          processChildren(data.children, templateObj);
+      }
+    }
+  });
+}
\ 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
new file mode 100644
index 0000000..43e7dbc
--- /dev/null
+++ b/src/public/javascripts/smart_nav_test_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/trimpath-template-1.0.38.js b/src/public/javascripts/trimpath-template-1.0.38.js
new file mode 100644
index 0000000..fd0898d
--- /dev/null
+++ b/src/public/javascripts/trimpath-template-1.0.38.js
@@ -0,0 +1,397 @@
+/**
+ * TrimPath Template. Release 1.0.38.
+ * Copyright (C) 2004, 2005 Metaha.
+ *
+ * TrimPath Template is licensed under the GNU General Public License
+ * and the Apache License, Version 2.0, as follows:
+ *
+ * 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; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+var TrimPath;
+
+// TODO: Debugging mode vs stop-on-error mode - runtime flag.
+// TODO: Handle || (or) characters and backslashes.
+// TODO: Add more modifiers.
+
+(function() {               // Using a closure to keep global namespace clean.
+    if (TrimPath == null)
+        TrimPath = new Object();
+    if (TrimPath.evalEx == null)
+        TrimPath.evalEx = function(src) { return eval(src); };
+
+    var UNDEFINED;
+    if (Array.prototype.pop == null)  // IE 5.x fix from Igor Poteryaev.
+        Array.prototype.pop = function() {
+            if (this.length === 0) {return UNDEFINED;}
+            return this[--this.length];
+        };
+    if (Array.prototype.push == null) // IE 5.x fix from Igor Poteryaev.
+        Array.prototype.push = function() {
+            for (var i = 0; i < arguments.length; ++i) {this[this.length] = arguments[i];}
+            return this.length;
+        };
+
+    TrimPath.parseTemplate = function(tmplContent, optTmplName, optEtc) {
+        if (optEtc == null)
+            optEtc = TrimPath.parseTemplate_etc;
+        var funcSrc = parse(tmplContent, optTmplName, optEtc);
+        var func = TrimPath.evalEx(funcSrc, optTmplName, 1);
+        if (func != null)
+            return new optEtc.Template(optTmplName, tmplContent, funcSrc, func, optEtc);
+        return null;
+    }
+
+    try {
+        String.prototype.process = function(context, optFlags) {
+            var template = TrimPath.parseTemplate(this, null);
+            if (template != null)
+                return template.process(context, optFlags);
+            return this;
+        }
+    } catch (e) { // Swallow exception, such as when String.prototype is sealed.
+    }
+
+    TrimPath.parseTemplate_etc = {};            // Exposed for extensibility.
+    TrimPath.parseTemplate_etc.statementTag = "forelse|for|if|elseif|else|var|macro";
+    TrimPath.parseTemplate_etc.statementDef = { // Lookup table for statement tags.
+        "if"     : { delta:  1, prefix: "if (", suffix: ") {", paramMin: 1 },
+        "else"   : { delta:  0, prefix: "} else {" },
+        "elseif" : { delta:  0, prefix: "} else if (", suffix: ") {", paramDefault: "true" },
+        "/if"    : { delta: -1, prefix: "}" },
+        "for"    : { delta:  1, paramMin: 3,
+            prefixFunc : function(stmtParts, state, tmplName, etc) {
+                if (stmtParts[2] != "in")
+                    throw new etc.ParseError(tmplName, state.line, "bad for loop statement: " + stmtParts.join(' '));
+                var iterVar = stmtParts[1];
+                var listVar = "__LIST__" + iterVar;
+                return [ "var ", listVar, " = ", stmtParts[3], ";",
+                    // Fix from Ross Shaull for hash looping, make sure that we have an array of loop lengths to treat like a stack.
+                    "var __LENGTH_STACK__;",
+                    "if (typeof(__LENGTH_STACK__) == 'undefined' || !__LENGTH_STACK__.length) __LENGTH_STACK__ = new Array();",
+                    "__LENGTH_STACK__[__LENGTH_STACK__.length] = 0;", // Push a new for-loop onto the stack of loop lengths.
+                    "if ((", listVar, ") != null) { ",
+                    "var ", iterVar, "_ct = 0;",       // iterVar_ct variable, added by B. Bittman
+                    "for (var ", iterVar, "_index in ", listVar, ") { ",
+                    iterVar, "_ct++;",
+                    "if (typeof(", listVar, "[", iterVar, "_index]) == 'function') {continue;}", // IE 5.x fix from Igor Poteryaev.
+                    "__LENGTH_STACK__[__LENGTH_STACK__.length - 1]++;",
+                    "var ", iterVar, " = ", listVar, "[", iterVar, "_index];" ].join("");
+            } },
+        "forelse" : { delta:  0, prefix: "} } if (__LENGTH_STACK__[__LENGTH_STACK__.length - 1] == 0) { if (", suffix: ") {", paramDefault: "true" },
+        "/for"    : { delta: -1, prefix: "} }; delete __LENGTH_STACK__[__LENGTH_STACK__.length - 1];" }, // Remove the just-finished for-loop from the stack of loop lengths.
+        "var"     : { delta:  0, prefix: "var ", suffix: ";" },
+        "macro"   : { delta:  1,
+            prefixFunc : function(stmtParts, state, tmplName, etc) {
+                var macroName = stmtParts[1].split('(')[0];
+                return [ "var ", macroName, " = function",
+                    stmtParts.slice(1).join(' ').substring(macroName.length),
+                    "{ var _OUT_arr = []; var _OUT = { write: function(m) { if (m) _OUT_arr.push(m); } }; " ].join('');
+            } },
+        "/macro"  : { delta: -1, prefix: " return _OUT_arr.join(''); };" }
+    }
+    TrimPath.parseTemplate_etc.modifierDef = {
+        "eat"        : function(v)    { return ""; },
+        "escape"     : function(s)    { return String(s).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;"); },
+        "capitalize" : function(s)    { return String(s).toUpperCase(); },
+        "default"    : function(s, d) { return s != null ? s : d; }
+    }
+    TrimPath.parseTemplate_etc.modifierDef.h = TrimPath.parseTemplate_etc.modifierDef.escape;
+
+    TrimPath.parseTemplate_etc.Template = function(tmplName, tmplContent, funcSrc, func, etc) {
+        this.process = function(context, flags) {
+            if (context == null)
+                context = {};
+            if (context._MODIFIERS == null)
+                context._MODIFIERS = {};
+            if (context.defined == null)
+                context.defined = function(str) { return (context[str] != undefined); };
+            for (var k in etc.modifierDef) {
+                if (context._MODIFIERS[k] == null)
+                    context._MODIFIERS[k] = etc.modifierDef[k];
+            }
+            if (flags == null)
+                flags = {};
+            var resultArr = [];
+            var resultOut = { write: function(m) { resultArr.push(m); } };
+            try {
+                func(resultOut, context, flags);
+            } catch (e) {
+                if (flags.throwExceptions == true)
+                    throw e;
+                var result = new String(resultArr.join("") + "[ERROR: " + e.toString() + (e.message ? '; ' + e.message : '') + "]");
+                result["exception"] = e;
+                return result;
+            }
+            return resultArr.join("");
+        }
+        this.name       = tmplName;
+        this.source     = tmplContent;
+        this.sourceFunc = funcSrc;
+        this.toString   = function() { return "TrimPath.Template [" + tmplName + "]"; }
+    }
+    TrimPath.parseTemplate_etc.ParseError = function(name, line, message) {
+        this.name    = name;
+        this.line    = line;
+        this.message = message;
+    }
+    TrimPath.parseTemplate_etc.ParseError.prototype.toString = function() {
+        return ("TrimPath template ParseError in " + this.name + ": line " + this.line + ", " + this.message);
+    }
+
+    var parse = function(body, tmplName, etc) {
+        body = cleanWhiteSpace(body);
+        var funcText = [ "var TrimPath_Template_TEMP = function(_OUT, _CONTEXT, _FLAGS) { with (_CONTEXT) {" ];
+        var state    = { stack: [], line: 1 };                              // TODO: Fix line number counting.
+        var endStmtPrev = -1;
+        while (endStmtPrev + 1 < body.length) {
+            var begStmt = endStmtPrev;
+            // Scan until we find some statement markup.
+            begStmt = body.indexOf("{", begStmt + 1);
+            while (begStmt >= 0) {
+                var endStmt = body.indexOf('}', begStmt + 1);
+                var stmt = body.substring(begStmt, endStmt);
+                var blockrx = stmt.match(/^\{(cdata|minify|eval)/); // From B. Bittman, minify/eval/cdata implementation.
+                if (blockrx) {
+                    var blockType = blockrx[1];
+                    var blockMarkerBeg = begStmt + blockType.length + 1;
+                    var blockMarkerEnd = body.indexOf('}', blockMarkerBeg);
+                    if (blockMarkerEnd >= 0) {
+                        var blockMarker;
+                        if( blockMarkerEnd - blockMarkerBeg <= 0 ) {
+                            blockMarker = "{/" + blockType + "}";
+                        } else {
+                            blockMarker = body.substring(blockMarkerBeg + 1, blockMarkerEnd);
+                        }
+
+                        var blockEnd = body.indexOf(blockMarker, blockMarkerEnd + 1);
+                        if (blockEnd >= 0) {
+                            emitSectionText(body.substring(endStmtPrev + 1, begStmt), funcText);
+
+                            var blockText = body.substring(blockMarkerEnd + 1, blockEnd);
+                            if (blockType == 'cdata') {
+                                emitText(blockText, funcText);
+                            } else if (blockType == 'minify') {
+                                emitText(scrubWhiteSpace(blockText), funcText);
+                            } else if (blockType == 'eval') {
+                                if (blockText != null && blockText.length > 0) // From B. Bittman, eval should not execute until process().
+                                    funcText.push('_OUT.write( (function() { ' + blockText + ' })() );');
+                            }
+                            begStmt = endStmtPrev = blockEnd + blockMarker.length - 1;
+                        }
+                    }
+                } else if (body.charAt(begStmt - 1) != '$' &&               // Not an expression or backslashed,
+                body.charAt(begStmt - 1) != '\\') {              // so check if it is a statement tag.
+                    var offset = (body.charAt(begStmt + 1) == '/' ? 2 : 1); // Close tags offset of 2 skips '/'.
+                    // 10 is larger than maximum statement tag length.
+                    if (body.substring(begStmt + offset, begStmt + 10 + offset).search(TrimPath.parseTemplate_etc.statementTag) == 0)
+                        break;                                              // Found a match.
+                }
+                begStmt = body.indexOf("{", begStmt + 1);
+            }
+            if (begStmt < 0)                              // In "a{for}c", begStmt will be 1.
+                break;
+            var endStmt = body.indexOf("}", begStmt + 1); // In "a{for}c", endStmt will be 5.
+            if (endStmt < 0)
+                break;
+            emitSectionText(body.substring(endStmtPrev + 1, begStmt), funcText);
+            emitStatement(body.substring(begStmt, endStmt + 1), state, funcText, tmplName, etc);
+            endStmtPrev = endStmt;
+        }
+        emitSectionText(body.substring(endStmtPrev + 1), funcText);
+        if (state.stack.length != 0)
+            throw new etc.ParseError(tmplName, state.line, "unclosed, unmatched statement(s): " + state.stack.join(","));
+        funcText.push("}}; TrimPath_Template_TEMP");
+        return funcText.join("");
+    }
+
+    var emitStatement = function(stmtStr, state, funcText, tmplName, etc) {
+        var parts = stmtStr.slice(1, -1).split(' ');
+        var stmt = etc.statementDef[parts[0]]; // Here, parts[0] == for/if/else/...
+        if (stmt == null) {                    // Not a real statement.
+            emitSectionText(stmtStr, funcText);
+            return;
+        }
+        if (stmt.delta < 0) {
+            if (state.stack.length <= 0)
+                throw new etc.ParseError(tmplName, state.line, "close tag does not match any previous statement: " + stmtStr);
+            state.stack.pop();
+        }
+        if (stmt.delta > 0)
+            state.stack.push(stmtStr);
+
+        if (stmt.paramMin != null &&
+            stmt.paramMin >= parts.length)
+            throw new etc.ParseError(tmplName, state.line, "statement needs more parameters: " + stmtStr);
+        if (stmt.prefixFunc != null)
+            funcText.push(stmt.prefixFunc(parts, state, tmplName, etc));
+        else
+            funcText.push(stmt.prefix);
+        if (stmt.suffix != null) {
+            if (parts.length <= 1) {
+                if (stmt.paramDefault != null)
+                    funcText.push(stmt.paramDefault);
+            } else {
+                for (var i = 1; i < parts.length; i++) {
+                    if (i > 1)
+                        funcText.push(' ');
+                    funcText.push(parts[i]);
+                }
+            }
+            funcText.push(stmt.suffix);
+        }
+    }
+
+    var emitSectionText = function(text, funcText) {
+        if (text.length <= 0)
+            return;
+        var nlPrefix = 0;               // Index to first non-newline in prefix.
+        var nlSuffix = text.length - 1; // Index to first non-space/tab in suffix.
+        while (nlPrefix < text.length && (text.charAt(nlPrefix) == '\n'))
+            nlPrefix++;
+        while (nlSuffix >= 0 && (text.charAt(nlSuffix) == ' ' || text.charAt(nlSuffix) == '\t'))
+            nlSuffix--;
+        if (nlSuffix < nlPrefix)
+            nlSuffix = nlPrefix;
+        if (nlPrefix > 0) {
+            funcText.push('if (_FLAGS.keepWhitespace == true) _OUT.write("');
+            var s = text.substring(0, nlPrefix).replace('\n', '\\n'); // A macro IE fix from BJessen.
+            if (s.charAt(s.length - 1) == '\n')
+              s = s.substring(0, s.length - 1);
+            funcText.push(s);
+            funcText.push('");');
+        }
+        var lines = text.substring(nlPrefix, nlSuffix + 1).split('\n');
+        for (var i = 0; i < lines.length; i++) {
+            emitSectionTextLine(lines[i], funcText);
+            if (i < lines.length - 1)
+                funcText.push('_OUT.write("\\n");\n');
+        }
+        if (nlSuffix + 1 < text.length) {
+            funcText.push('if (_FLAGS.keepWhitespace == true) _OUT.write("');
+            var s = text.substring(nlSuffix + 1).replace('\n', '\\n');
+            if (s.charAt(s.length - 1) == '\n')
+              s = s.substring(0, s.length - 1);
+            funcText.push(s);
+            funcText.push('");');
+        }
+    }
+
+    var emitSectionTextLine = function(line, funcText) {
+        var endMarkPrev = '}';
+        var endExprPrev = -1;
+        while (endExprPrev + endMarkPrev.length < line.length) {
+            var begMark = "${", endMark = "}";
+            var begExpr = line.indexOf(begMark, endExprPrev + endMarkPrev.length); // In "a${b}c", begExpr == 1
+            if (begExpr < 0)
+                break;
+            if (line.charAt(begExpr + 2) == '%') {
+                begMark = "${%";
+                endMark = "%}";
+            }
+            var endExpr = line.indexOf(endMark, begExpr + begMark.length);         // In "a${b}c", endExpr == 4;
+            if (endExpr < 0)
+                break;
+            emitText(line.substring(endExprPrev + endMarkPrev.length, begExpr), funcText);
+            // Example: exprs == 'firstName|default:"John Doe"|capitalize'.split('|')
+            var exprArr = line.substring(begExpr + begMark.length, endExpr).replace(/\|\|/g, "#@@#").split('|');
+            for (var k in exprArr) {
+                if (exprArr[k].replace) // IE 5.x fix from Igor Poteryaev.
+                    exprArr[k] = exprArr[k].replace(/#@@#/g, '||');
+            }
+            funcText.push('_OUT.write(');
+            emitExpression(exprArr, exprArr.length - 1, funcText);
+            funcText.push(');');
+            endExprPrev = endExpr;
+            endMarkPrev = endMark;
+        }
+        emitText(line.substring(endExprPrev + endMarkPrev.length), funcText);
+    }
+
+    var emitText = function(text, funcText) {
+        if (text == null ||
+            text.length <= 0)
+            return;
+        text = text.replace(/\\/g, '\\\\');
+        text = text.replace(/\n/g, '\\n');
+        text = text.replace(/"/g,  '\\"');
+        funcText.push('_OUT.write("');
+        funcText.push(text);
+        funcText.push('");');
+    }
+
+    var emitExpression = function(exprArr, index, funcText) {
+        // Ex: foo|a:x|b:y1,y2|c:z1,z2 is emitted as c(b(a(foo,x),y1,y2),z1,z2)
+        var expr = exprArr[index]; // Ex: exprArr == [firstName,capitalize,default:"John Doe"]
+        if (index <= 0) {          // Ex: expr    == 'default:"John Doe"'
+            funcText.push(expr);
+            return;
+        }
+        var parts = expr.split(':');
+        funcText.push('_MODIFIERS["');
+        funcText.push(parts[0]); // The parts[0] is a modifier function name, like capitalize.
+        funcText.push('"](');
+        emitExpression(exprArr, index - 1, funcText);
+        if (parts.length > 1) {
+            funcText.push(',');
+            funcText.push(parts[1]);
+        }
+        funcText.push(')');
+    }
+
+    var cleanWhiteSpace = function(result) {
+        result = result.replace(/\t/g,   "    ");
+        result = result.replace(/\r\n/g, "\n");
+        result = result.replace(/\r/g,   "\n");
+        result = result.replace(/^(\s*\S*(\s+\S+)*)\s*$/, '$1'); // Right trim by Igor Poteryaev.
+        return result;
+    }
+
+    var scrubWhiteSpace = function(result) {
+        result = result.replace(/^\s+/g,   "");
+        result = result.replace(/\s+$/g,   "");
+        result = result.replace(/\s+/g,   " ");
+        result = result.replace(/^(\s*\S*(\s+\S+)*)\s*$/, '$1'); // Right trim by Igor Poteryaev.
+        return result;
+    }
+
+    // The DOM helper functions depend on DOM/DHTML, so they only work in a browser.
+    // However, these are not considered core to the engine.
+    //
+    TrimPath.parseDOMTemplate = function(elementId, optDocument, optEtc) {
+        if (optDocument == null)
+            optDocument = document;
+        var element = optDocument.getElementById(elementId);
+        var content = element.value;     // Like textarea.value.
+        if (content == null)
+            content = element.innerHTML; // Like textarea.innerHTML.
+        content = content.replace(/&lt;/g, "<").replace(/&gt;/g, ">");
+        return TrimPath.parseTemplate(content, elementId, optEtc);
+    }
+
+    TrimPath.processDOMTemplate = function(elementId, context, optFlags, optDocument, optEtc) {
+        return TrimPath.parseDOMTemplate(elementId, optDocument, optEtc).process(context, optFlags);
+    }
+}) ();
diff --git a/src/public/stylesheets/ovirt-tree/tree.css b/src/public/stylesheets/ovirt-tree/tree.css
new file mode 100644
index 0000000..5fefb90
--- /dev/null
+++ b/src/public/stylesheets/ovirt-tree/tree.css
@@ -0,0 +1,83 @@
+#nav_tree {
+   padding: 20px;
+}
+
+.nav-tree {
+    width: 222px;
+    position: absolute;
+    overflow: auto;
+    top: 25px;
+    bottom: 140px;
+}
+
+.ovirt-tree, .ovirt-tree ul {
+    list-style: none;
+    margin:0;
+    padding:5px 0 5px 16px;
+    margin-right: 8px;
+}
+
+.ovirt-tree div {
+    background-repeat: no-repeat;
+    background-position: left;
+    padding: 4px 0 4px 28px;
+    cursor: pointer;
+}
+
+.HardwarePool {
+    background-image: url('../../images/icon_hdwarepool.png');
+}
+
+.VmResourcePool {
+    background-image: url('../../images/icon_vmpool.png');
+}
+
+.SmartPool {
+    background-image: url('../../images/icon_smartpool.png');
+}
+
+.hitarea {
+	width: 16px;
+	margin-left: -16px;
+	float: left;
+	cursor: pointer;
+}
+
+.expandable {
+    background: url('../../images/plus.gif') no-repeat left;
+}
+
+.expanded {
+    background: url('../../images/minus.gif') no-repeat left;
+}
+
+ul.ovirt-tree .current {
+    background-color: #698FA6;
+    color:#000000;
+    width: 100%;
+}
+
+.nav-smart-pool {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    height: 130px;
+    background: #CCCCCC;
+    width: 218px;
+    padding: 5px 5px 5px 5px;
+    overflow: auto;
+}
+
+.nav-smart-pool-header {
+    color: #666666;
+}
+
+.nav-dashboard {
+    background-image: url('../../images/icon_dashboard.gif');
+    background-repeat: no-repeat;
+    background-position: left;
+    padding: 0px 0 0px 28px;
+    position: absolute;
+    height: 25px;
+    top: 0;
+}
\ No newline at end of file
-- 
1.5.5.2



From apevec at redhat.com  Tue Oct  7 18:17:04 2008
From: apevec at redhat.com (Alan Pevec)
Date: Tue, 07 Oct 2008 20:17:04 +0200
Subject: [Ovirt-devel] [PATCH node-image] Clean up dependancies
	from	libvirt-qpid install.
In-Reply-To: <1223402821-30794-1-git-send-email-imain@redhat.com>
References: <1223402821-30794-1-git-send-email-imain@redhat.com>
Message-ID: <48EBA7A0.5000305@redhat.com>

ACK just add BuildRequires: appliance-tools >= 002-3 in ovirt-node-image.spec
to get image-minimizer



From jguiditt at redhat.com  Tue Oct  7 18:52:33 2008
From: jguiditt at redhat.com (Jason Guiditta)
Date: Tue, 07 Oct 2008 14:52:33 -0400
Subject: [Ovirt-devel] [PATCH] move dialog fix.
In-Reply-To: <1223389816-28541-1-git-send-email-sseago@redhat.com>
References: <1223389816-28541-1-git-send-email-sseago@redhat.com>
Message-ID: <1223405553.4791.1.camel@localhost.localdomain>

On Tue, 2008-10-07 at 10:30 -0400, Scott Seago wrote:
> fixes a problem in the move (and add pool to smart pool) dialogs when permission was granted to the top level DirectoryPool rather than to individual HW pools. This code will be going away soon anyway, as we need to migrate the dialog tree view away from the legacy implementation to jguiditta's new tree code.
> 
> This fixes BZ 464273 and 464398.
> 
> Signed-off-by: Scott Seago <sseago at redhat.com>
> ---
>  src/app/controllers/hardware_controller.rb |    8 ++++++++
>  1 files changed, 8 insertions(+), 0 deletions(-)
> 
> diff --git a/src/app/controllers/hardware_controller.rb b/src/app/controllers/hardware_controller.rb
> index 42ff9cb..9c04210 100644
> --- a/src/app/controllers/hardware_controller.rb
> +++ b/src/app/controllers/hardware_controller.rb
> @@ -76,6 +76,14 @@ class HardwareController < PoolController
>        open_list = []
>      else
>        pools = Pool.list_for_user(get_login_user,Permission::PRIV_VIEW)
> +      hw_root = HardwarePool.get_default_pool
> +      if !(pools.include?(hw_root))
> +        if pools.include?(DirectoryPool.get_directory_root)
> +          pools << hw_root
> +        elsif pools.include?(DirectoryPool.get_hardware_root)
> +          pools << hw_root
> +        end
> +      end
>        current_id = params[:current_id]
>        if current_id
>          current_pool = Pool.find(current_id)

ACK.  This works for me in both cases noted in the BZs



From apevec at redhat.com  Tue Oct  7 18:58:08 2008
From: apevec at redhat.com (Alan Pevec)
Date: Tue, 07 Oct 2008 20:58:08 +0200
Subject: [Ovirt-devel] [PATCH node] Add libvirt-qpid to the node
In-Reply-To: <1222969350-29823-1-git-send-email-imain@redhat.com>
References: <1222969350-29823-1-git-send-email-imain@redhat.com>
Message-ID: <48EBB140.5040306@redhat.com>

Ian Main wrote:
> This patch adds libvirt-qpid to the node image and sets it up
> so it will connect to the server in the given DNS SRV record.

ACK



From apevec at redhat.com  Tue Oct  7 19:07:41 2008
From: apevec at redhat.com (Alan Pevec)
Date: Tue, 07 Oct 2008 21:07:41 +0200
Subject: [Ovirt-devel] [PATCH recipe] Add qpidd to the wui
In-Reply-To: <1222970111-30065-1-git-send-email-imain@redhat.com>
References: <1222969465-29898-1-git-send-email-imain@redhat.com>
	<1222970111-30065-1-git-send-email-imain@redhat.com>
Message-ID: <48EBB37D.4060207@redhat.com>

Ian Main wrote:
> This patch adds qpidd to the wui, configures a DNS SRV record for
> its address, opens up the firewall port, creates a config for qpidd
> etc.
> 
> Amended: Seems I missed restarting qpidd so it will take
>          configuration changes.

ACK - w/ a condition to keep on prodding qpid team to add gssapi :)



From jguiditt at redhat.com  Tue Oct  7 19:16:49 2008
From: jguiditt at redhat.com (Jason Guiditta)
Date: Tue, 07 Oct 2008 15:16:49 -0400
Subject: [Ovirt-devel] [PATCH] fix for BZ 464395
In-Reply-To: <1223304481-10254-1-git-send-email-sseago@redhat.com>
References: <1223304481-10254-1-git-send-email-sseago@redhat.com>
Message-ID: <1223407009.4791.4.camel@localhost.localdomain>

On Mon, 2008-10-06 at 10:48 -0400, Scott Seago wrote:
> 'add first pool to this smart pool' link was constructed incorrectly.
> 
> Signed-off-by: Scott Seago <sseago at redhat.com>
> ---
>  src/app/views/smart_pools/show_pools.rhtml |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/src/app/views/smart_pools/show_pools.rhtml b/src/app/views/smart_pools/show_pools.rhtml
> index 8e89701..fbf6858 100644
> --- a/src/app/views/smart_pools/show_pools.rhtml
> +++ b/src/app/views/smart_pools/show_pools.rhtml
> @@ -67,7 +67,7 @@
>            <div class="no-grid-items-text">
>              No pools found in this pool. <br/><br/>
>              <%= image_tag "icon_addpool.png", :style=>"vertical-align:middle;" %>&nbsp;&nbsp;
> -            <a href="<%= url_for :controller => 'pool', :action => 'add_to_smart_pool', :smart_pool_id => @pool %>" rel="facebox[.bolder]">Add first Pool to this smart pool</a>
> +            <a href="<%= url_for :controller => 'smart_pools', :action => 'add_pool_dialog', :id => @pool %>" rel="facebox[.bolder]">Add first Pool to this smart pool</a>
>            </div>
>         </div>
>     </div>

ACK, this works for me.  However, you might want to change the image tag
to point at the new file from my patch - icon_add_smartpool.png since
this one (icon_addpool.png) does not exist.

-j



From jguiditt at redhat.com  Tue Oct  7 20:05:03 2008
From: jguiditt at redhat.com (Jason Guiditta)
Date: Tue,  7 Oct 2008 16:05:03 -0400
Subject: [Ovirt-devel] [PATCH server] Updated active_ldap plugin to match
	current gem rpm
Message-ID: <1223409903-8972-1-git-send-email-jguiditt@redhat.com>


Signed-off-by: Jason Guiditta <jguiditt at redhat.com>
---
 .../scaffold_active_ldap/templates/ldap.yml        |   21 -----------
 src/vendor/plugins/active_ldap/init.rb             |   37 ++------------------
 2 files changed, 3 insertions(+), 55 deletions(-)
 delete mode 100644 src/vendor/plugins/active_ldap/generators/scaffold_active_ldap/templates/ldap.yml

diff --git a/src/vendor/plugins/active_ldap/generators/scaffold_active_ldap/templates/ldap.yml b/src/vendor/plugins/active_ldap/generators/scaffold_active_ldap/templates/ldap.yml
deleted file mode 100644
index 720ec39..0000000
--- a/src/vendor/plugins/active_ldap/generators/scaffold_active_ldap/templates/ldap.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-development:
-  host: 127.0.0.1
-  port: 389
-  base: dc=devel,dc=local,dc=net
-  bind_dn: cn=admin,dc=local,dc=net
-  password: secret
-
-test:
-  host: 127.0.0.1
-  port: 389
-  base: dc=test,dc=local,dc=net
-  bind_dn: cn=admin,dc=local,dc=net
-  password: secret
-
-production:
-  host: 127.0.0.1
-  port: 389
-  method: :tls
-  base: dc=production,dc=local,dc=net
-  bind_dn: cn=admin,dc=local,dc=net
-  password: secret
diff --git a/src/vendor/plugins/active_ldap/init.rb b/src/vendor/plugins/active_ldap/init.rb
index fa1484a..3b4291e 100644
--- a/src/vendor/plugins/active_ldap/init.rb
+++ b/src/vendor/plugins/active_ldap/init.rb
@@ -1,7 +1,7 @@
 require_library_or_gem 'active_ldap'
 ActiveLdap::Base.logger ||= RAILS_DEFAULT_LOGGER
 
-required_version = ["0", "10", "0"]
+required_version = ["1", "0", "0"]
 if (ActiveLdap::VERSION.split(".") <=> required_version) < 0
   ActiveLdap::Base.class_eval do
     format = _("You need ActiveLdap %s or later")
@@ -25,40 +25,9 @@ class ::ActionView::Base
   include ActiveLdap::Helper
 end
 
+require 'active_ldap/action_controller/ldap_benchmarking'
 module ::ActionController
-  module LdapBenchmarking
-    def self.included(base)
-      base.class_eval do
-        alias_method_chain :render, :active_ldap_benchmark
-        alias_method_chain :rendering_runtime, :active_ldap
-      end
-    end
-
-    protected
-    def render_with_active_ldap_benchmark(*args, &block)
-      if logger
-        @ldap_runtime_before_render = ActiveLdap::Base.reset_runtime
-        result = render_without_active_ldap_benchmark(*args, &block)
-        @ldap_runtime_after_render = ActiveLdap::Base.reset_runtime
-        @rendering_runtime -= @ldap_runtime_after_render
-        result
-      else
-        render_without_active_ldap_benchmark(*args, &block)
-      end
-    end
-
-    private
-    def rendering_runtime_with_active_ldap(runtime)
-      result = rendering_runtime_without_active_ldap(runtime)
-      ldap_runtime = ActiveLdap::Base.reset_runtime
-      ldap_runtime += @ldap_runtime_before_render || 0
-      ldap_runtime += @ldap_runtime_after_render || 0
-      ldap_percentage = ldap_runtime * 100 / runtime
-      result + (" | LDAP: %.5f (%d%%)" % [ldap_runtime, ldap_percentage])
-    end
-  end
-
   class Base
-    include LdapBenchmarking
+    include ActiveLdap::ActionController::LdapBenchmarking
   end
 end
-- 
1.5.5.1



From fj0588di at aa.jp.fujitsu.com  Wed Oct  8 09:01:57 2008
From: fj0588di at aa.jp.fujitsu.com (S.Sakamoto)
Date: Wed, 8 Oct 2008 18:01:57 +0900
Subject: [Ovirt-devel] 0.93-1 oVirt Release
In-Reply-To: <48E230CB.20200@redhat.com>
References: <48DB0D64.5080502@redhat.com>
	<200809301903.EBC90646.69GE9JK0@aa.jp.fujitsu.com>
	<48E230CB.20200@redhat.com>
Message-ID: <200810081801.DFE37561.0G99JE6K@aa.jp.fujitsu.com>

> >> * oVirt Appliance manages VMs directly on the host it is running on.
> > What does this mean for details ? Please tell more information.
> > I got below from this sentence.
> > 
> > Until 0.92, oVirt doesn't show whether on which host(managed node) a VM is running.
> > But from this version(0.93-1), oVirt shows it.
> > 
> > Right ?
> 
> No, this is something different.  We still need to add to the UI the 
> ability for administrators to see which Node a given VM is running on.  We 
> also need to implement in the UI the ability to list all VMs running on a 
> given Node.  This is still in development.  Of course, if you have the 
> time and development skills to implement this, patches are always welcome.
> 
> What that bullet item is referring to is the following...
> 
> The Host that runs the oVirt Appliance can now be configured to look like 
> a Node.  You can manage VMs directly on the appliance host, instead of 
> needing to run the 'fake Nodes' in previous releases.  This new 
> functionality removes the need for fake nodes.
> 
> Does that answer your question?
> 
Hi,
Sorry for delaying response.

Thank you for your more information. I understand. 

Thanks,
Shigeki Sakamoto.



From clalance at redhat.com  Wed Oct  8 10:51:01 2008
From: clalance at redhat.com (Chris Lalancette)
Date: Wed, 08 Oct 2008 12:51:01 +0200
Subject: [Ovirt-devel] [PATCH server] Updated active_ldap plugin to match
	current gem rpm
In-Reply-To: <1223409903-8972-1-git-send-email-jguiditt@redhat.com>
References: <1223409903-8972-1-git-send-email-jguiditt@redhat.com>
Message-ID: <48EC9095.7070804@redhat.com>

Jason Guiditta wrote:
> Signed-off-by: Jason Guiditta <jguiditt at redhat.com>
> ---
>  .../scaffold_active_ldap/templates/ldap.yml        |   21 -----------
>  src/vendor/plugins/active_ldap/init.rb             |   37 ++------------------
>  2 files changed, 3 insertions(+), 55 deletions(-)
>  delete mode 100644 src/vendor/plugins/active_ldap/generators/scaffold_active_ldap/templates/ldap.yml

The code here is all in rubygem-activeldap-1.0.1, and that package is now in the
F-9 updates repository, so it looks good to go.

ACK

Chris Lalancette



From clalance at redhat.com  Wed Oct  8 10:53:47 2008
From: clalance at redhat.com (Chris Lalancette)
Date: Wed, 08 Oct 2008 12:53:47 +0200
Subject: [Ovirt-devel] [PATCH] fix for BZ 464395
In-Reply-To: <1223304481-10254-1-git-send-email-sseago@redhat.com>
References: <1223304481-10254-1-git-send-email-sseago@redhat.com>
Message-ID: <48EC913B.4020609@redhat.com>

Scott Seago wrote:
> diff --git a/src/app/views/smart_pools/show_pools.rhtml b/src/app/views/smart_pools/show_pools.rhtml
> index 8e89701..fbf6858 100644
> --- a/src/app/views/smart_pools/show_pools.rhtml
> +++ b/src/app/views/smart_pools/show_pools.rhtml
> @@ -67,7 +67,7 @@
>            <div class="no-grid-items-text">
>              No pools found in this pool. <br/><br/>
>              <%= image_tag "icon_addpool.png", :style=>"vertical-align:middle;" %>&nbsp;&nbsp;
> -            <a href="<%= url_for :controller => 'pool', :action => 'add_to_smart_pool', :smart_pool_id => @pool %>" rel="facebox[.bolder]">Add first Pool to this smart pool</a>
> +            <a href="<%= url_for :controller => 'smart_pools', :action => 'add_pool_dialog', :id => @pool %>" rel="facebox[.bolder]">Add first Pool to this smart pool</a>
>            </div>
>         </div>
>     </div>

Seems like an obvious typo (using the wrong controller)...

ACK

-- 
Chris Lalancette



From clalance at redhat.com  Wed Oct  8 10:59:25 2008
From: clalance at redhat.com (Chris Lalancette)
Date: Wed, 08 Oct 2008 12:59:25 +0200
Subject: [Ovirt-devel] [PATCH] move dialog fix.
In-Reply-To: <1223389816-28541-1-git-send-email-sseago@redhat.com>
References: <1223389816-28541-1-git-send-email-sseago@redhat.com>
Message-ID: <48EC928D.60506@redhat.com>

Scott Seago wrote:
> fixes a problem in the move (and add pool to smart pool) dialogs when permission was granted to the top level DirectoryPool rather than to individual HW pools. This code will be going away soon anyway, as we need to migrate the dialog tree view away from the legacy implementation to jguiditta's new tree code.
> 
> This fixes BZ 464273 and 464398.
> 
> Signed-off-by: Scott Seago <sseago at redhat.com>
> ---
>  src/app/controllers/hardware_controller.rb |    8 ++++++++
>  1 files changed, 8 insertions(+), 0 deletions(-)
> 
> diff --git a/src/app/controllers/hardware_controller.rb b/src/app/controllers/hardware_controller.rb
> index 42ff9cb..9c04210 100644
> --- a/src/app/controllers/hardware_controller.rb
> +++ b/src/app/controllers/hardware_controller.rb
> @@ -76,6 +76,14 @@ class HardwareController < PoolController
>        open_list = []
>      else
>        pools = Pool.list_for_user(get_login_user,Permission::PRIV_VIEW)
> +      hw_root = HardwarePool.get_default_pool
> +      if !(pools.include?(hw_root))
> +        if pools.include?(DirectoryPool.get_directory_root)
> +          pools << hw_root
> +        elsif pools.include?(DirectoryPool.get_hardware_root)
> +          pools << hw_root
> +        end
> +      end

Minor nit, in that you could get rid of a redundant "pools << hw_root" line by
doing "if pools.include?(...get_directory_root) or
pool.include?(...get_hardware_root)", but it's very minor.  If this code is
going away soon anyway, then no big deal, and...

ACK

-- 
Chris Lalancette



From clalance at redhat.com  Wed Oct  8 11:07:53 2008
From: clalance at redhat.com (Chris Lalancette)
Date: Wed, 08 Oct 2008 13:07:53 +0200
Subject: [Ovirt-devel] [PATCH server] Added a link from bonding to a boot
	type.
In-Reply-To: <1223390662-16536-1-git-send-email-dpierce@redhat.com>
References: <1223390662-16536-1-git-send-email-dpierce@redhat.com>
Message-ID: <48EC9489.3040902@redhat.com>

Darryl L. Pierce wrote:
> Previously the bondings had one of two paths: it could either
> explicitly set a static IP address or else fallback to an implicit
> DHCP boot.
> 
> This change will require that bondings be explicitly configured
> in the same way as a standard network interface.
> 
> Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
> ---
>  src/app/models/bonding.rb                      |   10 +++++++
>  src/db/migrate/023_add_boot_type_to_bonding.rb |   31 ++++++++++++++++++++++++
>  src/test/fixtures/bondings.yml                 |    1 +
>  src/test/unit/bonding_test.rb                  |   20 +++++++++++----
>  4 files changed, 57 insertions(+), 5 deletions(-)
>  create mode 100644 src/db/migrate/023_add_boot_type_to_bonding.rb

Yes, this is reasonable.  I like things to be a little more explicit, so having
an explicit "DHCP" (as opposed to implicit) makes things better.

ACK
-- 
Chris Lalancette



From clalance at redhat.com  Wed Oct  8 11:41:42 2008
From: clalance at redhat.com (Chris Lalancette)
Date: Wed, 08 Oct 2008 13:41:42 +0200
Subject: [Ovirt-devel] [PATCH server] Added support for booting a VM from
	an	ISO image.
In-Reply-To: <1223066798-11393-1-git-send-email-dpierce@redhat.com>
References: <1223066798-11393-1-git-send-email-dpierce@redhat.com>
Message-ID: <48EC9C76.1090902@redhat.com>

Darryl L. Pierce wrote:
> Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
> ---
>  src/app/controllers/vm_controller.rb |   13 ++++--
>  src/app/models/vm.rb                 |   31 ++++++++++++-
>  src/task-omatic/task_vm.rb           |   85 ++++++++++++++++++++++++++++-----
>  src/test/unit/vm_test.rb             |   56 +++++++++++++++++++++-
>  4 files changed, 163 insertions(+), 22 deletions(-)
> 
> diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb
> index f5c0845..8b16c94 100644
> --- a/src/app/controllers/vm_controller.rb
> +++ b/src/app/controllers/vm_controller.rb
> @@ -223,13 +223,18 @@ class VmController < ApplicationController
>    def _setup_provisioning_options
>      @provisioning_options = [[Vm::PXE_OPTION_LABEL, Vm::PXE_OPTION_VALUE],
>                               [Vm::HD_OPTION_LABEL, Vm::HD_OPTION_VALUE]]
> -    # FIXME add cobbler images too
> +
>      begin
> +      @provisioning_options += Cobbler::Image.find.collect do |image|
> +        [image.name + Vm::COBBLER_IMAGE_SUFFIX,
> +          "#{Vm::IMAGE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{image.name}"]
> +      end
> +
>        @provisioning_options += Cobbler::Profile.find.collect do |profile|
>          [profile.name + Vm::COBBLER_PROFILE_SUFFIX,
> -         Vm::COBBLER_PREFIX + Vm::PROVISIONING_DELIMITER +
> -         Vm::PROFILE_PREFIX + Vm::PROVISIONING_DELIMITER + profile.name]
> -      end
> +          "#{Vm::PROFILE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{profile.name}"]
> +
> +    end
>      rescue
>        #if cobbler doesn't respond/is misconfigured/etc just don't add profiles
>      end
> diff --git a/src/app/models/vm.rb b/src/app/models/vm.rb
> index ace6fb1..963da84 100644
> --- a/src/app/models/vm.rb
> +++ b/src/app/models/vm.rb
> @@ -49,7 +49,7 @@ class Vm < ActiveRecord::Base
>    PROFILE_PREFIX         = "profile"
>    IMAGE_PREFIX           = "image"
>    COBBLER_PROFILE_SUFFIX = " (Cobbler Profile)"
> -  COBBLER_IMAGE_SUFFIX   = " (Cobbler Profile)"
> +  COBBLER_IMAGE_SUFFIX   = " (Cobbler Image)"
>  
>    PXE_OPTION_LABEL       = "PXE Boot"
>    PXE_OPTION_VALUE       = "pxe"
> @@ -139,7 +139,12 @@ class Vm < ActiveRecord::Base
>    end
>  
>    def provisioning_and_boot_settings=(settings)
> -    if settings==PXE_OPTION_VALUE
> +    # if the settings have a prefix that matches cobber settings, then process
> +    # those details
> +    if settings =~ /\@#{COBBLER_PREFIX}/
> +      self[:boot_device] = BOOT_DEV_NETWORK
> +      self[:provisioning] = settings
> +    elsif settings==PXE_OPTION_VALUE
>        self[:boot_device]= BOOT_DEV_NETWORK
>        self[:provisioning]= nil
>      elsif settings==HD_OPTION_VALUE
> @@ -242,6 +247,28 @@ class Vm < ActiveRecord::Base
>      vm_resource_pool.search_users
>    end
>  
> +  # Reports whether the VM is uses Cobbler for booting.
> +  #
> +  def uses_cobbler?
> +    (self.provisioning != nil) && (self.provisioning.include? COBBLER_PREFIX)
> +  end
> +
> +  # Returns the cobbler type.
> +  #
> +  def cobbler_type
> +    if self.uses_cobbler?
> +      self.provisioning[/^(.*)@/,1]
> +    end
> +  end
> +
> +  # Returns the cobbler provisioning name.
> +  #
> +  def cobbler_name
> +    if self.uses_cobbler?
> +      self.provisioning[/^.*@.*:(.*)/,1]
> +    end
> +  end
> +
>    protected
>    def validate
>      resources = vm_resource_pool.max_resources_for_vm(self)
> diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb
> index 3588224..0c1be3a 100644
> --- a/src/task-omatic/task_vm.rb
> +++ b/src/task-omatic/task_vm.rb
> @@ -65,16 +65,26 @@ def create_vm_xml(name, uuid, memAllocated, memUsed, vcpus, bootDevice,
>    doc.root.elements["devices"].add_element("emulator")
>    doc.root.elements["devices"].elements["emulator"].text = "/usr/bin/qemu-kvm"
>  
> -  devs = [ 'hda', 'hdb', 'hdc', 'hdd' ]
> -  i = 0
> +  devs = [ 'hda', 'hdb', 'hdd', 'hde', 'hdf' ]

This can't work.  As it stands now, the qemu device model has 2 IDE controllers
with a master/slave per controller, for a maximum of 4 devices.  That's
generally what hardware has (had) as well, and nobody is really interested in
pushing that up.  We really need to switch to using SCSI and/or virtio, but
until we do, you can't just add an hdf; it has no chance of working.

> +  which_device = 0
>    diskDevices.each do |disk|
> +    is_cdrom = (disk =~ /\.iso/) ? true : false
> +    
>      diskdev = Element.new("disk")
> -    diskdev.add_attribute("type", "block")
> -    diskdev.add_attribute("device", "disk")
> -    diskdev.add_element("source", {"dev" => disk})
> -    diskdev.add_element("target", {"dev" => devs[i]})
> +    diskdev.add_attribute("type", is_cdrom ? "file" : "block")
> +    diskdev.add_attribute("device", is_cdrom ? "cdrom" : "disk")
> +
> +    if is_cdrom
> +      diskdev.add_element("readonly")
> +      diskdev.add_element("source", {"file" => disk})
> +      diskdev.add_element("target", {"dev" => "hdc", "bus" => "ide"})
> +    else
> +      diskdev.add_element("source", {"dev" => disk})
> +      diskdev.add_element("target", {"dev" => devs[which_device]})
> +    end
> +
>      doc.root.elements["devices"] << diskdev
> -    i += 1
> +    which_device += 1 unless is_cdrom
>    end

This is really not the best way to do this, either.  The right thing to do here
is to leave the loop pretty much as-is, but then to add the proper entries to
the "devs" array in the caller.  That way this loop remains stupid, and anything
smarter happens higher up in the chain.  That includes the "type", the "device",
etc etc etc.  This also allows you to get rid of keying on ".iso" as whether
this is a CD-ROM or not, which is a much better way to do it (it is kind of
far-fetched, but there's no real reason your guest disk can't be on an NFS share
and named my_guest.iso).

>  
>    doc.root.elements["devices"].add_element("interface", {"type" => "bridge"})
> @@ -154,15 +164,12 @@ def create_vm(task)
>    # create cobbler system profile
>    begin
>      if vm.provisioning and !vm.provisioning.empty?
> -      provisioning_arr = vm.provisioning.split(Vm::PROVISIONING_DELIMITER)
> -      if provisioning_arr[0]==Vm::COBBLER_PREFIX
> -        if provisioning_arr[1]==Vm::PROFILE_PREFIX
> +      if vm.uses_cobbler?
> +        if vm.cobbler_type == Vm::PROFILE_PREFIX:
>            system = Cobbler::System.new('name' => vm.uuid,
>                                         'profile' => provisioning_arr[2])
>            system.interfaces=[Cobbler::NetworkInterface.new({'mac_address' => vm.vnic_mac_addr})]
>            system.save
> -        elsif provisioning_arr[1]==Vm::IMAGE_PREFIX
> -          #FIXME handle cobbler images
>          end
>        end
>      end
> @@ -231,6 +238,22 @@ def shutdown_vm(task)
>    setVmShutdown(vm)
>  end
>  
> +# Find thes storage pool with the given ip address and export path.
> +#
> +def find_storage_pool(ip_addr, export_path)
> +  result = StoragePool.find(:first, 
> +    :conditions => 
> +      ['ip_addr = ? and export_path = ?',ip_addr, export_path])
> +
> +  if result
> +    puts "Found #{ip_addr}:#{export_path}"
> +  else
> +    puts "FUCK!"

Heh.  Well, you want to get rid of these puts; either raise an exception here
and let the higher level print out your exception, or just be quiet and let the
caller decide what to do if result == nil.

> +  end
> +  
> +  return result
> +end
> +
>  def start_vm(task)
>    puts "start_vm"
>  
> @@ -268,8 +291,44 @@ def start_vm(task)
>  
>      conn = Libvirt::open("qemu+tcp://" + host.hostname + "/system")
>  
> -    storagedevs = connect_storage_pools(conn, vm)
> +    # if the VM is an image, then prepare things
> +    if vm.uses_cobbler? && (vm.cobbler_type == Vm::IMAGE_PREFIX)
> +      details = Cobbler::Image.find_one(vm.cobbler_name)
> +      raise Exception.new("Image #{vm.cobbler_name} not found in Cobbler server") unless details
> +
> +      ignored, ip_addr, export_path, filename =
> +        details.file.split(/(.*):(.*)\/(.*)/)
>  
> +      found = false
> +
> +      vm.storage_volumes.each do |volume|
> +        if volume.filename == filename
> +          if (volume.storage_pool.ip_addr == ip_addr) &&
> +          (volume.storage_pool.export_path == export_path)
> +            found = true
> +          end
> +        end
> +      end
> +
> +      unless found
> +        puts "Creating a new NFS storage volume"
> +        image_volume = StorageVolume.factory("NFS",
> +          :filename => filename
> +        )
> +        
> +        image_volume.storage_pool  
> +        image_pool = find_storage_pool(ip_addr, export_path)
> +        if image_pool
> +          image_pool.storage_volumes << image_volume
> +          image_pool.save!
> +        end
> +        vm.storage_volumes << image_volume
> +        vm.save!
> +      end
> +    end

I'm not quite sure what's going on here.  It looks like you are looking for the
storage volume to exist in the guest's list of storage volumes, and then if it
doesn't exist, create it.  But this is not taskomatics job; the UI frontend
should have added anything it cared about.  I'm not quite sure why you want
taskomatic to do this, unless I am missing something and it is unavoidable
because of Cobbler.

Also, since none of the preceding code requires "conn" to operate properly, I
would move conn down to here.  I'm not sure if Ruby's garbage collector closes
stray fd's automatically, but there's no reason to take a chance; just open up
conn right before you need it.

-- 
Chris Lalancette



From clalance at redhat.com  Wed Oct  8 11:51:26 2008
From: clalance at redhat.com (Chris Lalancette)
Date: Wed, 08 Oct 2008 13:51:26 +0200
Subject: [Ovirt-devel] [PATCH server] Replaced the config scripts with
	configuration encoding.
In-Reply-To: <1223314773-18127-1-git-send-email-dpierce@redhat.com>
References: <1223314773-18127-1-git-send-email-dpierce@redhat.com>
Message-ID: <48EC9EBE.2030601@redhat.com>

Darryl L. Pierce wrote:
> *** NOTE ***
> This patch is a request for comments. I'm looking for some feedback on the encoding
> strategy I'm using below. The goal is to get away from using embedded scripts and to
> instead just describe the desired state to the node.
> *** NOTE ***
> 
> Rather than sending the node a series of scripts that load
> kernel modules, or are tightly coupled to tools like augeas,
> this patch introduces an encoding scheme for data.
> 
> A line that begins with "kmod" describes a kernel module that
> needs to be loaded. It will containing the module's name, an
> optional alias for the module, and then the module options
> if such are required.
> 
> A line that begins with "ifcfg" describes an network
> interface. It will contain the mac address and interface name,
> followed by all needed configuration values to bring the
> interface up.

This is definitely a step in the right direction.  I'm still a tiny bit
concerned about using the generic "kmod", as opposed to just "bonding"; the
former gives us more flexibility, but still leaves a security hole for loading
any random kernel module.  The latter means that we have to implement something
different for every new thing we want to support, but that's not necessarily a
bad thing.  So instead of:

kmod=[module name]|[module alias]|[module options]

I think I would rather see:

bonding=alias|options

For the ifcfg, that looks fine to me, as long as the number of delimited fields
is unlimited, and all of the additional field would be put in the ifcfg- script.
 That is, this is perfectly valid:

ifcfg=00:11:22:33:44|eth0|BOOTPROTO=dhcp|bridge=ovirtbr0|ONBOOT=yes

but so is:

ifcfg=00:11:22:33:44|eth0|BOOTPROTO=dhcp|bridge=ovirtbr0|ONBOOT=yes|DELAY=0

Chris Lalancette



From dpierce at redhat.com  Wed Oct  8 12:07:11 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Wed, 08 Oct 2008 08:07:11 -0400
Subject: [Ovirt-devel] [PATCH server] Replaced the config scripts with
	configuration encoding.
In-Reply-To: <48EC9EBE.2030601@redhat.com>
References: <1223314773-18127-1-git-send-email-dpierce@redhat.com>
	<48EC9EBE.2030601@redhat.com>
Message-ID: <48ECA26F.90907@redhat.com>

Chris Lalancette wrote:
> This is definitely a step in the right direction.  I'm still a tiny bit
> concerned about using the generic "kmod", as opposed to just "bonding"; the
> former gives us more flexibility, but still leaves a security hole for loading
> any random kernel module.  The latter means that we have to implement something
> different for every new thing we want to support, but that's not necessarily a
> bad thing.  So instead of:
> 
> kmod=[module name]|[module alias]|[module options]
> 
> I think I would rather see:
> 
> bonding=alias|options

I'm fine with either direction. I did it for the flexibility, being able
to load other modules via the same mechanism. But there's no need for
doing so now, so I can easily move the code to use an implicit bonding
module instead.

> 
> For the ifcfg, that looks fine to me, as long as the number of delimited fields
> is unlimited, and all of the additional field would be put in the ifcfg- script.
>  That is, this is perfectly valid:
> 
> ifcfg=00:11:22:33:44|eth0|BOOTPROTO=dhcp|bridge=ovirtbr0|ONBOOT=yes
> 
> but so is:
> 
> ifcfg=00:11:22:33:44|eth0|BOOTPROTO=dhcp|bridge=ovirtbr0|ONBOOT=yes|DELAY=0

The code on the node side supports this. It expects the first two fields
to be the mac address and the iface name. Everything else it just moves
through, pulls out the key and value pairs and builds the augtool file
from them.

-- 
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081008/21adfc01/attachment.vcf>

From jim at meyering.net  Wed Oct  8 13:08:50 2008
From: jim at meyering.net (Jim Meyering)
Date: Wed, 08 Oct 2008 15:08:50 +0200
Subject: [Ovirt-devel] [PATCH node-image] avoid image-minimizer fall-out
Message-ID: <87abdf5j4t.fsf@rho.meyering.net>


>From 8e45eb82fb7ed450de78e48aeaa8bd34b04313e1 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Wed, 8 Oct 2008 14:59:31 +0200
Subject: [PATCH node-image] ovirt-node-image.ks (%post): Include common-post.ks last

I noticed the following error go by today:

    Removing blacklisted files and directories
    Cleanup empty directory structures in /usr/share
    Running image-minimizer...
==> Unknown Command: touch
    e2fsck 1.41.0 (10-Jul-2008)
    Pass 1: Checking inodes, blocks, and sizes

That's due to the new use of image-minimizer in common-post.ks (cool, btw!).
It appears at the end of that file:

    echo "Cleanup empty directory structures in /usr/share"
    find /usr/share -type d -exec rmdir {} \; > /dev/null 2>&1

    echo "Running image-minimizer..."
    %post --nochroot --interpreter image-minimizer
    drop /usr/lib/libboost*
    keep /usr/lib/libboost_program_options.so*
    keep /usr/lib/libboost_filesystem.so*
    drop /usr/lib64/libboost*
    keep /usr/lib64/libboost_program_options.so*
    keep /usr/lib64/libboost_filesystem.so*

However, common-post.ks is included from ovirt-node-image.ks like this:

    ...
    %post
    %include common-post.ks

    touch /.autorelabel

    %end

Which means the "touch" command is interpreted by image-minimizer.
Whoops.

The patch below fixes that by moving the "touch" to precede the
inclusion of common-post.ks:
---
 ovirt-node-image.ks |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ovirt-node-image.ks b/ovirt-node-image.ks
index f5695d8..36b5da9 100644
--- a/ovirt-node-image.ks
+++ b/ovirt-node-image.ks
@@ -8,10 +8,13 @@
 %end

 %post
-%include common-post.ks

 touch /.autorelabel

+%include common-post.ks
+# CAUTION: don't include anything between the inclusion of common-post.ks
+# and the "%end" directive below.  Since the tail of common-post.ks invokes
+# image-minimizer, anything here would be interpreted as commands to it.
 %end

 %post --nochroot
--
1.6.0.2.307.gc427



From dpierce at redhat.com  Wed Oct  8 13:18:09 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Wed, 08 Oct 2008 09:18:09 -0400
Subject: [Ovirt-devel] [PATCH server] Added support for booting a VM from
	an	ISO image.
In-Reply-To: <48EC9C76.1090902@redhat.com>
References: <1223066798-11393-1-git-send-email-dpierce@redhat.com>
	<48EC9C76.1090902@redhat.com>
Message-ID: <48ECB311.90302@redhat.com>

Chris Lalancette wrote:
>> -  devs = [ 'hda', 'hdb', 'hdc', 'hdd' ]
>> -  i = 0
>> +  devs = [ 'hda', 'hdb', 'hdd', 'hde', 'hdf' ]
> 
> This can't work.  As it stands now, the qemu device model has 2 IDE controllers
> with a master/slave per controller, for a maximum of 4 devices.  That's
> generally what hardware has (had) as well, and nobody is really interested in
> pushing that up.  We really need to switch to using SCSI and/or virtio, but
> until we do, you can't just add an hdf; it has no chance of working.

Done. But, we'll want to make sure there's some logic added to the VM
creation page to disallow adding more than four storage devices.

>> +  which_device = 0
>>    diskDevices.each do |disk|
>> +    is_cdrom = (disk =~ /\.iso/) ? true : false
>> +    
>>      diskdev = Element.new("disk")
>> -    diskdev.add_attribute("type", "block")
>> -    diskdev.add_attribute("device", "disk")
>> -    diskdev.add_element("source", {"dev" => disk})
>> -    diskdev.add_element("target", {"dev" => devs[i]})
>> +    diskdev.add_attribute("type", is_cdrom ? "file" : "block")
>> +    diskdev.add_attribute("device", is_cdrom ? "cdrom" : "disk")
>> +
>> +    if is_cdrom
>> +      diskdev.add_element("readonly")
>> +      diskdev.add_element("source", {"file" => disk})
>> +      diskdev.add_element("target", {"dev" => "hdc", "bus" => "ide"})
>> +    else
>> +      diskdev.add_element("source", {"dev" => disk})
>> +      diskdev.add_element("target", {"dev" => devs[which_device]})
>> +    end
>> +
>>      doc.root.elements["devices"] << diskdev
>> -    i += 1
>> +    which_device += 1 unless is_cdrom
>>    end
> 
> This is really not the best way to do this, either.  The right thing to do here
> is to leave the loop pretty much as-is, but then to add the proper entries to
> the "devs" array in the caller.  That way this loop remains stupid, and anything
> smarter happens higher up in the chain.  That includes the "type", the "device",
> etc etc etc.  This also allows you to get rid of keying on ".iso" as whether
> this is a CD-ROM or not, which is a much better way to do it (it is kind of
> far-fetched, but there's no real reason your guest disk can't be on an NFS share
> and named my_guest.iso).

That was one of the issues I was troubling over is identifying which
disk is the image from Cobbler and which are just regular storage
devices from the pool. The trade off of doing the processing higher in
the callstack is that the higher code will now have to dig through the
VM's XML, figure out which device node is the image and then modify it.
Not sure if that's a better solution either.

>> +      unless found
>> +        puts "Creating a new NFS storage volume"
>> +        image_volume = StorageVolume.factory("NFS",
>> +          :filename => filename
>> +        )
>> +        
>> +        image_volume.storage_pool  
>> +        image_pool = find_storage_pool(ip_addr, export_path)
>> +        if image_pool
>> +          image_pool.storage_volumes << image_volume
>> +          image_pool.save!
>> +        end
>> +        vm.storage_volumes << image_volume
>> +        vm.save!
>> +      end
>> +    end
> 
> I'm not quite sure what's going on here.  It looks like you are looking for the
> storage volume to exist in the guest's list of storage volumes, and then if it
> doesn't exist, create it.  But this is not taskomatics job; the UI frontend
> should have added anything it cared about.  I'm not quite sure why you want
> taskomatic to do this, unless I am missing something and it is unavoidable
> because of Cobbler.

There's a subsequent call to connect_storage_devices which is calling
build to create any undefined storage pools. But, if it's better to do
that elsewhere, I can refactor the code and move that storage out to a
separate taskomatic call during the create_vm portion rather than the
start_vm portion.

> Also, since none of the preceding code requires "conn" to operate properly, I
> would move conn down to here.  I'm not sure if Ruby's garbage collector closes
> stray fd's automatically, but there's no reason to take a chance; just open up
> conn right before you need it.

Done. Good catch.

Any ideas on how to get this patch to have the VM actually boot from the
CDROM? That's the last big stumbling block I've been hitting. I have to
manually intervene to get the VM to boot from it.

-- 
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081008/a8289402/attachment.vcf>

From jim at meyering.net  Wed Oct  8 13:36:06 2008
From: jim at meyering.net (Jim Meyering)
Date: Wed, 08 Oct 2008 15:36:06 +0200
Subject: [Ovirt-devel] [PATCH server] Added support for booting a VM from
	an	ISO image.
In-Reply-To: <48ECB311.90302@redhat.com> (Darryl Pierce's message of "Wed, 08
	Oct 2008 09:18:09 -0400")
References: <1223066798-11393-1-git-send-email-dpierce@redhat.com>
	<48EC9C76.1090902@redhat.com> <48ECB311.90302@redhat.com>
Message-ID: <874p3n5hvd.fsf@rho.meyering.net>

Darryl Pierce <dpierce at redhat.com> wrote:
> Chris Lalancette wrote:
>>> -  devs = [ 'hda', 'hdb', 'hdc', 'hdd' ]
>>> -  i = 0
>>> +  devs = [ 'hda', 'hdb', 'hdd', 'hde', 'hdf' ]
>>
>> This can't work.  As it stands now, the qemu device model has 2 IDE controllers
>> with a master/slave per controller, for a maximum of 4 devices.  That's
>> generally what hardware has (had) as well, and nobody is really interested in
>> pushing that up.  We really need to switch to using SCSI and/or virtio, but
>> until we do, you can't just add an hdf; it has no chance of working.
>
> Done. But, we'll want to make sure there's some logic added to the VM
> creation page to disallow adding more than four storage devices.
>
>>> +  which_device = 0
>>>    diskDevices.each do |disk|
>>> +    is_cdrom = (disk =~ /\.iso/) ? true : false
>>> +    <<<=========

Hi Darryl,

I noticed that that line would add trailing spaces
(for me, they're highlighted).
You'll want to remove them and any others before pushing.
That will save you the trouble of an automatically-rejected push attempt.



From berrange at redhat.com  Wed Oct  8 14:04:40 2008
From: berrange at redhat.com (Daniel P. Berrange)
Date: Wed, 8 Oct 2008 15:04:40 +0100
Subject: [Ovirt-devel] [PATCH node-image] avoid image-minimizer fall-out
In-Reply-To: <87abdf5j4t.fsf@rho.meyering.net>
References: <87abdf5j4t.fsf@rho.meyering.net>
Message-ID: <20081008140440.GC19052@redhat.com>

On Wed, Oct 08, 2008 at 03:08:50PM +0200, Jim Meyering wrote:
> 
> >From 8e45eb82fb7ed450de78e48aeaa8bd34b04313e1 Mon Sep 17 00:00:00 2001
> From: Jim Meyering <meyering at redhat.com>
> Date: Wed, 8 Oct 2008 14:59:31 +0200
> Subject: [PATCH node-image] ovirt-node-image.ks (%post): Include common-post.ks last
> 
> I noticed the following error go by today:
> 
>     Removing blacklisted files and directories
>     Cleanup empty directory structures in /usr/share
>     Running image-minimizer...
> ==> Unknown Command: touch

The image minimiser should immediately exit with non-zero status
upon errors, not merely print a warning which could be missed in
the line noise for months.

>     e2fsck 1.41.0 (10-Jul-2008)
>     Pass 1: Checking inodes, blocks, and sizes
> 
> That's due to the new use of image-minimizer in common-post.ks (cool, btw!).
> It appears at the end of that file:
> 
>     echo "Cleanup empty directory structures in /usr/share"
>     find /usr/share -type d -exec rmdir {} \; > /dev/null 2>&1
> 
>     echo "Running image-minimizer..."
>     %post --nochroot --interpreter image-minimizer
>     drop /usr/lib/libboost*
>     keep /usr/lib/libboost_program_options.so*
>     keep /usr/lib/libboost_filesystem.so*
>     drop /usr/lib64/libboost*
>     keep /usr/lib64/libboost_program_options.so*
>     keep /usr/lib64/libboost_filesystem.so*
> 
> However, common-post.ks is included from ovirt-node-image.ks like this:
> 
>     ...
>     %post
>     %include common-post.ks
> 
>     touch /.autorelabel
> 
>     %end
> 
> Which means the "touch" command is interpreted by image-minimizer.
> Whoops.
> 
> The patch below fixes that by moving the "touch" to precede the
> inclusion of common-post.ks:
> ---
>  ovirt-node-image.ks |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)
> 
> diff --git a/ovirt-node-image.ks b/ovirt-node-image.ks
> index f5695d8..36b5da9 100644
> --- a/ovirt-node-image.ks
> +++ b/ovirt-node-image.ks
> @@ -8,10 +8,13 @@
>  %end
> 
>  %post
> -%include common-post.ks
> 
>  touch /.autorelabel
> 
> +%include common-post.ks
> +# CAUTION: don't include anything between the inclusion of common-post.ks
> +# and the "%end" directive below.  Since the tail of common-post.ks invokes
> +# image-minimizer, anything here would be interpreted as commands to it.


How about instead, adding another  '%post' at the end of the 'common-post.ks'
script, so that it resets things back to being processed by 'sh', instead
of the image-minimizer. 

If an include file changes semantics for a period, it is good practice to
restore the original semantics to avoid these kind of surprises.

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 jim at meyering.net  Wed Oct  8 14:16:09 2008
From: jim at meyering.net (Jim Meyering)
Date: Wed, 08 Oct 2008 16:16:09 +0200
Subject: [Ovirt-devel] [PATCH node-image] avoid image-minimizer fall-out
In-Reply-To: <20081008140440.GC19052@redhat.com> (Daniel P. Berrange's message
	of "Wed, 8 Oct 2008 15:04:40 +0100")
References: <87abdf5j4t.fsf@rho.meyering.net>
	<20081008140440.GC19052@redhat.com>
Message-ID: <87y70z41g6.fsf@rho.meyering.net>

"Daniel P. Berrange" <berrange at redhat.com> wrote:
...
> How about instead, adding another  '%post' at the end of the 'common-post.ks'
> script, so that it resets things back to being processed by 'sh', instead
> of the image-minimizer.
>
> If an include file changes semantics for a period, it is good practice to
> restore the original semantics to avoid these kind of surprises.

Yes, that's better.  Thanks:

>From 321b3fe26c9fe6252693d54db6f320864a7249e5 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Wed, 8 Oct 2008 16:14:51 +0200
Subject: [PATCH node-image] common-post.ks: add empty %post marker at end

I noticed the following error go by today:

    Removing blacklisted files and directories
    Cleanup empty directory structures in /usr/share
    Running image-minimizer...
==> Unknown Command: touch
    e2fsck 1.41.0 (10-Jul-2008)
    Pass 1: Checking inodes, blocks, and sizes

That's due to the new use of image-minimizer in common-post.ks (cool, btw!).
It appears at the end of that file:

    echo "Cleanup empty directory structures in /usr/share"
    find /usr/share -type d -exec rmdir {} \; > /dev/null 2>&1

    echo "Running image-minimizer..."
    %post --nochroot --interpreter image-minimizer
    drop /usr/lib/libboost*
    keep /usr/lib/libboost_program_options.so*
    keep /usr/lib/libboost_filesystem.so*
    drop /usr/lib64/libboost*
    keep /usr/lib64/libboost_program_options.so*
    keep /usr/lib64/libboost_filesystem.so*

However, common-post.ks is included from ovirt-node-image.ks like this:

    ...
    %post
    %include common-post.ks

    touch /.autorelabel

    %end

Which means the "touch" command is interpreted by image-minimizer.

The patch below fixes that by adding an %post directive after
the image-minimizer list, in order to restore the expected state.
---
 common-post.ks |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/common-post.ks b/common-post.ks
index deee9a5..a38820b 100644
--- a/common-post.ks
+++ b/common-post.ks
@@ -156,3 +156,7 @@ keep /usr/lib/libboost_filesystem.so*
 drop /usr/lib64/libboost*
 keep /usr/lib64/libboost_program_options.so*
 keep /usr/lib64/libboost_filesystem.so*
+
+# this empty "%post" section ends image-minimizer input, so that when this
+# file is inserted into another .ks file, they're in the expected state.
+%post
--
1.6.0.2.307.gc427



From bkearney at redhat.com  Wed Oct  8 14:42:47 2008
From: bkearney at redhat.com (Bryan Kearney)
Date: Wed, 08 Oct 2008 10:42:47 -0400
Subject: [Ovirt-devel] [PATCH node-image] avoid image-minimizer fall-out
In-Reply-To: <20081008140440.GC19052@redhat.com>
References: <87abdf5j4t.fsf@rho.meyering.net>
	<20081008140440.GC19052@redhat.com>
Message-ID: <48ECC6E7.3010906@redhat.com>

Daniel P. Berrange wrote:
> On Wed, Oct 08, 2008 at 03:08:50PM +0200, Jim Meyering wrote:
>> >From 8e45eb82fb7ed450de78e48aeaa8bd34b04313e1 Mon Sep 17 00:00:00 2001
>> From: Jim Meyering <meyering at redhat.com>
>> Date: Wed, 8 Oct 2008 14:59:31 +0200
>> Subject: [PATCH node-image] ovirt-node-image.ks (%post): Include common-post.ks last
>>
>> I noticed the following error go by today:
>>
>>     Removing blacklisted files and directories
>>     Cleanup empty directory structures in /usr/share
>>     Running image-minimizer...
>> ==> Unknown Command: touch
> 
> The image minimiser should immediately exit with non-zero status
> upon errors, not merely print a warning which could be missed in
> the line noise for months.

This is the current behavior (it returns a 1). I believe that the ks 
file continues. HUFF... can you see if you are eating the return code in 
the appliance-creator?

-- bk



From berrange at redhat.com  Wed Oct  8 14:49:57 2008
From: berrange at redhat.com (Daniel P. Berrange)
Date: Wed, 8 Oct 2008 15:49:57 +0100
Subject: [Ovirt-devel] [PATCH node-image] avoid image-minimizer fall-out
In-Reply-To: <48ECC6E7.3010906@redhat.com>
References: <87abdf5j4t.fsf@rho.meyering.net>
	<20081008140440.GC19052@redhat.com> <48ECC6E7.3010906@redhat.com>
Message-ID: <20081008144957.GG19052@redhat.com>

On Wed, Oct 08, 2008 at 10:42:47AM -0400, Bryan Kearney wrote:
> Daniel P. Berrange wrote:
> >On Wed, Oct 08, 2008 at 03:08:50PM +0200, Jim Meyering wrote:
> >>>From 8e45eb82fb7ed450de78e48aeaa8bd34b04313e1 Mon Sep 17 00:00:00 2001
> >>From: Jim Meyering <meyering at redhat.com>
> >>Date: Wed, 8 Oct 2008 14:59:31 +0200
> >>Subject: [PATCH node-image] ovirt-node-image.ks (%post): Include 
> >>common-post.ks last
> >>
> >>I noticed the following error go by today:
> >>
> >>    Removing blacklisted files and directories
> >>    Cleanup empty directory structures in /usr/share
> >>    Running image-minimizer...
> >>==> Unknown Command: touch
> >
> >The image minimiser should immediately exit with non-zero status
> >upon errors, not merely print a warning which could be missed in
> >the line noise for months.
> 
> This is the current behavior (it returns a 1). I believe that the ks 
> file continues. HUFF... can you see if you are eating the return code in 
> the appliance-creator?

Perhaps the kickstart file needs a 'set -e' as its first shell command ?
Or maybe the livecd-tools which invoke the %post section are not 
validating the exit status / throwing an error. 

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 apevec at redhat.com  Wed Oct  8 15:29:34 2008
From: apevec at redhat.com (Alan Pevec)
Date: Wed, 08 Oct 2008 17:29:34 +0200
Subject: [Ovirt-devel] [PATCH node-image] avoid image-minimizer fall-out
In-Reply-To: <20081008144957.GG19052@redhat.com>
References: <87abdf5j4t.fsf@rho.meyering.net>	<20081008140440.GC19052@redhat.com>
	<48ECC6E7.3010906@redhat.com> <20081008144957.GG19052@redhat.com>
Message-ID: <48ECD1DE.8090206@redhat.com>

Daniel P. Berrange wrote:
> Perhaps the kickstart file needs a 'set -e' as its first shell command ?
in livecd, each post section is executed separately

> Or maybe the livecd-tools which invoke the %post section are not 
> validating the exit status / throwing an error. 

This is what it does:
http://git.fedorahosted.org/git/?p=livecd;a=blob;f=imgcreate/creator.py;h=519735edb8574a248d51a97723dc27f1c8e82f9e;hb=HEAD#l692

retcode is ignored



From bkearney at redhat.com  Wed Oct  8 15:30:33 2008
From: bkearney at redhat.com (Bryan Kearney)
Date: Wed, 08 Oct 2008 11:30:33 -0400
Subject: [Ovirt-devel] [PATCH node-image] avoid image-minimizer fall-out
In-Reply-To: <48ECD1DE.8090206@redhat.com>
References: <87abdf5j4t.fsf@rho.meyering.net>	<20081008140440.GC19052@redhat.com>
	<48ECC6E7.3010906@redhat.com> <20081008144957.GG19052@redhat.com>
	<48ECD1DE.8090206@redhat.com>
Message-ID: <48ECD219.4080607@redhat.com>

Alan Pevec wrote:
> Daniel P. Berrange wrote:
>> Perhaps the kickstart file needs a 'set -e' as its first shell command ?
> in livecd, each post section is executed separately
> 
>> Or maybe the livecd-tools which invoke the %post section are not 
>> validating the exit status / throwing an error. 
> 
> This is what it does:
> http://git.fedorahosted.org/git/?p=livecd;a=blob;f=imgcreate/creator.py;h=519735edb8574a248d51a97723dc27f1c8e82f9e;hb=HEAD#l692 
> 
> 
> retcode is ignored

Huff..can you please put in a bug and work with katz to get it it fixed? 
Thanks!

-- bk



From apevec at redhat.com  Wed Oct  8 15:51:02 2008
From: apevec at redhat.com (Alan Pevec)
Date: Wed, 08 Oct 2008 17:51:02 +0200
Subject: [Ovirt-devel] [PATCH node-image] avoid image-minimizer fall-out
In-Reply-To: <87abdf5j4t.fsf@rho.meyering.net>
References: <87abdf5j4t.fsf@rho.meyering.net>
Message-ID: <48ECD6E6.4020600@redhat.com>

Jim Meyering wrote:
> ==> Unknown Command: touch

Good catch, I missed that in my build log!
Fix is good, but better is to move all blacklisting into separate ks include.
Patch attached. Eventually, the whole blacklist will be implemented using image-minimizer, but I just found that some improvements are needed, at least support for /dir1/*/dir2/ patterns (patch for that posted to thincrust-devel)

-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: 0001-move-blacklisting-into-separate-kickstart-include.patch
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081008/39a375f5/attachment.ksh>

From apevec at redhat.com  Wed Oct  8 16:11:43 2008
From: apevec at redhat.com (Alan Pevec)
Date: Wed,  8 Oct 2008 18:11:43 +0200
Subject: [Ovirt-devel] [PATCH ovirt-node-image] move blacklisting into
	separate kickstart include
In-Reply-To: <48ECD6E6.4020600@redhat.com>
References: <48ECD6E6.4020600@redhat.com>
Message-ID: <1223482303-12388-1-git-send-email-apevec@redhat.com>

Signed-off-by: Alan Pevec <apevec at redhat.com>
---
 Makefile.am         |    1 +
 common-blacklist.ks |  119 +++++++++++++++++++++++++++++++++++++++++++++++++++
 common-post.ks      |  113 ------------------------------------------------
 ovirt-node-image.ks |    2 +
 4 files changed, 122 insertions(+), 113 deletions(-)
 create mode 100644 common-blacklist.ks

diff --git a/Makefile.am b/Makefile.am
index 50d55ef..df54106 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,6 +22,7 @@ EXTRA_DIST =				\
   ovirt-node-image.spec		\
   ovirt-node-image.spec.in	\
   README.krb5				\
+  common-blacklist.ks			\
   common-install.ks			\
   common-pkgs.ks			\
   common-post.ks			\
diff --git a/common-blacklist.ks b/common-blacklist.ks
new file mode 100644
index 0000000..149a3b1
--- /dev/null
+++ b/common-blacklist.ks
@@ -0,0 +1,119 @@
+%post
+echo "Removing excess RPMs"
+
+RPM="rpm -v -e --nodeps"
+
+# kernel pulls in mkinitrd which pulls in isomd5sum which pulls in python,
+# and livecd-tools needs lokkit to configure SELinux.
+# However, this is just an install-time dependency; we can remove
+# it afterwards, which we do here
+$RPM -e system-config-firewall-tui system-config-network-tui rhpl \
+    rpm-python dbus-python kudzu newt-python newt
+
+$RPM -e kpartx mkinitrd isomd5sum dmraid python python-libs
+$RPM -e checkpolicy
+
+# Remove additional RPMs forcefully
+$RPM gamin pm-utils kbd libuser passwd usermode \
+    vbetool ConsoleKit hdparm \
+    efibootmgr krb5-workstation linux-atm-libs fedora-release-notes \
+    slang psmisc gdbm cryptsetup-luks pciutils mtools syslinux db4 \
+    wireless-tools radeontool cracklib-dicts cracklib libicu
+
+# Things we could probably remove if libvirt didn't link against them
+#$RPM avahi PolicyKit xen-libs
+
+# Things we could probably remove if qemu-kvm didn't link against them
+#$RPM SDL alsa-lib
+
+# Pam complains when this is missing
+#$RPM ConsoleKit-libs
+
+# the following are lists of kernel modules we are pretty sure we won't need;
+# note that these can be single files or whole directories.  They are specified
+# starting at $MODULES; so if you want to remove the NLS stuff from the
+# fs subdir, your mods entry would be "fs/nls"
+fs_mods="fs/nls fs/9p fs/affs fs/autofs fs/autofs4 fs/befs fs/bfs fs/cifs \
+       fs/coda fs/cramfs fs/dlm fs/ecryptfs fs/efs fs/exportfs fs/ext4 \
+       fs/freevxfs fs/fuse fs/gfs2 fs/hfs fs/hfsplus fs/jbd fs/jbd2 fs/jffs \
+       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/802 net/8021q 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"
+
+driver_mods="drivers/auxdisplay drivers/net/appletalk \
+       drivers/net/hamradio drivers/net/pcmcia drivers/net/tokenring \
+       drivers/net/wireless drivers/net/irda drivers/atm drivers/usb/atm \
+       drivers/acpi drivers/char/drm drivers/char/mwave \
+       drivers/char/ipmp drivers/char/pcmcia drivers/crypto drivers/dca \
+       drivers/firmware drivers/memstick drivers/mmc drivers/mfs \
+       drivers/parport drivers/video drivers/watchdog drivers/net/ppp* \
+       drivers/usb/serial drivers/usb/misc drivers/usb/class \
+       drivers/usb/image drivers/rtc"
+
+misc_mods="drivers/bluetooth drivers/firewire drivers/i2c drivers/isdn \
+       drivers/media drivers/misc drivers/leds drivers/mtd drivers/w1 sound \
+       drivers/input drivers/pcmcia drivers/scsi/pcmcia"
+
+
+echo "Removing excess kernel modules"
+MODULES="/lib/modules/*/kernel"
+RM="rm -rf"
+
+for mods in $fs_mods $net_mods $misc_mods $driver_mods ; do
+    $RM $MODULES/$mods
+done
+
+echo "Removing all timezones except for UTC"
+find /usr/share/zoneinfo -regextype egrep -type f \
+  ! -regex ".*/UTC|.*/GMT" -exec $RM {} \;
+
+echo "Removing blacklisted files and directories"
+blacklist="/boot /etc/alsa /etc/pki /usr/share/hwdata/MonitorsDB \
+    /usr/share/hwdata/oui.txt /usr/share/hwdata/videoaliases \
+    /usr/share/hwdata/videodrivers /usr/share/fedora-release \
+    /usr/share/tabset /usr/share/libvirt /usr/share/augeas/lenses/tests \
+    /usr/share/tc /usr/share/emacs /usr/share/info /usr/kerberos \
+    /usr/src /usr/etc /usr/games /usr/include /usr/local \
+    /usr/sbin/{dell*,sasldblistusers2,build-locale-archive,glibc_post_upgrade.*}"
+blacklist_lib="/usr/lib{,64}/python2.5 /usr/lib{,64}/gconv \
+    /usr/{,lib64}/tc /usr/lib{,64}/tls /usr/lib{,64}/sse2 \
+    /usr/lib{,64}/pkgconfig /usr/lib{,64}/nss /usr/lib{,64}/X11 \
+    /usr/lib{,64}/games /usr/lib{,64}/alsa-lib /usr/lib{,64}/fs/reiserfs \
+    /usr/lib{,64}/krb5 /usr/lib{,64}/hal /usr/lib{,64}/gio \
+    /lib/terminfo/d /lib/terminfo/v /lib/terminfo/a \
+    /lib/firmware /usr/lib/locale /usr/lib/syslinux"
+blacklist_pango="/usr/lib{,64}/pango /usr/lib{,64}/libpango* \
+    /etc/pango /usr/bin/pango*"
+blacklist_hal="/usr/bin/hal-device /usr/bin/hal-disable-polling \
+    /usr/bin/hal-find-by-capability /usr/bin/hal-find-by-property \
+    /usr/bin/hal-is-caller-locked-out /usr/bin/hal-is-caller-privileged \
+    /usr/bin/hal-lock /usr/bin/hal-set-property /usr/bin/hal-setup-keymap"
+blacklist_ssh="/usr/bin/sftp /usr/bin/slogin /usr/bin/ssh /usr/bin/ssh-add \
+    /usr/bin/ssh-agent /usr/bin/ssh-copy-id /usr/bin/ssh-keyscan"
+docs_blacklist="/usr/share/omf /usr/share/gnome /usr/share/doc \
+    /usr/share/locale /usr/share/libthai /usr/share/man /usr/share/terminfo \
+    /usr/share/X11 /usr/share/i18n"
+
+eval $RM $blacklist $blacklist_lib $blacklist_pango $blacklist_hal \
+    $blacklist_ssh $docs_blacklist
+
+echo "Cleanup empty directory structures in /usr/share"
+find /usr/share -type d -exec rmdir {} \; > /dev/null 2>&1
+
+echo "Running image-minimizer..."
+%end
+
+%post --nochroot --interpreter image-minimizer
+drop /usr/lib/libboost*
+keep /usr/lib/libboost_program_options.so*
+keep /usr/lib/libboost_filesystem.so*
+drop /usr/lib64/libboost*
+keep /usr/lib64/libboost_program_options.so*
+keep /usr/lib64/libboost_filesystem.so*
+
+%end
+
diff --git a/common-post.ks b/common-post.ks
index deee9a5..7497b20 100644
--- a/common-post.ks
+++ b/common-post.ks
@@ -43,116 +43,3 @@ cat > /etc/sysconfig/iptables << \EOF
 COMMIT
 EOF
 
-echo "Removing excess RPMs"
-
-RPM="rpm -v -e --nodeps"
-
-# kernel pulls in mkinitrd which pulls in isomd5sum which pulls in python,
-# and livecd-tools needs lokkit to configure SELinux.
-# However, this is just an install-time dependency; we can remove
-# it afterwards, which we do here
-$RPM -e system-config-firewall-tui system-config-network-tui rhpl \
-    rpm-python dbus-python kudzu newt-python newt
-
-$RPM -e kpartx mkinitrd isomd5sum dmraid python python-libs
-$RPM -e checkpolicy
-
-# Remove additional RPMs forcefully
-$RPM gamin pm-utils kbd libuser passwd usermode \
-    vbetool ConsoleKit hdparm \
-    efibootmgr krb5-workstation linux-atm-libs fedora-release-notes \
-    slang psmisc gdbm cryptsetup-luks pciutils mtools syslinux db4 \
-    wireless-tools radeontool cracklib-dicts cracklib libicu
-
-# Things we could probably remove if libvirt didn't link against them
-#$RPM avahi PolicyKit xen-libs
-
-# Things we could probably remove if qemu-kvm didn't link against them
-#$RPM SDL alsa-lib
-
-# Pam complains when this is missing
-#$RPM ConsoleKit-libs
-
-RM="rm -rf"
-
-echo "Removing excess kernel modules"
-MODULES="/lib/modules/*/kernel"
-
-# the following are lists of kernel modules we are pretty sure we won't need;
-# note that these can be single files or whole directories.  They are specified
-# starting at $MODULES above; so if you want to remove the NLS stuff from the
-# fs subdir, your mods entry would be "fs/nls"
-fs_mods="fs/nls fs/9p fs/affs fs/autofs fs/autofs4 fs/befs fs/bfs fs/cifs \
-       fs/coda fs/cramfs fs/dlm fs/ecryptfs fs/efs fs/exportfs fs/ext4 \
-       fs/freevxfs fs/fuse fs/gfs2 fs/hfs fs/hfsplus fs/jbd fs/jbd2 fs/jffs \
-       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/802 net/8021q 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"
-
-driver_mods="drivers/auxdisplay drivers/net/appletalk \
-       drivers/net/hamradio drivers/net/pcmcia drivers/net/tokenring \
-       drivers/net/wireless drivers/net/irda drivers/atm drivers/usb/atm \
-       drivers/acpi drivers/char/drm drivers/char/mwave \
-       drivers/char/ipmp drivers/char/pcmcia drivers/crypto drivers/dca \
-       drivers/firmware drivers/memstick drivers/mmc drivers/mfs \
-       drivers/parport drivers/video drivers/watchdog drivers/net/ppp* \
-       drivers/usb/serial drivers/usb/misc drivers/usb/class \
-       drivers/usb/image drivers/rtc"
-
-misc_mods="drivers/bluetooth drivers/firewire drivers/i2c drivers/isdn \
-       drivers/media drivers/misc drivers/leds drivers/mtd drivers/w1 sound \
-       drivers/input drivers/pcmcia drivers/scsi/pcmcia"
-
-for mods in $fs_mods $net_mods $misc_mods $driver_mods ; do
-    $RM $MODULES/$mods
-done
-
-echo "Removing all timezones except for UTC"
-find /usr/share/zoneinfo -regextype egrep -type f \
-  ! -regex ".*/UTC|.*/GMT" -exec $RM {} \;
-
-echo "Removing blacklisted files and directories"
-blacklist="/boot /etc/alsa /etc/pki /usr/share/hwdata/MonitorsDB \
-    /usr/share/hwdata/oui.txt /usr/share/hwdata/videoaliases \
-    /usr/share/hwdata/videodrivers /usr/share/fedora-release \
-    /usr/share/tabset /usr/share/libvirt /usr/share/augeas/lenses/tests \
-    /usr/share/tc /usr/share/emacs /usr/share/info /usr/kerberos \
-    /usr/src /usr/etc /usr/games /usr/include /usr/local \
-    /usr/sbin/{dell*,sasldblistusers2,build-locale-archive,glibc_post_upgrade.*}"
-blacklist_lib="/usr/lib{,64}/python2.5 /usr/lib{,64}/gconv \
-    /usr/{,lib64}/tc /usr/lib{,64}/tls /usr/lib{,64}/sse2 \
-    /usr/lib{,64}/pkgconfig /usr/lib{,64}/nss /usr/lib{,64}/X11 \
-    /usr/lib{,64}/games /usr/lib{,64}/alsa-lib /usr/lib{,64}/fs/reiserfs \
-    /usr/lib{,64}/krb5 /usr/lib{,64}/hal /usr/lib{,64}/gio \
-    /lib/terminfo/d /lib/terminfo/v /lib/terminfo/a \
-    /lib/firmware /usr/lib/locale /usr/lib/syslinux"
-blacklist_pango="/usr/lib{,64}/pango /usr/lib{,64}/libpango* \
-    /etc/pango /usr/bin/pango*"
-blacklist_hal="/usr/bin/hal-device /usr/bin/hal-disable-polling \
-    /usr/bin/hal-find-by-capability /usr/bin/hal-find-by-property \
-    /usr/bin/hal-is-caller-locked-out /usr/bin/hal-is-caller-privileged \
-    /usr/bin/hal-lock /usr/bin/hal-set-property /usr/bin/hal-setup-keymap"
-blacklist_ssh="/usr/bin/sftp /usr/bin/slogin /usr/bin/ssh /usr/bin/ssh-add \
-    /usr/bin/ssh-agent /usr/bin/ssh-copy-id /usr/bin/ssh-keyscan"
-docs_blacklist="/usr/share/omf /usr/share/gnome /usr/share/doc \
-    /usr/share/locale /usr/share/libthai /usr/share/man /usr/share/terminfo \
-    /usr/share/X11 /usr/share/i18n"
-
-eval $RM $blacklist $blacklist_lib $blacklist_pango $blacklist_hal \
-    $blacklist_ssh $docs_blacklist
-
-echo "Cleanup empty directory structures in /usr/share"
-find /usr/share -type d -exec rmdir {} \; > /dev/null 2>&1
-
-echo "Running image-minimizer..."
-%post --nochroot --interpreter image-minimizer
-drop /usr/lib/libboost*
-keep /usr/lib/libboost_program_options.so*
-keep /usr/lib/libboost_filesystem.so*
-drop /usr/lib64/libboost*
-keep /usr/lib64/libboost_program_options.so*
-keep /usr/lib64/libboost_filesystem.so*
diff --git a/ovirt-node-image.ks b/ovirt-node-image.ks
index f5695d8..985cee3 100644
--- a/ovirt-node-image.ks
+++ b/ovirt-node-image.ks
@@ -14,6 +14,8 @@ touch /.autorelabel
 
 %end
 
+%include common-blacklist.ks
+
 %post --nochroot
 # remove quiet from Node bootparams, added by livecd-creator
 sed -i -e 's/ quiet//' $LIVE_ROOT/isolinux/isolinux.cfg
-- 
1.5.5.1



From apevec at redhat.com  Wed Oct  8 16:25:46 2008
From: apevec at redhat.com (Alan Pevec)
Date: Wed, 08 Oct 2008 18:25:46 +0200
Subject: [Ovirt-devel] [PATCH node-image] avoid image-minimizer fall-out
In-Reply-To: <87abdf5j4t.fsf@rho.meyering.net>
References: <87abdf5j4t.fsf@rho.meyering.net>
Message-ID: <48ECDF0A.4080402@redhat.com>

Jim Meyering wrote:
> ==> Unknown Command: touch

Good catch, I missed that in my build log!
Fix is good, but better is to move all blacklisting into separate ks include.
Patch post: [PATCH ovirt-node-image] move blacklisting into separate kickstart include
Eventually, the whole blacklist will be implemented using image-minimizer, but I just found that some improvements are needed, at least support for /dir1/*/dir2/ patterns (patch for that posted to thincrust-devel)



From jim at meyering.net  Wed Oct  8 16:43:37 2008
From: jim at meyering.net (Jim Meyering)
Date: Wed, 08 Oct 2008 18:43:37 +0200
Subject: [Ovirt-devel] [PATCH node-image] avoid image-minimizer fall-out
In-Reply-To: <48ECD6E6.4020600@redhat.com> (Alan Pevec's message of "Wed, 08
	Oct 2008 17:51:02 +0200")
References: <87abdf5j4t.fsf@rho.meyering.net> <48ECD6E6.4020600@redhat.com>
Message-ID: <87hc7n3ume.fsf@rho.meyering.net>

Alan Pevec <apevec at redhat.com> wrote:
> Jim Meyering wrote:
>> ==> Unknown Command: touch
>
> Good catch, I missed that in my build log!
> Fix is good, but better is to move all blacklisting into separate ks include.
> Patch attached. Eventually, the whole blacklist will be implemented using image-minimizer, but I just found that some improvements are needed, at least support for /dir1/*/dir2/ patterns (patch for that posted to thincrust-devel)

> From ca965dc96a504c474e9f133de380203cef41b848 Mon Sep 17 00:00:00 2001
> From: Alan Pevec <apevec at redhat.com>
> Date: Wed, 8 Oct 2008 16:17:34 +0200
> Subject: [PATCH ovirt-node-image] move blacklisting into separate kickstart include

Looks fine to me, but I can't try it right away.



From jguiditt at redhat.com  Wed Oct  8 17:06:28 2008
From: jguiditt at redhat.com (Jason Guiditta)
Date: Wed,  8 Oct 2008 13:06:28 -0400
Subject: [Ovirt-devel] [PATCH server] Version 1 of Revamped Tree Navigation.
	Take 3
Message-ID: <1223485588-2817-1-git-send-email-jguiditt@redhat.com>

The new javascript tree widget contains the following features/changes from previous implementation:

* The html for the list is dynamically generated using a javascript template system.  This will allow us to plug in different layouts per tree as the widget matures.
* Updates to the tree are now incremental, rather than a full rip and replace as earlier. We have 2 states we currently look for - 'new' and 'changed'.  The first generates new html and appends it to the DOM, the second just does a replacement of the content of existing nodes.
* Vastly simplified the markup and css.
* Added calls where appropriate to refresh the tree before next planned call (for instance, if you add a new hardware pool).
* Added slide effect when opening and closing a node of the tree.
* Clicking the plus/minus opens/close the node only, does not load main content area.
* Clicking anywhere to the right of that on a given node will load content area.
* Added interim icons for 'smartpool' and 'add smartpool'

Note that aside from the nav area, this should not impact the existing trees which have not been converted yet (all popups that have one), as this is a completely separate codebase with it's own js and css files.

Related, but not technically part of the tree, I added a choose_layout method to allow testing of javascript components as we are building them to help eliminate possible side effects from other code.  When not in a production environment, you can pass in ?component_layout=[name] where [name] is the name of a shell rhtml file you have put in views/layouts/components.  As our UI is growing increasingly complex, I think this will be a very useful way to facilitate building components.

Signed-off-by: Jason Guiditta <jguiditt at redhat.com>
---
 src/app/controllers/application.rb                 |   19 +-
 src/app/controllers/tree_controller.rb             |   73 ++++-
 src/app/models/pool.rb                             |   18 +-
 src/app/views/layouts/_side_toolbar.rhtml          |    2 +-
 src/app/views/layouts/_tree.rhtml                  |  148 ++++++--
 src/app/views/layouts/components/tree.rhtml        |   61 +++
 src/app/views/layouts/redux.rhtml                  |   40 +--
 src/public/images/icon_add_smartpool.png           |  Bin 0 -> 1341 bytes
 src/public/images/icon_smartpool.png               |  Bin 0 -> 641 bytes
 src/public/javascripts/ovirt.js                    |   28 +-
 src/public/javascripts/ovirt.tree.js               |   85 +++++
 src/public/javascripts/smart_nav_test_data.js      |  151 ++++++++
 src/public/javascripts/trimpath-template-1.0.38.js |  397 ++++++++++++++++++++
 src/public/stylesheets/ovirt-tree/tree.css         |   83 ++++
 14 files changed, 1011 insertions(+), 94 deletions(-)
 create mode 100644 src/app/views/layouts/components/tree.rhtml
 create mode 100644 src/public/images/icon_add_smartpool.png
 create mode 100644 src/public/images/icon_smartpool.png
 create mode 100644 src/public/javascripts/ovirt.tree.js
 create mode 100644 src/public/javascripts/smart_nav_test_data.js
 create mode 100644 src/public/javascripts/trimpath-template-1.0.38.js
 create mode 100644 src/public/stylesheets/ovirt-tree/tree.css

diff --git a/src/app/controllers/application.rb b/src/app/controllers/application.rb
index 6dcf6f8..a751768 100644
--- a/src/app/controllers/application.rb
+++ b/src/app/controllers/application.rb
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 Red Hat, Inc.
 # Written by Scott Seago <sseago at redhat.com>
 #
@@ -24,7 +24,7 @@ class ApplicationController < ActionController::Base
   # Pick a unique cookie name to distinguish our session data from others'
   session :session_key => '_ovirt_session_id'
   init_gettext "ovirt"
-  layout 'redux'
+  layout :choose_layout
 
   before_filter :pre_new, :only => [:new]
   before_filter :pre_create, :only => [:create]
@@ -33,6 +33,13 @@ class ApplicationController < ActionController::Base
   before_filter :authorize_admin, :only => [:new, :create, :edit, :update, :destroy]
   before_filter :is_logged_in
 
+  def choose_layout
+    if(params[:component_layout])
+      return (ENV["RAILS_ENV"] != "production")?'components/' << params[:component_layout]:'redux'
+    end
+    return 'redux'
+  end
+
   def is_logged_in
     redirect_to(:controller => "login", :action => "login") unless get_login_user
   end
@@ -40,7 +47,7 @@ class ApplicationController < ActionController::Base
   def get_login_user
     (ENV["RAILS_ENV"] == "production") ? session[:user] : "ovirtadmin"
   end
-  
+
   def set_perms(hwpool)
     @user = get_login_user
     @can_view = hwpool.can_view(@user)
@@ -91,8 +98,8 @@ class ApplicationController < ActionController::Base
   # don't define find_opts for array inputs
   def json_hash(full_items, attributes, arg_list=[], find_opts={}, id_method=:id)
     page = params[:page].to_i
-    paginate_opts = {:page => page, 
-                     :order => "#{params[:sortname]} #{params[:sortorder]}", 
+    paginate_opts = {:page => page,
+                     :order => "#{params[:sortname]} #{params[:sortorder]}",
                      :per_page => params[:rp]}
     arg_list << find_opts.merge(paginate_opts)
     item_list = full_items.paginate(*arg_list)
@@ -102,7 +109,7 @@ class ApplicationController < ActionController::Base
     json_hash[:rows] = item_list.collect do |item|
       item_hash = {}
       item_hash[:id] = item.send(id_method)
-      item_hash[:cell] = attributes.collect do |attr| 
+      item_hash[:cell] = attributes.collect do |attr|
         if attr.is_a? Array
           value = item
           attr.each { |attr_item| value = value.send(attr_item)}
diff --git a/src/app/controllers/tree_controller.rb b/src/app/controllers/tree_controller.rb
index 1aed544..07d46f7 100644
--- a/src/app/controllers/tree_controller.rb
+++ b/src/app/controllers/tree_controller.rb
@@ -1,5 +1,4 @@
 class TreeController < ApplicationController
-
   def get_pools
     # TODO: split these into separate hash elements for HW and smart pools
     pools = HardwarePool.get_default_pool.full_set_nested(:method => :json_hash_element,
@@ -8,11 +7,81 @@ class TreeController < ApplicationController
                        :privilege => Permission::PRIV_VIEW, :user => get_login_user,
                        :smart_pool_set => true)
   end
+
   def fetch_nav
     @pools = get_pools
   end
-  
+
   def fetch_json
     render :json => get_pools.to_json
   end
+
+  def return_filtered_list
+    @ids = Array.new
+    @clientHash = {}
+    if (params[:item])
+      params[:item].each { |item|
+        tempItem = item.split("-")
+        itemHash = {
+          :id => tempItem[0].to_s,
+          :name =>tempItem[1]
+        }
+        @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)))
+    @ids.each { |item|
+      if @clientHash.has_key?(item.to_s)
+        @clientHash.delete(item.to_s)
+      end
+    }
+    @serverHash[:deleted] = @clientHash
+    render :json => @serverHash.to_json
+  end
+
+  private
+  def build_json(list)
+    list.each {|listItem|
+      process_list_item(listItem)
+      if listItem.has_key?(:children)
+          build_json(listItem[:children])
+      end
+    }
+    list
+  end
+
+  def process_list_item(item)
+    if @clientHash.has_key?(item[:id].to_s)
+      unless @clientHash[item[:id].to_s][:name] == item[:name]
+        item[:state] = "changed"
+      else
+        item[:state] = "unchanged"
+      end
+    else
+      item[:state] = "new"
+    end
+    @ids = @ids.push(item[:id])
+  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)
+          }
+        end
+      else
+        otherSmartPools.push(listItem)
+      end
+    }
+    mySmartPools + otherSmartPools
+  end
 end
diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb
index eb71be8..d189649 100644
--- a/src/app/models/pool.rb
+++ b/src/app/models/pool.rb
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 Red Hat, Inc.
 # Written by Scott Seago <sseago at redhat.com>
 #
@@ -45,7 +45,7 @@ class Pool < ActiveRecord::Base
   has_many :smart_pool_tags, :as => :tagged, :dependent => :destroy
   has_many :smart_pools, :through => :smart_pool_tags
 
-  # used to allow parent traversal before obj is saved to the db 
+  # used to allow parent traversal before obj is saved to the db
   # (needed for view code 'create' form)
   attr_accessor :tmp_parent
 
@@ -168,10 +168,10 @@ class Pool < ActiveRecord::Base
     end
   end
 
-  RESOURCE_LABELS = [["CPUs", :cpus, ""], 
-                     ["Memory", :memory_in_mb, "(mb)"], 
-                     ["NICs", :nics, ""], 
-                     ["VMs", :vms, ""], 
+  RESOURCE_LABELS = [["CPUs", :cpus, ""],
+                     ["Memory", :memory_in_mb, "(mb)"],
+                     ["NICs", :nics, ""],
+                     ["VMs", :vms, ""],
                      ["Disk", :storage_in_gb, "(gb)"]]
 
   #needed by tree widget for display
@@ -195,7 +195,7 @@ class Pool < ActiveRecord::Base
       found = false
       open_list.each do |open_pool|
         if pool.id == open_pool.id
-          new_open_list = open_list[(open_list.index(open_pool)+1)..-1]          
+          new_open_list = open_list[(open_list.index(open_pool)+1)..-1]
           unless new_open_list.empty?
             pool_children = pool.children unless pool_children
             hash[:children] = pool_hash(pool_children, new_open_list, filter_vm_pools)
@@ -210,7 +210,7 @@ class Pool < ActiveRecord::Base
   end
 
   def json_hash_element
-    { :id => id, :type => self[:type], :text => name, :name => name}
+    { :id => id, :type => self[:type], :text => name, :name => name, :parent_id => parent_id}
   end
 
   def hash_element
@@ -272,7 +272,7 @@ class Pool < ActiveRecord::Base
     obj = args.shift
     method = args.shift
     obj.send(method, *args)
-  end    
+  end
 
   def display_name
     name
diff --git a/src/app/views/layouts/_side_toolbar.rhtml b/src/app/views/layouts/_side_toolbar.rhtml
index e1958f1..4b92bcf 100644
--- a/src/app/views/layouts/_side_toolbar.rhtml
+++ b/src/app/views/layouts/_side_toolbar.rhtml
@@ -25,7 +25,7 @@
 <% end -%>
 <div class="toolbar" style="float:left;">
    <a href="<%= url_for :controller => :smart_pools, :action => 'new' %>" rel="facebox[.bolder]">
-     <%=image_tag "icon_add_hardwarepool.png", :title=>"Add Smart Pool"  %>
+     <%=image_tag "icon_add_smartpool.png", :title=>"Add Smart Pool"  %>
    </a>
 </div>
 <%if pool -%>
diff --git a/src/app/views/layouts/_tree.rhtml b/src/app/views/layouts/_tree.rhtml
index 0e6e138..a6bde14 100644
--- a/src/app/views/layouts/_tree.rhtml
+++ b/src/app/views/layouts/_tree.rhtml
@@ -1,32 +1,124 @@
-<div style=" float:left; padding:0 0 0 5px;"><%= image_tag("icon_dashboard.gif")%></div>
-  <% selected = "selected" if controller.controller_name == "dashboard" && params[:action] == "index" %>
-<div style=" float:left; padding:5px 0 0 5px;">
-    <%= link_to "Dashboard", { :controller => "dashboard" }, { :id => "dashboard", :class => "#{selected}" } %>
-</div>
-<div style="clear:both"></div>
-<%= javascript_include_tag "jquery.ovirt.treeview.js" -%>
-<script type="text/javascript">    
-    $(document).ready(function(){         
-        $("#test-tree").ovirt_treeview({
-            collapsed: true,
-            //animated: "normal",
-            url: "<%=  url_for :controller =>'/tree', :action => 'fetch_json' %>",
-            hardware_url: "<%=  url_for :controller =>'/hardware', :action => 'show' %>",
-            resource_url: "<%=  url_for :controller =>'/resources', :action => 'show' %>",
-            smart_url: "<%=  url_for :controller =>'/smart_pools', :action => 'show' %>"
-	});
-        var tree_reload = {
-            url: "<%=  url_for :controller =>'/tree', :action => 'fetch_json' %>",
-            hardware_url: "<%=  url_for :controller =>'/hardware', :action => 'show' %>",
-            resource_url: "<%=  url_for :controller =>'/resources', :action => 'show' %>",
-            smart_url: "<%=  url_for :controller =>'/smart_pools', :action => 'show' %>"
+<%= javascript_include_tag "trimpath-template-1.0.38.js" %>
+<%= javascript_include_tag "ovirt.tree.js" %>
+<%= stylesheet_link_tag 'ovirt-tree/tree' %>
+<script type="text/javascript">
+    var treeTimer, urlObj;
+    var processRecursive = true;
+    var recursiveTreeTempl, treeItemTempl, tree_url;
+    $(document).ready(function(){
+      recursiveTreeTempl = TrimPath.parseDOMTemplate("nav_tree_template");
+      treeItemTempl = TrimPath.parseDOMTemplate("nav_tree_updater_template");
+      urlObj = {
+        "HardwarePool" : "<%=  url_for :controller =>'/hardware', :action => 'show' %>",
+        "VmResourcePool" : "<%=  url_for :controller =>'/resources', :action => 'show' %>",
+        "SmartPool" : "<%=  url_for :controller =>'/smart_pools', :action => 'show' %>",
+        "DirectoryPool" : null
+      }
+      tree_url = "<%=  url_for :controller =>"/tree", :action => "return_filtered_list" %>";
+      processTree();
+      treeTimer = setInterval(processTree,15000);
+      $('ul.ovirt-tree li').livequery(
+        function(){
+          $(this)
+          .children('div')
+          .bind('click',function(){
+            $('ul.ovirt-tree li div').removeClass('current');
+            var thisHref = (urlObj[$(this).attr('class')] !=null) ? urlObj[$(this).attr('class')] + '/' + this.id :null;
+            $(this).toggleClass('current');
+            currentNode = this.id;
+            if ($tabs != null) {
+              var tabType = $tabs.data("pool_type.tabs");
+              ($(this).attr('class').toLowerCase().indexOf(tabType) == -1) ?selected_tab = 0 :selected_tab = $tabs.data("selected.tabs");
+            }
+            if (thisHref != null) {
+              $.ajax({
+                url: thisHref,
+                type: 'GET',
+                data: {ajax:true,tab:selected_tab},
+                dataType: 'html',
+                success: function(data) {
+                  $('#side-toolbar').html($(data).find('div.toolbar'));
+                  $('#tabs-and-content-container').html($(data).not('div#side-toolbar'));
+                },
+                error: function(xhr) {$.jGrowl(xhr.status + ' ' + xhr.statusText);}
+              });
+            }
+          });
+        },function(){
+          $(this)
+          .children('div')
+          .unbind('click');
         }
-        $('#test-tree').everyTime(15000,function(){
-          load(tree_reload, {}, this, this);
-        })
+      );
+      $('ul.ovirt-tree li:has(ul)').livequery(
+        function(){
+          $(this)
+            .children('span.hitarea')
+            .click(function(event){
+              if (this == event.target) {
+                  if($(this).siblings('ul').size() >0) {
+                      $(this)
+                        .toggleClass('expanded')
+                        .toggleClass('expandable')
+                        .siblings('ul').slideToggle("normal");
+                  }
+              }
+            });
+        },function(){
+            $(this).children('span.hitarea')
+              .removeClass('expanded expandable')
+              .unbind('click');
+        }
+      );
     });
 </script>
 
-<ul id="test-tree" class="filetree treeview-famfamfam treeview">
-</ul>
-<!--<ul id="tree" class="filetree treeview-famfamfam treeview"></ul>-->
+<!-- Output elements -->
+<div class="nav-dashboard">
+  <% selected = "selected" if controller.controller_name == "dashboard" && params[:action] == "index" %>
+  <%= link_to "Dashboard", { :controller => "dashboard" }, { :id => "dashboard", :class => "#{selected}" } %>
+</div>
+<form id="nav_tree_form">
+  <div class="nav-tree">
+    <ul id="nav_tree" class="ovirt-tree"></ul>
+  </div>
+  <div class="nav-smart-pool">
+    <span class="nav-smart-pool-header">Smart Pools</span> <!--FIXME: replace with i18n text -->
+    <ul id="smart_nav_tree" class="ovirt-tree"></ul>
+  </div>
+</form>
+
+<!-- Template content -->
+<!-- TODO: possibly move these templates into external files-->
+<textarea id="nav_tree_updater_template" style="display:none;">
+  <li>
+    <input type="checkbox" name="item[]" value="${id}-${name}" style="display:none" checked="checked"/>
+    <span class="hitarea {if defined('children')} expandable{/if}">&nbsp;</span><div id="${id}" class="${type}">${name}</div>
+  </li>
+</textarea>
+<textarea id="nav_tree_template" style="display:none;">
+  {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}">&nbsp;</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}">&nbsp;</span><div id="${item.id}" class="${item.type}">${item.name}</div>
+      {if item.children}
+        ${htmlList(item.children)}
+      {/if}
+    </li>
+  {/for}
+</textarea>
diff --git a/src/app/views/layouts/components/tree.rhtml b/src/app/views/layouts/components/tree.rhtml
new file mode 100644
index 0000000..063a6df
--- /dev/null
+++ b/src/app/views/layouts/components/tree.rhtml
@@ -0,0 +1,61 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+  <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
+  <title><%= yield :title -%></title>
+  <%= 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.form.js" -%>
+  <%= javascript_include_tag "ovirt.js" -%>
+
+  <script type="text/javascript">
+      var $tabs, selected_tab;
+      function delete_vm_pool(id, parent) {
+        $(document).trigger('close.facebox');
+        $.post('<%= url_for :controller => "resources", :action => "destroy" %>',
+               {id: id},
+                function(data,status){
+                  $("#vmpools_grid").flexReload();
+                  processTree();
+                  if (data.alert) {
+                    $.jGrowl(data.alert);
+                  }
+                 }, 'json');
+      }
+      function delete_hw_pool(id, parent) {
+        $(document).trigger('close.facebox');
+        $.post('<%= url_for :controller => "hardware", :action => "destroy" %>',
+               {id: id},
+                function(data,status){
+                  processTree();
+                  if (data.alert) {
+                    $.jGrowl(data.alert);
+                  }
+                 }, 'json');
+      }
+   </script>
+   <%= yield :scripts -%>
+ </head>
+
+ <body>
+   <div id="side">
+     <button id="stop">Stop!</button>
+     <%= render :partial => '/layouts/tree' %>
+   </div>
+   <div id="side-toolbar" class="header_menu_wrapper">
+     <%= render :partial => '/layouts/side_toolbar' %>
+   </div>
+
+   <div id="tabs-and-content-container">
+     <div id="main">
+        <div id="content_area">
+
+        </div>
+     </div>
+   </div>
+ </body>
+</html>
diff --git a/src/app/views/layouts/redux.rhtml b/src/app/views/layouts/redux.rhtml
index 01540d4..a985cdd 100644
--- a/src/app/views/layouts/redux.rhtml
+++ b/src/app/views/layouts/redux.rhtml
@@ -16,20 +16,18 @@
   <%= stylesheet_link_tag 'flexigrid/flexigrid.css' %>
   <%= stylesheet_link_tag 'facebox' %>
   <%= stylesheet_link_tag 'jquery.jgrowl.css' %>
-  <!--%= stylesheet_link_tag 'jquery.ui-1.5b4/themes/flora/flora.tabs.css' %-->
+
   <%= javascript_include_tag "jquery-1.2.6.min.js" -%>
   <%= javascript_include_tag "jquery-treeview/jquery.treeview.js" -%>
   <%= javascript_include_tag "jquery-treeview/jquery.treeview.async.js" -%>
   <%= javascript_include_tag "flexigrid.js" -%>
   <%= javascript_include_tag "facebox.js" -%>
-  <%= javascript_include_tag "jquery.timers.js" -%>
+  <%#= javascript_include_tag "jquery.timers.js" -%>
   <%= javascript_include_tag "jquery-svg/jquery.svg.pack.js" -%>
   <!--%= javascript_include_tag "jquery-svg/jquery.svgfilter.js" -%-->
   <%= javascript_include_tag "jquery-svg/jquery.svggraph.js" -%>
-  <!--%= javascript_include_tag "jquery.ui-1.5b4/ui.core.js" -%>
-  < %= javascript_include_tag "jquery.ui-1.5b4/ui.tabs.js" -%-->
   <%= javascript_include_tag "jquery.cookie.js" -%>
-  <%= javascript_include_tag "jquery.livequery.pack.js" -%>
+  <%= javascript_include_tag "jquery.livequery.min.js" -%>
   <%= javascript_include_tag "jquery.form.js" -%>
   <%= javascript_include_tag "jquery.jgrowl.js" -%>
 
@@ -40,37 +38,9 @@
   <%= javascript_include_tag "ovirt.js" -%>
     <script type="text/javascript">
       var $tabs, selected_tab;
-      $(document).ready(function(){  
+      $(document).ready(function(){
+         $.ajaxSetup({error: function(xhr) {$.jGrowl(xhr.status + ' ' + xhr.statusText);}});
             $('a[rel*=facebox]').livequery(function(){$(this).facebox();},function(){});
-            $('#side a').livequery(function(){
-                $(this).bind('click', function(){ 
-                    currentNode = $(this).parent().parent()[0].id;
-                    if ($tabs != null) {
-                    var tabType = $tabs.data("pool_type.tabs");
-                    ($(this).attr('href').indexOf(tabType) == -1) ?selected_tab = 0 :selected_tab = $tabs.data("selected.tabs");
-                    }
-                    $('#side span').each(function(){
-                        var nodeType = $(this).attr('class');
-                        if (nodeType.indexOf('_') != -1){
-                            nodeType = nodeType.substr(nodeType.indexOf('_') +1);
-                            $(this).attr('class', nodeType);
-                        }                        
-                    });
-                    var nodeType = $(this).parent().attr('class');
-                    $(this).parent().attr('class', 'current_' + nodeType);
-                    $.ajax({
-                        url: $(this).attr('href'),
-                        type: 'GET',
-                        data: {ajax:true,tab:selected_tab},
-                        //data: {nolayout:true},
-                        dataType: 'html',
-                        success: function(data) {
-                          $('#side-toolbar').html($(data).find('div.toolbar'));
-                          $('#tabs-and-content-container').html($(data).not('div#side-toolbar'));
-                        },
-                        error: function(xhr) {$.jGrowl(xhr.status + ' ' + xhr.statusText);}
-                    });
-                    return false;})},function(){});
             $('.dialog_tab_nav a').livequery(function(){
                 $(this).bind('click', function(){
                     $('.dialog_tab_nav li').removeClass('current');
diff --git a/src/public/images/icon_add_smartpool.png b/src/public/images/icon_add_smartpool.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7cb7316596b1eafbcad54890971f42737d45a62
GIT binary patch
literal 1341
zcmV-D1;YA?P)<h;3K|Lk000e1NJLTq0018V0018d1^@s7XsITz00001b5ch_0Itp)
z=>Px#32;bRa{vGe at Bjb`@Bu=sG?)MY1ma0VK~zY`?Uj8 at m1P*lf6sdk2N4b*32Gpj
ziIr#}C<=4BR93E5nbW3j`bTK1wQ`NkwdGP<I&+%SGMr_8v}Lp5DrT%42!5m_a$+JN
znu#8ik0Ws4aK7L7?hk|@QFOLy&Fin{eeUPFuIGNA`?(+J4=cVoEq2>x0Wbs1Je}!`
ze{g(M at wQp<036Moz3Z2+-<aJm9l3!%lg6=BasDv&Ptg;VL-E*;a7R$xgZa57vMJ at H
zB*xoR#W4eq*F)yg{GK?48&Y at 4{sb}h#Y_46DB&MQck=e~O;WZ$r?PiU1312IIsgf=
zWyB>6O)lU4OwT6G0K?PY9_K6=d)8_VBT?0;+Pa3m3Q1GuR$Z)UMA at 5B^-Wl!$L#L2
z0HDR?qfDNgR at y!hzxx{hBGw%|BO)TTW#2C@*_bScR>%Eba->ELc-SH$ukJnBC;0L6
zZ79H&w~>rxh3d8f0Ebq`O4h38F2U+~C|@(8081QVNu;ASDCIxqtC=h7RKEfMMVm7}
z3v*X5&6qeG(FLUxm=q_=u3;KEzjV|~JF?=!mFuQs=!U2HoH@=C#8GouPLyBg_^Ae(
zt1ih<i%wH at UUhHsef*u5aoxc)0&uoCSAJSKSc*SNpM0zJ=H5hrHn+cLJaYVK`8ju4
zX|uyMEG{;p>6TTuY|n{4ZD+ at l44{Vd1s`zrLVeLwZxzq_E4im&7CTq4V at U>WZa=SU
z+o1gbT*zk3)VWw=5@*`>z96S}&XRt~uB&AL?0;=KsZ&CcOS$0EFzP-fZL)<4GbUnE
z{{C}*GP`u#;q}RRR?F4LCro-6P1CxPl1_BFj;%BgmuYmzEpHmY;SJ*?^`TB8t)X2(
zrP0>z=1lz%MlZ<EN=Qg3yveyI4<m^3ctHFJ3Z*nOw+D at AdK3F4<7p(=VQ{{|OT9ma
z1ha!7krC(}b=>lA_aG{X at +KW$+S)}&-*2=&_O7meZ444Hh2OtL|N9ov8{PA at r@ocK
zwWB0|IdU+^RMlPVC0nMcyU|wznXme;0)RCyrl6EkMIWXt3<;0?${K4WWKbwUpH6#o
zd%)*%F35VvcHo}OMMReGJ9S&qmWAoK8V?aMEE8AbNlx#{7V9H()WrE))jgZ{{$8^4
zH~@RIr}kavSc9SkF&@AjOrfga6YS-MttJf{3PTG)vqZ)-BzYc_Ufw$Eww=6ZH%h7e
z93(t?7&BHj(B=;Ga&&{Y5}Lk5dC!CHLTTX)9 at I?w!gZv-@<a^o-)0(tc6{x2TI<TF
zJ+|-e&fIojh3MW^JXenq9c^ORh-it8)f7fMV(6ekQD~qvKoE2=d?;lCQxpz|LBo|6
z91TrgLqb2#de8pm9h=+FS6EFU5&GqV9NlrH=nIRPMKO_P9!-kH8Wo1<Mpvu9L01Tv
zG&-CfYA-lwX>mzJ(i}B3ZE2b*G}1F_Y(~u;{dRy6V^Vq^jicM2^($Ws;;uzpouC4s
z3n+Ety-*+;Xa;(R2MGv~56w^zvOQ_S)3)0coOz&%>};$eO!E_A31abj!0-|9>)4$E
z+yR5ZAsUHM7D6l<gM0=NrXWq%EAdL`pn<dpG&h2sVA4ShE;jjb1~i<yMJ$68I+Ugb
zb+5~OuGMLcH2YMP#UR9_A^uK+0nhy|{olkN%sNK%{HL at T00000NkvXXu0mjfQ2usz

literal 0
HcmV?d00001

diff --git a/src/public/images/icon_smartpool.png b/src/public/images/icon_smartpool.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ed0af0d2f2da5b34d13491ebe06f64a9450b5ec
GIT binary patch
literal 641
zcmV-{0)G98P)<h;3K|Lk000e1NJLTq000gE000gM1^@s7XiptS00001b5ch_0Itp)
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<B=)fr2A^FZ9B_&;-y<D&ygAEwlUu?8
zXWrl1=*kUkH{2rM&r55dNVKW#5S_qN>OgCO?qQ8bXY*%b6TKMABl7yX+X_>W+dJjd
z*#@*RiZ;R2Aa*aK{hv_)UHA6OiHbRtXp~Y6$A425SX5T*=MN#m*9wJ=6mE2hu{<L2
z at jmNMwFkFJ)<{x!wGGEoGp)_9P`ZGv)t8kTdg_;h$1A~@vNp1=1N6KM<$wn7mdfF3
zFQ5UFj=o>i-<nYc0CrI at H=iq6OkAGbzzhWd#X3#<*edoCFI&t6sZ=xvv=Mpt{VFNj
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`

literal 0
HcmV?d00001

diff --git a/src/public/javascripts/ovirt.js b/src/public/javascripts/ovirt.js
index 28585fd..4579c80 100644
--- a/src/public/javascripts/ovirt.js
+++ b/src/public/javascripts/ovirt.js
@@ -1,6 +1,5 @@
 // ovirt-specific javascript functions are defined here
 
-
 // helper functions for dialogs and action links
 
 
@@ -41,7 +40,7 @@ function add_hosts(url)
     if (validate_selected(hosts, "host")) {
       $.post(url,
              { resource_ids: hosts.toString() },
-              function(data,status){ 
+              function(data,status){
                 $(document).trigger('close.facebox');
 	        grid = $("#hosts_grid");
                 if (grid.size()>0 && grid != null) {
@@ -142,11 +141,11 @@ function ajax_validation(response, status)
     $(".fieldWithErrors").removeClass("fieldWithErrors");
     $("div.errorExplanation").remove();
     if (!response.success && response.errors ) {
-      for(i=0; i<response.errors.length; i++) { 
+      for(i=0; i<response.errors.length; i++) {
         var element = $("div.form_field:has(#"+response.object + "_" + response.errors[i][0]+")");
         if (element) {
           element.addClass("fieldWithErrors");
-          for(j=0; j<response.errors[i][1].length; j++) { 
+          for(j=0; j<response.errors[i][1].length; j++) {
             element.append('<div class="errorExplanation">'+response.errors[i][1][j]+'</div>');
           }
         }
@@ -163,9 +162,7 @@ function afterHwPool(response, status){
     ajax_validation(response, status);
     if (response.success) {
       $(document).trigger('close.facebox');
-      // FIXME do we need to reload the tree here
-
-      // this is for reloading the host/storage grid when 
+      // this is for reloading the host/storage grid when
       // adding hosts/storage to a new HW pool
       if (response.resource_type) {
         grid = $('#' + response.resource_type + '_grid');
@@ -176,9 +173,12 @@ function afterHwPool(response, status){
         }
       }
       
+      //FIXME: point all these refs at a widget so we dont need the functions in here
+      processTree();
+
       if ((response.resource_type == 'hosts' ? get_selected_hosts() : get_selected_storage()).indexOf($('#'+response.resource_type+'_selection_id').html()) != -1){
 	  empty_summary(response.resource_type +'_selection', (response.resource_type == 'hosts' ? 'Host' : 'Storage Pool'));
-      }   
+      }
       // do we have HW pools grid?
       //$("#vmpools_grid").flexReload()
     }
@@ -193,12 +193,14 @@ function afterVmPool(response, status){
       } else {
         $tabs.tabs("load",$tabs.data('selected.tabs'));
       }
+      processTree();
     }
 }
 function afterSmartPool(response, status){
     ajax_validation(response, status);
     if (response.success) {
       $(document).trigger('close.facebox');
+      processTree();
     }
 }
 function afterStoragePool(response, status){
@@ -208,7 +210,7 @@ function afterStoragePool(response, status){
       grid = $("#storage_grid");
       if (grid.size()>0 && grid != null) {
         grid.flexReload();
-      } else {;
+      } else {
         $tabs.tabs("load",$tabs.data('selected.tabs'));
       }
     }
@@ -238,7 +240,7 @@ function afterVm(response, status){
     }
 }
 
-//selection detail refresh 
+//selection detail refresh
 function refresh_summary(element_id, url, obj_id){
   $('#'+element_id+'').load(url, { id: obj_id})
 }
@@ -289,10 +291,10 @@ function delete_pool(delete_url, id)
   $.post(delete_url,
          {id: id},
           function(data,status){
+            //no more flex reload?
+            processTree();
             if (data.alert) {
               $.jGrowl(data.alert);
             }
            }, 'json');
-}
-
-
+}
\ No newline at end of file
diff --git a/src/public/javascripts/ovirt.tree.js b/src/public/javascripts/ovirt.tree.js
new file mode 100644
index 0000000..1d8e26f
--- /dev/null
+++ b/src/public/javascripts/ovirt.tree.js
@@ -0,0 +1,85 @@
+function processTree (){
+  $("#nav_tree_form").ajaxSubmit({
+    url: tree_url,
+    type: "POST",
+    dataType: "json",
+    success: function(response){
+      // First, remove any deleted items from the tree
+      $.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();
+            }
+          } 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();
+                }
+              }
+          }
+          $('#' + value.id).parent().remove();
+      });
+
+      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);
+      }
+    }
+  });
+}
+
+function processChildren(list, templateObj){
+/*  TODO: In future, we may need an additional state here of 'moved' which deletes
+ *  the item where it was in the tree and adds it to its new parent.
+*/
+  $.each(list, function(n,data){
+    var updatedNode;
+    if(data.state === 'changed'){
+      $('input[value^=' + data.id + '-]').attr('value', data.id + '-' + data.name);
+      $('#' + data.id).html(data.name);
+    } else if(data.state === 'new') {
+        /* If the elem with id matching the parent id has a sibling that is a ul,
+         * we should append the result of processing the template to the existing
+         * sublist.  Otherwise, we need to add a new sublist and add it there.
+        */
+       var result  = templateObj.process(data);
+       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('<ul>' + result + '</ul>');
+           $('#' + data.parent_id).siblings('span').addClass('expanded');
+         }
+       }
+      }
+    else {
+      if (data.children) {
+          processChildren(data.children, templateObj);
+      }
+    }
+  });
+}
\ 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
new file mode 100644
index 0000000..43e7dbc
--- /dev/null
+++ b/src/public/javascripts/smart_nav_test_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/trimpath-template-1.0.38.js b/src/public/javascripts/trimpath-template-1.0.38.js
new file mode 100644
index 0000000..fd0898d
--- /dev/null
+++ b/src/public/javascripts/trimpath-template-1.0.38.js
@@ -0,0 +1,397 @@
+/**
+ * TrimPath Template. Release 1.0.38.
+ * Copyright (C) 2004, 2005 Metaha.
+ *
+ * TrimPath Template is licensed under the GNU General Public License
+ * and the Apache License, Version 2.0, as follows:
+ *
+ * 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; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+var TrimPath;
+
+// TODO: Debugging mode vs stop-on-error mode - runtime flag.
+// TODO: Handle || (or) characters and backslashes.
+// TODO: Add more modifiers.
+
+(function() {               // Using a closure to keep global namespace clean.
+    if (TrimPath == null)
+        TrimPath = new Object();
+    if (TrimPath.evalEx == null)
+        TrimPath.evalEx = function(src) { return eval(src); };
+
+    var UNDEFINED;
+    if (Array.prototype.pop == null)  // IE 5.x fix from Igor Poteryaev.
+        Array.prototype.pop = function() {
+            if (this.length === 0) {return UNDEFINED;}
+            return this[--this.length];
+        };
+    if (Array.prototype.push == null) // IE 5.x fix from Igor Poteryaev.
+        Array.prototype.push = function() {
+            for (var i = 0; i < arguments.length; ++i) {this[this.length] = arguments[i];}
+            return this.length;
+        };
+
+    TrimPath.parseTemplate = function(tmplContent, optTmplName, optEtc) {
+        if (optEtc == null)
+            optEtc = TrimPath.parseTemplate_etc;
+        var funcSrc = parse(tmplContent, optTmplName, optEtc);
+        var func = TrimPath.evalEx(funcSrc, optTmplName, 1);
+        if (func != null)
+            return new optEtc.Template(optTmplName, tmplContent, funcSrc, func, optEtc);
+        return null;
+    }
+
+    try {
+        String.prototype.process = function(context, optFlags) {
+            var template = TrimPath.parseTemplate(this, null);
+            if (template != null)
+                return template.process(context, optFlags);
+            return this;
+        }
+    } catch (e) { // Swallow exception, such as when String.prototype is sealed.
+    }
+
+    TrimPath.parseTemplate_etc = {};            // Exposed for extensibility.
+    TrimPath.parseTemplate_etc.statementTag = "forelse|for|if|elseif|else|var|macro";
+    TrimPath.parseTemplate_etc.statementDef = { // Lookup table for statement tags.
+        "if"     : { delta:  1, prefix: "if (", suffix: ") {", paramMin: 1 },
+        "else"   : { delta:  0, prefix: "} else {" },
+        "elseif" : { delta:  0, prefix: "} else if (", suffix: ") {", paramDefault: "true" },
+        "/if"    : { delta: -1, prefix: "}" },
+        "for"    : { delta:  1, paramMin: 3,
+            prefixFunc : function(stmtParts, state, tmplName, etc) {
+                if (stmtParts[2] != "in")
+                    throw new etc.ParseError(tmplName, state.line, "bad for loop statement: " + stmtParts.join(' '));
+                var iterVar = stmtParts[1];
+                var listVar = "__LIST__" + iterVar;
+                return [ "var ", listVar, " = ", stmtParts[3], ";",
+                    // Fix from Ross Shaull for hash looping, make sure that we have an array of loop lengths to treat like a stack.
+                    "var __LENGTH_STACK__;",
+                    "if (typeof(__LENGTH_STACK__) == 'undefined' || !__LENGTH_STACK__.length) __LENGTH_STACK__ = new Array();",
+                    "__LENGTH_STACK__[__LENGTH_STACK__.length] = 0;", // Push a new for-loop onto the stack of loop lengths.
+                    "if ((", listVar, ") != null) { ",
+                    "var ", iterVar, "_ct = 0;",       // iterVar_ct variable, added by B. Bittman
+                    "for (var ", iterVar, "_index in ", listVar, ") { ",
+                    iterVar, "_ct++;",
+                    "if (typeof(", listVar, "[", iterVar, "_index]) == 'function') {continue;}", // IE 5.x fix from Igor Poteryaev.
+                    "__LENGTH_STACK__[__LENGTH_STACK__.length - 1]++;",
+                    "var ", iterVar, " = ", listVar, "[", iterVar, "_index];" ].join("");
+            } },
+        "forelse" : { delta:  0, prefix: "} } if (__LENGTH_STACK__[__LENGTH_STACK__.length - 1] == 0) { if (", suffix: ") {", paramDefault: "true" },
+        "/for"    : { delta: -1, prefix: "} }; delete __LENGTH_STACK__[__LENGTH_STACK__.length - 1];" }, // Remove the just-finished for-loop from the stack of loop lengths.
+        "var"     : { delta:  0, prefix: "var ", suffix: ";" },
+        "macro"   : { delta:  1,
+            prefixFunc : function(stmtParts, state, tmplName, etc) {
+                var macroName = stmtParts[1].split('(')[0];
+                return [ "var ", macroName, " = function",
+                    stmtParts.slice(1).join(' ').substring(macroName.length),
+                    "{ var _OUT_arr = []; var _OUT = { write: function(m) { if (m) _OUT_arr.push(m); } }; " ].join('');
+            } },
+        "/macro"  : { delta: -1, prefix: " return _OUT_arr.join(''); };" }
+    }
+    TrimPath.parseTemplate_etc.modifierDef = {
+        "eat"        : function(v)    { return ""; },
+        "escape"     : function(s)    { return String(s).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;"); },
+        "capitalize" : function(s)    { return String(s).toUpperCase(); },
+        "default"    : function(s, d) { return s != null ? s : d; }
+    }
+    TrimPath.parseTemplate_etc.modifierDef.h = TrimPath.parseTemplate_etc.modifierDef.escape;
+
+    TrimPath.parseTemplate_etc.Template = function(tmplName, tmplContent, funcSrc, func, etc) {
+        this.process = function(context, flags) {
+            if (context == null)
+                context = {};
+            if (context._MODIFIERS == null)
+                context._MODIFIERS = {};
+            if (context.defined == null)
+                context.defined = function(str) { return (context[str] != undefined); };
+            for (var k in etc.modifierDef) {
+                if (context._MODIFIERS[k] == null)
+                    context._MODIFIERS[k] = etc.modifierDef[k];
+            }
+            if (flags == null)
+                flags = {};
+            var resultArr = [];
+            var resultOut = { write: function(m) { resultArr.push(m); } };
+            try {
+                func(resultOut, context, flags);
+            } catch (e) {
+                if (flags.throwExceptions == true)
+                    throw e;
+                var result = new String(resultArr.join("") + "[ERROR: " + e.toString() + (e.message ? '; ' + e.message : '') + "]");
+                result["exception"] = e;
+                return result;
+            }
+            return resultArr.join("");
+        }
+        this.name       = tmplName;
+        this.source     = tmplContent;
+        this.sourceFunc = funcSrc;
+        this.toString   = function() { return "TrimPath.Template [" + tmplName + "]"; }
+    }
+    TrimPath.parseTemplate_etc.ParseError = function(name, line, message) {
+        this.name    = name;
+        this.line    = line;
+        this.message = message;
+    }
+    TrimPath.parseTemplate_etc.ParseError.prototype.toString = function() {
+        return ("TrimPath template ParseError in " + this.name + ": line " + this.line + ", " + this.message);
+    }
+
+    var parse = function(body, tmplName, etc) {
+        body = cleanWhiteSpace(body);
+        var funcText = [ "var TrimPath_Template_TEMP = function(_OUT, _CONTEXT, _FLAGS) { with (_CONTEXT) {" ];
+        var state    = { stack: [], line: 1 };                              // TODO: Fix line number counting.
+        var endStmtPrev = -1;
+        while (endStmtPrev + 1 < body.length) {
+            var begStmt = endStmtPrev;
+            // Scan until we find some statement markup.
+            begStmt = body.indexOf("{", begStmt + 1);
+            while (begStmt >= 0) {
+                var endStmt = body.indexOf('}', begStmt + 1);
+                var stmt = body.substring(begStmt, endStmt);
+                var blockrx = stmt.match(/^\{(cdata|minify|eval)/); // From B. Bittman, minify/eval/cdata implementation.
+                if (blockrx) {
+                    var blockType = blockrx[1];
+                    var blockMarkerBeg = begStmt + blockType.length + 1;
+                    var blockMarkerEnd = body.indexOf('}', blockMarkerBeg);
+                    if (blockMarkerEnd >= 0) {
+                        var blockMarker;
+                        if( blockMarkerEnd - blockMarkerBeg <= 0 ) {
+                            blockMarker = "{/" + blockType + "}";
+                        } else {
+                            blockMarker = body.substring(blockMarkerBeg + 1, blockMarkerEnd);
+                        }
+
+                        var blockEnd = body.indexOf(blockMarker, blockMarkerEnd + 1);
+                        if (blockEnd >= 0) {
+                            emitSectionText(body.substring(endStmtPrev + 1, begStmt), funcText);
+
+                            var blockText = body.substring(blockMarkerEnd + 1, blockEnd);
+                            if (blockType == 'cdata') {
+                                emitText(blockText, funcText);
+                            } else if (blockType == 'minify') {
+                                emitText(scrubWhiteSpace(blockText), funcText);
+                            } else if (blockType == 'eval') {
+                                if (blockText != null && blockText.length > 0) // From B. Bittman, eval should not execute until process().
+                                    funcText.push('_OUT.write( (function() { ' + blockText + ' })() );');
+                            }
+                            begStmt = endStmtPrev = blockEnd + blockMarker.length - 1;
+                        }
+                    }
+                } else if (body.charAt(begStmt - 1) != '$' &&               // Not an expression or backslashed,
+                body.charAt(begStmt - 1) != '\\') {              // so check if it is a statement tag.
+                    var offset = (body.charAt(begStmt + 1) == '/' ? 2 : 1); // Close tags offset of 2 skips '/'.
+                    // 10 is larger than maximum statement tag length.
+                    if (body.substring(begStmt + offset, begStmt + 10 + offset).search(TrimPath.parseTemplate_etc.statementTag) == 0)
+                        break;                                              // Found a match.
+                }
+                begStmt = body.indexOf("{", begStmt + 1);
+            }
+            if (begStmt < 0)                              // In "a{for}c", begStmt will be 1.
+                break;
+            var endStmt = body.indexOf("}", begStmt + 1); // In "a{for}c", endStmt will be 5.
+            if (endStmt < 0)
+                break;
+            emitSectionText(body.substring(endStmtPrev + 1, begStmt), funcText);
+            emitStatement(body.substring(begStmt, endStmt + 1), state, funcText, tmplName, etc);
+            endStmtPrev = endStmt;
+        }
+        emitSectionText(body.substring(endStmtPrev + 1), funcText);
+        if (state.stack.length != 0)
+            throw new etc.ParseError(tmplName, state.line, "unclosed, unmatched statement(s): " + state.stack.join(","));
+        funcText.push("}}; TrimPath_Template_TEMP");
+        return funcText.join("");
+    }
+
+    var emitStatement = function(stmtStr, state, funcText, tmplName, etc) {
+        var parts = stmtStr.slice(1, -1).split(' ');
+        var stmt = etc.statementDef[parts[0]]; // Here, parts[0] == for/if/else/...
+        if (stmt == null) {                    // Not a real statement.
+            emitSectionText(stmtStr, funcText);
+            return;
+        }
+        if (stmt.delta < 0) {
+            if (state.stack.length <= 0)
+                throw new etc.ParseError(tmplName, state.line, "close tag does not match any previous statement: " + stmtStr);
+            state.stack.pop();
+        }
+        if (stmt.delta > 0)
+            state.stack.push(stmtStr);
+
+        if (stmt.paramMin != null &&
+            stmt.paramMin >= parts.length)
+            throw new etc.ParseError(tmplName, state.line, "statement needs more parameters: " + stmtStr);
+        if (stmt.prefixFunc != null)
+            funcText.push(stmt.prefixFunc(parts, state, tmplName, etc));
+        else
+            funcText.push(stmt.prefix);
+        if (stmt.suffix != null) {
+            if (parts.length <= 1) {
+                if (stmt.paramDefault != null)
+                    funcText.push(stmt.paramDefault);
+            } else {
+                for (var i = 1; i < parts.length; i++) {
+                    if (i > 1)
+                        funcText.push(' ');
+                    funcText.push(parts[i]);
+                }
+            }
+            funcText.push(stmt.suffix);
+        }
+    }
+
+    var emitSectionText = function(text, funcText) {
+        if (text.length <= 0)
+            return;
+        var nlPrefix = 0;               // Index to first non-newline in prefix.
+        var nlSuffix = text.length - 1; // Index to first non-space/tab in suffix.
+        while (nlPrefix < text.length && (text.charAt(nlPrefix) == '\n'))
+            nlPrefix++;
+        while (nlSuffix >= 0 && (text.charAt(nlSuffix) == ' ' || text.charAt(nlSuffix) == '\t'))
+            nlSuffix--;
+        if (nlSuffix < nlPrefix)
+            nlSuffix = nlPrefix;
+        if (nlPrefix > 0) {
+            funcText.push('if (_FLAGS.keepWhitespace == true) _OUT.write("');
+            var s = text.substring(0, nlPrefix).replace('\n', '\\n'); // A macro IE fix from BJessen.
+            if (s.charAt(s.length - 1) == '\n')
+              s = s.substring(0, s.length - 1);
+            funcText.push(s);
+            funcText.push('");');
+        }
+        var lines = text.substring(nlPrefix, nlSuffix + 1).split('\n');
+        for (var i = 0; i < lines.length; i++) {
+            emitSectionTextLine(lines[i], funcText);
+            if (i < lines.length - 1)
+                funcText.push('_OUT.write("\\n");\n');
+        }
+        if (nlSuffix + 1 < text.length) {
+            funcText.push('if (_FLAGS.keepWhitespace == true) _OUT.write("');
+            var s = text.substring(nlSuffix + 1).replace('\n', '\\n');
+            if (s.charAt(s.length - 1) == '\n')
+              s = s.substring(0, s.length - 1);
+            funcText.push(s);
+            funcText.push('");');
+        }
+    }
+
+    var emitSectionTextLine = function(line, funcText) {
+        var endMarkPrev = '}';
+        var endExprPrev = -1;
+        while (endExprPrev + endMarkPrev.length < line.length) {
+            var begMark = "${", endMark = "}";
+            var begExpr = line.indexOf(begMark, endExprPrev + endMarkPrev.length); // In "a${b}c", begExpr == 1
+            if (begExpr < 0)
+                break;
+            if (line.charAt(begExpr + 2) == '%') {
+                begMark = "${%";
+                endMark = "%}";
+            }
+            var endExpr = line.indexOf(endMark, begExpr + begMark.length);         // In "a${b}c", endExpr == 4;
+            if (endExpr < 0)
+                break;
+            emitText(line.substring(endExprPrev + endMarkPrev.length, begExpr), funcText);
+            // Example: exprs == 'firstName|default:"John Doe"|capitalize'.split('|')
+            var exprArr = line.substring(begExpr + begMark.length, endExpr).replace(/\|\|/g, "#@@#").split('|');
+            for (var k in exprArr) {
+                if (exprArr[k].replace) // IE 5.x fix from Igor Poteryaev.
+                    exprArr[k] = exprArr[k].replace(/#@@#/g, '||');
+            }
+            funcText.push('_OUT.write(');
+            emitExpression(exprArr, exprArr.length - 1, funcText);
+            funcText.push(');');
+            endExprPrev = endExpr;
+            endMarkPrev = endMark;
+        }
+        emitText(line.substring(endExprPrev + endMarkPrev.length), funcText);
+    }
+
+    var emitText = function(text, funcText) {
+        if (text == null ||
+            text.length <= 0)
+            return;
+        text = text.replace(/\\/g, '\\\\');
+        text = text.replace(/\n/g, '\\n');
+        text = text.replace(/"/g,  '\\"');
+        funcText.push('_OUT.write("');
+        funcText.push(text);
+        funcText.push('");');
+    }
+
+    var emitExpression = function(exprArr, index, funcText) {
+        // Ex: foo|a:x|b:y1,y2|c:z1,z2 is emitted as c(b(a(foo,x),y1,y2),z1,z2)
+        var expr = exprArr[index]; // Ex: exprArr == [firstName,capitalize,default:"John Doe"]
+        if (index <= 0) {          // Ex: expr    == 'default:"John Doe"'
+            funcText.push(expr);
+            return;
+        }
+        var parts = expr.split(':');
+        funcText.push('_MODIFIERS["');
+        funcText.push(parts[0]); // The parts[0] is a modifier function name, like capitalize.
+        funcText.push('"](');
+        emitExpression(exprArr, index - 1, funcText);
+        if (parts.length > 1) {
+            funcText.push(',');
+            funcText.push(parts[1]);
+        }
+        funcText.push(')');
+    }
+
+    var cleanWhiteSpace = function(result) {
+        result = result.replace(/\t/g,   "    ");
+        result = result.replace(/\r\n/g, "\n");
+        result = result.replace(/\r/g,   "\n");
+        result = result.replace(/^(\s*\S*(\s+\S+)*)\s*$/, '$1'); // Right trim by Igor Poteryaev.
+        return result;
+    }
+
+    var scrubWhiteSpace = function(result) {
+        result = result.replace(/^\s+/g,   "");
+        result = result.replace(/\s+$/g,   "");
+        result = result.replace(/\s+/g,   " ");
+        result = result.replace(/^(\s*\S*(\s+\S+)*)\s*$/, '$1'); // Right trim by Igor Poteryaev.
+        return result;
+    }
+
+    // The DOM helper functions depend on DOM/DHTML, so they only work in a browser.
+    // However, these are not considered core to the engine.
+    //
+    TrimPath.parseDOMTemplate = function(elementId, optDocument, optEtc) {
+        if (optDocument == null)
+            optDocument = document;
+        var element = optDocument.getElementById(elementId);
+        var content = element.value;     // Like textarea.value.
+        if (content == null)
+            content = element.innerHTML; // Like textarea.innerHTML.
+        content = content.replace(/&lt;/g, "<").replace(/&gt;/g, ">");
+        return TrimPath.parseTemplate(content, elementId, optEtc);
+    }
+
+    TrimPath.processDOMTemplate = function(elementId, context, optFlags, optDocument, optEtc) {
+        return TrimPath.parseDOMTemplate(elementId, optDocument, optEtc).process(context, optFlags);
+    }
+}) ();
diff --git a/src/public/stylesheets/ovirt-tree/tree.css b/src/public/stylesheets/ovirt-tree/tree.css
new file mode 100644
index 0000000..5fefb90
--- /dev/null
+++ b/src/public/stylesheets/ovirt-tree/tree.css
@@ -0,0 +1,83 @@
+#nav_tree {
+   padding: 20px;
+}
+
+.nav-tree {
+    width: 222px;
+    position: absolute;
+    overflow: auto;
+    top: 25px;
+    bottom: 140px;
+}
+
+.ovirt-tree, .ovirt-tree ul {
+    list-style: none;
+    margin:0;
+    padding:5px 0 5px 16px;
+    margin-right: 8px;
+}
+
+.ovirt-tree div {
+    background-repeat: no-repeat;
+    background-position: left;
+    padding: 4px 0 4px 28px;
+    cursor: pointer;
+}
+
+.HardwarePool {
+    background-image: url('../../images/icon_hdwarepool.png');
+}
+
+.VmResourcePool {
+    background-image: url('../../images/icon_vmpool.png');
+}
+
+.SmartPool {
+    background-image: url('../../images/icon_smartpool.png');
+}
+
+.hitarea {
+	width: 16px;
+	margin-left: -16px;
+	float: left;
+	cursor: pointer;
+}
+
+.expandable {
+    background: url('../../images/plus.gif') no-repeat left;
+}
+
+.expanded {
+    background: url('../../images/minus.gif') no-repeat left;
+}
+
+ul.ovirt-tree .current {
+    background-color: #698FA6;
+    color:#000000;
+    width: 100%;
+}
+
+.nav-smart-pool {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    height: 130px;
+    background: #CCCCCC;
+    width: 218px;
+    padding: 5px 5px 5px 5px;
+    overflow: auto;
+}
+
+.nav-smart-pool-header {
+    color: #666666;
+}
+
+.nav-dashboard {
+    background-image: url('../../images/icon_dashboard.gif');
+    background-repeat: no-repeat;
+    background-position: left;
+    padding: 0px 0 0px 28px;
+    position: absolute;
+    height: 25px;
+    top: 0;
+}
\ No newline at end of file
-- 
1.5.5.2



From jim at meyering.net  Wed Oct  8 17:07:33 2008
From: jim at meyering.net (Jim Meyering)
Date: Wed, 08 Oct 2008 19:07:33 +0200
Subject: [Ovirt-devel] [PATCH *ALL*] Makefile.am: set OVIRT_DEV from
	Release: 0 in spec.in file
Message-ID: <87bpxv3tii.fsf@rho.meyering.net>

I'd been running "make build" without setting OVIRT_DEV.
That would cause trouble due to using out of date RPMs.
But in development, we should always simply set OVIRT_DEV=1.
We know we're in development mode when the spec.in file contains
has a line that starts like this:

    Release: 0

so I've adjusted all Makefile.am files to automatically do
what we want.  Painful to have to put this same snippet in
7 different repositories, but very soon I'll be motivated
(and have time) to factor out the worst of that duplication.

Jim

>From b7f104e0d410164682c16995fea6358a74e64b16 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Wed, 8 Oct 2008 18:58:32 +0200
Subject: [PATCH appliance] Makefile.am: set OVIRT_DEV from Release: 0 in spec.in file

---
 Makefile.am |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6631274..f77d157 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,6 +25,11 @@ EXTRA_DIST =				\
   ovirt-appliance.spec		\
   ovirt-appliance.spec.in

+# For Release: 0..., set OVIRT_DEV=1 so that we get extra_release.GIT-
+# annotated rpm version strings.
+OVIRT_DEV = \
+ $(shell grep -q '^[[:space:]]*Release:[[:space:]]*0' \
+   $(srcdir)/*.spec.in && echo 1 || :)

 git_head	= $$(git log -1 --pretty=format:%h)
 GIT_RELEASE	= $$(date --utc +%Y%m%d%H%M%S)git$(git_head)
--
1.6.0.2.304.gc76d

>From ee12814840cc1a052827887ee8cf8acda68c3693 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Wed, 8 Oct 2008 18:59:10 +0200
Subject: [PATCH docs] Makefile.am: set OVIRT_DEV from Release: 0 in spec.in file

---
 Makefile.am |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 47fbbab..af55e4f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,12 @@ EXTRA_DIST =				\
   oVirt_Installation_Guide	\
   Using_the_oVirt_Admin_UI

+# For Release: 0..., set OVIRT_DEV=1 so that we get extra_release.GIT-
+# annotated rpm version strings.
+OVIRT_DEV = \
+ $(shell grep -q '^[[:space:]]*Release:[[:space:]]*0' \
+   $(srcdir)/*.spec.in && echo 1 || :)
+
 git_head	= $$(git log -1 --pretty=format:%h)
 GIT_RELEASE	= $$(date --utc +%Y%m%d%H%M%S)git$(git_head)
 RPMDIR		= $$(rpm --eval '%{_rpmdir}')
--
1.6.0.2.304.gc76d

>From 679eeeb67c975ec6289b859b4b6309b465516403 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Wed, 8 Oct 2008 19:00:03 +0200
Subject: [PATCH node] Makefile.am: set OVIRT_DEV from Release: 0 in spec.in file

---
 Makefile.am |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 28aa71e..034fdde 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,6 +32,12 @@ EXTRA_DIST =			\
   logrotate/ovirt-logrotate	\
   logrotate/ovirt-logrotate.conf

+# For Release: 0..., set OVIRT_DEV=1 so that we get extra_release.GIT-
+# annotated rpm version strings.
+OVIRT_DEV = \
+ $(shell grep -q '^[[:space:]]*Release:[[:space:]]*0' \
+   $(srcdir)/*.spec.in && echo 1 || :)
+
 git_head	= $$(git log -1 --pretty=format:%h)
 GIT_RELEASE	= $$(date --utc +%Y%m%d%H%M%S)git$(git_head)
 RPMDIR		= $$(rpm --eval '%{_rpmdir}')
--
1.6.0.2.304.gc76d

>From a00b0850a4e2c51606715deea71dba1c55d10f97 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Wed, 8 Oct 2008 19:00:25 +0200
Subject: [PATCH node-image] Makefile.am: set OVIRT_DEV from Release: 0 in spec.in file

---
 Makefile.am |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 50d55ef..d34887b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,6 +30,12 @@ EXTRA_DIST =				\
   ovirt-node-image.ks		\
   ovirt-pxe

+# For Release: 0..., set OVIRT_DEV=1 so that we get extra_release.GIT-
+# annotated rpm version strings.
+OVIRT_DEV = \
+ $(shell grep -q '^[[:space:]]*Release:[[:space:]]*0' \
+   $(srcdir)/*.spec.in && echo 1 || :)
+
 git_head	= $$(git log -1 --pretty=format:%h)
 GIT_RELEASE	= $$(date --utc +%Y%m%d%H%M%S)git$(git_head)
 RPMDIR		= $$(rpm --eval '%{_rpmdir}')
--
1.6.0.2.304.gc76d

>From acba318c9075a2fce29bc095c4318c0c522080c1 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Wed, 8 Oct 2008 19:00:34 +0200
Subject: [PATCH recipe] Makefile.am: set OVIRT_DEV from Release: 0 in spec.in file

---
 Makefile.am |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 37751af..b0be2c0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,6 +34,12 @@ EXTRA_DIST =			\
   appliances/ovirt/templates/ovirt-server-appliance-setup.erb	\
   appliances/ovirt/templates/terminal.erb

+# For Release: 0..., set OVIRT_DEV=1 so that we get extra_release.GIT-
+# annotated rpm version strings.
+OVIRT_DEV = \
+ $(shell grep -q '^[[:space:]]*Release:[[:space:]]*0' \
+   $(srcdir)/*.spec.in && echo 1 || :)
+
 git_head	= $$(git log -1 --pretty=format:%h)
 GIT_RELEASE	= $$(date --utc +%Y%m%d%H%M%S)git$(git_head)
 RPMDIR		= $$(rpm --eval '%{_rpmdir}')
--
1.6.0.2.304.gc76d

>From 006d020c145c0a29ba311057d97ed39a4d43afc9 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Wed, 8 Oct 2008 18:56:58 +0200
Subject: [PATCH release] Makefile.am: set OVIRT_DEV from Release: 0 in spec.in file

---
 Makefile.am |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0637125..9c37e91 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,6 +25,12 @@ EXTRA_DIST =				\
   ovirt.repo				\
   misc-scripts

+# For Release: 0..., set OVIRT_DEV=1 so that we get extra_release.GIT-
+# annotated rpm version strings.
+OVIRT_DEV = \
+ $(shell grep -q '^[[:space:]]*Release:[[:space:]]*0' \
+   $(srcdir)/*.spec.in && echo 1 || :)
+
 git_head	= $$(git log -1 --pretty=format:%h)
 GIT_RELEASE	= $$(date --utc +%Y%m%d%H%M%S)git$(git_head)
 RPMDIR		= $$(rpm --eval '%{_rpmdir}')
--
1.6.0.2.304.gc76d

>From 9303c86a3d17416bec096e05e84c057a430f3ac7 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Wed, 8 Oct 2008 18:57:46 +0200
Subject: [PATCH server] Makefile.am: set OVIRT_DEV from Release: 0 in spec.in file

---
 Makefile.am |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index daf6ef0..2dc9c92 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,6 +25,12 @@ EXTRA_DIST =			\
   conf					\
   src

+# For Release: 0..., set OVIRT_DEV=1 so that we get extra_release.GIT-
+# annotated rpm version strings.
+OVIRT_DEV = \
+ $(shell grep -q '^[[:space:]]*Release:[[:space:]]*0' \
+   $(srcdir)/*.spec.in && echo 1 || :)
+
 git_head	= $$(git log -1 --pretty=format:%h)
 GIT_RELEASE	= $$(date --utc +%Y%m%d%H%M%S)git$(git_head)
 RPMDIR		= $$(rpm --eval '%{_rpmdir}')
--
1.6.0.2.304.gc76d



From mmorsi at redhat.com  Wed Oct  8 17:19:39 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Wed, 08 Oct 2008 13:19:39 -0400
Subject: [Ovirt-devel] [PATCH server] Version 1 of Revamped Tree
	Navigation. Fixed css urls
In-Reply-To: <1223403153-14490-1-git-send-email-jguiditt@redhat.com>
References: <1223403153-14490-1-git-send-email-jguiditt@redhat.com>
Message-ID: <48ECEBAB.7080201@redhat.com>

ACK as I tested it out and it seems to work on my system, and did a code
review. There are a few caveats as described below, but no blockers that
would prevent this from being pushed. (I can add these issues to
bugzilla if desired / required). One general note, there are alot of
deletions / additions due to whitespace removal, and while I and I'm
sure everyone else appreciates the effort, it did make this patch review
a bit more complicated. rabble rabble rabble ;-)


Jason Guiditta wrote:
> The new javascript tree widget contains the following features/changes from previous implementation:
>
> * The html for the list is dynamically generated using a javascript template system.  This will allow us to plug in different layouts per tree as the widget matures.
> * Updates to the tree are now incremental, rather than a full rip and replace as earlier. We have 2 states we currently look for - 'new' and 'changed'.  The first generates new html and appends it to the DOM, the second just does a replacement of the content of existing nodes.
> * Vastly simplified the markup and css.
> * Added calls where appropriate to refresh the tree before next planned call (for instance, if you add a new hardware pool).
>   
Not sure what the root cause is but I'm not seeing this 'immediate'
refresh when I add a new smart, hardware, or virtual machine pool, eg
the item doesn't appear until the next scheduled tree refresh.


> * Added slide effect when opening and closing a node of the tree.
> * Clicking the plus/minus opens/close the node only, does not load main content area.
> * Clicking anywhere to the right of that on a given node will load content area.
>   
Once again, not sure if this is an issue in your patch or something on
my local setup but this seems to stop after a certain point. eg. I can
click a bit of whitespace to the right of the node and have the content
area loaded correctly, but continuing further right (still in the side
bar though) the area becomes unclickable. I am running Firefox maximized
to a 1280x1024 screen.


> * Added interim icons for 'smartpool' and 'add smartpool'
>
> Note that aside from the nav area, this should not impact the existing trees which have not been converted yet (all popups that have one), as this is a completely separate codebase with it's own js and css files.
>
> Related, but not technically part of the tree, I added a choose_layout method to allow testing of javascript components as we are building them to help eliminate possible side effects from other code.  When not in a production environment, you can pass in ?component_layout=[name] where [name] is the name of a shell rhtml file you have put in views/layouts/components.  As our UI is growing increasingly complex, I think this will be a very useful way to facilitate building components.
>
>   
No existing issue with this bit, but I'm just wondering if this could
potentially result in any security issues as the client can now control
which layout is returned / rendered with which controller / action. Not
that we should be doing this in the first place, but should we ever have
a simple security mechanism in javascript (or even javascript form
validation without a server side correspondence), the client can
potentially invoke an action with a blank layout / template to get
around those mechanisms. Perhaps this is a far-fetched scenario, but I
would just like to raise the issue for thought at this point.

[snip]
> diff --git a/src/public/javascripts/smart_nav_test_data.js b/src/public/javascripts/smart_nav_test_data.js
> new file mode 100644
> index 0000000..43e7dbc
> --- /dev/null
> +++ b/src/public/javascripts/smart_nav_test_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"}]
> +}
>   
Is there any way we can add this to the tests/ directory and/or
integrate this into out test suite so that the tree is tested every time
autobuild tests the wui? Perhaps automatically loading this tree data
when the environment is set to 'test'? Perhaps adding a selenium test?


> \ No newline at end of file
> diff --git a/src/public/javascripts/trimpath-template-1.0.38.js b/src/public/javascripts/trimpath-template-1.0.38.js
>   
Ahhhh! Another javascript library, run for the hills! ;-)


> diff --git a/src/public/stylesheets/ovirt-tree/tree.css b/src/public/stylesheets/ovirt-tree/tree.css
> new file mode 100644
> index 0000000..5fefb90
> --- /dev/null
> +++ b/src/public/stylesheets/ovirt-tree/tree.css
> @@ -0,0 +1,83 @@
> +#nav_tree {
> +   padding: 20px;
> +}
>   
Are you sure you want this here, removing it seems to make the tree look
a bit nicer. (eg I'm seeing too much whitespace between the 'Dashboard'
and the 'Default' pool, can send a screenshot if you want.


Just to reiterate, even with the above issues, the new tree looks good
(perhaps the last padding issue can be tweaked before pushed) so ACK.

  -Mo



From sseago at redhat.com  Wed Oct  8 17:21:45 2008
From: sseago at redhat.com (Scott Seago)
Date: Wed, 08 Oct 2008 13:21:45 -0400
Subject: [Ovirt-devel] [PATCH server] Version 1 of Revamped Tree
	Navigation. Take 3
In-Reply-To: <1223485588-2817-1-git-send-email-jguiditt@redhat.com>
References: <1223485588-2817-1-git-send-email-jguiditt@redhat.com>
Message-ID: <48ECEC29.9060606@redhat.com>

Jason Guiditta wrote:
> The new javascript tree widget contains the following features/changes from previous implementation:
>
> * The html for the list is dynamically generated using a javascript template system.  This will allow us to plug in different layouts per tree as the widget matures.
> * Updates to the tree are now incremental, rather than a full rip and replace as earlier. We have 2 states we currently look for - 'new' and 'changed'.  The first generates new html and appends it to the DOM, the second just does a replacement of the content of existing nodes.
> * Vastly simplified the markup and css.
> * Added calls where appropriate to refresh the tree before next planned call (for instance, if you add a new hardware pool).
> * Added slide effect when opening and closing a node of the tree.
> * Clicking the plus/minus opens/close the node only, does not load main content area.
> * Clicking anywhere to the right of that on a given node will load content area.
> * Added interim icons for 'smartpool' and 'add smartpool'
>
> Note that aside from the nav area, this should not impact the existing trees which have not been converted yet (all popups that have one), as this is a completely separate codebase with it's own js and css files.
>
> Related, but not technically part of the tree, I added a choose_layout method to allow testing of javascript components as we are building them to help eliminate possible side effects from other code.  When not in a production environment, you can pass in ?component_layout=[name] where [name] is the name of a shell rhtml file you have put in views/layouts/components.  As our UI is growing increasingly complex, I think this will be a very useful way to facilitate building components.
>
>   
Works for me

ACK, take 3



From sseago at redhat.com  Wed Oct  8 18:01:34 2008
From: sseago at redhat.com (Scott Seago)
Date: Wed, 08 Oct 2008 14:01:34 -0400
Subject: [Ovirt-devel] [PATCH] integrate "which vm is running on which
	node"	in ui
In-Reply-To: <1223313443-20541-1-git-send-email-mmorsi@redhat.com>
References: <1223313443-20541-1-git-send-email-mmorsi@redhat.com>
Message-ID: <48ECF57E.3020604@redhat.com>

Mohammed Morsi wrote:
> ---
>  src/app/controllers/application.rb     |    2 +-
>  src/app/controllers/pool_controller.rb |    1 +
>  src/app/views/host/show.rhtml          |    2 ++
>  src/app/views/vm/_grid.rhtml           |    3 +++
>  4 files changed, 7 insertions(+), 1 deletions(-)
>   
ACK.

works for me. I tried it as a user w/ HW pool access and one without.

Scott



From jguiditt at redhat.com  Wed Oct  8 18:04:35 2008
From: jguiditt at redhat.com (Jason Guiditta)
Date: Wed, 08 Oct 2008 14:04:35 -0400
Subject: [Ovirt-devel] [PATCH server] Version 1 of Revamped Tree
	Navigation. Fixed css urls
In-Reply-To: <48ECEBAB.7080201@redhat.com>
References: <1223403153-14490-1-git-send-email-jguiditt@redhat.com>
	<48ECEBAB.7080201@redhat.com>
Message-ID: <1223489075.421.17.camel@localhost.localdomain>

On Wed, 2008-10-08 at 13:19 -0400, Mohammed Morsi wrote:
> ACK as I tested it out and it seems to work on my system, and did a code
> review. There are a few caveats as described below, but no blockers that
> would prevent this from being pushed. (I can add these issues to
> bugzilla if desired / required). One general note, there are alot of
> deletions / additions due to whitespace removal, and while I and I'm
> sure everyone else appreciates the effort, it did make this patch review
> a bit more complicated. rabble rabble rabble ;-)

On the whitespace removal, there really are only a few I think, as a lot
of this is legitimate reshuffling and moving existing code around with
slight revamps.  Also, I am using the git precommit hook, so I always
fix any whitespace errors that come up.  We can all discuss more in irc,
but I believe we should just fix these as we come across them, as new
ones should not be creeping in with the current setup.  I doubt there
are many left by now anyway, so it may be almost a moot point.

> Not sure what the root cause is but I'm not seeing this 'immediate'
> refresh when I add a new smart, hardware, or virtual machine pool, eg
> the item doesn't appear until the next scheduled tree refresh.
> 
I think this was mentioned in irc, but it is likely browser caching.  I
ran into the same thing on first deploy to an appliance
> 

> Once again, not sure if this is an issue in your patch or something on
> my local setup but this seems to stop after a certain point. eg. I can
> click a bit of whitespace to the right of the node and have the content
> area loaded correctly, but continuing further right (still in the side
> bar though) the area becomes unclickable. I am running Firefox maximized
> to a 1280x1024 screen.
> 
Not sure on this, could be the bit of padding I put to decrease overlap
of the container though.
> 

> No existing issue with this bit, but I'm just wondering if this could
> potentially result in any security issues as the client can now control
> which layout is returned / rendered with which controller / action. Not
> that we should be doing this in the first place, but should we ever have
> a simple security mechanism in javascript (or even javascript form
> validation without a server side correspondence), the client can
> potentially invoke an action with a blank layout / template to get
> around those mechanisms. Perhaps this is a far-fetched scenario, but I
> would just like to raise the issue for thought at this point.

Well, I have taken the security consideration into account by only
allowing the component layout if you are not in a production
environment.  If you think we need more than that, I am open to adding
more security.

> >   
> Is there any way we can add this to the tests/ directory and/or
> integrate this into out test suite so that the tree is tested every time
> autobuild tests the wui? Perhaps automatically loading this tree data
> when the environment is set to 'test'? Perhaps adding a selenium test?
> 
We could, but I think our regular wui selenium tests will work fine as
is.  This is more for development-level testing, ie trying to figure out
the correct jq selectors to use, or how to properly manipulate the dom.
That said, if no one else thinks it is useful, we can always kill it and
I'll just do it locally.  I do need it for my own work though and
running it in a test is not really going to help my use case.  Another
option could be to do a tests directory somewhere strictly for
javascript ui components that includes a test page - this would
accomplish the same thing I am going for here, and not even require
mongrel be running to do tests (hmm, though what about ajax calls..?)
> 
> > \ No newline at end of file
> > diff --git a/src/public/javascripts/trimpath-template-1.0.38.js b/src/public/javascripts/trimpath-template-1.0.38.js
> >   
> Ahhhh! Another javascript library, run for the hills! ;-)
/me hits the pavement....
> 
> 
> > diff --git a/src/public/stylesheets/ovirt-tree/tree.css b/src/public/stylesheets/ovirt-tree/tree.css
> > new file mode 100644
> > index 0000000..5fefb90
> > --- /dev/null
> > +++ b/src/public/stylesheets/ovirt-tree/tree.css
> > @@ -0,0 +1,83 @@
> > +#nav_tree {
> > +   padding: 20px;
> > +}
> >   
> Are you sure you want this here, removing it seems to make the tree look
> a bit nicer. (eg I'm seeing too much whitespace between the 'Dashboard'
> and the 'Default' pool, can send a screenshot if you want.

Sure, we can tweak this as necessary, though I think there is a chance
what you saw was related to the caching issue mentioned above, so I am
leaving it for the moment.
Thanks for the feedback,

-j



From dpierce at redhat.com  Wed Oct  8 19:04:10 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Wed,  8 Oct 2008 15:04:10 -0400
Subject: [Ovirt-devel] [PATCH server] Added support for booting a VM from an
	ISO image.
Message-ID: <1223492650-887-1-git-send-email-dpierce@redhat.com>

Also added a few helper methods to Vm to contain the knowledge
of how Cobbler integration is contained.

When a user adds an ISO image to the Cobbler server on the appliance,
they will need to do so using the full NFS path for where the virtual
image will go to mount it; i.e., hostname:/path/to/filename.iso

If the filename ends in ".iso" then the virtual machine will mount the
file as a CDROM device and boot it. Otherwise, it mounts it as a hard
disk device.

To add an image to Cobbler, do the following:

1. Download an ISO image, such as the KDE LiveImage from Fedora.
2. Copy it to the NFS directory on the server:
  cp *.iso /ovirtnfs/kde-live-cd.iso
3. Add that image to your Cobbler instance:
  cobbler image add --name=KDE-LiveCD --file=management.priv.ovirt.org:/ovirtnfs/kde-live-cd.iso
4. Create a new VM in your server.
5. Select "KDE-LiveCD" from the list of operating systems.
6. Save the VM.
7. Start the VM.

It should run the selected ISO.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 src/app/controllers/vm_controller.rb |   50 +++++++++++++---------
 src/app/models/vm.rb                 |   34 ++++++++++++++-
 src/task-omatic/task_vm.rb           |   78 ++++++++++++++++++++++++++++-----
 src/test/unit/vm_test.rb             |   56 +++++++++++++++++++++++-
 4 files changed, 181 insertions(+), 37 deletions(-)

diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb
index f5c0845..7f911e1 100644
--- a/src/app/controllers/vm_controller.rb
+++ b/src/app/controllers/vm_controller.rb
@@ -223,13 +223,18 @@ class VmController < ApplicationController
   def _setup_provisioning_options
     @provisioning_options = [[Vm::PXE_OPTION_LABEL, Vm::PXE_OPTION_VALUE],
                              [Vm::HD_OPTION_LABEL, Vm::HD_OPTION_VALUE]]
-    # FIXME add cobbler images too
+
     begin
+      @provisioning_options += Cobbler::Image.find.collect do |image|
+        [image.name + Vm::COBBLER_IMAGE_SUFFIX,
+          "#{Vm::IMAGE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{image.name}"]
+      end
+
       @provisioning_options += Cobbler::Profile.find.collect do |profile|
         [profile.name + Vm::COBBLER_PROFILE_SUFFIX,
-         Vm::COBBLER_PREFIX + Vm::PROVISIONING_DELIMITER +
-         Vm::PROFILE_PREFIX + Vm::PROVISIONING_DELIMITER + profile.name]
-      end
+          "#{Vm::PROFILE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{profile.name}"]
+
+    end
     rescue
       #if cobbler doesn't respond/is misconfigured/etc just don't add profiles
     end
@@ -239,24 +244,29 @@ class VmController < ApplicationController
   def _setup_vm_provision(params)
     # spaces are invalid in the cobbler name
     name = params[:vm][:uuid]
-    provision = params[:vm][:provisioning_and_boot_settings].gsub(
-         Vm::COBBLER_PREFIX + Vm::PROVISIONING_DELIMITER +
-         Vm::PROFILE_PREFIX + Vm::PROVISIONING_DELIMITER, "")
     mac = params[:vm][:vnic_mac_addr]
-    unless provision == Vm::PXE_OPTION_VALUE or
-           provision == Vm::HD_OPTION_VALUE
-      found = false
-      Cobbler::System.find.each{ |system|
-        if system.name == name
-          system.profile = provision
-          system.save
-          found = true
+    provision = params[:vm][:provisioning_and_boot_settings]
+    # determine what type of provisioning was selected for the VM
+    provisioning_type = :pxe_or_hd_type
+    provisioning_type = :image_type  if provision =~ /Vm::IMAGE_PREFIX at Vm::COBBLER_PREFIX/
+    provisioning_type = :system_type if provision =~ /Vm::PROFILE_PREFIX at Vm::COBBLER_PREFIX/
+
+    unless provisioning_type == :pxe_or_hd_type
+      cobbler_name = provision.gsub(/(Vm::IMAGE_PREFIX|Vm::PROFILE_PREFIX)@Vm::COBBLER_PREFIX/, '')
+
+      system = Cobbler::System.find_one(name)
+
+      unless system
+        nic = Cobbler::NetworkInterface.new({'mac_address' => mac})
+
+        case provisioning_type
+        when :image_type: 
+            system = Cobbler::System.create("name" => name, "image"    => cobbler_name)
+        when :system_type: 
+            system = Cobbler::System.create("name" => name, "profile" => cobbler_name)
         end
-      }
-      unless found
-        system = Cobbler::System.create("name" => name,
-                                        "profile" => provision)
-        system.interfaces=[Cobbler::NetworkInterface.new({'mac_address' => mac})]
+
+        system.interfaces = [nic]
         system.save
       end
     end
diff --git a/src/app/models/vm.rb b/src/app/models/vm.rb
index ace6fb1..e37b88e 100644
--- a/src/app/models/vm.rb
+++ b/src/app/models/vm.rb
@@ -49,7 +49,7 @@ class Vm < ActiveRecord::Base
   PROFILE_PREFIX         = "profile"
   IMAGE_PREFIX           = "image"
   COBBLER_PROFILE_SUFFIX = " (Cobbler Profile)"
-  COBBLER_IMAGE_SUFFIX   = " (Cobbler Profile)"
+  COBBLER_IMAGE_SUFFIX   = " (Cobbler Image)"
 
   PXE_OPTION_LABEL       = "PXE Boot"
   PXE_OPTION_VALUE       = "pxe"
@@ -139,7 +139,15 @@ class Vm < ActiveRecord::Base
   end
 
   def provisioning_and_boot_settings=(settings)
-    if settings==PXE_OPTION_VALUE
+    # if the settings have a prefix that matches cobber settings, then process
+    # those details
+    if settings =~ /#{COBBLER_IMAGE}\@#{COBBLER_PREFIX}/
+      self[:boot_device] = BOOT_DEV_CDROM
+      self[:provisiong] = settings
+    elsif settings =~ /#{COBBLER_PROFILE}\@#{COBBLER_PREFIX}/
+      self[:boot_device] = BOOT_DEV_NETWORK
+      self[:provisioning] = settings
+    elsif settings==PXE_OPTION_VALUE
       self[:boot_device]= BOOT_DEV_NETWORK
       self[:provisioning]= nil
     elsif settings==HD_OPTION_VALUE
@@ -242,6 +250,28 @@ class Vm < ActiveRecord::Base
     vm_resource_pool.search_users
   end
 
+  # Reports whether the VM is uses Cobbler for booting.
+  #
+  def uses_cobbler?
+    (self.provisioning != nil) && (self.provisioning.include? COBBLER_PREFIX)
+  end
+
+  # Returns the cobbler type.
+  #
+  def cobbler_type
+    if self.uses_cobbler?
+      self.provisioning[/^(.*)@/,1]
+    end
+  end
+
+  # Returns the cobbler provisioning name.
+  #
+  def cobbler_name
+    if self.uses_cobbler?
+      self.provisioning[/^.*@.*:(.*)/,1]
+    end
+  end
+
   protected
   def validate
     resources = vm_resource_pool.max_resources_for_vm(self)
diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb
index 3588224..afac66d 100644
--- a/src/task-omatic/task_vm.rb
+++ b/src/task-omatic/task_vm.rb
@@ -65,16 +65,26 @@ def create_vm_xml(name, uuid, memAllocated, memUsed, vcpus, bootDevice,
   doc.root.elements["devices"].add_element("emulator")
   doc.root.elements["devices"].elements["emulator"].text = "/usr/bin/qemu-kvm"
 
-  devs = [ 'hda', 'hdb', 'hdc', 'hdd' ]
-  i = 0
+  devs = ['hda', 'hdb', 'hdc', 'hdd']
+  which_device = 0
   diskDevices.each do |disk|
+    is_cdrom = (disk =~ /\.iso/) ? true : false
+
     diskdev = Element.new("disk")
-    diskdev.add_attribute("type", "block")
-    diskdev.add_attribute("device", "disk")
-    diskdev.add_element("source", {"dev" => disk})
-    diskdev.add_element("target", {"dev" => devs[i]})
+    diskdev.add_attribute("type", is_cdrom ? "file" : "block")
+    diskdev.add_attribute("device", is_cdrom ? "cdrom" : "disk")
+
+    if is_cdrom
+      diskdev.add_element("readonly")
+      diskdev.add_element("source", {"file" => disk})
+      diskdev.add_element("target", {"dev" => devs[which_device], "bus" => "ide"})
+    else
+      diskdev.add_element("source", {"dev" => disk})
+      diskdev.add_element("target", {"dev" => devs[which_device]})
+    end
+
     doc.root.elements["devices"] << diskdev
-    i += 1
+    which_device += 1 
   end
 
   doc.root.elements["devices"].add_element("interface", {"type" => "bridge"})
@@ -154,15 +164,12 @@ def create_vm(task)
   # create cobbler system profile
   begin
     if vm.provisioning and !vm.provisioning.empty?
-      provisioning_arr = vm.provisioning.split(Vm::PROVISIONING_DELIMITER)
-      if provisioning_arr[0]==Vm::COBBLER_PREFIX
-        if provisioning_arr[1]==Vm::PROFILE_PREFIX
+      if vm.uses_cobbler?
+        if vm.cobbler_type == Vm::PROFILE_PREFIX:
           system = Cobbler::System.new('name' => vm.uuid,
                                        'profile' => provisioning_arr[2])
           system.interfaces=[Cobbler::NetworkInterface.new({'mac_address' => vm.vnic_mac_addr})]
           system.save
-        elsif provisioning_arr[1]==Vm::IMAGE_PREFIX
-          #FIXME handle cobbler images
         end
       end
     end
@@ -231,6 +238,14 @@ def shutdown_vm(task)
   setVmShutdown(vm)
 end
 
+# Find thes storage pool with the given ip address and export path.
+#
+def find_storage_pool(ip_addr, export_path)
+  StoragePool.find(:first,
+    :conditions =>
+      ['ip_addr = ? and export_path = ?',ip_addr, export_path])
+end
+
 def start_vm(task)
   puts "start_vm"
 
@@ -266,6 +281,45 @@ def start_vm(task)
     # hosts to see if there is a host that will fit these constraints
     host = findHostSLA(vm)
 
+    # if we're booting from a CDROM the VM is an image, 
+    # then we need to add the NFS mount as a storage volume for this
+    # boot
+    #
+    if (vm.boot_device == Vm::BOOT_DEV_CDROM) && vm.uses_cobbler? && (vm.cobbler_type == Vm::IMAGE_PREFIX)
+      details = Cobbler::Image.find_one(vm.cobbler_name)
+      raise Exception.new("Image #{vm.cobbler_name} not found in Cobbler server") unless details
+
+      ignored, ip_addr, export_path, filename =
+        details.file.split(/(.*):(.*)\/(.*)/)
+
+      found = false
+
+      vm.storage_volumes.each do |volume|
+        if volume.filename == filename
+          if (volume.storage_pool.ip_addr == ip_addr) &&
+          (volume.storage_pool.export_path == export_path)
+            found = true
+          end
+        end
+      end
+
+      unless found
+        # Create a new transient NFS storage volume
+        # This volume is *not* persisted.
+        image_volume = StorageVolume.factory("NFS",
+          :filename => filename
+        )
+
+        image_volume.storage_pool
+        image_pool = find_storage_pool(ip_addr, export_path)
+        if image_pool
+          image_pool.storage_volumes << image_volume
+          image_pool.save!
+        end
+        vm.storage_volumes << image_volume
+      end
+    end
+
     conn = Libvirt::open("qemu+tcp://" + host.hostname + "/system")
 
     storagedevs = connect_storage_pools(conn, vm)
diff --git a/src/test/unit/vm_test.rb b/src/test/unit/vm_test.rb
index 4a5e353..22164e8 100644
--- a/src/test/unit/vm_test.rb
+++ b/src/test/unit/vm_test.rb
@@ -22,8 +22,58 @@ require File.dirname(__FILE__) + '/../test_helper'
 class VmTest < Test::Unit::TestCase
   fixtures :vms
 
-  # Replace this with your real tests.
-  def test_truth
-    assert true
+  def setup
+    @vm_name = "Test"
+    @no_cobbler_provisioning = "#{@vm_name}"
+    @cobbler_image_provisioning =
+      "#{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}"
+  end
+
+  # Ensures that, if the VM does not contain the Cobbler prefix, that it
+  # does not claim to be a Cobbler VM.
+  #
+  def test_uses_cobbler_without_cobbler_prefix
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings=@no_cobbler_provisioning
+
+    flunk "VM is not a Cobbler provisioned one." if vm.uses_cobbler?
+    assert_equal @vm_name, vm.provisioning, "Wrong name reported."
+  end
+
+  # Ensures that the VM reports that it uses Cobbler if the provisioning
+  # is for a Cobbler profile.
+  #
+  def test_uses_cobbler_with_cobbler_profile
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings = @cobbler_profile_provisioning
+
+    flunk "VM did not report that it's Cobbler provisioned." unless vm.uses_cobbler?
+    assert_equal Vm::PROFILE_PREFIX,
+      vm.cobbler_type,
+      "Wrong cobbler type reported."
+    assert_equal @vm_name,
+      vm.cobbler_name,
+      "Wrong name reported."
+  end
+
+  # Ensures that the VM reports that it uses Cobbler if the provisioning
+  # is for a Cobbler image.
+  #
+  def test_uses_cobbler_with_cobbler_image
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings = @cobbler_image_provisioning
+
+    flunk "VM did not report that it's Cobbler provisioned." unless vm.uses_cobbler?
+    assert_equal Vm::IMAGE_PREFIX,
+      vm.cobbler_type,
+      "Wrong cobbler type reported."
+    assert_equal @vm_name,
+      vm.cobbler_name,
+      "Wrong name reported."
   end
 end
-- 
1.5.5.1



From dpierce at redhat.com  Wed Oct  8 19:04:20 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Wed,  8 Oct 2008 15:04:20 -0400
Subject: [Ovirt-devel] [PATCH server] Replaced the config scripts with
	configuration encoding.
Message-ID: <1223492660-924-1-git-send-email-dpierce@redhat.com>

Rather than sending the node a series of scripts that load
kernel modules, or are tightly coupled to tools like augeas,
this patch introduces an encoding scheme for data.

A line that begins with "kmod" describes a kernel module that
needs to be loaded. It will containing the module's name, an
optional alias for the module, and then the module options
if such are required.

A line that begins with "ifcfg" describes an network
interface. It will contain the mac address and interface name,
followed by all needed configuration values to bring the
interface up.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 src/app/models/bonding.rb                          |    1 +
 src/lib/managed_node_configuration.rb              |   72 +++++++++------
 src/test/fixtures/bondings.yml                     |    8 ++-
 src/test/fixtures/bondings_nics.yml                |    8 ++
 src/test/fixtures/hosts.yml                        |   10 ++
 src/test/fixtures/nics.yml                         |   14 +++
 .../functional/managed_node_configuration_test.rb  |   94 ++++++++------------
 7 files changed, 118 insertions(+), 89 deletions(-)

diff --git a/src/app/models/bonding.rb b/src/app/models/bonding.rb
index 941e2cd..7bef2f8 100644
--- a/src/app/models/bonding.rb
+++ b/src/app/models/bonding.rb
@@ -38,6 +38,7 @@ class Bonding < ActiveRecord::Base
 
   belongs_to :host
   belongs_to :bonding_type
+  belongs_to :boot_type
 
   has_and_belongs_to_many :nics,
     :join_table  => 'bondings_nics',
diff --git a/src/lib/managed_node_configuration.rb b/src/lib/managed_node_configuration.rb
index 4ade235..8c8892b 100644
--- a/src/lib/managed_node_configuration.rb
+++ b/src/lib/managed_node_configuration.rb
@@ -23,36 +23,57 @@
 
 require 'stringio'
 
+# +ManagedNodeConfiguration+ generates a configuration file for an oVirt node
+# based on information about the hardware submitted by the node and the
+# configuration details held in the database.
+#
+# The configuration is returned as a series of encoded lines.
+#
+# For a kernel module, the formation of the line is as follows:
+#
+# kmod=[module name]|[module alias]|[module options]
+#
+# An example would be for loading the +bonding+ kernel module to setup a bonded
+# interface for load balancing. In this example, the bonded interface would be
+# named +failover0+ on the node:
+#
+# kmod=bonding|failover0|mode=2 miimon=100 downdelay=200
+#
+# For a network interface (including a bonded interface) an example would be:
+#
+# ifcfg=00:11:22:33:44|eth0|BOOTPROTO=dhcp|bridge=ovirtbr0|ONBOOT=yes
+#
+# In this line, the network interface +eth0+ has a hardware MAC address of
+# +00:11:22:33:44+. It will use DHCP for retrieving it's IP address details,
+# and will use the +ovirtbr0+ interface as a bridge.
+#
 class ManagedNodeConfiguration
   NIC_ENTRY_PREFIX='/files/etc/sysconfig/network-scripts'
 
   def self.generate(host, macs)
     result = StringIO.new
 
-    result.puts "#!/bin/bash"
     result.puts "# THIS FILE IS GENERATED!"
 
     # first process any bondings that're defined
     unless host.bondings.empty?
-      result.puts "cat <<\EOF > /var/tmp/pre-config-script"
-      result.puts "#!/bin/bash"
-      result.puts "# THIS FILE IS GENERATED!"
-
       host.bondings.each do |bonding|
-        result.puts "/sbin/modprobe bonding mode=#{bonding.bonding_type.mode}"
+        result.puts "bonding=#{bonding.interface_name}|mode=#{bonding.bonding_type.mode} miimon=100 downdelay=200"
       end
-
-      result.puts "EOF"
     end
 
     # now process the network interfaces  and bondings
-    result.puts "cat <<\EOF > /var/tmp/node-augtool"
 
     host.bondings.each do |bonding|
-      result.puts "rm #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}"
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/DEVICE #{bonding.interface_name}"
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/IPADDR #{bonding.ip_addr}" if bonding.ip_addr
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/ONBOOT yes"
+      entry = "ifcfg=none|#{bonding.interface_name}"
+
+      if bonding.ip_addr == nil || bonding.ip_addr.empty?
+        entry += "|BOOTPROTO=dhcp"
+      else
+        entry += "|BOOTPROTO=static|IPADDR=#{bonding.ip_addr}|NETMASK=#{bonding.netmask}|BROADCAST=#{bonding.broadcast}"
+      end
+
+      result.puts "#{entry}|ONBOOT=yes"
 
       bonding.nics.each do |nic|
         process_nic result, nic, macs, bonding
@@ -66,9 +87,6 @@ class ManagedNodeConfiguration
       end
     end
 
-    result.puts "save"
-    result.puts "EOF"
-
     result.string
   end
 
@@ -78,24 +96,18 @@ class ManagedNodeConfiguration
     iface_name = macs[nic.mac]
 
     if iface_name
-      result.puts "rm #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}"
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/DEVICE #{iface_name}"
+      entry = "ifcfg=#{nic.mac}|#{iface_name}"
 
       if bonding
-        result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/MASTER #{bonding.interface_name}"
-        result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/SLAVE yes"
+        entry += "|MASTER=#{bonding.interface_name}|SLAVE=yes"
       else
-        result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BOOTPROTO #{nic.boot_type.proto}"
-
-        if nic.boot_type.proto == 'static'
-          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/IPADDR #{nic.ip_addr}"
-          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/NETMASK #{nic.netmask}"
-          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BROADCAST #{nic.broadcast}"
-        end
+        entry += "|BOOTPROTO=#{nic.boot_type.proto}"
+        entry += "|IPADDR=#{nic.ip_addr}|NETMASK=#{nic.netmask}|BROADCAST=#{nic.broadcast}" if nic.boot_type.proto == 'static'
+        entry += "|BRIDGE=#{nic.bridge}" if nic.bridge
       end
-
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BRIDGE #{nic.bridge}"     if nic.bridge
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/ONBOOT yes"
+      entry += "|ONBOOT=yes"
     end
+
+    result.puts entry if defined? entry
   end
 end
diff --git a/src/test/fixtures/bondings.yml b/src/test/fixtures/bondings.yml
index c2a47b5..7023e08 100644
--- a/src/test/fixtures/bondings.yml
+++ b/src/test/fixtures/bondings.yml
@@ -1,6 +1,6 @@
 mailservers_managed_node_bonding:
     name: Production Network
-    interface_name: bond0
+    interface_name: mailbonding0
     bonding_type_id: <%= Fixtures.identify(:link_aggregation_bonding_type) %>
     host_id: <%= Fixtures.identify(:mailservers_managed_node) %>
     ip_addr: 172.31.0.15
@@ -8,3 +8,9 @@ mailservers_managed_node_bonding:
     broadcast: 172.31.0.255
     arp_ping_address: 172.31.0.100
     arp_interval: 0
+
+mediaserver_managed_node_bonding:
+    name: Fileserver Network
+    interface_name: mediabonding0
+    bonding_type_id: <%= Fixtures.identify(:link_aggregation_bonding_type) %>
+    host_id: <%= Fixtures.identify(:mediaserver_managed_node) %>
diff --git a/src/test/fixtures/bondings_nics.yml b/src/test/fixtures/bondings_nics.yml
index 11a3d1a..607ff8b 100644
--- a/src/test/fixtures/bondings_nics.yml
+++ b/src/test/fixtures/bondings_nics.yml
@@ -5,3 +5,11 @@ mailservers_managed_node_bonding_nic_1:
 mailservers_managed_node_bonding_nic_2:
     bonding_id: <%= Fixtures.identify(:mailservers_managed_node_bonding) %>
     nic_id: <%= Fixtures.identify(:mailserver_nic_two) %>
+
+mediaservers_managed_node_bonding_nic_1:
+    bonding_id: <%= Fixtures.identify(:mediaserver_managed_node_bonding) %>
+    nic_id: <%= Fixtures.identify(:mediaserver_nic_one) %>
+
+mediaservers_managed_node_bonding_nic_2:
+    bonding_id: <%= Fixtures.identify(:mediaserver_managed_node_bonding) %>
+    nic_id: <%= Fixtures.identify(:mediaserver_nic_two) %>
diff --git a/src/test/fixtures/hosts.yml b/src/test/fixtures/hosts.yml
index 5b8af15..28282c2 100644
--- a/src/test/fixtures/hosts.yml
+++ b/src/test/fixtures/hosts.yml
@@ -125,3 +125,13 @@ buildserver_managed_node:
     is_disabled: 0
     hypervisor_type: 'kvm'
     hardware_pool_id: <%= Fixtures.identify(:prodops_pool) %>
+
+mediaserver_managed_node:
+    uuid: '6293acd9-2784-11dc-9387-001558c41534'
+    hostname: 'build.mynetwork.com'
+    arch: 'x86_64'
+    memory: 65536
+    is_disabled: 0
+    hypervisor_type: 'kvm'
+    hardware_pool_id: <%= Fixtures.identify(:prodops_pool) %>
+
diff --git a/src/test/fixtures/nics.yml b/src/test/fixtures/nics.yml
index ccf71d2..5b2cecc 100644
--- a/src/test/fixtures/nics.yml
+++ b/src/test/fixtures/nics.yml
@@ -78,3 +78,17 @@ buildserver_nic_two:
     broadcast: '172.31.0.255'
     host_id: <%= Fixtures.identify(:buildserver_managed_node) %>
     boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
+
+mediaserver_nic_one:
+    mac: '07:17:19:65:03:32'
+    usage_type: '1'
+    bandwidth: 100
+    host_id: <%= Fixtures.identify(:mediaserver_managed_node) %>
+    boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
+
+mediaserver_nic_two:
+    mac: '07:17:19:65:03:31'
+    usage_type: '1'
+    bandwidth: 100
+    host_id: <%= Fixtures.identify(:mediaserver_managed_node) %>
+    boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
diff --git a/src/test/functional/managed_node_configuration_test.rb b/src/test/functional/managed_node_configuration_test.rb
index b5a7ec5..fd2139e 100644
--- a/src/test/functional/managed_node_configuration_test.rb
+++ b/src/test/functional/managed_node_configuration_test.rb
@@ -36,6 +36,7 @@ class ManagedNodeConfigurationTest < Test::Unit::TestCase
     @host_with_ip_address = hosts(:ldapserver_managed_node)
     @host_with_multiple_nics = hosts(:buildserver_managed_node)
     @host_with_bondings = hosts(:mailservers_managed_node)
+    @host_with_dhcp_bondings = hosts(:mediaserver_managed_node)
   end
 
   # Ensures that network interfaces uses DHCP when no IP address is specified.
@@ -44,15 +45,8 @@ class ManagedNodeConfigurationTest < Test::Unit::TestCase
     nic = @host_with_dhcp_card.nics.first
 
     expected = <<-HERE
-#!/bin/bash
 # THIS FILE IS GENERATED!
-cat <<\EOF > /var/tmp/node-augtool
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BOOTPROTO #{nic.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
-save
-EOF
+ifcfg=#{nic.mac}|eth0|BOOTPROTO=dhcp|ONBOOT=yes
     HERE
 
     result = ManagedNodeConfiguration.generate(
@@ -69,19 +63,8 @@ EOF
     nic = @host_with_ip_address.nics.first
 
     expected = <<-HERE
-#!/bin/bash
 # THIS FILE IS GENERATED!
-cat <<\EOF > /var/tmp/node-augtool
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BOOTPROTO #{nic.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/IPADDR #{nic.ip_addr}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/NETMASK #{nic.netmask}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BROADCAST #{nic.broadcast}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BRIDGE ovirtbr0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
-save
-EOF
+ifcfg=#{nic.mac}|eth0|BOOTPROTO=#{nic.boot_type.proto}|IPADDR=#{nic.ip_addr}|NETMASK=#{nic.netmask}|BROADCAST=#{nic.broadcast}|BRIDGE=#{nic.bridge}|ONBOOT=yes
     HERE
 
     result = ManagedNodeConfiguration.generate(
@@ -99,22 +82,9 @@ EOF
     nic2 = @host_with_multiple_nics.nics[1]
 
     expected = <<-HERE
-#!/bin/bash
 # THIS FILE IS GENERATED!
-cat <<\EOF > /var/tmp/node-augtool
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BOOTPROTO #{nic1.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/IPADDR #{nic1.ip_addr}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/NETMASK #{nic1.netmask}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BROADCAST #{nic1.broadcast}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth1
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/DEVICE eth1
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/BOOTPROTO #{nic2.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/ONBOOT yes
-save
-EOF
+ifcfg=#{nic1.mac}|eth0|BOOTPROTO=#{nic1.boot_type.proto}|IPADDR=#{nic1.ip_addr}|NETMASK=#{nic1.netmask}|BROADCAST=#{nic1.broadcast}|ONBOOT=yes
+ifcfg=#{nic2.mac}|eth1|BOOTPROTO=#{nic2.boot_type.proto}|ONBOOT=yes
     HERE
 
     result = ManagedNodeConfiguration.generate(
@@ -137,30 +107,11 @@ EOF
     nic2 = bonding.nics[1]
 
     expected = <<-HERE
-#!/bin/bash
 # THIS FILE IS GENERATED!
-cat <<\EOF > /var/tmp/pre-config-script
-#!/bin/bash
-# THIS FILE IS GENERATED!
-/sbin/modprobe bonding mode=#{bonding.bonding_type.mode}
-EOF
-cat <<\EOF > /var/tmp/node-augtool
-rm /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}
-set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/DEVICE #{bonding.interface_name}
-set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/IPADDR 172.31.0.15
-set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/ONBOOT yes
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/MASTER #{bonding.interface_name}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/SLAVE yes
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth1
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/DEVICE eth1
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/MASTER #{bonding.interface_name}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/SLAVE yes
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/ONBOOT yes
-save
-EOF
+bonding=#{bonding.interface_name}|mode=#{bonding.bonding_type.mode} miimon=100 downdelay=200
+ifcfg=none|#{bonding.interface_name}|BOOTPROTO=static|IPADDR=#{bonding.ip_addr}|NETMASK=#{bonding.netmask}|BROADCAST=#{bonding.broadcast}|ONBOOT=yes
+ifcfg=#{nic1.mac}|eth0|MASTER=#{bonding.interface_name}|SLAVE=yes|ONBOOT=yes
+ifcfg=#{nic2.mac}|eth1|MASTER=#{bonding.interface_name}|SLAVE=yes|ONBOOT=yes
 HERE
 
     result = ManagedNodeConfiguration.generate(
@@ -173,4 +124,31 @@ HERE
     assert_equal expected, result
   end
 
+  # Ensures that the generated bonding supports DHCP boot protocol.
+  #
+  def test_generate_with_dhcp_bonding
+    bonding = @host_with_dhcp_bondings.bondings.first
+
+    bonding.ip_addr=nil
+    nic1 = bonding.nics[0]
+    nic2 = bonding.nics[1]
+
+    expected = <<-HERE
+# THIS FILE IS GENERATED!
+bonding=#{bonding.interface_name}|mode=#{bonding.bonding_type.mode} miimon=100 downdelay=200
+ifcfg=none|#{bonding.interface_name}|BOOTPROTO=dhcp|ONBOOT=yes
+ifcfg=#{nic1.mac}|eth0|MASTER=#{bonding.interface_name}|SLAVE=yes|ONBOOT=yes
+ifcfg=#{nic2.mac}|eth1|MASTER=#{bonding.interface_name}|SLAVE=yes|ONBOOT=yes
+HERE
+
+    result = ManagedNodeConfiguration.generate(
+      @host_with_dhcp_bondings,
+      {
+        "#{nic1.mac}" => 'eth0',
+        "#{nic2.mac}" => 'eth1'
+      })
+
+    assert_equal expected, result
+  end
+
 end
-- 
1.5.5.1



From dpierce at redhat.com  Wed Oct  8 19:04:48 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Wed,  8 Oct 2008 15:04:48 -0400
Subject: [Ovirt-devel] [PATCH node] Updated the configuration processing to
	remove the need for scripts.
Message-ID: <1223492688-982-1-git-send-email-dpierce@redhat.com>


Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 scripts/ovirt-early          |   14 +++------
 scripts/ovirt-process-config |   59 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 9 deletions(-)
 create mode 100755 scripts/ovirt-process-config

diff --git a/scripts/ovirt-early b/scripts/ovirt-early
index 4723426..94f9363 100755
--- a/scripts/ovirt-early
+++ b/scripts/ovirt-early
@@ -12,6 +12,8 @@
 
 # size of the oVirt partition in megabytes
 OVIRT_SIZE=64
+BONDING_MODCONF_FILE=/etc/modprobe.d/bonding
+AUGTOOL_CONFIG=/var/tmp/augtool-config
 
 get_mac_addresses() {
     macs=$(ifconfig | awk '/HWaddr/ { print $5"="$1 }' \
@@ -42,17 +44,11 @@ configure_from_network() {
                     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"
-                        bash $cfgdb
-                        if [ -f /var/tmp/pre-config-script ]; then
-                            echo "Loading kernel modules"
-                            bash /var/tmp/pre-config-script \
-                                && echo "Kernel modules loaded" \
-                                || echo "Failed loading kernel modules"
-                        fi
+                        echo "Remote configuration bundle retrieved to $cfgdb"                          
+                        ovirt-process-config $cfgdb $BONDING_MODCONF_FILE $AUGTOOL_CONFIG
                         if [ -f /var/tmp/node-augtool ]; then
                             echo "Loading remote config"
-                            augtool < /var/tmp/node-augtool \
+                            augtool < $AUGTOOL_CONFIG \
                                 && echo "Remote config applied" \
                                 || echo "Failed applying remote config"
                         fi
diff --git a/scripts/ovirt-process-config b/scripts/ovirt-process-config
new file mode 100755
index 0000000..f294287
--- /dev/null
+++ b/scripts/ovirt-process-config
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+CONFIG=$1
+OVIRT_KERNEL_MODULE_FILE=$2
+OVIRT_CONFIG_OUTPUT_FILE=$3
+
+if [ "$3" == "" ]; then
+    echo "Usage: $(basename $0) [configfile] [output]"
+else
+    modconf=$(awk '/bonding=/ {
+            match($0, "bonding=(.*)", data)
+            split(data[1], mod, "|")
+
+            alias=mod[1]
+            options=mod[2]
+
+            printf("install %s /sbin/modprobe bonding -o %s %s\n",
+                alias, module, alias, options)
+        }' $CONFIG)
+
+    echo "$modconf" > $OVIRT_KERNEL_MODULE_FILE
+
+    # now build the list of module aliases to load and load them
+    modules=$(awk '/bonding=/ {
+            match($0, "bonding=(.*)", data)
+            split(data[1], mod, "|")
+
+            printf("%s ", mod[1])
+        }' $CONFIG)
+
+    /sbin/modprobe $modules
+
+    networking=$(awk '/ifcfg=/ {
+        match($0, "ifcfg=(.*)", data)
+        split(data[1], ifcfg, "|")
+        
+        mac = ifcfg[1]
+        iface = ifcfg[2]
+
+        printf("rm /files/etc/sysconfig/network-scripts/ifcfg-%s\n", iface)
+        printf("set /files/etc/sysconfig/network-scripts/ifcfg-%s/DEVICE %s\n", iface, iface)
+
+        for (line in ifcfg) {
+            if(line > 2) {
+                split(ifcfg[line], values, "=")
+                field = values[1]
+                value=values[2]
+
+                printf("set /files/etc/sysconfig/network-scripts/ifcfg-%s/%s %s\n", iface, field, value)
+            }
+        }
+
+
+        printf("save\n")
+
+    }' $CONFIG)
+
+    echo "$networking" > $OVIRT_CONFIG_OUTPUT_FILE
+fi
\ No newline at end of file
-- 
1.5.5.1



From dpierce at redhat.com  Wed Oct  8 19:06:26 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Wed,  8 Oct 2008 15:06:26 -0400
Subject: [Ovirt-devel] [PATCH node] Updated the configuration processing to
	remove the need for scripts.
Message-ID: <1223492786-1123-1-git-send-email-dpierce@redhat.com>


Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 scripts/ovirt-early          |   12 +++-----
 scripts/ovirt-process-config |   59 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 8 deletions(-)
 create mode 100755 scripts/ovirt-process-config

diff --git a/scripts/ovirt-early b/scripts/ovirt-early
index 4723426..e5f1e9b 100755
--- a/scripts/ovirt-early
+++ b/scripts/ovirt-early
@@ -12,6 +12,8 @@
 
 # size of the oVirt partition in megabytes
 OVIRT_SIZE=64
+BONDING_MODCONF_FILE=/etc/modprobe.d/bonding
+AUGTOOL_CONFIG=/var/tmp/augtool-config
 
 get_mac_addresses() {
     macs=$(ifconfig | awk '/HWaddr/ { print $5"="$1 }' \
@@ -43,16 +45,10 @@ configure_from_network() {
                       "http://$SRV_HOST:$SRV_PORT/ovirt/managed_node/config?host=$(hostname)&macs=$macs"
                     if [ $? -eq 0 ]; then
                         echo "Remote configuration bundle retrieved to $cfgdb"
-                        bash $cfgdb
-                        if [ -f /var/tmp/pre-config-script ]; then
-                            echo "Loading kernel modules"
-                            bash /var/tmp/pre-config-script \
-                                && echo "Kernel modules loaded" \
-                                || echo "Failed loading kernel modules"
-                        fi
+                        ovirt-process-config $cfgdb $BONDING_MODCONF_FILE $AUGTOOL_CONFIG
                         if [ -f /var/tmp/node-augtool ]; then
                             echo "Loading remote config"
-                            augtool < /var/tmp/node-augtool \
+                            augtool < $AUGTOOL_CONFIG \
                                 && echo "Remote config applied" \
                                 || echo "Failed applying remote config"
                         fi
diff --git a/scripts/ovirt-process-config b/scripts/ovirt-process-config
new file mode 100755
index 0000000..a025489
--- /dev/null
+++ b/scripts/ovirt-process-config
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+CONFIG=$1
+OVIRT_KERNEL_MODULE_FILE=$2
+OVIRT_CONFIG_OUTPUT_FILE=$3
+
+if [ "$3" == "" ]; then
+    echo "Usage: $(basename $0) [configfile] [output]"
+else
+    modconf=$(awk '/bonding=/ {
+            match($0, "bonding=(.*)", data)
+            split(data[1], mod, "|")
+
+            alias=mod[1]
+            options=mod[2]
+
+            printf("install %s /sbin/modprobe bonding -o %s %s\n",
+                alias, module, alias, options)
+        }' $CONFIG)
+
+    echo "$modconf" > $OVIRT_KERNEL_MODULE_FILE
+
+    # now build the list of module aliases to load and load them
+    modules=$(awk '/bonding=/ {
+            match($0, "bonding=(.*)", data)
+            split(data[1], mod, "|")
+
+            printf("%s ", mod[1])
+        }' $CONFIG)
+
+    /sbin/modprobe $modules
+
+    networking=$(awk '/ifcfg=/ {
+        match($0, "ifcfg=(.*)", data)
+        split(data[1], ifcfg, "|")
+
+        mac = ifcfg[1]
+        iface = ifcfg[2]
+
+        printf("rm /files/etc/sysconfig/network-scripts/ifcfg-%s\n", iface)
+        printf("set /files/etc/sysconfig/network-scripts/ifcfg-%s/DEVICE %s\n", iface, iface)
+
+        for (line in ifcfg) {
+            if(line > 2) {
+                split(ifcfg[line], values, "=")
+                field = values[1]
+                value=values[2]
+
+                printf("set /files/etc/sysconfig/network-scripts/ifcfg-%s/%s %s\n", iface, field, value)
+            }
+        }
+
+
+        printf("save\n")
+
+    }' $CONFIG)
+
+    echo "$networking" > $OVIRT_CONFIG_OUTPUT_FILE
+fi
\ No newline at end of file
-- 
1.5.5.1



From dpierce at redhat.com  Wed Oct  8 19:53:40 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Wed,  8 Oct 2008 15:53:40 -0400
Subject: [Ovirt-devel] [PATCH server] Added support for booting a VM from an
	ISO image.
Message-ID: <1223495620-4609-1-git-send-email-dpierce@redhat.com>

Also added a few helper methods to Vm to contain the knowledge
of how Cobbler integration is contained.

When a user adds an ISO image to the Cobbler server on the appliance,
they will need to do so using the full NFS path for where the virtual
image will go to mount it; i.e., hostname:/path/to/filename.iso

If the filename ends in ".iso" then the virtual machine will mount the
file as a CDROM device and boot it. Otherwise, it mounts it as a hard
disk device.

To add an image to Cobbler, do the following:

1. Download an ISO image, such as the KDE LiveImage from Fedora.
2. Copy it to the NFS directory on the server:
  cp *.iso /ovirtnfs/kde-live-cd.iso
3. Add that image to your Cobbler instance:
  cobbler image add --name=KDE-LiveCD --file=management.priv.ovirt.org:/ovirtnfs/kde-live-cd.iso
4. Create a new VM in your server.
5. Select "KDE-LiveCD" from the list of operating systems.
6. Save the VM.
7. Start the VM.

It should run the selected ISO.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 src/app/controllers/vm_controller.rb |   50 +++++++++++++---------
 src/app/models/vm.rb                 |   34 ++++++++++++++-
 src/task-omatic/task_vm.rb           |   78 ++++++++++++++++++++++++++++-----
 src/test/unit/vm_test.rb             |   56 +++++++++++++++++++++++-
 4 files changed, 181 insertions(+), 37 deletions(-)

diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb
index f5c0845..0ec2837 100644
--- a/src/app/controllers/vm_controller.rb
+++ b/src/app/controllers/vm_controller.rb
@@ -223,13 +223,18 @@ class VmController < ApplicationController
   def _setup_provisioning_options
     @provisioning_options = [[Vm::PXE_OPTION_LABEL, Vm::PXE_OPTION_VALUE],
                              [Vm::HD_OPTION_LABEL, Vm::HD_OPTION_VALUE]]
-    # FIXME add cobbler images too
+
     begin
+      @provisioning_options += Cobbler::Image.find.collect do |image|
+        [image.name + Vm::COBBLER_IMAGE_SUFFIX,
+          "#{Vm::IMAGE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{image.name}"]
+      end
+
       @provisioning_options += Cobbler::Profile.find.collect do |profile|
         [profile.name + Vm::COBBLER_PROFILE_SUFFIX,
-         Vm::COBBLER_PREFIX + Vm::PROVISIONING_DELIMITER +
-         Vm::PROFILE_PREFIX + Vm::PROVISIONING_DELIMITER + profile.name]
-      end
+          "#{Vm::PROFILE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{profile.name}"]
+
+    end
     rescue
       #if cobbler doesn't respond/is misconfigured/etc just don't add profiles
     end
@@ -239,24 +244,29 @@ class VmController < ApplicationController
   def _setup_vm_provision(params)
     # spaces are invalid in the cobbler name
     name = params[:vm][:uuid]
-    provision = params[:vm][:provisioning_and_boot_settings].gsub(
-         Vm::COBBLER_PREFIX + Vm::PROVISIONING_DELIMITER +
-         Vm::PROFILE_PREFIX + Vm::PROVISIONING_DELIMITER, "")
     mac = params[:vm][:vnic_mac_addr]
-    unless provision == Vm::PXE_OPTION_VALUE or
-           provision == Vm::HD_OPTION_VALUE
-      found = false
-      Cobbler::System.find.each{ |system|
-        if system.name == name
-          system.profile = provision
-          system.save
-          found = true
+    provision = params[:vm][:provisioning_and_boot_settings]
+    # determine what type of provisioning was selected for the VM
+    provisioning_type = :pxe_or_hd_type
+    provisioning_type = :image_type  if provision =~ /Vm::IMAGE_PREFIX at Vm::COBBLER_PREFIX/
+    provisioning_type = :system_type if provision =~ /Vm::PROFILE_PREFIX at Vm::COBBLER_PREFIX/
+
+    unless provisioning_type == :pxe_or_hd_type
+      cobbler_name = provision.gsub(/(Vm::IMAGE_PREFIX|Vm::PROFILE_PREFIX)@Vm::COBBLER_PREFIX/, '')
+
+      system = Cobbler::System.find_one(name)
+
+      unless system
+        nic = Cobbler::NetworkInterface.new({'mac_address' => mac})
+
+        case provisioning_type
+        when :image_type:
+            system = Cobbler::System.create("name" => name, "image"    => cobbler_name)
+        when :system_type:
+            system = Cobbler::System.create("name" => name, "profile" => cobbler_name)
         end
-      }
-      unless found
-        system = Cobbler::System.create("name" => name,
-                                        "profile" => provision)
-        system.interfaces=[Cobbler::NetworkInterface.new({'mac_address' => mac})]
+
+        system.interfaces = [nic]
         system.save
       end
     end
diff --git a/src/app/models/vm.rb b/src/app/models/vm.rb
index ace6fb1..e37b88e 100644
--- a/src/app/models/vm.rb
+++ b/src/app/models/vm.rb
@@ -49,7 +49,7 @@ class Vm < ActiveRecord::Base
   PROFILE_PREFIX         = "profile"
   IMAGE_PREFIX           = "image"
   COBBLER_PROFILE_SUFFIX = " (Cobbler Profile)"
-  COBBLER_IMAGE_SUFFIX   = " (Cobbler Profile)"
+  COBBLER_IMAGE_SUFFIX   = " (Cobbler Image)"
 
   PXE_OPTION_LABEL       = "PXE Boot"
   PXE_OPTION_VALUE       = "pxe"
@@ -139,7 +139,15 @@ class Vm < ActiveRecord::Base
   end
 
   def provisioning_and_boot_settings=(settings)
-    if settings==PXE_OPTION_VALUE
+    # if the settings have a prefix that matches cobber settings, then process
+    # those details
+    if settings =~ /#{COBBLER_IMAGE}\@#{COBBLER_PREFIX}/
+      self[:boot_device] = BOOT_DEV_CDROM
+      self[:provisiong] = settings
+    elsif settings =~ /#{COBBLER_PROFILE}\@#{COBBLER_PREFIX}/
+      self[:boot_device] = BOOT_DEV_NETWORK
+      self[:provisioning] = settings
+    elsif settings==PXE_OPTION_VALUE
       self[:boot_device]= BOOT_DEV_NETWORK
       self[:provisioning]= nil
     elsif settings==HD_OPTION_VALUE
@@ -242,6 +250,28 @@ class Vm < ActiveRecord::Base
     vm_resource_pool.search_users
   end
 
+  # Reports whether the VM is uses Cobbler for booting.
+  #
+  def uses_cobbler?
+    (self.provisioning != nil) && (self.provisioning.include? COBBLER_PREFIX)
+  end
+
+  # Returns the cobbler type.
+  #
+  def cobbler_type
+    if self.uses_cobbler?
+      self.provisioning[/^(.*)@/,1]
+    end
+  end
+
+  # Returns the cobbler provisioning name.
+  #
+  def cobbler_name
+    if self.uses_cobbler?
+      self.provisioning[/^.*@.*:(.*)/,1]
+    end
+  end
+
   protected
   def validate
     resources = vm_resource_pool.max_resources_for_vm(self)
diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb
index 3588224..6adda3b 100644
--- a/src/task-omatic/task_vm.rb
+++ b/src/task-omatic/task_vm.rb
@@ -65,16 +65,26 @@ def create_vm_xml(name, uuid, memAllocated, memUsed, vcpus, bootDevice,
   doc.root.elements["devices"].add_element("emulator")
   doc.root.elements["devices"].elements["emulator"].text = "/usr/bin/qemu-kvm"
 
-  devs = [ 'hda', 'hdb', 'hdc', 'hdd' ]
-  i = 0
+  devs = ['hda', 'hdb', 'hdc', 'hdd']
+  which_device = 0
   diskDevices.each do |disk|
+    is_cdrom = (disk =~ /\.iso/) ? true : false
+
     diskdev = Element.new("disk")
-    diskdev.add_attribute("type", "block")
-    diskdev.add_attribute("device", "disk")
-    diskdev.add_element("source", {"dev" => disk})
-    diskdev.add_element("target", {"dev" => devs[i]})
+    diskdev.add_attribute("type", is_cdrom ? "file" : "block")
+    diskdev.add_attribute("device", is_cdrom ? "cdrom" : "disk")
+
+    if is_cdrom
+      diskdev.add_element("readonly")
+      diskdev.add_element("source", {"file" => disk})
+      diskdev.add_element("target", {"dev" => devs[which_device], "bus" => "ide"})
+    else
+      diskdev.add_element("source", {"dev" => disk})
+      diskdev.add_element("target", {"dev" => devs[which_device]})
+    end
+
     doc.root.elements["devices"] << diskdev
-    i += 1
+    which_device += 1
   end
 
   doc.root.elements["devices"].add_element("interface", {"type" => "bridge"})
@@ -154,15 +164,12 @@ def create_vm(task)
   # create cobbler system profile
   begin
     if vm.provisioning and !vm.provisioning.empty?
-      provisioning_arr = vm.provisioning.split(Vm::PROVISIONING_DELIMITER)
-      if provisioning_arr[0]==Vm::COBBLER_PREFIX
-        if provisioning_arr[1]==Vm::PROFILE_PREFIX
+      if vm.uses_cobbler?
+        if vm.cobbler_type == Vm::PROFILE_PREFIX:
           system = Cobbler::System.new('name' => vm.uuid,
                                        'profile' => provisioning_arr[2])
           system.interfaces=[Cobbler::NetworkInterface.new({'mac_address' => vm.vnic_mac_addr})]
           system.save
-        elsif provisioning_arr[1]==Vm::IMAGE_PREFIX
-          #FIXME handle cobbler images
         end
       end
     end
@@ -231,6 +238,14 @@ def shutdown_vm(task)
   setVmShutdown(vm)
 end
 
+# Find thes storage pool with the given ip address and export path.
+#
+def find_storage_pool(ip_addr, export_path)
+  StoragePool.find(:first,
+    :conditions =>
+      ['ip_addr = ? and export_path = ?',ip_addr, export_path])
+end
+
 def start_vm(task)
   puts "start_vm"
 
@@ -266,6 +281,45 @@ def start_vm(task)
     # hosts to see if there is a host that will fit these constraints
     host = findHostSLA(vm)
 
+    # if we're booting from a CDROM the VM is an image,
+    # then we need to add the NFS mount as a storage volume for this
+    # boot
+    #
+    if (vm.boot_device == Vm::BOOT_DEV_CDROM) && vm.uses_cobbler? && (vm.cobbler_type == Vm::IMAGE_PREFIX)
+      details = Cobbler::Image.find_one(vm.cobbler_name)
+      raise Exception.new("Image #{vm.cobbler_name} not found in Cobbler server") unless details
+
+      ignored, ip_addr, export_path, filename =
+        details.file.split(/(.*):(.*)\/(.*)/)
+
+      found = false
+
+      vm.storage_volumes.each do |volume|
+        if volume.filename == filename
+          if (volume.storage_pool.ip_addr == ip_addr) &&
+          (volume.storage_pool.export_path == export_path)
+            found = true
+          end
+        end
+      end
+
+      unless found
+        # Create a new transient NFS storage volume
+        # This volume is *not* persisted.
+        image_volume = StorageVolume.factory("NFS",
+          :filename => filename
+        )
+
+        image_volume.storage_pool
+        image_pool = find_storage_pool(ip_addr, export_path)
+        if image_pool
+          image_pool.storage_volumes << image_volume
+          image_pool.save!
+        end
+        vm.storage_volumes << image_volume
+      end
+    end
+
     conn = Libvirt::open("qemu+tcp://" + host.hostname + "/system")
 
     storagedevs = connect_storage_pools(conn, vm)
diff --git a/src/test/unit/vm_test.rb b/src/test/unit/vm_test.rb
index 4a5e353..22164e8 100644
--- a/src/test/unit/vm_test.rb
+++ b/src/test/unit/vm_test.rb
@@ -22,8 +22,58 @@ require File.dirname(__FILE__) + '/../test_helper'
 class VmTest < Test::Unit::TestCase
   fixtures :vms
 
-  # Replace this with your real tests.
-  def test_truth
-    assert true
+  def setup
+    @vm_name = "Test"
+    @no_cobbler_provisioning = "#{@vm_name}"
+    @cobbler_image_provisioning =
+      "#{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}"
+  end
+
+  # Ensures that, if the VM does not contain the Cobbler prefix, that it
+  # does not claim to be a Cobbler VM.
+  #
+  def test_uses_cobbler_without_cobbler_prefix
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings=@no_cobbler_provisioning
+
+    flunk "VM is not a Cobbler provisioned one." if vm.uses_cobbler?
+    assert_equal @vm_name, vm.provisioning, "Wrong name reported."
+  end
+
+  # Ensures that the VM reports that it uses Cobbler if the provisioning
+  # is for a Cobbler profile.
+  #
+  def test_uses_cobbler_with_cobbler_profile
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings = @cobbler_profile_provisioning
+
+    flunk "VM did not report that it's Cobbler provisioned." unless vm.uses_cobbler?
+    assert_equal Vm::PROFILE_PREFIX,
+      vm.cobbler_type,
+      "Wrong cobbler type reported."
+    assert_equal @vm_name,
+      vm.cobbler_name,
+      "Wrong name reported."
+  end
+
+  # Ensures that the VM reports that it uses Cobbler if the provisioning
+  # is for a Cobbler image.
+  #
+  def test_uses_cobbler_with_cobbler_image
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings = @cobbler_image_provisioning
+
+    flunk "VM did not report that it's Cobbler provisioned." unless vm.uses_cobbler?
+    assert_equal Vm::IMAGE_PREFIX,
+      vm.cobbler_type,
+      "Wrong cobbler type reported."
+    assert_equal @vm_name,
+      vm.cobbler_name,
+      "Wrong name reported."
   end
 end
-- 
1.5.5.1



From berrange at redhat.com  Wed Oct  8 19:58:14 2008
From: berrange at redhat.com (Daniel P. Berrange)
Date: Wed, 8 Oct 2008 20:58:14 +0100
Subject: [Ovirt-devel] [PATCH node] Updated the configuration processing
	to remove the need for scripts.
In-Reply-To: <1223492786-1123-1-git-send-email-dpierce@redhat.com>
References: <1223492786-1123-1-git-send-email-dpierce@redhat.com>
Message-ID: <20081008195814.GH19052@redhat.com>

On Wed, Oct 08, 2008 at 03:06:26PM -0400, Darryl L. Pierce wrote:
> +BONDING_MODCONF_FILE=/etc/modprobe.d/bonding
> +AUGTOOL_CONFIG=/var/tmp/augtool-config

> +                        ovirt-process-config $cfgdb $BONDING_MODCONF_FILE $AUGTOOL_CONFIG


> diff --git a/scripts/ovirt-process-config b/scripts/ovirt-process-config
> new file mode 100755
> index 0000000..a025489
> --- /dev/null
> +++ b/scripts/ovirt-process-config
> @@ -0,0 +1,59 @@
> +#!/bin/bash
> +
> +CONFIG=$1
> +OVIRT_KERNEL_MODULE_FILE=$2
> +OVIRT_CONFIG_OUTPUT_FILE=$3
> +
> +if [ "$3" == "" ]; then
> +    echo "Usage: $(basename $0) [configfile] [output]"
> +else
> +    modconf=$(awk '/bonding=/ {
> +            match($0, "bonding=(.*)", data)
> +            split(data[1], mod, "|")
> +
> +            alias=mod[1]
> +            options=mod[2]
> +
> +            printf("install %s /sbin/modprobe bonding -o %s %s\n",
> +                alias, module, alias, options)
> +        }' $CONFIG)
> +
> +    echo "$modconf" > $OVIRT_KERNEL_MODULE_FILE
> +
> +    # now build the list of module aliases to load and load them
> +    modules=$(awk '/bonding=/ {
> +            match($0, "bonding=(.*)", data)
> +            split(data[1], mod, "|")
> +
> +            printf("%s ", mod[1])
> +        }' $CONFIG)
> +
> +    /sbin/modprobe $modules

This is all rather the wrong way to go about setting up bonding, 
reinventing stuff that's basically done automatically if you
configure things correctly. For module configuration the only
thing that should be neccessary is to add

  alias bond0 bonding

To '/etc/modprobe.conf' to define a network device bond0. Repeat
for bond1, bond2, etc as you need.

This causes the neccessary module to be loaded. Everything else
should then be done in the ifcfg-XXX scripts.

> +
> +    networking=$(awk '/ifcfg=/ {
> +        match($0, "ifcfg=(.*)", data)
> +        split(data[1], ifcfg, "|")
> +
> +        mac = ifcfg[1]
> +        iface = ifcfg[2]
> +
> +        printf("rm /files/etc/sysconfig/network-scripts/ifcfg-%s\n", iface)
> +        printf("set /files/etc/sysconfig/network-scripts/ifcfg-%s/DEVICE %s\n", iface, iface)
> +
> +        for (line in ifcfg) {
> +            if(line > 2) {
> +                split(ifcfg[line], values, "=")
> +                field = values[1]
> +                value=values[2]
> +
> +                printf("set /files/etc/sysconfig/network-scripts/ifcfg-%s/%s %s\n", iface, field, value)
> +            }
> +        }
> +
> +
> +        printf("save\n")
> +
> +    }' $CONFIG)

The bond device config itself:

 # cat ifcfg-bond0 
 DEVICE=bond0
 BOOTPROTO=dhcp
 BONDING_OPTS="mode=3"
 IPV6INIT=yes
 IPV6_AUTOCONF=yes
 ONBOOT=yes

Note the bonding options are set here, and not in the modprobe.conf
file because we want the ability to set them per bond device.

And the bond members

 # cat ifcfg-eth0 
 DEVICE=eth0
 HWADDR=00:16:3E:09:F2:EB
 ONBOOT=yes
 MASTER=bond0
 SLAVE=yes

 # cat ifcfg-eth1
 DEVICE=eth1
 HWADDR=00:16:3E:09:F2:3B
 ONBOOT=yes
 MASTER=bond0
 SLAVE=yes

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 Oct  8 20:05:27 2008
From: berrange at redhat.com (Daniel P. Berrange)
Date: Wed, 8 Oct 2008 21:05:27 +0100
Subject: [Ovirt-devel] [PATCH server] Replaced the config scripts with
	configuration encoding.
In-Reply-To: <1223314773-18127-1-git-send-email-dpierce@redhat.com>
References: <1223314773-18127-1-git-send-email-dpierce@redhat.com>
Message-ID: <20081008200527.GI19052@redhat.com>

On Mon, Oct 06, 2008 at 01:39:33PM -0400, Darryl L. Pierce wrote:
> *** NOTE ***
> This patch is a request for comments. I'm looking for some feedback on the encoding
> strategy I'm using below. The goal is to get away from using embedded scripts and to
> instead just describe the desired state to the node.
> *** NOTE ***

> +# +ManagedNodeConfiguration+ generates a configuration file for an oVirt node
> +# based on information about the hardware submitted by the node and the 
> +# configuration details held in the database.
> +# 
> +# The configuration is returned as a series of encoded lines.
> +# 
> +# For a kernel module, the formation of the line is as follows:
> +# 
> +# kmod=[module name]|[module alias]|[module options]
> +# 
> +# An example would be for loading the +bonding+ kernel module to setup a bonded
> +# interface for load balancing. In this example, the bonded interface would be
> +# named +failover0+ on the node:
> +# 
> +# kmod=bonding|failover0|mode=2 miimon=100 downdelay=200

There shouldn't be any need for configuration keyed off the module.
As per the other mail i send, the only thing in modprobe.conf should
be an 'alias bond0 bonding'. Everything else is NIC device config.

> +# For a network interface (including a bonded interface) an example would be:
> +# 
> +# ifcfg=00:11:22:33:44|eth0|BOOTPROTO=dhcp|bridge=ovirtbr0|ONBOOT=yes
> +# 
> +# In this line, the network interface +eth0+ has a hardware MAC address of 
> +# +00:11:22:33:44+. It will use DHCP for retrieving it's IP address details, 
> +# and will use the +ovirtbr0+ interface as a bridge.



> +kmod=bonding|#{bonding.interface_name}|mode=#{bonding.bonding_type.mode} miimon=100 downdelay=200
> +ifcfg=none|#{bonding.interface_name}|BOOTPROTO=static|IPADDR=#{bonding.ip_addr}|NETMASK=#{bonding.netmask}|BROADCAST=#{bonding.broadcast}|ONBOOT=yes
> +ifcfg=#{nic1.mac}|eth0|MASTER=#{bonding.interface_name}|SLAVE=yes|ONBOOT=yes
> +ifcfg=#{nic2.mac}|eth1|MASTER=#{bonding.interface_name}|SLAVE=yes|ONBOOT=yes

So, in this exampe, move those kmod= bonding options into the ifcfg= line
that follows.

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 dpierce at redhat.com  Wed Oct  8 20:05:39 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Wed, 08 Oct 2008 16:05:39 -0400
Subject: [Ovirt-devel] [PATCH node] Updated the configuration processing
	to remove the need for scripts.
In-Reply-To: <20081008195814.GH19052@redhat.com>
References: <1223492786-1123-1-git-send-email-dpierce@redhat.com>
	<20081008195814.GH19052@redhat.com>
Message-ID: <48ED1293.6040707@redhat.com>

Daniel P. Berrange wrote:
>> +    # now build the list of module aliases to load and load them
>> +    modules=$(awk '/bonding=/ {
>> +            match($0, "bonding=(.*)", data)
>> +            split(data[1], mod, "|")
>> +
>> +            printf("%s ", mod[1])
>> +        }' $CONFIG)
>> +
>> +    /sbin/modprobe $modules
> 
> This is all rather the wrong way to go about setting up bonding, 
> reinventing stuff that's basically done automatically if you
> configure things correctly. For module configuration the only
> thing that should be neccessary is to add
> 
>   alias bond0 bonding
> 
> To '/etc/modprobe.conf' to define a network device bond0. Repeat
> for bond1, bond2, etc as you need.
>
> This causes the neccessary module to be loaded. Everything else
> should then be done in the ifcfg-XXX scripts.



In working on this, doing the above failed every time. The error is:

FATAL: Error inserting bonding
(/lib/modules/2.6.26.5-45.fc9.i686/kernel/drivers/net/bonding/bonding.ko):
Unknown symbol in module, or unknown parameter (see dmesg)

The error from dmesg is:

bonding: Unknown parameter `bond1'

I'm trying to find the URL for it, but the only solution that's worked
is the one in the submitted patch.

-- 
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081008/be8dc8bd/attachment.vcf>

From berrange at redhat.com  Wed Oct  8 20:13:03 2008
From: berrange at redhat.com (Daniel P. Berrange)
Date: Wed, 8 Oct 2008 21:13:03 +0100
Subject: [Ovirt-devel] [PATCH node] Updated the configuration processing
	to remove the need for scripts.
In-Reply-To: <48ED1293.6040707@redhat.com>
References: <1223492786-1123-1-git-send-email-dpierce@redhat.com>
	<20081008195814.GH19052@redhat.com> <48ED1293.6040707@redhat.com>
Message-ID: <20081008201303.GJ19052@redhat.com>

On Wed, Oct 08, 2008 at 04:05:39PM -0400, Darryl Pierce wrote:
> Daniel P. Berrange wrote:
> >> +    # now build the list of module aliases to load and load them
> >> +    modules=$(awk '/bonding=/ {
> >> +            match($0, "bonding=(.*)", data)
> >> +            split(data[1], mod, "|")
> >> +
> >> +            printf("%s ", mod[1])
> >> +        }' $CONFIG)
> >> +
> >> +    /sbin/modprobe $modules
> > 
> > This is all rather the wrong way to go about setting up bonding, 
> > reinventing stuff that's basically done automatically if you
> > configure things correctly. For module configuration the only
> > thing that should be neccessary is to add
> > 
> >   alias bond0 bonding
> > 
> > To '/etc/modprobe.conf' to define a network device bond0. Repeat
> > for bond1, bond2, etc as you need.
> >
> > This causes the neccessary module to be loaded. Everything else
> > should then be done in the ifcfg-XXX scripts.
> 
> 
> 
> In working on this, doing the above failed every time. The error is:
> 
> FATAL: Error inserting bonding
> (/lib/modules/2.6.26.5-45.fc9.i686/kernel/drivers/net/bonding/bonding.ko):
> Unknown symbol in module, or unknown parameter (see dmesg)

What is giving you that error message ? 

It 'just works' when I try it.

  # echo "alias bond2 bonding" >> /etc/modprobe.conf
  # depmod -a
  # cat > ifcfg-bond2
  DEVICE=bond2
  IPADDR=192.168.122.78
  BOOTPROTO=static
  NETMASK=255.255.255.0
  GATEWAY=192.168.122.1
  ONBOOT=yes
  # ifup bond2
  arping: recvfrom: Network is down
  # ifconfig bond2
  bond2     Link encap:Ethernet  HWaddr 00:00:00:00:00:00  
            inet addr:192.168.122.78  Bcast:192.168.122.255  Mask:255.255.255.0
            UP BROADCAST MASTER MULTICAST  MTU:1500  Metric:1
            RX packets:0 errors:0 dropped:0 overruns:0 frame:0
            TX packets:0 errors:0 dropped:0 overruns:0 carrier:0
            collisions:0 txqueuelen:0 
            RX bytes:0 (0.0 b)  TX bytes:0 (0.0 b)


NB, you don't need to insmod the bonding module multiple times - we're
just defining aliases for it - its only ever loaded one time

  # lsmod  | grep bond
  bonding                81197  0 


The network init scripts look in modprobe.conf for any lines defining
an alias to bonding module, load it if not already loaded, and then
use /sys/class/net/bonding_masters to add the actual devices. See
the network-functions  script and the install_bonding_driver() function

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 dpierce at redhat.com  Wed Oct  8 20:24:17 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Wed, 08 Oct 2008 16:24:17 -0400
Subject: [Ovirt-devel] [PATCH node] Updated the configuration processing
	to remove the need for scripts.
In-Reply-To: <20081008201303.GJ19052@redhat.com>
References: <1223492786-1123-1-git-send-email-dpierce@redhat.com>
	<20081008195814.GH19052@redhat.com> <48ED1293.6040707@redhat.com>
	<20081008201303.GJ19052@redhat.com>
Message-ID: <48ED16F1.4080103@redhat.com>

Daniel P. Berrange wrote:
>> In working on this, doing the above failed every time. The error is:
>>
>> FATAL: Error inserting bonding
>> (/lib/modules/2.6.26.5-45.fc9.i686/kernel/drivers/net/bonding/bonding.ko):
>> Unknown symbol in module, or unknown parameter (see dmesg)
> 
> What is giving you that error message ? 

For me, it was:

# echo "alias bonding0 bonding" > /etc/ovirt
# modprobe bonding0

Doing it your way worked correctly. So I'm going back and fixing my
patch to do this instead.

-- 
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081008/9d5cf820/attachment.vcf>

From jguiditt at redhat.com  Wed Oct  8 20:29:51 2008
From: jguiditt at redhat.com (Jason Guiditta)
Date: Wed, 08 Oct 2008 16:29:51 -0400
Subject: [Ovirt-devel] [PATCH] integrate 'using ovirt' doc into a wui
	help section
In-Reply-To: <1222884890-12367-3-git-send-email-mmorsi@redhat.com>
References: <1222884890-12367-1-git-send-email-mmorsi@redhat.com>
	<1222884890-12367-2-git-send-email-mmorsi@redhat.com>
	<1222884890-12367-3-git-send-email-mmorsi@redhat.com>
Message-ID: <1223497791.421.29.camel@localhost.localdomain>

NACK, this does not work for me as is, changes suggested inline

On Wed, 2008-10-01 at 14:14 -0400, Mohammed Morsi wrote:
> this will work as is, but until help_sections table is populated
> all pages will link to main document body (and not particular
> sections)
> ---
>  src/app/controllers/application.rb           |    7 ++++++-
>  src/app/controllers/pool_controller.rb       |    2 +-
>  src/app/models/help_section.rb               |    2 ++
>  src/app/views/layouts/_header_redux.rhtml    |    1 -
>  src/app/views/layouts/help-and-content.rhtml |    4 ++++
>  src/app/views/layouts/redux.rhtml            |    4 ++++
>  src/app/views/layouts/tabs-and-content.rhtml |    6 +++++-
>  src/db/migrate/023_create_help_sections.rb   |   13 +++++++++++++
>  src/public/stylesheets/layout.css            |    8 +++++++-
>  src/test/fixtures/help_sections.yml          |    7 +++++++
>  src/test/unit/help_section_test.rb           |    8 ++++++++
>  11 files changed, 57 insertions(+), 5 deletions(-)
>  create mode 100644 src/app/models/help_section.rb
>  create mode 100644 src/app/views/layouts/help-and-content.rhtml
>  create mode 100644 src/db/migrate/023_create_help_sections.rb
>  create mode 100644 src/test/fixtures/help_sections.yml
>  create mode 100644 src/test/unit/help_section_test.rb
> 
> diff --git a/src/app/controllers/application.rb b/src/app/controllers/application.rb
> index 6dcf6f8..0d5521a 100644
> --- a/src/app/controllers/application.rb
> +++ b/src/app/controllers/application.rb
> @@ -31,7 +31,7 @@ class ApplicationController < ActionController::Base
>    before_filter :pre_edit, :only => [:edit, :update, :destroy]
>    before_filter :pre_show, :only => [:show]
>    before_filter :authorize_admin, :only => [:new, :create, :edit, :update, :destroy]
> -  before_filter :is_logged_in
> +  before_filter :is_logged_in, :get_help_section
>  
>    def is_logged_in
>      redirect_to(:controller => "login", :action => "login") unless get_login_user
> @@ -40,6 +40,11 @@ class ApplicationController < ActionController::Base
>    def get_login_user
>      (ENV["RAILS_ENV"] == "production") ? session[:user] : "ovirtadmin"
>    end
> +
> +  def get_help_section
> +      help = HelpSection.find(:first, :conditions => [ "controller = ? AND action = ?", controller_name, action_name ])
> +      @help_section = help ? help.section : ""
> +  end
This seems to generate the correct information.  I tested as you
suggested with:
insert into help_sections (controller, action, section) values
('hardware', 'show',
'Working-with-hardware-pools.html#Viewing-hardware-resources');

and

insert into help_sections (controller, action, section) values
('hardware', 'show_storage', 'Managing-Storage-Servers.html');

for anyone else who wants to try it.  Clearly we will need something set
up to populate this, but I understand that is outside the scope of this
(and related) patch.

>    
>    def set_perms(hwpool)
>      @user = get_login_user
> diff --git a/src/app/controllers/pool_controller.rb b/src/app/controllers/pool_controller.rb
> index 02ef290..1a574b1 100644
> --- a/src/app/controllers/pool_controller.rb
> +++ b/src/app/controllers/pool_controller.rb
> @@ -35,7 +35,7 @@ class PoolController < ApplicationController
>      respond_to do |format|
>        format.html {
>          render :layout => 'tabs-and-content' if params[:ajax]
> -        render :layout => false if params[:nolayout]
> +        render :layout => 'help-and-content' if params[:nolayout]
>        }
>        format.xml {
>          render :xml => @pool.to_xml(XML_OPTS)
> diff --git a/src/app/models/help_section.rb b/src/app/models/help_section.rb
> new file mode 100644
> index 0000000..a891383
> --- /dev/null
> +++ b/src/app/models/help_section.rb
> @@ -0,0 +1,2 @@
> +class HelpSection < ActiveRecord::Base
> +end
> diff --git a/src/app/views/layouts/_header_redux.rhtml b/src/app/views/layouts/_header_redux.rhtml
> index 18014ab..a12d567 100644
> --- a/src/app/views/layouts/_header_redux.rhtml
> +++ b/src/app/views/layouts/_header_redux.rhtml
> @@ -6,7 +6,6 @@
>      <input id="textfield_effect" name="terms" value="Search" onkeypress="" onfocus="if( this.value == this.defaultValue ) this.value='';" type="text">
>      <input id="searchbox-button" src="<%= image_path "icon_search.png"%>" title="Search" type="image">&nbsp;&nbsp;|
>    </form>
> -  <a id="help-link" href="#" ><%= image_tag "icon_help.png" %></a> <!-- FIXME wire link correctly -->
>  </div>
>  
>  <div class="header_titlebar">Resource Pools</div>
> diff --git a/src/app/views/layouts/help-and-content.rhtml b/src/app/views/layouts/help-and-content.rhtml
> new file mode 100644
> index 0000000..67989b7
> --- /dev/null
> +++ b/src/app/views/layouts/help-and-content.rhtml
> @@ -0,0 +1,4 @@
> +<div id="help-div">
> + <a id="help-link" href="help/<%= @help_section %>" ><%= image_tag "icon_help.png" %></a>
> +</div>
> +<%= yield %>
This link did not work for me on my appliance, went to 192.../help
instead of ovirt/help, suggest replacing with:
<%= link_to image_tag("icon_help.png"),
                          {:controller => 'help', :action =>
@help_section},
                          :id=>"help-link" %>
which does work for me.  Same goes for other instances of this link (so
3 spots).  Also, shouldn't this be a popup (whether facebox or standard)
since you don't get brought back where you were when hitting the back
button?
> diff --git a/src/app/views/layouts/redux.rhtml b/src/app/views/layouts/redux.rhtml
> index 01540d4..f6b4657 100644
> --- a/src/app/views/layouts/redux.rhtml
> +++ b/src/app/views/layouts/redux.rhtml
> @@ -109,11 +109,15 @@
>     </div>
>  
>     <div id="tabs-and-content-container">
> +
>       <div id="navigation-tabs" style="position:absolute; top:40px; left:250px;">
>         <%= render :partial => '/layouts/navigation_tabs' %>
>       </div> 
>       <div id="main">
>          <div id="content_area">
> +          <div id="help-div">
> +            <a id="help-link" href="help/<%= @help_section %>" ><%= image_tag "icon_help.png" %></a>
> +          </div>
>            <%= yield  %> <%# the rest of the center and right hand side %>
>          </div>
>       </div>
> diff --git a/src/app/views/layouts/tabs-and-content.rhtml b/src/app/views/layouts/tabs-and-content.rhtml
> index 8aa4183..e55b5ea 100644
> --- a/src/app/views/layouts/tabs-and-content.rhtml
> +++ b/src/app/views/layouts/tabs-and-content.rhtml
> @@ -1,3 +1,4 @@
> +
>  <div id="side-toolbar" class="header_menu_wrapper">
>    <%= render :partial => '/layouts/side_toolbar' %>
>  </div>
> @@ -6,5 +7,8 @@
>  </div> 
>  <div id="main">
>    <div id="content_area">
> +   <div id="help-div">
> +     <a id="help-link" href="help/<%= @help_section %>" ><%= image_tag "icon_help.png" %></a>
> +   </div>
>    </div>
> -</div>
> \ No newline at end of file
> +</div>
> diff --git a/src/db/migrate/023_create_help_sections.rb b/src/db/migrate/023_create_help_sections.rb
> new file mode 100644
> index 0000000..963e8bd
> --- /dev/null
> +++ b/src/db/migrate/023_create_help_sections.rb
> @@ -0,0 +1,13 @@
> +class CreateHelpSections < ActiveRecord::Migration
> +  def self.up
> +    create_table :help_sections do |t|
> +      t.string :controller, :null => false, :limit => 25
> +      t.string :action, :null => false, :limit => 25
> +      t.string :section, :null => false, :limit => 100
> +    end
> +  end
> +
> +  def self.down
> +    drop_table :help_sections
> +  end
> +end
> diff --git a/src/public/stylesheets/layout.css b/src/public/stylesheets/layout.css
> index 9471cdc..013c959 100644
> --- a/src/public/stylesheets/layout.css
> +++ b/src/public/stylesheets/layout.css
> @@ -128,7 +128,7 @@ a { color:#000000; text-decoration: none;}
>  /*  ----- Right side of Header --------  */
>  
>  .header_info {
> -  padding: 10px 20px 0px 10px;
> +  padding: 10px 30px 0px 10px;
>    margin: 0;
>    float: right;
>    text-align: right;
> @@ -140,6 +140,12 @@ a { color:#000000; text-decoration: none;}
>  .header_info a:visited { color: #B5B5B5; text-decoration: none; }
>  .header_info a:hover   { color: #FFFFFF; text-decoration: none; }
>  
> +#help-div {
> +  position: fixed;
> +  top: 10px;
> +  right: -1px;
> +}
> +
>  #textfield_effect {
>      border-width: 1px;
>      border-style: solid;
> diff --git a/src/test/fixtures/help_sections.yml b/src/test/fixtures/help_sections.yml
> new file mode 100644
> index 0000000..5bf0293
> --- /dev/null
> +++ b/src/test/fixtures/help_sections.yml
> @@ -0,0 +1,7 @@
> +# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
> +
> +# one:
> +#   column: value
> +#
> +# two:
> +#   column: value
> diff --git a/src/test/unit/help_section_test.rb b/src/test/unit/help_section_test.rb
> new file mode 100644
> index 0000000..a0e6a08
> --- /dev/null
> +++ b/src/test/unit/help_section_test.rb
> @@ -0,0 +1,8 @@
> +require 'test_helper'
> +
> +class HelpSectionTest < ActiveSupport::TestCase
> +  # Replace this with your real tests.
> +  def test_truth
> +    assert true
> +  end
> +end



From jguiditt at redhat.com  Wed Oct  8 20:33:05 2008
From: jguiditt at redhat.com (Jason Guiditta)
Date: Wed, 08 Oct 2008 16:33:05 -0400
Subject: [Ovirt-devel] [PATCH] integrate docs into appliance / server
In-Reply-To: <1222884890-12367-2-git-send-email-mmorsi@redhat.com>
References: <1222884890-12367-1-git-send-email-mmorsi@redhat.com>
	<1222884890-12367-2-git-send-email-mmorsi@redhat.com>
Message-ID: <1223497985.421.32.camel@localhost.localdomain>

On Wed, 2008-10-01 at 14:14 -0400, Mohammed Morsi wrote:
> ---
>  appliances/ovirt/ovirt.pp.in |    4 ++++
>  ovirt-recipe.spec.in         |    1 +
>  2 files changed, 5 insertions(+), 0 deletions(-)
> 
> diff --git a/appliances/ovirt/ovirt.pp.in b/appliances/ovirt/ovirt.pp.in
> index 1ee8b48..e24c046 100644
> --- a/appliances/ovirt/ovirt.pp.in
> +++ b/appliances/ovirt/ovirt.pp.in
> @@ -168,6 +168,10 @@ single_exec {"ovirt_installation":
>      require => [Service["postgresql"],Single_exec["ovirt_appliance_installation"]]
>  }
>  
> +single_exec {"ovirt_docs_accesible_from_server":
> +    command => "/bin/ln -s /usr/share/doc/ovirt-docs-${appliance_version}/Using_oVirt/ /usr/share/ovirt-server/public/help"
> +}
> +
>  #
>  # Cobbler Configuration
>  #
> diff --git a/ovirt-recipe.spec.in b/ovirt-recipe.spec.in
> index 7013b3b..cb134c4 100644
> --- a/ovirt-recipe.spec.in
> +++ b/ovirt-recipe.spec.in
> @@ -29,6 +29,7 @@ Requires: iscsi-initiator-utils
>  Requires: ovirt-server
>  Requires: ovirt-node-image-pxe
>  Requires: ovirt-release
> +Requires: ovirt-docs
>  Requires: rhpl
>  Requires: cobbler
>  Requires: rubygem-cobbler

Pending the changes in the related patch, ACK, this seems to set up the
symlink fine.

-j



From jim at meyering.net  Wed Oct  8 20:42:26 2008
From: jim at meyering.net (Jim Meyering)
Date: Wed, 08 Oct 2008 22:42:26 +0200
Subject: [Ovirt-devel] [PATCH node] Updated the configuration processing
	to remove the need for scripts.
In-Reply-To: <1223492786-1123-1-git-send-email-dpierce@redhat.com> (Darryl
	L. Pierce's message of "Wed, 8 Oct 2008 15:06:26 -0400")
References: <1223492786-1123-1-git-send-email-dpierce@redhat.com>
Message-ID: <8763o24y4t.fsf@rho.meyering.net>

"Darryl L. Pierce" <dpierce at redhat.com> wrote:
> Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
> ---
>  scripts/ovirt-early          |   12 +++-----
>  scripts/ovirt-process-config |   59 ++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 63 insertions(+), 8 deletions(-)
>  create mode 100755 scripts/ovirt-process-config
>
> diff --git a/scripts/ovirt-early b/scripts/ovirt-early
> index 4723426..e5f1e9b 100755
> --- a/scripts/ovirt-early
> +++ b/scripts/ovirt-early
> @@ -12,6 +12,8 @@
>
>  # size of the oVirt partition in megabytes
>  OVIRT_SIZE=64
> +BONDING_MODCONF_FILE=/etc/modprobe.d/bonding
> +AUGTOOL_CONFIG=/var/tmp/augtool-config
>
>  get_mac_addresses() {
>      macs=$(ifconfig | awk '/HWaddr/ { print $5"="$1 }' \
> @@ -43,16 +45,10 @@ configure_from_network() {
>                        "http://$SRV_HOST:$SRV_PORT/ovirt/managed_node/config?host=$(hostname)&macs=$macs"
>                      if [ $? -eq 0 ]; then
>                          echo "Remote configuration bundle retrieved to $cfgdb"
> -                        bash $cfgdb
> -                        if [ -f /var/tmp/pre-config-script ]; then
> -                            echo "Loading kernel modules"
> -                            bash /var/tmp/pre-config-script \
> -                                && echo "Kernel modules loaded" \
> -                                || echo "Failed loading kernel modules"
> -                        fi
> +                        ovirt-process-config $cfgdb $BONDING_MODCONF_FILE $AUGTOOL_CONFIG
>                          if [ -f /var/tmp/node-augtool ]; then
>                              echo "Loading remote config"
> -                            augtool < /var/tmp/node-augtool \
> +                            augtool < $AUGTOOL_CONFIG \
>                                  && echo "Remote config applied" \
>                                  || echo "Failed applying remote config"
>                          fi
> diff --git a/scripts/ovirt-process-config b/scripts/ovirt-process-config
> new file mode 100755
> index 0000000..a025489
> --- /dev/null
> +++ b/scripts/ovirt-process-config
> @@ -0,0 +1,59 @@
> +#!/bin/bash
> +
> +CONFIG=$1
> +OVIRT_KERNEL_MODULE_FILE=$2
> +OVIRT_CONFIG_OUTPUT_FILE=$3
> +
> +if [ "$3" == "" ]; then

How about this instead?
(first lines are almost straight out of create-ovirt-appliance,
but for the 3rd, you'd have to add a tiny bit of code to handle -h)

ME=$(basename "$0")
warn() { printf "$ME: $@\n" >&2; }
try_h() { printf "Try \`$ME -h' for more information.\n" >&2; }

case $# in
  0|1|2) warn "too few arguments"; try_help;;
  3) ;;
  *) warn "too man arguments"; try_help;;
esac

With the above doing an exit upon failure, you can un-indent
everything below.

> +    echo "Usage: $(basename $0) [configfile] [output]"

> +else
> +    modconf=$(awk '/bonding=/ {
> +            match($0, "bonding=(.*)", data)
> +            split(data[1], mod, "|")
> +
> +            alias=mod[1]
> +            options=mod[2]
> +
> +            printf("install %s /sbin/modprobe bonding -o %s %s\n",
> +                alias, module, alias, options)

We need to do some sanitization (perl calls this untainting) here.
I.e., we want to reject malicious parameters like "; rm -rf /" or
"& start-stealthy-daemon...".

So, match alias, module, and options for bogus shell meta-characters,
or probably-better, accept only a limited alphabet, maybe just
search for anything matching this /[^[:alnum:]=_ at -]/

> +        }' $CONFIG)

You'll want to diagnose bogosity from within the awk script
and exit nonzero to tell the shell to fail:

           ...
           }' $CONFIG) || exit 1;

> +    echo "$modconf" > $OVIRT_KERNEL_MODULE_FILE
> +
> +    # now build the list of module aliases to load and load them
> +    modules=$(awk '/bonding=/ {
> +            match($0, "bonding=(.*)", data)
> +            split(data[1], mod, "|")
> +
> +            printf("%s ", mod[1])
> +        }' $CONFIG)
> +
> +    /sbin/modprobe $modules

Have you tested this with two or more modules?
Not sure, but you *might* have to do this:

    eval /sbin/modprobe "$modules"

> +    networking=$(awk '/ifcfg=/ {
> +        match($0, "ifcfg=(.*)", data)
> +        split(data[1], ifcfg, "|")
> +
> +        mac = ifcfg[1]
> +        iface = ifcfg[2]
> +
> +        printf("rm /files/etc/sysconfig/network-scripts/ifcfg-%s\n", iface)
> +        printf("set /files/etc/sysconfig/network-scripts/ifcfg-%s/DEVICE %s\n", iface, iface)

If you factor out this long path prefix, the lines will fit in <80, too.

> +
> +        for (line in ifcfg) {
> +            if(line > 2) {
> +                split(ifcfg[line], values, "=")
> +                field = values[1]
> +                value=values[2]
> +
> +                printf("set /files/etc/sysconfig/network-scripts/ifcfg-%s/%s %s\n", iface, field, value)
> +            }
> +        }
> +
> +
> +        printf("save\n")
> +
> +    }' $CONFIG)
> +
> +    echo "$networking" > $OVIRT_CONFIG_OUTPUT_FILE
> +fi
> \ No newline at end of file

Please add one. ^^



From mmorsi at redhat.com  Wed Oct  8 21:15:16 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Wed,  8 Oct 2008 17:15:16 -0400
Subject: [Ovirt-devel] [PATCH server] integrate 'using ovirt' doc into a wui
	help section
Message-ID: <1223500516-28560-1-git-send-email-mmorsi@redhat.com>

this will work as is, but until help_sections table is populated
all pages will link to main document body (and not particular
sections)
---
 src/app/controllers/application.rb           |    7 ++++++-
 src/app/controllers/pool_controller.rb       |    2 +-
 src/app/models/help_section.rb               |    2 ++
 src/app/views/layouts/_header_redux.rhtml    |    1 -
 src/app/views/layouts/help-and-content.rhtml |    6 ++++++
 src/app/views/layouts/redux.rhtml            |    6 ++++++
 src/app/views/layouts/tabs-and-content.rhtml |    8 +++++++-
 src/db/migrate/023_create_help_sections.rb   |   13 +++++++++++++
 src/public/stylesheets/layout.css            |    8 +++++++-
 src/test/fixtures/help_sections.yml          |    7 +++++++
 src/test/unit/help_section_test.rb           |    8 ++++++++
 11 files changed, 63 insertions(+), 5 deletions(-)
 create mode 100644 src/app/models/help_section.rb
 create mode 100644 src/app/views/layouts/help-and-content.rhtml
 create mode 100644 src/db/migrate/023_create_help_sections.rb
 create mode 100644 src/test/fixtures/help_sections.yml
 create mode 100644 src/test/unit/help_section_test.rb

diff --git a/src/app/controllers/application.rb b/src/app/controllers/application.rb
index a751768..37e56dd 100644
--- a/src/app/controllers/application.rb
+++ b/src/app/controllers/application.rb
@@ -31,7 +31,7 @@ class ApplicationController < ActionController::Base
   before_filter :pre_edit, :only => [:edit, :update, :destroy]
   before_filter :pre_show, :only => [:show]
   before_filter :authorize_admin, :only => [:new, :create, :edit, :update, :destroy]
-  before_filter :is_logged_in
+  before_filter :is_logged_in, :get_help_section
 
   def choose_layout
     if(params[:component_layout])
@@ -44,6 +44,11 @@ class ApplicationController < ActionController::Base
     redirect_to(:controller => "login", :action => "login") unless get_login_user
   end
 
+  def get_help_section
+      help = HelpSection.find(:first, :conditions => [ "controller = ? AND action = ?", controller_name, action_name ])
+      @help_section = help ? help.section : ""
+  end
+
   def get_login_user
     (ENV["RAILS_ENV"] == "production") ? session[:user] : "ovirtadmin"
   end
diff --git a/src/app/controllers/pool_controller.rb b/src/app/controllers/pool_controller.rb
index 02ef290..1a574b1 100644
--- a/src/app/controllers/pool_controller.rb
+++ b/src/app/controllers/pool_controller.rb
@@ -35,7 +35,7 @@ class PoolController < ApplicationController
     respond_to do |format|
       format.html {
         render :layout => 'tabs-and-content' if params[:ajax]
-        render :layout => false if params[:nolayout]
+        render :layout => 'help-and-content' if params[:nolayout]
       }
       format.xml {
         render :xml => @pool.to_xml(XML_OPTS)
diff --git a/src/app/models/help_section.rb b/src/app/models/help_section.rb
new file mode 100644
index 0000000..a891383
--- /dev/null
+++ b/src/app/models/help_section.rb
@@ -0,0 +1,2 @@
+class HelpSection < ActiveRecord::Base
+end
diff --git a/src/app/views/layouts/_header_redux.rhtml b/src/app/views/layouts/_header_redux.rhtml
index 18014ab..a12d567 100644
--- a/src/app/views/layouts/_header_redux.rhtml
+++ b/src/app/views/layouts/_header_redux.rhtml
@@ -6,7 +6,6 @@
     <input id="textfield_effect" name="terms" value="Search" onkeypress="" onfocus="if( this.value == this.defaultValue ) this.value='';" type="text">
     <input id="searchbox-button" src="<%= image_path "icon_search.png"%>" title="Search" type="image">&nbsp;&nbsp;|
   </form>
-  <a id="help-link" href="#" ><%= image_tag "icon_help.png" %></a> <!-- FIXME wire link correctly -->
 </div>
 
 <div class="header_titlebar">Resource Pools</div>
diff --git a/src/app/views/layouts/help-and-content.rhtml b/src/app/views/layouts/help-and-content.rhtml
new file mode 100644
index 0000000..fc96c9f
--- /dev/null
+++ b/src/app/views/layouts/help-and-content.rhtml
@@ -0,0 +1,6 @@
+<div id="help-div">
+  <%= link_to image_tag("icon_help.png"),
+      {:controller => 'help', :action => @help_section},
+      :id=>"help-link", :popup => true %>
+</div>
+<%= yield %>
diff --git a/src/app/views/layouts/redux.rhtml b/src/app/views/layouts/redux.rhtml
index a985cdd..475db64 100644
--- a/src/app/views/layouts/redux.rhtml
+++ b/src/app/views/layouts/redux.rhtml
@@ -79,11 +79,17 @@
    </div>
 
    <div id="tabs-and-content-container">
+
      <div id="navigation-tabs" style="position:absolute; top:40px; left:250px;">
        <%= render :partial => '/layouts/navigation_tabs' %>
      </div> 
      <div id="main">
         <div id="content_area">
+          <div id="help-div">
+                <%= link_to image_tag("icon_help.png"),
+                {:controller => 'help', :action => @help_section},
+                :id=>"help-link", :popup => true %>
+          </div>
           <%= yield  %> <%# the rest of the center and right hand side %>
         </div>
      </div>
diff --git a/src/app/views/layouts/tabs-and-content.rhtml b/src/app/views/layouts/tabs-and-content.rhtml
index 8aa4183..359f17b 100644
--- a/src/app/views/layouts/tabs-and-content.rhtml
+++ b/src/app/views/layouts/tabs-and-content.rhtml
@@ -1,3 +1,4 @@
+
 <div id="side-toolbar" class="header_menu_wrapper">
   <%= render :partial => '/layouts/side_toolbar' %>
 </div>
@@ -6,5 +7,10 @@
 </div> 
 <div id="main">
   <div id="content_area">
+   <div id="help-div">
+    <%= link_to image_tag("icon_help.png"),
+        {:controller => 'help', :action => @help_section},
+        :id=>"help-link", :popup => true %>
+   </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/db/migrate/023_create_help_sections.rb b/src/db/migrate/023_create_help_sections.rb
new file mode 100644
index 0000000..963e8bd
--- /dev/null
+++ b/src/db/migrate/023_create_help_sections.rb
@@ -0,0 +1,13 @@
+class CreateHelpSections < ActiveRecord::Migration
+  def self.up
+    create_table :help_sections do |t|
+      t.string :controller, :null => false, :limit => 25
+      t.string :action, :null => false, :limit => 25
+      t.string :section, :null => false, :limit => 100
+    end
+  end
+
+  def self.down
+    drop_table :help_sections
+  end
+end
diff --git a/src/public/stylesheets/layout.css b/src/public/stylesheets/layout.css
index 9471cdc..013c959 100644
--- a/src/public/stylesheets/layout.css
+++ b/src/public/stylesheets/layout.css
@@ -128,7 +128,7 @@ a { color:#000000; text-decoration: none;}
 /*  ----- Right side of Header --------  */
 
 .header_info {
-  padding: 10px 20px 0px 10px;
+  padding: 10px 30px 0px 10px;
   margin: 0;
   float: right;
   text-align: right;
@@ -140,6 +140,12 @@ a { color:#000000; text-decoration: none;}
 .header_info a:visited { color: #B5B5B5; text-decoration: none; }
 .header_info a:hover   { color: #FFFFFF; text-decoration: none; }
 
+#help-div {
+  position: fixed;
+  top: 10px;
+  right: -1px;
+}
+
 #textfield_effect {
     border-width: 1px;
     border-style: solid;
diff --git a/src/test/fixtures/help_sections.yml b/src/test/fixtures/help_sections.yml
new file mode 100644
index 0000000..5bf0293
--- /dev/null
+++ b/src/test/fixtures/help_sections.yml
@@ -0,0 +1,7 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+# one:
+#   column: value
+#
+# two:
+#   column: value
diff --git a/src/test/unit/help_section_test.rb b/src/test/unit/help_section_test.rb
new file mode 100644
index 0000000..a0e6a08
--- /dev/null
+++ b/src/test/unit/help_section_test.rb
@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class HelpSectionTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end
-- 
1.5.5.1



From dpierce at redhat.com  Wed Oct  8 21:14:33 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Wed,  8 Oct 2008 17:14:33 -0400
Subject: [Ovirt-devel] [PATCH node] Updated the configuration processing to
	remove the need for scripts.
Message-ID: <1223500473-12273-1-git-send-email-dpierce@redhat.com>

The system now takes an encoded configuration descriptor from the server. It
then parses from that a set of aliases for bondings if such exist. It then
also extracts configuration details for the various network interfaces on the
node. Afterward, it reloads module dependencies and then restarts the
networking service.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 scripts/ovirt-early          |   12 ++-----
 scripts/ovirt-process-config |   64 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 8 deletions(-)
 create mode 100755 scripts/ovirt-process-config

diff --git a/scripts/ovirt-early b/scripts/ovirt-early
index 4723426..e5f1e9b 100755
--- a/scripts/ovirt-early
+++ b/scripts/ovirt-early
@@ -12,6 +12,8 @@
 
 # size of the oVirt partition in megabytes
 OVIRT_SIZE=64
+BONDING_MODCONF_FILE=/etc/modprobe.d/bonding
+AUGTOOL_CONFIG=/var/tmp/augtool-config
 
 get_mac_addresses() {
     macs=$(ifconfig | awk '/HWaddr/ { print $5"="$1 }' \
@@ -43,16 +45,10 @@ configure_from_network() {
                       "http://$SRV_HOST:$SRV_PORT/ovirt/managed_node/config?host=$(hostname)&macs=$macs"
                     if [ $? -eq 0 ]; then
                         echo "Remote configuration bundle retrieved to $cfgdb"
-                        bash $cfgdb
-                        if [ -f /var/tmp/pre-config-script ]; then
-                            echo "Loading kernel modules"
-                            bash /var/tmp/pre-config-script \
-                                && echo "Kernel modules loaded" \
-                                || echo "Failed loading kernel modules"
-                        fi
+                        ovirt-process-config $cfgdb $BONDING_MODCONF_FILE $AUGTOOL_CONFIG
                         if [ -f /var/tmp/node-augtool ]; then
                             echo "Loading remote config"
-                            augtool < /var/tmp/node-augtool \
+                            augtool < $AUGTOOL_CONFIG \
                                 && echo "Remote config applied" \
                                 || echo "Failed applying remote config"
                         fi
diff --git a/scripts/ovirt-process-config b/scripts/ovirt-process-config
new file mode 100755
index 0000000..4c9b7dc
--- /dev/null
+++ b/scripts/ovirt-process-config
@@ -0,0 +1,64 @@
+#!/bin/bash
+
+ME=$(basename "$0")
+warn() { printf "$ME: $@\n" >&2; }
+try_h() { printf "Try \`$ME -h' for more information.\n" >&2; exit 1;}
+try_help() { printf "Usage: \`$ME [config] [module output] [config output]\n" >&2; exit 1;}
+
+case $# in
+  0|1|2) warn "too few arguments"; try_help;;
+  3) ;;
+  *) warn "too many arguments"; try_help;;
+esac
+
+CONFIG=$1
+OVIRT_KERNEL_MODULE_FILE=$2
+OVIRT_CONFIG_OUTPUT_FILE=$3
+
+modconf=$(awk '/bonding=/ {
+        match($0, "bonding=(.*)", data)
+        split(data[1], mod, "|")
+
+        alias=mod[1]
+
+        printf("install %s bonding", alias)
+    }' $CONFIG)
+
+echo "$modconf" > $OVIRT_KERNEL_MODULE_FILE
+
+# now build the list of module aliases to load and load them
+modules=$(awk '/bonding=/ {
+        match($0, "bonding=(.*)", data)
+        split(data[1], mod, "|")
+
+        printf("%s ", mod[1])
+    }' $CONFIG)
+
+/sbin/depmod -a
+
+networking=$(awk '/ifcfg=/ {
+    match($0, "ifcfg=(.*)", data)
+    split(data[1], ifcfg, "|")
+
+    mac = ifcfg[1]
+    iface = ifcfg[2]
+
+    printf("rm /files/etc/sysconfig/network-scripts/ifcfg-%s\n", iface)
+    printf("set /files/etc/sysconfig/network-scripts/ifcfg-%s/DEVICE %s\n", iface, iface)
+
+    for (line in ifcfg) {
+        if(line > 2) {
+            match(ifcfg[line], "(^[^=]+)=(.*)", values)
+            field=values[1]
+            value=values[2]
+
+            printf("set /files/etc/sysconfig/network-scripts/ifcfg-%s/%s %s\n", iface, field, value)
+        }
+    }
+
+
+    printf("save\n")
+
+}' $CONFIG)
+
+echo "$networking" > $OVIRT_CONFIG_OUTPUT_FILE
-- 
1.5.5.1



From dpierce at redhat.com  Wed Oct  8 21:14:45 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Wed,  8 Oct 2008 17:14:45 -0400
Subject: [Ovirt-devel] [PATCH server] Replaced the config scripts with
	configuration encoding.
Message-ID: <1223500485-12307-1-git-send-email-dpierce@redhat.com>

Rather than sending the node a series of scripts that load
kernel modules, or are tightly coupled to tools like augeas,
this patch introduces an encoding scheme for data.

A line that begins with "kmod" describes a kernel module that
needs to be loaded. It will containing the module's name, an
optional alias for the module, and then the module options
if such are required.

A line that begins with "ifcfg" describes an network
interface. It will contain the mac address and interface name,
followed by all needed configuration values to bring the
interface up.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 src/app/models/bonding.rb                          |    1 +
 src/lib/managed_node_configuration.rb              |   72 +++++++++------
 src/test/fixtures/bondings.yml                     |    8 ++-
 src/test/fixtures/bondings_nics.yml                |    8 ++
 src/test/fixtures/hosts.yml                        |   10 ++
 src/test/fixtures/nics.yml                         |   14 +++
 .../functional/managed_node_configuration_test.rb  |   94 ++++++++------------
 7 files changed, 118 insertions(+), 89 deletions(-)

diff --git a/src/app/models/bonding.rb b/src/app/models/bonding.rb
index 941e2cd..7bef2f8 100644
--- a/src/app/models/bonding.rb
+++ b/src/app/models/bonding.rb
@@ -38,6 +38,7 @@ class Bonding < ActiveRecord::Base
 
   belongs_to :host
   belongs_to :bonding_type
+  belongs_to :boot_type
 
   has_and_belongs_to_many :nics,
     :join_table  => 'bondings_nics',
diff --git a/src/lib/managed_node_configuration.rb b/src/lib/managed_node_configuration.rb
index 4ade235..fc33560 100644
--- a/src/lib/managed_node_configuration.rb
+++ b/src/lib/managed_node_configuration.rb
@@ -23,36 +23,57 @@
 
 require 'stringio'
 
+# +ManagedNodeConfiguration+ generates a configuration file for an oVirt node
+# based on information about the hardware submitted by the node and the
+# configuration details held in the database.
+#
+# The configuration is returned as a series of encoded lines.
+#
+# For a kernel module, the formation of the line is as follows:
+#
+# kmod=[module name]|[module alias]|[module options]
+#
+# An example would be for loading the +bonding+ kernel module to setup a bonded
+# interface for load balancing. In this example, the bonded interface would be
+# named +failover0+ on the node:
+#
+# kmod=bonding|failover0|mode=2 miimon=100 downdelay=200
+#
+# For a network interface (including a bonded interface) an example would be:
+#
+# ifcfg=00:11:22:33:44|eth0|BOOTPROTO=dhcp|bridge=ovirtbr0|ONBOOT=yes
+#
+# In this line, the network interface +eth0+ has a hardware MAC address of
+# +00:11:22:33:44+. It will use DHCP for retrieving it's IP address details,
+# and will use the +ovirtbr0+ interface as a bridge.
+#
 class ManagedNodeConfiguration
   NIC_ENTRY_PREFIX='/files/etc/sysconfig/network-scripts'
 
   def self.generate(host, macs)
     result = StringIO.new
 
-    result.puts "#!/bin/bash"
     result.puts "# THIS FILE IS GENERATED!"
 
     # first process any bondings that're defined
     unless host.bondings.empty?
-      result.puts "cat <<\EOF > /var/tmp/pre-config-script"
-      result.puts "#!/bin/bash"
-      result.puts "# THIS FILE IS GENERATED!"
-
       host.bondings.each do |bonding|
-        result.puts "/sbin/modprobe bonding mode=#{bonding.bonding_type.mode}"
+        result.puts "bonding=#{bonding.interface_name}"
       end
-
-      result.puts "EOF"
     end
 
     # now process the network interfaces  and bondings
-    result.puts "cat <<\EOF > /var/tmp/node-augtool"
 
     host.bondings.each do |bonding|
-      result.puts "rm #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}"
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/DEVICE #{bonding.interface_name}"
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/IPADDR #{bonding.ip_addr}" if bonding.ip_addr
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/ONBOOT yes"
+      entry = "ifcfg=none|#{bonding.interface_name}|BONDING_OPTS=\"mode=#{bonding.bonding_type.mode} miimon=100\""
+
+      if bonding.ip_addr == nil || bonding.ip_addr.empty?
+        entry += "|BOOTPROTO=dhcp"
+      else
+        entry += "|BOOTPROTO=static|IPADDR=#{bonding.ip_addr}|NETMASK=#{bonding.netmask}|BROADCAST=#{bonding.broadcast}"
+      end
+
+      result.puts "#{entry}|ONBOOT=yes"
 
       bonding.nics.each do |nic|
         process_nic result, nic, macs, bonding
@@ -66,9 +87,6 @@ class ManagedNodeConfiguration
       end
     end
 
-    result.puts "save"
-    result.puts "EOF"
-
     result.string
   end
 
@@ -78,24 +96,18 @@ class ManagedNodeConfiguration
     iface_name = macs[nic.mac]
 
     if iface_name
-      result.puts "rm #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}"
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/DEVICE #{iface_name}"
+      entry = "ifcfg=#{nic.mac}|#{iface_name}"
 
       if bonding
-        result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/MASTER #{bonding.interface_name}"
-        result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/SLAVE yes"
+        entry += "|MASTER=#{bonding.interface_name}|SLAVE=yes"
       else
-        result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BOOTPROTO #{nic.boot_type.proto}"
-
-        if nic.boot_type.proto == 'static'
-          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/IPADDR #{nic.ip_addr}"
-          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/NETMASK #{nic.netmask}"
-          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BROADCAST #{nic.broadcast}"
-        end
+        entry += "|BOOTPROTO=#{nic.boot_type.proto}"
+        entry += "|IPADDR=#{nic.ip_addr}|NETMASK=#{nic.netmask}|BROADCAST=#{nic.broadcast}" if nic.boot_type.proto == 'static'
+        entry += "|BRIDGE=#{nic.bridge}" if nic.bridge
       end
-
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BRIDGE #{nic.bridge}"     if nic.bridge
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/ONBOOT yes"
+      entry += "|ONBOOT=yes"
     end
+
+    result.puts entry if defined? entry
   end
 end
diff --git a/src/test/fixtures/bondings.yml b/src/test/fixtures/bondings.yml
index c2a47b5..7023e08 100644
--- a/src/test/fixtures/bondings.yml
+++ b/src/test/fixtures/bondings.yml
@@ -1,6 +1,6 @@
 mailservers_managed_node_bonding:
     name: Production Network
-    interface_name: bond0
+    interface_name: mailbonding0
     bonding_type_id: <%= Fixtures.identify(:link_aggregation_bonding_type) %>
     host_id: <%= Fixtures.identify(:mailservers_managed_node) %>
     ip_addr: 172.31.0.15
@@ -8,3 +8,9 @@ mailservers_managed_node_bonding:
     broadcast: 172.31.0.255
     arp_ping_address: 172.31.0.100
     arp_interval: 0
+
+mediaserver_managed_node_bonding:
+    name: Fileserver Network
+    interface_name: mediabonding0
+    bonding_type_id: <%= Fixtures.identify(:link_aggregation_bonding_type) %>
+    host_id: <%= Fixtures.identify(:mediaserver_managed_node) %>
diff --git a/src/test/fixtures/bondings_nics.yml b/src/test/fixtures/bondings_nics.yml
index 11a3d1a..607ff8b 100644
--- a/src/test/fixtures/bondings_nics.yml
+++ b/src/test/fixtures/bondings_nics.yml
@@ -5,3 +5,11 @@ mailservers_managed_node_bonding_nic_1:
 mailservers_managed_node_bonding_nic_2:
     bonding_id: <%= Fixtures.identify(:mailservers_managed_node_bonding) %>
     nic_id: <%= Fixtures.identify(:mailserver_nic_two) %>
+
+mediaservers_managed_node_bonding_nic_1:
+    bonding_id: <%= Fixtures.identify(:mediaserver_managed_node_bonding) %>
+    nic_id: <%= Fixtures.identify(:mediaserver_nic_one) %>
+
+mediaservers_managed_node_bonding_nic_2:
+    bonding_id: <%= Fixtures.identify(:mediaserver_managed_node_bonding) %>
+    nic_id: <%= Fixtures.identify(:mediaserver_nic_two) %>
diff --git a/src/test/fixtures/hosts.yml b/src/test/fixtures/hosts.yml
index 5b8af15..28282c2 100644
--- a/src/test/fixtures/hosts.yml
+++ b/src/test/fixtures/hosts.yml
@@ -125,3 +125,13 @@ buildserver_managed_node:
     is_disabled: 0
     hypervisor_type: 'kvm'
     hardware_pool_id: <%= Fixtures.identify(:prodops_pool) %>
+
+mediaserver_managed_node:
+    uuid: '6293acd9-2784-11dc-9387-001558c41534'
+    hostname: 'build.mynetwork.com'
+    arch: 'x86_64'
+    memory: 65536
+    is_disabled: 0
+    hypervisor_type: 'kvm'
+    hardware_pool_id: <%= Fixtures.identify(:prodops_pool) %>
+
diff --git a/src/test/fixtures/nics.yml b/src/test/fixtures/nics.yml
index ccf71d2..5b2cecc 100644
--- a/src/test/fixtures/nics.yml
+++ b/src/test/fixtures/nics.yml
@@ -78,3 +78,17 @@ buildserver_nic_two:
     broadcast: '172.31.0.255'
     host_id: <%= Fixtures.identify(:buildserver_managed_node) %>
     boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
+
+mediaserver_nic_one:
+    mac: '07:17:19:65:03:32'
+    usage_type: '1'
+    bandwidth: 100
+    host_id: <%= Fixtures.identify(:mediaserver_managed_node) %>
+    boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
+
+mediaserver_nic_two:
+    mac: '07:17:19:65:03:31'
+    usage_type: '1'
+    bandwidth: 100
+    host_id: <%= Fixtures.identify(:mediaserver_managed_node) %>
+    boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
diff --git a/src/test/functional/managed_node_configuration_test.rb b/src/test/functional/managed_node_configuration_test.rb
index b5a7ec5..e5b9c18 100644
--- a/src/test/functional/managed_node_configuration_test.rb
+++ b/src/test/functional/managed_node_configuration_test.rb
@@ -36,6 +36,7 @@ class ManagedNodeConfigurationTest < Test::Unit::TestCase
     @host_with_ip_address = hosts(:ldapserver_managed_node)
     @host_with_multiple_nics = hosts(:buildserver_managed_node)
     @host_with_bondings = hosts(:mailservers_managed_node)
+    @host_with_dhcp_bondings = hosts(:mediaserver_managed_node)
   end
 
   # Ensures that network interfaces uses DHCP when no IP address is specified.
@@ -44,15 +45,8 @@ class ManagedNodeConfigurationTest < Test::Unit::TestCase
     nic = @host_with_dhcp_card.nics.first
 
     expected = <<-HERE
-#!/bin/bash
 # THIS FILE IS GENERATED!
-cat <<\EOF > /var/tmp/node-augtool
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BOOTPROTO #{nic.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
-save
-EOF
+ifcfg=#{nic.mac}|eth0|BOOTPROTO=dhcp|ONBOOT=yes
     HERE
 
     result = ManagedNodeConfiguration.generate(
@@ -69,19 +63,8 @@ EOF
     nic = @host_with_ip_address.nics.first
 
     expected = <<-HERE
-#!/bin/bash
 # THIS FILE IS GENERATED!
-cat <<\EOF > /var/tmp/node-augtool
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BOOTPROTO #{nic.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/IPADDR #{nic.ip_addr}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/NETMASK #{nic.netmask}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BROADCAST #{nic.broadcast}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BRIDGE ovirtbr0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
-save
-EOF
+ifcfg=#{nic.mac}|eth0|BOOTPROTO=#{nic.boot_type.proto}|IPADDR=#{nic.ip_addr}|NETMASK=#{nic.netmask}|BROADCAST=#{nic.broadcast}|BRIDGE=#{nic.bridge}|ONBOOT=yes
     HERE
 
     result = ManagedNodeConfiguration.generate(
@@ -99,22 +82,9 @@ EOF
     nic2 = @host_with_multiple_nics.nics[1]
 
     expected = <<-HERE
-#!/bin/bash
 # THIS FILE IS GENERATED!
-cat <<\EOF > /var/tmp/node-augtool
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BOOTPROTO #{nic1.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/IPADDR #{nic1.ip_addr}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/NETMASK #{nic1.netmask}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BROADCAST #{nic1.broadcast}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth1
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/DEVICE eth1
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/BOOTPROTO #{nic2.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/ONBOOT yes
-save
-EOF
+ifcfg=#{nic1.mac}|eth0|BOOTPROTO=#{nic1.boot_type.proto}|IPADDR=#{nic1.ip_addr}|NETMASK=#{nic1.netmask}|BROADCAST=#{nic1.broadcast}|ONBOOT=yes
+ifcfg=#{nic2.mac}|eth1|BOOTPROTO=#{nic2.boot_type.proto}|ONBOOT=yes
     HERE
 
     result = ManagedNodeConfiguration.generate(
@@ -137,30 +107,11 @@ EOF
     nic2 = bonding.nics[1]
 
     expected = <<-HERE
-#!/bin/bash
 # THIS FILE IS GENERATED!
-cat <<\EOF > /var/tmp/pre-config-script
-#!/bin/bash
-# THIS FILE IS GENERATED!
-/sbin/modprobe bonding mode=#{bonding.bonding_type.mode}
-EOF
-cat <<\EOF > /var/tmp/node-augtool
-rm /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}
-set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/DEVICE #{bonding.interface_name}
-set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/IPADDR 172.31.0.15
-set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/ONBOOT yes
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/MASTER #{bonding.interface_name}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/SLAVE yes
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth1
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/DEVICE eth1
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/MASTER #{bonding.interface_name}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/SLAVE yes
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/ONBOOT yes
-save
-EOF
+bonding=#{bonding.interface_name}
+ifcfg=none|#{bonding.interface_name}|BONDING_OPTS="mode=#{bonding.bonding_type.mode} miimon=100"|BOOTPROTO=static|IPADDR=#{bonding.ip_addr}|NETMASK=#{bonding.netmask}|BROADCAST=#{bonding.broadcast}|ONBOOT=yes
+ifcfg=#{nic1.mac}|eth0|MASTER=#{bonding.interface_name}|SLAVE=yes|ONBOOT=yes
+ifcfg=#{nic2.mac}|eth1|MASTER=#{bonding.interface_name}|SLAVE=yes|ONBOOT=yes
 HERE
 
     result = ManagedNodeConfiguration.generate(
@@ -173,4 +124,31 @@ HERE
     assert_equal expected, result
   end
 
+  # Ensures that the generated bonding supports DHCP boot protocol.
+  #
+  def test_generate_with_dhcp_bonding
+    bonding = @host_with_dhcp_bondings.bondings.first
+
+    bonding.ip_addr=nil
+    nic1 = bonding.nics[0]
+    nic2 = bonding.nics[1]
+
+    expected = <<-HERE
+# THIS FILE IS GENERATED!
+bonding=#{bonding.interface_name}
+ifcfg=none|#{bonding.interface_name}|BONDING_OPTS="mode=#{bonding.bonding_type.mode} miimon=100"|BOOTPROTO=dhcp|ONBOOT=yes
+ifcfg=#{nic1.mac}|eth0|MASTER=#{bonding.interface_name}|SLAVE=yes|ONBOOT=yes
+ifcfg=#{nic2.mac}|eth1|MASTER=#{bonding.interface_name}|SLAVE=yes|ONBOOT=yes
+HERE
+
+    result = ManagedNodeConfiguration.generate(
+      @host_with_dhcp_bondings,
+      {
+        "#{nic1.mac}" => 'eth0',
+        "#{nic2.mac}" => 'eth1'
+      })
+
+    assert_equal expected, result
+  end
+
 end
-- 
1.5.5.1



From jim at meyering.net  Wed Oct  8 21:19:15 2008
From: jim at meyering.net (Jim Meyering)
Date: Wed, 08 Oct 2008 23:19:15 +0200
Subject: [Ovirt-devel] [PATCH node] ovirt-node-selinux: new sub-module,
	for conforming SELinux policy
Message-ID: <87zlle3hv0.fsf@rho.meyering.net>


ovirt-node needs SELinux policy to allow qemu to access the iSCSI block
devices. This is done presently via a script during install, but it
should be done by a subpackage of ovirt-node called ovirt-node-selinux.
Follow the Fedora guidelines for this located at:
http://fedoraproject.org/wiki/PackagingDrafts/SELinux/PolicyModules

* Makefile.am (EXTRA_DIST): Add ovirt-node-selinux.te.
* ovirt-node-selinux.te: New file, with contents from...
* ovirt-listen-awake/ovirt-install-node: ...here.  Remove policy
definition and semodule-running code.
* ovirt-node.spec.in: Update per the above wiki URL.
---
 Makefile.am                           |    6 ++--
 ovirt-listen-awake/ovirt-install-node |   19 ----------
 ovirt-node-selinux.te                 |    8 ++++
 ovirt-node.spec.in                    |   59 ++++++++++++++++++++++++++++++++-
 4 files changed, 69 insertions(+), 23 deletions(-)
 create mode 100644 ovirt-node-selinux.te

diff --git a/Makefile.am b/Makefile.am
index 28aa71e..8ca63dc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,10 +21,11 @@ SUBDIRS = ovirt-identify-node ovirt-listen-awake
 EXTRA_DIST =			\
   .gitignore			\
   ovirt-node.spec		\
-  ovirt-node.spec.in	\
+  ovirt-node.spec.in		\
+  ovirt-node-selinux.te		\
   scripts/collectd		\
   scripts/collectd.conf.in	\
-  scripts/ovirt				\
+  scripts/ovirt			\
   scripts/ovirt-awake		\
   scripts/ovirt-early		\
   scripts/ovirt-functions	\
@@ -48,4 +49,3 @@ publish: rpms
 	createrepo $(OVIRT_CACHE_DIR)/ovirt

 .PHONY: rpms publish
-
diff --git a/ovirt-listen-awake/ovirt-install-node b/ovirt-listen-awake/ovirt-install-node
index c741acf..1d998f4 100644
--- a/ovirt-listen-awake/ovirt-install-node
+++ b/ovirt-listen-awake/ovirt-install-node
@@ -100,22 +100,3 @@ elif [ "$1" = "stateful" ]; then
 else
     usage
 fi
-
-# Common to both stateless and stateful Nodes
-
-if selinuxenabled ; then
-    # make disks available to VMs
-    t=$(mktemp -d)
-    cat > $t/te <<\EOF
-module ovirt 1.0.0;
-require {
-    type fixed_disk_device_t;
-    type qemu_t;
-    class blk_file { ioctl getattr setattr read write };
-}
-allow qemu_t fixed_disk_device_t:blk_file { ioctl getattr setattr read write };
-EOF
-    checkmodule -M -m -o $t/mod $t/te
-    semodule_package -o $t/pp -m $t/mod
-    semodule -i $t/pp
-fi
diff --git a/ovirt-node-selinux.te b/ovirt-node-selinux.te
new file mode 100644
index 0000000..a53d3de
--- /dev/null
+++ b/ovirt-node-selinux.te
@@ -0,0 +1,8 @@
+module ovirt 1.0.0;
+require {
+    type fixed_disk_device_t;
+    type qemu_t;
+    class blk_file { ioctl getattr setattr read write };
+}
+# Give qemu_t access to any block device
+allow qemu_t fixed_disk_device_t:blk_file { ioctl getattr setattr read write };
diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index 3dc4e1d..daa3d7f 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -6,6 +6,11 @@ Source0:        %{name}-%{version}.tar.gz
 License:        GPLv2+
 Group:          Applications/System

+%define selinux_variants mls strict targeted
+%define selinux_policyver %(sed -n 's,.*selinux-policy-\([^/]*\)/.*,\1,p' /usr/share/selinux/devel/policyhelp)
+%define modulename %{name}-selinux
+Source1:        %{modulename}.te
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 URL:            http://www.ovirt.org/
 Requires(post):  /sbin/chkconfig
@@ -26,14 +31,38 @@ ExclusiveArch:  %{ix86} x86_64
 Provides a series of daemons and support utilities to allow an
 oVirt Node to interact with the oVirt server.

-%prep
+%package selinux
+Summary:        SELinux policy module supporting ovirt-node
+Group:          System Environment/Base
+BuildRequires:  checkpolicy, selinux-policy-devel, hardlink
+%if "%{selinux_policyver}" != ""
+Requires:       selinux-policy >= %{selinux_policyver}
+%endif
+Requires:       %{name} = %{version}-%{release}
+Requires(post):   /usr/sbin/semodule, /sbin/restorecon
+Requires(postun): /usr/sbin/semodule, /sbin/restorecon
+
+%description selinux
+SELinux policy module supporting ovirt-node

+%prep
 %setup -q

+mkdir SELinux
+cp -p %{SOURCE1} SELinux
+
 %build
 %configure
 make

+cd SELinux
+for selinuxvariant in %{selinux_variants}; do
+  make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
+  mv %{modulename}.pp %{modulename}.pp.${selinuxvariant}
+  make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
+done
+cd -
+
 %install
 %{__rm} -rf %{buildroot}
 %{__install} -d -m0755 %{buildroot}%{_sbindir}
@@ -65,6 +94,16 @@ make

 echo "oVirt Node release %{version}-%{release}" > %{buildroot}%{_sysconfdir}/ovirt-release

+cd SELinux
+for selinuxvariant in %{selinux_variants}; do
+  install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
+  install -p -m 644 %{modulename}.pp.${selinuxvariant} \
+  %{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp
+done
+cd -
+
+/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux
+
 %clean
 %{__rm} -rf %{buildroot}

@@ -85,6 +124,24 @@ if [ "$1" = 0 ] ; then
   /sbin/chkconfig --del ovirt-listen-awake
 fi

+%post selinux
+for selinuxvariant in %{selinux_variants}; do
+  /usr/sbin/semodule -s ${selinuxvariant} -i \
+    %{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp &> /dev/null || :
+done
+
+%postun selinux
+if [ $1 -eq 0 ] ; then
+  for selinuxvariant in %{selinux_variants}; do
+    /usr/sbin/semodule -s ${selinuxvariant} -r %{modulename} &> /dev/null || :
+  done
+fi
+
+%files selinux
+%defattr(-,root,root,0755)
+%doc SELinux/*
+%{_datadir}/selinux/*/%{modulename}.pp
+
 %files
 %defattr(-,root,root,0755)
 %{_sbindir}/ovirt-awake
--
1.6.0.2.304.gc76d



From dpierce at redhat.com  Wed Oct  8 21:23:41 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Wed, 08 Oct 2008 17:23:41 -0400
Subject: [Ovirt-devel] Testing nic configuration
Message-ID: <48ED24DD.6000305@redhat.com>

1. Let the node boot so that the appropriate entries are created in nics.
2. Change the boot_type_id to be "1" for an entry. This will make it
static ip.
3. Set an IP address, netmask and broadcast address for the nic.
4. Restart the NIC.

After booting, it should have the configured network configuration.

-- 
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081008/8d4d298b/attachment.vcf>

From mmorsi at redhat.com  Wed Oct  8 22:00:13 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Wed,  8 Oct 2008 18:00:13 -0400
Subject: [Ovirt-devel] [PATCH server] integrate 'using ovirt' doc into a wui
	help section
Message-ID: <1223503213-30958-1-git-send-email-mmorsi@redhat.com>

this will work as is, but until help_sections table is populated
all pages will link to main document body (and not particular
sections)
---
 src/app/controllers/application.rb           |   15 ++++++++++++++-
 src/app/controllers/pool_controller.rb       |    2 +-
 src/app/models/help_section.rb               |    2 ++
 src/app/views/layouts/_header_redux.rhtml    |    1 -
 src/app/views/layouts/help-and-content.rhtml |    6 ++++++
 src/app/views/layouts/redux.rhtml            |    6 ++++++
 src/app/views/layouts/tabs-and-content.rhtml |    8 +++++++-
 src/db/migrate/023_create_help_sections.rb   |   13 +++++++++++++
 src/public/stylesheets/layout.css            |    8 +++++++-
 src/test/fixtures/help_sections.yml          |    7 +++++++
 src/test/unit/help_section_test.rb           |    8 ++++++++
 11 files changed, 71 insertions(+), 5 deletions(-)
 create mode 100644 src/app/models/help_section.rb
 create mode 100644 src/app/views/layouts/help-and-content.rhtml
 create mode 100644 src/db/migrate/023_create_help_sections.rb
 create mode 100644 src/test/fixtures/help_sections.yml
 create mode 100644 src/test/unit/help_section_test.rb

diff --git a/src/app/controllers/application.rb b/src/app/controllers/application.rb
index a751768..187adc6 100644
--- a/src/app/controllers/application.rb
+++ b/src/app/controllers/application.rb
@@ -31,7 +31,7 @@ class ApplicationController < ActionController::Base
   before_filter :pre_edit, :only => [:edit, :update, :destroy]
   before_filter :pre_show, :only => [:show]
   before_filter :authorize_admin, :only => [:new, :create, :edit, :update, :destroy]
-  before_filter :is_logged_in
+  before_filter :is_logged_in, :get_help_section
 
   def choose_layout
     if(params[:component_layout])
@@ -44,6 +44,19 @@ class ApplicationController < ActionController::Base
     redirect_to(:controller => "login", :action => "login") unless get_login_user
   end
 
+  def get_help_section
+      help = HelpSection.find(:first, :conditions => [ "controller = ? AND action = ?", controller_name, action_name ])
+      @help_section = help ? help.section : ""
+      if @help_section.index('#')
+        help_sections = @help_section.split('#')
+        @help_section = help_sections[0]
+        @anchor = help_sections[1]
+      else
+        @help_section = @help_section
+        @anchor = ""
+      end
+  end
+
   def get_login_user
     (ENV["RAILS_ENV"] == "production") ? session[:user] : "ovirtadmin"
   end
diff --git a/src/app/controllers/pool_controller.rb b/src/app/controllers/pool_controller.rb
index 02ef290..1a574b1 100644
--- a/src/app/controllers/pool_controller.rb
+++ b/src/app/controllers/pool_controller.rb
@@ -35,7 +35,7 @@ class PoolController < ApplicationController
     respond_to do |format|
       format.html {
         render :layout => 'tabs-and-content' if params[:ajax]
-        render :layout => false if params[:nolayout]
+        render :layout => 'help-and-content' if params[:nolayout]
       }
       format.xml {
         render :xml => @pool.to_xml(XML_OPTS)
diff --git a/src/app/models/help_section.rb b/src/app/models/help_section.rb
new file mode 100644
index 0000000..a891383
--- /dev/null
+++ b/src/app/models/help_section.rb
@@ -0,0 +1,2 @@
+class HelpSection < ActiveRecord::Base
+end
diff --git a/src/app/views/layouts/_header_redux.rhtml b/src/app/views/layouts/_header_redux.rhtml
index 18014ab..a12d567 100644
--- a/src/app/views/layouts/_header_redux.rhtml
+++ b/src/app/views/layouts/_header_redux.rhtml
@@ -6,7 +6,6 @@
     <input id="textfield_effect" name="terms" value="Search" onkeypress="" onfocus="if( this.value == this.defaultValue ) this.value='';" type="text">
     <input id="searchbox-button" src="<%= image_path "icon_search.png"%>" title="Search" type="image">&nbsp;&nbsp;|
   </form>
-  <a id="help-link" href="#" ><%= image_tag "icon_help.png" %></a> <!-- FIXME wire link correctly -->
 </div>
 
 <div class="header_titlebar">Resource Pools</div>
diff --git a/src/app/views/layouts/help-and-content.rhtml b/src/app/views/layouts/help-and-content.rhtml
new file mode 100644
index 0000000..0542418
--- /dev/null
+++ b/src/app/views/layouts/help-and-content.rhtml
@@ -0,0 +1,6 @@
+<div id="help-div">
+  <%= link_to image_tag("icon_help.png"),
+      {:controller => 'help', :action => @help_section, :anchor => @anchor},
+      :id=>"help-link", :popup => true %>
+</div>
+<%= yield %>
diff --git a/src/app/views/layouts/redux.rhtml b/src/app/views/layouts/redux.rhtml
index a985cdd..0918dce 100644
--- a/src/app/views/layouts/redux.rhtml
+++ b/src/app/views/layouts/redux.rhtml
@@ -79,11 +79,17 @@
    </div>
 
    <div id="tabs-and-content-container">
+
      <div id="navigation-tabs" style="position:absolute; top:40px; left:250px;">
        <%= render :partial => '/layouts/navigation_tabs' %>
      </div> 
      <div id="main">
         <div id="content_area">
+          <div id="help-div">
+                <%= link_to image_tag("icon_help.png"),
+                {:controller => 'help', :action => @help_section, :anchor => @anchor},
+                :id=>"help-link", :popup => true %>
+          </div>
           <%= yield  %> <%# the rest of the center and right hand side %>
         </div>
      </div>
diff --git a/src/app/views/layouts/tabs-and-content.rhtml b/src/app/views/layouts/tabs-and-content.rhtml
index 8aa4183..92eafd2 100644
--- a/src/app/views/layouts/tabs-and-content.rhtml
+++ b/src/app/views/layouts/tabs-and-content.rhtml
@@ -1,3 +1,4 @@
+
 <div id="side-toolbar" class="header_menu_wrapper">
   <%= render :partial => '/layouts/side_toolbar' %>
 </div>
@@ -6,5 +7,10 @@
 </div> 
 <div id="main">
   <div id="content_area">
+   <div id="help-div">
+    <%= link_to image_tag("icon_help.png"),
+        {:controller => 'help', :action => @help_section, :anchor => @anchor},
+        :id=>"help-link", :popup => true %>
+   </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/db/migrate/023_create_help_sections.rb b/src/db/migrate/023_create_help_sections.rb
new file mode 100644
index 0000000..963e8bd
--- /dev/null
+++ b/src/db/migrate/023_create_help_sections.rb
@@ -0,0 +1,13 @@
+class CreateHelpSections < ActiveRecord::Migration
+  def self.up
+    create_table :help_sections do |t|
+      t.string :controller, :null => false, :limit => 25
+      t.string :action, :null => false, :limit => 25
+      t.string :section, :null => false, :limit => 100
+    end
+  end
+
+  def self.down
+    drop_table :help_sections
+  end
+end
diff --git a/src/public/stylesheets/layout.css b/src/public/stylesheets/layout.css
index 9471cdc..013c959 100644
--- a/src/public/stylesheets/layout.css
+++ b/src/public/stylesheets/layout.css
@@ -128,7 +128,7 @@ a { color:#000000; text-decoration: none;}
 /*  ----- Right side of Header --------  */
 
 .header_info {
-  padding: 10px 20px 0px 10px;
+  padding: 10px 30px 0px 10px;
   margin: 0;
   float: right;
   text-align: right;
@@ -140,6 +140,12 @@ a { color:#000000; text-decoration: none;}
 .header_info a:visited { color: #B5B5B5; text-decoration: none; }
 .header_info a:hover   { color: #FFFFFF; text-decoration: none; }
 
+#help-div {
+  position: fixed;
+  top: 10px;
+  right: -1px;
+}
+
 #textfield_effect {
     border-width: 1px;
     border-style: solid;
diff --git a/src/test/fixtures/help_sections.yml b/src/test/fixtures/help_sections.yml
new file mode 100644
index 0000000..5bf0293
--- /dev/null
+++ b/src/test/fixtures/help_sections.yml
@@ -0,0 +1,7 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+# one:
+#   column: value
+#
+# two:
+#   column: value
diff --git a/src/test/unit/help_section_test.rb b/src/test/unit/help_section_test.rb
new file mode 100644
index 0000000..a0e6a08
--- /dev/null
+++ b/src/test/unit/help_section_test.rb
@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class HelpSectionTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end
-- 
1.5.5.1



From jguiditt at redhat.com  Wed Oct  8 22:13:01 2008
From: jguiditt at redhat.com (Jason Guiditta)
Date: Wed, 08 Oct 2008 18:13:01 -0400
Subject: [Ovirt-devel] [PATCH server] integrate 'using ovirt' doc into
	a wui help section
In-Reply-To: <1223503213-30958-1-git-send-email-mmorsi@redhat.com>
References: <1223503213-30958-1-git-send-email-mmorsi@redhat.com>
Message-ID: <1223503981.421.34.camel@localhost.localdomain>

On Wed, 2008-10-08 at 18:00 -0400, Mohammed Morsi wrote:
> this will work as is, but until help_sections table is populated
> all pages will link to main document body (and not particular
> sections)
> ---
>  src/app/controllers/application.rb           |   15 ++++++++++++++-
>  src/app/controllers/pool_controller.rb       |    2 +-
>  src/app/models/help_section.rb               |    2 ++
>  src/app/views/layouts/_header_redux.rhtml    |    1 -
>  src/app/views/layouts/help-and-content.rhtml |    6 ++++++
>  src/app/views/layouts/redux.rhtml            |    6 ++++++
>  src/app/views/layouts/tabs-and-content.rhtml |    8 +++++++-
>  src/db/migrate/023_create_help_sections.rb   |   13 +++++++++++++
>  src/public/stylesheets/layout.css            |    8 +++++++-
>  src/test/fixtures/help_sections.yml          |    7 +++++++
>  src/test/unit/help_section_test.rb           |    8 ++++++++
>  11 files changed, 71 insertions(+), 5 deletions(-)
>  create mode 100644 src/app/models/help_section.rb
>  create mode 100644 src/app/views/layouts/help-and-content.rhtml
>  create mode 100644 src/db/migrate/023_create_help_sections.rb
>  create mode 100644 src/test/fixtures/help_sections.yml
>  create mode 100644 src/test/unit/help_section_test.rb
> 
> diff --git a/src/app/controllers/application.rb b/src/app/controllers/application.rb
> index a751768..187adc6 100644
> --- a/src/app/controllers/application.rb
> +++ b/src/app/controllers/application.rb
> @@ -31,7 +31,7 @@ class ApplicationController < ActionController::Base
>    before_filter :pre_edit, :only => [:edit, :update, :destroy]
>    before_filter :pre_show, :only => [:show]
>    before_filter :authorize_admin, :only => [:new, :create, :edit, :update, :destroy]
> -  before_filter :is_logged_in
> +  before_filter :is_logged_in, :get_help_section
>  
>    def choose_layout
>      if(params[:component_layout])
> @@ -44,6 +44,19 @@ class ApplicationController < ActionController::Base
>      redirect_to(:controller => "login", :action => "login") unless get_login_user
>    end
>  
> +  def get_help_section
> +      help = HelpSection.find(:first, :conditions => [ "controller = ? AND action = ?", controller_name, action_name ])
> +      @help_section = help ? help.section : ""
> +      if @help_section.index('#')
> +        help_sections = @help_section.split('#')
> +        @help_section = help_sections[0]
> +        @anchor = help_sections[1]
> +      else
> +        @help_section = @help_section
> +        @anchor = ""
> +      end
> +  end
> +
>    def get_login_user
>      (ENV["RAILS_ENV"] == "production") ? session[:user] : "ovirtadmin"
>    end
> diff --git a/src/app/controllers/pool_controller.rb b/src/app/controllers/pool_controller.rb
> index 02ef290..1a574b1 100644
> --- a/src/app/controllers/pool_controller.rb
> +++ b/src/app/controllers/pool_controller.rb
> @@ -35,7 +35,7 @@ class PoolController < ApplicationController
>      respond_to do |format|
>        format.html {
>          render :layout => 'tabs-and-content' if params[:ajax]
> -        render :layout => false if params[:nolayout]
> +        render :layout => 'help-and-content' if params[:nolayout]
>        }
>        format.xml {
>          render :xml => @pool.to_xml(XML_OPTS)
> diff --git a/src/app/models/help_section.rb b/src/app/models/help_section.rb
> new file mode 100644
> index 0000000..a891383
> --- /dev/null
> +++ b/src/app/models/help_section.rb
> @@ -0,0 +1,2 @@
> +class HelpSection < ActiveRecord::Base
> +end
> diff --git a/src/app/views/layouts/_header_redux.rhtml b/src/app/views/layouts/_header_redux.rhtml
> index 18014ab..a12d567 100644
> --- a/src/app/views/layouts/_header_redux.rhtml
> +++ b/src/app/views/layouts/_header_redux.rhtml
> @@ -6,7 +6,6 @@
>      <input id="textfield_effect" name="terms" value="Search" onkeypress="" onfocus="if( this.value == this.defaultValue ) this.value='';" type="text">
>      <input id="searchbox-button" src="<%= image_path "icon_search.png"%>" title="Search" type="image">&nbsp;&nbsp;|
>    </form>
> -  <a id="help-link" href="#" ><%= image_tag "icon_help.png" %></a> <!-- FIXME wire link correctly -->
>  </div>
>  
>  <div class="header_titlebar">Resource Pools</div>
> diff --git a/src/app/views/layouts/help-and-content.rhtml b/src/app/views/layouts/help-and-content.rhtml
> new file mode 100644
> index 0000000..0542418
> --- /dev/null
> +++ b/src/app/views/layouts/help-and-content.rhtml
> @@ -0,0 +1,6 @@
> +<div id="help-div">
> +  <%= link_to image_tag("icon_help.png"),
> +      {:controller => 'help', :action => @help_section, :anchor => @anchor},
> +      :id=>"help-link", :popup => true %>
> +</div>
> +<%= yield %>
> diff --git a/src/app/views/layouts/redux.rhtml b/src/app/views/layouts/redux.rhtml
> index a985cdd..0918dce 100644
> --- a/src/app/views/layouts/redux.rhtml
> +++ b/src/app/views/layouts/redux.rhtml
> @@ -79,11 +79,17 @@
>     </div>
>  
>     <div id="tabs-and-content-container">
> +
>       <div id="navigation-tabs" style="position:absolute; top:40px; left:250px;">
>         <%= render :partial => '/layouts/navigation_tabs' %>
>       </div> 
>       <div id="main">
>          <div id="content_area">
> +          <div id="help-div">
> +                <%= link_to image_tag("icon_help.png"),
> +                {:controller => 'help', :action => @help_section, :anchor => @anchor},
> +                :id=>"help-link", :popup => true %>
> +          </div>
>            <%= yield  %> <%# the rest of the center and right hand side %>
>          </div>
>       </div>
> diff --git a/src/app/views/layouts/tabs-and-content.rhtml b/src/app/views/layouts/tabs-and-content.rhtml
> index 8aa4183..92eafd2 100644
> --- a/src/app/views/layouts/tabs-and-content.rhtml
> +++ b/src/app/views/layouts/tabs-and-content.rhtml
> @@ -1,3 +1,4 @@
> +
>  <div id="side-toolbar" class="header_menu_wrapper">
>    <%= render :partial => '/layouts/side_toolbar' %>
>  </div>
> @@ -6,5 +7,10 @@
>  </div> 
>  <div id="main">
>    <div id="content_area">
> +   <div id="help-div">
> +    <%= link_to image_tag("icon_help.png"),
> +        {:controller => 'help', :action => @help_section, :anchor => @anchor},
> +        :id=>"help-link", :popup => true %>
> +   </div>
>    </div>
> -</div>
> \ No newline at end of file
> +</div>
> diff --git a/src/db/migrate/023_create_help_sections.rb b/src/db/migrate/023_create_help_sections.rb
> new file mode 100644
> index 0000000..963e8bd
> --- /dev/null
> +++ b/src/db/migrate/023_create_help_sections.rb
> @@ -0,0 +1,13 @@
> +class CreateHelpSections < ActiveRecord::Migration
> +  def self.up
> +    create_table :help_sections do |t|
> +      t.string :controller, :null => false, :limit => 25
> +      t.string :action, :null => false, :limit => 25
> +      t.string :section, :null => false, :limit => 100
> +    end
> +  end
> +
> +  def self.down
> +    drop_table :help_sections
> +  end
> +end
> diff --git a/src/public/stylesheets/layout.css b/src/public/stylesheets/layout.css
> index 9471cdc..013c959 100644
> --- a/src/public/stylesheets/layout.css
> +++ b/src/public/stylesheets/layout.css
> @@ -128,7 +128,7 @@ a { color:#000000; text-decoration: none;}
>  /*  ----- Right side of Header --------  */
>  
>  .header_info {
> -  padding: 10px 20px 0px 10px;
> +  padding: 10px 30px 0px 10px;
>    margin: 0;
>    float: right;
>    text-align: right;
> @@ -140,6 +140,12 @@ a { color:#000000; text-decoration: none;}
>  .header_info a:visited { color: #B5B5B5; text-decoration: none; }
>  .header_info a:hover   { color: #FFFFFF; text-decoration: none; }
>  
> +#help-div {
> +  position: fixed;
> +  top: 10px;
> +  right: -1px;
> +}
> +
>  #textfield_effect {
>      border-width: 1px;
>      border-style: solid;
> diff --git a/src/test/fixtures/help_sections.yml b/src/test/fixtures/help_sections.yml
> new file mode 100644
> index 0000000..5bf0293
> --- /dev/null
> +++ b/src/test/fixtures/help_sections.yml
> @@ -0,0 +1,7 @@
> +# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
> +
> +# one:
> +#   column: value
> +#
> +# two:
> +#   column: value
> diff --git a/src/test/unit/help_section_test.rb b/src/test/unit/help_section_test.rb
> new file mode 100644
> index 0000000..a0e6a08
> --- /dev/null
> +++ b/src/test/unit/help_section_test.rb
> @@ -0,0 +1,8 @@
> +require 'test_helper'
> +
> +class HelpSectionTest < ActiveSupport::TestCase
> +  # Replace this with your real tests.
> +  def test_truth
> +    assert true
> +  end
> +end

ACK, this now works for me.

-j



From pmyers at redhat.com  Thu Oct  9 03:29:25 2008
From: pmyers at redhat.com (Perry Myers)
Date: Wed,  8 Oct 2008 23:29:25 -0400
Subject: [Ovirt-devel] [PATCH recipe] Syntax error correction in ovirt.pp
	(missing comma)
Message-ID: <1223522965-20298-1-git-send-email-pmyers@redhat.com>

Missing comma in ovirt.pp caused ace service to fail at appliance firstboot,
which caused failures in the appliance.

Signed-off-by: Perry Myers <pmyers at redhat.com>
---
 appliances/ovirt/ovirt.pp.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/appliances/ovirt/ovirt.pp.in b/appliances/ovirt/ovirt.pp.in
index 4e96cca..da98f2d 100644
--- a/appliances/ovirt/ovirt.pp.in
+++ b/appliances/ovirt/ovirt.pp.in
@@ -84,7 +84,7 @@ file {"/etc/collectd.conf":
 }
 
 file {"/etc/qpidd.conf":
-    source => "puppet:///ovirt/qpidd.conf"
+    source => "puppet:///ovirt/qpidd.conf",
     notify => Service["qpidd"]
 }
 
-- 
1.5.5.1



From pmyers at redhat.com  Thu Oct  9 03:33:16 2008
From: pmyers at redhat.com (Perry N. Myers)
Date: Wed, 08 Oct 2008 23:33:16 -0400
Subject: [Ovirt-devel] Re: [PATCH recipe] Syntax error correction in
	ovirt.pp (missing comma)
In-Reply-To: <1223522965-20298-1-git-send-email-pmyers@redhat.com>
References: <1223522965-20298-1-git-send-email-pmyers@redhat.com>
Message-ID: <48ED7B7C.3010306@redhat.com>

Perry Myers wrote:
> Missing comma in ovirt.pp caused ace service to fail at appliance firstboot,
> which caused failures in the appliance.

For those of you who reported issues with the appliance booting and 
seeming like a postgres connection problem, this was the reason.  Here's 
what happened for future reference:

syntax error in ovirt.pp caused /etc/init.d/ace to fail during appliance 
firstboot configuration

This prevented the ovirt-server-install script from running which sets up 
the database, and then failures cascaded from there

It's important when writing patches to test the build process end to end 
including building an appliance and testing major functionality to make 
sure no regressions are introduced.

To diagnose this problem I simply looked at the log files in:
/var/log/ace

Perry



From pmyers at redhat.com  Thu Oct  9 04:08:58 2008
From: pmyers at redhat.com (Perry N. Myers)
Date: Thu, 09 Oct 2008 00:08:58 -0400
Subject: [Ovirt-devel] image minimizer in ovirt-node-image kickstart
Message-ID: <48ED83DA.7060501@redhat.com>

Noticed that there is a new section in the common-post.ks in 
ovirt-node-image using something call Image Minimizer.  I assume this is 
the whitelist/blacklist solution that the AOS team has been working on?

Some of the output from that is suspect...  Here's what I'm seeing:

> Running image-minimizer...
> Unknown Command: touch
> e2fsck 1.41.0 (10-Jul-2008)
> Pass 1: Checking inodes, blocks, and sizes
> Pass 2: Checking directory structure
> Pass 3: Checking directory connectivity
> Pass 4: Checking reference counts
> Pass 5: Checking group summary information
> ovirt-node-image: 3724/35200 files (1.1% non-contiguous), 52460/140800 blocks
> e2fsck 1.41.0 (10-Jul-2008)
> Pass 1: Checking inodes, blocks, and sizes
> Pass 2: Checking directory structure
> Pass 3: Checking directory connectivity
> Pass 4: Checking reference counts
> Pass 5: Checking group summary information
> Directories count wrong for group #0 (441, counted=241).
> Fix? yes
> 
> 
> ovirt-node-image: ***** FILE SYSTEM WAS MODIFIED *****
> ovirt-node-image: 3724/14080 files (2.1% non-contiguous), 51098/51098 blocks

Don't know if the resulting fsck is caused by the image minimizer or not, 
but if someone else can replicate what I'm seeing here we need to look 
into this.

Also, the "Unknown command: touch" seems to be coming from the image 
minimizer as well.

Perry



From pmyers at redhat.com  Thu Oct  9 04:12:30 2008
From: pmyers at redhat.com (Perry N. Myers)
Date: Thu, 09 Oct 2008 00:12:30 -0400
Subject: [Ovirt-devel] [PATCH *ALL*] Makefile.am: set OVIRT_DEV
	from	Release: 0 in spec.in file
In-Reply-To: <87bpxv3tii.fsf@rho.meyering.net>
References: <87bpxv3tii.fsf@rho.meyering.net>
Message-ID: <48ED84AE.9090606@redhat.com>

Jim Meyering wrote:
> I'd been running "make build" without setting OVIRT_DEV.
> That would cause trouble due to using out of date RPMs.
> But in development, we should always simply set OVIRT_DEV=1.
> We know we're in development mode when the spec.in file contains
> has a line that starts like this:
> 
>     Release: 0
> 
> so I've adjusted all Makefile.am files to automatically do
> what we want.  Painful to have to put this same snippet in
> 7 different repositories, but very soon I'll be motivated
> (and have time) to factor out the worst of that duplication.

These patches seem to work fine, and I would ACK them except...

I've noticed that occasionally the rpm flags for OVIRT_DEV are not set 
properly in the ovirt-appliance repo, causing the version for 
ovirt-appliance to occasionally be 0.94-0 even though the Release is 0 in 
the spec file.  I can't seem to replicate the error with any consistency. 
  It just happens once and a while with seemingly the same environment (I 
know there must be something different, but haven't pinned it down yet)

If anyone has seen this behavior w/o these patches applied please let me 
know, as maybe this has been a problem all along.  It could be that the 
bashism used to set rpm_flags is not working properly in the Makefile.

Perry



From imain at redhat.com  Thu Oct  9 04:19:33 2008
From: imain at redhat.com (Ian Main)
Date: Wed, 8 Oct 2008 21:19:33 -0700
Subject: [Ovirt-devel] Ovirt-qpid API
Message-ID: <20081008211933.089ac7a8@tp.mains.net>


So I've been doing some work on this API.  It looks like libvirt hardware enumeration is coming along reasonably, so I'm not going to cover all that in this API.  Instead we'll get a version of libvirt built in a few weeks with hardware enumeration and update libvirt-qpid to support that.

As always, please take a look and see if I forgot anything or such.

Here's a rundown of the info we are gathering now:

- Hardware uuid using HAL
- architecture
- CPU info:
    - number of cores
    - processor
    - core id
    - cpu cores
    - vendor id
    - model
    - cpu family
    - cpuid level
    - cpu MHz
    - cache size
    - cpu flags

- Network interfaces:
    - interface name
    - MAC
    - ip address
    - netmask
    - broadcast
    - bandwidth (speed - 100baseT full/half etc.)

- Memory size

Things gathered by libvirt hardware enumeration:

The in-development Libvirt API is currently using HAL to enumerate
devices.  This gives us information on processor, storage, network
interfaces etc. but does not include the IP address configuration of a
network interface, nor the speed capabilities. 

Otherwise we have:

- Kerberos key download.  This will remain a separate step.
- Various statistics pushed via collectd.  This can remain in place, but I
  think we should consider pushing the load avg (or maybe cpu usage?  I know
  there are some graphing issues with load) which would eliminate the need for
  host-collect.rb.
- Network configuration.
- Shutdown/reboot.
- Beeps and flashes to identify machine and nics.

So the attached API deals with all the network configuration, IP address
information etc. as well as the various other functions we want to see
supported beyond what libvirt provides for us.

On the network API, I wasn't entirely positive I should take this approach
or if I should create another Bonding class that bonds networkInterfaces.  In
the end I chose this model as it essentially mirrors what the configuration
is doing.  I can easily be convinced to do the other though.. or even to just
mock it up and see how it looks.

From the python qpid client, you would setup the network something like this:

s = Session()
b = s.addBroker()
onode = s.getObjects(name="ovirtNode", uuid=someuuid)

# So this call would return a networkInterface class but would be configured
# for bonding.  This is the part I'm 50/50 on.  I could create a separate
# Bonding class.
bond = onode.createBondingInterface("bond0")
# It should basically be setup to be right on creation..
bond.dhcp = true
bond.restart()

nics = s.getObjects(name="networkInterface", ovirtNode=onode)
for nic in nics:
  nic.master="bond0"
  nic.restart()

# For fun..
onode.beeping = true
nic[0].blinking = true

The objects will also be created from the configuration on the node
if it had persistent storage and came up configured.

    Ian


-------------- next part --------------
A non-text attachment was scrubbed...
Name: ovirt-node-2008-10-08.xml
Type: application/xml
Size: 1879 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081008/9546a83d/attachment.wsdl>

From pmyers at redhat.com  Thu Oct  9 04:28:06 2008
From: pmyers at redhat.com (Perry N. Myers)
Date: Thu, 09 Oct 2008 00:28:06 -0400
Subject: [Ovirt-devel] [PATCH node] ovirt-node-selinux: new sub-module,
	for conforming SELinux policy
In-Reply-To: <87zlle3hv0.fsf@rho.meyering.net>
References: <87zlle3hv0.fsf@rho.meyering.net>
Message-ID: <48ED8856.5010102@redhat.com>

Jim Meyering wrote:
> ovirt-node needs SELinux policy to allow qemu to access the iSCSI block
> devices. This is done presently via a script during install, but it
> should be done by a subpackage of ovirt-node called ovirt-node-selinux.
> Follow the Fedora guidelines for this located at:
> http://fedoraproject.org/wiki/PackagingDrafts/SELinux/PolicyModules
> 
> * Makefile.am (EXTRA_DIST): Add ovirt-node-selinux.te.
> * ovirt-node-selinux.te: New file, with contents from...
> * ovirt-listen-awake/ovirt-install-node: ...here.  Remove policy
> definition and semodule-running code.
> * ovirt-node.spec.in: Update per the above wiki URL.

This seems to work for me.  I'm able to successfully boot a VM using iSCSI 
storage and SELinux isn't blocking access to the storage with this policy 
applied.

However...  I see other errors in dmesg that are SELinux related.  This 
might bear looking into:

> type=1400 audit(1223526055.374:4): avc:  denied  { read } for  pid=2592 comm="mount" name="tmp.mhdXsnaPjX" dev=dm-0 ino=7101 scontext=system_u:system_r:mount_t:s0 tcontext=system_u:object_r:initrc_tmp_t:s0 tclass=dir
> type=1400 audit(1223526055.374:5): avc:  denied  { read } for  pid=2592 comm="mount" name="tmp.mhdXsnaPjX" dev=dm-0 ino=7101 scontext=system_u:system_r:mount_t:s0 tcontext=system_u:object_r:initrc_tmp_t:s0 tclass=dir
> Not cloning cgroup for unused subsystem ns
> SELinux: initialized (dev proc, type proc), uses genfs_contexts
> scsi6 : iSCSI Initiator over TCP/IP
> scsi 6:0:0:0: RAID              IET      Controller       0001 PQ: 0 ANSI: 5
> scsi 6:0:0:0: Attached scsi generic sg2 type 12
> scsi 6:0:0:1: Direct-Access     IET      VIRTUAL-DISK     0001 PQ: 0 ANSI: 5
> sd 6:0:0:1: [sdb] 6291456 512-byte hardware sectors (3221 MB)
> sd 6:0:0:1: [sdb] Write Protect is off
> sd 6:0:0:1: [sdb] Mode Sense: 79 00 00 08
> sd 6:0:0:1: [sdb] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
> sd 6:0:0:1: [sdb] 6291456 512-byte hardware sectors (3221 MB)
> sd 6:0:0:1: [sdb] Write Protect is off
> sd 6:0:0:1: [sdb] Mode Sense: 79 00 00 08
> sd 6:0:0:1: [sdb] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
>  sdb: unknown partition table
> type=1400 audit(1223526138.070:6): avc:  denied  { search } for  pid=2732 comm="iscsid" name="bdi" dev=debugfs ino=6 scontext=system_u:system_r:iscsid_t:s0 tcontext=system_u:object_r:debugfs_t:s0 tclass=dir
> type=1400 audit(1223526138.070:7): avc:  denied  { search } for  pid=2732 comm="iscsid" name="/" dev=debugfs ino=1 scontext=system_u:system_r:iscsid_t:s0 tcontext=system_u:object_r:debugfs_t:s0 tclass=dir
> sd 6:0:0:1: [sdb] Attached SCSI disk
> sd 6:0:0:1: Attached scsi generic sg3 type 0
> scsi 6:0:0:2: Direct-Access     IET      VIRTUAL-DISK     0001 PQ: 0 ANSI: 5
> sd 6:0:0:2: [sdc] 6291456 512-byte hardware sectors (3221 MB)
> sd 6:0:0:2: [sdc] Write Protect is off
> sd 6:0:0:2: [sdc] Mode Sense: 79 00 00 08
> sd 6:0:0:2: [sdc] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
> sd 6:0:0:2: [sdc] 6291456 512-byte hardware sectors (3221 MB)
> sd 6:0:0:2: [sdc] Write Protect is off
> sd 6:0:0:2: [sdc] Mode Sense: 79 00 00 08
> sd 6:0:0:2: [sdc] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
>  sdc: unknown partition table
> type=1400 audit(1223526138.084:8): avc:  denied  { search } for  pid=2732 comm="iscsid" name="bdi" dev=debugfs ino=6 scontext=system_u:system_r:iscsid_t:s0 tcontext=system_u:object_r:debugfs_t:s0 tclass=dir
> type=1400 audit(1223526138.084:9): avc:  denied  { search } for  pid=2732 comm="iscsid" name="/" dev=debugfs ino=1 scontext=system_u:system_r:iscsid_t:s0 tcontext=system_u:object_r:debugfs_t:s0 tclass=dir
> sd 6:0:0:2: [sdc] Attached SCSI disk
> sd 6:0:0:2: Attached scsi generic sg4 type 0
> scsi 6:0:0:3: Direct-Access     IET      VIRTUAL-DISK     0001 PQ: 0 ANSI: 5
> sd 6:0:0:3: [sdd] 6291456 512-byte hardware sectors (3221 MB)
> sd 6:0:0:3: [sdd] Write Protect is off
> sd 6:0:0:3: [sdd] Mode Sense: 79 00 00 08
> sd 6:0:0:3: [sdd] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
> sd 6:0:0:3: [sdd] 6291456 512-byte hardware sectors (3221 MB)
> sd 6:0:0:3: [sdd] Write Protect is off
> sd 6:0:0:3: [sdd] Mode Sense: 79 00 00 08
> sd 6:0:0:3: [sdd] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
>  sdd: unknown partition table
> type=1400 audit(1223526138.098:10): avc:  denied  { search } for  pid=2732 comm="iscsid" name="bdi" dev=debugfs ino=6 scontext=system_u:system_r:iscsid_t:s0 tcontext=system_u:object_r:debugfs_t:s0 tclass=dir
> type=1400 audit(1223526138.098:11): avc:  denied  { search } for  pid=2732 comm="iscsid" name="/" dev=debugfs ino=1 scontext=system_u:system_r:iscsid_t:s0 tcontext=system_u:object_r:debugfs_t:s0 tclass=dir
> sd 6:0:0:3: [sdd] Attached SCSI disk
> sd 6:0:0:3: Attached scsi generic sg5 type 0
> sd 6:0:0:1: [sdb] 6291456 512-byte hardware sectors (3221 MB)
> sd 6:0:0:1: [sdb] Write Protect is off
> sd 6:0:0:1: [sdb] Mode Sense: 79 00 00 08
> sd 6:0:0:1: [sdb] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
> sd 6:0:0:2: [sdc] 6291456 512-byte hardware sectors (3221 MB)
> sd 6:0:0:2: [sdc] Write Protect is off
> sd 6:0:0:2: [sdc] Mode Sense: 79 00 00 08
> sd 6:0:0:2: [sdc] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
> sd 6:0:0:3: [sdd] 6291456 512-byte hardware sectors (3221 MB)
> sd 6:0:0:3: [sdd] Write Protect is off
> sd 6:0:0:3: [sdd] Mode Sense: 79 00 00 08
> sd 6:0:0:3: [sdd] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
> sd 6:0:0:1: [sdb] Synchronizing SCSI cache
> sd 6:0:0:2: [sdc] Synchronizing SCSI cache
> sd 6:0:0:3: [sdd] Synchronizing SCSI cache
> scsi7 : iSCSI Initiator over TCP/IP
> scsi 7:0:0:0: RAID              IET      Controller       0001 PQ: 0 ANSI: 5
> scsi 7:0:0:0: Attached scsi generic sg2 type 12
> scsi 7:0:0:1: Direct-Access     IET      VIRTUAL-DISK     0001 PQ: 0 ANSI: 5
> sd 7:0:0:1: [sdb] 6291456 512-byte hardware sectors (3221 MB)
> sd 7:0:0:1: [sdb] Write Protect is off
> sd 7:0:0:1: [sdb] Mode Sense: 79 00 00 08
> sd 7:0:0:1: [sdb] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
> sd 7:0:0:1: [sdb] 6291456 512-byte hardware sectors (3221 MB)
> sd 7:0:0:1: [sdb] Write Protect is off
> sd 7:0:0:1: [sdb] Mode Sense: 79 00 00 08
> sd 7:0:0:1: [sdb] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
>  sdb: unknown partition table
> type=1400 audit(1223526199.621:12): avc:  denied  { search } for  pid=2852 comm="iscsid" name="bdi" dev=debugfs ino=6 scontext=system_u:system_r:iscsid_t:s0 tcontext=system_u:object_r:debugfs_t:s0 tclass=dir
> type=1400 audit(1223526199.621:13): avc:  denied  { search } for  pid=2852 comm="iscsid" name="/" dev=debugfs ino=1 scontext=system_u:system_r:iscsid_t:s0 tcontext=system_u:object_r:debugfs_t:s0 tclass=dir
> sd 7:0:0:1: [sdb] Attached SCSI disk
> sd 7:0:0:1: Attached scsi generic sg3 type 0
> scsi 7:0:0:2: Direct-Access     IET      VIRTUAL-DISK     0001 PQ: 0 ANSI: 5
> sd 7:0:0:2: [sdc] 6291456 512-byte hardware sectors (3221 MB)
> sd 7:0:0:2: [sdc] Write Protect is off
> sd 7:0:0:2: [sdc] Mode Sense: 79 00 00 08
> sd 7:0:0:2: [sdc] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
> sd 7:0:0:2: [sdc] 6291456 512-byte hardware sectors (3221 MB)
> sd 7:0:0:2: [sdc] Write Protect is off
> sd 7:0:0:2: [sdc] Mode Sense: 79 00 00 08
> sd 7:0:0:2: [sdc] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
>  sdc: unknown partition table
> type=1400 audit(1223526199.636:14): avc:  denied  { search } for  pid=2852 comm="iscsid" name="bdi" dev=debugfs ino=6 scontext=system_u:system_r:iscsid_t:s0 tcontext=system_u:object_r:debugfs_t:s0 tclass=dir
> type=1400 audit(1223526199.636:15): avc:  denied  { search } for  pid=2852 comm="iscsid" name="/" dev=debugfs ino=1 scontext=system_u:system_r:iscsid_t:s0 tcontext=system_u:object_r:debugfs_t:s0 tclass=dir
> sd 7:0:0:2: [sdc] Attached SCSI disk
> sd 7:0:0:2: Attached scsi generic sg4 type 0
> scsi 7:0:0:3: Direct-Access     IET      VIRTUAL-DISK     0001 PQ: 0 ANSI: 5
> sd 7:0:0:3: [sdd] 6291456 512-byte hardware sectors (3221 MB)
> sd 7:0:0:3: [sdd] Write Protect is off
> sd 7:0:0:3: [sdd] Mode Sense: 79 00 00 08
> sd 7:0:0:3: [sdd] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
> sd 7:0:0:3: [sdd] 6291456 512-byte hardware sectors (3221 MB)
> sd 7:0:0:3: [sdd] Write Protect is off
> sd 7:0:0:3: [sdd] Mode Sense: 79 00 00 08
> sd 7:0:0:3: [sdd] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
>  sdd: unknown partition table
> type=1400 audit(1223526199.649:16): avc:  denied  { search } for  pid=2852 comm="iscsid" name="bdi" dev=debugfs ino=6 scontext=system_u:system_r:iscsid_t:s0 tcontext=system_u:object_r:debugfs_t:s0 tclass=dir
> type=1400 audit(1223526199.649:17): avc:  denied  { search } for  pid=2852 comm="iscsid" name="/" dev=debugfs ino=1 scontext=system_u:system_r:iscsid_t:s0 tcontext=system_u:object_r:debugfs_t:s0 tclass=dir
> sd 7:0:0:3: [sdd] Attached SCSI disk
> sd 7:0:0:3: Attached scsi generic sg5 type 0
> sd 7:0:0:1: [sdb] 6291456 512-byte hardware sectors (3221 MB)
> sd 7:0:0:1: [sdb] Write Protect is off
> sd 7:0:0:1: [sdb] Mode Sense: 79 00 00 08
> sd 7:0:0:1: [sdb] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
> sd 7:0:0:2: [sdc] 6291456 512-byte hardware sectors (3221 MB)
> sd 7:0:0:2: [sdc] Write Protect is off
> sd 7:0:0:2: [sdc] Mode Sense: 79 00 00 08
> sd 7:0:0:2: [sdc] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
> sd 7:0:0:3: [sdd] 6291456 512-byte hardware sectors (3221 MB)
> sd 7:0:0:3: [sdd] Write Protect is off
> sd 7:0:0:3: [sdd] Mode Sense: 79 00 00 08
> sd 7:0:0:3: [sdd] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
> tun: Universal TUN/TAP device driver, 1.6
> tun: (C) 1999-2004 Max Krasnyansky <maxk at qualcomm.com>
> device vnet0 entered promiscuous mode
> ovirtbr0: port 2(vnet0) entering learning state
> ovirtbr0: topology change detected, propagating
> ovirtbr0: port 2(vnet0) entering forwarding state
> vnet0: no IPv6 routers present
> kvm: emulating exchange as write
> [root at node123 ~]# df
> Filesystem           1K-blocks      Used Available Use% Mounted on
> /dev/mapper/live-rw     554336    199904    348824  37% /
> tmpfs                  1880100         0   1880100   0% /dev/shm
> [root at node123 ~]# virsh pool-list
> Name                 State      Autostart 
> -----------------------------------------
> NXk142Ob3yPtJwHp     active     no        
> 
> [root at node123 ~]# virsh pool-dumpxml
> error: command 'pool-dumpxml' requires <pool> option
> [root at node123 ~]# virsh pool-dumpxml NXk142Ob3yPtJwHp
> <pool type='iscsi'>
>   <name>NXk142Ob3yPtJwHp</name>
>   <uuid>2d075063-164a-e19d-de69-a142eac7b009</uuid>
>   <capacity>9663676416</capacity>
>   <allocation>9663676416</allocation>
>   <available>0</available>
>   <source>
>     <host name='192.168.50.2'/>
>     <device path='ovirtpriv:storage'>
>     </device>
>   </source>
>   <target>
>     <path>/dev/disk/by-id</path>
>     <permissions>
>       <mode>0700</mode>
>       <owner>0</owner>
>       <group>0</group>
>     </permissions>
>   </target>
> </pool>

Perry



From jim at meyering.net  Thu Oct  9 06:20:56 2008
From: jim at meyering.net (Jim Meyering)
Date: Thu, 09 Oct 2008 08:20:56 +0200
Subject: [Ovirt-devel] image minimizer in ovirt-node-image kickstart
In-Reply-To: <48ED83DA.7060501@redhat.com> (Perry N. Myers's message of "Thu, 
	09 Oct 2008 00:08:58 -0400")
References: <48ED83DA.7060501@redhat.com>
Message-ID: <87d4ia2ss7.fsf@rho.meyering.net>

"Perry N. Myers" <pmyers at redhat.com> wrote:
> Noticed that there is a new section in the common-post.ks in
> ovirt-node-image using something call Image Minimizer.  I assume this
> is the whitelist/blacklist solution that the AOS team has been working
> on?
>
> Some of the output from that is suspect...  Here's what I'm seeing:
>
>> Running image-minimizer...
>> Unknown Command: touch
>> e2fsck 1.41.0 (10-Jul-2008)
>> Pass 1: Checking inodes, blocks, and sizes
>> Pass 2: Checking directory structure
>> Pass 3: Checking directory connectivity
>> Pass 4: Checking reference counts
>> Pass 5: Checking group summary information
>> ovirt-node-image: 3724/35200 files (1.1% non-contiguous), 52460/140800 blocks
>> e2fsck 1.41.0 (10-Jul-2008)
>> Pass 1: Checking inodes, blocks, and sizes
>> Pass 2: Checking directory structure
>> Pass 3: Checking directory connectivity
>> Pass 4: Checking reference counts
>> Pass 5: Checking group summary information
>> Directories count wrong for group #0 (441, counted=241).
>> Fix? yes
>>
>>
>> ovirt-node-image: ***** FILE SYSTEM WAS MODIFIED *****
>> ovirt-node-image: 3724/14080 files (2.1% non-contiguous), 51098/51098 blocks

I've seen that fsck-detected failure regularly, in the last couple days.
I presume you're building on a system with at least 2 cores, right?
I seem to recall that one fs-related phase was parallelized, so took
advantage of all cores on a multi-core system, so maybe there's a race.

> Don't know if the resulting fsck is caused by the image minimizer or
> not, but if someone else can replicate what I'm seeing here we need to
> look into this.
>
> Also, the "Unknown command: touch" seems to be coming from the image
> minimizer as well.

I proposed a work-around, then Alan proposed a better patch for that,
but it was not possible to ACK with "works for me" yesterday,
due to the early-boot problem you've just fixed.



From apevec at redhat.com  Thu Oct  9 06:22:16 2008
From: apevec at redhat.com (Alan Pevec)
Date: Thu, 09 Oct 2008 08:22:16 +0200
Subject: [Ovirt-devel] image minimizer in ovirt-node-image kickstart
In-Reply-To: <48ED83DA.7060501@redhat.com>
References: <48ED83DA.7060501@redhat.com>
Message-ID: <48EDA318.5010400@redhat.com>

Perry N. Myers wrote:
> Noticed that there is a new section in the common-post.ks in 
> ovirt-node-image using something call Image Minimizer.  I assume this is 
> the whitelist/blacklist solution that the AOS team has been working on?

yes, it's in appliance-tools-002-3

 
> Some of the output from that is suspect...  Here's what I'm seeing:
> 
>> Running image-minimizer...
>> Unknown Command: touch

yeah, Jim noticed that, [PATCH ovirt-node-image] move blacklisting into	separate kickstart include should fix that

> Don't know if the resulting fsck is caused by the image minimizer or 
> not, but if someone else can replicate what I'm seeing here we need to 
> look into this.

does fsck happen if you apply above patch?



From berrange at redhat.com  Thu Oct  9 09:02:28 2008
From: berrange at redhat.com (Daniel P. Berrange)
Date: Thu, 9 Oct 2008 10:02:28 +0100
Subject: [Ovirt-devel] Ovirt-qpid API
In-Reply-To: <20081008211933.089ac7a8@tp.mains.net>
References: <20081008211933.089ac7a8@tp.mains.net>
Message-ID: <20081009090228.GE26108@redhat.com>

On Wed, Oct 08, 2008 at 09:19:33PM -0700, Ian Main wrote:
> 
> So I've been doing some work on this API.  It looks like libvirt hardware enumeration is coming along reasonably, so I'm not going to cover all that in this API.  Instead we'll get a version of libvirt built in a few weeks with hardware enumeration and update libvirt-qpid to support that.
> 
> As always, please take a look and see if I forgot anything or such.
> 
> Here's a rundown of the info we are gathering now:
> 
> - Hardware uuid using HAL
> - architecture

Available in libvirt

> - CPU info:
>     - number of cores
>     - processor
>     - core id
>     - cpu cores
>     - vendor id
>     - model
>     - cpu family
>     - cpuid level
>     - cpu MHz
>     - cache size
>     - cpu flags

All this needs to come from libvirt if you want it to work
with Xen ever, because Dom0 doesn't see true details

> - Network interfaces:
>     - interface name
>     - MAC
>     - ip address
>     - netmask
>     - broadcast
>     - bandwidth (speed - 100baseT full/half etc.)

This needs to take account of IPv6 addressing - US gov mandates
use of IPv6 in all applications now. So need to separate the
physical device info, from the addressing info - there can be
multiple IPv4 and multiple IPv6 addresses ultimately, even if
oVirt will only use a single address for now.

> - Memory size

Available in libvirt & against must use libvirt if its to work
with Xen because Dom0 doesn't see true memory info.

> Otherwise we have:
> 
> - Kerberos key download.  This will remain a separate step.

Agreed, this is part of the security credentials bootstrap stage.

> - Various statistics pushed via collectd.  This can remain in place, but I
>   think we should consider pushing the load avg (or maybe cpu usage?  I know
>   there are some graphing issues with load) which would eliminate the need for
>   host-collect.rb.

I had thought we were going to push all collectd info over AMQP 
so we only had two network protocols in/out of the node - AMQP and
a per-guest VNC connection ?

> - Network configuration.
> - Shutdown/reboot.

VirtualIron guys have requested this as part of libvirt a few weeks back
and we had a bit of discussion but never came to any conclusion. I'm 
inclined to think they're probably right :-)

> - Beeps and flashes to identify machine and nics.

Interesting, not heard of this requirement before. Guess until we
have NIC mgmt in the libvirt API, this can go in the oVirt NIC
mgmt schema you mention above.

> So the attached API deals with all the network configuration, IP address
> information etc. as well as the various other functions we want to see
> supported beyond what libvirt provides for us.
> 
> On the network API, I wasn't entirely positive I should take this approach
> or if I should create another Bonding class that bonds networkInterfaces.  In
> the end I chose this model as it essentially mirrors what the configuration
> is doing.  I can easily be convinced to do the other though.. or even to just
> mock it up and see how it looks.

Depends how flexible / advanced you want to get. Long term bonding isn't
the only thing people will want to setup. There's bridging, and vlans
too.

 - A bond device can contain n * physical NICs
 - Multiple VLAN devices can be created against each bond device,
   or physical NIC
 - Each VLAN, bond or physical device can be added to a bridge

So you can have a stacking of device, from lowest to highest level:

 - Physical device
 - Bond devices
 - VLAN devices
 - Bridges

The bond, vlan, bridge layers can each be omitted depending on needs.

> <schema package="com.redhat.ovirtNode">
> 
>   <class name="ovirtNode">
> 
>     <property name="uuid" type="sstr" access="RC" desc="hostname UUID as gathered from HAL."/>
>     <property name="hostname" type="sstr" access="RC" desc="host name"/>
> 
>     <method name="hardwareShutdown" desc="Bring down host and halt machine."/>
>     <method name="hardwareRestart" desc="Bring down host and restart."/>
>     
>     <property name="beeping" type="bool" desc="true/false to invoke beeping of machine (for identifying system)"/>
> 
>     <method name="createBondingInterface"/>
>       <arg name="interfaceName" dir="I" type="sstr" desc="Name of new interface"/>
>       <arg name="interface" dir="O" type="objId" desc="New bonding interface"/>
>     </method>
>   </class>
> 
>   <class name="networkInterface">
>     <property name="ovirtNode" type="objId" references="ovirtNode" access="RC" index="y" parentRef="y" desc="Keep track of hardware node these interfaces belong to."/>
>     <property name="interfaceName" type="sstr" access="RC" desc="Network interface name."/>
>     <property name="dhcp" type="bool" desc="true/false - use DHCP for interface.  If false properties will be saved and restored for static IP."/>
>     <property name="speed" type="uint32" desc="link speed."/>
>     <property name="mac" type="uint64" desc="MAC address."/>
>     <property name="ip" type="sstr" desc="IP address."/>
>     <property name="netmask" type="sstr" desc="Netmask."/>
>     <property name="broadcast" type="sstr" desc="Broadcast."/>
>     <property name="master" type="sstr" desc="Master device interface name for bonding.  If set this interface becomes a slave."/>
>     <property name="blink" type="bool" desc="True/false to invoke blinking of ethernet light (for identifying interface)"/>
>     
>     <method name="restart" desc="Restart the interface to allow changes to properties to take effect."/>
>   </class>

You need to model address information separately from the device info.
Each network Interface can have n * IPv4 addresses & m * IPv6 addrs.

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 slinabery at redhat.com  Thu Oct  9 10:16:15 2008
From: slinabery at redhat.com (Steve Linabery)
Date: Thu, 9 Oct 2008 05:16:15 -0500
Subject: [Ovirt-devel] [PATCH server] Add a rudimentary flash chart written
	in flex framework to summary pages.
Message-ID: <20081009101614.GA10125@redhat.com>

First stab at showing real rrd data in flash chart (in this case, memory peak use for last 40 samples of rrd data). Note that to test this, you'll need to get the open flex sdk and compile src/flexchart/flexchart.mxml yourself.

Enjoy,
Steve
-------------- next part --------------
>From ce87700f1570ce6146f9cdc87062a079f0192b3c Mon Sep 17 00:00:00 2001
From: Steve Linabery <slinabery at redhat.com>
Date: Thu, 9 Oct 2008 05:10:02 -0500
Subject: [PATCH server] Add a rudimentary flash chart written in flex framework to summary pages.

---
 src/app/controllers/graph_controller.rb            |   30 +-
 src/app/views/graph/flexchart_data.rhtml           |    1 +
 src/app/views/graph/history_graphs.rhtml           |   87 +---
 src/config/routes.rb                               |    1 +
 src/flexchart/README.txt                           |    8 +
 src/flexchart/com/adobe/serialization/json/JSON.as |   85 +++
 .../com/adobe/serialization/json/JSONDecoder.as    |  221 ++++++++
 .../com/adobe/serialization/json/JSONEncoder.as    |  299 +++++++++++
 .../com/adobe/serialization/json/JSONParseError.as |   87 +++
 .../com/adobe/serialization/json/JSONToken.as      |  104 ++++
 .../com/adobe/serialization/json/JSONTokenType.as  |   67 +++
 .../com/adobe/serialization/json/JSONTokenizer.as  |  547 ++++++++++++++++++++
 src/flexchart/flexchart.mxml                       |   20 +
 src/flexchart/org/ovirt/ChartLoader.as             |   44 ++
 src/flexchart/org/ovirt/DataSeries.as              |   22 +
 src/flexchart/org/ovirt/DataSource.as              |   37 ++
 src/public/javascripts/jquery.flash.js             |  288 ++++++++++
 17 files changed, 1870 insertions(+), 78 deletions(-)
 create mode 100644 src/app/views/graph/flexchart_data.rhtml
 create mode 100644 src/flexchart/README.txt
 create mode 100644 src/flexchart/com/adobe/serialization/json/JSON.as
 create mode 100644 src/flexchart/com/adobe/serialization/json/JSONDecoder.as
 create mode 100644 src/flexchart/com/adobe/serialization/json/JSONEncoder.as
 create mode 100644 src/flexchart/com/adobe/serialization/json/JSONParseError.as
 create mode 100644 src/flexchart/com/adobe/serialization/json/JSONToken.as
 create mode 100644 src/flexchart/com/adobe/serialization/json/JSONTokenType.as
 create mode 100644 src/flexchart/com/adobe/serialization/json/JSONTokenizer.as
 create mode 100644 src/flexchart/flexchart.mxml
 create mode 100644 src/flexchart/org/ovirt/ChartLoader.as
 create mode 100644 src/flexchart/org/ovirt/DataSeries.as
 create mode 100644 src/flexchart/org/ovirt/DataSource.as
 create mode 100644 src/public/javascripts/jquery.flash.js

diff --git a/src/app/controllers/graph_controller.rb b/src/app/controllers/graph_controller.rb
index dbe2afc..6450935 100644
--- a/src/app/controllers/graph_controller.rb
+++ b/src/app/controllers/graph_controller.rb
@@ -3,7 +3,24 @@ require 'util/stats/Stats'
 class GraphController < ApplicationController
   layout nil
 
-  # generate layout for avaialability bar graphs
+  def flexchart_data
+
+    #FIXME: use the stats package aggregation (when it's available)
+    #instead of the old method
+    graph_obj = history_graph_data_object
+
+    #FIXME: for this release, the flexchart shows only peak values,
+    #       and only shows a default of the last 40 data points in rrd.
+    graph_data = { :labels => graph_obj[:timepoints].last(40),
+                   :values => graph_obj[:dataset][2][:values].last(40) }
+    my_data = graph_data[:labels].zip(graph_data[:values])
+    @graph = { :vectors => my_data,
+               :max_value => graph_obj[:total_peak]
+             }
+  end
+
+
+  # generate layout for availability bar graphs
   def availability_graph
     @id = params[:id]
     @target = params[:target]
@@ -67,6 +84,10 @@ class GraphController < ApplicationController
 
   # retrieves data for history graphs
   def history_graph_data
+    render :json => history_graph_data_object
+  end
+
+  def history_graph_data_object
     history_graphs
     myDays = params[:days]
     target = params[:target]
@@ -212,9 +233,10 @@ class GraphController < ApplicationController
                 :stroke => @avg_history[:color],
                 :strokeWidth => 1
             }
-       ]
+       ],
+       :total_peak => total_peak
     }
-    render :json => graph_object
+
   end
 
 
@@ -261,7 +283,7 @@ class GraphController < ApplicationController
             }
        ]
     }
-    render :json => graph_object
+
 
   end
   
diff --git a/src/app/views/graph/flexchart_data.rhtml b/src/app/views/graph/flexchart_data.rhtml
new file mode 100644
index 0000000..a79ce06
--- /dev/null
+++ b/src/app/views/graph/flexchart_data.rhtml
@@ -0,0 +1 @@
+<%= @graph.to_json %>
diff --git a/src/app/views/graph/history_graphs.rhtml b/src/app/views/graph/history_graphs.rhtml
index 2b6874f..f372e4b 100644
--- a/src/app/views/graph/history_graphs.rhtml
+++ b/src/app/views/graph/history_graphs.rhtml
@@ -1,76 +1,15 @@
+<%= javascript_include_tag "jquery.flash.js" %>
+<div id="the-div-name"></div>
 <script type="text/javascript">
-
-var graph = "load_history";
-var days  = "7";
-
-function swap_history_graph(newgraph, newdays){
-    if(newgraph == null) newgraph = graph
-    if(newdays == null) newdays = days
-    $('.history_graph').hide(); 
-    $('#' + newgraph + "_" + newdays).parent().show();
-    eval("draw_" + newgraph + "_" + newdays + "_graph_get_data()");
-}
-function swap_history_graph_target(title, newgraph){
-    swap_history_graph(newgraph, null);
-    $('#history_graph_selection').html(title + '&nbsp;&nbsp;<%= image_tag 'icon_menu_arrow.gif' %>');
-    graph = newgraph
-}
-function swap_history_graph_time(title, newdays){
-    swap_history_graph(null, newdays);
-    $('#history_graph_time_selection').html(title + '&nbsp;&nbsp;<%= image_tag 'icon_menu_arrow.gif' %>');
-    days = newdays
-}
-
-</script>
-
-<%= render :partial => '/layouts/graph', :locals => { :drawMe => false,  :includeDiv => false, :methodName=> 'draw_cpu_history_1_graph',     :div_id => 'cpu_history_1',     :chartType => 'line', :yGridLines => 'lightgrey', :xGridLines => 'lightgrey', :ticksX => 20,  :scaleX => 173,   :ticksY => 10, :scaleY => 110,  :url => (url_for :escape => false, :controller => 'graph', :action => 'history_graph_data', :id => @id, :params => { :target => 'cpu',    :poolType => @poolType, :days => 1   } ) } %>
-<%= render :partial => '/layouts/graph', :locals => { :drawMe => false,  :includeDiv => false, :methodName=> 'draw_cpu_history_7_graph',     :div_id => 'cpu_history_7',     :chartType => 'line', :yGridLines => 'lightgrey', :xGridLines => 'lightgrey', :ticksX => 39, :scaleX => 272,  :ticksY => 10, :scaleY => 110,  :url => (url_for :escape => false, :controller => 'graph', :action => 'history_graph_data', :id => @id, :params => { :target => 'cpu',    :poolType => @poolType, :days => 7   } ) } %>
-<%= render :partial => '/layouts/graph', :locals => { :drawMe => false,  :includeDiv => false, :methodName=> 'draw_cpu_history_30_graph',    :div_id => 'cpu_history_30',    :chartType => 'line', :yGridLines => 'lightgrey', :xGridLines => 'lightgrey', :ticksX => 120,  :scaleX => 1200,  :ticksY => 10, :scaleY => 110,  :url => (url_for :escape => false, :controller => 'graph', :action => 'history_graph_data', :id => @id, :params => { :target => 'cpu',    :poolType => @poolType, :days => 30  } ) } %>
-<%= render :partial => '/layouts/graph', :locals => { :drawMe => false,  :includeDiv => false, :methodName=> 'draw_memory_history_1_graph',  :div_id => 'memory_history_1',  :chartType => 'line', :yGridLines => 'lightgrey', :xGridLines => 'lightgrey', :ticksX => 20,  :scaleX => 173,   :ticksY => 50, :scaleY => 756,  :url => (url_for :escape => false, :controller => 'graph', :action => 'history_graph_data', :id => @id, :params => { :target => 'memory', :poolType => @poolType, :days => 1   } ) } %>
-<%= render :partial => '/layouts/graph', :locals => { :drawMe => false,  :includeDiv => false, :methodName=> 'draw_memory_history_7_graph',  :div_id => 'memory_history_7',  :chartType => 'line', :yGridLines => 'lightgrey', :xGridLines => 'lightgrey', :ticksX => 39, :scaleX => 272,  :ticksY => 50, :scaleY => 756,  :url => (url_for :escape => false, :controller => 'graph', :action => 'history_graph_data', :id => @id, :params => { :target => 'memory', :poolType => @poolType, :days => 7   } ) } %>
-<%= render :partial => '/layouts/graph', :locals => { :drawMe => false,  :includeDiv => false, :methodName=> 'draw_memory_history_30_graph', :div_id => 'memory_history_30', :chartType => 'line', :yGridLines => 'lightgrey', :xGridLines => 'lightgrey', :ticksX => 120,  :scaleX => 1162,  :ticksY => 50, :scaleY => 756,  :url => (url_for :escape => false, :controller => 'graph', :action => 'history_graph_data', :id => @id, :params => { :target => 'memory', :poolType => @poolType, :days => 30  } ) } %>
-<%= render :partial => '/layouts/graph', :locals => { :drawMe => false,  :includeDiv => false, :methodName=> 'draw_load_history_1_graph',    :div_id => 'load_history_1',    :chartType => 'line', :yGridLines => 'lightgrey', :xGridLines => 'lightgrey', :ticksX => 20,  :scaleX => 173,   :ticksY => 2,  :scaleY => 23,   :url => (url_for :escape => false, :controller => 'graph', :action => 'history_graph_data', :id => @id, :params => { :target => 'load',   :poolType => @poolType, :days => 1   } ) } %>
-<%= render :partial => '/layouts/graph', :locals => { :drawMe => false,  :includeDiv => false, :methodName=> 'draw_load_history_7_graph',    :div_id => 'load_history_7',    :chartType => 'line', :yGridLines => 'lightgrey', :xGridLines => 'lightgrey', :ticksX => 39, :scaleX => 272,  :ticksY => 2,  :scaleY => 23,   :url => (url_for :escape => false, :controller => 'graph', :action => 'history_graph_data', :id => @id, :params => { :target => 'load',   :poolType => @poolType, :days => 7   } ) } %>
-<%= render :partial => '/layouts/graph', :locals => { :drawMe => false,  :includeDiv => false, :methodName=> 'draw_load_history_30_graph',   :div_id => 'load_history_30',   :chartType => 'line', :yGridLines => 'lightgrey', :xGridLines => 'lightgrey', :ticksX => 120,  :scaleX => 1200,  :ticksY => 2,  :scaleY => 23,   :url => (url_for :escape => false, :controller => 'graph', :action => 'history_graph_data', :id => @id, :params => { :target => 'load',   :poolType => @poolType, :days => 30  } ) } %>
-
-<div id="history_graphs">
-  <div id="history_graphs_control">
-   <div class="history_graphs_menu">
-      <ul>
-        <li><div id="history_graph_selection" class="history_graph_menu_header">Overall Load &nbsp;&nbsp;<%= image_tag 'icon_menu_arrow.gif' %></div></li>
-        <li class="history_graph_menu_item history_graph_menu_fitem"><a href="#" onclick="swap_history_graph_target('Overall Load', 'load_history')" >Overall Load</a></li>
-        <li class="history_graph_menu_item"><a href="#" onclick="swap_history_graph_target('CPU History', 'cpu_history');" >CPU History</a></li>
-        <li class="history_graph_menu_item history_graph_menu_litem"><a href="#" onclick="swap_history_graph_target('Memory History', 'memory_history');">Memory History</a></li>
-      </ul>
-   </div>
-   <div class="history_graphs_menu">
-      <ul>
-        <li><div id="history_graph_time_selection" class="history_graph_menu_header">Last 7 Days &nbsp;&nbsp;<%= image_tag 'icon_menu_arrow.gif' %></div></li>
-        <li class="history_graph_menu_item history_graph_menu_fitem"<a href="#" onclick="swap_history_graph_time('Last 24 Hours', '1')" >Last 24 Hours</a></li>
-        <li class="history_graph_menu_item"><a href="#" onclick="swap_history_graph_time('Last 7 days', '7')" >Last 7  Days</a></li>
-        <li class="history_graph_menu_item history_graph_menu_litem"><a href="#" onclick="swap_history_graph_time('Last 30 Days', '30')" >Last 30 Days</a></li>
-      </ul>
-   </div>
-   <div class="history_graphs_legend">
-       <font color="<%= @peak_history[:color]   %>">Peak &nbsp; &nbsp;</font>
-       <font color="<%= @avg_history[:color] %>">Average &nbsp; &nbsp;</font>
-       <font color="<%= @roll_peak_history[:color]   %>">Rolling Peak &nbsp; &nbsp;</font>
-       <font color="<%= @roll_avg_history[:color] %>">Rolling Average &nbsp; &nbsp;</font>
-   </div>
-  </div>
-  <div id="history_graphs_graphs">
-    <div class="history_graph"><div id="cpu_history_1">       </div></div>
-    <div class="history_graph"><div id="cpu_history_7">       </div></div>
-    <div class="history_graph"><div id="cpu_history_30">      </div></div>
-    <div class="history_graph"><div id="memory_history_1">    </div></div>
-    <div class="history_graph"><div id="memory_history_7">    </div></div>
-    <div class="history_graph"><div id="memory_history_30">   </div></div>
-    <div class="history_graph"><div id="load_history_1">      </div></div>
-    <div class="history_graph"><div id="load_history_7">      </div></div>
-    <div class="history_graph"><div id="load_history_30">     </div></div>
-  </div>
-</div>
-
-<script type="text/javascript">
-    swap_history_graph(null, null); // display 1st graph
+$(document).ready(function(){
+$('#the-div-name').flash(
+        {
+          src: '/ovirt/flexchart.swf',
+          width: 720,
+          height: 300,
+          flashvars: { flexchart_data: '/ovirt/graph/flexchart_data/<%= @id %>/memory/1' }
+        },
+        { version: 9 }
+    );
+});
 </script>
diff --git a/src/config/routes.rb b/src/config/routes.rb
index 6f8e481..8d538cb 100644
--- a/src/config/routes.rb
+++ b/src/config/routes.rb
@@ -41,6 +41,7 @@ ActionController::Routing::Routes.draw do |map|
   map.connect ':controller/service.wsdl', :action => 'wsdl'
 
   # Install the default route as the lowest priority.
+  map.connect 'graph/flexchart_data/:id/:target/:days', :controller => 'graph', :action => 'flexchart_data'
   map.connect ':controller/:action/:id.:format'
   map.connect ':controller/:action/:id'
 
diff --git a/src/flexchart/README.txt b/src/flexchart/README.txt
new file mode 100644
index 0000000..7402112
--- /dev/null
+++ b/src/flexchart/README.txt
@@ -0,0 +1,8 @@
+Until mxmlc gets packaged and this becomes part of autobuild, 
+you must obtain the open flex SDK to build the swf movie.
+
+Once you have mxmlc on your system, run:
+
+mxmlc flexchart.mxml
+
+in this directory, and copy the resulting file flexchart.swf to /usr/share/ovirt-server/public on your appliance.
diff --git a/src/flexchart/com/adobe/serialization/json/JSON.as b/src/flexchart/com/adobe/serialization/json/JSON.as
new file mode 100644
index 0000000..bfee6d9
--- /dev/null
+++ b/src/flexchart/com/adobe/serialization/json/JSON.as
@@ -0,0 +1,85 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.serialization.json {
+
+	/**
+	 * This class provides encoding and decoding of the JSON format.
+	 *
+	 * Example usage:
+	 * <code>
+	 * 		// create a JSON string from an internal object
+	 * 		JSON.encode( myObject );
+	 *
+	 *		// read a JSON string into an internal object
+	 *		var myObject:Object = JSON.decode( jsonString );
+	 *	</code>
+	 */
+	public class JSON {
+	
+	
+		/**
+		 * Encodes a object into a JSON string.
+		 *
+		 * @param o The object to create a JSON string for
+		 * @return the JSON string representing o
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public static function encode( o:Object ):String {
+			
+			var encoder:JSONEncoder = new JSONEncoder( o );
+			return encoder.getString();
+		
+		}
+		
+		/**
+		 * Decodes a JSON string into a native object.
+		 * 
+		 * @param s The JSON string representing the object
+		 * @return A native object as specified by s
+		 * @throw JSONParseError
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public static function decode( s:String ):* {
+			
+			var decoder:JSONDecoder = new JSONDecoder( s )
+			return decoder.getValue();
+			
+		}
+	
+	}
+
+}
\ No newline at end of file
diff --git a/src/flexchart/com/adobe/serialization/json/JSONDecoder.as b/src/flexchart/com/adobe/serialization/json/JSONDecoder.as
new file mode 100644
index 0000000..82ade19
--- /dev/null
+++ b/src/flexchart/com/adobe/serialization/json/JSONDecoder.as
@@ -0,0 +1,221 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.serialization.json {
+
+	public class JSONDecoder {
+		
+		/** The value that will get parsed from the JSON string */
+		private var value:*;
+		
+		/** The tokenizer designated to read the JSON string */
+		private var tokenizer:JSONTokenizer;
+		
+		/** The current token from the tokenizer */
+		private var token:JSONToken;
+		
+		/**
+		 * Constructs a new JSONDecoder to parse a JSON string 
+		 * into a native object.
+		 *
+		 * @param s The JSON string to be converted
+		 *		into a native object
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function JSONDecoder( s:String ) {
+			
+			tokenizer = new JSONTokenizer( s );
+			
+			nextToken();
+			value = parseValue();
+		}
+		
+		/**
+		 * Gets the internal object that was created by parsing
+		 * the JSON string passed to the constructor.
+		 *
+		 * @return The internal object representation of the JSON
+		 * 		string that was passed to the constructor
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function getValue():* {
+			return value;
+		}
+		
+		/**
+		 * Returns the next token from the tokenzier reading
+		 * the JSON string
+		 */
+		private function nextToken():JSONToken {
+			return token = tokenizer.getNextToken();
+		}
+		
+		/**
+		 * Attempt to parse an array
+		 */
+		private function parseArray():Array {
+			// create an array internally that we're going to attempt
+			// to parse from the tokenizer
+			var a:Array = new Array();
+			
+			// grab the next token from the tokenizer to move
+			// past the opening [
+			nextToken();
+			
+			// check to see if we have an empty array
+			if ( token.type == JSONTokenType.RIGHT_BRACKET ) {
+				// we're done reading the array, so return it
+				return a;
+			}
+			
+			// deal with elements of the array, and use an "infinite"
+			// loop because we could have any amount of elements
+			while ( true ) {
+				// read in the value and add it to the array
+				a.push ( parseValue() );
+			
+				// after the value there should be a ] or a ,
+				nextToken();
+				
+				if ( token.type == JSONTokenType.RIGHT_BRACKET ) {
+					// we're done reading the array, so return it
+					return a;
+				} else if ( token.type == JSONTokenType.COMMA ) {
+					// move past the comma and read another value
+					nextToken();
+				} else {
+					tokenizer.parseError( "Expecting ] or , but found " + token.value );
+				}
+			}
+            return null;
+		}
+		
+		/**
+		 * Attempt to parse an object
+		 */
+		private function parseObject():Object {
+			// create the object internally that we're going to
+			// attempt to parse from the tokenizer
+			var o:Object = new Object();
+						
+			// store the string part of an object member so
+			// that we can assign it a value in the object
+			var key:String
+			
+			// grab the next token from the tokenizer
+			nextToken();
+			
+			// check to see if we have an empty object
+			if ( token.type == JSONTokenType.RIGHT_BRACE ) {
+				// we're done reading the object, so return it
+				return o;
+			}
+			
+			// deal with members of the object, and use an "infinite"
+			// loop because we could have any amount of members
+			while ( true ) {
+			
+				if ( token.type == JSONTokenType.STRING ) {
+					// the string value we read is the key for the object
+					key = String( token.value );
+					
+					// move past the string to see what's next
+					nextToken();
+					
+					// after the string there should be a :
+					if ( token.type == JSONTokenType.COLON ) {
+						
+						// move past the : and read/assign a value for the key
+						nextToken();
+						o[key] = parseValue();	
+						
+						// move past the value to see what's next
+						nextToken();
+						
+						// after the value there's either a } or a ,
+						if ( token.type == JSONTokenType.RIGHT_BRACE ) {
+							// // we're done reading the object, so return it
+							return o;
+							
+						} else if ( token.type == JSONTokenType.COMMA ) {
+							// skip past the comma and read another member
+							nextToken();
+						} else {
+							tokenizer.parseError( "Expecting } or , but found " + token.value );
+						}
+					} else {
+						tokenizer.parseError( "Expecting : but found " + token.value );
+					}
+				} else {
+					tokenizer.parseError( "Expecting string but found " + token.value );
+				}
+			}
+            return null;
+		}
+		
+		/**
+		 * Attempt to parse a value
+		 */
+		private function parseValue():Object
+		{
+			// Catch errors when the input stream ends abruptly
+			if ( token == null )
+			{
+				tokenizer.parseError( "Unexpected end of input" );
+			}
+					
+			switch ( token.type ) {
+				case JSONTokenType.LEFT_BRACE:
+					return parseObject();
+					
+				case JSONTokenType.LEFT_BRACKET:
+					return parseArray();
+					
+				case JSONTokenType.STRING:
+				case JSONTokenType.NUMBER:
+				case JSONTokenType.TRUE:
+				case JSONTokenType.FALSE:
+				case JSONTokenType.NULL:
+					return token.value;
+
+				default:
+					tokenizer.parseError( "Unexpected " + token.value );
+					
+			}
+            return null;
+		}
+	}
+}
diff --git a/src/flexchart/com/adobe/serialization/json/JSONEncoder.as b/src/flexchart/com/adobe/serialization/json/JSONEncoder.as
new file mode 100644
index 0000000..44469d0
--- /dev/null
+++ b/src/flexchart/com/adobe/serialization/json/JSONEncoder.as
@@ -0,0 +1,299 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.serialization.json 
+{
+
+	import flash.utils.describeType;
+
+	public class JSONEncoder {
+	
+		/** The string that is going to represent the object we're encoding */
+		private var jsonString:String;
+		
+		/**
+		 * Creates a new JSONEncoder.
+		 *
+		 * @param o The object to encode as a JSON string
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function JSONEncoder( value:* ) {
+			jsonString = convertToString( value );
+		
+		}
+		
+		/**
+		 * Gets the JSON string from the encoder.
+		 *
+		 * @return The JSON string representation of the object
+		 * 		that was passed to the constructor
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function getString():String {
+			return jsonString;
+		}
+		
+		/**
+		 * Converts a value to it's JSON string equivalent.
+		 *
+		 * @param value The value to convert.  Could be any 
+		 *		type (object, number, array, etc)
+		 */
+		private function convertToString( value:* ):String {
+			
+			// determine what value is and convert it based on it's type
+			if ( value is String ) {
+				
+				// escape the string so it's formatted correctly
+				return escapeString( value as String );
+				
+			} else if ( value is Number ) {
+				
+				// only encode numbers that finate
+				return isFinite( value as Number) ? value.toString() : "null";
+
+			} else if ( value is Boolean ) {
+				
+				// convert boolean to string easily
+				return value ? "true" : "false";
+
+			} else if ( value is Array ) {
+			
+				// call the helper method to convert an array
+				return arrayToString( value as Array );
+			
+			} else if ( value is Object && value != null ) {
+			
+				// call the helper method to convert an object
+				return objectToString( value );
+			}
+            return "null";
+		}
+		
+		/**
+		 * Escapes a string accoding to the JSON specification.
+		 *
+		 * @param str The string to be escaped
+		 * @return The string with escaped special characters
+		 * 		according to the JSON specification
+		 */
+		private function escapeString( str:String ):String {
+			// create a string to store the string's jsonstring value
+			var s:String = "";
+			// current character in the string we're processing
+			var ch:String;
+			// store the length in a local variable to reduce lookups
+			var len:Number = str.length;
+			
+			// loop over all of the characters in the string
+			for ( var i:int = 0; i < len; i++ ) {
+			
+				// examine the character to determine if we have to escape it
+				ch = str.charAt( i );
+				switch ( ch ) {
+				
+					case '"':	// quotation mark
+						s += "\\\"";
+						break;
+						
+					//case '/':	// solidus
+					//	s += "\\/";
+					//	break;
+						
+					case '\\':	// reverse solidus
+						s += "\\\\";
+						break;
+						
+					case '\b':	// bell
+						s += "\\b";
+						break;
+						
+					case '\f':	// form feed
+						s += "\\f";
+						break;
+						
+					case '\n':	// newline
+						s += "\\n";
+						break;
+						
+					case '\r':	// carriage return
+						s += "\\r";
+						break;
+						
+					case '\t':	// horizontal tab
+						s += "\\t";
+						break;
+						
+					default:	// everything else
+						
+						// check for a control character and escape as unicode
+						if ( ch < ' ' ) {
+							// get the hex digit(s) of the character (either 1 or 2 digits)
+							var hexCode:String = ch.charCodeAt( 0 ).toString( 16 );
+							
+							// ensure that there are 4 digits by adjusting
+							// the # of zeros accordingly.
+							var zeroPad:String = hexCode.length == 2 ? "00" : "000";
+							
+							// create the unicode escape sequence with 4 hex digits
+							s += "\\u" + zeroPad + hexCode;
+						} else {
+						
+							// no need to do any special encoding, just pass-through
+							s += ch;
+							
+						}
+				}	// end switch
+				
+			}	// end for loop
+						
+			return "\"" + s + "\"";
+		}
+		
+		/**
+		 * Converts an array to it's JSON string equivalent
+		 *
+		 * @param a The array to convert
+		 * @return The JSON string representation of <code>a</code>
+		 */
+		private function arrayToString( a:Array ):String {
+			// create a string to store the array's jsonstring value
+			var s:String = "";
+			
+			// loop over the elements in the array and add their converted
+			// values to the string
+			for ( var i:int = 0; i < a.length; i++ ) {
+				// when the length is 0 we're adding the first element so
+				// no comma is necessary
+				if ( s.length > 0 ) {
+					// we've already added an element, so add the comma separator
+					s += ","
+				}
+				
+				// convert the value to a string
+				s += convertToString( a[i] );	
+			}
+			
+			// KNOWN ISSUE:  In ActionScript, Arrays can also be associative
+			// objects and you can put anything in them, ie:
+			//		myArray["foo"] = "bar";
+			//
+			// These properties aren't picked up in the for loop above because
+			// the properties don't correspond to indexes.  However, we're
+			// sort of out luck because the JSON specification doesn't allow
+			// these types of array properties.
+			//
+			// So, if the array was also used as an associative object, there
+			// may be some values in the array that don't get properly encoded.
+			//
+			// A possible solution is to instead encode the Array as an Object
+			// but then it won't get decoded correctly (and won't be an
+			// Array instance)
+						
+			// close the array and return it's string value
+			return "[" + s + "]";
+		}
+		
+		/**
+		 * Converts an object to it's JSON string equivalent
+		 *
+		 * @param o The object to convert
+		 * @return The JSON string representation of <code>o</code>
+		 */
+		private function objectToString( o:Object ):String
+		{
+			// create a string to store the object's jsonstring value
+			var s:String = "";
+			
+			// determine if o is a class instance or a plain object
+			var classInfo:XML = describeType( o );
+			if ( classInfo. at name.toString() == "Object" )
+			{
+				// the value of o[key] in the loop below - store this 
+				// as a variable so we don't have to keep looking up o[key]
+				// when testing for valid values to convert
+				var value:Object;
+				
+				// loop over the keys in the object and add their converted
+				// values to the string
+				for ( var key:String in o )
+				{
+					// assign value to a variable for quick lookup
+					value = o[key];
+					
+					// don't add function's to the JSON string
+					if ( value is Function )
+					{
+						// skip this key and try another
+						continue;
+					}
+					
+					// when the length is 0 we're adding the first item so
+					// no comma is necessary
+					if ( s.length > 0 ) {
+						// we've already added an item, so add the comma separator
+						s += ","
+					}
+					
+					s += escapeString( key ) + ":" + convertToString( value );
+				}
+			}
+			else // o is a class instance
+			{
+				// Loop over all of the variables and accessors in the class and 
+				// serialize them along with their values.
+				for each ( var v:XML in classInfo..*.( name() == "variable" || name() == "accessor" ) )
+				{
+					// When the length is 0 we're adding the first item so
+					// no comma is necessary
+					if ( s.length > 0 ) {
+						// We've already added an item, so add the comma separator
+						s += ","
+					}
+					
+					s += escapeString( v. at name.toString() ) + ":" 
+							+ convertToString( o[ v. at name ] );
+				}
+				
+			}
+			
+			return "{" + s + "}";
+		}
+
+		
+	}
+	
+}
diff --git a/src/flexchart/com/adobe/serialization/json/JSONParseError.as b/src/flexchart/com/adobe/serialization/json/JSONParseError.as
new file mode 100644
index 0000000..5aec1e3
--- /dev/null
+++ b/src/flexchart/com/adobe/serialization/json/JSONParseError.as
@@ -0,0 +1,87 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.serialization.json {
+
+	/**
+	 *
+	 *
+	 */
+	public class JSONParseError extends Error 	{
+	
+		/** The location in the string where the error occurred */
+		private var _location:int;
+		
+		/** The string in which the parse error occurred */
+		private var _text:String;
+	
+		/**
+		 * Constructs a new JSONParseError.
+		 *
+		 * @param message The error message that occured during parsing
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function JSONParseError( message:String = "", location:int = 0, text:String = "") {
+			super( message );
+			name = "JSONParseError";
+			_location = location;
+			_text = text;
+		}
+
+		/**
+		 * Provides read-only access to the location variable.
+		 *
+		 * @return The location in the string where the error occurred
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function get location():int {
+			return _location;
+		}
+		
+		/**
+		 * Provides read-only access to the text variable.
+		 *
+		 * @return The string in which the error occurred
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function get text():String {
+			return _text;
+		}
+	}
+	
+}
\ No newline at end of file
diff --git a/src/flexchart/com/adobe/serialization/json/JSONToken.as b/src/flexchart/com/adobe/serialization/json/JSONToken.as
new file mode 100644
index 0000000..258d63c
--- /dev/null
+++ b/src/flexchart/com/adobe/serialization/json/JSONToken.as
@@ -0,0 +1,104 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.serialization.json {
+
+	public class JSONToken {
+	
+		private var _type:int;
+		private var _value:Object;
+		
+		/**
+		 * Creates a new JSONToken with a specific token type and value.
+		 *
+		 * @param type The JSONTokenType of the token
+		 * @param value The value of the token
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function JSONToken( type:int = -1 /* JSONTokenType.UNKNOWN */, value:Object = null ) {
+			_type = type;
+			_value = value;
+		}
+		
+		/**
+		 * Returns the type of the token.
+		 *
+		 * @see com.adobe.serialization.json.JSONTokenType
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function get type():int {
+			return _type;	
+		}
+		
+		/**
+		 * Sets the type of the token.
+		 *
+		 * @see com.adobe.serialization.json.JSONTokenType
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function set type( value:int ):void {
+			_type = value;	
+		}
+		
+		/**
+		 * Gets the value of the token
+		 *
+		 * @see com.adobe.serialization.json.JSONTokenType
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function get value():Object {
+			return _value;	
+		}
+		
+		/**
+		 * Sets the value of the token
+		 *
+		 * @see com.adobe.serialization.json.JSONTokenType
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function set value ( v:Object ):void {
+			_value = v;	
+		}
+
+	}
+	
+}
\ No newline at end of file
diff --git a/src/flexchart/com/adobe/serialization/json/JSONTokenType.as b/src/flexchart/com/adobe/serialization/json/JSONTokenType.as
new file mode 100644
index 0000000..fceb3f0
--- /dev/null
+++ b/src/flexchart/com/adobe/serialization/json/JSONTokenType.as
@@ -0,0 +1,67 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.serialization.json {
+
+	/**
+	 * Class containing constant values for the different types
+	 * of tokens in a JSON encoded string.
+	 */
+	public class JSONTokenType {
+	
+		public static const UNKNOWN:int = -1;
+		
+		public static const COMMA:int = 0;
+		
+		public static const LEFT_BRACE:int = 1;
+		
+		public static const RIGHT_BRACE:int = 2;
+		
+		public static const LEFT_BRACKET:int = 3;
+		
+		public static const RIGHT_BRACKET:int = 4;
+		
+		public static const COLON:int = 6;
+		
+		public static const TRUE:int = 7;
+		
+		public static const FALSE:int = 8;
+		
+		public static const NULL:int = 9;
+		
+		public static const STRING:int = 10;
+		
+		public static const NUMBER:int = 11;
+		
+	}
+	
+}
\ No newline at end of file
diff --git a/src/flexchart/com/adobe/serialization/json/JSONTokenizer.as b/src/flexchart/com/adobe/serialization/json/JSONTokenizer.as
new file mode 100644
index 0000000..f5d406a
--- /dev/null
+++ b/src/flexchart/com/adobe/serialization/json/JSONTokenizer.as
@@ -0,0 +1,547 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.serialization.json {
+
+	public class JSONTokenizer {
+	
+		/** The object that will get parsed from the JSON string */
+		private var obj:Object;
+		
+		/** The JSON string to be parsed */
+		private var jsonString:String;
+		
+		/** The current parsing location in the JSON string */
+		private var loc:int;
+		
+		/** The current character in the JSON string during parsing */
+		private var ch:String;
+		
+		/**
+		 * Constructs a new JSONDecoder to parse a JSON string 
+		 * into a native object.
+		 *
+		 * @param s The JSON string to be converted
+		 *		into a native object
+		 */
+		public function JSONTokenizer( s:String ) {
+			jsonString = s;
+			loc = 0;
+			
+			// prime the pump by getting the first character
+			nextChar();
+		}
+		
+		/**
+		 * Gets the next token in the input sting and advances
+		* the character to the next character after the token
+		 */
+		public function getNextToken():JSONToken {
+			var token:JSONToken = new JSONToken();
+			
+			// skip any whitespace / comments since the last 
+			// token was read
+			skipIgnored();
+						
+			// examine the new character and see what we have...
+			switch ( ch ) {
+				
+				case '{':
+					token.type = JSONTokenType.LEFT_BRACE;
+					token.value = '{';
+					nextChar();
+					break
+					
+				case '}':
+					token.type = JSONTokenType.RIGHT_BRACE;
+					token.value = '}';
+					nextChar();
+					break
+					
+				case '[':
+					token.type = JSONTokenType.LEFT_BRACKET;
+					token.value = '[';
+					nextChar();
+					break
+					
+				case ']':
+					token.type = JSONTokenType.RIGHT_BRACKET;
+					token.value = ']';
+					nextChar();
+					break
+				
+				case ',':
+					token.type = JSONTokenType.COMMA;
+					token.value = ',';
+					nextChar();
+					break
+					
+				case ':':
+					token.type = JSONTokenType.COLON;
+					token.value = ':';
+					nextChar();
+					break;
+					
+				case 't': // attempt to read true
+					var possibleTrue:String = "t" + nextChar() + nextChar() + nextChar();
+					
+					if ( possibleTrue == "true" ) {
+						token.type = JSONTokenType.TRUE;
+						token.value = true;
+						nextChar();
+					} else {
+						parseError( "Expecting 'true' but found " + possibleTrue );
+					}
+					
+					break;
+					
+				case 'f': // attempt to read false
+					var possibleFalse:String = "f" + nextChar() + nextChar() + nextChar() + nextChar();
+					
+					if ( possibleFalse == "false" ) {
+						token.type = JSONTokenType.FALSE;
+						token.value = false;
+						nextChar();
+					} else {
+						parseError( "Expecting 'false' but found " + possibleFalse );
+					}
+					
+					break;
+					
+				case 'n': // attempt to read null
+				
+					var possibleNull:String = "n" + nextChar() + nextChar() + nextChar();
+					
+					if ( possibleNull == "null" ) {
+						token.type = JSONTokenType.NULL;
+						token.value = null;
+						nextChar();
+					} else {
+						parseError( "Expecting 'null' but found " + possibleNull );
+					}
+					
+					break;
+					
+				case '"': // the start of a string
+					token = readString();
+					break;
+					
+				default: 
+					// see if we can read a number
+					if ( isDigit( ch ) || ch == '-' ) {
+						token = readNumber();
+					} else if ( ch == '' ) {
+						// check for reading past the end of the string
+						return null;
+					} else {						
+						// not sure what was in the input string - it's not
+						// anything we expected
+						parseError( "Unexpected " + ch + " encountered" );
+					}
+			}
+			
+			return token;
+		}
+		
+		/**
+		 * Attempts to read a string from the input string.  Places
+		 * the character location at the first character after the
+		 * string.  It is assumed that ch is " before this method is called.
+		 *
+		 * @return the JSONToken with the string value if a string could
+		 *		be read.  Throws an error otherwise.
+		 */
+		private function readString():JSONToken {
+			// the token for the string we'll try to read
+			var token:JSONToken = new JSONToken();
+			token.type = JSONTokenType.STRING;
+			
+			// the string to store the string we'll try to read
+			var string:String = "";
+			
+			// advance past the first "
+			nextChar();
+			
+			while ( ch != '"' && ch != '' ) {
+								
+				// unescape the escape sequences in the string
+				if ( ch == '\\' ) {
+					
+					// get the next character so we know what
+					// to unescape
+					nextChar();
+					
+					switch ( ch ) {
+						
+						case '"': // quotation mark
+							string += '"';
+							break;
+						
+						case '/':	// solidus
+							string += "/";
+							break;
+							
+						case '\\':	// reverse solidus
+							string += '\\';
+							break;
+							
+						case 'b':	// bell
+							string += '\b';
+							break;
+							
+						case 'f':	// form feed
+							string += '\f';
+							break;
+							
+						case 'n':	// newline
+							string += '\n';
+							break;
+							
+						case 'r':	// carriage return
+							string += '\r';
+							break;
+							
+						case 't':	// horizontal tab
+							string += '\t'
+							break;
+						
+						case 'u':
+							// convert a unicode escape sequence
+							// to it's character value - expecting
+							// 4 hex digits
+							
+							// save the characters as a string we'll convert to an int
+							var hexValue:String = "";
+							
+							// try to find 4 hex characters
+							for ( var i:int = 0; i < 4; i++ ) {
+								// get the next character and determine
+								// if it's a valid hex digit or not
+								if ( !isHexDigit( nextChar() ) ) {
+									parseError( " Excepted a hex digit, but found: " + ch );
+								}
+								// valid, add it to the value
+								hexValue += ch;
+							}
+							
+							// convert hexValue to an integer, and use that
+							// integrer value to create a character to add
+							// to our string.
+							string += String.fromCharCode( parseInt( hexValue, 16 ) );
+							
+							break;
+					
+						default:
+							// couldn't unescape the sequence, so just
+							// pass it through
+							string += '\\' + ch;
+						
+					}
+					
+				} else {
+					// didn't have to unescape, so add the character to the string
+					string += ch;
+					
+				}
+				
+				// move to the next character
+				nextChar();
+				
+			}
+			
+			// we read past the end of the string without closing it, which
+			// is a parse error
+			if ( ch == '' ) {
+				parseError( "Unterminated string literal" );
+			}
+			
+			// move past the closing " in the input string
+			nextChar();
+			
+			// attach to the string to the token so we can return it
+			token.value = string;
+			
+			return token;
+		}
+		
+		/**
+		 * Attempts to read a number from the input string.  Places
+		 * the character location at the first character after the
+		 * number.
+		 * 
+		 * @return The JSONToken with the number value if a number could
+		 * 		be read.  Throws an error otherwise.
+		 */
+		private function readNumber():JSONToken {
+			// the token for the number we'll try to read
+			var token:JSONToken = new JSONToken();
+			token.type = JSONTokenType.NUMBER;
+			
+			// the string to accumulate the number characters
+			// into that we'll convert to a number at the end
+			var input:String = "";
+			
+			// check for a negative number
+			if ( ch == '-' ) {
+				input += '-';
+				nextChar();
+			}
+			
+			// the number must start with a digit
+			if ( !isDigit( ch ) )
+			{
+				parseError( "Expecting a digit" );
+			}
+			
+			// 0 can only be the first digit if it
+			// is followed by a decimal point
+			if ( ch == '0' )
+			{
+				input += ch;
+				nextChar();
+				
+				// make sure no other digits come after 0
+				if ( isDigit( ch ) )
+				{
+					parseError( "A digit cannot immediately follow 0" );
+				}
+			}
+			else
+			{
+				// read numbers while we can
+				while ( isDigit( ch ) ) {
+					input += ch;
+					nextChar();
+				}
+			}
+			
+			// check for a decimal value
+			if ( ch == '.' ) {
+				input += '.';
+				nextChar();
+				
+				// after the decimal there has to be a digit
+				if ( !isDigit( ch ) )
+				{
+					parseError( "Expecting a digit" );
+				}
+				
+				// read more numbers to get the decimal value
+				while ( isDigit( ch ) ) {
+					input += ch;
+					nextChar();
+				}
+			}
+			
+			// check for scientific notation
+			if ( ch == 'e' || ch == 'E' )
+			{
+				input += "e"
+				nextChar();
+				// check for sign
+				if ( ch == '+' || ch == '-' )
+				{
+					input += ch;
+					nextChar();
+				}
+				
+				// require at least one number for the exponent
+				// in this case
+				if ( !isDigit( ch ) )
+				{
+					parseError( "Scientific notation number needs exponent value" );
+				}
+							
+				// read in the exponent
+				while ( isDigit( ch ) )
+				{
+					input += ch;
+					nextChar();
+				}
+			}
+			
+			// convert the string to a number value
+			var num:Number = Number( input );
+			
+			if ( isFinite( num ) && !isNaN( num ) ) {
+				token.value = num;
+				return token;
+			} else {
+				parseError( "Number " + num + " is not valid!" );
+			}
+            return null;
+		}
+
+		/**
+		 * Reads the next character in the input
+		 * string and advances the character location.
+		 *
+		 * @return The next character in the input string, or
+		 *		null if we've read past the end.
+		 */
+		private function nextChar():String {
+			return ch = jsonString.charAt( loc++ );
+		}
+		
+		/**
+		 * Advances the character location past any
+		 * sort of white space and comments
+		 */
+		private function skipIgnored():void {
+			skipWhite();
+			skipComments();
+			skipWhite();
+		}
+		
+		/**
+		 * Skips comments in the input string, either
+		 * single-line or multi-line.  Advances the character
+		 * to the first position after the end of the comment.
+		 */
+		private function skipComments():void {
+			if ( ch == '/' ) {
+				// Advance past the first / to find out what type of comment
+				nextChar();
+				switch ( ch ) {
+					case '/': // single-line comment, read through end of line
+						
+						// Loop over the characters until we find
+						// a newline or until there's no more characters left
+						do {
+							nextChar();
+						} while ( ch != '\n' && ch != '' )
+						
+						// move past the \n
+						nextChar();
+						
+						break;
+					
+					case '*': // multi-line comment, read until closing */
+
+						// move past the opening *
+						nextChar();
+						
+						// try to find a trailing */
+						while ( true ) {
+							if ( ch == '*' ) {
+								// check to see if we have a closing /
+								nextChar();
+								if ( ch == '/') {
+									// move past the end of the closing */
+									nextChar();
+									break;
+								}
+							} else {
+								// move along, looking if the next character is a *
+								nextChar();
+							}
+							
+							// when we're here we've read past the end of 
+							// the string without finding a closing */, so error
+							if ( ch == '' ) {
+								parseError( "Multi-line comment not closed" );
+							}
+						}
+
+						break;
+					
+					// Can't match a comment after a /, so it's a parsing error
+					default:
+						parseError( "Unexpected " + ch + " encountered (expecting '/' or '*' )" );
+				}
+			}
+			
+		}
+		
+		
+		/**
+		 * Skip any whitespace in the input string and advances
+		 * the character to the first character after any possible
+		 * whitespace.
+		 */
+		private function skipWhite():void {
+			
+			// As long as there are spaces in the input 
+			// stream, advance the current location pointer
+			// past them
+			while ( isWhiteSpace( ch ) ) {
+				nextChar();
+			}
+			
+		}
+		
+		/**
+		 * Determines if a character is whitespace or not.
+		 *
+		 * @return True if the character passed in is a whitespace
+		 *	character
+		 */
+		private function isWhiteSpace( ch:String ):Boolean {
+			return ( ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r' );
+		}
+		
+		/**
+		 * Determines if a character is a digit [0-9].
+		 *
+		 * @return True if the character passed in is a digit
+		 */
+		private function isDigit( ch:String ):Boolean {
+			return ( ch >= '0' && ch <= '9' );
+		}
+		
+		/**
+		 * Determines if a character is a digit [0-9].
+		 *
+		 * @return True if the character passed in is a digit
+		 */
+		private function isHexDigit( ch:String ):Boolean {
+			// get the uppercase value of ch so we only have
+			// to compare the value between 'A' and 'F'
+			var uc:String = ch.toUpperCase();
+			
+			// a hex digit is a digit of A-F, inclusive ( using
+			// our uppercase constraint )
+			return ( isDigit( ch ) || ( uc >= 'A' && uc <= 'F' ) );
+		}
+	
+		/**
+		 * Raises a parsing error with a specified message, tacking
+		 * on the error location and the original string.
+		 *
+		 * @param message The message indicating why the error occurred
+		 */
+		public function parseError( message:String ):void {
+			throw new JSONParseError( message, loc, jsonString );
+		}
+	}
+	
+}
diff --git a/src/flexchart/flexchart.mxml b/src/flexchart/flexchart.mxml
new file mode 100644
index 0000000..796329d
--- /dev/null
+++ b/src/flexchart/flexchart.mxml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" applicationComplete="populate(flexChart)">
+  <mx:Script>
+    <![CDATA[
+
+      import mx.containers.Box;
+      import org.ovirt.*;
+
+      private function populate(chart:Box):void {
+        var chartLoader:ChartLoader = new ChartLoader(chart, parameters['flexchart_data']);
+        chartLoader.load();
+      }
+
+    ]]>
+  </mx:Script>
+  <mx:Panel height="100%" width="100%" visible="true">
+    <mx:HBox id="flexChart"  height="100%" width="100%" visible="true" verticalAlign="bottom" opaqueBackground="0xFFFFFF" borderThickness="0">
+    </mx:HBox>
+  </mx:Panel>
+</mx:Application>
diff --git a/src/flexchart/org/ovirt/ChartLoader.as b/src/flexchart/org/ovirt/ChartLoader.as
new file mode 100644
index 0000000..d76bf28
--- /dev/null
+++ b/src/flexchart/org/ovirt/ChartLoader.as
@@ -0,0 +1,44 @@
+package org.ovirt {
+
+  import mx.containers.Box;
+  import mx.containers.HBox;
+  import mx.controls.Text;
+
+  public class ChartLoader {
+
+    private var element:Box;
+    private var datasourceUrl:String;
+
+    public function ChartLoader(element:Box, datasourceUrl:String) {
+      this.element = element;
+      this.datasourceUrl = datasourceUrl;
+    }
+
+    public function addData(dataSeries:DataSeries):void {
+      var points:Array = dataSeries.getPoints();
+      var maxValue:Number = dataSeries.getMaxValue();
+      var scale:Number = maxValue;
+      if (scale == 0) { scale = 1; }
+      var size:int = points.length;
+      element.removeAllChildren();
+      element.setStyle("horizontalGap","2");
+      for (var i:int = 0; i < size; i++) {
+        var value:Number = (points[i] as Array)[1];
+        var bar:HBox = new HBox();
+        bar.percentHeight = ((value / scale) * 90);
+        bar.percentWidth = (100 / size);
+        bar.setStyle("backgroundColor","0x0000FF");
+        bar.setStyle("left","1");
+        bar.setStyle("right","1");
+        bar.visible = true;
+        bar.setVisible(true);
+        element.addChild(bar);
+      }
+    }
+
+    public function load():void {
+      var dataSource:DataSource = new DataSource(this);
+      dataSource.retrieveData(datasourceUrl);
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/flexchart/org/ovirt/DataSeries.as b/src/flexchart/org/ovirt/DataSeries.as
new file mode 100644
index 0000000..c47da97
--- /dev/null
+++ b/src/flexchart/org/ovirt/DataSeries.as
@@ -0,0 +1,22 @@
+//class to encapsulate the json object representation of a data
+//series returned from stats package
+
+package org.ovirt {
+
+  public class DataSeries {
+
+    private var object:Object;
+
+    public function DataSeries (object:Object) {
+      this.object = object;
+    }
+
+    public function getPoints():Array {
+      return object["vectors"] as Array;
+    }
+
+    public function getMaxValue():Number {
+      return object["max_value"] as Number;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/flexchart/org/ovirt/DataSource.as b/src/flexchart/org/ovirt/DataSource.as
new file mode 100644
index 0000000..e10cf93
--- /dev/null
+++ b/src/flexchart/org/ovirt/DataSource.as
@@ -0,0 +1,37 @@
+package org.ovirt {
+
+  import flash.net.URLLoader;
+  import flash.net.URLRequest;
+  import com.adobe.serialization.json.JSON;
+  import flash.events.Event;
+  import flash.events.IOErrorEvent;
+
+  public class DataSource {
+
+    private var chartLoader:ChartLoader;
+
+    public function DataSource(chartLoader:ChartLoader) {
+      this.chartLoader = chartLoader;
+    }
+
+    public function retrieveData(url:String):void {
+      var loader:URLLoader = new URLLoader();
+      loader.addEventListener( IOErrorEvent.IO_ERROR, this.ioError );
+      loader.addEventListener( Event.COMPLETE, dataLoaded );
+      var request:URLRequest = new URLRequest(url);
+      loader.load(request);
+    }
+
+    private function dataLoaded(event:Event):void {
+      var loader:URLLoader = URLLoader(event.target);
+      var object:Object = JSON.decode(loader.data);
+      var series:DataSeries = new DataSeries(object);
+      chartLoader.addData(series);
+    }
+
+    private function ioError( e:IOErrorEvent ):void {
+      //FIXME:
+      //do something useful with this error
+    }
+  }
+}
diff --git a/src/public/javascripts/jquery.flash.js b/src/public/javascripts/jquery.flash.js
new file mode 100644
index 0000000..e47cc2e
--- /dev/null
+++ b/src/public/javascripts/jquery.flash.js
@@ -0,0 +1,288 @@
+/**
+ * Flash (http://jquery.lukelutman.com/plugins/flash)
+ * A jQuery plugin for embedding Flash movies.
+ * 
+ * Version 1.0
+ * November 9th, 2006
+ *
+ * Copyright (c) 2006 Luke Lutman (http://www.lukelutman.com)
+ * Dual licensed under the MIT and GPL licenses.
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.opensource.org/licenses/gpl-license.php
+ * 
+ * Inspired by:
+ * SWFObject (http://blog.deconcept.com/swfobject/)
+ * UFO (http://www.bobbyvandersluis.com/ufo/)
+ * sIFR (http://www.mikeindustries.com/sifr/)
+ * 
+ * IMPORTANT: 
+ * The packed version of jQuery breaks ActiveX control
+ * activation in Internet Explorer. Use JSMin to minifiy
+ * jQuery (see: http://jquery.lukelutman.com/plugins/flash#activex).
+ *
+ **/ 
+;(function(){
+	
+var $$;
+
+/**
+ * 
+ * @desc Replace matching elements with a flash movie.
+ * @author Luke Lutman
+ * @version 1.0.1
+ *
+ * @name flash
+ * @param Hash htmlOptions Options for the embed/object tag.
+ * @param Hash pluginOptions Options for detecting/updating the Flash plugin (optional).
+ * @param Function replace Custom block called for each matched element if flash is installed (optional).
+ * @param Function update Custom block called for each matched if flash isn't installed (optional).
+ * @type jQuery
+ *
+ * @cat plugins/flash
+ * 
+ * @example $('#hello').flash({ src: 'hello.swf' });
+ * @desc Embed a Flash movie.
+ *
+ * @example $('#hello').flash({ src: 'hello.swf' }, { version: 8 });
+ * @desc Embed a Flash 8 movie.
+ *
+ * @example $('#hello').flash({ src: 'hello.swf' }, { expressInstall: true });
+ * @desc Embed a Flash movie using Express Install if flash isn't installed.
+ *
+ * @example $('#hello').flash({ src: 'hello.swf' }, { update: false });
+ * @desc Embed a Flash movie, don't show an update message if Flash isn't installed.
+ *
+**/
+$$ = jQuery.fn.flash = function(htmlOptions, pluginOptions, replace, update) {
+	
+	// Set the default block.
+	var block = replace || $$.replace;
+	
+	// Merge the default and passed plugin options.
+	pluginOptions = $$.copy($$.pluginOptions, pluginOptions);
+	
+	// Detect Flash.
+	if(!$$.hasFlash(pluginOptions.version)) {
+		// Use Express Install (if specified and Flash plugin 6,0,65 or higher is installed).
+		if(pluginOptions.expressInstall && $$.hasFlash(6,0,65)) {
+			// Add the necessary flashvars (merged later).
+			var expressInstallOptions = {
+				flashvars: {  	
+					MMredirectURL: location,
+					MMplayerType: 'PlugIn',
+					MMdoctitle: jQuery('title').text() 
+				}					
+			};
+		// Ask the user to update (if specified).
+		} else if (pluginOptions.update) {
+			// Change the block to insert the update message instead of the flash movie.
+			block = update || $$.update;
+		// Fail
+		} else {
+			// The required version of flash isn't installed.
+			// Express Install is turned off, or flash 6,0,65 isn't installed.
+			// Update is turned off.
+			// Return without doing anything.
+			return this;
+		}
+	}
+	
+	// Merge the default, express install and passed html options.
+	htmlOptions = $$.copy($$.htmlOptions, expressInstallOptions, htmlOptions);
+	
+	// Invoke $block (with a copy of the merged html options) for each element.
+	return this.each(function(){
+		block.call(this, $$.copy(htmlOptions));
+	});
+	
+};
+/**
+ *
+ * @name flash.copy
+ * @desc Copy an arbitrary number of objects into a new object.
+ * @type Object
+ * 
+ * @example $$.copy({ foo: 1 }, { bar: 2 });
+ * @result { foo: 1, bar: 2 };
+ *
+**/
+$$.copy = function() {
+	var options = {}, flashvars = {};
+	for(var i = 0; i < arguments.length; i++) {
+		var arg = arguments[i];
+		if(arg == undefined) continue;
+		jQuery.extend(options, arg);
+		// don't clobber one flash vars object with another
+		// merge them instead
+		if(arg.flashvars == undefined) continue;
+		jQuery.extend(flashvars, arg.flashvars);
+	}
+	options.flashvars = flashvars;
+	return options;
+};
+/*
+ * @name flash.hasFlash
+ * @desc Check if a specific version of the Flash plugin is installed
+ * @type Boolean
+ *
+**/
+$$.hasFlash = function() {
+	// look for a flag in the query string to bypass flash detection
+	if(/hasFlash\=true/.test(location)) return true;
+	if(/hasFlash\=false/.test(location)) return false;
+	var pv = $$.hasFlash.playerVersion().match(/\d+/g);
+	var rv = String([arguments[0], arguments[1], arguments[2]]).match(/\d+/g) || String($$.pluginOptions.version).match(/\d+/g);
+	for(var i = 0; i < 3; i++) {
+		pv[i] = parseInt(pv[i] || 0);
+		rv[i] = parseInt(rv[i] || 0);
+		// player is less than required
+		if(pv[i] < rv[i]) return false;
+		// player is greater than required
+		if(pv[i] > rv[i]) return true;
+	}
+	// major version, minor version and revision match exactly
+	return true;
+};
+/**
+ *
+ * @name flash.hasFlash.playerVersion
+ * @desc Get the version of the installed Flash plugin.
+ * @type String
+ *
+**/
+$$.hasFlash.playerVersion = function() {
+	// ie
+	try {
+		try {
+			// avoid fp6 minor version lookup issues
+			// see: http://blog.deconcept.com/2006/01/11/getvariable-setvariable-crash-internet-explorer-flash-6/
+			var axo = new ActiveXObject('ShockwaveFlash.ShockwaveFlash.6');
+			try { axo.AllowScriptAccess = 'always';	} 
+			catch(e) { return '6,0,0'; }				
+		} catch(e) {}
+		return new ActiveXObject('ShockwaveFlash.ShockwaveFlash').GetVariable('$version').replace(/\D+/g, ',').match(/^,?(.+),?$/)[1];
+	// other browsers
+	} catch(e) {
+		try {
+			if(navigator.mimeTypes["application/x-shockwave-flash"].enabledPlugin){
+				return (navigator.plugins["Shockwave Flash 2.0"] || navigator.plugins["Shockwave Flash"]).description.replace(/\D+/g, ",").match(/^,?(.+),?$/)[1];
+			}
+		} catch(e) {}		
+	}
+	return '0,0,0';
+};
+/**
+ *
+ * @name flash.htmlOptions
+ * @desc The default set of options for the object or embed tag.
+ *
+**/
+$$.htmlOptions = {
+	height: 240,
+	flashvars: {},
+	pluginspage: 'http://www.adobe.com/go/getflashplayer',
+	src: '#',
+	type: 'application/x-shockwave-flash',
+	width: 320		
+};
+/**
+ *
+ * @name flash.pluginOptions
+ * @desc The default set of options for checking/updating the flash Plugin.
+ *
+**/
+$$.pluginOptions = {
+	expressInstall: false,
+	update: true,
+	version: '6.0.65'
+};
+/**
+ *
+ * @name flash.replace
+ * @desc The default method for replacing an element with a Flash movie.
+ *
+**/
+$$.replace = function(htmlOptions) {
+	this.innerHTML = '<div class="alt">'+this.innerHTML+'</div>';
+	jQuery(this)
+		.addClass('flash-replaced')
+		.prepend($$.transform(htmlOptions));
+};
+/**
+ *
+ * @name flash.update
+ * @desc The default method for replacing an element with an update message.
+ *
+**/
+$$.update = function(htmlOptions) {
+	var url = String(location).split('?');
+	url.splice(1,0,'?hasFlash=true&');
+	url = url.join('');
+	var msg = '<p>This content requires the Flash Player. <a href="http://www.adobe.com/go/getflashplayer">Download Flash Player</a>. Already have Flash Player? <a href="'+url+'">Click here.</a></p>';
+	this.innerHTML = '<span class="alt">'+this.innerHTML+'</span>';
+	jQuery(this)
+		.addClass('flash-update')
+		.prepend(msg);
+};
+/**
+ *
+ * @desc Convert a hash of html options to a string of attributes, using Function.apply(). 
+ * @example toAttributeString.apply(htmlOptions)
+ * @result foo="bar" foo="bar"
+ *
+**/
+function toAttributeString() {
+	var s = '';
+	for(var key in this)
+		if(typeof this[key] != 'function')
+			s += key+'="'+this[key]+'" ';
+	return s;		
+};
+/**
+ *
+ * @desc Convert a hash of flashvars to a url-encoded string, using Function.apply(). 
+ * @example toFlashvarsString.apply(flashvarsObject)
+ * @result foo=bar&foo=bar
+ *
+**/
+function toFlashvarsString() {
+	var s = '';
+	for(var key in this)
+		if(typeof this[key] != 'function')
+			s += key+'='+encodeURIComponent(this[key])+'&';
+	return s.replace(/&$/, '');		
+};
+/**
+ *
+ * @name flash.transform
+ * @desc Transform a set of html options into an embed tag.
+ * @type String 
+ *
+ * @example $$.transform(htmlOptions)
+ * @result <embed src="foo.swf" ... />
+ *
+ * Note: The embed tag is NOT standards-compliant, but it 
+ * works in all current browsers. flash.transform can be
+ * overwritten with a custom function to generate more 
+ * standards-compliant markup.
+ *
+**/
+$$.transform = function(htmlOptions) {
+	htmlOptions.toString = toAttributeString;
+	if(htmlOptions.flashvars) htmlOptions.flashvars.toString = toFlashvarsString;
+	return '<embed ' + String(htmlOptions) + '/>';		
+};
+
+/**
+ *
+ * Flash Player 9 Fix (http://blog.deconcept.com/2006/07/28/swfobject-143-released/)
+ *
+**/
+if (window.attachEvent) {
+	window.attachEvent("onbeforeunload", function(){
+		__flash_unloadHandler = function() {};
+		__flash_savedUnloadHandler = function() {};
+	});
+}
+	
+})();
\ No newline at end of file
-- 
1.5.5.1


From slinabery at redhat.com  Thu Oct  9 10:19:29 2008
From: slinabery at redhat.com (Steve Linabery)
Date: Thu, 9 Oct 2008 05:19:29 -0500
Subject: [Ovirt-devel] [PATCH server] Add a rudimentary flash chart
	written in flex framework to summary pages.
In-Reply-To: <20081009101614.GA10125@redhat.com>
References: <20081009101614.GA10125@redhat.com>
Message-ID: <20081009101929.GC10125@redhat.com>

On Thu, Oct 09, 2008 at 05:16:15AM -0500, Steve Linabery wrote:
> First stab at showing real rrd data in flash chart (in this case, memory peak use for last 40 samples of rrd data). Note that to test this, you'll need to get the open flex sdk and compile src/flexchart/flexchart.mxml yourself.

Gah, I just realized I didn't add our "preamble" & authorship info to the actionscript files I created for this. But I'll add that stuff if necessary.

Thanks,
Steve



From bkearney at redhat.com  Thu Oct  9 13:03:37 2008
From: bkearney at redhat.com (Bryan Kearney)
Date: Thu, 09 Oct 2008 09:03:37 -0400
Subject: [Ovirt-devel] Re: [PATCH recipe] Syntax error correction
	in	ovirt.pp (missing comma)
In-Reply-To: <48ED7B7C.3010306@redhat.com>
References: <1223522965-20298-1-git-send-email-pmyers@redhat.com>
	<48ED7B7C.3010306@redhat.com>
Message-ID: <48EE0129.7050102@redhat.com>

Perry N. Myers wrote:
> Perry Myers wrote:
>> Missing comma in ovirt.pp caused ace service to fail at appliance 
>> firstboot,
>> which caused failures in the appliance.
> 
> For those of you who reported issues with the appliance booting and 
> seeming like a postgres connection problem, this was the reason.  Here's 
> what happened for future reference:
> 
> syntax error in ovirt.pp caused /etc/init.d/ace to fail during appliance 
> firstboot configuration
> 
> This prevented the ovirt-server-install script from running which sets 
> up the database, and then failures cascaded from there
> 
> It's important when writing patches to test the build process end to end 
> including building an appliance and testing major functionality to make 
> sure no regressions are introduced.
> 
> To diagnose this problem I simply looked at the log files in:
> /var/log/ace

In addition, you can use the ace tooling to catch _many_ of the syntax 
errors (not all). I had not documented this... but I just added the 
following page:

http://www.thincrust.net/docs-acedebugging.html

Run this before you attempt to build the appliance to save some time.

-- bk



From pmyers at redhat.com  Thu Oct  9 13:30:15 2008
From: pmyers at redhat.com (Perry Myers)
Date: Thu,  9 Oct 2008 09:30:15 -0400
Subject: [Ovirt-devel] [PATCH node-image] Add ovirt-node-selinux policy to
	the node image
Message-ID: <1223559015-24998-1-git-send-email-pmyers@redhat.com>

Signed-off-by: Perry Myers <pmyers at redhat.com>
---
 common-pkgs.ks |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/common-pkgs.ks b/common-pkgs.ks
index 0149956..cd4f243 100644
--- a/common-pkgs.ks
+++ b/common-pkgs.ks
@@ -33,6 +33,7 @@ hal
 # qemu-img RPM.
 qemu-img
 ovirt-node
+ovirt-node-selinux
 -audit-libs-python
 -hdparm
 -ustr
-- 
1.5.5.1



From pmyers at redhat.com  Thu Oct  9 13:30:39 2008
From: pmyers at redhat.com (Perry Myers)
Date: Thu,  9 Oct 2008 09:30:39 -0400
Subject: [Ovirt-devel] [PATCH release] Add ovirt-node-selinux to list of
	packages to install to host in update-host
Message-ID: <1223559039-25028-1-git-send-email-pmyers@redhat.com>

Signed-off-by: Perry Myers <pmyers at redhat.com>
---
 ovirt.mk |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ovirt.mk b/ovirt.mk
index dc28f6c..4a45f7e 100644
--- a/ovirt.mk
+++ b/ovirt.mk
@@ -82,7 +82,8 @@ update-host:
 	@$(write_repo_file)
 	@sudo yum install -c $(OVIRT_CACHE_DIR)/ovirt-local.repo -y \
 	  --enablerepo=ovirt \
-	  ovirt-release ovirt-build ovirt-appliance ovirt-node ovirt-docs
+	  ovirt-release ovirt-build ovirt-appliance ovirt-node ovirt-docs \
+	  ovirt-node-selinux
 
 tar-src:
 	@mkdir -p $(OVIRT_CACHE_DIR)
-- 
1.5.5.1



From jim at meyering.net  Thu Oct  9 13:34:45 2008
From: jim at meyering.net (Jim Meyering)
Date: Thu, 09 Oct 2008 15:34:45 +0200
Subject: [Ovirt-devel] [PATCH release] Add ovirt-node-selinux to list of
	packages to install to host in update-host
In-Reply-To: <1223559039-25028-1-git-send-email-pmyers@redhat.com> (Perry
	Myers's message of "Thu, 9 Oct 2008 09:30:39 -0400")
References: <1223559039-25028-1-git-send-email-pmyers@redhat.com>
Message-ID: <874p3l28p6.fsf@rho.meyering.net>

Perry Myers <pmyers at redhat.com> wrote:
> Signed-off-by: Perry Myers <pmyers at redhat.com>
> ---
>  ovirt.mk |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/ovirt.mk b/ovirt.mk
> index dc28f6c..4a45f7e 100644
> --- a/ovirt.mk
> +++ b/ovirt.mk
> @@ -82,7 +82,8 @@ update-host:
>  	@$(write_repo_file)
>  	@sudo yum install -c $(OVIRT_CACHE_DIR)/ovirt-local.repo -y \
>  	  --enablerepo=ovirt \
> -	  ovirt-release ovirt-build ovirt-appliance ovirt-node ovirt-docs
> +	  ovirt-release ovirt-build ovirt-appliance ovirt-node ovirt-docs \
> +	  ovirt-node-selinux
>
>  tar-src:
>  	@mkdir -p $(OVIRT_CACHE_DIR)

ACK (20-min build in progress)



From jim at meyering.net  Thu Oct  9 13:34:56 2008
From: jim at meyering.net (Jim Meyering)
Date: Thu, 09 Oct 2008 15:34:56 +0200
Subject: [Ovirt-devel] [PATCH node-image] Add ovirt-node-selinux policy to
	the node image
In-Reply-To: <1223559015-24998-1-git-send-email-pmyers@redhat.com> (Perry
	Myers's message of "Thu, 9 Oct 2008 09:30:15 -0400")
References: <1223559015-24998-1-git-send-email-pmyers@redhat.com>
Message-ID: <87y70xzybj.fsf@rho.meyering.net>

Perry Myers <pmyers at redhat.com> wrote:
> Signed-off-by: Perry Myers <pmyers at redhat.com>
> ---
>  common-pkgs.ks |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/common-pkgs.ks b/common-pkgs.ks
> index 0149956..cd4f243 100644
> --- a/common-pkgs.ks
> +++ b/common-pkgs.ks
> @@ -33,6 +33,7 @@ hal
>  # qemu-img RPM.
>  qemu-img
>  ovirt-node
> +ovirt-node-selinux

ACK



From jim at meyering.net  Thu Oct  9 13:41:51 2008
From: jim at meyering.net (Jim Meyering)
Date: Thu, 09 Oct 2008 15:41:51 +0200
Subject: [Ovirt-devel] Re: [PATCH recipe] Syntax error correction
	in	ovirt.pp (missing comma)
In-Reply-To: <48EE0129.7050102@redhat.com> (Bryan Kearney's message of "Thu,
	09 Oct 2008 09:03:37 -0400")
References: <1223522965-20298-1-git-send-email-pmyers@redhat.com>
	<48ED7B7C.3010306@redhat.com> <48EE0129.7050102@redhat.com>
Message-ID: <87skr5zy00.fsf@rho.meyering.net>

Bryan Kearney <bkearney at redhat.com> wrote:
> In addition, you can use the ace tooling to catch _many_ of the syntax
> errors (not all). I had not documented this... but I just added the
> following page:
>
> http://www.thincrust.net/docs-acedebugging.html
>
> Run this before you attempt to build the appliance to save some time.

If there's not too expensive, it'd be nice to automate that process.



From xxqonline at hotmail.com  Thu Oct  9 14:51:13 2008
From: xxqonline at hotmail.com (xxqonline at hotmail.com)
Date: Thu, 9 Oct 2008 22:51:13 +0800
Subject: [Ovirt-devel] I cannot see the NFS storage size afer I virsh start
	ovirt-appliance
Message-ID: <BAY124-DS385AEB6571E13A3DFA8B8B13A0@phx.gbl>

Hello folks:
      I use the virsh 0.4.5. I followed the quick start to set the storage pool.
After that I checked the property of that pool. There is no size information.
Then I create a vm pool, and try to create a fedora 9 (Cobbler Profile), I failed to start it.
Can any one give me a help?

Thanks,
Qiang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081009/b45b3e24/attachment.htm>

From xxqonline at hotmail.com  Thu Oct  9 15:09:43 2008
From: xxqonline at hotmail.com (xxqonline at hotmail.com)
Date: Thu, 9 Oct 2008 23:09:43 +0800
Subject: [Ovirt-devel] Can any one help me,
	I cannot start the virtual machine with default ovirt-appliance
Message-ID: <BAY124-DS2355D5B778D1923557997B13A0@phx.gbl>

Hello folks:
      I use the virsh 0.4.5. I followed the quick start to set the storage pool (nfs).
After that I checked the property of that pool. There is no size information.
Then I create a vm pool, and try to create a fedora 9 (Cobbler Profile), I failed to start it.
Can any one give me a help?

I am new to ovirt, I really want to start the virtual machine, can any one give me a help?
I am trying to find the error log, but seems there is no error, just told me the vm cannot be started, is there any log that I can use to trouble shooting?

Thanks,
Qiang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081009/5eacb458/attachment.htm>

From apevec at redhat.com  Thu Oct  9 15:10:37 2008
From: apevec at redhat.com (Alan Pevec)
Date: Thu,  9 Oct 2008 17:10:37 +0200
Subject: [Ovirt-devel] [PATCH ovirt-appliance] remove skip_compress_image
Message-ID: <1223565037-18581-1-git-send-email-apevec@redhat.com>

Signed-off-by: Alan Pevec <apevec at redhat.com>
---
 Makefile.am             |    2 --
 ovirt-appliance.spec.in |    6 +-----
 2 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6631274..91f8fa3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,8 +38,6 @@ RPM_FLAGS	+= $(if $(OVIRT_URL),--define "ovirt_url $(OVIRT_URL)")
 # THINCRUST_URL env var can be set to the root of an thincrust.net mirror
 # FIXME: This is temporary until thincrust RPMS are in Fedora 9 Updates
 RPM_FLAGS	+= $(if $(THINCRUST_URL),--define "thincrust_url $(THINCRUST_URL)")
-# SKIP_COMPRESS_IMAGE env var an be set to 1 to skip qcow compression
-RPM_FLAGS	+= $(if $(SKIP_COMPRESS_IMAGE),--define "skip_compress_image $(SKIP_COMPRESS_IMAGE)")
 
 rpms: dist
 	rpmbuild $(RPM_FLAGS) -ta $(distdir).tar.gz
diff --git a/ovirt-appliance.spec.in b/ovirt-appliance.spec.in
index fb19edd..f08e0f6 100644
--- a/ovirt-appliance.spec.in
+++ b/ovirt-appliance.spec.in
@@ -70,11 +70,7 @@ sudo su - -c "cd $(pwd) && appliance-creator --config ovirt-appliance.ks \
                   --tmpdir='%{ovirt_cache_dir}/appliance-tmp' \
                   --cache='%{ovirt_cache_dir}/yum'"
 sudo su - -c "cd $(pwd) && chown -R $USER ."
-if [ -n "%{?skip_compress_image}" ]; then
-   mv %{name}-sda.raw %{name}.img
-else
-   mv %{name}-sda.qcow2 %{name}.img
-fi
+mv %{name}-sda.qcow2 %{name}.img
 
 %install
 %{__rm} -rf %{buildroot}
-- 
1.5.5.1



From dpierce at redhat.com  Thu Oct  9 15:12:49 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Thu,  9 Oct 2008 11:12:49 -0400
Subject: [Ovirt-devel] [PATCH server] Added support for booting a VM from an
	ISO image.
Message-ID: <1223565169-15368-1-git-send-email-dpierce@redhat.com>

The NFS export for Cobbler needs to be added as an NFS storage pool.
Otherwise, taskomatic will not be able to locate it.

Also added a few helper methods to Vm to contain the knowledge
of how Cobbler integration is contained.

When a user adds an ISO image to the Cobbler server on the appliance,
they will need to do so using the full NFS path for where the virtual
image will go to mount it; i.e., hostname:/path/to/filename.iso

If the filename ends in ".iso" then the virtual machine will mount the
file as a CDROM device and boot it. Otherwise, it mounts it as a hard
disk device.

To add an image to Cobbler, do the following:

1. Download an ISO image, such as the KDE LiveImage from Fedora.
2. Copy it to the NFS directory on the server:
  cp *.iso /ovirtnfs/kde-live-cd.iso
3. Add that image to your Cobbler instance:
  cobbler image add --name=KDE-LiveCD --file=management.priv.ovirt.org:/ovirtnfs/kde-live-cd.iso
4. Create a new VM in your server.
5. Select "KDE-LiveCD" from the list of operating systems.
6. Save the VM.
7. Start the VM.

It should run the selected ISO.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 src/app/controllers/vm_controller.rb |   50 ++++++++++++--------
 src/app/models/vm.rb                 |   34 +++++++++++++-
 src/task-omatic/task_vm.rb           |   83 +++++++++++++++++++++++++++++-----
 src/test/unit/vm_test.rb             |   56 +++++++++++++++++++++-
 4 files changed, 186 insertions(+), 37 deletions(-)

diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb
index f5c0845..0ec2837 100644
--- a/src/app/controllers/vm_controller.rb
+++ b/src/app/controllers/vm_controller.rb
@@ -223,13 +223,18 @@ class VmController < ApplicationController
   def _setup_provisioning_options
     @provisioning_options = [[Vm::PXE_OPTION_LABEL, Vm::PXE_OPTION_VALUE],
                              [Vm::HD_OPTION_LABEL, Vm::HD_OPTION_VALUE]]
-    # FIXME add cobbler images too
+
     begin
+      @provisioning_options += Cobbler::Image.find.collect do |image|
+        [image.name + Vm::COBBLER_IMAGE_SUFFIX,
+          "#{Vm::IMAGE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{image.name}"]
+      end
+
       @provisioning_options += Cobbler::Profile.find.collect do |profile|
         [profile.name + Vm::COBBLER_PROFILE_SUFFIX,
-         Vm::COBBLER_PREFIX + Vm::PROVISIONING_DELIMITER +
-         Vm::PROFILE_PREFIX + Vm::PROVISIONING_DELIMITER + profile.name]
-      end
+          "#{Vm::PROFILE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{profile.name}"]
+
+    end
     rescue
       #if cobbler doesn't respond/is misconfigured/etc just don't add profiles
     end
@@ -239,24 +244,29 @@ class VmController < ApplicationController
   def _setup_vm_provision(params)
     # spaces are invalid in the cobbler name
     name = params[:vm][:uuid]
-    provision = params[:vm][:provisioning_and_boot_settings].gsub(
-         Vm::COBBLER_PREFIX + Vm::PROVISIONING_DELIMITER +
-         Vm::PROFILE_PREFIX + Vm::PROVISIONING_DELIMITER, "")
     mac = params[:vm][:vnic_mac_addr]
-    unless provision == Vm::PXE_OPTION_VALUE or
-           provision == Vm::HD_OPTION_VALUE
-      found = false
-      Cobbler::System.find.each{ |system|
-        if system.name == name
-          system.profile = provision
-          system.save
-          found = true
+    provision = params[:vm][:provisioning_and_boot_settings]
+    # determine what type of provisioning was selected for the VM
+    provisioning_type = :pxe_or_hd_type
+    provisioning_type = :image_type  if provision =~ /Vm::IMAGE_PREFIX at Vm::COBBLER_PREFIX/
+    provisioning_type = :system_type if provision =~ /Vm::PROFILE_PREFIX at Vm::COBBLER_PREFIX/
+
+    unless provisioning_type == :pxe_or_hd_type
+      cobbler_name = provision.gsub(/(Vm::IMAGE_PREFIX|Vm::PROFILE_PREFIX)@Vm::COBBLER_PREFIX/, '')
+
+      system = Cobbler::System.find_one(name)
+
+      unless system
+        nic = Cobbler::NetworkInterface.new({'mac_address' => mac})
+
+        case provisioning_type
+        when :image_type:
+            system = Cobbler::System.create("name" => name, "image"    => cobbler_name)
+        when :system_type:
+            system = Cobbler::System.create("name" => name, "profile" => cobbler_name)
         end
-      }
-      unless found
-        system = Cobbler::System.create("name" => name,
-                                        "profile" => provision)
-        system.interfaces=[Cobbler::NetworkInterface.new({'mac_address' => mac})]
+
+        system.interfaces = [nic]
         system.save
       end
     end
diff --git a/src/app/models/vm.rb b/src/app/models/vm.rb
index ace6fb1..d7beacf 100644
--- a/src/app/models/vm.rb
+++ b/src/app/models/vm.rb
@@ -49,7 +49,7 @@ class Vm < ActiveRecord::Base
   PROFILE_PREFIX         = "profile"
   IMAGE_PREFIX           = "image"
   COBBLER_PROFILE_SUFFIX = " (Cobbler Profile)"
-  COBBLER_IMAGE_SUFFIX   = " (Cobbler Profile)"
+  COBBLER_IMAGE_SUFFIX   = " (Cobbler Image)"
 
   PXE_OPTION_LABEL       = "PXE Boot"
   PXE_OPTION_VALUE       = "pxe"
@@ -139,7 +139,15 @@ class Vm < ActiveRecord::Base
   end
 
   def provisioning_and_boot_settings=(settings)
-    if settings==PXE_OPTION_VALUE
+    # if the settings have a prefix that matches cobber settings, then process
+    # those details
+    if settings =~ /#{IMAGE_PREFIX}@#{COBBLER_PREFIX}/
+      self[:boot_device] = BOOT_DEV_CDROM
+      self[:provisioning] = settings
+    elsif settings =~ /#{PROFILE_PREFIX}@#{COBBLER_PREFIX}/
+      self[:boot_device] = BOOT_DEV_NETWORK
+      self[:provisioning] = settings
+    elsif settings==PXE_OPTION_VALUE
       self[:boot_device]= BOOT_DEV_NETWORK
       self[:provisioning]= nil
     elsif settings==HD_OPTION_VALUE
@@ -242,6 +250,28 @@ class Vm < ActiveRecord::Base
     vm_resource_pool.search_users
   end
 
+  # Reports whether the VM is uses Cobbler for booting.
+  #
+  def uses_cobbler?
+    (self.provisioning != nil) && (self.provisioning.include? COBBLER_PREFIX)
+  end
+
+  # Returns the cobbler type.
+  #
+  def cobbler_type
+    if self.uses_cobbler?
+      self.provisioning[/^(.*)@/,1]
+    end
+  end
+
+  # Returns the cobbler provisioning name.
+  #
+  def cobbler_name
+    if self.uses_cobbler?
+      self.provisioning[/^.*@.*:(.*)/,1]
+    end
+  end
+
   protected
   def validate
     resources = vm_resource_pool.max_resources_for_vm(self)
diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb
index 3588224..982613f 100644
--- a/src/task-omatic/task_vm.rb
+++ b/src/task-omatic/task_vm.rb
@@ -65,16 +65,26 @@ def create_vm_xml(name, uuid, memAllocated, memUsed, vcpus, bootDevice,
   doc.root.elements["devices"].add_element("emulator")
   doc.root.elements["devices"].elements["emulator"].text = "/usr/bin/qemu-kvm"
 
-  devs = [ 'hda', 'hdb', 'hdc', 'hdd' ]
-  i = 0
+  devs = ['hda', 'hdb', 'hdc', 'hdd']
+  which_device = 0
   diskDevices.each do |disk|
+    is_cdrom = (disk =~ /\.iso/) ? true : false
+
     diskdev = Element.new("disk")
-    diskdev.add_attribute("type", "block")
-    diskdev.add_attribute("device", "disk")
-    diskdev.add_element("source", {"dev" => disk})
-    diskdev.add_element("target", {"dev" => devs[i]})
+    diskdev.add_attribute("type", is_cdrom ? "file" : "block")
+    diskdev.add_attribute("device", is_cdrom ? "cdrom" : "disk")
+
+    if is_cdrom
+      diskdev.add_element("readonly")
+      diskdev.add_element("source", {"file" => disk})
+      diskdev.add_element("target", {"dev" => devs[which_device], "bus" => "ide"})
+    else
+      diskdev.add_element("source", {"dev" => disk})
+      diskdev.add_element("target", {"dev" => devs[which_device]})
+    end
+
     doc.root.elements["devices"] << diskdev
-    i += 1
+    which_device += 1
   end
 
   doc.root.elements["devices"].add_element("interface", {"type" => "bridge"})
@@ -154,15 +164,12 @@ def create_vm(task)
   # create cobbler system profile
   begin
     if vm.provisioning and !vm.provisioning.empty?
-      provisioning_arr = vm.provisioning.split(Vm::PROVISIONING_DELIMITER)
-      if provisioning_arr[0]==Vm::COBBLER_PREFIX
-        if provisioning_arr[1]==Vm::PROFILE_PREFIX
+      if vm.uses_cobbler?
+        if vm.cobbler_type == Vm::PROFILE_PREFIX:
           system = Cobbler::System.new('name' => vm.uuid,
                                        'profile' => provisioning_arr[2])
           system.interfaces=[Cobbler::NetworkInterface.new({'mac_address' => vm.vnic_mac_addr})]
           system.save
-        elsif provisioning_arr[1]==Vm::IMAGE_PREFIX
-          #FIXME handle cobbler images
         end
       end
     end
@@ -231,6 +238,14 @@ def shutdown_vm(task)
   setVmShutdown(vm)
 end
 
+# Find thes storage pool with the given ip address and export path.
+#
+def find_storage_pool(ip_addr, export_path)
+  StoragePool.find(:first,
+    :conditions =>
+      ['ip_addr = ? and export_path = ?',ip_addr, export_path])
+end
+
 def start_vm(task)
   puts "start_vm"
 
@@ -266,6 +281,50 @@ def start_vm(task)
     # hosts to see if there is a host that will fit these constraints
     host = findHostSLA(vm)
 
+    # if we're booting from a CDROM the VM is an image,
+    # then we need to add the NFS mount as a storage volume for this
+    # boot
+    #
+    if (vm.boot_device == Vm::BOOT_DEV_CDROM) && vm.uses_cobbler? && (vm.cobbler_type == Vm::IMAGE_PREFIX)
+      details = Cobbler::Image.find_one(vm.cobbler_name)
+      
+      raise Exception.new("Image #{vm.cobbler_name} not found in Cobbler server") unless details
+
+      ignored, ip_addr, export_path, filename =
+        details.file.split(/(.*):(.*)\/(.*)/)
+
+      found = false
+
+      vm.storage_volumes.each do |volume|
+        if volume.filename == filename
+          if (volume.storage_pool.ip_addr == ip_addr) &&
+          (volume.storage_pool.export_path == export_path)
+            found = true
+          end
+        end
+      end
+      
+      unless found
+        # Create a new transient NFS storage volume
+        # This volume is *not* persisted.
+        image_volume = StorageVolume.factory("NFS",
+          :filename => filename
+        )
+
+        image_volume.storage_pool
+        image_pool = find_storage_pool(ip_addr, export_path)
+        
+        raise Exception.new("Unable to find Cobbler storage pool") unless image_pool
+        
+        if image_pool
+          image_pool.storage_volumes << image_volume
+          image_pool.save!
+        end
+        vm.storage_volumes << image_volume
+        vm.save!
+      end
+    end
+
     conn = Libvirt::open("qemu+tcp://" + host.hostname + "/system")
 
     storagedevs = connect_storage_pools(conn, vm)
diff --git a/src/test/unit/vm_test.rb b/src/test/unit/vm_test.rb
index 4a5e353..22164e8 100644
--- a/src/test/unit/vm_test.rb
+++ b/src/test/unit/vm_test.rb
@@ -22,8 +22,58 @@ require File.dirname(__FILE__) + '/../test_helper'
 class VmTest < Test::Unit::TestCase
   fixtures :vms
 
-  # Replace this with your real tests.
-  def test_truth
-    assert true
+  def setup
+    @vm_name = "Test"
+    @no_cobbler_provisioning = "#{@vm_name}"
+    @cobbler_image_provisioning =
+      "#{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}"
+  end
+
+  # Ensures that, if the VM does not contain the Cobbler prefix, that it
+  # does not claim to be a Cobbler VM.
+  #
+  def test_uses_cobbler_without_cobbler_prefix
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings=@no_cobbler_provisioning
+
+    flunk "VM is not a Cobbler provisioned one." if vm.uses_cobbler?
+    assert_equal @vm_name, vm.provisioning, "Wrong name reported."
+  end
+
+  # Ensures that the VM reports that it uses Cobbler if the provisioning
+  # is for a Cobbler profile.
+  #
+  def test_uses_cobbler_with_cobbler_profile
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings = @cobbler_profile_provisioning
+
+    flunk "VM did not report that it's Cobbler provisioned." unless vm.uses_cobbler?
+    assert_equal Vm::PROFILE_PREFIX,
+      vm.cobbler_type,
+      "Wrong cobbler type reported."
+    assert_equal @vm_name,
+      vm.cobbler_name,
+      "Wrong name reported."
+  end
+
+  # Ensures that the VM reports that it uses Cobbler if the provisioning
+  # is for a Cobbler image.
+  #
+  def test_uses_cobbler_with_cobbler_image
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings = @cobbler_image_provisioning
+
+    flunk "VM did not report that it's Cobbler provisioned." unless vm.uses_cobbler?
+    assert_equal Vm::IMAGE_PREFIX,
+      vm.cobbler_type,
+      "Wrong cobbler type reported."
+    assert_equal @vm_name,
+      vm.cobbler_name,
+      "Wrong name reported."
   end
 end
-- 
1.5.5.1



From jim at meyering.net  Thu Oct  9 15:16:06 2008
From: jim at meyering.net (Jim Meyering)
Date: Thu, 09 Oct 2008 17:16:06 +0200
Subject: [Ovirt-devel] [PATCH *all-7*] autogen.sh: run autoheader and
	libtool only if needed
Message-ID: <87bpxtztmx.fsf@rho.meyering.net>

This makes it so autogen.sh (all 7 modules) no longer
runs autoheader unnecessarily (suggestion from Alan Pevec).
Also, it skips the check for libtool when it's not needed.
[it's not needed in any of these modules]

I tested it by running this:

  for i in *; do test -d $i/.git && (cd $i && ./autogen.sh); done

and ensuring there were no errors.

>From b2eaec5c40bb3bd5c63baca9513dade17cae510a Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Thu, 9 Oct 2008 17:03:56 +0200
Subject: [PATCH appliance] autogen.sh: run autoheader and libtool only if needed

---
 autogen.sh |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 8e77f25..6b0970f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,12 +17,17 @@ THEDIR=`pwd`
 	  die=1
   }

-  (libtool --version) < /dev/null > /dev/null 2>&1 || {
+  # Require libtool only if one of of LT_INIT,
+  # AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac.
+  grep -E '^[[:blank:]]*(LT_INIT|A[CM]_PROG_LIBTOOL)' configure.ac >/dev/null \
+      && {
+    (libtool --version) < /dev/null > /dev/null 2>&1 || {
 	  echo
 	  echo "You must have libtool installed."
 	  echo "Download the appropriate package for your distribution,"
 	  echo "or see http://www.gnu.org/software/libtool"
 	  die=1
+    }
   }

   (automake --version) < /dev/null > /dev/null 2>&1 || {
@@ -46,7 +51,10 @@ THEDIR=`pwd`
   fi

   aclocal
-  autoheader
+
+  # Run autoheader only if needed
+  grep '^[[:blank:]]*AC_CONFIG_HEADERS' configure.ac >/dev/null && autoheader
+
   automake --add-missing
   autoconf
   ./configure "$@"
--
1.6.0.2.304.gc76d

>From 9621960dd03f2204f4a968ba9afac49ea3e0dc7a Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Thu, 9 Oct 2008 17:03:56 +0200
Subject: [PATCH docs] autogen.sh: run autoheader and libtool only if needed

---
 autogen.sh |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 234141b..74fc1e2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,12 +17,17 @@ THEDIR=`pwd`
 	  die=1
   }

-  (libtool --version) < /dev/null > /dev/null 2>&1 || {
+  # Require libtool only if one of of LT_INIT,
+  # AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac.
+  grep -E '^[[:blank:]]*(LT_INIT|A[CM]_PROG_LIBTOOL)' configure.ac >/dev/null \
+      && {
+    (libtool --version) < /dev/null > /dev/null 2>&1 || {
 	  echo
 	  echo "You must have libtool installed."
 	  echo "Download the appropriate package for your distribution,"
 	  echo "or see http://www.gnu.org/software/libtool"
 	  die=1
+    }
   }

   (automake --version) < /dev/null > /dev/null 2>&1 || {
@@ -46,7 +51,10 @@ THEDIR=`pwd`
   fi

   aclocal
-  autoheader
+
+  # Run autoheader only if needed
+  grep '^[[:blank:]]*AC_CONFIG_HEADERS' configure.ac >/dev/null && autoheader
+
   automake --add-missing
   autoconf
   ./configure "$@"
--
1.6.0.2.304.gc76d

>From e732750ce270975bc6ae338ff0728dbedfa6193d Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Thu, 9 Oct 2008 17:03:56 +0200
Subject: [PATCH node] autogen.sh: run autoheader and libtool only if needed

---
 autogen.sh |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index d018b64..5fd5c2f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,12 +17,17 @@ THEDIR=`pwd`
 	  die=1
   }

-  (libtool --version) < /dev/null > /dev/null 2>&1 || {
+  # Require libtool only if one of of LT_INIT,
+  # AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac.
+  grep -E '^[[:blank:]]*(LT_INIT|A[CM]_PROG_LIBTOOL)' configure.ac >/dev/null \
+      && {
+    (libtool --version) < /dev/null > /dev/null 2>&1 || {
 	  echo
 	  echo "You must have libtool installed."
 	  echo "Download the appropriate package for your distribution,"
 	  echo "or see http://www.gnu.org/software/libtool"
 	  die=1
+    }
   }

   (automake --version) < /dev/null > /dev/null 2>&1 || {
@@ -46,7 +51,10 @@ THEDIR=`pwd`
   fi

   aclocal
-  autoheader
+
+  # Run autoheader only if needed
+  grep '^[[:blank:]]*AC_CONFIG_HEADERS' configure.ac >/dev/null && autoheader
+
   automake --add-missing
   autoconf
   ./configure "$@"
--
1.6.0.2.304.gc76d

>From 82e8c9d6bc8a2b7fd215074f4bccc3b3344bff5d Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Thu, 9 Oct 2008 17:03:56 +0200
Subject: [PATCH node-image] autogen.sh: run autoheader and libtool only if needed

---
 autogen.sh |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index a2b0f89..e4b75c2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,12 +17,17 @@ THEDIR=`pwd`
 	  die=1
   }

-  (libtool --version) < /dev/null > /dev/null 2>&1 || {
+  # Require libtool only if one of of LT_INIT,
+  # AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac.
+  grep -E '^[[:blank:]]*(LT_INIT|A[CM]_PROG_LIBTOOL)' configure.ac >/dev/null \
+      && {
+    (libtool --version) < /dev/null > /dev/null 2>&1 || {
 	  echo
 	  echo "You must have libtool installed."
 	  echo "Download the appropriate package for your distribution,"
 	  echo "or see http://www.gnu.org/software/libtool"
 	  die=1
+    }
   }

   (automake --version) < /dev/null > /dev/null 2>&1 || {
@@ -46,7 +51,10 @@ THEDIR=`pwd`
   fi

   aclocal
-  autoheader
+
+  # Run autoheader only if needed
+  grep '^[[:blank:]]*AC_CONFIG_HEADERS' configure.ac >/dev/null && autoheader
+
   automake --add-missing
   autoconf
   ./configure "$@"
--
1.6.0.2.304.gc76d

>From ea981202624fe8600d9adb143e1a0984dc511267 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Thu, 9 Oct 2008 17:03:56 +0200
Subject: [PATCH recipe] autogen.sh: run autoheader and libtool only if needed

---
 autogen.sh |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 02a4ca2..34b0e47 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,12 +17,17 @@ THEDIR=`pwd`
 	  die=1
   }

-  (libtool --version) < /dev/null > /dev/null 2>&1 || {
+  # Require libtool only if one of of LT_INIT,
+  # AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac.
+  grep -E '^[[:blank:]]*(LT_INIT|A[CM]_PROG_LIBTOOL)' configure.ac >/dev/null \
+      && {
+    (libtool --version) < /dev/null > /dev/null 2>&1 || {
 	  echo
 	  echo "You must have libtool installed."
 	  echo "Download the appropriate package for your distribution,"
 	  echo "or see http://www.gnu.org/software/libtool"
 	  die=1
+    }
   }

   (automake --version) < /dev/null > /dev/null 2>&1 || {
@@ -46,7 +51,10 @@ THEDIR=`pwd`
   fi

   aclocal
-  autoheader
+
+  # Run autoheader only if needed
+  grep '^[[:blank:]]*AC_CONFIG_HEADERS' configure.ac >/dev/null && autoheader
+
   automake --add-missing
   autoconf
   ./configure "$@"
--
1.6.0.2.304.gc76d

>From a3825ffe53956f46981daa6776943b5d65c71aeb Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Thu, 9 Oct 2008 17:03:56 +0200
Subject: [PATCH release] autogen.sh: run autoheader and libtool only if needed

---
 autogen.sh |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index cca9761..af6ff67 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,12 +17,17 @@ THEDIR=`pwd`
 	  die=1
   }

-  (libtool --version) < /dev/null > /dev/null 2>&1 || {
+  # Require libtool only if one of of LT_INIT,
+  # AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac.
+  grep -E '^[[:blank:]]*(LT_INIT|A[CM]_PROG_LIBTOOL)' configure.ac >/dev/null \
+      && {
+    (libtool --version) < /dev/null > /dev/null 2>&1 || {
 	  echo
 	  echo "You must have libtool installed."
 	  echo "Download the appropriate package for your distribution,"
 	  echo "or see http://www.gnu.org/software/libtool"
 	  die=1
+    }
   }

   (automake --version) < /dev/null > /dev/null 2>&1 || {
@@ -46,7 +51,10 @@ THEDIR=`pwd`
   fi

   aclocal
-  autoheader
+
+  # Run autoheader only if needed
+  grep '^[[:blank:]]*AC_CONFIG_HEADERS' configure.ac >/dev/null && autoheader
+
   automake --add-missing
   autoconf
   ./configure "$@"
--
1.6.0.2.304.gc76d

>From d8d0db5e0d902e779c89a81426a0340249ae8e8e Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Thu, 9 Oct 2008 17:03:56 +0200
Subject: [PATCH server] autogen.sh: run autoheader and libtool only if needed

---
 autogen.sh |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 7f0ca85..68ef0d8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,12 +17,17 @@ THEDIR=`pwd`
 	  die=1
   }

-  (libtool --version) < /dev/null > /dev/null 2>&1 || {
+  # Require libtool only if one of of LT_INIT,
+  # AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac.
+  grep -E '^[[:blank:]]*(LT_INIT|A[CM]_PROG_LIBTOOL)' configure.ac >/dev/null \
+      && {
+    (libtool --version) < /dev/null > /dev/null 2>&1 || {
 	  echo
 	  echo "You must have libtool installed."
 	  echo "Download the appropriate package for your distribution,"
 	  echo "or see http://www.gnu.org/software/libtool"
 	  die=1
+    }
   }

   (automake --version) < /dev/null > /dev/null 2>&1 || {
@@ -46,7 +51,10 @@ THEDIR=`pwd`
   fi

   aclocal
-  autoheader
+
+  # Run autoheader only if needed
+  grep '^[[:blank:]]*AC_CONFIG_HEADERS' configure.ac >/dev/null && autoheader
+
   automake --add-missing
   autoconf
   ./configure "$@"
--
1.6.0.2.304.gc76d



From dpierce at redhat.com  Thu Oct  9 15:17:58 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Thu,  9 Oct 2008 11:17:58 -0400
Subject: [Ovirt-devel] [PATCH server] Added support for booting a VM from an
	ISO image.
Message-ID: <1223565478-15734-1-git-send-email-dpierce@redhat.com>

The NFS export for Cobbler needs to be added as an NFS storage pool.
Otherwise, taskomatic will not be able to locate it.

Also added a few helper methods to Vm to contain the knowledge
of how Cobbler integration is contained.

When a user adds an ISO image to the Cobbler server on the appliance,
they will need to do so using the full NFS path for where the virtual
image will go to mount it; i.e., hostname:/path/to/filename.iso

If the filename ends in ".iso" then the virtual machine will mount the
file as a CDROM device and boot it. Otherwise, it mounts it as a hard
disk device.

To add an image to Cobbler, do the following:

1. Download an ISO image, such as the KDE LiveImage from Fedora.
2. Copy it to the NFS directory on the server:
  cp *.iso /ovirtnfs/kde-live-cd.iso
3. Add that image to your Cobbler instance:
  cobbler image add --name=KDE-LiveCD --file=management.priv.ovirt.org:/ovirtnfs/kde-live-cd.iso
4. Create a new VM in your server.
5. Select "KDE-LiveCD" from the list of operating systems.
6. Save the VM.
7. Start the VM.

It should run the selected ISO.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 src/app/controllers/vm_controller.rb |   50 ++++++++++++--------
 src/app/models/vm.rb                 |   34 +++++++++++++-
 src/task-omatic/task_vm.rb           |   81 +++++++++++++++++++++++++++++-----
 src/test/unit/vm_test.rb             |   56 ++++++++++++++++++++++-
 4 files changed, 184 insertions(+), 37 deletions(-)

diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb
index f5c0845..0ec2837 100644
--- a/src/app/controllers/vm_controller.rb
+++ b/src/app/controllers/vm_controller.rb
@@ -223,13 +223,18 @@ class VmController < ApplicationController
   def _setup_provisioning_options
     @provisioning_options = [[Vm::PXE_OPTION_LABEL, Vm::PXE_OPTION_VALUE],
                              [Vm::HD_OPTION_LABEL, Vm::HD_OPTION_VALUE]]
-    # FIXME add cobbler images too
+
     begin
+      @provisioning_options += Cobbler::Image.find.collect do |image|
+        [image.name + Vm::COBBLER_IMAGE_SUFFIX,
+          "#{Vm::IMAGE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{image.name}"]
+      end
+
       @provisioning_options += Cobbler::Profile.find.collect do |profile|
         [profile.name + Vm::COBBLER_PROFILE_SUFFIX,
-         Vm::COBBLER_PREFIX + Vm::PROVISIONING_DELIMITER +
-         Vm::PROFILE_PREFIX + Vm::PROVISIONING_DELIMITER + profile.name]
-      end
+          "#{Vm::PROFILE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{profile.name}"]
+
+    end
     rescue
       #if cobbler doesn't respond/is misconfigured/etc just don't add profiles
     end
@@ -239,24 +244,29 @@ class VmController < ApplicationController
   def _setup_vm_provision(params)
     # spaces are invalid in the cobbler name
     name = params[:vm][:uuid]
-    provision = params[:vm][:provisioning_and_boot_settings].gsub(
-         Vm::COBBLER_PREFIX + Vm::PROVISIONING_DELIMITER +
-         Vm::PROFILE_PREFIX + Vm::PROVISIONING_DELIMITER, "")
     mac = params[:vm][:vnic_mac_addr]
-    unless provision == Vm::PXE_OPTION_VALUE or
-           provision == Vm::HD_OPTION_VALUE
-      found = false
-      Cobbler::System.find.each{ |system|
-        if system.name == name
-          system.profile = provision
-          system.save
-          found = true
+    provision = params[:vm][:provisioning_and_boot_settings]
+    # determine what type of provisioning was selected for the VM
+    provisioning_type = :pxe_or_hd_type
+    provisioning_type = :image_type  if provision =~ /Vm::IMAGE_PREFIX at Vm::COBBLER_PREFIX/
+    provisioning_type = :system_type if provision =~ /Vm::PROFILE_PREFIX at Vm::COBBLER_PREFIX/
+
+    unless provisioning_type == :pxe_or_hd_type
+      cobbler_name = provision.gsub(/(Vm::IMAGE_PREFIX|Vm::PROFILE_PREFIX)@Vm::COBBLER_PREFIX/, '')
+
+      system = Cobbler::System.find_one(name)
+
+      unless system
+        nic = Cobbler::NetworkInterface.new({'mac_address' => mac})
+
+        case provisioning_type
+        when :image_type:
+            system = Cobbler::System.create("name" => name, "image"    => cobbler_name)
+        when :system_type:
+            system = Cobbler::System.create("name" => name, "profile" => cobbler_name)
         end
-      }
-      unless found
-        system = Cobbler::System.create("name" => name,
-                                        "profile" => provision)
-        system.interfaces=[Cobbler::NetworkInterface.new({'mac_address' => mac})]
+
+        system.interfaces = [nic]
         system.save
       end
     end
diff --git a/src/app/models/vm.rb b/src/app/models/vm.rb
index ace6fb1..d7beacf 100644
--- a/src/app/models/vm.rb
+++ b/src/app/models/vm.rb
@@ -49,7 +49,7 @@ class Vm < ActiveRecord::Base
   PROFILE_PREFIX         = "profile"
   IMAGE_PREFIX           = "image"
   COBBLER_PROFILE_SUFFIX = " (Cobbler Profile)"
-  COBBLER_IMAGE_SUFFIX   = " (Cobbler Profile)"
+  COBBLER_IMAGE_SUFFIX   = " (Cobbler Image)"
 
   PXE_OPTION_LABEL       = "PXE Boot"
   PXE_OPTION_VALUE       = "pxe"
@@ -139,7 +139,15 @@ class Vm < ActiveRecord::Base
   end
 
   def provisioning_and_boot_settings=(settings)
-    if settings==PXE_OPTION_VALUE
+    # if the settings have a prefix that matches cobber settings, then process
+    # those details
+    if settings =~ /#{IMAGE_PREFIX}@#{COBBLER_PREFIX}/
+      self[:boot_device] = BOOT_DEV_CDROM
+      self[:provisioning] = settings
+    elsif settings =~ /#{PROFILE_PREFIX}@#{COBBLER_PREFIX}/
+      self[:boot_device] = BOOT_DEV_NETWORK
+      self[:provisioning] = settings
+    elsif settings==PXE_OPTION_VALUE
       self[:boot_device]= BOOT_DEV_NETWORK
       self[:provisioning]= nil
     elsif settings==HD_OPTION_VALUE
@@ -242,6 +250,28 @@ class Vm < ActiveRecord::Base
     vm_resource_pool.search_users
   end
 
+  # Reports whether the VM is uses Cobbler for booting.
+  #
+  def uses_cobbler?
+    (self.provisioning != nil) && (self.provisioning.include? COBBLER_PREFIX)
+  end
+
+  # Returns the cobbler type.
+  #
+  def cobbler_type
+    if self.uses_cobbler?
+      self.provisioning[/^(.*)@/,1]
+    end
+  end
+
+  # Returns the cobbler provisioning name.
+  #
+  def cobbler_name
+    if self.uses_cobbler?
+      self.provisioning[/^.*@.*:(.*)/,1]
+    end
+  end
+
   protected
   def validate
     resources = vm_resource_pool.max_resources_for_vm(self)
diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb
index 3588224..ef0f8e2 100644
--- a/src/task-omatic/task_vm.rb
+++ b/src/task-omatic/task_vm.rb
@@ -65,16 +65,26 @@ def create_vm_xml(name, uuid, memAllocated, memUsed, vcpus, bootDevice,
   doc.root.elements["devices"].add_element("emulator")
   doc.root.elements["devices"].elements["emulator"].text = "/usr/bin/qemu-kvm"
 
-  devs = [ 'hda', 'hdb', 'hdc', 'hdd' ]
-  i = 0
+  devs = ['hda', 'hdb', 'hdc', 'hdd']
+  which_device = 0
   diskDevices.each do |disk|
+    is_cdrom = (disk =~ /\.iso/) ? true : false
+
     diskdev = Element.new("disk")
-    diskdev.add_attribute("type", "block")
-    diskdev.add_attribute("device", "disk")
-    diskdev.add_element("source", {"dev" => disk})
-    diskdev.add_element("target", {"dev" => devs[i]})
+    diskdev.add_attribute("type", is_cdrom ? "file" : "block")
+    diskdev.add_attribute("device", is_cdrom ? "cdrom" : "disk")
+
+    if is_cdrom
+      diskdev.add_element("readonly")
+      diskdev.add_element("source", {"file" => disk})
+      diskdev.add_element("target", {"dev" => devs[which_device], "bus" => "ide"})
+    else
+      diskdev.add_element("source", {"dev" => disk})
+      diskdev.add_element("target", {"dev" => devs[which_device]})
+    end
+
     doc.root.elements["devices"] << diskdev
-    i += 1
+    which_device += 1
   end
 
   doc.root.elements["devices"].add_element("interface", {"type" => "bridge"})
@@ -154,15 +164,12 @@ def create_vm(task)
   # create cobbler system profile
   begin
     if vm.provisioning and !vm.provisioning.empty?
-      provisioning_arr = vm.provisioning.split(Vm::PROVISIONING_DELIMITER)
-      if provisioning_arr[0]==Vm::COBBLER_PREFIX
-        if provisioning_arr[1]==Vm::PROFILE_PREFIX
+      if vm.uses_cobbler?
+        if vm.cobbler_type == Vm::PROFILE_PREFIX:
           system = Cobbler::System.new('name' => vm.uuid,
                                        'profile' => provisioning_arr[2])
           system.interfaces=[Cobbler::NetworkInterface.new({'mac_address' => vm.vnic_mac_addr})]
           system.save
-        elsif provisioning_arr[1]==Vm::IMAGE_PREFIX
-          #FIXME handle cobbler images
         end
       end
     end
@@ -231,6 +238,14 @@ def shutdown_vm(task)
   setVmShutdown(vm)
 end
 
+# Find thes storage pool with the given ip address and export path.
+#
+def find_storage_pool(ip_addr, export_path)
+  StoragePool.find(:first,
+    :conditions =>
+      ['ip_addr = ? and export_path = ?',ip_addr, export_path])
+end
+
 def start_vm(task)
   puts "start_vm"
 
@@ -266,6 +281,48 @@ def start_vm(task)
     # hosts to see if there is a host that will fit these constraints
     host = findHostSLA(vm)
 
+    # if we're booting from a CDROM the VM is an image,
+    # then we need to add the NFS mount as a storage volume for this
+    # boot
+    #
+    if (vm.boot_device == Vm::BOOT_DEV_CDROM) && vm.uses_cobbler? && (vm.cobbler_type == Vm::IMAGE_PREFIX)
+      details = Cobbler::Image.find_one(vm.cobbler_name)
+
+      raise Exception.new("Image #{vm.cobbler_name} not found in Cobbler server") unless details
+
+      ignored, ip_addr, export_path, filename =
+        details.file.split(/(.*):(.*)\/(.*)/)
+
+      found = false
+
+      vm.storage_volumes.each do |volume|
+        if volume.filename == filename
+          if (volume.storage_pool.ip_addr == ip_addr) &&
+          (volume.storage_pool.export_path == export_path)
+            found = true
+          end
+        end
+      end
+
+      unless found
+        # Create a new transient NFS storage volume
+        # This volume is *not* persisted.
+        image_volume = StorageVolume.factory("NFS",
+          :filename => filename
+        )
+
+        image_volume.storage_pool
+        image_pool = find_storage_pool(ip_addr, export_path)
+
+        raise Exception.new("Unable to find Cobbler storage pool") unless image_pool
+
+        if image_pool
+          image_pool.storage_volumes << image_volume
+        end
+        vm.storage_volumes << image_volume
+      end
+    end
+
     conn = Libvirt::open("qemu+tcp://" + host.hostname + "/system")
 
     storagedevs = connect_storage_pools(conn, vm)
diff --git a/src/test/unit/vm_test.rb b/src/test/unit/vm_test.rb
index 4a5e353..22164e8 100644
--- a/src/test/unit/vm_test.rb
+++ b/src/test/unit/vm_test.rb
@@ -22,8 +22,58 @@ require File.dirname(__FILE__) + '/../test_helper'
 class VmTest < Test::Unit::TestCase
   fixtures :vms
 
-  # Replace this with your real tests.
-  def test_truth
-    assert true
+  def setup
+    @vm_name = "Test"
+    @no_cobbler_provisioning = "#{@vm_name}"
+    @cobbler_image_provisioning =
+      "#{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}"
+  end
+
+  # Ensures that, if the VM does not contain the Cobbler prefix, that it
+  # does not claim to be a Cobbler VM.
+  #
+  def test_uses_cobbler_without_cobbler_prefix
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings=@no_cobbler_provisioning
+
+    flunk "VM is not a Cobbler provisioned one." if vm.uses_cobbler?
+    assert_equal @vm_name, vm.provisioning, "Wrong name reported."
+  end
+
+  # Ensures that the VM reports that it uses Cobbler if the provisioning
+  # is for a Cobbler profile.
+  #
+  def test_uses_cobbler_with_cobbler_profile
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings = @cobbler_profile_provisioning
+
+    flunk "VM did not report that it's Cobbler provisioned." unless vm.uses_cobbler?
+    assert_equal Vm::PROFILE_PREFIX,
+      vm.cobbler_type,
+      "Wrong cobbler type reported."
+    assert_equal @vm_name,
+      vm.cobbler_name,
+      "Wrong name reported."
+  end
+
+  # Ensures that the VM reports that it uses Cobbler if the provisioning
+  # is for a Cobbler image.
+  #
+  def test_uses_cobbler_with_cobbler_image
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings = @cobbler_image_provisioning
+
+    flunk "VM did not report that it's Cobbler provisioned." unless vm.uses_cobbler?
+    assert_equal Vm::IMAGE_PREFIX,
+      vm.cobbler_type,
+      "Wrong cobbler type reported."
+    assert_equal @vm_name,
+      vm.cobbler_name,
+      "Wrong name reported."
   end
 end
-- 
1.5.5.1



From xxqonline at hotmail.com  Thu Oct  9 14:59:53 2008
From: xxqonline at hotmail.com (xxqonline at hotmail.com)
Date: Thu, 9 Oct 2008 22:59:53 +0800
Subject: [Ovirt-devel] I cannot start virtual machine in virsh 0.4.5
In-Reply-To: <BAY124-DS385AEB6571E13A3DFA8B8B13A0@phx.gbl>
References: <BAY124-DS385AEB6571E13A3DFA8B8B13A0@phx.gbl>
Message-ID: <BAY124-DS57FB9CDD2D6F0A16CA774B13A0@phx.gbl>


Hello folks:
      I use the virsh 0.4.5. I followed the quick start to set the storage pool (nfs).
After that I checked the property of that pool. There is no size information.
Then I create a vm pool, and try to create a fedora 9 (Cobbler Profile), I failed to start it.
Can any one give me a help?

I am new to ovirt, I really want to start the virtual machine, can any one give me a help?
I am trying to find the error log, but seems there is no error, just told me the vm cannot be started, is there any log that I can use to trouble shooting?

Thanks,
Qiang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081009/0001af15/attachment.htm>

From apevec at redhat.com  Thu Oct  9 15:33:45 2008
From: apevec at redhat.com (Alan Pevec)
Date: Thu,  9 Oct 2008 17:33:45 +0200
Subject: [Ovirt-devel] [PATCH ovirt-appliance] configure node5 to persist
	config and node3 stateless
Message-ID: <1223566425-23216-1-git-send-email-apevec@redhat.com>

People are usually starting node3 and get confused after appliance
reinstallation, since persisted old keytab is not valid anymore.

NOTE: there's a script ovirt-release/misc-scripts/ovirt-reset-fake-nodes
to wipe local storage of all 'fake' Nodes

Signed-off-by: Alan Pevec <apevec at redhat.com>
---
 ovirt-appliance.ks |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ovirt-appliance.ks b/ovirt-appliance.ks
index 0fd5186..28f171e 100644
--- a/ovirt-appliance.ks
+++ b/ovirt-appliance.ks
@@ -121,11 +121,11 @@ cobbler distro add --name="oVirt-Node-$arch" --arch=$arch \
   --kopts="rootflags=loop root=/ovirt-node-image.iso rootfstype=iso9660 ro console=ttyS0,115200n8 console=tty0"
 cobbler profile add --name=oVirt-Node-$arch --distro=oVirt-Node-$arch
 cobbler system add --netboot-enabled=1 --profile=oVirt-Node-$arch \
-  --name=node3 --mac=00:16:3e:12:34:57 --kopts="ovirt_init=scsi"
+  --name=node3 --mac=00:16:3e:12:34:57
 cobbler system add --netboot-enabled=1 --profile=oVirt-Node-$arch \
   --name=node4 --mac=00:16:3e:12:34:58 --kopts="ovirt_init=scsi ovirt_local_boot"
 cobbler system add --netboot-enabled=1 --profile=oVirt-Node-$arch \
-  --name=node5 --mac=00:16:3e:12:34:59
+  --name=node5 --mac=00:16:3e:12:34:59 --kopts="ovirt_init=scsi"
 set +x
 echo "Add new oVirt Nodes as Cobbler systems to make them PXE boot oVirt Node image directly."
 echo "oVirt-Node-$arch is also default boot option in Cobbler menu"
-- 
1.5.5.1



From jim at meyering.net  Thu Oct  9 15:44:51 2008
From: jim at meyering.net (Jim Meyering)
Date: Thu, 09 Oct 2008 17:44:51 +0200
Subject: [Ovirt-devel] [PATCH *ALL*] Makefile.am: set OVIRT_DEV
	from	Release: 0 in spec.in file
In-Reply-To: <48ED84AE.9090606@redhat.com> (Perry N. Myers's message of "Thu, 
	09 Oct 2008 00:12:30 -0400")
References: <87bpxv3tii.fsf@rho.meyering.net> <48ED84AE.9090606@redhat.com>
Message-ID: <8763o1zsb0.fsf@rho.meyering.net>

"Perry N. Myers" <pmyers at redhat.com> wrote:
> Jim Meyering wrote:
>> I'd been running "make build" without setting OVIRT_DEV.
>> That would cause trouble due to using out of date RPMs.
>> But in development, we should always simply set OVIRT_DEV=1.
>> We know we're in development mode when the spec.in file contains
>> has a line that starts like this:
>>
>>     Release: 0
>>
>> so I've adjusted all Makefile.am files to automatically do
>> what we want.  Painful to have to put this same snippet in
>> 7 different repositories, but very soon I'll be motivated
>> (and have time) to factor out the worst of that duplication.
>
> These patches seem to work fine, and I would ACK them except...
>
> I've noticed that occasionally the rpm flags for OVIRT_DEV are not set
> properly in the ovirt-appliance repo, causing the version for
> ovirt-appliance to occasionally be 0.94-0 even though the Release is 0
> in the spec file.  I can't seem to replicate the error with any
> consistency. It just happens once and a while with seemingly the same
> environment (I know there must be something different, but haven't
> pinned it down yet)
>
> If anyone has seen this behavior w/o these patches applied please let
> me know, as maybe this has been a problem all along.  It could be that
> the bashism used to set rpm_flags is not working properly in the
> Makefile.

Hi Perry,

I've run "make build" several times, both with and without OVIRT_DEV=1
in my environment, (though just for the first few seconds each time,
which is enough to see the relevant rpmbuild command),
and every time I saw the expected .git... argument:

   --define "extra_release .$(date --utc +%Y%m%d%H%M%S)git$(git log -1 --pretty=format:%h)"

Ah ha.
But if I build with "make publish OVIRT_DEV=",
*then* I see what you report: no extra_release definition.

To reduce the likelihood of that happening,
I could change the variable name to e.g., _OVIRT_DEV.
But maybe it's not worth worrying about.
You choose.



From apevec at redhat.com  Thu Oct  9 16:06:00 2008
From: apevec at redhat.com (Alan Pevec)
Date: Thu, 09 Oct 2008 18:06:00 +0200
Subject: [Ovirt-devel] Can any one help me,	I cannot start the virtual
	machine with default ovirt-appliance
In-Reply-To: <BAY124-DS2355D5B778D1923557997B13A0@phx.gbl>
References: <BAY124-DS2355D5B778D1923557997B13A0@phx.gbl>
Message-ID: <48EE2BE8.1030101@redhat.com>

xxqonline at hotmail.com wrote:
> Hello folks:
>       I use the virsh 0.4.5. I followed the quick start to set the 
> storage pool (nfs).
> After that I checked the property of that pool. There is no size 
> information.
> Then I create a vm pool, and try to create a fedora 9 (Cobbler Profile), 
> I failed to start it.
> Can any one give me a help?

First, which version are you using?
Check that firstrun worked fine, see http://ovirt.org/page/TroubleShooting#Debugging_oVirt_Appliance_firstboot
for how to modify the fresh image after ovirt-appliance RPM installation and before starting it up for the first time and check logs mentioned there.



From jim at meyering.net  Thu Oct  9 17:18:04 2008
From: jim at meyering.net (Jim Meyering)
Date: Thu, 09 Oct 2008 19:18:04 +0200
Subject: [Ovirt-devel] [PATCH *ALL*] Makefile.am: set OVIRT_DEV
	from	Release: 0 in spec.in file
In-Reply-To: <8763o1zsb0.fsf@rho.meyering.net> (Jim Meyering's message of
	"Thu, 09 Oct 2008 17:44:51 +0200")
References: <87bpxv3tii.fsf@rho.meyering.net> <48ED84AE.9090606@redhat.com>
	<8763o1zsb0.fsf@rho.meyering.net>
Message-ID: <87r66py9f7.fsf@rho.meyering.net>

Jim Meyering <jim at meyering.net> wrote:

> "Perry N. Myers" <pmyers at redhat.com> wrote:
>> Jim Meyering wrote:
>>> I'd been running "make build" without setting OVIRT_DEV.
>>> That would cause trouble due to using out of date RPMs.
>>> But in development, we should always simply set OVIRT_DEV=1.
>>> We know we're in development mode when the spec.in file contains
>>> has a line that starts like this:
>>>
>>>     Release: 0
>>>
>>> so I've adjusted all Makefile.am files to automatically do
>>> what we want.  Painful to have to put this same snippet in
>>> 7 different repositories, but very soon I'll be motivated
>>> (and have time) to factor out the worst of that duplication.
>>
>> These patches seem to work fine, and I would ACK them except...
>>
>> I've noticed that occasionally the rpm flags for OVIRT_DEV are not set
>> properly in the ovirt-appliance repo, causing the version for
>> ovirt-appliance to occasionally be 0.94-0 even though the Release is 0
>> in the spec file.  I can't seem to replicate the error with any
>> consistency. It just happens once and a while with seemingly the same
>> environment (I know there must be something different, but haven't
>> pinned it down yet)
>>
>> If anyone has seen this behavior w/o these patches applied please let
>> me know, as maybe this has been a problem all along.  It could be that
>> the bashism used to set rpm_flags is not working properly in the
>> Makefile.
>
> Hi Perry,
>
> I've run "make build" several times, both with and without OVIRT_DEV=1
> in my environment, (though just for the first few seconds each time,
> which is enough to see the relevant rpmbuild command),
> and every time I saw the expected .git... argument:
>
>    --define "extra_release .$(date --utc +%Y%m%d%H%M%S)git$(git log -1 --pretty=format:%h)"
>
> Ah ha.
> But if I build with "make publish OVIRT_DEV=",
> *then* I see what you report: no extra_release definition.
>
> To reduce the likelihood of that happening,
> I could change the variable name to e.g., _OVIRT_DEV.

I've changed it to _ovirt_dev.
I'll push these 7 identical (modulo context) changes after I eat:

>From 9db4eb4dad24f3b5132944c5c1b916d2a42be615 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Thu, 9 Oct 2008 19:16:01 +0200
Subject: [PATCH appliance] Makefile.am: obviate OVIRT_DEV envvar

Now, _ovirt_dev is automatically set from Release: 0 in spec.in file.
Just like OVIRT_DEV was, it's used to define (or not) "extra_release".
---
 Makefile.am |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6631274..8cba85d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,12 +25,17 @@ EXTRA_DIST =				\
   ovirt-appliance.spec		\
   ovirt-appliance.spec.in

+# For Release: 0..., set _ovirt_dev=1 so that we get extra_release.GIT-
+# annotated rpm version strings.
+_ovirt_dev = \
+ $(shell grep -q '^[[:space:]]*Release:[[:space:]]*0' \
+   $(srcdir)/*.spec.in && echo 1 || :)

 git_head	= $$(git log -1 --pretty=format:%h)
 GIT_RELEASE	= $$(date --utc +%Y%m%d%H%M%S)git$(git_head)
 RPMDIR		= $$(rpm --eval '%{_rpmdir}')
 RPM_FLAGS	= --define "ovirt_cache_dir $(OVIRT_CACHE_DIR)"
-RPM_FLAGS	+= $(if $(OVIRT_DEV),--define "extra_release .$(GIT_RELEASE)")
+RPM_FLAGS	+= $(if $(_ovirt_dev),--define "extra_release .$(GIT_RELEASE)")
 # FEDORA_URL env var can be set to the root of a fedora mirror
 RPM_FLAGS	+= $(if $(FEDORA_URL),--define "fedora_url $(FEDORA_URL)")
 # OVIRT_URL env var can be set to the root of an ovirt.org mirror
--
1.6.0.2.304.gc76d

>From 96223e17149e0440b616c75d4c189363318ab187 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Thu, 9 Oct 2008 19:16:01 +0200
Subject: [PATCH docs] Makefile.am: obviate OVIRT_DEV envvar

Now, _ovirt_dev is automatically set from Release: 0 in spec.in file.
Just like OVIRT_DEV was, it's used to define (or not) "extra_release".
---
 Makefile.am |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 47fbbab..9d58e23 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,11 +24,17 @@ EXTRA_DIST =				\
   oVirt_Installation_Guide	\
   Using_the_oVirt_Admin_UI

+# For Release: 0..., set _ovirt_dev=1 so that we get extra_release.GIT-
+# annotated rpm version strings.
+_ovirt_dev = \
+ $(shell grep -q '^[[:space:]]*Release:[[:space:]]*0' \
+   $(srcdir)/*.spec.in && echo 1 || :)
+
 git_head	= $$(git log -1 --pretty=format:%h)
 GIT_RELEASE	= $$(date --utc +%Y%m%d%H%M%S)git$(git_head)
 RPMDIR		= $$(rpm --eval '%{_rpmdir}')
 RPM_FLAGS	= --define "ovirt_cache_dir $(OVIRT_CACHE_DIR)"
-RPM_FLAGS	+= $(if $(OVIRT_DEV),--define "extra_release .$(GIT_RELEASE)")
+RPM_FLAGS	+= $(if $(_ovirt_dev),--define "extra_release .$(GIT_RELEASE)")

 rpms: dist
 	rpmbuild $(RPM_FLAGS) -ta $(distdir).tar.gz
--
1.6.0.2.304.gc76d

>From f8eefaa29fbee9ddbc4b4159f765be573cdbc9e4 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Thu, 9 Oct 2008 19:16:01 +0200
Subject: [PATCH node] Makefile.am: obviate OVIRT_DEV envvar

Now, _ovirt_dev is automatically set from Release: 0 in spec.in file.
Just like OVIRT_DEV was, it's used to define (or not) "extra_release".
---
 Makefile.am |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8ca63dc..1d63310 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,11 +33,17 @@ EXTRA_DIST =			\
   logrotate/ovirt-logrotate	\
   logrotate/ovirt-logrotate.conf

+# For Release: 0..., set _ovirt_dev=1 so that we get extra_release.GIT-
+# annotated rpm version strings.
+_ovirt_dev = \
+ $(shell grep -q '^[[:space:]]*Release:[[:space:]]*0' \
+   $(srcdir)/*.spec.in && echo 1 || :)
+
 git_head	= $$(git log -1 --pretty=format:%h)
 GIT_RELEASE	= $$(date --utc +%Y%m%d%H%M%S)git$(git_head)
 RPMDIR		= $$(rpm --eval '%{_rpmdir}')
 RPM_FLAGS	= --define "ovirt_cache_dir $(OVIRT_CACHE_DIR)"
-RPM_FLAGS	+= $(if $(OVIRT_DEV),--define "extra_release .$(GIT_RELEASE)")
+RPM_FLAGS	+= $(if $(_ovirt_dev),--define "extra_release .$(GIT_RELEASE)")

 rpms: dist
 	rpmbuild $(RPM_FLAGS) -ta $(distdir).tar.gz
--
1.6.0.2.304.gc76d

>From 4b276c09c8d211c63f6e6dc586c8a66b3dab6f05 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Thu, 9 Oct 2008 19:16:01 +0200
Subject: [PATCH node-image] Makefile.am: obviate OVIRT_DEV envvar

Now, _ovirt_dev is automatically set from Release: 0 in spec.in file.
Just like OVIRT_DEV was, it's used to define (or not) "extra_release".
---
 Makefile.am |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 50d55ef..73a0a7b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,11 +30,17 @@ EXTRA_DIST =				\
   ovirt-node-image.ks		\
   ovirt-pxe

+# For Release: 0..., set _ovirt_dev=1 so that we get extra_release.GIT-
+# annotated rpm version strings.
+_ovirt_dev = \
+ $(shell grep -q '^[[:space:]]*Release:[[:space:]]*0' \
+   $(srcdir)/*.spec.in && echo 1 || :)
+
 git_head	= $$(git log -1 --pretty=format:%h)
 GIT_RELEASE	= $$(date --utc +%Y%m%d%H%M%S)git$(git_head)
 RPMDIR		= $$(rpm --eval '%{_rpmdir}')
 RPM_FLAGS	= --define "ovirt_cache_dir $(OVIRT_CACHE_DIR)"
-RPM_FLAGS	+= $(if $(OVIRT_DEV),--define "extra_release .$(GIT_RELEASE)")
+RPM_FLAGS	+= $(if $(_ovirt_dev),--define "extra_release .$(GIT_RELEASE)")
 # FEDORA_URL env var can be set to the root of a fedora mirror
 RPM_FLAGS	+= $(if $(FEDORA_URL),--define "fedora_url $(FEDORA_URL)")
 # OVIRT_URL env var can be set to the root of an ovirt.org mirror
--
1.6.0.2.304.gc76d

>From 1b4e66eca164916440cac9031d174f0c82cc997d Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Thu, 9 Oct 2008 19:16:01 +0200
Subject: [PATCH recipe] Makefile.am: obviate OVIRT_DEV envvar

Now, _ovirt_dev is automatically set from Release: 0 in spec.in file.
Just like OVIRT_DEV was, it's used to define (or not) "extra_release".
---
 Makefile.am |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 37751af..db2962d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,11 +34,17 @@ EXTRA_DIST =			\
   appliances/ovirt/templates/ovirt-server-appliance-setup.erb	\
   appliances/ovirt/templates/terminal.erb

+# For Release: 0..., set _ovirt_dev=1 so that we get extra_release.GIT-
+# annotated rpm version strings.
+_ovirt_dev = \
+ $(shell grep -q '^[[:space:]]*Release:[[:space:]]*0' \
+   $(srcdir)/*.spec.in && echo 1 || :)
+
 git_head	= $$(git log -1 --pretty=format:%h)
 GIT_RELEASE	= $$(date --utc +%Y%m%d%H%M%S)git$(git_head)
 RPMDIR		= $$(rpm --eval '%{_rpmdir}')
 RPM_FLAGS	= --define "ovirt_cache_dir $(OVIRT_CACHE_DIR)"
-RPM_FLAGS	+= $(if $(OVIRT_DEV),--define "extra_release .$(GIT_RELEASE)")
+RPM_FLAGS	+= $(if $(_ovirt_dev),--define "extra_release .$(GIT_RELEASE)")

 rpms: dist
 	rpmbuild $(RPM_FLAGS) -ta $(distdir).tar.gz
--
1.6.0.2.304.gc76d

>From 32e4db1453a2cdbed1ee29fb5f523f1fbbe9709c Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Thu, 9 Oct 2008 19:16:01 +0200
Subject: [PATCH release] Makefile.am: obviate OVIRT_DEV envvar

Now, _ovirt_dev is automatically set from Release: 0 in spec.in file.
Just like OVIRT_DEV was, it's used to define (or not) "extra_release".
---
 Makefile.am |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0637125..d726dab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,11 +25,17 @@ EXTRA_DIST =				\
   ovirt.repo				\
   misc-scripts

+# For Release: 0..., set _ovirt_dev=1 so that we get extra_release.GIT-
+# annotated rpm version strings.
+_ovirt_dev = \
+ $(shell grep -q '^[[:space:]]*Release:[[:space:]]*0' \
+   $(srcdir)/*.spec.in && echo 1 || :)
+
 git_head	= $$(git log -1 --pretty=format:%h)
 GIT_RELEASE	= $$(date --utc +%Y%m%d%H%M%S)git$(git_head)
 RPMDIR		= $$(rpm --eval '%{_rpmdir}')
 RPM_FLAGS	= --define "ovirt_cache_dir $(OVIRT_CACHE_DIR)"
-RPM_FLAGS	+= $(if $(OVIRT_DEV),--define "extra_release .$(GIT_RELEASE)")
+RPM_FLAGS	+= $(if $(_ovirt_dev),--define "extra_release .$(GIT_RELEASE)")

 rpms: dist
 	rpmbuild $(RPM_FLAGS) -ta $(distdir).tar.gz
--
1.6.0.2.304.gc76d

>From e84b82128372d6d58327116a22c6a3cd76084afc Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Thu, 9 Oct 2008 19:16:01 +0200
Subject: [PATCH server] Makefile.am: obviate OVIRT_DEV envvar

Now, _ovirt_dev is automatically set from Release: 0 in spec.in file.
Just like OVIRT_DEV was, it's used to define (or not) "extra_release".
---
 Makefile.am |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index daf6ef0..71a5e9f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,11 +25,17 @@ EXTRA_DIST =			\
   conf					\
   src

+# For Release: 0..., set _ovirt_dev=1 so that we get extra_release.GIT-
+# annotated rpm version strings.
+_ovirt_dev = \
+ $(shell grep -q '^[[:space:]]*Release:[[:space:]]*0' \
+   $(srcdir)/*.spec.in && echo 1 || :)
+
 git_head	= $$(git log -1 --pretty=format:%h)
 GIT_RELEASE	= $$(date --utc +%Y%m%d%H%M%S)git$(git_head)
 RPMDIR		= $$(rpm --eval '%{_rpmdir}')
 RPM_FLAGS	= --define "ovirt_cache_dir $(OVIRT_CACHE_DIR)"
-RPM_FLAGS	+= $(if $(OVIRT_DEV),--define "extra_release .$(GIT_RELEASE)")
+RPM_FLAGS	+= $(if $(_ovirt_dev),--define "extra_release .$(GIT_RELEASE)")

 rpms: dist
 	rpmbuild $(RPM_FLAGS) -ta $(distdir).tar.gz
--
1.6.0.2.304.gc76d



From jim at meyering.net  Thu Oct  9 17:57:26 2008
From: jim at meyering.net (Jim Meyering)
Date: Thu, 09 Oct 2008 19:57:26 +0200
Subject: [Ovirt-devel] [PATCH node] Updated the configuration processing
	to remove the need for scripts.
In-Reply-To: <8763o24y4t.fsf@rho.meyering.net> (Jim Meyering's message of
	"Wed, 08 Oct 2008 22:42:26 +0200")
References: <1223492786-1123-1-git-send-email-dpierce@redhat.com>
	<8763o24y4t.fsf@rho.meyering.net>
Message-ID: <87ljwxy7ll.fsf@rho.meyering.net>

Jim Meyering <jim at meyering.net> wrote:
> "Darryl L. Pierce" <dpierce at redhat.com> wrote:
...
>> +    modconf=$(awk '/bonding=/ {
>> +            match($0, "bonding=(.*)", data)
>> +            split(data[1], mod, "|")
>> +
>> +            alias=mod[1]
>> +            options=mod[2]
>> +
>> +            printf("install %s /sbin/modprobe bonding -o %s %s\n",
>> +                alias, module, alias, options)
>
> We need to do some sanitization (perl calls this untainting) here.
> I.e., we want to reject malicious parameters like "; rm -rf /" or
> "& start-stealthy-daemon...".
>
> So, match alias, module, and options for bogus shell meta-characters,
> or probably-better, accept only a limited alphabet, maybe just
> search for anything matching this /[^[:alnum:]=_ at -]/
>
>> +        }' $CONFIG)
>
> You'll want to diagnose bogosity from within the awk script
> and exit nonzero to tell the shell to fail:
>
>            ...
>            }' $CONFIG) || exit 1;

Hi Darryl,

Here's a little stand-alone script to demonstrate what I meant:

#!/bin/sh
ME=$(basename "$0")
warn() { printf "$ME: $@\n" >&2; }

cat <<\EOF > in
bonding=;rm -rf /|b|c
EOF
modconf=$(awk '/bonding=/ {
           match($0, "bonding=(.*)", data)
           split(data[1], mod, "|")

	   if (match("[^[:alnum:]=_ at -]", mod[1]) >= 0)
	     { printf "invalid bonding alias: \"%s\"\n", mod[1]; exit 1; }

           alias=mod[1]

	   printf("install %s bonding", alias)
  }' in) || { warn "$modconf"; exit 2; }
echo "$modconf"

--------------------------------
It has to be a little tricky that since awk is run from a subshell,
which means its stderr would be ignored, so instead of printing its
own diagnostic, it just prints it to stdout, and the invoker knows
to use the result in _its_ diagnostic when the awk script exits nonzero.



From jim at meyering.net  Thu Oct  9 18:51:09 2008
From: jim at meyering.net (Jim Meyering)
Date: Thu, 09 Oct 2008 20:51:09 +0200
Subject: [Ovirt-devel] [PATCH *all-7*] autogen.sh: run autoheader and
	libtool only if needed
In-Reply-To: <87bpxtztmx.fsf@rho.meyering.net> (Jim Meyering's message of
	"Thu, 09 Oct 2008 17:16:06 +0200")
References: <87bpxtztmx.fsf@rho.meyering.net>
Message-ID: <87fxn5y542.fsf@rho.meyering.net>

Jim Meyering <jim at meyering.net> wrote:
> This makes it so autogen.sh (all 7 modules) no longer
> runs autoheader unnecessarily (suggestion from Alan Pevec).
> Also, it skips the check for libtool when it's not needed.
> [it's not needed in any of these modules]
>
> I tested it by running this:
>
>   for i in *; do test -d $i/.git && (cd $i && ./autogen.sh); done
>
> and ensuring there were no errors.

I've just pushed those.



From slinabery at redhat.com  Thu Oct  9 19:06:45 2008
From: slinabery at redhat.com (Steve Linabery)
Date: Thu, 9 Oct 2008 14:06:45 -0500
Subject: [Ovirt-devel] flexchart build instructions
Message-ID: <20081009190645.GF10125@redhat.com>

Hi,

If anyone would like to build the flexchart swf (Flash Movie), here's how:

0) download the Open Flex SDK at http://opensource.adobe.com/wiki/display/flexsdk/Download+Flex+3 (I think I used latest stable build)
1) unzip that archive somewhere and add the bin subdirectory of same to your PATH
2) Apply the patch I sent for review earlier today
3) cd to {ovirt_src_home}/server/src/flexchart in your patched source tree
4) execute 'mxmlc flexchart.mxml'
5) copy the resulting flexchart.swf to /usr/share/ovirt-server/public on your appliance (which you've just rebuilt using my patch)

Please let me know if it works for you (or doesn't!). If you see blue bars in your chart area (assumes you have some rrd data stored for memory use), it's working.

Thanks,
Steve



From mmorsi at redhat.com  Thu Oct  9 20:44:49 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Thu,  9 Oct 2008 16:44:49 -0400
Subject: [Ovirt-devel] [PATCH server] fixes to the bonding tests
Message-ID: <1223585089-25209-1-git-send-email-mmorsi@redhat.com>

---
 src/app/models/bonding.rb      |    2 ++
 src/app/models/bonding_type.rb |    2 ++
 src/test/unit/bonding_test.rb  |    9 ---------
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/app/models/bonding.rb b/src/app/models/bonding.rb
index 941e2cd..eb25d05 100644
--- a/src/app/models/bonding.rb
+++ b/src/app/models/bonding.rb
@@ -36,6 +36,8 @@ class Bonding < ActiveRecord::Base
   validates_presence_of :interface_name,
     :message => 'An interface name is required.'
 
+  validates_presence_of :host_id
+
   belongs_to :host
   belongs_to :bonding_type
 
diff --git a/src/app/models/bonding_type.rb b/src/app/models/bonding_type.rb
index e0d2193..7697ff4 100644
--- a/src/app/models/bonding_type.rb
+++ b/src/app/models/bonding_type.rb
@@ -23,4 +23,6 @@
 class BondingType < ActiveRecord::Base
   validates_presence_of :label
   validates_presence_of :mode
+
+  validates_uniqueness_of :mode
 end
diff --git a/src/test/unit/bonding_test.rb b/src/test/unit/bonding_test.rb
index 4bdb079..1dbab38 100644
--- a/src/test/unit/bonding_test.rb
+++ b/src/test/unit/bonding_test.rb
@@ -30,7 +30,6 @@ class BondingTest < ActiveSupport::TestCase
     @bonding = Bonding.new(
       :name           => 'Bonding1',
       :interface_name => 'bond0',
-      :type_id        => bonding_types(:failover_bonding_type),
       :host_id        => hosts(:mailservers_managed_node))
   end
 
@@ -50,14 +49,6 @@ class BondingTest < ActiveSupport::TestCase
     flunk 'Bondings have to have an interface name.' if @bonding.valid?
   end
 
-  # Ensures that the bonding type is required.
-  #
-  def test_valid_fails_without_type
-    @bonding.type_id = nil
-
-    flunk 'Bondings have to have a valid type.' if @bonding.valid?
-  end
-
   # Ensures that a host is required
   #
   def test_valid_fails_without_host
-- 
1.5.5.1



From mmorsi at redhat.com  Thu Oct  9 20:49:29 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Thu, 09 Oct 2008 16:49:29 -0400
Subject: [Ovirt-devel] Re: [PATCH server] fixes to the bonding tests
In-Reply-To: <1223585089-25209-1-git-send-email-mmorsi@redhat.com>
References: <1223585089-25209-1-git-send-email-mmorsi@redhat.com>
Message-ID: <48EE6E59.2060202@redhat.com>

Mohammed Morsi wrote:
> ---
>  src/app/models/bonding.rb      |    2 ++
>  src/app/models/bonding_type.rb |    2 ++
>  src/test/unit/bonding_test.rb  |    9 ---------
>  3 files changed, 4 insertions(+), 9 deletions(-)
>
> diff --git a/src/app/models/bonding.rb b/src/app/models/bonding.rb
> index 941e2cd..eb25d05 100644
> --- a/src/app/models/bonding.rb
> +++ b/src/app/models/bonding.rb
> @@ -36,6 +36,8 @@ class Bonding < ActiveRecord::Base
>    validates_presence_of :interface_name,
>      :message => 'An interface name is required.'
>  
> +  validates_presence_of :host_id
> +
>    belongs_to :host
>    belongs_to :bonding_type
>  
> diff --git a/src/app/models/bonding_type.rb b/src/app/models/bonding_type.rb
> index e0d2193..7697ff4 100644
> --- a/src/app/models/bonding_type.rb
> +++ b/src/app/models/bonding_type.rb
> @@ -23,4 +23,6 @@
>  class BondingType < ActiveRecord::Base
>    validates_presence_of :label
>    validates_presence_of :mode
> +
> +  validates_uniqueness_of :mode
>  end
> diff --git a/src/test/unit/bonding_test.rb b/src/test/unit/bonding_test.rb
> index 4bdb079..1dbab38 100644
> --- a/src/test/unit/bonding_test.rb
> +++ b/src/test/unit/bonding_test.rb
> @@ -30,7 +30,6 @@ class BondingTest < ActiveSupport::TestCase
>      @bonding = Bonding.new(
>        :name           => 'Bonding1',
>        :interface_name => 'bond0',
> -      :type_id        => bonding_types(:failover_bonding_type),
>        :host_id        => hosts(:mailservers_managed_node))
>    end
>  
> @@ -50,14 +49,6 @@ class BondingTest < ActiveSupport::TestCase
>      flunk 'Bondings have to have an interface name.' if @bonding.valid?
>    end
>  
> -  # Ensures that the bonding type is required.
> -  #
> -  def test_valid_fails_without_type
> -    @bonding.type_id = nil
> -
> -    flunk 'Bondings have to have a valid type.' if @bonding.valid?
> -  end
> -
>    # Ensures that a host is required
>    #
>    def test_valid_fails_without_host
>   

There are still two tests broken. I traced the problem to
host-browser/host-browser.rb line 305 where calls to
BondingType.find_by_proto fail to return anything. Checking the database
at this time verifies that there is nothing in the table, which is
strange as this is only an issue for those two test cases, all other
times it works successfully (BondingType table gets populated and
everything). I have a feeling some deletion is cascading to deleting the
BondingType entries, or a similar issue but I'm not sure where this is
happening. Think you could take care of these last two bits as you know
this bonding / nic system better than I do (also if something looks
wrong in this patch, could you correct it?)

  Thanks alot,
    Mo


  1) Failure:
test_write_host_info_with_duplicate_nic(HostBrowserIdentifyTest)
    [./test/unit/host_browser_identify_test.rb:226:in
`test_write_host_info_with_duplicate_nic'
    
/usr/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in
`__send__'
    
/usr/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in
`run']:
Exception raised:
Class: <RuntimeError>
Message: <"Called id for nil, which would mistakenly be 4 -- if you
really wanted the id of nil, use object_id">
---Backtrace---
./test/unit/../../host-browser/host-browser.rb:317:in `write_host_info'
./test/unit/../../host-browser/host-browser.rb:308:in `collect'
./test/unit/../../host-browser/host-browser.rb:308:in `write_host_info'
./test/unit/host_browser_identify_test.rb:226:in
`test_write_host_info_with_duplicate_nic'
./test/unit/host_browser_identify_test.rb:226:in
`test_write_host_info_with_duplicate_nic'
/usr/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in
`__send__'
/usr/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in
`run'
---------------

  2) Failure:
test_write_host_info_with_missing_uuid(HostBrowserIdentifyTest)
    [./test/unit/host_browser_identify_test.rb:167:in
`test_write_host_info_with_missing_uuid'
    
/usr/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in
`__send__'
    
/usr/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in
`run']:
Exception raised:
Class: <RuntimeError>
Message: <"Called id for nil, which would mistakenly be 4 -- if you
really wanted the id of nil, use object_id">
---Backtrace---
./test/unit/../../host-browser/host-browser.rb:317:in `write_host_info'
./test/unit/../../host-browser/host-browser.rb:308:in `collect'
./test/unit/../../host-browser/host-browser.rb:308:in `write_host_info'
./test/unit/host_browser_identify_test.rb:167:in
`test_write_host_info_with_missing_uuid'
./test/unit/host_browser_identify_test.rb:167:in
`test_write_host_info_with_missing_uuid'
/usr/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in
`__send__'
/usr/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in
`run'
---------------



From xxqonline at hotmail.com  Fri Oct 10 05:21:55 2008
From: xxqonline at hotmail.com (xxqonline at hotmail.com)
Date: Fri, 10 Oct 2008 13:21:55 +0800
Subject: [Ovirt-devel] Can any one help me,
	I cannot start the virtual machine with default ovirt-appliance
In-Reply-To: <BAY124-DS2355D5B778D1923557997B13A0@phx.gbl>
	<48EE2BE8.1030101@redhat.com>
References: <BAY124-DS2355D5B778D1923557997B13A0@phx.gbl>
	<48EE2BE8.1030101@redhat.com>
Message-ID: <BAY124-DS4E50AFCBEAEF8DCB452BDB1350@phx.gbl>

Thanks Alan:

I am using 32bit Fedora
Linux physical.priv.ovirt.org 2.6.25-14.fc9.i686 #1 SMP Thu May 1 06:28:41 
EDT 2008 i686 i686 i386 GNU/Linux
I start the ovirt in the node model.

[root at physical ~]# rpm -qa | grep ovirt
virt-viewer-plugin-0.0.3-3ovirt1.fc9.i386
libvirt-python-0.4.5-2ovirt1.fc9.i386
ovirt-appliance-0.93-1.fc9.i386
ovirt-release-0.93-1.fc9.noarch
ovirt-node-0.93-1.fc9.i386
libvirt-0.4.5-2ovirt1.fc9.i386
kvm-74-7.fc9.ovirt.i386
ovirt-docs-0.93-1.fc9.noarch


I have configured the NFS as described in the doc. But I do not know why the 
storage show nothing, please refer to the attachement.


When I create aovirt-node VM, it always pending, and the other PXE-boot, 
Fedora 9 cobbler profile and so on always show stopped.

I cannot start them.
And when I use the # ssh -Y root at 192.168.50.2 virt-viewer -c 
qemu+tcp://node3.priv.ovirt.org/system VM_NAME
It told me the virt-viewer  command is not on the 192.168.50.2.


Regards,
Qiang






--------------------------------------------------
From: "Alan Pevec" <apevec at redhat.com>
Sent: Friday, October 10, 2008 12:06 AM
To: <xxqonline at hotmail.com>
Cc: <ovirt-devel at redhat.com>
Subject: Re: [Ovirt-devel] Can any one help me,	I cannot start the virtual 
machine with default ovirt-appliance

> xxqonline at hotmail.com wrote:
>> Hello folks:
>>       I use the virsh 0.4.5. I followed the quick start to set the 
>> storage pool (nfs).
>> After that I checked the property of that pool. There is no size 
>> information.
>> Then I create a vm pool, and try to create a fedora 9 (Cobbler Profile), 
>> I failed to start it.
>> Can any one give me a help?
>
> First, which version are you using?
> Check that firstrun worked fine, see 
> http://ovirt.org/page/TroubleShooting#Debugging_oVirt_Appliance_firstboot
> for how to modify the fresh image after ovirt-appliance RPM installation 
> and before starting it up for the first time and check logs mentioned 
> there.
>
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: Storage.png
Type: image/png
Size: 22479 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081010/3f858533/attachment.png>

From xxqonline at hotmail.com  Fri Oct 10 06:59:48 2008
From: xxqonline at hotmail.com (xxqonline at hotmail.com)
Date: Fri, 10 Oct 2008 14:59:48 +0800
Subject: [Ovirt-devel] libvir: QEMU error : internal error failed to set CPU
	affinity Permission denied
Message-ID: <BAY124-DS61A1174C0FCB99BCAD3B1B1350@phx.gbl>

Hello folks:

I have encountered the following problem:

[root at vmodev01 ~]# virsh start ovirt-appliance
libvir: QEMU error : internal error failed to set CPU affinity Permission denied
error: Failed to start domain ovirt-appliance

How can I solve it?

Thanks,
Qiang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081010/59784437/attachment.htm>

From xxqonline at hotmail.com  Fri Oct 10 07:02:41 2008
From: xxqonline at hotmail.com (xxqonline at hotmail.com)
Date: Fri, 10 Oct 2008 15:02:41 +0800
Subject: [Ovirt-devel] Re: libvir: QEMU error : internal error failed to set
	CPU affinity Permission denied
Message-ID: <BAY124-DS1AF3E418ABBA5177A9664B1350@phx.gbl>

I am using root


From: xxqonline at hotmail.com 
Sent: Friday, October 10, 2008 2:59 PM
To: ovirt-devel at redhat.com 
Subject: libvir: QEMU error : internal error failed to set CPU affinity Permission denied


Hello folks:

I have encountered the following problem:

[root at vmodev01 ~]# virsh start ovirt-appliance
libvir: QEMU error : internal error failed to set CPU affinity Permission denied
error: Failed to start domain ovirt-appliance

How can I solve it?

Thanks,
Qiang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081010/b03bebda/attachment.htm>

From apevec at redhat.com  Fri Oct 10 07:06:48 2008
From: apevec at redhat.com (Alan Pevec)
Date: Fri, 10 Oct 2008 09:06:48 +0200
Subject: [Ovirt-devel] Re: libvir: QEMU error : internal error failed
	to set	CPU affinity Permission denied
In-Reply-To: <BAY124-DS1AF3E418ABBA5177A9664B1350@phx.gbl>
References: <BAY124-DS1AF3E418ABBA5177A9664B1350@phx.gbl>
Message-ID: <48EEFF08.9050602@redhat.com>

xxqonline at hotmail.com wrote:
> I am using root

yeah, but libvirtd and qemu run confined in SELinux domains (virtd_t and qemu_t, resp.) 
 
> [root at vmodev01 ~]# virsh start ovirt-appliance
> libvir: QEMU error : internal error failed to set CPU affinity 
> Permission denied
> error: Failed to start domain ovirt-appliance
> How can I solve it?

IIRC that was solved by the selinux-policy update some time ago, is your system fully updated Fedora 9 ?



From xxqonline at hotmail.com  Fri Oct 10 07:08:11 2008
From: xxqonline at hotmail.com (xxqonline at hotmail.com)
Date: Fri, 10 Oct 2008 15:08:11 +0800
Subject: [Ovirt-devel] Re: libvir: QEMU error : internal error failed to set
	CPU affinity Permission denied
Message-ID: <BAY124-DS64D1E8C1429863AEFC0F5B1350@phx.gbl>

I am not sure, I just install from a DVD
 qxu at vmodev01-2: uname -a
Linux vmodev01 2.6.25-14.fc9.x86_64 #1 SMP Thu May 1 06:06:21 EDT 2008 x86_64 x86_64 x86_64 GNU/Linux



From: xxqonline at hotmail.com 
Sent: Friday, October 10, 2008 2:59 PM
To: ovirt-devel at redhat.com 
Subject: libvir: QEMU error : internal error failed to set CPU affinity Permission denied


Hello folks:

I have encountered the following problem:

[root at vmodev01 ~]# virsh start ovirt-appliance
libvir: QEMU error : internal error failed to set CPU affinity Permission denied
error: Failed to start domain ovirt-appliance

How can I solve it?

Thanks,
Qiang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081010/5adf8361/attachment.htm>

From xxqonline at hotmail.com  Fri Oct 10 07:08:47 2008
From: xxqonline at hotmail.com (xxqonline at hotmail.com)
Date: Fri, 10 Oct 2008 15:08:47 +0800
Subject: [Ovirt-devel] Re: libvir: QEMU error : internal error failed to
	set	CPU affinity Permission denied
In-Reply-To: <BAY124-DS1AF3E418ABBA5177A9664B1350@phx.gbl>
	<48EEFF08.9050602@redhat.com>
References: <BAY124-DS1AF3E418ABBA5177A9664B1350@phx.gbl>
	<48EEFF08.9050602@redhat.com>
Message-ID: <BAY124-DS68D74F8C003C9C09A071AB1350@phx.gbl>

I am not sure, I just install from a DVD
 qxu at vmodev01-2: uname -a
Linux vmodev01 2.6.25-14.fc9.x86_64 #1 SMP Thu May 1 06:06:21 EDT 2008 
x86_64 x86_64 x86_64 GNU/Linux

--------------------------------------------------
From: "Alan Pevec" <apevec at redhat.com>
Sent: Friday, October 10, 2008 3:06 PM
To: <xxqonline at hotmail.com>
Cc: <ovirt-devel at redhat.com>
Subject: Re: [Ovirt-devel] Re: libvir: QEMU error : internal error failed to 
set	CPU affinity Permission denied

> xxqonline at hotmail.com wrote:
>> I am using root
>
> yeah, but libvirtd and qemu run confined in SELinux domains (virtd_t and 
> qemu_t, resp.)
>> [root at vmodev01 ~]# virsh start ovirt-appliance
>> libvir: QEMU error : internal error failed to set CPU affinity Permission 
>> denied
>> error: Failed to start domain ovirt-appliance
>> How can I solve it?
>
> IIRC that was solved by the selinux-policy update some time ago, is your 
> system fully updated Fedora 9 ?
>
> 



From apevec at redhat.com  Fri Oct 10 09:16:17 2008
From: apevec at redhat.com (Alan Pevec)
Date: Fri, 10 Oct 2008 11:16:17 +0200
Subject: [Ovirt-devel] Can any one help me,	I cannot start the virtual
	machine with default ovirt-appliance
In-Reply-To: <BAY124-DS4E50AFCBEAEF8DCB452BDB1350@phx.gbl>
References: <BAY124-DS2355D5B778D1923557997B13A0@phx.gbl>
	<48EE2BE8.1030101@redhat.com>
	<BAY124-DS4E50AFCBEAEF8DCB452BDB1350@phx.gbl>
Message-ID: <48EF1D61.5030009@redhat.com>

xxqonline at hotmail.com wrote:
> I am using 32bit Fedora
> Linux physical.priv.ovirt.org 2.6.25-14.fc9.i686 #1 SMP Thu May 1 
> 06:28:41 EDT 2008 i686 i686 i386 GNU/Linux
> I start the ovirt in the node model.

please run yum update to get latest F9 updates.
 
> [root at physical ~]# rpm -qa | grep ovirt
> virt-viewer-plugin-0.0.3-3ovirt1.fc9.i386
> libvirt-python-0.4.5-2ovirt1.fc9.i386
> ovirt-appliance-0.93-1.fc9.i386
> ovirt-release-0.93-1.fc9.noarch
> ovirt-node-0.93-1.fc9.i386
> libvirt-0.4.5-2ovirt1.fc9.i386
> kvm-74-7.fc9.ovirt.i386
> ovirt-docs-0.93-1.fc9.noarch


that's all good - you have latest released beta installed

> I have configured the NFS as described in the doc. But I do not know why 
> the storage show nothing, please refer to the attachement.

Do you have node3 running? Taskomatic needs at least one Node to be up and running to be able to execute libvirt storage pool commands.

> When I create aovirt-node VM, it always pending, and the other PXE-boot, 
> Fedora 9 cobbler profile and so on always show stopped.
 
> I cannot start them.
> And when I use the # ssh -Y root at 192.168.50.2 virt-viewer -c 
> qemu+tcp://node3.priv.ovirt.org/system VM_NAME
> It told me the virt-viewer  command is not on the 192.168.50.2.

Yeah, this is old instruction, if you have running oVirt managed VM, you should get "Console" link in VM details which starts external vnc viewer via virt-viewer-plugin.

Please double check you have node3 running: virsh list on the host machine should show ovirt-appliance and node3 VMs running - in "fake" Nodes modus, oVirt managed VMs are created inside nodeX VMs (yeah, confusing and useless, this is just for demo/quick test in development)



From Itamar.Heim at qumranet.com  Thu Oct  9 22:49:29 2008
From: Itamar.Heim at qumranet.com (Itamar Heim)
Date: Thu, 9 Oct 2008 15:49:29 -0700
Subject: [Ovirt-devel] Ovirt-qpid API
In-Reply-To: <20081008211933.089ac7a8@tp.mains.net>
References: <20081008211933.089ac7a8@tp.mains.net>
Message-ID: <ED2414DB5FBBCF4FA66ECE71F290E9A2C9468A@EXVBE011-2.exch011.intermedia.net>

Some thoughts:
1. Assuming oVirt is booting with a KVM module, would be valuable to
know if KVM is actually enabled (not sure what is the generalization of
this for Xen/others).
Usually it means VT/SVM was not enabled by bios, or that another bios
flag is preventing it from booting (TX for example).

2. memory - need to know more than just physical memory size, also free
and cached I guess.
(could be already collected by collectd - didn't get a chance to go over
it yet)

3. node version - reflects potential capabilities, backward
compatibility considerations by management, etc.
(not sure if we don't need one for KVM/other hypervisor version, and one
for the libvirt version)

Itamar

-----Original Message-----
From: ovirt-devel-bounces at redhat.com
[mailto:ovirt-devel-bounces at redhat.com] On Behalf Of Ian Main
Sent: Thursday, October 09, 2008 6:20 AM
To: ovirt-devel at redhat.com
Subject: [Ovirt-devel] Ovirt-qpid API


So I've been doing some work on this API.  It looks like libvirt
hardware enumeration is coming along reasonably, so I'm not going to
cover all that in this API.  Instead we'll get a version of libvirt
built in a few weeks with hardware enumeration and update libvirt-qpid
to support that.

As always, please take a look and see if I forgot anything or such.

Here's a rundown of the info we are gathering now:

- Hardware uuid using HAL
- architecture
- CPU info:
    - number of cores
    - processor
    - core id
    - cpu cores
    - vendor id
    - model
    - cpu family
    - cpuid level
    - cpu MHz
    - cache size
    - cpu flags

- Network interfaces:
    - interface name
    - MAC
    - ip address
    - netmask
    - broadcast
    - bandwidth (speed - 100baseT full/half etc.)

- Memory size

Things gathered by libvirt hardware enumeration:

The in-development Libvirt API is currently using HAL to enumerate
devices.  This gives us information on processor, storage, network
interfaces etc. but does not include the IP address configuration of a
network interface, nor the speed capabilities. 

Otherwise we have:

- Kerberos key download.  This will remain a separate step.
- Various statistics pushed via collectd.  This can remain in place, but
I
  think we should consider pushing the load avg (or maybe cpu usage?  I
know
  there are some graphing issues with load) which would eliminate the
need for
  host-collect.rb.
- Network configuration.
- Shutdown/reboot.
- Beeps and flashes to identify machine and nics.

So the attached API deals with all the network configuration, IP address
information etc. as well as the various other functions we want to see
supported beyond what libvirt provides for us.

On the network API, I wasn't entirely positive I should take this
approach or if I should create another Bonding class that bonds
networkInterfaces.  In the end I chose this model as it essentially
mirrors what the configuration is doing.  I can easily be convinced to
do the other though.. or even to just mock it up and see how it looks.

>From the python qpid client, you would setup the network something like
this:

s = Session()
b = s.addBroker()
onode = s.getObjects(name="ovirtNode", uuid=someuuid)

# So this call would return a networkInterface class but would be
configured # for bonding.  This is the part I'm 50/50 on.  I could
create a separate # Bonding class.
bond = onode.createBondingInterface("bond0")
# It should basically be setup to be right on creation..
bond.dhcp = true
bond.restart()

nics = s.getObjects(name="networkInterface", ovirtNode=onode) for nic in
nics:
  nic.master="bond0"
  nic.restart()

# For fun..
onode.beeping = true
nic[0].blinking = true

The objects will also be created from the configuration on the node if
it had persistent storage and came up configured.

    Ian





From berrange at redhat.com  Fri Oct 10 12:47:48 2008
From: berrange at redhat.com (Daniel P. Berrange)
Date: Fri, 10 Oct 2008 13:47:48 +0100
Subject: [Ovirt-devel] Ovirt-qpid API
In-Reply-To: <ED2414DB5FBBCF4FA66ECE71F290E9A2C9468A@EXVBE011-2.exch011.intermedia.net>
References: <20081008211933.089ac7a8@tp.mains.net>
	<ED2414DB5FBBCF4FA66ECE71F290E9A2C9468A@EXVBE011-2.exch011.intermedia.net>
Message-ID: <20081010124748.GG12910@redhat.com>

On Thu, Oct 09, 2008 at 03:49:29PM -0700, Itamar Heim wrote:
> Some thoughts:
> 1. Assuming oVirt is booting with a KVM module, would be valuable to
> know if KVM is actually enabled (not sure what is the generalization of
> this for Xen/others).
> Usually it means VT/SVM was not enabled by bios, or that another bios
> flag is preventing it from booting (TX for example).

libvirt provides you this information via its host capabilities API:

# virsh capabilities
<capabilities>

  <host>
    <cpu>
      <arch>i686</arch>
    </cpu>
  </host>

  <guest>
    <os_type>hvm</os_type>
    <arch name='i686'>
      <wordsize>32</wordsize>
      <emulator>/usr/bin/qemu</emulator>
      <machine>pc</machine>
      <machine>isapc</machine>
      <domain type='qemu'>
      </domain>
      <domain type='kvm'>
        <emulator>/usr/bin/qemu-kvm</emulator>
      </domain>
    </arch>
    <features>
      <pae/>
      <nonpae/>
      <acpi default='on' toggle='yes'/>
      <apic default='on' toggle='no'/>
    </features>
  </guest>

  [cut restof XML]


If you don't get a 'kvm' domain type, then the module is not active
and/or the userspace is missing.


> 2. memory - need to know more than just physical memory size, also free
> and cached I guess.

libvirt also exposes this - and NUMA topology and free memory per NUMA
cell.

> 3. node version - reflects potential capabilities, backward
> compatibility considerations by management, etc.
> (not sure if we don't need one for KVM/other hypervisor version, and one
> for the libvirt version)

Although we expose the libvirt version, applications should really
try to drive themselves off capabilities, rather than the version
number. If we backport new features into older libvirt during the
lifetime of a product, then version number checks fail, but capability
based checks will work correctly.

libvirt exposes alot of capability info for guest domains types, but
we need to increase its info for things like storage, network and the
like.

ovirt qpid will likely want to expose some form of capability based
information wrt the host OS features. eg info on allowed networking
configs (eg whether bonding, vlans, etc are allowed), and level of
clustering support. We should define somewhere this info can be exposed
and then use it when adding new features, betweeen releases.

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 slinabery at redhat.com  Fri Oct 10 14:33:54 2008
From: slinabery at redhat.com (Steve Linabery)
Date: Fri, 10 Oct 2008 09:33:54 -0500
Subject: [Ovirt-devel] flexchart build instructions
In-Reply-To: <20081009190645.GF10125@redhat.com>
References: <20081009190645.GF10125@redhat.com>
Message-ID: <20081010143353.GG10125@redhat.com>

I left out an important additional step:

On Thu, Oct 09, 2008 at 02:06:45PM -0500, Steve Linabery wrote:
> Hi,
> 
> If anyone would like to build the flexchart swf (Flash Movie), here's how:
> 
> 0) download the Open Flex SDK at http://opensource.adobe.com/wiki/display/flexsdk/Download+Flex+3 (I think I used latest stable build)
> 1) unzip that archive somewhere and add the bin subdirectory of same to your PATH

1a) run dos2unix on bin/mxmlc

> 2) Apply the patch I sent for review earlier today
> 3) cd to {ovirt_src_home}/server/src/flexchart in your patched source tree
> 4) execute 'mxmlc flexchart.mxml'
> 5) copy the resulting flexchart.swf to /usr/share/ovirt-server/public on your appliance (which you've just rebuilt using my patch)
> 
> Please let me know if it works for you (or doesn't!). If you see blue bars in your chart area (assumes you have some rrd data stored for memory use), it's working.
> 
> Thanks,
> Steve
> 
> _______________________________________________
> Ovirt-devel mailing list
> Ovirt-devel at redhat.com
> https://www.redhat.com/mailman/listinfo/ovirt-devel



From dpierce at redhat.com  Fri Oct 10 14:40:04 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Fri, 10 Oct 2008 10:40:04 -0400
Subject: [Ovirt-devel] [PATCH server] Fixes broken unit tests for bonding
	classes and the host browser.
Message-ID: <1223649604-8272-1-git-send-email-dpierce@redhat.com>


Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 src/app/models/bonding.rb          |    6 ++++++
 src/app/models/bonding_type.rb     |    4 ++++
 src/test/unit/bonding_test.rb      |   10 +++++-----
 src/test/unit/bonding_type_test.rb |    2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/app/models/bonding.rb b/src/app/models/bonding.rb
index 941e2cd..4b6e8a5 100644
--- a/src/app/models/bonding.rb
+++ b/src/app/models/bonding.rb
@@ -33,6 +33,12 @@ class Bonding < ActiveRecord::Base
   validates_presence_of :name,
     :message => 'A name is required.'
 
+  validates_presence_of :host_id,
+    :message => 'A host must be specified.'
+
+  validates_presence_of :bonding_type_id,
+    :message => 'A bonding type must be specified.'
+
   validates_presence_of :interface_name,
     :message => 'An interface name is required.'
 
diff --git a/src/app/models/bonding_type.rb b/src/app/models/bonding_type.rb
index e0d2193..f844df1 100644
--- a/src/app/models/bonding_type.rb
+++ b/src/app/models/bonding_type.rb
@@ -22,5 +22,9 @@
 #
 class BondingType < ActiveRecord::Base
   validates_presence_of :label
+  validates_uniqueness_of :label,
+    :message => 'Label must be unique'
   validates_presence_of :mode
+  validates_uniqueness_of :mode,
+    :message => 'Mode must be unique'
 end
diff --git a/src/test/unit/bonding_test.rb b/src/test/unit/bonding_test.rb
index 4bdb079..a2cdef8 100644
--- a/src/test/unit/bonding_test.rb
+++ b/src/test/unit/bonding_test.rb
@@ -28,10 +28,10 @@ class BondingTest < ActiveSupport::TestCase
 
   def setup
     @bonding = Bonding.new(
-      :name           => 'Bonding1',
-      :interface_name => 'bond0',
-      :type_id        => bonding_types(:failover_bonding_type),
-      :host_id        => hosts(:mailservers_managed_node))
+      :name            => 'Bonding1',
+      :interface_name  => 'bond0',
+      :bonding_type_id => bonding_types(:failover_bonding_type),
+      :host_id         => hosts(:mailservers_managed_node))
   end
 
   # Ensures that the name is required.
@@ -53,7 +53,7 @@ class BondingTest < ActiveSupport::TestCase
   # Ensures that the bonding type is required.
   #
   def test_valid_fails_without_type
-    @bonding.type_id = nil
+    @bonding.bonding_type_id = nil
 
     flunk 'Bondings have to have a valid type.' if @bonding.valid?
   end
diff --git a/src/test/unit/bonding_type_test.rb b/src/test/unit/bonding_type_test.rb
index 5f2ccb2..c900002 100644
--- a/src/test/unit/bonding_type_test.rb
+++ b/src/test/unit/bonding_type_test.rb
@@ -29,6 +29,6 @@ class BondingTypeTest < ActiveSupport::TestCase
   def test_modes_must_be_unique
     @bonding_type.mode = BondingType.find(:first).mode
 
-    assert @bonding_type.save == false, 'A bonding type with a duplicate mode should not save.'
+    flunk "Modes must be unique" if @bonding_type.valid?
   end
 end
-- 
1.5.5.1



From dpierce at redhat.com  Fri Oct 10 14:43:05 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Fri, 10 Oct 2008 10:43:05 -0400
Subject: [Ovirt-devel] [PATCH server] Added support for booting a VM from an
	ISO image.
Message-ID: <1223649785-8471-1-git-send-email-dpierce@redhat.com>

The NFS export for Cobbler needs to be added as an NFS storage pool.
Otherwise, taskomatic will not be able to locate it.

Also added a few helper methods to Vm to contain the knowledge
of how Cobbler integration is contained.

When a user adds an ISO image to the Cobbler server on the appliance,
they will need to do so using the full NFS path for where the virtual
image will go to mount it; i.e., hostname:/path/to/filename.iso

If the filename ends in ".iso" then the virtual machine will mount the
file as a CDROM device and boot it. Otherwise, it mounts it as a hard
disk device.

To add an image to Cobbler, do the following:

1. Download an ISO image, such as the KDE LiveImage from Fedora.
2. Copy it to the NFS directory on the server:
  cp *.iso /ovirtnfs/kde-live-cd.iso
3. Add that image to your Cobbler instance:
  cobbler image add --name=KDE-LiveCD --file=management.priv.ovirt.org:/ovirtnfs/kde-live-cd.iso
4. Create a new VM in your server.
5. Select "KDE-LiveCD" from the list of operating systems.
6. Save the VM.
7. Start the VM.

It should run the selected ISO.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 src/app/controllers/vm_controller.rb |   51 +++++++++++++--------
 src/app/models/vm.rb                 |   34 +++++++++++++-
 src/task-omatic/task_vm.rb           |   81 +++++++++++++++++++++++++++++-----
 src/test/unit/vm_test.rb             |   56 ++++++++++++++++++++++-
 4 files changed, 185 insertions(+), 37 deletions(-)

diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb
index f5c0845..5e9da06 100644
--- a/src/app/controllers/vm_controller.rb
+++ b/src/app/controllers/vm_controller.rb
@@ -48,6 +48,7 @@ class VmController < ApplicationController
     begin
       Vm.transaction do
         @vm.save!
+        _setup_vm_provision(params)
         @task = VmTask.new({ :user    => @user,
                              :vm_id   => @vm.id,
                              :action  => VmTask::ACTION_CREATE_VM,
@@ -223,13 +224,18 @@ class VmController < ApplicationController
   def _setup_provisioning_options
     @provisioning_options = [[Vm::PXE_OPTION_LABEL, Vm::PXE_OPTION_VALUE],
                              [Vm::HD_OPTION_LABEL, Vm::HD_OPTION_VALUE]]
-    # FIXME add cobbler images too
+
     begin
+      @provisioning_options += Cobbler::Image.find.collect do |image|
+        [image.name + Vm::COBBLER_IMAGE_SUFFIX,
+          "#{Vm::IMAGE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{image.name}"]
+      end
+
       @provisioning_options += Cobbler::Profile.find.collect do |profile|
         [profile.name + Vm::COBBLER_PROFILE_SUFFIX,
-         Vm::COBBLER_PREFIX + Vm::PROVISIONING_DELIMITER +
-         Vm::PROFILE_PREFIX + Vm::PROVISIONING_DELIMITER + profile.name]
-      end
+          "#{Vm::PROFILE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{profile.name}"]
+
+    end
     rescue
       #if cobbler doesn't respond/is misconfigured/etc just don't add profiles
     end
@@ -239,24 +245,29 @@ class VmController < ApplicationController
   def _setup_vm_provision(params)
     # spaces are invalid in the cobbler name
     name = params[:vm][:uuid]
-    provision = params[:vm][:provisioning_and_boot_settings].gsub(
-         Vm::COBBLER_PREFIX + Vm::PROVISIONING_DELIMITER +
-         Vm::PROFILE_PREFIX + Vm::PROVISIONING_DELIMITER, "")
     mac = params[:vm][:vnic_mac_addr]
-    unless provision == Vm::PXE_OPTION_VALUE or
-           provision == Vm::HD_OPTION_VALUE
-      found = false
-      Cobbler::System.find.each{ |system|
-        if system.name == name
-          system.profile = provision
-          system.save
-          found = true
+    provision = params[:vm][:provisioning_and_boot_settings]
+    # determine what type of provisioning was selected for the VM
+    provisioning_type = :pxe_or_hd_type
+    provisioning_type = :image_type  if provision.index "#{Vm::IMAGE_PREFIX}@#{Vm::COBBLER_PREFIX}"
+    provisioning_type = :system_type if provision.index "#{Vm::PROFILE_PREFIX}@#{Vm::COBBLER_PREFIX}"
+
+    unless provisioning_type == :pxe_or_hd_type
+      cobbler_name = provision.gsub(/(Vm::IMAGE_PREFIX|Vm::PROFILE_PREFIX)@Vm::COBBLER_PREFIX/, '')
+
+      system = Cobbler::System.find_one(name)
+
+      unless system
+        nic = Cobbler::NetworkInterface.new({'mac_address' => mac})
+
+        case provisioning_type
+        when :image_type:
+            system = Cobbler::System.create("name" => name, "image"    => cobbler_name)
+        when :system_type:
+            system = Cobbler::System.create("name" => name, "profile" => cobbler_name)
         end
-      }
-      unless found
-        system = Cobbler::System.create("name" => name,
-                                        "profile" => provision)
-        system.interfaces=[Cobbler::NetworkInterface.new({'mac_address' => mac})]
+
+        system.interfaces = [nic]
         system.save
       end
     end
diff --git a/src/app/models/vm.rb b/src/app/models/vm.rb
index ace6fb1..d7beacf 100644
--- a/src/app/models/vm.rb
+++ b/src/app/models/vm.rb
@@ -49,7 +49,7 @@ class Vm < ActiveRecord::Base
   PROFILE_PREFIX         = "profile"
   IMAGE_PREFIX           = "image"
   COBBLER_PROFILE_SUFFIX = " (Cobbler Profile)"
-  COBBLER_IMAGE_SUFFIX   = " (Cobbler Profile)"
+  COBBLER_IMAGE_SUFFIX   = " (Cobbler Image)"
 
   PXE_OPTION_LABEL       = "PXE Boot"
   PXE_OPTION_VALUE       = "pxe"
@@ -139,7 +139,15 @@ class Vm < ActiveRecord::Base
   end
 
   def provisioning_and_boot_settings=(settings)
-    if settings==PXE_OPTION_VALUE
+    # if the settings have a prefix that matches cobber settings, then process
+    # those details
+    if settings =~ /#{IMAGE_PREFIX}@#{COBBLER_PREFIX}/
+      self[:boot_device] = BOOT_DEV_CDROM
+      self[:provisioning] = settings
+    elsif settings =~ /#{PROFILE_PREFIX}@#{COBBLER_PREFIX}/
+      self[:boot_device] = BOOT_DEV_NETWORK
+      self[:provisioning] = settings
+    elsif settings==PXE_OPTION_VALUE
       self[:boot_device]= BOOT_DEV_NETWORK
       self[:provisioning]= nil
     elsif settings==HD_OPTION_VALUE
@@ -242,6 +250,28 @@ class Vm < ActiveRecord::Base
     vm_resource_pool.search_users
   end
 
+  # Reports whether the VM is uses Cobbler for booting.
+  #
+  def uses_cobbler?
+    (self.provisioning != nil) && (self.provisioning.include? COBBLER_PREFIX)
+  end
+
+  # Returns the cobbler type.
+  #
+  def cobbler_type
+    if self.uses_cobbler?
+      self.provisioning[/^(.*)@/,1]
+    end
+  end
+
+  # Returns the cobbler provisioning name.
+  #
+  def cobbler_name
+    if self.uses_cobbler?
+      self.provisioning[/^.*@.*:(.*)/,1]
+    end
+  end
+
   protected
   def validate
     resources = vm_resource_pool.max_resources_for_vm(self)
diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb
index 3588224..6c4ace6 100644
--- a/src/task-omatic/task_vm.rb
+++ b/src/task-omatic/task_vm.rb
@@ -65,16 +65,26 @@ def create_vm_xml(name, uuid, memAllocated, memUsed, vcpus, bootDevice,
   doc.root.elements["devices"].add_element("emulator")
   doc.root.elements["devices"].elements["emulator"].text = "/usr/bin/qemu-kvm"
 
-  devs = [ 'hda', 'hdb', 'hdc', 'hdd' ]
-  i = 0
+  devs = ['hda', 'hdb', 'hdc', 'hdd']
+  which_device = 0
   diskDevices.each do |disk|
+    is_cdrom = (disk =~ /\.iso/) ? true : false
+
     diskdev = Element.new("disk")
-    diskdev.add_attribute("type", "block")
-    diskdev.add_attribute("device", "disk")
-    diskdev.add_element("source", {"dev" => disk})
-    diskdev.add_element("target", {"dev" => devs[i]})
+    diskdev.add_attribute("type", is_cdrom ? "file" : "block")
+    diskdev.add_attribute("device", is_cdrom ? "cdrom" : "disk")
+
+    if is_cdrom
+      diskdev.add_element("readonly")
+      diskdev.add_element("source", {"file" => disk})
+      diskdev.add_element("target", {"dev" => devs[which_device], "bus" => "ide"})
+    else
+      diskdev.add_element("source", {"dev" => disk})
+      diskdev.add_element("target", {"dev" => devs[which_device]})
+    end
+
     doc.root.elements["devices"] << diskdev
-    i += 1
+    which_device += 1
   end
 
   doc.root.elements["devices"].add_element("interface", {"type" => "bridge"})
@@ -154,15 +164,12 @@ def create_vm(task)
   # create cobbler system profile
   begin
     if vm.provisioning and !vm.provisioning.empty?
-      provisioning_arr = vm.provisioning.split(Vm::PROVISIONING_DELIMITER)
-      if provisioning_arr[0]==Vm::COBBLER_PREFIX
-        if provisioning_arr[1]==Vm::PROFILE_PREFIX
+      if vm.uses_cobbler?
+        if vm.cobbler_type == Vm::PROFILE_PREFIX:
           system = Cobbler::System.new('name' => vm.uuid,
                                        'profile' => provisioning_arr[2])
           system.interfaces=[Cobbler::NetworkInterface.new({'mac_address' => vm.vnic_mac_addr})]
           system.save
-        elsif provisioning_arr[1]==Vm::IMAGE_PREFIX
-          #FIXME handle cobbler images
         end
       end
     end
@@ -231,6 +238,14 @@ def shutdown_vm(task)
   setVmShutdown(vm)
 end
 
+# Find thes storage pool with the given ip address and export path.
+#
+def find_storage_pool(ip_addr, export_path)
+  StoragePool.find(:first,
+    :conditions =>
+      ['ip_addr = ? and export_path = ?',ip_addr, export_path])
+end
+
 def start_vm(task)
   puts "start_vm"
 
@@ -266,6 +281,48 @@ def start_vm(task)
     # hosts to see if there is a host that will fit these constraints
     host = findHostSLA(vm)
 
+    # if we're booting from a CDROM the VM is an image,
+    # then we need to add the NFS mount as a storage volume for this
+    # boot
+    #
+    if (vm.boot_device == Vm::BOOT_DEV_CDROM) && vm.uses_cobbler? && (vm.cobbler_type == Vm::IMAGE_PREFIX)
+      details = Cobbler::Image.find_one(vm.cobbler_name)
+
+      raise "Image #{vm.cobbler_name} not found in Cobbler server" unless details
+
+      ignored, ip_addr, export_path, filename =
+        details.file.split(/(.*):(.*)\/(.*)/)
+
+      found = false
+
+      vm.storage_volumes.each do |volume|
+        if volume.filename == filename
+          if (volume.storage_pool.ip_addr == ip_addr) &&
+          (volume.storage_pool.export_path == export_path)
+            found = true
+          end
+        end
+      end
+
+      unless found
+        # Create a new transient NFS storage volume
+        # This volume is *not* persisted.
+        image_volume = StorageVolume.factory("NFS",
+          :filename => filename
+        )
+
+        image_volume.storage_pool
+        image_pool = find_storage_pool(ip_addr, export_path)
+
+        raise Exception.new("Unable to find Cobbler storage pool") unless image_pool
+
+        if image_pool
+          image_pool.storage_volumes << image_volume
+        end
+        vm.storage_volumes << image_volume
+      end
+    end
+
     conn = Libvirt::open("qemu+tcp://" + host.hostname + "/system")
 
     storagedevs = connect_storage_pools(conn, vm)
diff --git a/src/test/unit/vm_test.rb b/src/test/unit/vm_test.rb
index 4a5e353..22164e8 100644
--- a/src/test/unit/vm_test.rb
+++ b/src/test/unit/vm_test.rb
@@ -22,8 +22,58 @@ require File.dirname(__FILE__) + '/../test_helper'
 class VmTest < Test::Unit::TestCase
   fixtures :vms
 
-  # Replace this with your real tests.
-  def test_truth
-    assert true
+  def setup
+    @vm_name = "Test"
+    @no_cobbler_provisioning = "#{@vm_name}"
+    @cobbler_image_provisioning =
+      "#{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}"
+  end
+
+  # Ensures that, if the VM does not contain the Cobbler prefix, that it
+  # does not claim to be a Cobbler VM.
+  #
+  def test_uses_cobbler_without_cobbler_prefix
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings=@no_cobbler_provisioning
+
+    flunk "VM is not a Cobbler provisioned one." if vm.uses_cobbler?
+    assert_equal @vm_name, vm.provisioning, "Wrong name reported."
+  end
+
+  # Ensures that the VM reports that it uses Cobbler if the provisioning
+  # is for a Cobbler profile.
+  #
+  def test_uses_cobbler_with_cobbler_profile
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings = @cobbler_profile_provisioning
+
+    flunk "VM did not report that it's Cobbler provisioned." unless vm.uses_cobbler?
+    assert_equal Vm::PROFILE_PREFIX,
+      vm.cobbler_type,
+      "Wrong cobbler type reported."
+    assert_equal @vm_name,
+      vm.cobbler_name,
+      "Wrong name reported."
+  end
+
+  # Ensures that the VM reports that it uses Cobbler if the provisioning
+  # is for a Cobbler image.
+  #
+  def test_uses_cobbler_with_cobbler_image
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings = @cobbler_image_provisioning
+
+    flunk "VM did not report that it's Cobbler provisioned." unless vm.uses_cobbler?
+    assert_equal Vm::IMAGE_PREFIX,
+      vm.cobbler_type,
+      "Wrong cobbler type reported."
+    assert_equal @vm_name,
+      vm.cobbler_name,
+      "Wrong name reported."
   end
 end
-- 
1.5.5.1



From hbrock at redhat.com  Fri Oct 10 14:57:55 2008
From: hbrock at redhat.com (Hugh O. Brock)
Date: Fri, 10 Oct 2008 10:57:55 -0400
Subject: [Ovirt-devel] flexchart build instructions
In-Reply-To: <20081010143353.GG10125@redhat.com>
References: <20081009190645.GF10125@redhat.com>
	<20081010143353.GG10125@redhat.com>
Message-ID: <20081010145755.GD30422@redhat.com>

On Fri, Oct 10, 2008 at 09:33:54AM -0500, Steve Linabery wrote:
> I left out an important additional step:
> 
> On Thu, Oct 09, 2008 at 02:06:45PM -0500, Steve Linabery wrote:
> > Hi,
> > 
> > If anyone would like to build the flexchart swf (Flash Movie), here's how:
> > 
> > 0) download the Open Flex SDK at http://opensource.adobe.com/wiki/display/flexsdk/Download+Flex+3 (I think I used latest stable build)
> > 1) unzip that archive somewhere and add the bin subdirectory of same to your PATH
> 
> 1a) run dos2unix on bin/mxmlc
> 
> > 2) Apply the patch I sent for review earlier today
> > 3) cd to {ovirt_src_home}/server/src/flexchart in your patched source tree
> > 4) execute 'mxmlc flexchart.mxml'
> > 5) copy the resulting flexchart.swf to /usr/share/ovirt-server/public on your appliance (which you've just rebuilt using my patch)
> > 
> > Please let me know if it works for you (or doesn't!). If you see blue bars in your chart area (assumes you have some rrd data stored for memory use), it's working.
> > 
> > Thanks,
> > Steve
> > 

Crazy, is mxmlc a shell script? 

--H



From apevec at redhat.com  Fri Oct 10 15:11:33 2008
From: apevec at redhat.com (Alan Pevec)
Date: Fri, 10 Oct 2008 17:11:33 +0200
Subject: [Ovirt-devel] flexchart build instructions
In-Reply-To: <20081010145755.GD30422@redhat.com>
References: <20081009190645.GF10125@redhat.com>	<20081010143353.GG10125@redhat.com>
	<20081010145755.GD30422@redhat.com>
Message-ID: <48EF70A5.6010206@redhat.com>

Hugh O. Brock wrote:
>>> 0) download the Open Flex SDK at http://opensource.adobe.com/wiki/display/flexsdk/Download+Flex+3 (I think I used latest stable build)
>>> 1) unzip that archive somewhere and add the bin subdirectory of same to your PATH
>> 1a) run dos2unix on bin/mxmlc

> Crazy, is mxmlc a shell script? 
yeah, wrapper scripts starting Java.
BTW, in 3.1.0.2710 ZIP I got all scripts w/o execute bit, so also chmod +x bin/mxmlc



From mmorsi at redhat.com  Fri Oct 10 15:17:04 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Fri, 10 Oct 2008 11:17:04 -0400
Subject: [Ovirt-devel] [PATCH server] Fixes broken unit tests for bonding
	classes and the host browser.
In-Reply-To: <1223649604-8272-1-git-send-email-dpierce@redhat.com>
References: <1223649604-8272-1-git-send-email-dpierce@redhat.com>
Message-ID: <48EF71F0.2060709@redhat.com>

Darryl L. Pierce wrote:
> Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
> ---
>  src/app/models/bonding.rb          |    6 ++++++
>  src/app/models/bonding_type.rb     |    4 ++++
>  src/test/unit/bonding_test.rb      |   10 +++++-----
>  src/test/unit/bonding_type_test.rb |    2 +-
>  4 files changed, 16 insertions(+), 6 deletions(-)
>
> diff --git a/src/app/models/bonding.rb b/src/app/models/bonding.rb
> index 941e2cd..4b6e8a5 100644
> --- a/src/app/models/bonding.rb
> +++ b/src/app/models/bonding.rb
> @@ -33,6 +33,12 @@ class Bonding < ActiveRecord::Base
>    validates_presence_of :name,
>      :message => 'A name is required.'
>  
> +  validates_presence_of :host_id,
> +    :message => 'A host must be specified.'
> +
> +  validates_presence_of :bonding_type_id,
> +    :message => 'A bonding type must be specified.'
> +
>    validates_presence_of :interface_name,
>      :message => 'An interface name is required.'
>  
> diff --git a/src/app/models/bonding_type.rb b/src/app/models/bonding_type.rb
> index e0d2193..f844df1 100644
> --- a/src/app/models/bonding_type.rb
> +++ b/src/app/models/bonding_type.rb
> @@ -22,5 +22,9 @@
>  #
>  class BondingType < ActiveRecord::Base
>    validates_presence_of :label
> +  validates_uniqueness_of :label,
> +    :message => 'Label must be unique'
>    validates_presence_of :mode
> +  validates_uniqueness_of :mode,
> +    :message => 'Mode must be unique'
>  end
> diff --git a/src/test/unit/bonding_test.rb b/src/test/unit/bonding_test.rb
> index 4bdb079..a2cdef8 100644
> --- a/src/test/unit/bonding_test.rb
> +++ b/src/test/unit/bonding_test.rb
> @@ -28,10 +28,10 @@ class BondingTest < ActiveSupport::TestCase
>  
>    def setup
>      @bonding = Bonding.new(
> -      :name           => 'Bonding1',
> -      :interface_name => 'bond0',
> -      :type_id        => bonding_types(:failover_bonding_type),
> -      :host_id        => hosts(:mailservers_managed_node))
> +      :name            => 'Bonding1',
> +      :interface_name  => 'bond0',
> +      :bonding_type_id => bonding_types(:failover_bonding_type),
> +      :host_id         => hosts(:mailservers_managed_node))
>    end
>  
>    # Ensures that the name is required.
> @@ -53,7 +53,7 @@ class BondingTest < ActiveSupport::TestCase
>    # Ensures that the bonding type is required.
>    #
>    def test_valid_fails_without_type
> -    @bonding.type_id = nil
> +    @bonding.bonding_type_id = nil
>  
>      flunk 'Bondings have to have a valid type.' if @bonding.valid?
>    end
> diff --git a/src/test/unit/bonding_type_test.rb b/src/test/unit/bonding_type_test.rb
> index 5f2ccb2..c900002 100644
> --- a/src/test/unit/bonding_type_test.rb
> +++ b/src/test/unit/bonding_type_test.rb
> @@ -29,6 +29,6 @@ class BondingTypeTest < ActiveSupport::TestCase
>    def test_modes_must_be_unique
>      @bonding_type.mode = BondingType.find(:first).mode
>  
> -    assert @bonding_type.save == false, 'A bonding type with a duplicate mode should not save.'
> +    flunk "Modes must be unique" if @bonding_type.valid?
>    end
>  end
>   
ACK as this patch seems to take care of the bonding problems. As
mentioned I'm seeing two last broken test cases, both seeming to stem
from the same problem (they are attached). It seems that in
host_browser.rb, specifically write_host_info line 305 doesn't succeed
in retrieving BootType from proto in those two broken cases. I've
verified that the contents of the BootType table is null there where as
other tables have data (crudely tested by putting a long sleep
immediately before the line in question and then running the psql client
manually and selecting records ). I tried debugging it for a while
yesterday but was unable to come up with a solution, perhaps we can
figure out something together. (a theory I had was that some deletion is
cascading and knocking out the BootType records). Perhaps if everything
is working locally for you, there is still a bit of code in your local
repo that you haven't sent out yet? I'm wondering because I see  you
mention host_browser in the subject line but don't see the actual
changes to any host browser module in your attached patch.

  Thanks alot,
     Mo

  1) Failure:
test_write_host_info_with_duplicate_nic(HostBrowserIdentifyTest)
    [./test/unit/host_browser_identify_test.rb:226:in
`test_write_host_info_with_duplicate_nic'
    
/usr/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in
`__send__'
    
/usr/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in
`run']:
Exception raised:
Class: <RuntimeError>
Message: <"Called id for nil, which would mistakenly be 4 -- if you
really wanted the id of nil, use object_id">
---Backtrace---
./test/unit/../../host-browser/host-browser.rb:317:in `write_host_info'
./test/unit/../../host-browser/host-browser.rb:308:in `collect'
./test/unit/../../host-browser/host-browser.rb:308:in `write_host_info'
./test/unit/host_browser_identify_test.rb:226:in
`test_write_host_info_with_duplicate_nic'
./test/unit/host_browser_identify_test.rb:226:in
`test_write_host_info_with_duplicate_nic'
/usr/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in
`__send__'
/usr/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in
`run'
---------------

  2) Failure:
test_write_host_info_with_missing_uuid(HostBrowserIdentifyTest)
    [./test/unit/host_browser_identify_test.rb:167:in
`test_write_host_info_with_missing_uuid'
    
/usr/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in
`__send__'
    
/usr/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in
`run']:
Exception raised:
Class: <RuntimeError>
Message: <"Called id for nil, which would mistakenly be 4 -- if you
really wanted the id of nil, use object_id">
---Backtrace---
./test/unit/../../host-browser/host-browser.rb:317:in `write_host_info'
./test/unit/../../host-browser/host-browser.rb:308:in `collect'
./test/unit/../../host-browser/host-browser.rb:308:in `write_host_info'
./test/unit/host_browser_identify_test.rb:167:in
`test_write_host_info_with_missing_uuid'
./test/unit/host_browser_identify_test.rb:167:in
`test_write_host_info_with_missing_uuid'
/usr/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in
`__send__'
/usr/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in
`run'
---------------

38 tests, 47 assertions, 2 failures, 0 errors



From hbrock at redhat.com  Fri Oct 10 15:26:44 2008
From: hbrock at redhat.com (Hugh O. Brock)
Date: Fri, 10 Oct 2008 11:26:44 -0400
Subject: [Ovirt-devel] flexchart build instructions
In-Reply-To: <48EF70A5.6010206@redhat.com>
References: <20081009190645.GF10125@redhat.com>
	<20081010143353.GG10125@redhat.com>
	<20081010145755.GD30422@redhat.com> <48EF70A5.6010206@redhat.com>
Message-ID: <20081010152644.GE30422@redhat.com>

On Fri, Oct 10, 2008 at 05:11:33PM +0200, Alan Pevec wrote:
> Hugh O. Brock wrote:
>>>> 0) download the Open Flex SDK at http://opensource.adobe.com/wiki/display/flexsdk/Download+Flex+3 (I think I used latest stable build)
>>>> 1) unzip that archive somewhere and add the bin subdirectory of same to your PATH
>>> 1a) run dos2unix on bin/mxmlc
>
>> Crazy, is mxmlc a shell script? 
> yeah, wrapper scripts starting Java.
> BTW, in 3.1.0.2710 ZIP I got all scripts w/o execute bit, so also chmod +x bin/mxmlc

Awesome. So when we put this stuff in the build system I guess we can fix all that permanently, eh?

--Hugh



From slinabery at redhat.com  Fri Oct 10 15:33:40 2008
From: slinabery at redhat.com (Steve Linabery)
Date: Fri, 10 Oct 2008 10:33:40 -0500
Subject: [Ovirt-devel] REVISED: [PATCH server] Add a rudimentary flash
	chart written in flex framework to summary pages.
In-Reply-To: <20081009101929.GC10125@redhat.com>
References: <20081009101614.GA10125@redhat.com>
	<20081009101929.GC10125@redhat.com>
Message-ID: <20081010153339.GH10125@redhat.com>

Hi,

Here's a resubmission of this patch, with git pre-commit hooks enabled this time.

Thank you for testing!

Steve
-------------- next part --------------
>From 2f4c9126262cb9cc2272eb6ca62436c0e2746ab9 Mon Sep 17 00:00:00 2001
From: Steve Linabery <slinabery at redhat.com>
Date: Fri, 10 Oct 2008 10:29:53 -0500
Subject: [PATCH server] Add to summary pages a rudimentary flash chart written in flex framework

---
 src/app/controllers/graph_controller.rb            |   30 +-
 src/app/views/graph/flexchart_data.rhtml           |    1 +
 src/app/views/graph/history_graphs.rhtml           |   87 +---
 src/config/routes.rb                               |    1 +
 src/flexchart/README.txt                           |    8 +
 src/flexchart/com/adobe/serialization/json/JSON.as |   85 +++
 .../com/adobe/serialization/json/JSONDecoder.as    |  221 ++++++++
 .../com/adobe/serialization/json/JSONEncoder.as    |  299 +++++++++++
 .../com/adobe/serialization/json/JSONParseError.as |   87 +++
 .../com/adobe/serialization/json/JSONToken.as      |  104 ++++
 .../com/adobe/serialization/json/JSONTokenType.as  |   67 +++
 .../com/adobe/serialization/json/JSONTokenizer.as  |  547 ++++++++++++++++++++
 src/flexchart/flexchart.mxml                       |   20 +
 src/flexchart/org/ovirt/ChartLoader.as             |   64 +++
 src/flexchart/org/ovirt/DataSeries.as              |   42 ++
 src/flexchart/org/ovirt/DataSource.as              |   57 ++
 src/public/javascripts/jquery.flash.js             |  288 ++++++++++
 17 files changed, 1930 insertions(+), 78 deletions(-)
 create mode 100644 src/app/views/graph/flexchart_data.rhtml
 create mode 100644 src/flexchart/README.txt
 create mode 100644 src/flexchart/com/adobe/serialization/json/JSON.as
 create mode 100644 src/flexchart/com/adobe/serialization/json/JSONDecoder.as
 create mode 100644 src/flexchart/com/adobe/serialization/json/JSONEncoder.as
 create mode 100644 src/flexchart/com/adobe/serialization/json/JSONParseError.as
 create mode 100644 src/flexchart/com/adobe/serialization/json/JSONToken.as
 create mode 100644 src/flexchart/com/adobe/serialization/json/JSONTokenType.as
 create mode 100644 src/flexchart/com/adobe/serialization/json/JSONTokenizer.as
 create mode 100644 src/flexchart/flexchart.mxml
 create mode 100644 src/flexchart/org/ovirt/ChartLoader.as
 create mode 100644 src/flexchart/org/ovirt/DataSeries.as
 create mode 100644 src/flexchart/org/ovirt/DataSource.as
 create mode 100644 src/public/javascripts/jquery.flash.js

diff --git a/src/app/controllers/graph_controller.rb b/src/app/controllers/graph_controller.rb
index dbe2afc..6450935 100644
--- a/src/app/controllers/graph_controller.rb
+++ b/src/app/controllers/graph_controller.rb
@@ -3,7 +3,24 @@ require 'util/stats/Stats'
 class GraphController < ApplicationController
   layout nil
 
-  # generate layout for avaialability bar graphs
+  def flexchart_data
+
+    #FIXME: use the stats package aggregation (when it's available)
+    #instead of the old method
+    graph_obj = history_graph_data_object
+
+    #FIXME: for this release, the flexchart shows only peak values,
+    #       and only shows a default of the last 40 data points in rrd.
+    graph_data = { :labels => graph_obj[:timepoints].last(40),
+                   :values => graph_obj[:dataset][2][:values].last(40) }
+    my_data = graph_data[:labels].zip(graph_data[:values])
+    @graph = { :vectors => my_data,
+               :max_value => graph_obj[:total_peak]
+             }
+  end
+
+
+  # generate layout for availability bar graphs
   def availability_graph
     @id = params[:id]
     @target = params[:target]
@@ -67,6 +84,10 @@ class GraphController < ApplicationController
 
   # retrieves data for history graphs
   def history_graph_data
+    render :json => history_graph_data_object
+  end
+
+  def history_graph_data_object
     history_graphs
     myDays = params[:days]
     target = params[:target]
@@ -212,9 +233,10 @@ class GraphController < ApplicationController
                 :stroke => @avg_history[:color],
                 :strokeWidth => 1
             }
-       ]
+       ],
+       :total_peak => total_peak
     }
-    render :json => graph_object
+
   end
 
 
@@ -261,7 +283,7 @@ class GraphController < ApplicationController
             }
        ]
     }
-    render :json => graph_object
+
 
   end
   
diff --git a/src/app/views/graph/flexchart_data.rhtml b/src/app/views/graph/flexchart_data.rhtml
new file mode 100644
index 0000000..a79ce06
--- /dev/null
+++ b/src/app/views/graph/flexchart_data.rhtml
@@ -0,0 +1 @@
+<%= @graph.to_json %>
diff --git a/src/app/views/graph/history_graphs.rhtml b/src/app/views/graph/history_graphs.rhtml
index 2b6874f..f372e4b 100644
--- a/src/app/views/graph/history_graphs.rhtml
+++ b/src/app/views/graph/history_graphs.rhtml
@@ -1,76 +1,15 @@
+<%= javascript_include_tag "jquery.flash.js" %>
+<div id="the-div-name"></div>
 <script type="text/javascript">
-
-var graph = "load_history";
-var days  = "7";
-
-function swap_history_graph(newgraph, newdays){
-    if(newgraph == null) newgraph = graph
-    if(newdays == null) newdays = days
-    $('.history_graph').hide(); 
-    $('#' + newgraph + "_" + newdays).parent().show();
-    eval("draw_" + newgraph + "_" + newdays + "_graph_get_data()");
-}
-function swap_history_graph_target(title, newgraph){
-    swap_history_graph(newgraph, null);
-    $('#history_graph_selection').html(title + '&nbsp;&nbsp;<%= image_tag 'icon_menu_arrow.gif' %>');
-    graph = newgraph
-}
-function swap_history_graph_time(title, newdays){
-    swap_history_graph(null, newdays);
-    $('#history_graph_time_selection').html(title + '&nbsp;&nbsp;<%= image_tag 'icon_menu_arrow.gif' %>');
-    days = newdays
-}
-
-</script>
-
-<%= render :partial => '/layouts/graph', :locals => { :drawMe => false,  :includeDiv => false, :methodName=> 'draw_cpu_history_1_graph',     :div_id => 'cpu_history_1',     :chartType => 'line', :yGridLines => 'lightgrey', :xGridLines => 'lightgrey', :ticksX => 20,  :scaleX => 173,   :ticksY => 10, :scaleY => 110,  :url => (url_for :escape => false, :controller => 'graph', :action => 'history_graph_data', :id => @id, :params => { :target => 'cpu',    :poolType => @poolType, :days => 1   } ) } %>
-<%= render :partial => '/layouts/graph', :locals => { :drawMe => false,  :includeDiv => false, :methodName=> 'draw_cpu_history_7_graph',     :div_id => 'cpu_history_7',     :chartType => 'line', :yGridLines => 'lightgrey', :xGridLines => 'lightgrey', :ticksX => 39, :scaleX => 272,  :ticksY => 10, :scaleY => 110,  :url => (url_for :escape => false, :controller => 'graph', :action => 'history_graph_data', :id => @id, :params => { :target => 'cpu',    :poolType => @poolType, :days => 7   } ) } %>
-<%= render :partial => '/layouts/graph', :locals => { :drawMe => false,  :includeDiv => false, :methodName=> 'draw_cpu_history_30_graph',    :div_id => 'cpu_history_30',    :chartType => 'line', :yGridLines => 'lightgrey', :xGridLines => 'lightgrey', :ticksX => 120,  :scaleX => 1200,  :ticksY => 10, :scaleY => 110,  :url => (url_for :escape => false, :controller => 'graph', :action => 'history_graph_data', :id => @id, :params => { :target => 'cpu',    :poolType => @poolType, :days => 30  } ) } %>
-<%= render :partial => '/layouts/graph', :locals => { :drawMe => false,  :includeDiv => false, :methodName=> 'draw_memory_history_1_graph',  :div_id => 'memory_history_1',  :chartType => 'line', :yGridLines => 'lightgrey', :xGridLines => 'lightgrey', :ticksX => 20,  :scaleX => 173,   :ticksY => 50, :scaleY => 756,  :url => (url_for :escape => false, :controller => 'graph', :action => 'history_graph_data', :id => @id, :params => { :target => 'memory', :poolType => @poolType, :days => 1   } ) } %>
-<%= render :partial => '/layouts/graph', :locals => { :drawMe => false,  :includeDiv => false, :methodName=> 'draw_memory_history_7_graph',  :div_id => 'memory_history_7',  :chartType => 'line', :yGridLines => 'lightgrey', :xGridLines => 'lightgrey', :ticksX => 39, :scaleX => 272,  :ticksY => 50, :scaleY => 756,  :url => (url_for :escape => false, :controller => 'graph', :action => 'history_graph_data', :id => @id, :params => { :target => 'memory', :poolType => @poolType, :days => 7   } ) } %>
-<%= render :partial => '/layouts/graph', :locals => { :drawMe => false,  :includeDiv => false, :methodName=> 'draw_memory_history_30_graph', :div_id => 'memory_history_30', :chartType => 'line', :yGridLines => 'lightgrey', :xGridLines => 'lightgrey', :ticksX => 120,  :scaleX => 1162,  :ticksY => 50, :scaleY => 756,  :url => (url_for :escape => false, :controller => 'graph', :action => 'history_graph_data', :id => @id, :params => { :target => 'memory', :poolType => @poolType, :days => 30  } ) } %>
-<%= render :partial => '/layouts/graph', :locals => { :drawMe => false,  :includeDiv => false, :methodName=> 'draw_load_history_1_graph',    :div_id => 'load_history_1',    :chartType => 'line', :yGridLines => 'lightgrey', :xGridLines => 'lightgrey', :ticksX => 20,  :scaleX => 173,   :ticksY => 2,  :scaleY => 23,   :url => (url_for :escape => false, :controller => 'graph', :action => 'history_graph_data', :id => @id, :params => { :target => 'load',   :poolType => @poolType, :days => 1   } ) } %>
-<%= render :partial => '/layouts/graph', :locals => { :drawMe => false,  :includeDiv => false, :methodName=> 'draw_load_history_7_graph',    :div_id => 'load_history_7',    :chartType => 'line', :yGridLines => 'lightgrey', :xGridLines => 'lightgrey', :ticksX => 39, :scaleX => 272,  :ticksY => 2,  :scaleY => 23,   :url => (url_for :escape => false, :controller => 'graph', :action => 'history_graph_data', :id => @id, :params => { :target => 'load',   :poolType => @poolType, :days => 7   } ) } %>
-<%= render :partial => '/layouts/graph', :locals => { :drawMe => false,  :includeDiv => false, :methodName=> 'draw_load_history_30_graph',   :div_id => 'load_history_30',   :chartType => 'line', :yGridLines => 'lightgrey', :xGridLines => 'lightgrey', :ticksX => 120,  :scaleX => 1200,  :ticksY => 2,  :scaleY => 23,   :url => (url_for :escape => false, :controller => 'graph', :action => 'history_graph_data', :id => @id, :params => { :target => 'load',   :poolType => @poolType, :days => 30  } ) } %>
-
-<div id="history_graphs">
-  <div id="history_graphs_control">
-   <div class="history_graphs_menu">
-      <ul>
-        <li><div id="history_graph_selection" class="history_graph_menu_header">Overall Load &nbsp;&nbsp;<%= image_tag 'icon_menu_arrow.gif' %></div></li>
-        <li class="history_graph_menu_item history_graph_menu_fitem"><a href="#" onclick="swap_history_graph_target('Overall Load', 'load_history')" >Overall Load</a></li>
-        <li class="history_graph_menu_item"><a href="#" onclick="swap_history_graph_target('CPU History', 'cpu_history');" >CPU History</a></li>
-        <li class="history_graph_menu_item history_graph_menu_litem"><a href="#" onclick="swap_history_graph_target('Memory History', 'memory_history');">Memory History</a></li>
-      </ul>
-   </div>
-   <div class="history_graphs_menu">
-      <ul>
-        <li><div id="history_graph_time_selection" class="history_graph_menu_header">Last 7 Days &nbsp;&nbsp;<%= image_tag 'icon_menu_arrow.gif' %></div></li>
-        <li class="history_graph_menu_item history_graph_menu_fitem"<a href="#" onclick="swap_history_graph_time('Last 24 Hours', '1')" >Last 24 Hours</a></li>
-        <li class="history_graph_menu_item"><a href="#" onclick="swap_history_graph_time('Last 7 days', '7')" >Last 7  Days</a></li>
-        <li class="history_graph_menu_item history_graph_menu_litem"><a href="#" onclick="swap_history_graph_time('Last 30 Days', '30')" >Last 30 Days</a></li>
-      </ul>
-   </div>
-   <div class="history_graphs_legend">
-       <font color="<%= @peak_history[:color]   %>">Peak &nbsp; &nbsp;</font>
-       <font color="<%= @avg_history[:color] %>">Average &nbsp; &nbsp;</font>
-       <font color="<%= @roll_peak_history[:color]   %>">Rolling Peak &nbsp; &nbsp;</font>
-       <font color="<%= @roll_avg_history[:color] %>">Rolling Average &nbsp; &nbsp;</font>
-   </div>
-  </div>
-  <div id="history_graphs_graphs">
-    <div class="history_graph"><div id="cpu_history_1">       </div></div>
-    <div class="history_graph"><div id="cpu_history_7">       </div></div>
-    <div class="history_graph"><div id="cpu_history_30">      </div></div>
-    <div class="history_graph"><div id="memory_history_1">    </div></div>
-    <div class="history_graph"><div id="memory_history_7">    </div></div>
-    <div class="history_graph"><div id="memory_history_30">   </div></div>
-    <div class="history_graph"><div id="load_history_1">      </div></div>
-    <div class="history_graph"><div id="load_history_7">      </div></div>
-    <div class="history_graph"><div id="load_history_30">     </div></div>
-  </div>
-</div>
-
-<script type="text/javascript">
-    swap_history_graph(null, null); // display 1st graph
+$(document).ready(function(){
+$('#the-div-name').flash(
+        {
+          src: '/ovirt/flexchart.swf',
+          width: 720,
+          height: 300,
+          flashvars: { flexchart_data: '/ovirt/graph/flexchart_data/<%= @id %>/memory/1' }
+        },
+        { version: 9 }
+    );
+});
 </script>
diff --git a/src/config/routes.rb b/src/config/routes.rb
index 6f8e481..8d538cb 100644
--- a/src/config/routes.rb
+++ b/src/config/routes.rb
@@ -41,6 +41,7 @@ ActionController::Routing::Routes.draw do |map|
   map.connect ':controller/service.wsdl', :action => 'wsdl'
 
   # Install the default route as the lowest priority.
+  map.connect 'graph/flexchart_data/:id/:target/:days', :controller => 'graph', :action => 'flexchart_data'
   map.connect ':controller/:action/:id.:format'
   map.connect ':controller/:action/:id'
 
diff --git a/src/flexchart/README.txt b/src/flexchart/README.txt
new file mode 100644
index 0000000..66eb183
--- /dev/null
+++ b/src/flexchart/README.txt
@@ -0,0 +1,8 @@
+Until mxmlc gets packaged and this becomes part of autobuild,
+you must obtain the open flex SDK to build the swf movie.
+
+Once you have mxmlc on your system, run:
+
+mxmlc flexchart.mxml
+
+in this directory, and copy the resulting file flexchart.swf to /usr/share/ovirt-server/public on your appliance.
diff --git a/src/flexchart/com/adobe/serialization/json/JSON.as b/src/flexchart/com/adobe/serialization/json/JSON.as
new file mode 100644
index 0000000..8cd9286
--- /dev/null
+++ b/src/flexchart/com/adobe/serialization/json/JSON.as
@@ -0,0 +1,85 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+  * Neither the name of Adobe Systems Incorporated nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.serialization.json {
+
+	/**
+	 * This class provides encoding and decoding of the JSON format.
+	 *
+	 * Example usage:
+	 * <code>
+	 * 		// create a JSON string from an internal object
+	 * 		JSON.encode( myObject );
+	 *
+	 *		// read a JSON string into an internal object
+	 *		var myObject:Object = JSON.decode( jsonString );
+	 *	</code>
+	 */
+	public class JSON {
+
+
+		/**
+		 * Encodes a object into a JSON string.
+		 *
+		 * @param o The object to create a JSON string for
+		 * @return the JSON string representing o
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public static function encode( o:Object ):String {
+
+			var encoder:JSONEncoder = new JSONEncoder( o );
+			return encoder.getString();
+
+		}
+
+		/**
+		 * Decodes a JSON string into a native object.
+		 *
+		 * @param s The JSON string representing the object
+		 * @return A native object as specified by s
+		 * @throw JSONParseError
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public static function decode( s:String ):* {
+
+			var decoder:JSONDecoder = new JSONDecoder( s )
+			return decoder.getValue();
+
+		}
+
+	}
+
+}
\ No newline at end of file
diff --git a/src/flexchart/com/adobe/serialization/json/JSONDecoder.as b/src/flexchart/com/adobe/serialization/json/JSONDecoder.as
new file mode 100644
index 0000000..83bba1c
--- /dev/null
+++ b/src/flexchart/com/adobe/serialization/json/JSONDecoder.as
@@ -0,0 +1,221 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+  * Neither the name of Adobe Systems Incorporated nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.serialization.json {
+
+	public class JSONDecoder {
+
+		/** The value that will get parsed from the JSON string */
+		private var value:*;
+
+		/** The tokenizer designated to read the JSON string */
+		private var tokenizer:JSONTokenizer;
+
+		/** The current token from the tokenizer */
+		private var token:JSONToken;
+
+		/**
+		 * Constructs a new JSONDecoder to parse a JSON string
+		 * into a native object.
+		 *
+		 * @param s The JSON string to be converted
+		 *		into a native object
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function JSONDecoder( s:String ) {
+
+			tokenizer = new JSONTokenizer( s );
+
+			nextToken();
+			value = parseValue();
+		}
+
+		/**
+		 * Gets the internal object that was created by parsing
+		 * the JSON string passed to the constructor.
+		 *
+		 * @return The internal object representation of the JSON
+		 * 		string that was passed to the constructor
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function getValue():* {
+			return value;
+		}
+
+		/**
+		 * Returns the next token from the tokenzier reading
+		 * the JSON string
+		 */
+		private function nextToken():JSONToken {
+			return token = tokenizer.getNextToken();
+		}
+
+		/**
+		 * Attempt to parse an array
+		 */
+		private function parseArray():Array {
+			// create an array internally that we're going to attempt
+			// to parse from the tokenizer
+			var a:Array = new Array();
+
+			// grab the next token from the tokenizer to move
+			// past the opening [
+			nextToken();
+
+			// check to see if we have an empty array
+			if ( token.type == JSONTokenType.RIGHT_BRACKET ) {
+				// we're done reading the array, so return it
+				return a;
+			}
+
+			// deal with elements of the array, and use an "infinite"
+			// loop because we could have any amount of elements
+			while ( true ) {
+				// read in the value and add it to the array
+				a.push ( parseValue() );
+
+				// after the value there should be a ] or a ,
+				nextToken();
+
+				if ( token.type == JSONTokenType.RIGHT_BRACKET ) {
+					// we're done reading the array, so return it
+					return a;
+				} else if ( token.type == JSONTokenType.COMMA ) {
+					// move past the comma and read another value
+					nextToken();
+				} else {
+					tokenizer.parseError( "Expecting ] or , but found " + token.value );
+				}
+			}
+            return null;
+		}
+
+		/**
+		 * Attempt to parse an object
+		 */
+		private function parseObject():Object {
+			// create the object internally that we're going to
+			// attempt to parse from the tokenizer
+			var o:Object = new Object();
+
+			// store the string part of an object member so
+			// that we can assign it a value in the object
+			var key:String
+
+			// grab the next token from the tokenizer
+			nextToken();
+
+			// check to see if we have an empty object
+			if ( token.type == JSONTokenType.RIGHT_BRACE ) {
+				// we're done reading the object, so return it
+				return o;
+			}
+
+			// deal with members of the object, and use an "infinite"
+			// loop because we could have any amount of members
+			while ( true ) {
+
+				if ( token.type == JSONTokenType.STRING ) {
+					// the string value we read is the key for the object
+					key = String( token.value );
+
+					// move past the string to see what's next
+					nextToken();
+
+					// after the string there should be a :
+					if ( token.type == JSONTokenType.COLON ) {
+
+						// move past the : and read/assign a value for the key
+						nextToken();
+						o[key] = parseValue();
+
+						// move past the value to see what's next
+						nextToken();
+
+						// after the value there's either a } or a ,
+						if ( token.type == JSONTokenType.RIGHT_BRACE ) {
+							// // we're done reading the object, so return it
+							return o;
+
+						} else if ( token.type == JSONTokenType.COMMA ) {
+							// skip past the comma and read another member
+							nextToken();
+						} else {
+							tokenizer.parseError( "Expecting } or , but found " + token.value );
+						}
+					} else {
+						tokenizer.parseError( "Expecting : but found " + token.value );
+					}
+				} else {
+					tokenizer.parseError( "Expecting string but found " + token.value );
+				}
+			}
+            return null;
+		}
+
+		/**
+		 * Attempt to parse a value
+		 */
+		private function parseValue():Object
+		{
+			// Catch errors when the input stream ends abruptly
+			if ( token == null )
+			{
+				tokenizer.parseError( "Unexpected end of input" );
+			}
+
+			switch ( token.type ) {
+				case JSONTokenType.LEFT_BRACE:
+					return parseObject();
+
+				case JSONTokenType.LEFT_BRACKET:
+					return parseArray();
+
+				case JSONTokenType.STRING:
+				case JSONTokenType.NUMBER:
+				case JSONTokenType.TRUE:
+				case JSONTokenType.FALSE:
+				case JSONTokenType.NULL:
+					return token.value;
+
+				default:
+					tokenizer.parseError( "Unexpected " + token.value );
+
+			}
+            return null;
+		}
+	}
+}
diff --git a/src/flexchart/com/adobe/serialization/json/JSONEncoder.as b/src/flexchart/com/adobe/serialization/json/JSONEncoder.as
new file mode 100644
index 0000000..8297b4f
--- /dev/null
+++ b/src/flexchart/com/adobe/serialization/json/JSONEncoder.as
@@ -0,0 +1,299 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+  * Neither the name of Adobe Systems Incorporated nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.serialization.json
+{
+
+	import flash.utils.describeType;
+
+	public class JSONEncoder {
+
+		/** The string that is going to represent the object we're encoding */
+		private var jsonString:String;
+
+		/**
+		 * Creates a new JSONEncoder.
+		 *
+		 * @param o The object to encode as a JSON string
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function JSONEncoder( value:* ) {
+			jsonString = convertToString( value );
+
+		}
+
+		/**
+		 * Gets the JSON string from the encoder.
+		 *
+		 * @return The JSON string representation of the object
+		 * 		that was passed to the constructor
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function getString():String {
+			return jsonString;
+		}
+
+		/**
+		 * Converts a value to it's JSON string equivalent.
+		 *
+		 * @param value The value to convert.  Could be any
+		 *		type (object, number, array, etc)
+		 */
+		private function convertToString( value:* ):String {
+
+			// determine what value is and convert it based on it's type
+			if ( value is String ) {
+
+				// escape the string so it's formatted correctly
+				return escapeString( value as String );
+
+			} else if ( value is Number ) {
+
+				// only encode numbers that finate
+				return isFinite( value as Number) ? value.toString() : "null";
+
+			} else if ( value is Boolean ) {
+
+				// convert boolean to string easily
+				return value ? "true" : "false";
+
+			} else if ( value is Array ) {
+
+				// call the helper method to convert an array
+				return arrayToString( value as Array );
+
+			} else if ( value is Object && value != null ) {
+
+				// call the helper method to convert an object
+				return objectToString( value );
+			}
+            return "null";
+		}
+
+		/**
+		 * Escapes a string accoding to the JSON specification.
+		 *
+		 * @param str The string to be escaped
+		 * @return The string with escaped special characters
+		 * 		according to the JSON specification
+		 */
+		private function escapeString( str:String ):String {
+			// create a string to store the string's jsonstring value
+			var s:String = "";
+			// current character in the string we're processing
+			var ch:String;
+			// store the length in a local variable to reduce lookups
+			var len:Number = str.length;
+
+			// loop over all of the characters in the string
+			for ( var i:int = 0; i < len; i++ ) {
+
+				// examine the character to determine if we have to escape it
+				ch = str.charAt( i );
+				switch ( ch ) {
+
+					case '"':	// quotation mark
+						s += "\\\"";
+						break;
+
+					//case '/':	// solidus
+					//	s += "\\/";
+					//	break;
+
+					case '\\':	// reverse solidus
+						s += "\\\\";
+						break;
+
+					case '\b':	// bell
+						s += "\\b";
+						break;
+
+					case '\f':	// form feed
+						s += "\\f";
+						break;
+
+					case '\n':	// newline
+						s += "\\n";
+						break;
+
+					case '\r':	// carriage return
+						s += "\\r";
+						break;
+
+					case '\t':	// horizontal tab
+						s += "\\t";
+						break;
+
+					default:	// everything else
+
+						// check for a control character and escape as unicode
+						if ( ch < ' ' ) {
+							// get the hex digit(s) of the character (either 1 or 2 digits)
+							var hexCode:String = ch.charCodeAt( 0 ).toString( 16 );
+
+							// ensure that there are 4 digits by adjusting
+							// the # of zeros accordingly.
+							var zeroPad:String = hexCode.length == 2 ? "00" : "000";
+
+							// create the unicode escape sequence with 4 hex digits
+							s += "\\u" + zeroPad + hexCode;
+						} else {
+
+							// no need to do any special encoding, just pass-through
+							s += ch;
+
+						}
+				}	// end switch
+
+			}	// end for loop
+
+			return "\"" + s + "\"";
+		}
+
+		/**
+		 * Converts an array to it's JSON string equivalent
+		 *
+		 * @param a The array to convert
+		 * @return The JSON string representation of <code>a</code>
+		 */
+		private function arrayToString( a:Array ):String {
+			// create a string to store the array's jsonstring value
+			var s:String = "";
+
+			// loop over the elements in the array and add their converted
+			// values to the string
+			for ( var i:int = 0; i < a.length; i++ ) {
+				// when the length is 0 we're adding the first element so
+				// no comma is necessary
+				if ( s.length > 0 ) {
+					// we've already added an element, so add the comma separator
+					s += ","
+				}
+
+				// convert the value to a string
+				s += convertToString( a[i] );
+			}
+
+			// KNOWN ISSUE:  In ActionScript, Arrays can also be associative
+			// objects and you can put anything in them, ie:
+			//		myArray["foo"] = "bar";
+			//
+			// These properties aren't picked up in the for loop above because
+			// the properties don't correspond to indexes.  However, we're
+			// sort of out luck because the JSON specification doesn't allow
+			// these types of array properties.
+			//
+			// So, if the array was also used as an associative object, there
+			// may be some values in the array that don't get properly encoded.
+			//
+			// A possible solution is to instead encode the Array as an Object
+			// but then it won't get decoded correctly (and won't be an
+			// Array instance)
+
+			// close the array and return it's string value
+			return "[" + s + "]";
+		}
+
+		/**
+		 * Converts an object to it's JSON string equivalent
+		 *
+		 * @param o The object to convert
+		 * @return The JSON string representation of <code>o</code>
+		 */
+		private function objectToString( o:Object ):String
+		{
+			// create a string to store the object's jsonstring value
+			var s:String = "";
+
+			// determine if o is a class instance or a plain object
+			var classInfo:XML = describeType( o );
+			if ( classInfo. at name.toString() == "Object" )
+			{
+				// the value of o[key] in the loop below - store this
+				// as a variable so we don't have to keep looking up o[key]
+				// when testing for valid values to convert
+				var value:Object;
+
+				// loop over the keys in the object and add their converted
+				// values to the string
+				for ( var key:String in o )
+				{
+					// assign value to a variable for quick lookup
+					value = o[key];
+
+					// don't add function's to the JSON string
+					if ( value is Function )
+					{
+						// skip this key and try another
+						continue;
+					}
+
+					// when the length is 0 we're adding the first item so
+					// no comma is necessary
+					if ( s.length > 0 ) {
+						// we've already added an item, so add the comma separator
+						s += ","
+					}
+
+					s += escapeString( key ) + ":" + convertToString( value );
+				}
+			}
+			else // o is a class instance
+			{
+				// Loop over all of the variables and accessors in the class and
+				// serialize them along with their values.
+				for each ( var v:XML in classInfo..*.( name() == "variable" || name() == "accessor" ) )
+				{
+					// When the length is 0 we're adding the first item so
+					// no comma is necessary
+					if ( s.length > 0 ) {
+						// We've already added an item, so add the comma separator
+						s += ","
+					}
+
+					s += escapeString( v. at name.toString() ) + ":"
+							+ convertToString( o[ v. at name ] );
+				}
+
+			}
+
+			return "{" + s + "}";
+		}
+
+
+	}
+
+}
diff --git a/src/flexchart/com/adobe/serialization/json/JSONParseError.as b/src/flexchart/com/adobe/serialization/json/JSONParseError.as
new file mode 100644
index 0000000..4040910
--- /dev/null
+++ b/src/flexchart/com/adobe/serialization/json/JSONParseError.as
@@ -0,0 +1,87 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+  * Neither the name of Adobe Systems Incorporated nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.serialization.json {
+
+	/**
+	 *
+	 *
+	 */
+	public class JSONParseError extends Error 	{
+
+		/** The location in the string where the error occurred */
+		private var _location:int;
+
+		/** The string in which the parse error occurred */
+		private var _text:String;
+
+		/**
+		 * Constructs a new JSONParseError.
+		 *
+		 * @param message The error message that occured during parsing
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function JSONParseError( message:String = "", location:int = 0, text:String = "") {
+			super( message );
+			name = "JSONParseError";
+			_location = location;
+			_text = text;
+		}
+
+		/**
+		 * Provides read-only access to the location variable.
+		 *
+		 * @return The location in the string where the error occurred
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function get location():int {
+			return _location;
+		}
+
+		/**
+		 * Provides read-only access to the text variable.
+		 *
+		 * @return The string in which the error occurred
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function get text():String {
+			return _text;
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/src/flexchart/com/adobe/serialization/json/JSONToken.as b/src/flexchart/com/adobe/serialization/json/JSONToken.as
new file mode 100644
index 0000000..0296f13
--- /dev/null
+++ b/src/flexchart/com/adobe/serialization/json/JSONToken.as
@@ -0,0 +1,104 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+  * Neither the name of Adobe Systems Incorporated nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.serialization.json {
+
+	public class JSONToken {
+
+		private var _type:int;
+		private var _value:Object;
+
+		/**
+		 * Creates a new JSONToken with a specific token type and value.
+		 *
+		 * @param type The JSONTokenType of the token
+		 * @param value The value of the token
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function JSONToken( type:int = -1 /* JSONTokenType.UNKNOWN */, value:Object = null ) {
+			_type = type;
+			_value = value;
+		}
+
+		/**
+		 * Returns the type of the token.
+		 *
+		 * @see com.adobe.serialization.json.JSONTokenType
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function get type():int {
+			return _type;
+		}
+
+		/**
+		 * Sets the type of the token.
+		 *
+		 * @see com.adobe.serialization.json.JSONTokenType
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function set type( value:int ):void {
+			_type = value;
+		}
+
+		/**
+		 * Gets the value of the token
+		 *
+		 * @see com.adobe.serialization.json.JSONTokenType
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function get value():Object {
+			return _value;
+		}
+
+		/**
+		 * Sets the value of the token
+		 *
+		 * @see com.adobe.serialization.json.JSONTokenType
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function set value ( v:Object ):void {
+			_value = v;
+		}
+
+	}
+
+}
\ No newline at end of file
diff --git a/src/flexchart/com/adobe/serialization/json/JSONTokenType.as b/src/flexchart/com/adobe/serialization/json/JSONTokenType.as
new file mode 100644
index 0000000..adaa0d7
--- /dev/null
+++ b/src/flexchart/com/adobe/serialization/json/JSONTokenType.as
@@ -0,0 +1,67 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+  * Neither the name of Adobe Systems Incorporated nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.serialization.json {
+
+	/**
+	 * Class containing constant values for the different types
+	 * of tokens in a JSON encoded string.
+	 */
+	public class JSONTokenType {
+
+		public static const UNKNOWN:int = -1;
+
+		public static const COMMA:int = 0;
+
+		public static const LEFT_BRACE:int = 1;
+
+		public static const RIGHT_BRACE:int = 2;
+
+		public static const LEFT_BRACKET:int = 3;
+
+		public static const RIGHT_BRACKET:int = 4;
+
+		public static const COLON:int = 6;
+
+		public static const TRUE:int = 7;
+
+		public static const FALSE:int = 8;
+
+		public static const NULL:int = 9;
+
+		public static const STRING:int = 10;
+
+		public static const NUMBER:int = 11;
+
+	}
+
+}
\ No newline at end of file
diff --git a/src/flexchart/com/adobe/serialization/json/JSONTokenizer.as b/src/flexchart/com/adobe/serialization/json/JSONTokenizer.as
new file mode 100644
index 0000000..9e7a5a4
--- /dev/null
+++ b/src/flexchart/com/adobe/serialization/json/JSONTokenizer.as
@@ -0,0 +1,547 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+  * Neither the name of Adobe Systems Incorporated nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.serialization.json {
+
+	public class JSONTokenizer {
+
+		/** The object that will get parsed from the JSON string */
+		private var obj:Object;
+
+		/** The JSON string to be parsed */
+		private var jsonString:String;
+
+		/** The current parsing location in the JSON string */
+		private var loc:int;
+
+		/** The current character in the JSON string during parsing */
+		private var ch:String;
+
+		/**
+		 * Constructs a new JSONDecoder to parse a JSON string
+		 * into a native object.
+		 *
+		 * @param s The JSON string to be converted
+		 *		into a native object
+		 */
+		public function JSONTokenizer( s:String ) {
+			jsonString = s;
+			loc = 0;
+
+			// prime the pump by getting the first character
+			nextChar();
+		}
+
+		/**
+		 * Gets the next token in the input sting and advances
+		* the character to the next character after the token
+		 */
+		public function getNextToken():JSONToken {
+			var token:JSONToken = new JSONToken();
+
+			// skip any whitespace / comments since the last
+			// token was read
+			skipIgnored();
+
+			// examine the new character and see what we have...
+			switch ( ch ) {
+
+				case '{':
+					token.type = JSONTokenType.LEFT_BRACE;
+					token.value = '{';
+					nextChar();
+					break
+
+				case '}':
+					token.type = JSONTokenType.RIGHT_BRACE;
+					token.value = '}';
+					nextChar();
+					break
+
+				case '[':
+					token.type = JSONTokenType.LEFT_BRACKET;
+					token.value = '[';
+					nextChar();
+					break
+
+				case ']':
+					token.type = JSONTokenType.RIGHT_BRACKET;
+					token.value = ']';
+					nextChar();
+					break
+
+				case ',':
+					token.type = JSONTokenType.COMMA;
+					token.value = ',';
+					nextChar();
+					break
+
+				case ':':
+					token.type = JSONTokenType.COLON;
+					token.value = ':';
+					nextChar();
+					break;
+
+				case 't': // attempt to read true
+					var possibleTrue:String = "t" + nextChar() + nextChar() + nextChar();
+
+					if ( possibleTrue == "true" ) {
+						token.type = JSONTokenType.TRUE;
+						token.value = true;
+						nextChar();
+					} else {
+						parseError( "Expecting 'true' but found " + possibleTrue );
+					}
+
+					break;
+
+				case 'f': // attempt to read false
+					var possibleFalse:String = "f" + nextChar() + nextChar() + nextChar() + nextChar();
+
+					if ( possibleFalse == "false" ) {
+						token.type = JSONTokenType.FALSE;
+						token.value = false;
+						nextChar();
+					} else {
+						parseError( "Expecting 'false' but found " + possibleFalse );
+					}
+
+					break;
+
+				case 'n': // attempt to read null
+
+					var possibleNull:String = "n" + nextChar() + nextChar() + nextChar();
+
+					if ( possibleNull == "null" ) {
+						token.type = JSONTokenType.NULL;
+						token.value = null;
+						nextChar();
+					} else {
+						parseError( "Expecting 'null' but found " + possibleNull );
+					}
+
+					break;
+
+				case '"': // the start of a string
+					token = readString();
+					break;
+
+				default:
+					// see if we can read a number
+					if ( isDigit( ch ) || ch == '-' ) {
+						token = readNumber();
+					} else if ( ch == '' ) {
+						// check for reading past the end of the string
+						return null;
+					} else {
+						// not sure what was in the input string - it's not
+						// anything we expected
+						parseError( "Unexpected " + ch + " encountered" );
+					}
+			}
+
+			return token;
+		}
+
+		/**
+		 * Attempts to read a string from the input string.  Places
+		 * the character location at the first character after the
+		 * string.  It is assumed that ch is " before this method is called.
+		 *
+		 * @return the JSONToken with the string value if a string could
+		 *		be read.  Throws an error otherwise.
+		 */
+		private function readString():JSONToken {
+			// the token for the string we'll try to read
+			var token:JSONToken = new JSONToken();
+			token.type = JSONTokenType.STRING;
+
+			// the string to store the string we'll try to read
+			var string:String = "";
+
+			// advance past the first "
+			nextChar();
+
+			while ( ch != '"' && ch != '' ) {
+
+				// unescape the escape sequences in the string
+				if ( ch == '\\' ) {
+
+					// get the next character so we know what
+					// to unescape
+					nextChar();
+
+					switch ( ch ) {
+
+						case '"': // quotation mark
+							string += '"';
+							break;
+
+						case '/':	// solidus
+							string += "/";
+							break;
+
+						case '\\':	// reverse solidus
+							string += '\\';
+							break;
+
+						case 'b':	// bell
+							string += '\b';
+							break;
+
+						case 'f':	// form feed
+							string += '\f';
+							break;
+
+						case 'n':	// newline
+							string += '\n';
+							break;
+
+						case 'r':	// carriage return
+							string += '\r';
+							break;
+
+						case 't':	// horizontal tab
+							string += '\t'
+							break;
+
+						case 'u':
+							// convert a unicode escape sequence
+							// to it's character value - expecting
+							// 4 hex digits
+
+							// save the characters as a string we'll convert to an int
+							var hexValue:String = "";
+
+							// try to find 4 hex characters
+							for ( var i:int = 0; i < 4; i++ ) {
+								// get the next character and determine
+								// if it's a valid hex digit or not
+								if ( !isHexDigit( nextChar() ) ) {
+									parseError( " Excepted a hex digit, but found: " + ch );
+								}
+								// valid, add it to the value
+								hexValue += ch;
+							}
+
+							// convert hexValue to an integer, and use that
+							// integrer value to create a character to add
+							// to our string.
+							string += String.fromCharCode( parseInt( hexValue, 16 ) );
+
+							break;
+
+						default:
+							// couldn't unescape the sequence, so just
+							// pass it through
+							string += '\\' + ch;
+
+					}
+
+				} else {
+					// didn't have to unescape, so add the character to the string
+					string += ch;
+
+				}
+
+				// move to the next character
+				nextChar();
+
+			}
+
+			// we read past the end of the string without closing it, which
+			// is a parse error
+			if ( ch == '' ) {
+				parseError( "Unterminated string literal" );
+			}
+
+			// move past the closing " in the input string
+			nextChar();
+
+			// attach to the string to the token so we can return it
+			token.value = string;
+
+			return token;
+		}
+
+		/**
+		 * Attempts to read a number from the input string.  Places
+		 * the character location at the first character after the
+		 * number.
+		 *
+		 * @return The JSONToken with the number value if a number could
+		 * 		be read.  Throws an error otherwise.
+		 */
+		private function readNumber():JSONToken {
+			// the token for the number we'll try to read
+			var token:JSONToken = new JSONToken();
+			token.type = JSONTokenType.NUMBER;
+
+			// the string to accumulate the number characters
+			// into that we'll convert to a number at the end
+			var input:String = "";
+
+			// check for a negative number
+			if ( ch == '-' ) {
+				input += '-';
+				nextChar();
+			}
+
+			// the number must start with a digit
+			if ( !isDigit( ch ) )
+			{
+				parseError( "Expecting a digit" );
+			}
+
+			// 0 can only be the first digit if it
+			// is followed by a decimal point
+			if ( ch == '0' )
+			{
+				input += ch;
+				nextChar();
+
+				// make sure no other digits come after 0
+				if ( isDigit( ch ) )
+				{
+					parseError( "A digit cannot immediately follow 0" );
+				}
+			}
+			else
+			{
+				// read numbers while we can
+				while ( isDigit( ch ) ) {
+					input += ch;
+					nextChar();
+				}
+			}
+
+			// check for a decimal value
+			if ( ch == '.' ) {
+				input += '.';
+				nextChar();
+
+				// after the decimal there has to be a digit
+				if ( !isDigit( ch ) )
+				{
+					parseError( "Expecting a digit" );
+				}
+
+				// read more numbers to get the decimal value
+				while ( isDigit( ch ) ) {
+					input += ch;
+					nextChar();
+				}
+			}
+
+			// check for scientific notation
+			if ( ch == 'e' || ch == 'E' )
+			{
+				input += "e"
+				nextChar();
+				// check for sign
+				if ( ch == '+' || ch == '-' )
+				{
+					input += ch;
+					nextChar();
+				}
+
+				// require at least one number for the exponent
+				// in this case
+				if ( !isDigit( ch ) )
+				{
+					parseError( "Scientific notation number needs exponent value" );
+				}
+
+				// read in the exponent
+				while ( isDigit( ch ) )
+				{
+					input += ch;
+					nextChar();
+				}
+			}
+
+			// convert the string to a number value
+			var num:Number = Number( input );
+
+			if ( isFinite( num ) && !isNaN( num ) ) {
+				token.value = num;
+				return token;
+			} else {
+				parseError( "Number " + num + " is not valid!" );
+			}
+            return null;
+		}
+
+		/**
+		 * Reads the next character in the input
+		 * string and advances the character location.
+		 *
+		 * @return The next character in the input string, or
+		 *		null if we've read past the end.
+		 */
+		private function nextChar():String {
+			return ch = jsonString.charAt( loc++ );
+		}
+
+		/**
+		 * Advances the character location past any
+		 * sort of white space and comments
+		 */
+		private function skipIgnored():void {
+			skipWhite();
+			skipComments();
+			skipWhite();
+		}
+
+		/**
+		 * Skips comments in the input string, either
+		 * single-line or multi-line.  Advances the character
+		 * to the first position after the end of the comment.
+		 */
+		private function skipComments():void {
+			if ( ch == '/' ) {
+				// Advance past the first / to find out what type of comment
+				nextChar();
+				switch ( ch ) {
+					case '/': // single-line comment, read through end of line
+
+						// Loop over the characters until we find
+						// a newline or until there's no more characters left
+						do {
+							nextChar();
+						} while ( ch != '\n' && ch != '' )
+
+						// move past the \n
+						nextChar();
+
+						break;
+
+					case '*': // multi-line comment, read until closing */
+
+						// move past the opening *
+						nextChar();
+
+						// try to find a trailing */
+						while ( true ) {
+							if ( ch == '*' ) {
+								// check to see if we have a closing /
+								nextChar();
+								if ( ch == '/') {
+									// move past the end of the closing */
+									nextChar();
+									break;
+								}
+							} else {
+								// move along, looking if the next character is a *
+								nextChar();
+							}
+
+							// when we're here we've read past the end of
+							// the string without finding a closing */, so error
+							if ( ch == '' ) {
+								parseError( "Multi-line comment not closed" );
+							}
+						}
+
+						break;
+
+					// Can't match a comment after a /, so it's a parsing error
+					default:
+						parseError( "Unexpected " + ch + " encountered (expecting '/' or '*' )" );
+				}
+			}
+
+		}
+
+
+		/**
+		 * Skip any whitespace in the input string and advances
+		 * the character to the first character after any possible
+		 * whitespace.
+		 */
+		private function skipWhite():void {
+
+			// As long as there are spaces in the input
+			// stream, advance the current location pointer
+			// past them
+			while ( isWhiteSpace( ch ) ) {
+				nextChar();
+			}
+
+		}
+
+		/**
+		 * Determines if a character is whitespace or not.
+		 *
+		 * @return True if the character passed in is a whitespace
+		 *	character
+		 */
+		private function isWhiteSpace( ch:String ):Boolean {
+			return ( ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r' );
+		}
+
+		/**
+		 * Determines if a character is a digit [0-9].
+		 *
+		 * @return True if the character passed in is a digit
+		 */
+		private function isDigit( ch:String ):Boolean {
+			return ( ch >= '0' && ch <= '9' );
+		}
+
+		/**
+		 * Determines if a character is a digit [0-9].
+		 *
+		 * @return True if the character passed in is a digit
+		 */
+		private function isHexDigit( ch:String ):Boolean {
+			// get the uppercase value of ch so we only have
+			// to compare the value between 'A' and 'F'
+			var uc:String = ch.toUpperCase();
+
+			// a hex digit is a digit of A-F, inclusive ( using
+			// our uppercase constraint )
+			return ( isDigit( ch ) || ( uc >= 'A' && uc <= 'F' ) );
+		}
+
+		/**
+		 * Raises a parsing error with a specified message, tacking
+		 * on the error location and the original string.
+		 *
+		 * @param message The message indicating why the error occurred
+		 */
+		public function parseError( message:String ):void {
+			throw new JSONParseError( message, loc, jsonString );
+		}
+	}
+
+}
diff --git a/src/flexchart/flexchart.mxml b/src/flexchart/flexchart.mxml
new file mode 100644
index 0000000..796329d
--- /dev/null
+++ b/src/flexchart/flexchart.mxml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" applicationComplete="populate(flexChart)">
+  <mx:Script>
+    <![CDATA[
+
+      import mx.containers.Box;
+      import org.ovirt.*;
+
+      private function populate(chart:Box):void {
+        var chartLoader:ChartLoader = new ChartLoader(chart, parameters['flexchart_data']);
+        chartLoader.load();
+      }
+
+    ]]>
+  </mx:Script>
+  <mx:Panel height="100%" width="100%" visible="true">
+    <mx:HBox id="flexChart"  height="100%" width="100%" visible="true" verticalAlign="bottom" opaqueBackground="0xFFFFFF" borderThickness="0">
+    </mx:HBox>
+  </mx:Panel>
+</mx:Application>
diff --git a/src/flexchart/org/ovirt/ChartLoader.as b/src/flexchart/org/ovirt/ChartLoader.as
new file mode 100644
index 0000000..4e493a4
--- /dev/null
+++ b/src/flexchart/org/ovirt/ChartLoader.as
@@ -0,0 +1,64 @@
+/*
+ Copyright (C) 2008 Red Hat, Inc.
+ Written by Steve Linabery <slinabery at redhat.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA  02110-1301, USA.  A copy of the GNU General Public License is
+ also available at http://www.gnu.org/copyleft/gpl.html.
+*/
+
+package org.ovirt {
+
+  import mx.containers.Box;
+  import mx.containers.HBox;
+  import mx.controls.Text;
+
+  public class ChartLoader {
+
+    private var element:Box;
+    private var datasourceUrl:String;
+
+    public function ChartLoader(element:Box, datasourceUrl:String) {
+      this.element = element;
+      this.datasourceUrl = datasourceUrl;
+    }
+
+    public function addData(dataSeries:DataSeries):void {
+      var points:Array = dataSeries.getPoints();
+      var maxValue:Number = dataSeries.getMaxValue();
+      var scale:Number = maxValue;
+      if (scale == 0) { scale = 1; }
+      var size:int = points.length;
+      element.removeAllChildren();
+      element.setStyle("horizontalGap","2");
+      for (var i:int = 0; i < size; i++) {
+        var value:Number = (points[i] as Array)[1];
+        var bar:HBox = new HBox();
+        bar.percentHeight = ((value / scale) * 90);
+        bar.percentWidth = (100 / size);
+        bar.setStyle("backgroundColor","0x0000FF");
+        bar.setStyle("left","1");
+        bar.setStyle("right","1");
+        bar.visible = true;
+        bar.setVisible(true);
+        element.addChild(bar);
+      }
+    }
+
+    public function load():void {
+      var dataSource:DataSource = new DataSource(this);
+      dataSource.retrieveData(datasourceUrl);
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/flexchart/org/ovirt/DataSeries.as b/src/flexchart/org/ovirt/DataSeries.as
new file mode 100644
index 0000000..d63162a
--- /dev/null
+++ b/src/flexchart/org/ovirt/DataSeries.as
@@ -0,0 +1,42 @@
+/*
+ Copyright (C) 2008 Red Hat, Inc.
+ Written by Steve Linabery <slinabery at redhat.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA  02110-1301, USA.  A copy of the GNU General Public License is
+ also available at http://www.gnu.org/copyleft/gpl.html.
+*/
+
+//class to encapsulate the json object representation of a data
+//series returned from stats package
+
+package org.ovirt {
+
+  public class DataSeries {
+
+    private var object:Object;
+
+    public function DataSeries (object:Object) {
+      this.object = object;
+    }
+
+    public function getPoints():Array {
+      return object["vectors"] as Array;
+    }
+
+    public function getMaxValue():Number {
+      return object["max_value"] as Number;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/flexchart/org/ovirt/DataSource.as b/src/flexchart/org/ovirt/DataSource.as
new file mode 100644
index 0000000..1a64f03
--- /dev/null
+++ b/src/flexchart/org/ovirt/DataSource.as
@@ -0,0 +1,57 @@
+/*
+ Copyright (C) 2008 Red Hat, Inc.
+ Written by Steve Linabery <slinabery at redhat.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA  02110-1301, USA.  A copy of the GNU General Public License is
+ also available at http://www.gnu.org/copyleft/gpl.html.
+*/
+
+package org.ovirt {
+
+  import flash.net.URLLoader;
+  import flash.net.URLRequest;
+  import com.adobe.serialization.json.JSON;
+  import flash.events.Event;
+  import flash.events.IOErrorEvent;
+
+  public class DataSource {
+
+    private var chartLoader:ChartLoader;
+
+    public function DataSource(chartLoader:ChartLoader) {
+      this.chartLoader = chartLoader;
+    }
+
+    public function retrieveData(url:String):void {
+      var loader:URLLoader = new URLLoader();
+      loader.addEventListener( IOErrorEvent.IO_ERROR, this.ioError );
+      loader.addEventListener( Event.COMPLETE, dataLoaded );
+      var request:URLRequest = new URLRequest(url);
+      loader.load(request);
+    }
+
+    private function dataLoaded(event:Event):void {
+      var loader:URLLoader = URLLoader(event.target);
+      var object:Object = JSON.decode(loader.data);
+      var series:DataSeries = new DataSeries(object);
+      chartLoader.addData(series);
+    }
+
+    private function ioError( e:IOErrorEvent ):void {
+      //FIXME:
+      //do something useful with this error
+    }
+  }
+}
diff --git a/src/public/javascripts/jquery.flash.js b/src/public/javascripts/jquery.flash.js
new file mode 100644
index 0000000..2608834
--- /dev/null
+++ b/src/public/javascripts/jquery.flash.js
@@ -0,0 +1,288 @@
+/**
+ * Flash (http://jquery.lukelutman.com/plugins/flash)
+ * A jQuery plugin for embedding Flash movies.
+ *
+ * Version 1.0
+ * November 9th, 2006
+ *
+ * Copyright (c) 2006 Luke Lutman (http://www.lukelutman.com)
+ * Dual licensed under the MIT and GPL licenses.
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.opensource.org/licenses/gpl-license.php
+ *
+ * Inspired by:
+ * SWFObject (http://blog.deconcept.com/swfobject/)
+ * UFO (http://www.bobbyvandersluis.com/ufo/)
+ * sIFR (http://www.mikeindustries.com/sifr/)
+ *
+ * IMPORTANT:
+ * The packed version of jQuery breaks ActiveX control
+ * activation in Internet Explorer. Use JSMin to minifiy
+ * jQuery (see: http://jquery.lukelutman.com/plugins/flash#activex).
+ *
+ **/
+;(function(){
+
+var $$;
+
+/**
+ *
+ * @desc Replace matching elements with a flash movie.
+ * @author Luke Lutman
+ * @version 1.0.1
+ *
+ * @name flash
+ * @param Hash htmlOptions Options for the embed/object tag.
+ * @param Hash pluginOptions Options for detecting/updating the Flash plugin (optional).
+ * @param Function replace Custom block called for each matched element if flash is installed (optional).
+ * @param Function update Custom block called for each matched if flash isn't installed (optional).
+ * @type jQuery
+ *
+ * @cat plugins/flash
+ *
+ * @example $('#hello').flash({ src: 'hello.swf' });
+ * @desc Embed a Flash movie.
+ *
+ * @example $('#hello').flash({ src: 'hello.swf' }, { version: 8 });
+ * @desc Embed a Flash 8 movie.
+ *
+ * @example $('#hello').flash({ src: 'hello.swf' }, { expressInstall: true });
+ * @desc Embed a Flash movie using Express Install if flash isn't installed.
+ *
+ * @example $('#hello').flash({ src: 'hello.swf' }, { update: false });
+ * @desc Embed a Flash movie, don't show an update message if Flash isn't installed.
+ *
+**/
+$$ = jQuery.fn.flash = function(htmlOptions, pluginOptions, replace, update) {
+
+	// Set the default block.
+	var block = replace || $$.replace;
+
+	// Merge the default and passed plugin options.
+	pluginOptions = $$.copy($$.pluginOptions, pluginOptions);
+
+	// Detect Flash.
+	if(!$$.hasFlash(pluginOptions.version)) {
+		// Use Express Install (if specified and Flash plugin 6,0,65 or higher is installed).
+		if(pluginOptions.expressInstall && $$.hasFlash(6,0,65)) {
+			// Add the necessary flashvars (merged later).
+			var expressInstallOptions = {
+				flashvars: {
+					MMredirectURL: location,
+					MMplayerType: 'PlugIn',
+					MMdoctitle: jQuery('title').text()
+				}
+			};
+		// Ask the user to update (if specified).
+		} else if (pluginOptions.update) {
+			// Change the block to insert the update message instead of the flash movie.
+			block = update || $$.update;
+		// Fail
+		} else {
+			// The required version of flash isn't installed.
+			// Express Install is turned off, or flash 6,0,65 isn't installed.
+			// Update is turned off.
+			// Return without doing anything.
+			return this;
+		}
+	}
+
+	// Merge the default, express install and passed html options.
+	htmlOptions = $$.copy($$.htmlOptions, expressInstallOptions, htmlOptions);
+
+	// Invoke $block (with a copy of the merged html options) for each element.
+	return this.each(function(){
+		block.call(this, $$.copy(htmlOptions));
+	});
+
+};
+/**
+ *
+ * @name flash.copy
+ * @desc Copy an arbitrary number of objects into a new object.
+ * @type Object
+ *
+ * @example $$.copy({ foo: 1 }, { bar: 2 });
+ * @result { foo: 1, bar: 2 };
+ *
+**/
+$$.copy = function() {
+	var options = {}, flashvars = {};
+	for(var i = 0; i < arguments.length; i++) {
+		var arg = arguments[i];
+		if(arg == undefined) continue;
+		jQuery.extend(options, arg);
+		// don't clobber one flash vars object with another
+		// merge them instead
+		if(arg.flashvars == undefined) continue;
+		jQuery.extend(flashvars, arg.flashvars);
+	}
+	options.flashvars = flashvars;
+	return options;
+};
+/*
+ * @name flash.hasFlash
+ * @desc Check if a specific version of the Flash plugin is installed
+ * @type Boolean
+ *
+**/
+$$.hasFlash = function() {
+	// look for a flag in the query string to bypass flash detection
+	if(/hasFlash\=true/.test(location)) return true;
+	if(/hasFlash\=false/.test(location)) return false;
+	var pv = $$.hasFlash.playerVersion().match(/\d+/g);
+	var rv = String([arguments[0], arguments[1], arguments[2]]).match(/\d+/g) || String($$.pluginOptions.version).match(/\d+/g);
+	for(var i = 0; i < 3; i++) {
+		pv[i] = parseInt(pv[i] || 0);
+		rv[i] = parseInt(rv[i] || 0);
+		// player is less than required
+		if(pv[i] < rv[i]) return false;
+		// player is greater than required
+		if(pv[i] > rv[i]) return true;
+	}
+	// major version, minor version and revision match exactly
+	return true;
+};
+/**
+ *
+ * @name flash.hasFlash.playerVersion
+ * @desc Get the version of the installed Flash plugin.
+ * @type String
+ *
+**/
+$$.hasFlash.playerVersion = function() {
+	// ie
+	try {
+		try {
+			// avoid fp6 minor version lookup issues
+			// see: http://blog.deconcept.com/2006/01/11/getvariable-setvariable-crash-internet-explorer-flash-6/
+			var axo = new ActiveXObject('ShockwaveFlash.ShockwaveFlash.6');
+			try { axo.AllowScriptAccess = 'always';	}
+			catch(e) { return '6,0,0'; }
+		} catch(e) {}
+		return new ActiveXObject('ShockwaveFlash.ShockwaveFlash').GetVariable('$version').replace(/\D+/g, ',').match(/^,?(.+),?$/)[1];
+	// other browsers
+	} catch(e) {
+		try {
+			if(navigator.mimeTypes["application/x-shockwave-flash"].enabledPlugin){
+				return (navigator.plugins["Shockwave Flash 2.0"] || navigator.plugins["Shockwave Flash"]).description.replace(/\D+/g, ",").match(/^,?(.+),?$/)[1];
+			}
+		} catch(e) {}
+	}
+	return '0,0,0';
+};
+/**
+ *
+ * @name flash.htmlOptions
+ * @desc The default set of options for the object or embed tag.
+ *
+**/
+$$.htmlOptions = {
+	height: 240,
+	flashvars: {},
+	pluginspage: 'http://www.adobe.com/go/getflashplayer',
+	src: '#',
+	type: 'application/x-shockwave-flash',
+	width: 320
+};
+/**
+ *
+ * @name flash.pluginOptions
+ * @desc The default set of options for checking/updating the flash Plugin.
+ *
+**/
+$$.pluginOptions = {
+	expressInstall: false,
+	update: true,
+	version: '6.0.65'
+};
+/**
+ *
+ * @name flash.replace
+ * @desc The default method for replacing an element with a Flash movie.
+ *
+**/
+$$.replace = function(htmlOptions) {
+	this.innerHTML = '<div class="alt">'+this.innerHTML+'</div>';
+	jQuery(this)
+		.addClass('flash-replaced')
+		.prepend($$.transform(htmlOptions));
+};
+/**
+ *
+ * @name flash.update
+ * @desc The default method for replacing an element with an update message.
+ *
+**/
+$$.update = function(htmlOptions) {
+	var url = String(location).split('?');
+	url.splice(1,0,'?hasFlash=true&');
+	url = url.join('');
+	var msg = '<p>This content requires the Flash Player. <a href="http://www.adobe.com/go/getflashplayer">Download Flash Player</a>. Already have Flash Player? <a href="'+url+'">Click here.</a></p>';
+	this.innerHTML = '<span class="alt">'+this.innerHTML+'</span>';
+	jQuery(this)
+		.addClass('flash-update')
+		.prepend(msg);
+};
+/**
+ *
+ * @desc Convert a hash of html options to a string of attributes, using Function.apply().
+ * @example toAttributeString.apply(htmlOptions)
+ * @result foo="bar" foo="bar"
+ *
+**/
+function toAttributeString() {
+	var s = '';
+	for(var key in this)
+		if(typeof this[key] != 'function')
+			s += key+'="'+this[key]+'" ';
+	return s;
+};
+/**
+ *
+ * @desc Convert a hash of flashvars to a url-encoded string, using Function.apply().
+ * @example toFlashvarsString.apply(flashvarsObject)
+ * @result foo=bar&foo=bar
+ *
+**/
+function toFlashvarsString() {
+	var s = '';
+	for(var key in this)
+		if(typeof this[key] != 'function')
+			s += key+'='+encodeURIComponent(this[key])+'&';
+	return s.replace(/&$/, '');
+};
+/**
+ *
+ * @name flash.transform
+ * @desc Transform a set of html options into an embed tag.
+ * @type String
+ *
+ * @example $$.transform(htmlOptions)
+ * @result <embed src="foo.swf" ... />
+ *
+ * Note: The embed tag is NOT standards-compliant, but it
+ * works in all current browsers. flash.transform can be
+ * overwritten with a custom function to generate more
+ * standards-compliant markup.
+ *
+**/
+$$.transform = function(htmlOptions) {
+	htmlOptions.toString = toAttributeString;
+	if(htmlOptions.flashvars) htmlOptions.flashvars.toString = toFlashvarsString;
+	return '<embed ' + String(htmlOptions) + '/>';
+};
+
+/**
+ *
+ * Flash Player 9 Fix (http://blog.deconcept.com/2006/07/28/swfobject-143-released/)
+ *
+**/
+if (window.attachEvent) {
+	window.attachEvent("onbeforeunload", function(){
+		__flash_unloadHandler = function() {};
+		__flash_savedUnloadHandler = function() {};
+	});
+}
+
+})();
\ No newline at end of file
-- 
1.5.5.1


From dpierce at redhat.com  Fri Oct 10 19:55:58 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Fri, 10 Oct 2008 15:55:58 -0400
Subject: [Ovirt-devel] [PATCH server] Added support for booting a VM from an
	ISO image.
Message-ID: <1223668558-28139-1-git-send-email-dpierce@redhat.com>

The NFS export for Cobbler needs to be added as an NFS storage pool.
Otherwise, taskomatic will not be able to locate it.

Also added a few helper methods to Vm to contain the knowledge
of how Cobbler integration is contained.

When a user adds an ISO image to the Cobbler server on the appliance,
they will need to do so using the full NFS path for where the virtual
image will go to mount it; i.e., hostname:/path/to/filename.iso

If the filename ends in ".iso" then the virtual machine will mount the
file as a CDROM device and boot it. Otherwise, it mounts it as a hard
disk device.

To add an image to Cobbler, do the following:

1. Download an ISO image, such as the KDE LiveImage from Fedora.
2. Copy it to the NFS directory on the server:
  cp *.iso /ovirtnfs/kde-live-cd.iso
3. Add that image to your Cobbler instance:
  cobbler image add --name=KDE-LiveCD --file=management.priv.ovirt.org:/ovirtnfs/kde-live-cd.iso
4. Create a new VM in your server.
5. Select "KDE-LiveCD" from the list of operating systems.
6. Save the VM.
7. Start the VM.

It should run the selected ISO.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 src/app/controllers/vm_controller.rb |   51 ++++++++++++---------
 src/app/models/vm.rb                 |   34 +++++++++++++-
 src/task-omatic/task_vm.rb           |   81 +++++++++++++++++++++++++++++-----
 src/test/unit/vm_test.rb             |   56 ++++++++++++++++++++++-
 4 files changed, 184 insertions(+), 38 deletions(-)

diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb
index f5c0845..bc88760 100644
--- a/src/app/controllers/vm_controller.rb
+++ b/src/app/controllers/vm_controller.rb
@@ -48,6 +48,7 @@ class VmController < ApplicationController
     begin
       Vm.transaction do
         @vm.save!
+        _setup_vm_provision(params)
         @task = VmTask.new({ :user    => @user,
                              :vm_id   => @vm.id,
                              :action  => VmTask::ACTION_CREATE_VM,
@@ -70,7 +71,7 @@ class VmController < ApplicationController
         alert = "VM was successfully created."
       end
       render :json => { :object => "vm", :success => true, :alert => alert  }
-    rescue
+    rescue Exception => error
       # FIXME: need to distinguish vm vs. task save errors (but should mostly be vm)
       render :json => { :object => "vm", :success => false, 
                         :errors => @vm.errors.localize_error_messages.to_a }
@@ -223,13 +224,18 @@ class VmController < ApplicationController
   def _setup_provisioning_options
     @provisioning_options = [[Vm::PXE_OPTION_LABEL, Vm::PXE_OPTION_VALUE],
                              [Vm::HD_OPTION_LABEL, Vm::HD_OPTION_VALUE]]
-    # FIXME add cobbler images too
+
     begin
+      @provisioning_options += Cobbler::Image.find.collect do |image|
+        [image.name + Vm::COBBLER_IMAGE_SUFFIX,
+          "#{Vm::IMAGE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{image.name}"]
+      end
+
       @provisioning_options += Cobbler::Profile.find.collect do |profile|
         [profile.name + Vm::COBBLER_PROFILE_SUFFIX,
-         Vm::COBBLER_PREFIX + Vm::PROVISIONING_DELIMITER +
-         Vm::PROFILE_PREFIX + Vm::PROVISIONING_DELIMITER + profile.name]
-      end
+          "#{Vm::PROFILE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{profile.name}"]
+
+    end
     rescue
       #if cobbler doesn't respond/is misconfigured/etc just don't add profiles
     end
@@ -239,24 +245,27 @@ class VmController < ApplicationController
   def _setup_vm_provision(params)
     # spaces are invalid in the cobbler name
     name = params[:vm][:uuid]
-    provision = params[:vm][:provisioning_and_boot_settings].gsub(
-         Vm::COBBLER_PREFIX + Vm::PROVISIONING_DELIMITER +
-         Vm::PROFILE_PREFIX + Vm::PROVISIONING_DELIMITER, "")
     mac = params[:vm][:vnic_mac_addr]
-    unless provision == Vm::PXE_OPTION_VALUE or
-           provision == Vm::HD_OPTION_VALUE
-      found = false
-      Cobbler::System.find.each{ |system|
-        if system.name == name
-          system.profile = provision
-          system.save
-          found = true
+    provision = params[:vm][:provisioning_and_boot_settings]
+    # determine what type of provisioning was selected for the VM
+    provisioning_type = :pxe_or_hd_type
+    provisioning_type = :image_type  if provision.index "#{Vm::IMAGE_PREFIX}@#{Vm::COBBLER_PREFIX}"
+    provisioning_type = :system_type if provision.index "#{Vm::PROFILE_PREFIX}@#{Vm::COBBLER_PREFIX}"
+
+    unless provisioning_type == :pxe_or_hd_type
+      cobbler_name = provision.slice(/(.*):(.*)/, 2)
+      system = Cobbler::System.find_one(name)
+      unless system
+        nic = Cobbler::NetworkInterface.new({'mac_address' => mac})
+
+        case provisioning_type
+        when :image_type:
+            system = Cobbler::System.new("name" => name, "image"    => cobbler_name)
+        when :system_type:
+            system = Cobbler::System.new("name" => name, "profile" => cobbler_name)
         end
-      }
-      unless found
-        system = Cobbler::System.create("name" => name,
-                                        "profile" => provision)
-        system.interfaces=[Cobbler::NetworkInterface.new({'mac_address' => mac})]
+
+        system.interfaces = [nic]
         system.save
       end
     end
diff --git a/src/app/models/vm.rb b/src/app/models/vm.rb
index ace6fb1..d7beacf 100644
--- a/src/app/models/vm.rb
+++ b/src/app/models/vm.rb
@@ -49,7 +49,7 @@ class Vm < ActiveRecord::Base
   PROFILE_PREFIX         = "profile"
   IMAGE_PREFIX           = "image"
   COBBLER_PROFILE_SUFFIX = " (Cobbler Profile)"
-  COBBLER_IMAGE_SUFFIX   = " (Cobbler Profile)"
+  COBBLER_IMAGE_SUFFIX   = " (Cobbler Image)"
 
   PXE_OPTION_LABEL       = "PXE Boot"
   PXE_OPTION_VALUE       = "pxe"
@@ -139,7 +139,15 @@ class Vm < ActiveRecord::Base
   end
 
   def provisioning_and_boot_settings=(settings)
-    if settings==PXE_OPTION_VALUE
+    # if the settings have a prefix that matches cobber settings, then process
+    # those details
+    if settings =~ /#{IMAGE_PREFIX}@#{COBBLER_PREFIX}/
+      self[:boot_device] = BOOT_DEV_CDROM
+      self[:provisioning] = settings
+    elsif settings =~ /#{PROFILE_PREFIX}@#{COBBLER_PREFIX}/
+      self[:boot_device] = BOOT_DEV_NETWORK
+      self[:provisioning] = settings
+    elsif settings==PXE_OPTION_VALUE
       self[:boot_device]= BOOT_DEV_NETWORK
       self[:provisioning]= nil
     elsif settings==HD_OPTION_VALUE
@@ -242,6 +250,28 @@ class Vm < ActiveRecord::Base
     vm_resource_pool.search_users
   end
 
+  # Reports whether the VM is uses Cobbler for booting.
+  #
+  def uses_cobbler?
+    (self.provisioning != nil) && (self.provisioning.include? COBBLER_PREFIX)
+  end
+
+  # Returns the cobbler type.
+  #
+  def cobbler_type
+    if self.uses_cobbler?
+      self.provisioning[/^(.*)@/,1]
+    end
+  end
+
+  # Returns the cobbler provisioning name.
+  #
+  def cobbler_name
+    if self.uses_cobbler?
+      self.provisioning[/^.*@.*:(.*)/,1]
+    end
+  end
+
   protected
   def validate
     resources = vm_resource_pool.max_resources_for_vm(self)
diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb
index 3588224..6c4ace6 100644
--- a/src/task-omatic/task_vm.rb
+++ b/src/task-omatic/task_vm.rb
@@ -65,16 +65,26 @@ def create_vm_xml(name, uuid, memAllocated, memUsed, vcpus, bootDevice,
   doc.root.elements["devices"].add_element("emulator")
   doc.root.elements["devices"].elements["emulator"].text = "/usr/bin/qemu-kvm"
 
-  devs = [ 'hda', 'hdb', 'hdc', 'hdd' ]
-  i = 0
+  devs = ['hda', 'hdb', 'hdc', 'hdd']
+  which_device = 0
   diskDevices.each do |disk|
+    is_cdrom = (disk =~ /\.iso/) ? true : false
+
     diskdev = Element.new("disk")
-    diskdev.add_attribute("type", "block")
-    diskdev.add_attribute("device", "disk")
-    diskdev.add_element("source", {"dev" => disk})
-    diskdev.add_element("target", {"dev" => devs[i]})
+    diskdev.add_attribute("type", is_cdrom ? "file" : "block")
+    diskdev.add_attribute("device", is_cdrom ? "cdrom" : "disk")
+
+    if is_cdrom
+      diskdev.add_element("readonly")
+      diskdev.add_element("source", {"file" => disk})
+      diskdev.add_element("target", {"dev" => devs[which_device], "bus" => "ide"})
+    else
+      diskdev.add_element("source", {"dev" => disk})
+      diskdev.add_element("target", {"dev" => devs[which_device]})
+    end
+
     doc.root.elements["devices"] << diskdev
-    i += 1
+    which_device += 1
   end
 
   doc.root.elements["devices"].add_element("interface", {"type" => "bridge"})
@@ -154,15 +164,12 @@ def create_vm(task)
   # create cobbler system profile
   begin
     if vm.provisioning and !vm.provisioning.empty?
-      provisioning_arr = vm.provisioning.split(Vm::PROVISIONING_DELIMITER)
-      if provisioning_arr[0]==Vm::COBBLER_PREFIX
-        if provisioning_arr[1]==Vm::PROFILE_PREFIX
+      if vm.uses_cobbler?
+        if vm.cobbler_type == Vm::PROFILE_PREFIX:
           system = Cobbler::System.new('name' => vm.uuid,
                                        'profile' => provisioning_arr[2])
           system.interfaces=[Cobbler::NetworkInterface.new({'mac_address' => vm.vnic_mac_addr})]
           system.save
-        elsif provisioning_arr[1]==Vm::IMAGE_PREFIX
-          #FIXME handle cobbler images
         end
       end
     end
@@ -231,6 +238,14 @@ def shutdown_vm(task)
   setVmShutdown(vm)
 end
 
+# Find thes storage pool with the given ip address and export path.
+#
+def find_storage_pool(ip_addr, export_path)
+  StoragePool.find(:first,
+    :conditions =>
+      ['ip_addr = ? and export_path = ?',ip_addr, export_path])
+end
+
 def start_vm(task)
   puts "start_vm"
 
@@ -266,6 +281,48 @@ def start_vm(task)
     # hosts to see if there is a host that will fit these constraints
     host = findHostSLA(vm)
 
+    # if we're booting from a CDROM the VM is an image,
+    # then we need to add the NFS mount as a storage volume for this
+    # boot
+    #
+    if (vm.boot_device == Vm::BOOT_DEV_CDROM) && vm.uses_cobbler? && (vm.cobbler_type == Vm::IMAGE_PREFIX)
+      details = Cobbler::Image.find_one(vm.cobbler_name)
+
+      raise "Image #{vm.cobbler_name} not found in Cobbler server" unless details
+
+      ignored, ip_addr, export_path, filename =
+        details.file.split(/(.*):(.*)\/(.*)/)
+
+      found = false
+
+      vm.storage_volumes.each do |volume|
+        if volume.filename == filename
+          if (volume.storage_pool.ip_addr == ip_addr) &&
+          (volume.storage_pool.export_path == export_path)
+            found = true
+          end
+        end
+      end
+
+      unless found
+        # Create a new transient NFS storage volume
+        # This volume is *not* persisted.
+        image_volume = StorageVolume.factory("NFS",
+          :filename => filename
+        )
+
+        image_volume.storage_pool
+        image_pool = find_storage_pool(ip_addr, export_path)
+
+        raise Exception.new("Unable to find Cobbler storage pool") unless image_pool
+
+        if image_pool
+          image_pool.storage_volumes << image_volume
+        end
+        vm.storage_volumes << image_volume
+      end
+    end
+
     conn = Libvirt::open("qemu+tcp://" + host.hostname + "/system")
 
     storagedevs = connect_storage_pools(conn, vm)
diff --git a/src/test/unit/vm_test.rb b/src/test/unit/vm_test.rb
index 4a5e353..22164e8 100644
--- a/src/test/unit/vm_test.rb
+++ b/src/test/unit/vm_test.rb
@@ -22,8 +22,58 @@ require File.dirname(__FILE__) + '/../test_helper'
 class VmTest < Test::Unit::TestCase
   fixtures :vms
 
-  # Replace this with your real tests.
-  def test_truth
-    assert true
+  def setup
+    @vm_name = "Test"
+    @no_cobbler_provisioning = "#{@vm_name}"
+    @cobbler_image_provisioning =
+      "#{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}"
+  end
+
+  # Ensures that, if the VM does not contain the Cobbler prefix, that it
+  # does not claim to be a Cobbler VM.
+  #
+  def test_uses_cobbler_without_cobbler_prefix
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings=@no_cobbler_provisioning
+
+    flunk "VM is not a Cobbler provisioned one." if vm.uses_cobbler?
+    assert_equal @vm_name, vm.provisioning, "Wrong name reported."
+  end
+
+  # Ensures that the VM reports that it uses Cobbler if the provisioning
+  # is for a Cobbler profile.
+  #
+  def test_uses_cobbler_with_cobbler_profile
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings = @cobbler_profile_provisioning
+
+    flunk "VM did not report that it's Cobbler provisioned." unless vm.uses_cobbler?
+    assert_equal Vm::PROFILE_PREFIX,
+      vm.cobbler_type,
+      "Wrong cobbler type reported."
+    assert_equal @vm_name,
+      vm.cobbler_name,
+      "Wrong name reported."
+  end
+
+  # Ensures that the VM reports that it uses Cobbler if the provisioning
+  # is for a Cobbler image.
+  #
+  def test_uses_cobbler_with_cobbler_image
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings = @cobbler_image_provisioning
+
+    flunk "VM did not report that it's Cobbler provisioned." unless vm.uses_cobbler?
+    assert_equal Vm::IMAGE_PREFIX,
+      vm.cobbler_type,
+      "Wrong cobbler type reported."
+    assert_equal @vm_name,
+      vm.cobbler_name,
+      "Wrong name reported."
   end
 end
-- 
1.5.5.1



From mdehaan at redhat.com  Fri Oct 10 20:01:23 2008
From: mdehaan at redhat.com (Michael DeHaan)
Date: Fri, 10 Oct 2008 16:01:23 -0400
Subject: [Ovirt-devel] [PATCH server] Added support for booting a VM from
	an	ISO image.
In-Reply-To: <1223668558-28139-1-git-send-email-dpierce@redhat.com>
References: <1223668558-28139-1-git-send-email-dpierce@redhat.com>
Message-ID: <48EFB493.6030101@redhat.com>

Darryl L. Pierce wrote:
> The NFS export for Cobbler needs to be added as an NFS storage pool.
> Otherwise, taskomatic will not be able to locate it.
>
> Also added a few helper methods to Vm to contain the knowledge
> of how Cobbler integration is contained.
>
> When a user adds an ISO image to the Cobbler server on the appliance,
> they will need to do so using the full NFS path for where the virtual
> image will go to mount it; i.e., hostname:/path/to/filename.iso
>
> If the filename ends in ".iso" then the virtual machine will mount the
> file as a CDROM device and boot it. Otherwise, it mounts it as a hard
> disk device.
>   

Please set the "--type" on the image object in Cobbler if you aren't 
doing so already.
This is much better than paying attention to the filename.

There is one for "iso", and another for "virtimage".   If specifying 
virt-image there
is also a parameter you can use to track the location of the XML file, 
though I had
some recent discussions with Bryan Kearney and David Huff about that.

The basics are that most likely we're going to want the data that goes 
into that XML
file stored in cobbler so that cobbler can generate the XML file if we 
decide to bump
up the RAM later.   Cobbler has a live mod_python based templating 
system so you
could just use that (once the code is added to support it) to just wget 
the XML and use
that in conjunction with virt-image.

This also prevents from having to keep the XML files around, though we 
may add
a facility in cobbler to "import" from an XML file that came out of 
virt-convert.

TBD, I'm still honestly unclear about some of the details.

Anyway, "image add" takes a --type, so be sure to set that and don't use 
the extension.

This will make things work better with koan, even though I know you 
aren't using it, it should
be consistent. 

(In fact, the path also needs tweaking for how you store it...
it should start with nfs://hostname:/path not just hostname:/path)

--Michael





> To add an image to Cobbler, do the following:
>
> 1. Download an ISO image, such as the KDE LiveImage from Fedora.
> 2. Copy it to the NFS directory on the server:
>   cp *.iso /ovirtnfs/kde-live-cd.iso
> 3. Add that image to your Cobbler instance:
>   cobbler image add --name=KDE-LiveCD --file=management.priv.ovirt.org:/ovirtnfs/kde-live-cd.iso
> 4. Create a new VM in your server.
> 5. Select "KDE-LiveCD" from the list of operating systems.
> 6. Save the VM.
> 7. Start the VM.
>
> It should run the selected ISO.
>
> Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
> ---
>  src/app/controllers/vm_controller.rb |   51 ++++++++++++---------
>  src/app/models/vm.rb                 |   34 +++++++++++++-
>  src/task-omatic/task_vm.rb           |   81 +++++++++++++++++++++++++++++-----
>  src/test/unit/vm_test.rb             |   56 ++++++++++++++++++++++-
>  4 files changed, 184 insertions(+), 38 deletions(-)
>
> diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb
> index f5c0845..bc88760 100644
> --- a/src/app/controllers/vm_controller.rb
> +++ b/src/app/controllers/vm_controller.rb
> @@ -48,6 +48,7 @@ class VmController < ApplicationController
>      begin
>        Vm.transaction do
>          @vm.save!
> +        _setup_vm_provision(params)
>          @task = VmTask.new({ :user    => @user,
>                               :vm_id   => @vm.id,
>                               :action  => VmTask::ACTION_CREATE_VM,
> @@ -70,7 +71,7 @@ class VmController < ApplicationController
>          alert = "VM was successfully created."
>        end
>        render :json => { :object => "vm", :success => true, :alert => alert  }
> -    rescue
> +    rescue Exception => error
>        # FIXME: need to distinguish vm vs. task save errors (but should mostly be vm)
>        render :json => { :object => "vm", :success => false, 
>                          :errors => @vm.errors.localize_error_messages.to_a }
> @@ -223,13 +224,18 @@ class VmController < ApplicationController
>    def _setup_provisioning_options
>      @provisioning_options = [[Vm::PXE_OPTION_LABEL, Vm::PXE_OPTION_VALUE],
>                               [Vm::HD_OPTION_LABEL, Vm::HD_OPTION_VALUE]]
> -    # FIXME add cobbler images too
> +
>      begin
> +      @provisioning_options += Cobbler::Image.find.collect do |image|
> +        [image.name + Vm::COBBLER_IMAGE_SUFFIX,
> +          "#{Vm::IMAGE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{image.name}"]
> +      end
> +
>        @provisioning_options += Cobbler::Profile.find.collect do |profile|
>          [profile.name + Vm::COBBLER_PROFILE_SUFFIX,
> -         Vm::COBBLER_PREFIX + Vm::PROVISIONING_DELIMITER +
> -         Vm::PROFILE_PREFIX + Vm::PROVISIONING_DELIMITER + profile.name]
> -      end
> +          "#{Vm::PROFILE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{profile.name}"]
> +
> +    end
>      rescue
>        #if cobbler doesn't respond/is misconfigured/etc just don't add profiles
>      end
> @@ -239,24 +245,27 @@ class VmController < ApplicationController
>    def _setup_vm_provision(params)
>      # spaces are invalid in the cobbler name
>      name = params[:vm][:uuid]
> -    provision = params[:vm][:provisioning_and_boot_settings].gsub(
> -         Vm::COBBLER_PREFIX + Vm::PROVISIONING_DELIMITER +
> -         Vm::PROFILE_PREFIX + Vm::PROVISIONING_DELIMITER, "")
>      mac = params[:vm][:vnic_mac_addr]
> -    unless provision == Vm::PXE_OPTION_VALUE or
> -           provision == Vm::HD_OPTION_VALUE
> -      found = false
> -      Cobbler::System.find.each{ |system|
> -        if system.name == name
> -          system.profile = provision
> -          system.save
> -          found = true
> +    provision = params[:vm][:provisioning_and_boot_settings]
> +    # determine what type of provisioning was selected for the VM
> +    provisioning_type = :pxe_or_hd_type
> +    provisioning_type = :image_type  if provision.index "#{Vm::IMAGE_PREFIX}@#{Vm::COBBLER_PREFIX}"
> +    provisioning_type = :system_type if provision.index "#{Vm::PROFILE_PREFIX}@#{Vm::COBBLER_PREFIX}"
> +
> +    unless provisioning_type == :pxe_or_hd_type
> +      cobbler_name = provision.slice(/(.*):(.*)/, 2)
> +      system = Cobbler::System.find_one(name)
> +      unless system
> +        nic = Cobbler::NetworkInterface.new({'mac_address' => mac})
> +
> +        case provisioning_type
> +        when :image_type:
> +            system = Cobbler::System.new("name" => name, "image"    => cobbler_name)
> +        when :system_type:
> +            system = Cobbler::System.new("name" => name, "profile" => cobbler_name)
>          end
> -      }
> -      unless found
> -        system = Cobbler::System.create("name" => name,
> -                                        "profile" => provision)
> -        system.interfaces=[Cobbler::NetworkInterface.new({'mac_address' => mac})]
> +
> +        system.interfaces = [nic]
>          system.save
>        end
>      end
> diff --git a/src/app/models/vm.rb b/src/app/models/vm.rb
> index ace6fb1..d7beacf 100644
> --- a/src/app/models/vm.rb
> +++ b/src/app/models/vm.rb
> @@ -49,7 +49,7 @@ class Vm < ActiveRecord::Base
>    PROFILE_PREFIX         = "profile"
>    IMAGE_PREFIX           = "image"
>    COBBLER_PROFILE_SUFFIX = " (Cobbler Profile)"
> -  COBBLER_IMAGE_SUFFIX   = " (Cobbler Profile)"
> +  COBBLER_IMAGE_SUFFIX   = " (Cobbler Image)"
>  
>    PXE_OPTION_LABEL       = "PXE Boot"
>    PXE_OPTION_VALUE       = "pxe"
> @@ -139,7 +139,15 @@ class Vm < ActiveRecord::Base
>    end
>  
>    def provisioning_and_boot_settings=(settings)
> -    if settings==PXE_OPTION_VALUE
> +    # if the settings have a prefix that matches cobber settings, then process
> +    # those details
> +    if settings =~ /#{IMAGE_PREFIX}@#{COBBLER_PREFIX}/
> +      self[:boot_device] = BOOT_DEV_CDROM
> +      self[:provisioning] = settings
> +    elsif settings =~ /#{PROFILE_PREFIX}@#{COBBLER_PREFIX}/
> +      self[:boot_device] = BOOT_DEV_NETWORK
> +      self[:provisioning] = settings
> +    elsif settings==PXE_OPTION_VALUE
>        self[:boot_device]= BOOT_DEV_NETWORK
>        self[:provisioning]= nil
>      elsif settings==HD_OPTION_VALUE
> @@ -242,6 +250,28 @@ class Vm < ActiveRecord::Base
>      vm_resource_pool.search_users
>    end
>  
> +  # Reports whether the VM is uses Cobbler for booting.
> +  #
> +  def uses_cobbler?
> +    (self.provisioning != nil) && (self.provisioning.include? COBBLER_PREFIX)
> +  end
> +
> +  # Returns the cobbler type.
> +  #
> +  def cobbler_type
> +    if self.uses_cobbler?
> +      self.provisioning[/^(.*)@/,1]
> +    end
> +  end
> +
> +  # Returns the cobbler provisioning name.
> +  #
> +  def cobbler_name
> +    if self.uses_cobbler?
> +      self.provisioning[/^.*@.*:(.*)/,1]
> +    end
> +  end
> +
>    protected
>    def validate
>      resources = vm_resource_pool.max_resources_for_vm(self)
> diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb
> index 3588224..6c4ace6 100644
> --- a/src/task-omatic/task_vm.rb
> +++ b/src/task-omatic/task_vm.rb
> @@ -65,16 +65,26 @@ def create_vm_xml(name, uuid, memAllocated, memUsed, vcpus, bootDevice,
>    doc.root.elements["devices"].add_element("emulator")
>    doc.root.elements["devices"].elements["emulator"].text = "/usr/bin/qemu-kvm"
>  
> -  devs = [ 'hda', 'hdb', 'hdc', 'hdd' ]
> -  i = 0
> +  devs = ['hda', 'hdb', 'hdc', 'hdd']
> +  which_device = 0
>    diskDevices.each do |disk|
> +    is_cdrom = (disk =~ /\.iso/) ? true : false
> +
>      diskdev = Element.new("disk")
> -    diskdev.add_attribute("type", "block")
> -    diskdev.add_attribute("device", "disk")
> -    diskdev.add_element("source", {"dev" => disk})
> -    diskdev.add_element("target", {"dev" => devs[i]})
> +    diskdev.add_attribute("type", is_cdrom ? "file" : "block")
> +    diskdev.add_attribute("device", is_cdrom ? "cdrom" : "disk")
> +
> +    if is_cdrom
> +      diskdev.add_element("readonly")
> +      diskdev.add_element("source", {"file" => disk})
> +      diskdev.add_element("target", {"dev" => devs[which_device], "bus" => "ide"})
> +    else
> +      diskdev.add_element("source", {"dev" => disk})
> +      diskdev.add_element("target", {"dev" => devs[which_device]})
> +    end
> +
>      doc.root.elements["devices"] << diskdev
> -    i += 1
> +    which_device += 1
>    end
>  
>    doc.root.elements["devices"].add_element("interface", {"type" => "bridge"})
> @@ -154,15 +164,12 @@ def create_vm(task)
>    # create cobbler system profile
>    begin
>      if vm.provisioning and !vm.provisioning.empty?
> -      provisioning_arr = vm.provisioning.split(Vm::PROVISIONING_DELIMITER)
> -      if provisioning_arr[0]==Vm::COBBLER_PREFIX
> -        if provisioning_arr[1]==Vm::PROFILE_PREFIX
> +      if vm.uses_cobbler?
> +        if vm.cobbler_type == Vm::PROFILE_PREFIX:
>            system = Cobbler::System.new('name' => vm.uuid,
>                                         'profile' => provisioning_arr[2])
>            system.interfaces=[Cobbler::NetworkInterface.new({'mac_address' => vm.vnic_mac_addr})]
>            system.save
> -        elsif provisioning_arr[1]==Vm::IMAGE_PREFIX
> -          #FIXME handle cobbler images
>          end
>        end
>      end
> @@ -231,6 +238,14 @@ def shutdown_vm(task)
>    setVmShutdown(vm)
>  end
>  
> +# Find thes storage pool with the given ip address and export path.
> +#
> +def find_storage_pool(ip_addr, export_path)
> +  StoragePool.find(:first,
> +    :conditions =>
> +      ['ip_addr = ? and export_path = ?',ip_addr, export_path])
> +end
> +
>  def start_vm(task)
>    puts "start_vm"
>  
> @@ -266,6 +281,48 @@ def start_vm(task)
>      # hosts to see if there is a host that will fit these constraints
>      host = findHostSLA(vm)
>  
> +    # if we're booting from a CDROM the VM is an image,
> +    # then we need to add the NFS mount as a storage volume for this
> +    # boot
> +    #
> +    if (vm.boot_device == Vm::BOOT_DEV_CDROM) && vm.uses_cobbler? && (vm.cobbler_type == Vm::IMAGE_PREFIX)
> +      details = Cobbler::Image.find_one(vm.cobbler_name)
> +
> +      raise "Image #{vm.cobbler_name} not found in Cobbler server" unless details
> +
> +      ignored, ip_addr, export_path, filename =
> +        details.file.split(/(.*):(.*)\/(.*)/)
> +
> +      found = false
> +
> +      vm.storage_volumes.each do |volume|
> +        if volume.filename == filename
> +          if (volume.storage_pool.ip_addr == ip_addr) &&
> +          (volume.storage_pool.export_path == export_path)
> +            found = true
> +          end
> +        end
> +      end
> +
> +      unless found
> +        # Create a new transient NFS storage volume
> +        # This volume is *not* persisted.
> +        image_volume = StorageVolume.factory("NFS",
> +          :filename => filename
> +        )
> +
> +        image_volume.storage_pool
> +        image_pool = find_storage_pool(ip_addr, export_path)
> +
> +        raise Exception.new("Unable to find Cobbler storage pool") unless image_pool
> +
> +        if image_pool
> +          image_pool.storage_volumes << image_volume
> +        end
> +        vm.storage_volumes << image_volume
> +      end
> +    end
> +
>      conn = Libvirt::open("qemu+tcp://" + host.hostname + "/system")
>  
>      storagedevs = connect_storage_pools(conn, vm)
> diff --git a/src/test/unit/vm_test.rb b/src/test/unit/vm_test.rb
> index 4a5e353..22164e8 100644
> --- a/src/test/unit/vm_test.rb
> +++ b/src/test/unit/vm_test.rb
> @@ -22,8 +22,58 @@ require File.dirname(__FILE__) + '/../test_helper'
>  class VmTest < Test::Unit::TestCase
>    fixtures :vms
>  
> -  # Replace this with your real tests.
> -  def test_truth
> -    assert true
> +  def setup
> +    @vm_name = "Test"
> +    @no_cobbler_provisioning = "#{@vm_name}"
> +    @cobbler_image_provisioning =
> +      "#{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}"
> +  end
> +
> +  # Ensures that, if the VM does not contain the Cobbler prefix, that it
> +  # does not claim to be a Cobbler VM.
> +  #
> +  def test_uses_cobbler_without_cobbler_prefix
> +    vm = Vm.new
> +
> +    vm.provisioning_and_boot_settings=@no_cobbler_provisioning
> +
> +    flunk "VM is not a Cobbler provisioned one." if vm.uses_cobbler?
> +    assert_equal @vm_name, vm.provisioning, "Wrong name reported."
> +  end
> +
> +  # Ensures that the VM reports that it uses Cobbler if the provisioning
> +  # is for a Cobbler profile.
> +  #
> +  def test_uses_cobbler_with_cobbler_profile
> +    vm = Vm.new
> +
> +    vm.provisioning_and_boot_settings = @cobbler_profile_provisioning
> +
> +    flunk "VM did not report that it's Cobbler provisioned." unless vm.uses_cobbler?
> +    assert_equal Vm::PROFILE_PREFIX,
> +      vm.cobbler_type,
> +      "Wrong cobbler type reported."
> +    assert_equal @vm_name,
> +      vm.cobbler_name,
> +      "Wrong name reported."
> +  end
> +
> +  # Ensures that the VM reports that it uses Cobbler if the provisioning
> +  # is for a Cobbler image.
> +  #
> +  def test_uses_cobbler_with_cobbler_image
> +    vm = Vm.new
> +
> +    vm.provisioning_and_boot_settings = @cobbler_image_provisioning
> +
> +    flunk "VM did not report that it's Cobbler provisioned." unless vm.uses_cobbler?
> +    assert_equal Vm::IMAGE_PREFIX,
> +      vm.cobbler_type,
> +      "Wrong cobbler type reported."
> +    assert_equal @vm_name,
> +      vm.cobbler_name,
> +      "Wrong name reported."
>    end
>  end
>   



From jguiditt at redhat.com  Fri Oct 10 20:56:55 2008
From: jguiditt at redhat.com (Jason Guiditta)
Date: Fri, 10 Oct 2008 16:56:55 -0400
Subject: [Ovirt-devel] Re: [PATCH server] Add to summary pages a rudimentary
	flash chart written in flex framework
In-Reply-To: <1223668852-16189-1-git-send-email-slinabery@redhat.com>
References: <1223668852-16189-1-git-send-email-slinabery@redhat.com>
Message-ID: <1223672215.3157.19.camel@localhost.localdomain>

Assuming we are pushing this in with all the temporary caveats for
generating the swf, this does work for me, but a few questions/comments
inline.  ACK with suggestions added, I tested locally and they work fine
for me.

On Fri, 2008-10-10 at 15:00 -0500, Steve Linabery wrote:
> ---
>  src/app/controllers/graph_controller.rb            |   30 +-
>  src/app/views/graph/flexchart_data.rhtml           |    1 +
>  src/app/views/graph/history_graphs.rhtml           |   87 +---
>  src/config/routes.rb                               |    1 +
>  src/flexchart/README.txt                           |    8 +
>  src/flexchart/com/adobe/serialization/json/JSON.as |   85 +++
>  .../com/adobe/serialization/json/JSONDecoder.as    |  221 ++++++++
>  .../com/adobe/serialization/json/JSONEncoder.as    |  299 +++++++++++
>  .../com/adobe/serialization/json/JSONParseError.as |   87 +++
>  .../com/adobe/serialization/json/JSONToken.as      |  104 ++++
>  .../com/adobe/serialization/json/JSONTokenType.as  |   67 +++
>  .../com/adobe/serialization/json/JSONTokenizer.as  |  547 ++++++++++++++++++++
>  src/flexchart/flexchart.mxml                       |   20 +
>  src/flexchart/org/ovirt/ChartLoader.as             |   64 +++
>  src/flexchart/org/ovirt/DataSeries.as              |   42 ++
>  src/flexchart/org/ovirt/DataSource.as              |   57 ++
>  src/public/javascripts/jquery.flash.js             |  288 ++++++++++
>  17 files changed, 1930 insertions(+), 78 deletions(-)
>  create mode 100644 src/app/views/graph/flexchart_data.rhtml
>  create mode 100644 src/flexchart/README.txt
>  create mode 100644 src/flexchart/com/adobe/serialization/json/JSON.as
>  create mode 100644 src/flexchart/com/adobe/serialization/json/JSONDecoder.as
>  create mode 100644 src/flexchart/com/adobe/serialization/json/JSONEncoder.as
>  create mode 100644 src/flexchart/com/adobe/serialization/json/JSONParseError.as
>  create mode 100644 src/flexchart/com/adobe/serialization/json/JSONToken.as
>  create mode 100644 src/flexchart/com/adobe/serialization/json/JSONTokenType.as
>  create mode 100644 src/flexchart/com/adobe/serialization/json/JSONTokenizer.as
>  create mode 100644 src/flexchart/flexchart.mxml
>  create mode 100644 src/flexchart/org/ovirt/ChartLoader.as
>  create mode 100644 src/flexchart/org/ovirt/DataSeries.as
>  create mode 100644 src/flexchart/org/ovirt/DataSource.as
>  create mode 100644 src/public/javascripts/jquery.flash.js
> 
> diff --git a/src/app/controllers/graph_controller.rb b/src/app/controllers/graph_controller.rb
> index dbe2afc..6450935 100644
> --- a/src/app/controllers/graph_controller.rb
> +++ b/src/app/controllers/graph_controller.rb
> @@ -3,7 +3,24 @@ require 'util/stats/Stats'
>  class GraphController < ApplicationController
>    layout nil
>  
> -  # generate layout for avaialability bar graphs
> +  def flexchart_data
> +
> +    #FIXME: use the stats package aggregation (when it's available)
> +    #instead of the old method
> +    graph_obj = history_graph_data_object
> +
> +    #FIXME: for this release, the flexchart shows only peak values,
> +    #       and only shows a default of the last 40 data points in rrd.
> +    graph_data = { :labels => graph_obj[:timepoints].last(40),
> +                   :values => graph_obj[:dataset][2][:values].last(40) }
> +    my_data = graph_data[:labels].zip(graph_data[:values])
> +    @graph = { :vectors => my_data,
> +               :max_value => graph_obj[:total_peak]
> +             }
> +  end
> +
> +
> +  # generate layout for availability bar graphs
>    def availability_graph
>      @id = params[:id]
>      @target = params[:target]
> @@ -67,6 +84,10 @@ class GraphController < ApplicationController
>  
>    # retrieves data for history graphs
>    def history_graph_data
> +    render :json => history_graph_data_object
> +  end
> +
> +  def history_graph_data_object
>      history_graphs
>      myDays = params[:days]
>      target = params[:target]
> @@ -212,9 +233,10 @@ class GraphController < ApplicationController
>                  :stroke => @avg_history[:color],
>                  :strokeWidth => 1
>              }
> -       ]
> +       ],
> +       :total_peak => total_peak
>      }
> -    render :json => graph_object
> +
>    end
>  
> 
> @@ -261,7 +283,7 @@ class GraphController < ApplicationController
>              }
>         ]
>      }
> -    render :json => graph_object
> +
>  
>    end
>    
> diff --git a/src/app/views/graph/flexchart_data.rhtml b/src/app/views/graph/flexchart_data.rhtml
> new file mode 100644
> index 0000000..a79ce06
> --- /dev/null
> +++ b/src/app/views/graph/flexchart_data.rhtml
> @@ -0,0 +1 @@
Don't understand why you are doing this here, rather than doing a
render :json in the controller?
> +<%= @graph.to_json %>
> diff --git a/src/app/views/graph/history_graphs.rhtml b/src/app/views/graph/history_graphs.rhtml
> index 2b6874f..f372e4b 100644
> --- a/src/app/views/graph/history_graphs.rhtml
> +++ b/src/app/views/graph/history_graphs.rhtml
> @@ -1,76 +1,15 @@
> +<%= javascript_include_tag "jquery.flash.js" %>
> +<div id="the-div-name"></div>
>  <script type="text/javascript">
> -
> -var graph = "load_history";
> -var days  = "7";
> -
> -function swap_history_graph(newgraph, newdays){
> -    if(newgraph == null) newgraph = graph
> -    if(newdays == null) newdays = days
> -    $('.history_graph').hide(); 
> -    $('#' + newgraph + "_" + newdays).parent().show();
> -    eval("draw_" + newgraph + "_" + newdays + "_graph_get_data()");
> -}
> -function swap_history_graph_target(title, newgraph){
> -    swap_history_graph(newgraph, null);
> -    $('#history_graph_selection').html(title + '&nbsp;&nbsp;<%= image_tag 'icon_menu_arrow.gif' %>');
> -    graph = newgraph
> -}
> -function swap_history_graph_time(title, newdays){
> -    swap_history_graph(null, newdays);
> -    $('#history_graph_time_selection').html(title + '&nbsp;&nbsp;<%= image_tag 'icon_menu_arrow.gif' %>');
> -    days = newdays
> -}
> -
> -</script>
> -
> -<%= render :partial => '/layouts/graph', :locals => { :drawMe => false,  :includeDiv => false, :methodName=> 'draw_cpu_history_1_graph',     :div_id => 'cpu_history_1',     :chartType => 'line', :yGridLines => 'lightgrey', :xGridLines => 'lightgrey', :ticksX => 20,  :scaleX => 173,   :ticksY => 10, :scaleY => 110,  :url => (url_for :escape => false, :controller => 'graph', :action => 'history_graph_data', :id => @id, :params => { :target => 'cpu',    :poolType => @poolType, :days => 1   } ) } %>
> -<%= render :partial => '/layouts/graph', :locals => { :drawMe => false,  :includeDiv => false, :methodName=> 'draw_cpu_history_7_graph',     :div_id => 'cpu_history_7',     :chartType => 'line', :yGridLines => 'lightgrey', :xGridLines => 'lightgrey', :ticksX => 39, :scaleX => 272,  :ticksY => 10, :scaleY => 110,  :url => (url_for :escape => false, :controller => 'graph', :action => 'history_graph_data', :id => @id, :params => { :target => 'cpu',    :poolType => @poolType, :days => 7   } ) } %>
> -<%= render :partial => '/layouts/graph', :locals => { :drawMe => false,  :includeDiv => false, :methodName=> 'draw_cpu_history_30_graph',    :div_id => 'cpu_history_30',    :chartType => 'line', :yGridLines => 'lightgrey', :xGridLines => 'lightgrey', :ticksX => 120,  :scaleX => 1200,  :ticksY => 10, :scaleY => 110,  :url => (url_for :escape => false, :controller => 'graph', :action => 'history_graph_data', :id => @id, :params => { :target => 'cpu',    :poolType => @poolType, :days => 30  } ) } %>
> -<%= render :partial => '/layouts/graph', :locals => { :drawMe => false,  :includeDiv => false, :methodName=> 'draw_memory_history_1_graph',  :div_id => 'memory_history_1',  :chartType => 'line', :yGridLines => 'lightgrey', :xGridLines => 'lightgrey', :ticksX => 20,  :scaleX => 173,   :ticksY => 50, :scaleY => 756,  :url => (url_for :escape => false, :controller => 'graph', :action => 'history_graph_data', :id => @id, :params => { :target => 'memory', :poolType => @poolType, :days => 1   } ) } %>
> -<%= render :partial => '/layouts/graph', :locals => { :drawMe => false,  :includeDiv => false, :methodName=> 'draw_memory_history_7_graph',  :div_id => 'memory_history_7',  :chartType => 'line', :yGridLines => 'lightgrey', :xGridLines => 'lightgrey', :ticksX => 39, :scaleX => 272,  :ticksY => 50, :scaleY => 756,  :url => (url_for :escape => false, :controller => 'graph', :action => 'history_graph_data', :id => @id, :params => { :target => 'memory', :poolType => @poolType, :days => 7   } ) } %>
> -<%= render :partial => '/layouts/graph', :locals => { :drawMe => false,  :includeDiv => false, :methodName=> 'draw_memory_history_30_graph', :div_id => 'memory_history_30', :chartType => 'line', :yGridLines => 'lightgrey', :xGridLines => 'lightgrey', :ticksX => 120,  :scaleX => 1162,  :ticksY => 50, :scaleY => 756,  :url => (url_for :escape => false, :controller => 'graph', :action => 'history_graph_data', :id => @id, :params => { :target => 'memory', :poolType => @poolType, :days => 30  } ) } %>
> -<%= render :partial => '/layouts/graph', :locals => { :drawMe => false,  :includeDiv => false, :methodName=> 'draw_load_history_1_graph',    :div_id => 'load_history_1',    :chartType => 'line', :yGridLines => 'lightgrey', :xGridLines => 'lightgrey', :ticksX => 20,  :scaleX => 173,   :ticksY => 2,  :scaleY => 23,   :url => (url_for :escape => false, :controller => 'graph', :action => 'history_graph_data', :id => @id, :params => { :target => 'load',   :poolType => @poolType, :days => 1   } ) } %>
> -<%= render :partial => '/layouts/graph', :locals => { :drawMe => false,  :includeDiv => false, :methodName=> 'draw_load_history_7_graph',    :div_id => 'load_history_7',    :chartType => 'line', :yGridLines => 'lightgrey', :xGridLines => 'lightgrey', :ticksX => 39, :scaleX => 272,  :ticksY => 2,  :scaleY => 23,   :url => (url_for :escape => false, :controller => 'graph', :action => 'history_graph_data', :id => @id, :params => { :target => 'load',   :poolType => @poolType, :days => 7   } ) } %>
> -<%= render :partial => '/layouts/graph', :locals => { :drawMe => false,  :includeDiv => false, :methodName=> 'draw_load_history_30_graph',   :div_id => 'load_history_30',   :chartType => 'line', :yGridLines => 'lightgrey', :xGridLines => 'lightgrey', :ticksX => 120,  :scaleX => 1200,  :ticksY => 2,  :scaleY => 23,   :url => (url_for :escape => false, :controller => 'graph', :action => 'history_graph_data', :id => @id, :params => { :target => 'load',   :poolType => @poolType, :days => 30  } ) } %>
> -
> -<div id="history_graphs">
> -  <div id="history_graphs_control">
> -   <div class="history_graphs_menu">
> -      <ul>
> -        <li><div id="history_graph_selection" class="history_graph_menu_header">Overall Load &nbsp;&nbsp;<%= image_tag 'icon_menu_arrow.gif' %></div></li>
> -        <li class="history_graph_menu_item history_graph_menu_fitem"><a href="#" onclick="swap_history_graph_target('Overall Load', 'load_history')" >Overall Load</a></li>
> -        <li class="history_graph_menu_item"><a href="#" onclick="swap_history_graph_target('CPU History', 'cpu_history');" >CPU History</a></li>
> -        <li class="history_graph_menu_item history_graph_menu_litem"><a href="#" onclick="swap_history_graph_target('Memory History', 'memory_history');">Memory History</a></li>
> -      </ul>
> -   </div>
> -   <div class="history_graphs_menu">
> -      <ul>
> -        <li><div id="history_graph_time_selection" class="history_graph_menu_header">Last 7 Days &nbsp;&nbsp;<%= image_tag 'icon_menu_arrow.gif' %></div></li>
> -        <li class="history_graph_menu_item history_graph_menu_fitem"<a href="#" onclick="swap_history_graph_time('Last 24 Hours', '1')" >Last 24 Hours</a></li>
> -        <li class="history_graph_menu_item"><a href="#" onclick="swap_history_graph_time('Last 7 days', '7')" >Last 7  Days</a></li>
> -        <li class="history_graph_menu_item history_graph_menu_litem"><a href="#" onclick="swap_history_graph_time('Last 30 Days', '30')" >Last 30 Days</a></li>
> -      </ul>
> -   </div>
> -   <div class="history_graphs_legend">
> -       <font color="<%= @peak_history[:color]   %>">Peak &nbsp; &nbsp;</font>
> -       <font color="<%= @avg_history[:color] %>">Average &nbsp; &nbsp;</font>
> -       <font color="<%= @roll_peak_history[:color]   %>">Rolling Peak &nbsp; &nbsp;</font>
> -       <font color="<%= @roll_avg_history[:color] %>">Rolling Average &nbsp; &nbsp;</font>
> -   </div>
> -  </div>
> -  <div id="history_graphs_graphs">
> -    <div class="history_graph"><div id="cpu_history_1">       </div></div>
> -    <div class="history_graph"><div id="cpu_history_7">       </div></div>
> -    <div class="history_graph"><div id="cpu_history_30">      </div></div>
> -    <div class="history_graph"><div id="memory_history_1">    </div></div>
> -    <div class="history_graph"><div id="memory_history_7">    </div></div>
> -    <div class="history_graph"><div id="memory_history_30">   </div></div>
> -    <div class="history_graph"><div id="load_history_1">      </div></div>
> -    <div class="history_graph"><div id="load_history_7">      </div></div>
> -    <div class="history_graph"><div id="load_history_30">     </div></div>
> -  </div>
> -</div>
> -
I like how much shorter this is!  However, not so keen on having the
path hardcoded like this.  I did a little poking, and think you might
want to add a helper to application_helper.rb like so:

def flash_path(source)
  compute_public_path(source, 'swfs', 'swf')
end

'swfs' is a directory under /public.  I think we should have all the
flash swfs (even if it is only this one) in a dir rather than top level,
doesn't have to be called swfs, could be something else.
> -<script type="text/javascript">
> -    swap_history_graph(null, null); // display 1st graph
> +$(document).ready(function(){
This div needs a more appropriate name that describes what it contains.
> +$('#the-div-name').flash(
> +        {
> +          src: '/ovirt/flexchart.swf',
This line can be changed to:
	     src: '<%=flash_path("flexchart")%>',
> +          width: 720,
> +          height: 300,
> +          flashvars: { flexchart_data: '/ovirt/graph/flexchart_data/<%= @id %>/memory/1' }
Similarly, please do this one as:
             flashvars: { flexchart_data: "<%= url_for :controller
=>'/graph', :action => 'flexchart_data' %>/<%= @id %>/memory/1" }
> +        },
> +        { version: 9 }
> +    );
> +});
>  </script>
> diff --git a/src/config/routes.rb b/src/config/routes.rb
> index 6f8e481..8d538cb 100644
> --- a/src/config/routes.rb
> +++ b/src/config/routes.rb
> @@ -41,6 +41,7 @@ ActionController::Routing::Routes.draw do |map|
>    map.connect ':controller/service.wsdl', :action => 'wsdl'
>  
>    # Install the default route as the lowest priority.
> +  map.connect 'graph/flexchart_data/:id/:target/:days', :controller => 'graph', :action => 'flexchart_data'
>    map.connect ':controller/:action/:id.:format'
>    map.connect ':controller/:action/:id'
>  
> diff --git a/src/flexchart/README.txt b/src/flexchart/README.txt
> new file mode 100644
> index 0000000..66eb183
> --- /dev/null
> +++ b/src/flexchart/README.txt
> @@ -0,0 +1,8 @@
> +Until mxmlc gets packaged and this becomes part of autobuild,
> +you must obtain the open flex SDK to build the swf movie.
> +
> +Once you have mxmlc on your system, run:
> +
> +mxmlc flexchart.mxml
> +
> +in this directory, and copy the resulting file flexchart.swf to /usr/share/ovirt-server/public on your appliance.
<snip adobe code>

Don't know AS well enough to comment on quality of code too much, mostly
seems reasonable as a first cut.
> diff --git a/src/flexchart/flexchart.mxml b/src/flexchart/flexchart.mxml
> new file mode 100644
> index 0000000..796329d
> --- /dev/null
> +++ b/src/flexchart/flexchart.mxml
> @@ -0,0 +1,20 @@
> +<?xml version="1.0"?>
> +<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" applicationComplete="populate(flexChart)">
> +  <mx:Script>
> +    <![CDATA[
> +
> +      import mx.containers.Box;
> +      import org.ovirt.*;
> +
> +      private function populate(chart:Box):void {
> +        var chartLoader:ChartLoader = new ChartLoader(chart, parameters['flexchart_data']);
> +        chartLoader.load();
> +      }
> +
> +    ]]>
> +  </mx:Script>
> +  <mx:Panel height="100%" width="100%" visible="true">
> +    <mx:HBox id="flexChart"  height="100%" width="100%" visible="true" verticalAlign="bottom" opaqueBackground="0xFFFFFF" borderThickness="0">
> +    </mx:HBox>
> +  </mx:Panel>
> +</mx:Application>
> diff --git a/src/flexchart/org/ovirt/ChartLoader.as b/src/flexchart/org/ovirt/ChartLoader.as
> new file mode 100644
> index 0000000..4e493a4
> --- /dev/null
> +++ b/src/flexchart/org/ovirt/ChartLoader.as
> @@ -0,0 +1,64 @@
> +/*
> + Copyright (C) 2008 Red Hat, Inc.
> + Written by Steve Linabery <slinabery at redhat.com>
> +
> + This program is free software; you can redistribute it and/or modify
> + it under the terms of the GNU General Public License as published by
> + the Free Software Foundation; version 2 of the License.
> +
> + This program is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + GNU General Public License for more details.
> +
> + You should have received a copy of the GNU General Public License
> + along with this program; if not, write to the Free Software
> + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> + MA  02110-1301, USA.  A copy of the GNU General Public License is
> + also available at http://www.gnu.org/copyleft/gpl.html.
> +*/
> +
> +package org.ovirt {
> +
> +  import mx.containers.Box;
> +  import mx.containers.HBox;
> +  import mx.controls.Text;
> +
> +  public class ChartLoader {
> +
> +    private var element:Box;
> +    private var datasourceUrl:String;
> +
> +    public function ChartLoader(element:Box, datasourceUrl:String) {
> +      this.element = element;
> +      this.datasourceUrl = datasourceUrl;
> +    }
> +
> +    public function addData(dataSeries:DataSeries):void {
> +      var points:Array = dataSeries.getPoints();
> +      var maxValue:Number = dataSeries.getMaxValue();
> +      var scale:Number = maxValue;
> +      if (scale == 0) { scale = 1; }
> +      var size:int = points.length;
> +      element.removeAllChildren();
> +      element.setStyle("horizontalGap","2");
Maybe I am spoiled by ruby and jquery - no .each in AS?
> +      for (var i:int = 0; i < size; i++) {
> +        var value:Number = (points[i] as Array)[1];
> +        var bar:HBox = new HBox();
> +        bar.percentHeight = ((value / scale) * 90);
> +        bar.percentWidth = (100 / size);
> +        bar.setStyle("backgroundColor","0x0000FF");
> +        bar.setStyle("left","1");
> +        bar.setStyle("right","1");
> +        bar.visible = true;
> +        bar.setVisible(true);
> +        element.addChild(bar);
> +      }
> +    }
> +
> +    public function load():void {
> +      var dataSource:DataSource = new DataSource(this);
> +      dataSource.retrieveData(datasourceUrl);
> +    }
> +  }
> +}
> \ No newline at end of file
> diff --git a/src/flexchart/org/ovirt/DataSeries.as b/src/flexchart/org/ovirt/DataSeries.as
> new file mode 100644
> index 0000000..d63162a
> --- /dev/null
> +++ b/src/flexchart/org/ovirt/DataSeries.as
> @@ -0,0 +1,42 @@
> +/*
> + Copyright (C) 2008 Red Hat, Inc.
> + Written by Steve Linabery <slinabery at redhat.com>
> +
> + This program is free software; you can redistribute it and/or modify
> + it under the terms of the GNU General Public License as published by
> + the Free Software Foundation; version 2 of the License.
> +
> + This program is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + GNU General Public License for more details.
> +
> + You should have received a copy of the GNU General Public License
> + along with this program; if not, write to the Free Software
> + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> + MA  02110-1301, USA.  A copy of the GNU General Public License is
> + also available at http://www.gnu.org/copyleft/gpl.html.
> +*/
> +
> +//class to encapsulate the json object representation of a data
> +//series returned from stats package
> +
> +package org.ovirt {
> +
> +  public class DataSeries {
> +
> +    private var object:Object;
> +
> +    public function DataSeries (object:Object) {
> +      this.object = object;
> +    }
> +
> +    public function getPoints():Array {
> +      return object["vectors"] as Array;
> +    }
> +
> +    public function getMaxValue():Number {
> +      return object["max_value"] as Number;
> +    }
> +  }
> +}
> \ No newline at end of file
> diff --git a/src/flexchart/org/ovirt/DataSource.as b/src/flexchart/org/ovirt/DataSource.as
> new file mode 100644
> index 0000000..1a64f03
> --- /dev/null
> +++ b/src/flexchart/org/ovirt/DataSource.as
> @@ -0,0 +1,57 @@
> +/*
> + Copyright (C) 2008 Red Hat, Inc.
> + Written by Steve Linabery <slinabery at redhat.com>
> +
> + This program is free software; you can redistribute it and/or modify
> + it under the terms of the GNU General Public License as published by
> + the Free Software Foundation; version 2 of the License.
> +
> + This program is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + GNU General Public License for more details.
> +
> + You should have received a copy of the GNU General Public License
> + along with this program; if not, write to the Free Software
> + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> + MA  02110-1301, USA.  A copy of the GNU General Public License is
> + also available at http://www.gnu.org/copyleft/gpl.html.
> +*/
> +
> +package org.ovirt {
> +
> +  import flash.net.URLLoader;
> +  import flash.net.URLRequest;
> +  import com.adobe.serialization.json.JSON;
> +  import flash.events.Event;
> +  import flash.events.IOErrorEvent;
> +
> +  public class DataSource {
> +
> +    private var chartLoader:ChartLoader;
> +
> +    public function DataSource(chartLoader:ChartLoader) {
> +      this.chartLoader = chartLoader;
> +    }
> +
> +    public function retrieveData(url:String):void {
> +      var loader:URLLoader = new URLLoader();
> +      loader.addEventListener( IOErrorEvent.IO_ERROR, this.ioError );
> +      loader.addEventListener( Event.COMPLETE, dataLoaded );
> +      var request:URLRequest = new URLRequest(url);
> +      loader.load(request);
> +    }
> +
> +    private function dataLoaded(event:Event):void {
> +      var loader:URLLoader = URLLoader(event.target);
> +      var object:Object = JSON.decode(loader.data);
> +      var series:DataSeries = new DataSeries(object);
> +      chartLoader.addData(series);
> +    }
> +
> +    private function ioError( e:IOErrorEvent ):void {
> +      //FIXME:
> +      //do something useful with this error
> +    }
> +  }
> +}
<snip new jq plugin>



From imain at redhat.com  Fri Oct 10 21:56:49 2008
From: imain at redhat.com (Ian Main)
Date: Fri, 10 Oct 2008 14:56:49 -0700
Subject: [Ovirt-devel] [PATCH server] qpid/qmf python demo
Message-ID: <1223675809-3625-1-git-send-email-imain@redhat.com>

This is a little demo of the qpid interface in python.
This is just a temporary thing to demonstrate how it works.

Signed-off-by: Ian Main <imain at redhat.com>
---
 src/qpid_list_demo.py |   42 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 42 insertions(+), 0 deletions(-)
 create mode 100755 src/qpid_list_demo.py

diff --git a/src/qpid_list_demo.py b/src/qpid_list_demo.py
new file mode 100755
index 0000000..3b96c8a
--- /dev/null
+++ b/src/qpid_list_demo.py
@@ -0,0 +1,42 @@
+#!/usr/bin/python
+
+# This script is temporary!  It's just a demo to show how the qpid
+# stuff works.  This prints out a hierarchy of nodes/domains/pools/volumes
+# every five seconds.
+
+from qpid.qmfconsole import Session
+import time
+
+s = Session()
+b = s.addBroker()
+
+while True:
+    nodes = s.getObjects(cls="node")
+    for node in nodes:
+        print 'node:', node.hostname
+        for prop in node.properties:
+            print "  property:", prop
+        # Find any domains that on the current node.
+        domains = s.getObjects(cls="domain", node=node.objectId)
+        for domain in domains:
+            print '  domain:', domain.name
+            for prop in domain.properties:
+                print "    property:", prop
+
+        pools = s.getObjects(cls="pool", node=node.objectId)
+        for pool in pools:
+            print '  pool:', pool.name
+            for prop in pool.properties:
+                print "    property:", prop
+
+            # Find volumes that are part of the pool.
+            volumes = s.getObjects(cls="volume", pool=pool.objectId)
+            for volume in volumes:
+                print '    volume:', volume.name
+                for prop in volume.properties:
+                    print "      property:", prop
+
+    time.sleep(5)
+
+    print '----------------------------'
+
-- 
1.5.5.1



From dpierce at redhat.com  Sat Oct 11 11:29:52 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Sat, 11 Oct 2008 07:29:52 -0400
Subject: [Ovirt-devel] [PATCH server] Added support for booting a VM from an
	ISO image.
Message-ID: <1223724592-4169-1-git-send-email-dpierce@redhat.com>

The NFS export for Cobbler needs to be added as an NFS storage pool.
Otherwise, taskomatic will not be able to locate it.

Also added a few helper methods to Vm to contain the knowledge
of how Cobbler integration is contained.

When a user adds an ISO image to the Cobbler server on the appliance,
they will need to do so using the full NFS path for where the virtual
image will go to mount it; i.e., hostname:/path/to/filename.iso

If the filename ends in ".iso" then the virtual machine will mount the
file as a CDROM device and boot it. Otherwise, it mounts it as a hard
disk device.

To add an image to Cobbler, do the following:

1. Download an ISO image, such as the KDE LiveImage from Fedora.
2. Copy it to the NFS directory on the server:
  cp *.iso /ovirtnfs/kde-live-cd.iso
3. Add that image to your Cobbler instance:
  cobbler image add --name=KDE-LiveCD --file=management.priv.ovirt.org:/ovirtnfs/kde-live-cd.iso
4. Create a new VM in your server.
5. Select "KDE-LiveCD" from the list of operating systems.
6. Save the VM.
7. Start the VM.

It should run the selected ISO.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 src/app/controllers/vm_controller.rb |   51 ++++++++++++--------
 src/app/models/vm.rb                 |   34 +++++++++++++-
 src/task-omatic/task_vm.rb           |   84 +++++++++++++++++++++++++++++-----
 src/test/unit/vm_test.rb             |   56 +++++++++++++++++++++-
 4 files changed, 187 insertions(+), 38 deletions(-)

diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb
index f5c0845..bc88760 100644
--- a/src/app/controllers/vm_controller.rb
+++ b/src/app/controllers/vm_controller.rb
@@ -48,6 +48,7 @@ class VmController < ApplicationController
     begin
       Vm.transaction do
         @vm.save!
+        _setup_vm_provision(params)
         @task = VmTask.new({ :user    => @user,
                              :vm_id   => @vm.id,
                              :action  => VmTask::ACTION_CREATE_VM,
@@ -70,7 +71,7 @@ class VmController < ApplicationController
         alert = "VM was successfully created."
       end
       render :json => { :object => "vm", :success => true, :alert => alert  }
-    rescue
+    rescue Exception => error
       # FIXME: need to distinguish vm vs. task save errors (but should mostly be vm)
       render :json => { :object => "vm", :success => false, 
                         :errors => @vm.errors.localize_error_messages.to_a }
@@ -223,13 +224,18 @@ class VmController < ApplicationController
   def _setup_provisioning_options
     @provisioning_options = [[Vm::PXE_OPTION_LABEL, Vm::PXE_OPTION_VALUE],
                              [Vm::HD_OPTION_LABEL, Vm::HD_OPTION_VALUE]]
-    # FIXME add cobbler images too
+
     begin
+      @provisioning_options += Cobbler::Image.find.collect do |image|
+        [image.name + Vm::COBBLER_IMAGE_SUFFIX,
+          "#{Vm::IMAGE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{image.name}"]
+      end
+
       @provisioning_options += Cobbler::Profile.find.collect do |profile|
         [profile.name + Vm::COBBLER_PROFILE_SUFFIX,
-         Vm::COBBLER_PREFIX + Vm::PROVISIONING_DELIMITER +
-         Vm::PROFILE_PREFIX + Vm::PROVISIONING_DELIMITER + profile.name]
-      end
+          "#{Vm::PROFILE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{profile.name}"]
+
+    end
     rescue
       #if cobbler doesn't respond/is misconfigured/etc just don't add profiles
     end
@@ -239,24 +245,27 @@ class VmController < ApplicationController
   def _setup_vm_provision(params)
     # spaces are invalid in the cobbler name
     name = params[:vm][:uuid]
-    provision = params[:vm][:provisioning_and_boot_settings].gsub(
-         Vm::COBBLER_PREFIX + Vm::PROVISIONING_DELIMITER +
-         Vm::PROFILE_PREFIX + Vm::PROVISIONING_DELIMITER, "")
     mac = params[:vm][:vnic_mac_addr]
-    unless provision == Vm::PXE_OPTION_VALUE or
-           provision == Vm::HD_OPTION_VALUE
-      found = false
-      Cobbler::System.find.each{ |system|
-        if system.name == name
-          system.profile = provision
-          system.save
-          found = true
+    provision = params[:vm][:provisioning_and_boot_settings]
+    # determine what type of provisioning was selected for the VM
+    provisioning_type = :pxe_or_hd_type
+    provisioning_type = :image_type  if provision.index "#{Vm::IMAGE_PREFIX}@#{Vm::COBBLER_PREFIX}"
+    provisioning_type = :system_type if provision.index "#{Vm::PROFILE_PREFIX}@#{Vm::COBBLER_PREFIX}"
+
+    unless provisioning_type == :pxe_or_hd_type
+      cobbler_name = provision.slice(/(.*):(.*)/, 2)
+      system = Cobbler::System.find_one(name)
+      unless system
+        nic = Cobbler::NetworkInterface.new({'mac_address' => mac})
+
+        case provisioning_type
+        when :image_type:
+            system = Cobbler::System.new("name" => name, "image"    => cobbler_name)
+        when :system_type:
+            system = Cobbler::System.new("name" => name, "profile" => cobbler_name)
         end
-      }
-      unless found
-        system = Cobbler::System.create("name" => name,
-                                        "profile" => provision)
-        system.interfaces=[Cobbler::NetworkInterface.new({'mac_address' => mac})]
+
+        system.interfaces = [nic]
         system.save
       end
     end
diff --git a/src/app/models/vm.rb b/src/app/models/vm.rb
index ace6fb1..d7beacf 100644
--- a/src/app/models/vm.rb
+++ b/src/app/models/vm.rb
@@ -49,7 +49,7 @@ class Vm < ActiveRecord::Base
   PROFILE_PREFIX         = "profile"
   IMAGE_PREFIX           = "image"
   COBBLER_PROFILE_SUFFIX = " (Cobbler Profile)"
-  COBBLER_IMAGE_SUFFIX   = " (Cobbler Profile)"
+  COBBLER_IMAGE_SUFFIX   = " (Cobbler Image)"
 
   PXE_OPTION_LABEL       = "PXE Boot"
   PXE_OPTION_VALUE       = "pxe"
@@ -139,7 +139,15 @@ class Vm < ActiveRecord::Base
   end
 
   def provisioning_and_boot_settings=(settings)
-    if settings==PXE_OPTION_VALUE
+    # if the settings have a prefix that matches cobber settings, then process
+    # those details
+    if settings =~ /#{IMAGE_PREFIX}@#{COBBLER_PREFIX}/
+      self[:boot_device] = BOOT_DEV_CDROM
+      self[:provisioning] = settings
+    elsif settings =~ /#{PROFILE_PREFIX}@#{COBBLER_PREFIX}/
+      self[:boot_device] = BOOT_DEV_NETWORK
+      self[:provisioning] = settings
+    elsif settings==PXE_OPTION_VALUE
       self[:boot_device]= BOOT_DEV_NETWORK
       self[:provisioning]= nil
     elsif settings==HD_OPTION_VALUE
@@ -242,6 +250,28 @@ class Vm < ActiveRecord::Base
     vm_resource_pool.search_users
   end
 
+  # Reports whether the VM is uses Cobbler for booting.
+  #
+  def uses_cobbler?
+    (self.provisioning != nil) && (self.provisioning.include? COBBLER_PREFIX)
+  end
+
+  # Returns the cobbler type.
+  #
+  def cobbler_type
+    if self.uses_cobbler?
+      self.provisioning[/^(.*)@/,1]
+    end
+  end
+
+  # Returns the cobbler provisioning name.
+  #
+  def cobbler_name
+    if self.uses_cobbler?
+      self.provisioning[/^.*@.*:(.*)/,1]
+    end
+  end
+
   protected
   def validate
     resources = vm_resource_pool.max_resources_for_vm(self)
diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb
index 3588224..72ad9d8 100644
--- a/src/task-omatic/task_vm.rb
+++ b/src/task-omatic/task_vm.rb
@@ -65,16 +65,26 @@ def create_vm_xml(name, uuid, memAllocated, memUsed, vcpus, bootDevice,
   doc.root.elements["devices"].add_element("emulator")
   doc.root.elements["devices"].elements["emulator"].text = "/usr/bin/qemu-kvm"
 
-  devs = [ 'hda', 'hdb', 'hdc', 'hdd' ]
-  i = 0
+  devs = ['hda', 'hdb', 'hdc', 'hdd']
+  which_device = 0
   diskDevices.each do |disk|
+    is_cdrom = (disk =~ /\.iso/) ? true : false
+
     diskdev = Element.new("disk")
-    diskdev.add_attribute("type", "block")
-    diskdev.add_attribute("device", "disk")
-    diskdev.add_element("source", {"dev" => disk})
-    diskdev.add_element("target", {"dev" => devs[i]})
+    diskdev.add_attribute("type", is_cdrom ? "file" : "block")
+    diskdev.add_attribute("device", is_cdrom ? "cdrom" : "disk")
+
+    if is_cdrom
+      diskdev.add_element("readonly")
+      diskdev.add_element("source", {"file" => disk})
+      diskdev.add_element("target", {"dev" => devs[which_device], "bus" => "ide"})
+    else
+      diskdev.add_element("source", {"dev" => disk})
+      diskdev.add_element("target", {"dev" => devs[which_device]})
+    end
+
     doc.root.elements["devices"] << diskdev
-    i += 1
+    which_device += 1
   end
 
   doc.root.elements["devices"].add_element("interface", {"type" => "bridge"})
@@ -154,15 +164,12 @@ def create_vm(task)
   # create cobbler system profile
   begin
     if vm.provisioning and !vm.provisioning.empty?
-      provisioning_arr = vm.provisioning.split(Vm::PROVISIONING_DELIMITER)
-      if provisioning_arr[0]==Vm::COBBLER_PREFIX
-        if provisioning_arr[1]==Vm::PROFILE_PREFIX
+      if vm.uses_cobbler?
+        if vm.cobbler_type == Vm::PROFILE_PREFIX:
           system = Cobbler::System.new('name' => vm.uuid,
                                        'profile' => provisioning_arr[2])
           system.interfaces=[Cobbler::NetworkInterface.new({'mac_address' => vm.vnic_mac_addr})]
           system.save
-        elsif provisioning_arr[1]==Vm::IMAGE_PREFIX
-          #FIXME handle cobbler images
         end
       end
     end
@@ -231,6 +238,14 @@ def shutdown_vm(task)
   setVmShutdown(vm)
 end
 
+# Find thes storage pool with the given ip address and export path.
+#
+def find_storage_pool(ip_addr, export_path)
+  StoragePool.find(:first,
+    :conditions =>
+      ['ip_addr = ? and export_path = ?',ip_addr, export_path])
+end
+
 def start_vm(task)
   puts "start_vm"
 
@@ -266,6 +281,48 @@ def start_vm(task)
     # hosts to see if there is a host that will fit these constraints
     host = findHostSLA(vm)
 
+    # if we're booting from a CDROM the VM is an image,
+    # then we need to add the NFS mount as a storage volume for this
+    # boot
+    #
+    if (vm.boot_device == Vm::BOOT_DEV_CDROM) && vm.uses_cobbler? && (vm.cobbler_type == Vm::IMAGE_PREFIX)
+      details = Cobbler::Image.find_one(vm.cobbler_name)
+
+      raise "Image #{vm.cobbler_name} not found in Cobbler server" unless details
+
+      ignored, ip_addr, export_path, filename =
+        details.file.split(/(.*):(.*)\/(.*)/)
+
+      found = false
+
+      vm.storage_volumes.each do |volume|
+        if volume.filename == filename
+          if (volume.storage_pool.ip_addr == ip_addr) &&
+          (volume.storage_pool.export_path == export_path)
+            found = true
+          end
+        end
+      end
+
+      unless found
+        # Create a new transient NFS storage volume
+        # This volume is *not* persisted.
+        image_volume = StorageVolume.factory("NFS",
+          :filename => filename
+        )
+
+        image_volume.storage_pool
+        image_pool = find_storage_pool(ip_addr, export_path)
+
+        raise Exception.new("Unable to find Cobbler storage pool") unless image_pool
+
+        if image_pool
+          image_pool.storage_volumes << image_volume
+        end
+        vm.storage_volumes << image_volume
+      end
+    end
+
     conn = Libvirt::open("qemu+tcp://" + host.hostname + "/system")
 
     storagedevs = connect_storage_pools(conn, vm)
@@ -277,6 +334,9 @@ def start_vm(task)
 
     dom = conn.define_domain_xml(xml.to_s)
     dom.create
+    
+    # Remove the transient storage volume so that it's not persisted
+    vm.storage_volumes.delete image_volume defined? image_volume
 
     setVmVncPort(vm, dom)
 
diff --git a/src/test/unit/vm_test.rb b/src/test/unit/vm_test.rb
index 4a5e353..22164e8 100644
--- a/src/test/unit/vm_test.rb
+++ b/src/test/unit/vm_test.rb
@@ -22,8 +22,58 @@ require File.dirname(__FILE__) + '/../test_helper'
 class VmTest < Test::Unit::TestCase
   fixtures :vms
 
-  # Replace this with your real tests.
-  def test_truth
-    assert true
+  def setup
+    @vm_name = "Test"
+    @no_cobbler_provisioning = "#{@vm_name}"
+    @cobbler_image_provisioning =
+      "#{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}"
+  end
+
+  # Ensures that, if the VM does not contain the Cobbler prefix, that it
+  # does not claim to be a Cobbler VM.
+  #
+  def test_uses_cobbler_without_cobbler_prefix
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings=@no_cobbler_provisioning
+
+    flunk "VM is not a Cobbler provisioned one." if vm.uses_cobbler?
+    assert_equal @vm_name, vm.provisioning, "Wrong name reported."
+  end
+
+  # Ensures that the VM reports that it uses Cobbler if the provisioning
+  # is for a Cobbler profile.
+  #
+  def test_uses_cobbler_with_cobbler_profile
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings = @cobbler_profile_provisioning
+
+    flunk "VM did not report that it's Cobbler provisioned." unless vm.uses_cobbler?
+    assert_equal Vm::PROFILE_PREFIX,
+      vm.cobbler_type,
+      "Wrong cobbler type reported."
+    assert_equal @vm_name,
+      vm.cobbler_name,
+      "Wrong name reported."
+  end
+
+  # Ensures that the VM reports that it uses Cobbler if the provisioning
+  # is for a Cobbler image.
+  #
+  def test_uses_cobbler_with_cobbler_image
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings = @cobbler_image_provisioning
+
+    flunk "VM did not report that it's Cobbler provisioned." unless vm.uses_cobbler?
+    assert_equal Vm::IMAGE_PREFIX,
+      vm.cobbler_type,
+      "Wrong cobbler type reported."
+    assert_equal @vm_name,
+      vm.cobbler_name,
+      "Wrong name reported."
   end
 end
-- 
1.5.5.1



From justin at redfish-group.com  Mon Oct 13 06:46:45 2008
From: justin at redfish-group.com (Justin Clacherty)
Date: Mon, 13 Oct 2008 16:46:45 +1000
Subject: [Ovirt-devel] unable to add hosts in web admin tool
Message-ID: <48F2EED5.6030908@redfish-group.com>

Hi,

I'm currently trying out ovirt.  I've installed the ovirt appliance on a 
fedora 9 machine and have a seperate machine on a private lan which I am 
using as a node.  I've looked through the documentation but it doesn't 
seem to have been updated with the current release.

I've set up cobbler to have the node boot oVirt-Node-x86_64.  I noticed 
that the nodes that were already set up have a kernel parameter set 
"ovirt_init=scsi", do I need to have this set for my node too?  Once the 
node is booted, how do I add it in the oVirt web admin tool?  When I go 
to add a hos it doesn't appear in the list.

Justin.




From xxqonline at hotmail.com  Mon Oct 13 06:49:15 2008
From: xxqonline at hotmail.com (xxqonline at hotmail.com)
Date: Mon, 13 Oct 2008 14:49:15 +0800
Subject: [Ovirt-devel] unable to add hosts in web admin tool
In-Reply-To: <48F2EED5.6030908@redfish-group.com>
References: <48F2EED5.6030908@redfish-group.com>
Message-ID: <BAY124-DS52A7EA200879521B94307B1360@phx.gbl>

Did you start the managed host in network bootup?
Do you have PXE feature in your managed host?
Do you have 2 nics on your management host?

--------------------------------------------------
From: "Justin Clacherty" <justin at redfish-group.com>
Sent: Monday, October 13, 2008 2:46 PM
To: <ovirt-devel at redhat.com>
Subject: [Ovirt-devel] unable to add hosts in web admin tool

> Hi,
> 
> I'm currently trying out ovirt.  I've installed the ovirt appliance on a 
> fedora 9 machine and have a seperate machine on a private lan which I am 
> using as a node.  I've looked through the documentation but it doesn't 
> seem to have been updated with the current release.
> 
> I've set up cobbler to have the node boot oVirt-Node-x86_64.  I noticed 
> that the nodes that were already set up have a kernel parameter set 
> "ovirt_init=scsi", do I need to have this set for my node too?  Once the 
> node is booted, how do I add it in the oVirt web admin tool?  When I go 
> to add a hos it doesn't appear in the list.
> 
> Justin.
> 
> 
> _______________________________________________
> Ovirt-devel mailing list
> Ovirt-devel at redhat.com
> https://www.redhat.com/mailman/listinfo/ovirt-devel
> 



From justin at redfish-group.com  Mon Oct 13 07:20:39 2008
From: justin at redfish-group.com (Justin Clacherty)
Date: Mon, 13 Oct 2008 17:20:39 +1000
Subject: [Ovirt-devel] unable to add hosts in web admin tool
In-Reply-To: <BAY124-DS52A7EA200879521B94307B1360@phx.gbl>
References: <48F2EED5.6030908@redfish-group.com>
	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl>
Message-ID: <48F2F6C7.4020300@redfish-group.com>

Yes, the managed host booted the oVirt-Node dist via PXE.  Both the 
managed host and the management host have 2 nics.  One nic is on the 
private management network (this is the network the managed host has 
booted from), the other nic is on my local network.

Justin.

xxqonline at hotmail.com wrote:
> Did you start the managed host in network bootup?
> Do you have PXE feature in your managed host?
> Do you have 2 nics on your management host?
>
> --------------------------------------------------
> From: "Justin Clacherty" <justin at redfish-group.com>
> Sent: Monday, October 13, 2008 2:46 PM
> To: <ovirt-devel at redhat.com>
> Subject: [Ovirt-devel] unable to add hosts in web admin tool
>
>> Hi,
>>
>> I'm currently trying out ovirt.  I've installed the ovirt appliance 
>> on a fedora 9 machine and have a seperate machine on a private lan 
>> which I am using as a node.  I've looked through the documentation 
>> but it doesn't seem to have been updated with the current release.
>>
>> I've set up cobbler to have the node boot oVirt-Node-x86_64.  I 
>> noticed that the nodes that were already set up have a kernel 
>> parameter set "ovirt_init=scsi", do I need to have this set for my 
>> node too?  Once the node is booted, how do I add it in the oVirt web 
>> admin tool?  When I go to add a hos it doesn't appear in the list.
>>
>> Justin.
>>
>>
>> _______________________________________________
>> Ovirt-devel mailing list
>> Ovirt-devel at redhat.com
>> https://www.redhat.com/mailman/listinfo/ovirt-devel
>>



From apevec at redhat.com  Mon Oct 13 07:55:23 2008
From: apevec at redhat.com (Alan Pevec)
Date: Mon, 13 Oct 2008 09:55:23 +0200
Subject: [Ovirt-devel] unable to add hosts in web admin tool
In-Reply-To: <48F2F6C7.4020300@redfish-group.com>
References: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl>
	<48F2F6C7.4020300@redfish-group.com>
Message-ID: <48F2FEEB.10705@redhat.com>

Justin Clacherty wrote:
> Yes, the managed host booted the oVirt-Node dist via PXE.  Both the 
> managed host and the management host have 2 nics.  One nic is on the 
> private management network (this is the network the managed host has 
> booted from), the other nic is on my local network.

Please check the logs /var/log/ovirt* to find out what's going on
 
>>> I'm currently trying out ovirt.  I've installed the ovirt appliance 
>>> on a fedora 9 machine and have a seperate machine on a private lan 
>>> which I am using as a node.  I've looked through the documentation 
>>> but it doesn't seem to have been updated with the current release.
>>>
>>> I've set up cobbler to have the node boot oVirt-Node-x86_64.  I 
>>> noticed that the nodes that were already set up have a kernel 
>>> parameter set "ovirt_init=scsi", do I need to have this set for my 

That parameter sets up local disk partition for persisted Node configuration, see http://ovirt.org/page/Local_Disk_Usage For simplicity try w/o it first.

>>> node too?  Once the node is booted, how do I add it in the oVirt web 
>>> admin tool?  When I go to add a hos it doesn't appear in the list.

Nodes register themselves with the ovirt server on boot and show up automatically in WUI.
Check ovirt-host-browser service log.



From justin at redfish-group.com  Mon Oct 13 09:19:06 2008
From: justin at redfish-group.com (Justin Clacherty)
Date: Mon, 13 Oct 2008 19:19:06 +1000
Subject: [Ovirt-devel] unable to add hosts in web admin tool
In-Reply-To: <48F2FEEB.10705@redhat.com>
References: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl>
	<48F2F6C7.4020300@redfish-group.com> <48F2FEEB.10705@redhat.com>
Message-ID: <48F3128A.7090800@redfish-group.com>

Alan Pevec wrote:
> Please check the logs /var/log/ovirt* to find out what's going on

Can't see anything much in the logs on the management server.  I had a 
look at ovirt.log on the managed host and it looks as though it is 
having problems talking to the management node, not sure what to do 
about it though.  Here's the relevant part of the log:

Resolving management.priv.ovirt.org.... 192.168.50.2
Connecting to management.priv.ovirt.org.|192.168.50.2|:80... connected.
HTTP request sent, awaiting response... 500 Internal Server Error
2008-10-13 16:52:33 ERROR 500: Internal Server Error.

Failed to retrieve configuration bundle
Applying default configuration to eth0 and ovirtbr0
Applying default configuration to eth1 and ovirtbr1
Default config applied
  No volume groups found
mount: you must specify the filesystem type
umount: /tmp/tmp.1L8QltORDO: not mounted
skipping Kerberos configuration
skipping ovirt-awake, oVirt identify service not available
skipping collectd configuration, collectd service not available
mount: you must specify the filesystem type
store config:mount: can't find /tmp/tmp.r0yHe5SGXZ in /etc/fstab or 
/etc/mtab
 /etc/ssh/ssh_host_dsa_key /etc/ssh/ssh_host_dsa_key.pub 
/etc/ssh/ssh_host_key /etc/ssh/ssh_host_key.pub 
/etc/ssh/ssh_host_rsa_key /etc/ssh/ssh_host_rsa_key.pub
umount: /tmp/tmp.r0yHe5SGXZ: not mounted
skipping ovirt-identify-node, oVirt registration service not available

> That parameter sets up local disk partition for persisted Node 
> configuration, see http://ovirt.org/page/Local_Disk_Usage For 
> simplicity try w/o it first.

Thanks, removed it for this node.



From xxqonline at hotmail.com  Mon Oct 13 09:20:38 2008
From: xxqonline at hotmail.com (xxqonline at hotmail.com)
Date: Mon, 13 Oct 2008 17:20:38 +0800
Subject: [Ovirt-devel] unable to add hosts in web admin tool
In-Reply-To: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl>
	<48F2F6C7.4020300@redfish-group.com> <48F2FEEB.10705@redhat.com>
	<48F3128A.7090800@redfish-group.com>
References: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl>
	<48F2F6C7.4020300@redfish-group.com> <48F2FEEB.10705@redhat.com>
	<48F3128A.7090800@redfish-group.com>
Message-ID: <BAY124-DS161312F67DDBCC590EC82B1360@phx.gbl>

Which appliance are you using?
The ovirt-appliance is not running well.
You may need to download the developer.img in download page.

--------------------------------------------------
From: "Justin Clacherty" <justin at redfish-group.com>
Sent: Monday, October 13, 2008 5:19 PM
To: "Alan Pevec" <apevec at redhat.com>
Cc: <xxqonline at hotmail.com>; <ovirt-devel at redhat.com>
Subject: Re: [Ovirt-devel] unable to add hosts in web admin tool

> Alan Pevec wrote:
>> Please check the logs /var/log/ovirt* to find out what's going on
> 
> Can't see anything much in the logs on the management server.  I had a 
> look at ovirt.log on the managed host and it looks as though it is 
> having problems talking to the management node, not sure what to do 
> about it though.  Here's the relevant part of the log:
> 
> Resolving management.priv.ovirt.org.... 192.168.50.2
> Connecting to management.priv.ovirt.org.|192.168.50.2|:80... connected.
> HTTP request sent, awaiting response... 500 Internal Server Error
> 2008-10-13 16:52:33 ERROR 500: Internal Server Error.
> 
> Failed to retrieve configuration bundle
> Applying default configuration to eth0 and ovirtbr0
> Applying default configuration to eth1 and ovirtbr1
> Default config applied
>  No volume groups found
> mount: you must specify the filesystem type
> umount: /tmp/tmp.1L8QltORDO: not mounted
> skipping Kerberos configuration
> skipping ovirt-awake, oVirt identify service not available
> skipping collectd configuration, collectd service not available
> mount: you must specify the filesystem type
> store config:mount: can't find /tmp/tmp.r0yHe5SGXZ in /etc/fstab or 
> /etc/mtab
> /etc/ssh/ssh_host_dsa_key /etc/ssh/ssh_host_dsa_key.pub 
> /etc/ssh/ssh_host_key /etc/ssh/ssh_host_key.pub 
> /etc/ssh/ssh_host_rsa_key /etc/ssh/ssh_host_rsa_key.pub
> umount: /tmp/tmp.r0yHe5SGXZ: not mounted
> skipping ovirt-identify-node, oVirt registration service not available
> 
>> That parameter sets up local disk partition for persisted Node 
>> configuration, see http://ovirt.org/page/Local_Disk_Usage For 
>> simplicity try w/o it first.
> 
> Thanks, removed it for this node.
> 
> 



From justin at redfish-group.com  Mon Oct 13 09:36:00 2008
From: justin at redfish-group.com (Justin Clacherty)
Date: Mon, 13 Oct 2008 19:36:00 +1000
Subject: [Ovirt-devel] unable to add hosts in web admin tool
In-Reply-To: <BAY124-DS161312F67DDBCC590EC82B1360@phx.gbl>
References: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl>
	<48F2F6C7.4020300@redfish-group.com> <48F2FEEB.10705@redhat.com>
	<48F3128A.7090800@redfish-group.com>
	<BAY124-DS161312F67DDBCC590EC82B1360@phx.gbl>
Message-ID: <48F31680.1090807@redfish-group.com>

xxqonline at hotmail.com wrote:
> Which appliance are you using?
> The ovirt-appliance is not running well.
> You may need to download the developer.img in download page.

Installed it from yum as described on the oVirt website.  I presume the 
yum version of ovirt-appliance is 0.93-1



From xxqonline at hotmail.com  Mon Oct 13 09:37:48 2008
From: xxqonline at hotmail.com (xxqonline at hotmail.com)
Date: Mon, 13 Oct 2008 17:37:48 +0800
Subject: [Ovirt-devel] unable to add hosts in web admin tool
In-Reply-To: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl>
	<48F2F6C7.4020300@redfish-group.com> <48F2FEEB.10705@redhat.com>
	<48F3128A.7090800@redfish-group.com>
	<BAY124-DS161312F67DDBCC590EC82B1360@phx.gbl>
	<48F31680.1090807@redfish-group.com>
References: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl>
	<48F2F6C7.4020300@redfish-group.com> <48F2FEEB.10705@redhat.com>
	<48F3128A.7090800@redfish-group.com>
	<BAY124-DS161312F67DDBCC590EC82B1360@phx.gbl>
	<48F31680.1090807@redfish-group.com>
Message-ID: <BAY124-DS27D2BE7E3391FF9AFA4ABB1360@phx.gbl>

I think you may download a developer.img, it is in download page

BTW, I did not run ovirt-appliance successful.


--------------------------------------------------
From: "Justin Clacherty" <justin at redfish-group.com>
Sent: Monday, October 13, 2008 5:36 PM
To: <xxqonline at hotmail.com>
Cc: "Alan Pevec" <apevec at redhat.com>; <ovirt-devel at redhat.com>
Subject: Re: [Ovirt-devel] unable to add hosts in web admin tool

> xxqonline at hotmail.com wrote:
>> Which appliance are you using?
>> The ovirt-appliance is not running well.
>> You may need to download the developer.img in download page.
> 
> Installed it from yum as described on the oVirt website.  I presume the 
> yum version of ovirt-appliance is 0.93-1
> 



From xxqonline at hotmail.com  Mon Oct 13 09:48:08 2008
From: xxqonline at hotmail.com (xxqonline at hotmail.com)
Date: Mon, 13 Oct 2008 17:48:08 +0800
Subject: [Ovirt-devel] unable to add hosts in web admin tool
In-Reply-To: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl><48F2F6C7.4020300@redfish-group.com>
	<48F2FEEB.10705@redhat.com><48F3128A.7090800@redfish-group.com><BAY124-DS161312F67DDBCC590EC82B1360@phx.gbl><48F31680.1090807@redfish-group.com>
	<BAY124-DS27D2BE7E3391FF9AFA4ABB1360@phx.gbl>
References: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl><48F2F6C7.4020300@redfish-group.com>
	<48F2FEEB.10705@redhat.com><48F3128A.7090800@redfish-group.com><BAY124-DS161312F67DDBCC590EC82B1360@phx.gbl><48F31680.1090807@redfish-group.com>
	<BAY124-DS27D2BE7E3391FF9AFA4ABB1360@phx.gbl>
Message-ID: <BAY124-DS31B411F70FBA2B521A0F2B1360@phx.gbl>

I think ovirt-appliance.img is just a toy.
The developer.img is the real thing we can use.

BTW, the doc of the oVirt has a lot of the fault.
But they are not hard to be fixed by ourselves.


--------------------------------------------------
From: <xxqonline at hotmail.com>
Sent: Monday, October 13, 2008 5:37 PM
To: "Justin Clacherty" <justin at redfish-group.com>
Cc: <ovirt-devel at redhat.com>
Subject: Re: [Ovirt-devel] unable to add hosts in web admin tool

> I think you may download a developer.img, it is in download page
> 
> BTW, I did not run ovirt-appliance successful.
> 
> 
> --------------------------------------------------
> From: "Justin Clacherty" <justin at redfish-group.com>
> Sent: Monday, October 13, 2008 5:36 PM
> To: <xxqonline at hotmail.com>
> Cc: "Alan Pevec" <apevec at redhat.com>; <ovirt-devel at redhat.com>
> Subject: Re: [Ovirt-devel] unable to add hosts in web admin tool
> 
>> xxqonline at hotmail.com wrote:
>>> Which appliance are you using?
>>> The ovirt-appliance is not running well.
>>> You may need to download the developer.img in download page.
>> 
>> Installed it from yum as described on the oVirt website.  I presume the 
>> yum version of ovirt-appliance is 0.93-1
>> 
> 
> _______________________________________________
> Ovirt-devel mailing list
> Ovirt-devel at redhat.com
> https://www.redhat.com/mailman/listinfo/ovirt-devel
> 



From justin at redfish-group.com  Mon Oct 13 09:48:38 2008
From: justin at redfish-group.com (Justin Clacherty)
Date: Mon, 13 Oct 2008 19:48:38 +1000
Subject: [Ovirt-devel] unable to add hosts in web admin tool
In-Reply-To: <BAY124-DS27D2BE7E3391FF9AFA4ABB1360@phx.gbl>
References: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl>
	<48F2F6C7.4020300@redfish-group.com> <48F2FEEB.10705@redhat.com>
	<48F3128A.7090800@redfish-group.com>
	<BAY124-DS161312F67DDBCC590EC82B1360@phx.gbl>
	<48F31680.1090807@redfish-group.com>
	<BAY124-DS27D2BE7E3391FF9AFA4ABB1360@phx.gbl>
Message-ID: <48F31976.8090407@redfish-group.com>

xxqonline at hotmail.com wrote:
> I think you may download a developer.img, it is in download page

Wasn't the developer image just there to allow you to run nodes on the 
management server instead of needing seperate hardware?

>
> BTW, I did not run ovirt-appliance successful.

bummer.



From xxqonline at hotmail.com  Mon Oct 13 09:50:31 2008
From: xxqonline at hotmail.com (xxqonline at hotmail.com)
Date: Mon, 13 Oct 2008 17:50:31 +0800
Subject: [Ovirt-devel] unable to add hosts in web admin tool
In-Reply-To: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl>
	<48F2F6C7.4020300@redfish-group.com> <48F2FEEB.10705@redhat.com>
	<48F3128A.7090800@redfish-group.com>
	<BAY124-DS161312F67DDBCC590EC82B1360@phx.gbl>
	<48F31680.1090807@redfish-group.com>
	<BAY124-DS27D2BE7E3391FF9AFA4ABB1360@phx.gbl>
	<48F31976.8090407@redfish-group.com>
References: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl>
	<48F2F6C7.4020300@redfish-group.com> <48F2FEEB.10705@redhat.com>
	<48F3128A.7090800@redfish-group.com>
	<BAY124-DS161312F67DDBCC590EC82B1360@phx.gbl>
	<48F31680.1090807@redfish-group.com>
	<BAY124-DS27D2BE7E3391FF9AFA4ABB1360@phx.gbl>
	<48F31976.8090407@redfish-group.com>
Message-ID: <BAY124-DS5F85F366E0B6BCCB9A6EFB1360@phx.gbl>

The problem is I think the ovirt-appliance .img did not use the second nic.
But the developer.img used. 
I am not the red hat guy, I really think they need to improve doc.

--------------------------------------------------
From: "Justin Clacherty" <justin at redfish-group.com>
Sent: Monday, October 13, 2008 5:48 PM
To: <xxqonline at hotmail.com>
Cc: "Alan Pevec" <apevec at redhat.com>; <ovirt-devel at redhat.com>
Subject: Re: [Ovirt-devel] unable to add hosts in web admin tool

> xxqonline at hotmail.com wrote:
>> I think you may download a developer.img, it is in download page
> 
> Wasn't the developer image just there to allow you to run nodes on the 
> management server instead of needing seperate hardware?
> 
>>
>> BTW, I did not run ovirt-appliance successful.
> 
> bummer.
> 
> 



From xxqonline at hotmail.com  Mon Oct 13 09:55:34 2008
From: xxqonline at hotmail.com (xxqonline at hotmail.com)
Date: Mon, 13 Oct 2008 17:55:34 +0800
Subject: [Ovirt-devel] unable to add hosts in web admin tool
In-Reply-To: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl><48F2F6C7.4020300@redfish-group.com>
	<48F2FEEB.10705@redhat.com><48F3128A.7090800@redfish-group.com><BAY124-DS161312F67DDBCC590EC82B1360@phx.gbl><48F31680.1090807@redfish-group.com><BAY124-DS27D2BE7E3391FF9AFA4ABB1360@phx.gbl><48F31976.8090407@redfish-group.com>
	<BAY124-DS5F85F366E0B6BCCB9A6EFB1360@phx.gbl>
References: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl><48F2F6C7.4020300@redfish-group.com>
	<48F2FEEB.10705@redhat.com><48F3128A.7090800@redfish-group.com><BAY124-DS161312F67DDBCC590EC82B1360@phx.gbl><48F31680.1090807@redfish-group.com><BAY124-DS27D2BE7E3391FF9AFA4ABB1360@phx.gbl><48F31976.8090407@redfish-group.com>
	<BAY124-DS5F85F366E0B6BCCB9A6EFB1360@phx.gbl>
Message-ID: <BAY124-DS4E897CE834376C4F5B74EB1360@phx.gbl>

Hello Justin:

      Why not have a try
 http://ovirt.org/download/ovirt-developer-appliance-0.91-1-x86_64.tar
http://ovirt.org/download/ovirt-developer-appliance-0.91-1-i386.tar
http://ovirt.org/download.html

Not the admin url is not 192.168.50.2, it is the eth0 ip of the admin vm.
I said there are a lot of the error in their doc.



Regards,
Qiang

--------------------------------------------------
From: <xxqonline at hotmail.com>
Sent: Monday, October 13, 2008 5:50 PM
To: "Justin Clacherty" <justin at redfish-group.com>
Cc: <ovirt-devel at redhat.com>
Subject: Re: [Ovirt-devel] unable to add hosts in web admin tool

> The problem is I think the ovirt-appliance .img did not use the second 
> nic.
> But the developer.img used. I am not the red hat guy, I really think they 
> need to improve doc.
>
> --------------------------------------------------
> From: "Justin Clacherty" <justin at redfish-group.com>
> Sent: Monday, October 13, 2008 5:48 PM
> To: <xxqonline at hotmail.com>
> Cc: "Alan Pevec" <apevec at redhat.com>; <ovirt-devel at redhat.com>
> Subject: Re: [Ovirt-devel] unable to add hosts in web admin tool
>
>> xxqonline at hotmail.com wrote:
>>> I think you may download a developer.img, it is in download page
>>
>> Wasn't the developer image just there to allow you to run nodes on the 
>> management server instead of needing seperate hardware?
>>
>>>
>>> BTW, I did not run ovirt-appliance successful.
>>
>> bummer.
>>
>>
>
> _______________________________________________
> Ovirt-devel mailing list
> Ovirt-devel at redhat.com
> https://www.redhat.com/mailman/listinfo/ovirt-devel
> 



From justin at redfish-group.com  Mon Oct 13 10:29:13 2008
From: justin at redfish-group.com (Justin Clacherty)
Date: Mon, 13 Oct 2008 20:29:13 +1000
Subject: [Ovirt-devel] unable to add hosts in web admin tool
In-Reply-To: <BAY124-DS4E897CE834376C4F5B74EB1360@phx.gbl>
References: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl><48F2F6C7.4020300@redfish-group.com>
	<48F2FEEB.10705@redhat.com><48F3128A.7090800@redfish-group.com><BAY124-DS161312F67DDBCC590EC82B1360@phx.gbl><48F31680.1090807@redfish-group.com><BAY124-DS27D2BE7E3391FF9AFA4ABB1360@phx.gbl><48F31976.8090407@redfish-group.com>
	<BAY124-DS5F85F366E0B6BCCB9A6EFB1360@phx.gbl>
	<BAY124-DS4E897CE834376C4F5B74EB1360@phx.gbl>
Message-ID: <48F322F9.6000802@redfish-group.com>

I'd prefer to run with the current release.  Being in beta I suspect 
there is quite a difference between 0.91-1 and the current release.  
Plus I don't want to be reporting bugs that have already been fixed.

Justin.

xxqonline at hotmail.com wrote:
> Hello Justin:
>
>      Why not have a try
> http://ovirt.org/download/ovirt-developer-appliance-0.91-1-x86_64.tar
> http://ovirt.org/download/ovirt-developer-appliance-0.91-1-i386.tar
> http://ovirt.org/download.html
>
> Not the admin url is not 192.168.50.2, it is the eth0 ip of the admin vm.
> I said there are a lot of the error in their doc.
>
>
>
> Regards,
> Qiang
>
> --------------------------------------------------
> From: <xxqonline at hotmail.com>
> Sent: Monday, October 13, 2008 5:50 PM
> To: "Justin Clacherty" <justin at redfish-group.com>
> Cc: <ovirt-devel at redhat.com>
> Subject: Re: [Ovirt-devel] unable to add hosts in web admin tool
>
>> The problem is I think the ovirt-appliance .img did not use the 
>> second nic.
>> But the developer.img used. I am not the red hat guy, I really think 
>> they need to improve doc.
>>
>> --------------------------------------------------
>> From: "Justin Clacherty" <justin at redfish-group.com>
>> Sent: Monday, October 13, 2008 5:48 PM
>> To: <xxqonline at hotmail.com>
>> Cc: "Alan Pevec" <apevec at redhat.com>; <ovirt-devel at redhat.com>
>> Subject: Re: [Ovirt-devel] unable to add hosts in web admin tool
>>
>>> xxqonline at hotmail.com wrote:
>>>> I think you may download a developer.img, it is in download page
>>>
>>> Wasn't the developer image just there to allow you to run nodes on 
>>> the management server instead of needing seperate hardware?
>>>
>>>>
>>>> BTW, I did not run ovirt-appliance successful.
>>>
>>> bummer.
>>>
>>>
>>
>> _______________________________________________
>> Ovirt-devel mailing list
>> Ovirt-devel at redhat.com
>> https://www.redhat.com/mailman/listinfo/ovirt-devel
>>



From justin at redfish-group.com  Mon Oct 13 10:31:24 2008
From: justin at redfish-group.com (Justin Clacherty)
Date: Mon, 13 Oct 2008 20:31:24 +1000
Subject: [Ovirt-devel] unable to add hosts in web admin tool
In-Reply-To: <BAY124-DS103C4B5386E1C538A6502B1360@phx.gbl>
References: <BAY124-DS103C4B5386E1C538A6502B1360@phx.gbl>
Message-ID: <48F3237C.2070900@redfish-group.com>

Hi Qiang,

The docs are not current, they don't reflect how it works in the current 
release.  I imagine with the amount of development going on the docs 
will be out of sync for a while, that's why I'm turning to the list.

Justin.

xxqonline at hotmail.com wrote:
> Hello Justin:
>
> http://ovirt.org/docs/Using_oVirt/Steps-installing-the-Bundled-Appliance.html 
>
> You can see they provide us the same url in doc for real physical 
> machine.
>
> Thanks,
> Qiang
>
> --------------------------------------------------
> From: <xxqonline at hotmail.com>
> Sent: Monday, October 13, 2008 5:50 PM
> To: "Justin Clacherty" <justin at redfish-group.com>
> Cc: "Alan Pevec" <apevec at redhat.com>; <ovirt-devel at redhat.com>
> Subject: Re: [Ovirt-devel] unable to add hosts in web admin tool
>
>> The problem is I think the ovirt-appliance .img did not use the 
>> second nic.
>> But the developer.img used. I am not the red hat guy, I really think 
>> they need to improve doc.
>>
>> --------------------------------------------------
>> From: "Justin Clacherty" <justin at redfish-group.com>
>> Sent: Monday, October 13, 2008 5:48 PM
>> To: <xxqonline at hotmail.com>
>> Cc: "Alan Pevec" <apevec at redhat.com>; <ovirt-devel at redhat.com>
>> Subject: Re: [Ovirt-devel] unable to add hosts in web admin tool
>>
>>> xxqonline at hotmail.com wrote:
>>>> I think you may download a developer.img, it is in download page
>>>
>>> Wasn't the developer image just there to allow you to run nodes on 
>>> the management server instead of needing seperate hardware?
>>>
>>>>
>>>> BTW, I did not run ovirt-appliance successful.
>>>
>>> bummer.
>>>
>>>



From xxqonline at hotmail.com  Mon Oct 13 10:14:56 2008
From: xxqonline at hotmail.com (xxqonline at hotmail.com)
Date: Mon, 13 Oct 2008 18:14:56 +0800
Subject: [Ovirt-devel] unable to add hosts in web admin tool
Message-ID: <BAY124-DS103C4B5386E1C538A6502B1360@phx.gbl>

Hello Justin:

http://ovirt.org/docs/Using_oVirt/Steps-installing-the-Bundled-Appliance.html
You can see they provide us the same url in doc for real physical machine.

Thanks,
Qiang

--------------------------------------------------
From: <xxqonline at hotmail.com>
Sent: Monday, October 13, 2008 5:50 PM
To: "Justin Clacherty" <justin at redfish-group.com>
Cc: "Alan Pevec" <apevec at redhat.com>; <ovirt-devel at redhat.com>
Subject: Re: [Ovirt-devel] unable to add hosts in web admin tool

> The problem is I think the ovirt-appliance .img did not use the second 
> nic.
> But the developer.img used. I am not the red hat guy, I really think they 
> need to improve doc.
>
> --------------------------------------------------
> From: "Justin Clacherty" <justin at redfish-group.com>
> Sent: Monday, October 13, 2008 5:48 PM
> To: <xxqonline at hotmail.com>
> Cc: "Alan Pevec" <apevec at redhat.com>; <ovirt-devel at redhat.com>
> Subject: Re: [Ovirt-devel] unable to add hosts in web admin tool
>
>> xxqonline at hotmail.com wrote:
>>> I think you may download a developer.img, it is in download page
>>
>> Wasn't the developer image just there to allow you to run nodes on the 
>> management server instead of needing seperate hardware?
>>
>>>
>>> BTW, I did not run ovirt-appliance successful.
>>
>> bummer.
>>
>> 



From xxqonline at hotmail.com  Mon Oct 13 11:03:48 2008
From: xxqonline at hotmail.com (xxqonline at hotmail.com)
Date: Mon, 13 Oct 2008 19:03:48 +0800
Subject: [Ovirt-devel] unable to add hosts in web admin tool
In-Reply-To: <BAY124-DS103C4B5386E1C538A6502B1360@phx.gbl>
	<48F3237C.2070900@redfish-group.com>
References: <BAY124-DS103C4B5386E1C538A6502B1360@phx.gbl>
	<48F3237C.2070900@redfish-group.com>
Message-ID: <BAY124-DS6CBFA52304D666FCCD604B1360@phx.gbl>

Thanks Justin:
       I am also interested in how to run with the current release.
       I have tried a lot, in 0.91 release, I can see the nfs storage in 
GUI, but with the newest, I cannot see that. I think the current beta 
release is not ready.

Regards,
Qiang

--------------------------------------------------
From: "Justin Clacherty" <justin at redfish-group.com>
Sent: Monday, October 13, 2008 6:31 PM
To: <xxqonline at hotmail.com>
Cc: "Alan Pevec" <apevec at redhat.com>; <ovirt-devel at redhat.com>
Subject: Re: [Ovirt-devel] unable to add hosts in web admin tool

> Hi Qiang,
>
> The docs are not current, they don't reflect how it works in the current 
> release.  I imagine with the amount of development going on the docs will 
> be out of sync for a while, that's why I'm turning to the list.
>
> Justin.
>
> xxqonline at hotmail.com wrote:
>> Hello Justin:
>>
>> http://ovirt.org/docs/Using_oVirt/Steps-installing-the-Bundled-Appliance.html
>> You can see they provide us the same url in doc for real physical 
>> machine.
>>
>> Thanks,
>> Qiang
>>
>> --------------------------------------------------
>> From: <xxqonline at hotmail.com>
>> Sent: Monday, October 13, 2008 5:50 PM
>> To: "Justin Clacherty" <justin at redfish-group.com>
>> Cc: "Alan Pevec" <apevec at redhat.com>; <ovirt-devel at redhat.com>
>> Subject: Re: [Ovirt-devel] unable to add hosts in web admin tool
>>
>>> The problem is I think the ovirt-appliance .img did not use the second 
>>> nic.
>>> But the developer.img used. I am not the red hat guy, I really think 
>>> they need to improve doc.
>>>
>>> --------------------------------------------------
>>> From: "Justin Clacherty" <justin at redfish-group.com>
>>> Sent: Monday, October 13, 2008 5:48 PM
>>> To: <xxqonline at hotmail.com>
>>> Cc: "Alan Pevec" <apevec at redhat.com>; <ovirt-devel at redhat.com>
>>> Subject: Re: [Ovirt-devel] unable to add hosts in web admin tool
>>>
>>>> xxqonline at hotmail.com wrote:
>>>>> I think you may download a developer.img, it is in download page
>>>>
>>>> Wasn't the developer image just there to allow you to run nodes on the 
>>>> management server instead of needing seperate hardware?
>>>>
>>>>>
>>>>> BTW, I did not run ovirt-appliance successful.
>>>>
>>>> bummer.
>>>>
>>>>
>
> 



From apevec at redhat.com  Mon Oct 13 11:50:01 2008
From: apevec at redhat.com (Alan Pevec)
Date: Mon, 13 Oct 2008 13:50:01 +0200
Subject: [Ovirt-devel] unable to add hosts in web admin tool
In-Reply-To: <48F322F9.6000802@redfish-group.com>
References: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl><48F2F6C7.4020300@redfish-group.com>	<48F2FEEB.10705@redhat.com><48F3128A.7090800@redfish-group.com><BAY124-DS161312F67DDBCC590EC82B1360@phx.gbl><48F31680.1090807@redfish-group.com><BAY124-DS27D2BE7E3391FF9AFA4ABB1360@phx.gbl><48F31976.8090407@redfish-group.com>	<BAY124-DS5F85F366E0B6BCCB9A6EFB1360@phx.gbl>	<BAY124-DS4E897CE834376C4F5B74EB1360@phx.gbl>
	<48F322F9.6000802@redfish-group.com>
Message-ID: <48F335E9.3040805@redhat.com>

Justin Clacherty wrote:
> I'd prefer to run with the current release.  Being in beta I suspect 
> there is quite a difference between 0.91-1 and the current release.  
> Plus I don't want to be reporting bugs that have already been fixed.

Yes, please use latest beta builds or even try building from git, 0.91 is definitely out of date!

> ovirt-appliance .img did not use the second nic. 

Image is built always w/ two virtual NICs, difference between demo and bundled is just how you wire the management NIC: create-ovirt-appliance -e eth1 will bridge real eth1 on the host machine with the management NIC (eth1 in the appliance, 192.160.50.2)
If that doesn't work, please give us clear steps to reproduce so it can be fixed.



From justin at redfish-group.com  Mon Oct 13 12:00:15 2008
From: justin at redfish-group.com (Justin Clacherty)
Date: Mon, 13 Oct 2008 22:00:15 +1000
Subject: [Ovirt-devel] unable to add hosts in web admin tool
In-Reply-To: <48F335E9.3040805@redhat.com>
References: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl><48F2F6C7.4020300@redfish-group.com>	<48F2FEEB.10705@redhat.com><48F3128A.7090800@redfish-group.com><BAY124-DS161312F67DDBCC590EC82B1360@phx.gbl><48F31680.1090807@redfish-group.com><BAY124-DS27D2BE7E3391FF9AFA4ABB1360@phx.gbl><48F31976.8090407@redfish-group.com>	<BAY124-DS5F85F366E0B6BCCB9A6EFB1360@phx.gbl>	<BAY124-DS4E897CE834376C4F5B74EB1360@phx.gbl>
	<48F322F9.6000802@redfish-group.com> <48F335E9.3040805@redhat.com>
Message-ID: <48F3384F.9080501@redfish-group.com>

Hi Alan,

Alan Pevec wrote:
> Image is built always w/ two virtual NICs, difference between demo and 
> bundled is just how you wire the management NIC: 
> create-ovirt-appliance -e eth1 will bridge real eth1 on the host 
> machine with the management NIC (eth1 in the appliance, 192.160.50.2)
> If that doesn't work, please give us clear steps to reproduce so it 
> can be fixed.

I had no problems getting the management node up and running using the 
second nic as a bridge.  My problem seems to be with the node image.  
See my previous email for the output from ovirt.log on the node.

Justin.




From apevec at redhat.com  Mon Oct 13 14:24:33 2008
From: apevec at redhat.com (Alan Pevec)
Date: Mon, 13 Oct 2008 16:24:33 +0200
Subject: [Ovirt-devel] unable to add hosts in web admin tool
In-Reply-To: <48F3128A.7090800@redfish-group.com>
References: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl>
	<48F2F6C7.4020300@redfish-group.com> <48F2FEEB.10705@redhat.com>
	<48F3128A.7090800@redfish-group.com>
Message-ID: <48F35A21.6070101@redhat.com>

Justin Clacherty wrote:
> Alan Pevec wrote:
>> Please check the logs /var/log/ovirt* to find out what's going on
> 
> Can't see anything much in the logs on the management server.  I had a 
> look at ovirt.log on the managed host and it looks as though it is 
> having problems talking to the management node, not sure what to do 
> about it though.  Here's the relevant part of the log:
> 
> Resolving management.priv.ovirt.org.... 192.168.50.2
> Connecting to management.priv.ovirt.org.|192.168.50.2|:80... connected.
> HTTP request sent, awaiting response... 500 Internal Server Error
> 2008-10-13 16:52:33 ERROR 500: Internal Server Error.

Seems that ovirt-appliance firstboot failed and left appliance in bad state, check the mongrel log.
You can also reinstall ovirt-appliance image and try http://ovirt.org/page/TroubleShooting#Debugging_oVirt_Appliance_firstboot



From dpierce at redhat.com  Mon Oct 13 15:30:14 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Mon, 13 Oct 2008 11:30:14 -0400
Subject: [Ovirt-devel] [PATCH server] Added support for booting a VM from an
	ISO image.
Message-ID: <1223911814-515-1-git-send-email-dpierce@redhat.com>

The NFS export for Cobbler needs to be added as an NFS storage pool.
Otherwise, taskomatic will not be able to locate it.

Also added a few helper methods to Vm to contain the knowledge
of how Cobbler integration is contained.

When a user adds an ISO image to the Cobbler server on the appliance,
they will need to do so using the full NFS path for where the virtual
image will go to mount it; i.e., hostname:/path/to/filename.iso

If the filename ends in ".iso" then the virtual machine will mount the
file as a CDROM device and boot it. Otherwise, it mounts it as a hard
disk device.

To add an image to Cobbler, do the following:

1. Download an ISO image, such as the KDE LiveImage from Fedora.
2. Copy it to the NFS directory on the server:
  cp *.iso /ovirtnfs/kde-live-cd.iso
3. Add that image to your Cobbler instance:
  cobbler image add --name=KDE-LiveCD --file=management.priv.ovirt.org:/ovirtnfs/kde-live-cd.iso
4. Create a new VM in your server.
5. Select "KDE-LiveCD" from the list of operating systems.
6. Save the VM.
7. Start the VM.

It should run the selected ISO.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 src/app/controllers/vm_controller.rb |   51 +++++++++++--------
 src/app/models/vm.rb                 |   34 ++++++++++++-
 src/task-omatic/task_vm.rb           |   91 +++++++++++++++++++++++++++++-----
 src/test/unit/vm_test.rb             |   56 ++++++++++++++++++++-
 4 files changed, 194 insertions(+), 38 deletions(-)

diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb
index f5c0845..bc88760 100644
--- a/src/app/controllers/vm_controller.rb
+++ b/src/app/controllers/vm_controller.rb
@@ -48,6 +48,7 @@ class VmController < ApplicationController
     begin
       Vm.transaction do
         @vm.save!
+        _setup_vm_provision(params)
         @task = VmTask.new({ :user    => @user,
                              :vm_id   => @vm.id,
                              :action  => VmTask::ACTION_CREATE_VM,
@@ -70,7 +71,7 @@ class VmController < ApplicationController
         alert = "VM was successfully created."
       end
       render :json => { :object => "vm", :success => true, :alert => alert  }
-    rescue
+    rescue Exception => error
       # FIXME: need to distinguish vm vs. task save errors (but should mostly be vm)
       render :json => { :object => "vm", :success => false, 
                         :errors => @vm.errors.localize_error_messages.to_a }
@@ -223,13 +224,18 @@ class VmController < ApplicationController
   def _setup_provisioning_options
     @provisioning_options = [[Vm::PXE_OPTION_LABEL, Vm::PXE_OPTION_VALUE],
                              [Vm::HD_OPTION_LABEL, Vm::HD_OPTION_VALUE]]
-    # FIXME add cobbler images too
+
     begin
+      @provisioning_options += Cobbler::Image.find.collect do |image|
+        [image.name + Vm::COBBLER_IMAGE_SUFFIX,
+          "#{Vm::IMAGE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{image.name}"]
+      end
+
       @provisioning_options += Cobbler::Profile.find.collect do |profile|
         [profile.name + Vm::COBBLER_PROFILE_SUFFIX,
-         Vm::COBBLER_PREFIX + Vm::PROVISIONING_DELIMITER +
-         Vm::PROFILE_PREFIX + Vm::PROVISIONING_DELIMITER + profile.name]
-      end
+          "#{Vm::PROFILE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{profile.name}"]
+
+    end
     rescue
       #if cobbler doesn't respond/is misconfigured/etc just don't add profiles
     end
@@ -239,24 +245,27 @@ class VmController < ApplicationController
   def _setup_vm_provision(params)
     # spaces are invalid in the cobbler name
     name = params[:vm][:uuid]
-    provision = params[:vm][:provisioning_and_boot_settings].gsub(
-         Vm::COBBLER_PREFIX + Vm::PROVISIONING_DELIMITER +
-         Vm::PROFILE_PREFIX + Vm::PROVISIONING_DELIMITER, "")
     mac = params[:vm][:vnic_mac_addr]
-    unless provision == Vm::PXE_OPTION_VALUE or
-           provision == Vm::HD_OPTION_VALUE
-      found = false
-      Cobbler::System.find.each{ |system|
-        if system.name == name
-          system.profile = provision
-          system.save
-          found = true
+    provision = params[:vm][:provisioning_and_boot_settings]
+    # determine what type of provisioning was selected for the VM
+    provisioning_type = :pxe_or_hd_type
+    provisioning_type = :image_type  if provision.index "#{Vm::IMAGE_PREFIX}@#{Vm::COBBLER_PREFIX}"
+    provisioning_type = :system_type if provision.index "#{Vm::PROFILE_PREFIX}@#{Vm::COBBLER_PREFIX}"
+
+    unless provisioning_type == :pxe_or_hd_type
+      cobbler_name = provision.slice(/(.*):(.*)/, 2)
+      system = Cobbler::System.find_one(name)
+      unless system
+        nic = Cobbler::NetworkInterface.new({'mac_address' => mac})
+
+        case provisioning_type
+        when :image_type:
+            system = Cobbler::System.new("name" => name, "image"    => cobbler_name)
+        when :system_type:
+            system = Cobbler::System.new("name" => name, "profile" => cobbler_name)
         end
-      }
-      unless found
-        system = Cobbler::System.create("name" => name,
-                                        "profile" => provision)
-        system.interfaces=[Cobbler::NetworkInterface.new({'mac_address' => mac})]
+
+        system.interfaces = [nic]
         system.save
       end
     end
diff --git a/src/app/models/vm.rb b/src/app/models/vm.rb
index ace6fb1..d7beacf 100644
--- a/src/app/models/vm.rb
+++ b/src/app/models/vm.rb
@@ -49,7 +49,7 @@ class Vm < ActiveRecord::Base
   PROFILE_PREFIX         = "profile"
   IMAGE_PREFIX           = "image"
   COBBLER_PROFILE_SUFFIX = " (Cobbler Profile)"
-  COBBLER_IMAGE_SUFFIX   = " (Cobbler Profile)"
+  COBBLER_IMAGE_SUFFIX   = " (Cobbler Image)"
 
   PXE_OPTION_LABEL       = "PXE Boot"
   PXE_OPTION_VALUE       = "pxe"
@@ -139,7 +139,15 @@ class Vm < ActiveRecord::Base
   end
 
   def provisioning_and_boot_settings=(settings)
-    if settings==PXE_OPTION_VALUE
+    # if the settings have a prefix that matches cobber settings, then process
+    # those details
+    if settings =~ /#{IMAGE_PREFIX}@#{COBBLER_PREFIX}/
+      self[:boot_device] = BOOT_DEV_CDROM
+      self[:provisioning] = settings
+    elsif settings =~ /#{PROFILE_PREFIX}@#{COBBLER_PREFIX}/
+      self[:boot_device] = BOOT_DEV_NETWORK
+      self[:provisioning] = settings
+    elsif settings==PXE_OPTION_VALUE
       self[:boot_device]= BOOT_DEV_NETWORK
       self[:provisioning]= nil
     elsif settings==HD_OPTION_VALUE
@@ -242,6 +250,28 @@ class Vm < ActiveRecord::Base
     vm_resource_pool.search_users
   end
 
+  # Reports whether the VM is uses Cobbler for booting.
+  #
+  def uses_cobbler?
+    (self.provisioning != nil) && (self.provisioning.include? COBBLER_PREFIX)
+  end
+
+  # Returns the cobbler type.
+  #
+  def cobbler_type
+    if self.uses_cobbler?
+      self.provisioning[/^(.*)@/,1]
+    end
+  end
+
+  # Returns the cobbler provisioning name.
+  #
+  def cobbler_name
+    if self.uses_cobbler?
+      self.provisioning[/^.*@.*:(.*)/,1]
+    end
+  end
+
   protected
   def validate
     resources = vm_resource_pool.max_resources_for_vm(self)
diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb
index 3588224..40e0a1d 100644
--- a/src/task-omatic/task_vm.rb
+++ b/src/task-omatic/task_vm.rb
@@ -65,16 +65,26 @@ def create_vm_xml(name, uuid, memAllocated, memUsed, vcpus, bootDevice,
   doc.root.elements["devices"].add_element("emulator")
   doc.root.elements["devices"].elements["emulator"].text = "/usr/bin/qemu-kvm"
 
-  devs = [ 'hda', 'hdb', 'hdc', 'hdd' ]
-  i = 0
+  devs = ['hda', 'hdb', 'hdc', 'hdd']
+  which_device = 0
   diskDevices.each do |disk|
+    is_cdrom = (disk =~ /\.iso/) ? true : false
+
     diskdev = Element.new("disk")
-    diskdev.add_attribute("type", "block")
-    diskdev.add_attribute("device", "disk")
-    diskdev.add_element("source", {"dev" => disk})
-    diskdev.add_element("target", {"dev" => devs[i]})
+    diskdev.add_attribute("type", is_cdrom ? "file" : "block")
+    diskdev.add_attribute("device", is_cdrom ? "cdrom" : "disk")
+
+    if is_cdrom
+      diskdev.add_element("readonly")
+      diskdev.add_element("source", {"file" => disk})
+      diskdev.add_element("target", {"dev" => devs[which_device], "bus" => "ide"})
+    else
+      diskdev.add_element("source", {"dev" => disk})
+      diskdev.add_element("target", {"dev" => devs[which_device]})
+    end
+
     doc.root.elements["devices"] << diskdev
-    i += 1
+    which_device += 1
   end
 
   doc.root.elements["devices"].add_element("interface", {"type" => "bridge"})
@@ -154,15 +164,12 @@ def create_vm(task)
   # create cobbler system profile
   begin
     if vm.provisioning and !vm.provisioning.empty?
-      provisioning_arr = vm.provisioning.split(Vm::PROVISIONING_DELIMITER)
-      if provisioning_arr[0]==Vm::COBBLER_PREFIX
-        if provisioning_arr[1]==Vm::PROFILE_PREFIX
+      if vm.uses_cobbler?
+        if vm.cobbler_type == Vm::PROFILE_PREFIX:
           system = Cobbler::System.new('name' => vm.uuid,
                                        'profile' => provisioning_arr[2])
           system.interfaces=[Cobbler::NetworkInterface.new({'mac_address' => vm.vnic_mac_addr})]
           system.save
-        elsif provisioning_arr[1]==Vm::IMAGE_PREFIX
-          #FIXME handle cobbler images
         end
       end
     end
@@ -231,6 +238,21 @@ def shutdown_vm(task)
   setVmShutdown(vm)
 end
 
+# Find thes storage pool with the given ip address and export path.
+#
+def find_storage_pool(ip_addr, export_path)
+  pool = StoragePool.factory(StoragePool::NFS)
+  
+  pool.ip_addr = ip_addr
+  pool.export_path = export_path
+  
+  return pool
+  
+  #StoragePool.find(:first,
+  #  :conditions =>
+  #    ['ip_addr = ? and export_path = ?',ip_addr, export_path])
+end
+
 def start_vm(task)
   puts "start_vm"
 
@@ -266,6 +288,48 @@ def start_vm(task)
     # hosts to see if there is a host that will fit these constraints
     host = findHostSLA(vm)
 
+    # if we're booting from a CDROM the VM is an image,
+    # then we need to add the NFS mount as a storage volume for this
+    # boot
+    #
+    if (vm.boot_device == Vm::BOOT_DEV_CDROM) && vm.uses_cobbler? && (vm.cobbler_type == Vm::IMAGE_PREFIX)
+      details = Cobbler::Image.find_one(vm.cobbler_name)
+
+      raise "Image #{vm.cobbler_name} not found in Cobbler server" unless details
+
+      ignored, ip_addr, export_path, filename =
+        details.file.split(/(.*):(.*)\/(.*)/)
+
+      found = false
+
+      vm.storage_volumes.each do |volume|
+        if volume.filename == filename
+          if (volume.storage_pool.ip_addr == ip_addr) &&
+          (volume.storage_pool.export_path == export_path)
+            found = true
+          end
+        end
+      end
+
+      unless found
+        # Create a new transient NFS storage volume
+        # This volume is *not* persisted.
+        image_volume = StorageVolume.factory("NFS",
+          :filename => filename
+        )
+
+        image_volume.storage_pool
+        image_pool = find_storage_pool(ip_addr, export_path)
+
+        raise Exception.new("Unable to find Cobbler storage pool") unless image_pool
+
+        if image_pool
+          image_pool.storage_volumes << image_volume
+        end
+        vm.storage_volumes << image_volume
+      end
+    end
+
     conn = Libvirt::open("qemu+tcp://" + host.hostname + "/system")
 
     storagedevs = connect_storage_pools(conn, vm)
@@ -278,6 +342,9 @@ def start_vm(task)
     dom = conn.define_domain_xml(xml.to_s)
     dom.create
 
+    # Remove the transient storage volume so that it's not persisted
+    vm.storage_volumes.delete image_volume defined? image_volume
+
     setVmVncPort(vm, dom)
 
     conn.close
diff --git a/src/test/unit/vm_test.rb b/src/test/unit/vm_test.rb
index 4a5e353..22164e8 100644
--- a/src/test/unit/vm_test.rb
+++ b/src/test/unit/vm_test.rb
@@ -22,8 +22,58 @@ require File.dirname(__FILE__) + '/../test_helper'
 class VmTest < Test::Unit::TestCase
   fixtures :vms
 
-  # Replace this with your real tests.
-  def test_truth
-    assert true
+  def setup
+    @vm_name = "Test"
+    @no_cobbler_provisioning = "#{@vm_name}"
+    @cobbler_image_provisioning =
+      "#{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}"
+  end
+
+  # Ensures that, if the VM does not contain the Cobbler prefix, that it
+  # does not claim to be a Cobbler VM.
+  #
+  def test_uses_cobbler_without_cobbler_prefix
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings=@no_cobbler_provisioning
+
+    flunk "VM is not a Cobbler provisioned one." if vm.uses_cobbler?
+    assert_equal @vm_name, vm.provisioning, "Wrong name reported."
+  end
+
+  # Ensures that the VM reports that it uses Cobbler if the provisioning
+  # is for a Cobbler profile.
+  #
+  def test_uses_cobbler_with_cobbler_profile
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings = @cobbler_profile_provisioning
+
+    flunk "VM did not report that it's Cobbler provisioned." unless vm.uses_cobbler?
+    assert_equal Vm::PROFILE_PREFIX,
+      vm.cobbler_type,
+      "Wrong cobbler type reported."
+    assert_equal @vm_name,
+      vm.cobbler_name,
+      "Wrong name reported."
+  end
+
+  # Ensures that the VM reports that it uses Cobbler if the provisioning
+  # is for a Cobbler image.
+  #
+  def test_uses_cobbler_with_cobbler_image
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings = @cobbler_image_provisioning
+
+    flunk "VM did not report that it's Cobbler provisioned." unless vm.uses_cobbler?
+    assert_equal Vm::IMAGE_PREFIX,
+      vm.cobbler_type,
+      "Wrong cobbler type reported."
+    assert_equal @vm_name,
+      vm.cobbler_name,
+      "Wrong name reported."
   end
 end
-- 
1.5.5.1



From dpierce at redhat.com  Mon Oct 13 16:45:02 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Mon, 13 Oct 2008 12:45:02 -0400
Subject: [Ovirt-devel] [PATCH server] Added support for booting a VM from an
	ISO image.
Message-ID: <1223916302-5623-1-git-send-email-dpierce@redhat.com>

Also added a few helper methods to Vm to contain the knowledge
of how Cobbler integration is contained.

When a user adds an ISO image to the Cobbler server on the appliance,
they will need to do so using the full NFS path for where the virtual
image will go to mount it; i.e., hostname:/path/to/filename.iso

If the filename ends in ".iso" then the virtual machine will mount the
file as a CDROM device and boot it. Otherwise, it mounts it as a hard
disk device.

To add an image to Cobbler, do the following:

1. Download an ISO image, such as the KDE LiveImage from Fedora.
2. Copy it to the NFS directory on the server:
  cp *.iso /ovirtnfs/kde-live-cd.iso
3. Add that image to your Cobbler instance:
  cobbler image add --name=KDE-LiveCD --file=management.priv.ovirt.org:/ovirtnfs/kde-live-cd.iso
4. Create a new VM in your server.
5. Select "KDE-LiveCD" from the list of operating systems.
6. Save the VM.
7. Start the VM.

It should run the selected ISO.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 src/app/controllers/vm_controller.rb |   51 +++++++++++++---------
 src/app/models/vm.rb                 |   34 ++++++++++++++-
 src/task-omatic/task_vm.rb           |   76 ++++++++++++++++++++++++++++------
 src/task-omatic/utils.rb             |    4 +-
 src/test/unit/vm_test.rb             |   56 +++++++++++++++++++++++-
 5 files changed, 180 insertions(+), 41 deletions(-)

diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb
index f5c0845..bc88760 100644
--- a/src/app/controllers/vm_controller.rb
+++ b/src/app/controllers/vm_controller.rb
@@ -48,6 +48,7 @@ class VmController < ApplicationController
     begin
       Vm.transaction do
         @vm.save!
+        _setup_vm_provision(params)
         @task = VmTask.new({ :user    => @user,
                              :vm_id   => @vm.id,
                              :action  => VmTask::ACTION_CREATE_VM,
@@ -70,7 +71,7 @@ class VmController < ApplicationController
         alert = "VM was successfully created."
       end
       render :json => { :object => "vm", :success => true, :alert => alert  }
-    rescue
+    rescue Exception => error
       # FIXME: need to distinguish vm vs. task save errors (but should mostly be vm)
       render :json => { :object => "vm", :success => false, 
                         :errors => @vm.errors.localize_error_messages.to_a }
@@ -223,13 +224,18 @@ class VmController < ApplicationController
   def _setup_provisioning_options
     @provisioning_options = [[Vm::PXE_OPTION_LABEL, Vm::PXE_OPTION_VALUE],
                              [Vm::HD_OPTION_LABEL, Vm::HD_OPTION_VALUE]]
-    # FIXME add cobbler images too
+
     begin
+      @provisioning_options += Cobbler::Image.find.collect do |image|
+        [image.name + Vm::COBBLER_IMAGE_SUFFIX,
+          "#{Vm::IMAGE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{image.name}"]
+      end
+
       @provisioning_options += Cobbler::Profile.find.collect do |profile|
         [profile.name + Vm::COBBLER_PROFILE_SUFFIX,
-         Vm::COBBLER_PREFIX + Vm::PROVISIONING_DELIMITER +
-         Vm::PROFILE_PREFIX + Vm::PROVISIONING_DELIMITER + profile.name]
-      end
+          "#{Vm::PROFILE_PREFIX}@#{Vm::COBBLER_PREFIX}#{Vm::PROVISIONING_DELIMITER}#{profile.name}"]
+
+    end
     rescue
       #if cobbler doesn't respond/is misconfigured/etc just don't add profiles
     end
@@ -239,24 +245,27 @@ class VmController < ApplicationController
   def _setup_vm_provision(params)
     # spaces are invalid in the cobbler name
     name = params[:vm][:uuid]
-    provision = params[:vm][:provisioning_and_boot_settings].gsub(
-         Vm::COBBLER_PREFIX + Vm::PROVISIONING_DELIMITER +
-         Vm::PROFILE_PREFIX + Vm::PROVISIONING_DELIMITER, "")
     mac = params[:vm][:vnic_mac_addr]
-    unless provision == Vm::PXE_OPTION_VALUE or
-           provision == Vm::HD_OPTION_VALUE
-      found = false
-      Cobbler::System.find.each{ |system|
-        if system.name == name
-          system.profile = provision
-          system.save
-          found = true
+    provision = params[:vm][:provisioning_and_boot_settings]
+    # determine what type of provisioning was selected for the VM
+    provisioning_type = :pxe_or_hd_type
+    provisioning_type = :image_type  if provision.index "#{Vm::IMAGE_PREFIX}@#{Vm::COBBLER_PREFIX}"
+    provisioning_type = :system_type if provision.index "#{Vm::PROFILE_PREFIX}@#{Vm::COBBLER_PREFIX}"
+
+    unless provisioning_type == :pxe_or_hd_type
+      cobbler_name = provision.slice(/(.*):(.*)/, 2)
+      system = Cobbler::System.find_one(name)
+      unless system
+        nic = Cobbler::NetworkInterface.new({'mac_address' => mac})
+
+        case provisioning_type
+        when :image_type:
+            system = Cobbler::System.new("name" => name, "image"    => cobbler_name)
+        when :system_type:
+            system = Cobbler::System.new("name" => name, "profile" => cobbler_name)
         end
-      }
-      unless found
-        system = Cobbler::System.create("name" => name,
-                                        "profile" => provision)
-        system.interfaces=[Cobbler::NetworkInterface.new({'mac_address' => mac})]
+
+        system.interfaces = [nic]
         system.save
       end
     end
diff --git a/src/app/models/vm.rb b/src/app/models/vm.rb
index ace6fb1..d7beacf 100644
--- a/src/app/models/vm.rb
+++ b/src/app/models/vm.rb
@@ -49,7 +49,7 @@ class Vm < ActiveRecord::Base
   PROFILE_PREFIX         = "profile"
   IMAGE_PREFIX           = "image"
   COBBLER_PROFILE_SUFFIX = " (Cobbler Profile)"
-  COBBLER_IMAGE_SUFFIX   = " (Cobbler Profile)"
+  COBBLER_IMAGE_SUFFIX   = " (Cobbler Image)"
 
   PXE_OPTION_LABEL       = "PXE Boot"
   PXE_OPTION_VALUE       = "pxe"
@@ -139,7 +139,15 @@ class Vm < ActiveRecord::Base
   end
 
   def provisioning_and_boot_settings=(settings)
-    if settings==PXE_OPTION_VALUE
+    # if the settings have a prefix that matches cobber settings, then process
+    # those details
+    if settings =~ /#{IMAGE_PREFIX}@#{COBBLER_PREFIX}/
+      self[:boot_device] = BOOT_DEV_CDROM
+      self[:provisioning] = settings
+    elsif settings =~ /#{PROFILE_PREFIX}@#{COBBLER_PREFIX}/
+      self[:boot_device] = BOOT_DEV_NETWORK
+      self[:provisioning] = settings
+    elsif settings==PXE_OPTION_VALUE
       self[:boot_device]= BOOT_DEV_NETWORK
       self[:provisioning]= nil
     elsif settings==HD_OPTION_VALUE
@@ -242,6 +250,28 @@ class Vm < ActiveRecord::Base
     vm_resource_pool.search_users
   end
 
+  # Reports whether the VM is uses Cobbler for booting.
+  #
+  def uses_cobbler?
+    (self.provisioning != nil) && (self.provisioning.include? COBBLER_PREFIX)
+  end
+
+  # Returns the cobbler type.
+  #
+  def cobbler_type
+    if self.uses_cobbler?
+      self.provisioning[/^(.*)@/,1]
+    end
+  end
+
+  # Returns the cobbler provisioning name.
+  #
+  def cobbler_name
+    if self.uses_cobbler?
+      self.provisioning[/^.*@.*:(.*)/,1]
+    end
+  end
+
   protected
   def validate
     resources = vm_resource_pool.max_resources_for_vm(self)
diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb
index 3588224..8398e83 100644
--- a/src/task-omatic/task_vm.rb
+++ b/src/task-omatic/task_vm.rb
@@ -65,16 +65,26 @@ def create_vm_xml(name, uuid, memAllocated, memUsed, vcpus, bootDevice,
   doc.root.elements["devices"].add_element("emulator")
   doc.root.elements["devices"].elements["emulator"].text = "/usr/bin/qemu-kvm"
 
-  devs = [ 'hda', 'hdb', 'hdc', 'hdd' ]
-  i = 0
+  devs = ['hda', 'hdb', 'hdc', 'hdd']
+  which_device = 0
   diskDevices.each do |disk|
+    is_cdrom = (disk =~ /\.iso/) ? true : false
+
     diskdev = Element.new("disk")
-    diskdev.add_attribute("type", "block")
-    diskdev.add_attribute("device", "disk")
-    diskdev.add_element("source", {"dev" => disk})
-    diskdev.add_element("target", {"dev" => devs[i]})
+    diskdev.add_attribute("type", is_cdrom ? "file" : "block")
+    diskdev.add_attribute("device", is_cdrom ? "cdrom" : "disk")
+
+    if is_cdrom
+      diskdev.add_element("readonly")
+      diskdev.add_element("source", {"file" => disk})
+      diskdev.add_element("target", {"dev" => devs[which_device], "bus" => "ide"})
+    else
+      diskdev.add_element("source", {"dev" => disk})
+      diskdev.add_element("target", {"dev" => devs[which_device]})
+    end
+
     doc.root.elements["devices"] << diskdev
-    i += 1
+    which_device += 1
   end
 
   doc.root.elements["devices"].add_element("interface", {"type" => "bridge"})
@@ -154,15 +164,12 @@ def create_vm(task)
   # create cobbler system profile
   begin
     if vm.provisioning and !vm.provisioning.empty?
-      provisioning_arr = vm.provisioning.split(Vm::PROVISIONING_DELIMITER)
-      if provisioning_arr[0]==Vm::COBBLER_PREFIX
-        if provisioning_arr[1]==Vm::PROFILE_PREFIX
+      if vm.uses_cobbler?
+        if vm.cobbler_type == Vm::PROFILE_PREFIX:
           system = Cobbler::System.new('name' => vm.uuid,
                                        'profile' => provisioning_arr[2])
           system.interfaces=[Cobbler::NetworkInterface.new({'mac_address' => vm.vnic_mac_addr})]
           system.save
-        elsif provisioning_arr[1]==Vm::IMAGE_PREFIX
-          #FIXME handle cobbler images
         end
       end
     end
@@ -266,9 +273,52 @@ def start_vm(task)
     # hosts to see if there is a host that will fit these constraints
     host = findHostSLA(vm)
 
+    # if we're booting from a CDROM the VM is an image,
+    # then we need to add the NFS mount as a storage volume for this
+    # boot
+    #
+    if (vm.boot_device == Vm::BOOT_DEV_CDROM) && vm.uses_cobbler? && (vm.cobbler_type == Vm::IMAGE_PREFIX)
+      details = Cobbler::Image.find_one(vm.cobbler_name)
+
+      raise "Image #{vm.cobbler_name} not found in Cobbler server" unless details
+
+      ignored, ip_addr, export_path, filename =
+        details.file.split(/(.*):(.*)\/(.*)/)
+
+      found = false
+
+      vm.storage_volumes.each do |volume|
+        if volume.filename == filename
+          if (volume.storage_pool.ip_addr == ip_addr) &&
+          (volume.storage_pool.export_path == export_path)
+            found = true
+          end
+        end
+      end
+
+      unless found
+        # Create a new transient NFS storage volume
+        # This volume is *not* persisted.
+        image_volume = StorageVolume.factory("NFS",
+          :filename => filename
+        )
+
+        image_volume.storage_pool
+        image_pool = StoragePool.factory(StoragePool::NFS)
+
+        image_pool.ip_addr = ip_addr
+        image_pool.export_path = export_path
+        image_pool.storage_volumes << image_volume
+        image_volume.storage_pool = image_pool
+      end
+    end
+
     conn = Libvirt::open("qemu+tcp://" + host.hostname + "/system")
 
-    storagedevs = connect_storage_pools(conn, vm)
+    volumes = []
+    volumes += vm.storage_volumes
+    volumes << image_volume if image_volume
+    storagedevs = connect_storage_pools(conn, volumes)
 
     # FIXME: get rid of the hardcoded bridge
     xml = create_vm_xml(vm.description, vm.uuid, vm.memory_allocated,
diff --git a/src/task-omatic/utils.rb b/src/task-omatic/utils.rb
index 9e60122..47a4543 100644
--- a/src/task-omatic/utils.rb
+++ b/src/task-omatic/utils.rb
@@ -67,7 +67,7 @@ def teardown_storage_pools(conn)
   end
 end
 
-def connect_storage_pools(conn, vm)
+def connect_storage_pools(conn, storage_volumes)
   # here, build up a list of already defined pools.  We'll use it
   # later to see if we need to define new pools for the storage or just
   # keep using existing ones
@@ -78,7 +78,7 @@ def connect_storage_pools(conn, vm)
   end
 
   storagedevs = []
-  vm.storage_volumes.each do |volume|
+  storage_volumes.each do |volume|
     # here, we need to iterate through each volume and possibly attach it
     # to the host we are going to be using
     storage_pool = volume.storage_pool
diff --git a/src/test/unit/vm_test.rb b/src/test/unit/vm_test.rb
index 4a5e353..22164e8 100644
--- a/src/test/unit/vm_test.rb
+++ b/src/test/unit/vm_test.rb
@@ -22,8 +22,58 @@ require File.dirname(__FILE__) + '/../test_helper'
 class VmTest < Test::Unit::TestCase
   fixtures :vms
 
-  # Replace this with your real tests.
-  def test_truth
-    assert true
+  def setup
+    @vm_name = "Test"
+    @no_cobbler_provisioning = "#{@vm_name}"
+    @cobbler_image_provisioning =
+      "#{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}"
+  end
+
+  # Ensures that, if the VM does not contain the Cobbler prefix, that it
+  # does not claim to be a Cobbler VM.
+  #
+  def test_uses_cobbler_without_cobbler_prefix
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings=@no_cobbler_provisioning
+
+    flunk "VM is not a Cobbler provisioned one." if vm.uses_cobbler?
+    assert_equal @vm_name, vm.provisioning, "Wrong name reported."
+  end
+
+  # Ensures that the VM reports that it uses Cobbler if the provisioning
+  # is for a Cobbler profile.
+  #
+  def test_uses_cobbler_with_cobbler_profile
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings = @cobbler_profile_provisioning
+
+    flunk "VM did not report that it's Cobbler provisioned." unless vm.uses_cobbler?
+    assert_equal Vm::PROFILE_PREFIX,
+      vm.cobbler_type,
+      "Wrong cobbler type reported."
+    assert_equal @vm_name,
+      vm.cobbler_name,
+      "Wrong name reported."
+  end
+
+  # Ensures that the VM reports that it uses Cobbler if the provisioning
+  # is for a Cobbler image.
+  #
+  def test_uses_cobbler_with_cobbler_image
+    vm = Vm.new
+
+    vm.provisioning_and_boot_settings = @cobbler_image_provisioning
+
+    flunk "VM did not report that it's Cobbler provisioned." unless vm.uses_cobbler?
+    assert_equal Vm::IMAGE_PREFIX,
+      vm.cobbler_type,
+      "Wrong cobbler type reported."
+    assert_equal @vm_name,
+      vm.cobbler_name,
+      "Wrong name reported."
   end
 end
-- 
1.5.5.1



From sseago at redhat.com  Mon Oct 13 20:01:26 2008
From: sseago at redhat.com (Scott Seago)
Date: Mon, 13 Oct 2008 16:01:26 -0400
Subject: [Ovirt-devel] [PATCH server] Added support for booting a VM from
	an	ISO image.
In-Reply-To: <1223916302-5623-1-git-send-email-dpierce@redhat.com>
References: <1223916302-5623-1-git-send-email-dpierce@redhat.com>
Message-ID: <48F3A916.8000902@redhat.com>

Darryl L. Pierce wrote:
> Also added a few helper methods to Vm to contain the knowledge
> of how Cobbler integration is contained.
>
> When a user adds an ISO image to the Cobbler server on the appliance,
> they will need to do so using the full NFS path for where the virtual
> image will go to mount it; i.e., hostname:/path/to/filename.iso
>
> If the filename ends in ".iso" then the virtual machine will mount the
> file as a CDROM device and boot it. Otherwise, it mounts it as a hard
> disk device.
>
> To add an image to Cobbler, do the following:
>
> 1. Download an ISO image, such as the KDE LiveImage from Fedora.
> 2. Copy it to the NFS directory on the server:
>   cp *.iso /ovirtnfs/kde-live-cd.iso
> 3. Add that image to your Cobbler instance:
>   cobbler image add --name=KDE-LiveCD --file=management.priv.ovirt.org:/ovirtnfs/kde-live-cd.iso
> 4. Create a new VM in your server.
> 5. Select "KDE-LiveCD" from the list of operating systems.
> 6. Save the VM.
> 7. Start the VM.
>
> It should run the selected ISO.
>   
This works for me. only change from this is I created a new nfs mount 
/cobblernfs so the isos won't conflict with the /ovirtnfs storage pool.

ACK

Scott



From dpierce at redhat.com  Mon Oct 13 21:04:21 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Mon, 13 Oct 2008 17:04:21 -0400
Subject: [Ovirt-devel] [PATCH node] Updated the configuration processing to
	remove the need for scripts.
Message-ID: <1223931861-1575-1-git-send-email-dpierce@redhat.com>

The system now takes an encoded configuration descriptor from the server. It
then parses from that a set of aliases for bondings if such exist. It then
also extracts configuration details for the various network interfaces on the
node. Afterward, it reloads module dependencies and then restarts the
networking service.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 Makefile.am                  |    1 +
 ovirt-node.spec.in           |    2 +
 scripts/ovirt-early          |   12 ++-----
 scripts/ovirt-process-config |   69 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 76 insertions(+), 8 deletions(-)
 create mode 100755 scripts/ovirt-process-config

diff --git a/Makefile.am b/Makefile.am
index 1d63310..c55db13 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,6 +30,7 @@ EXTRA_DIST =			\
   scripts/ovirt-early		\
   scripts/ovirt-functions	\
   scripts/ovirt-post		\
+  scripts/ovirt-process-config  \
   logrotate/ovirt-logrotate	\
   logrotate/ovirt-logrotate.conf
 
diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index daa3d7f..ea8099d 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -74,6 +74,7 @@ cd -
 %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/logrotate.d
 
 %{__install} -p -m0755 scripts/ovirt-awake %{buildroot}%{_sbindir}
+%{__install} -p -m0755 scripts/ovirt-process-config %{buildroot}%{_sbindir}
 %{__install} -p -m0755 ovirt-identify-node/ovirt-identify-node %{buildroot}%{_sbindir}
 %{__install} -p -m0755 ovirt-listen-awake/ovirt-listen-awake %{buildroot}%{_sbindir}
 %{__install} -Dp -m0755 ovirt-listen-awake/ovirt-listen-awake.init %{buildroot}%{_initrddir}/ovirt-listen-awake
@@ -145,6 +146,7 @@ fi
 %files
 %defattr(-,root,root,0755)
 %{_sbindir}/ovirt-awake
+%{_sbindir}/ovirt-process-config
 %{_sbindir}/ovirt-identify-node
 %{_sbindir}/ovirt-listen-awake
 %{_sbindir}/ovirt-install-node
diff --git a/scripts/ovirt-early b/scripts/ovirt-early
index 4723426..e5f1e9b 100755
--- a/scripts/ovirt-early
+++ b/scripts/ovirt-early
@@ -12,6 +12,8 @@
 
 # size of the oVirt partition in megabytes
 OVIRT_SIZE=64
+BONDING_MODCONF_FILE=/etc/modprobe.d/bonding
+AUGTOOL_CONFIG=/var/tmp/augtool-config
 
 get_mac_addresses() {
     macs=$(ifconfig | awk '/HWaddr/ { print $5"="$1 }' \
@@ -43,16 +45,10 @@ configure_from_network() {
                       "http://$SRV_HOST:$SRV_PORT/ovirt/managed_node/config?host=$(hostname)&macs=$macs"
                     if [ $? -eq 0 ]; then
                         echo "Remote configuration bundle retrieved to $cfgdb"
-                        bash $cfgdb
-                        if [ -f /var/tmp/pre-config-script ]; then
-                            echo "Loading kernel modules"
-                            bash /var/tmp/pre-config-script \
-                                && echo "Kernel modules loaded" \
-                                || echo "Failed loading kernel modules"
-                        fi
+                        ovirt-process-config $cfgdb $BONDING_MODCONF_FILE $AUGTOOL_CONFIG
                         if [ -f /var/tmp/node-augtool ]; then
                             echo "Loading remote config"
-                            augtool < /var/tmp/node-augtool \
+                            augtool < $AUGTOOL_CONFIG \
                                 && echo "Remote config applied" \
                                 || echo "Failed applying remote config"
                         fi
diff --git a/scripts/ovirt-process-config b/scripts/ovirt-process-config
new file mode 100755
index 0000000..e9d8101
--- /dev/null
+++ b/scripts/ovirt-process-config
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+ME=$(basename "$0")
+warn() { printf "$ME: $@\n" >&2; }
+try_h() { printf "Try \`$ME -h' for more information.\n" >&2; exit 1;}
+try_help() { printf "Usage: \`$ME [config] [module output] [config output]\n" >&2; exit 1;}
+
+case $# in
+  0|1|2) warn "too few arguments"; try_help;;
+  3) ;;
+  *) warn "too many arguments"; try_help;;
+esac
+
+CONFIG=$1
+OVIRT_KERNEL_MODULE_FILE=$2
+OVIRT_CONFIG_OUTPUT_FILE=$3
+
+modconf=$(awk '/bonding=/ {
+        match($0, "bonding=(.*)", data)
+        split(data[1], mod, "|")
+
+        if (match("[^[:alnum:]=_ at -]", mod[1]) >= 0) {
+            printf "invalid bonding alias: \"%s\"\n", mod[1];
+            exit 1;
+        }
+
+        alias=mod[1]
+
+        printf("install %s bonding", alias)
+    }' $CONFIG)
+
+echo "$modconf" > $OVIRT_KERNEL_MODULE_FILE
+
+# now build the list of module aliases to load and load them
+modules=$(awk '/bonding=/ {
+        match($0, "bonding=(.*)", data)
+        split(data[1], mod, "|")
+
+        printf("%s ", mod[1])
+    }' $CONFIG)
+
+/sbin/depmod -a
+
+networking=$(awk '/ifcfg=/ {
+    match($0, "ifcfg=(.*)", data)
+    split(data[1], ifcfg, "|")
+
+    mac = ifcfg[1]
+    iface = ifcfg[2]
+
+    printf("rm /files/etc/sysconfig/network-scripts/ifcfg-%s\n", iface)
+    printf("set /files/etc/sysconfig/network-scripts/ifcfg-%s/DEVICE %s\n", iface, iface)
+
+    for (line in ifcfg) {
+        if(line > 2) {
+            match(ifcfg[line], "(^[^=]+)=(.*)", values)
+            field=values[1]
+            value=values[2]
+
+            printf("set /files/etc/sysconfig/network-scripts/ifcfg-%s/%s %s\n", iface, field, value)
+        }
+    }
+
+
+    printf("save\n")
+
+}' $CONFIG)
+
+echo "$networking" > $OVIRT_CONFIG_OUTPUT_FILE
-- 
1.5.5.1



From pmyers at redhat.com  Tue Oct 14 02:06:05 2008
From: pmyers at redhat.com (Perry Myers)
Date: Mon, 13 Oct 2008 22:06:05 -0400
Subject: [Ovirt-devel] [PATCH node] Fix ovirt install/uninstall node scripts
	so reboot is not necessary
Message-ID: <1223949965-7931-1-git-send-email-pmyers@redhat.com>

Signed-off-by: Perry Myers <pmyers at redhat.com>
---
 ovirt-listen-awake/ovirt-install-node   |   55 ++++++++++++++++++++++++++-----
 ovirt-listen-awake/ovirt-uninstall-node |   10 +++++-
 2 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/ovirt-listen-awake/ovirt-install-node b/ovirt-listen-awake/ovirt-install-node
index 1d998f4..4cffd6d 100644
--- a/ovirt-listen-awake/ovirt-install-node
+++ b/ovirt-listen-awake/ovirt-install-node
@@ -1,16 +1,27 @@
 #!/bin/bash
 
+PHYS_HOST=physical.priv.ovirt.org
+MGMT_HOST=management.priv.ovirt.org
+
 . /etc/init.d/ovirt-functions
 
 PATH=$PATH:/sbin:/usr/sbin
+ME=$(basename "$0")
+warn() { printf "$ME: $@\n" >&2; }
+die() { warn "$@"; exit 1; }
 
 usage() {
-    echo "Usage: ovirt-install-node <stateless|stateful>"
-    exit 1
+    echo "Usage: $ME <stateless|stateful>"
 }
 
+# first, check to see we are root
+if [ $( id -u ) -ne 0 ]; then
+    die "Must run as root"
+fi
+
 if [ $# -ne 1 ]; then
     usage
+    exit 1
 fi
 
 backup_file() {
@@ -73,14 +84,27 @@ elif [ "$1" = "stateful" ]; then
         exit 2
     fi
 
+    # Always try to uninstall first, that way the original pristine files are
+    # in place before re-installing, this prevents OVIRT_BACKUP_DIR from
+    # being overwritten with an older version of the node config files
+    ovirt-uninstall-node > /dev/null 2>&1
+
+    # Remove old keytab if it exists in case we have a new appliance to work with
+    rm -f /etc/libvirt/krb5.tab
+
     mkdir -p $OVIRT_BACKUP_DIR
 
     backup_file /etc/sysconfig/network
-    sed -i -e 's/^HOSTNAME=.*/HOSTNAME=physical.priv.ovirt.org/' /etc/sysconfig/network
+    if grep "^HOSTNAME=" /etc/sysconfig/network > /dev/null 2>&1 ; then
+        sed -i -e "s/^HOSTNAME=.*/HOSTNAME=$PHYS_HOST/" /etc/sysconfig/network
+    else
+        echo "HOSTNAME=$PHYS_HOST" >> /etc/sysconfig/network
+    fi
+    hostname $PHYS_HOST
 
     backup_file /etc/hosts
-    add_if_not_exist "192.168.50.1 physical.priv.ovirt.org" /etc/hosts
-    add_if_not_exist "192.168.50.2 management.priv.ovirt.org" /etc/hosts
+    add_if_not_exist "192.168.50.1 $PHYS_HOST" /etc/hosts
+    add_if_not_exist "192.168.50.2 $MGMT_HOST" /etc/hosts
 
     chkconfig ovirt-listen-awake on
     chkconfig collectd on
@@ -93,10 +117,23 @@ elif [ "$1" = "stateful" ]; then
     ovirt_setup_libvirtd
 
     backup_file /etc/sysconfig/iptables
-    lokkit -n -t ovirtbr0
-
-    echo "Setup complete.  To make the changes take effect, shut down any"
-    echo "running guests and reboot the host"
+    lokkit -p 7777:tcp -p 16509:tcp
+
+    service collectd restart
+    service ovirt-listen-awake restart
+
+    # Check if any domains are active before restarting libvirtd, since it will
+    # kill them.  Header information from virsh list is 2 lines, and 1 line for
+    # footer.  So > 3 lines means domains are running
+    running_domains=$(( $(virsh -c qemu:///system list 2> /dev/null | wc -l) - 3 ))
+    if [ $running_domains -gt 0 ]; then
+        echo "Cannot restart libvirtd because domains are active."
+        echo "Please shutdown all domains and restart libvirtd with:"
+        echo "service libvirtd restart"
+    else
+        service libvirtd restart
+    fi
 else
     usage
+    exit 1
 fi
diff --git a/ovirt-listen-awake/ovirt-uninstall-node b/ovirt-listen-awake/ovirt-uninstall-node
index 1f820e4..a40b0ed 100644
--- a/ovirt-listen-awake/ovirt-uninstall-node
+++ b/ovirt-listen-awake/ovirt-uninstall-node
@@ -3,9 +3,17 @@
 . /etc/init.d/ovirt-functions
 
 PATH=$PATH:/sbin:/usr/sbin
+ME=$(basename "$0")
+warn() { printf "$ME: $@\n" >&2; }
+die() { warn "$@"; exit 1; }
+
+# first, check to see we are root
+if [ $( id -u ) -ne 0 ]; then
+    die "Must run as root"
+fi
 
 if [ $# -ne 0 ]; then
-    echo "Usage: ovirt-uninstall-node"
+    echo "Usage: $ME"
     exit 1
 fi
 
-- 
1.5.5.1



From pmyers at redhat.com  Tue Oct 14 02:11:19 2008
From: pmyers at redhat.com (Perry Myers)
Date: Mon, 13 Oct 2008 22:11:19 -0400
Subject: [Ovirt-devel] Re: [PATCH node] Fix ovirt install/uninstall node
 scripts so reboot is not necessary
In-Reply-To: <1223949965-7931-1-git-send-email-pmyers@redhat.com>
References: <1223949965-7931-1-git-send-email-pmyers@redhat.com>
Message-ID: <48F3FFC7.9090302@redhat.com>

One problem still exists with the 'running vms on the appliance host'...

The current procedure is:

1. Install ovirt-appliance, ovirt-node and ovirt-node-selinux rpms
2. ovirt-install-node stateful
3. create-ovirt-appliance
4. virsh start ovirt-appliance

When the appliance comes up, it will contact the host and will assign it a 
keytab.  However, since libvirt doesn't pick up the keytab until it is 
restarted (and you can't restart libvirtd while the appliance is running) 
you need to:

5. On appliance: shutdown -h now
6. virsh destroy ovirt-appliance
7. service libvirtd restart
8. virsh start ovirt-appliance

Now when the appliance is up again, it can contact the physical host and 
create vms on it since libvirt has the correct keytab loaded.

Once we move to using libvirt-qpid and ovirt-qpid this should go away 
since we won't need libvirt to have a keytab, the qpid interfaces will 
will handle the security for us.

Perry



From justin at redfish-group.com  Tue Oct 14 04:57:08 2008
From: justin at redfish-group.com (Justin Clacherty)
Date: Tue, 14 Oct 2008 14:57:08 +1000
Subject: [Ovirt-devel] unable to add hosts in web admin tool
In-Reply-To: <48F35A21.6070101@redhat.com>
References: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl>
	<48F2F6C7.4020300@redfish-group.com> <48F2FEEB.10705@redhat.com>
	<48F3128A.7090800@redfish-group.com> <48F35A21.6070101@redhat.com>
Message-ID: <48F426A4.3070706@redfish-group.com>

Alan Pevec wrote:
> Seems that ovirt-appliance firstboot failed and left appliance in bad 
> state, check the mongrel log.
> You can also reinstall ovirt-appliance image and try 
> http://ovirt.org/page/TroubleShooting#Debugging_oVirt_Appliance_firstboot

Thanks Alan.  I can't get to it at the moment, but from memory the 
mongrel log on the management server was empty.  I'll reinstall the 
appliance and debug firstboot.

Justin.




From jim at meyering.net  Tue Oct 14 07:05:55 2008
From: jim at meyering.net (Jim Meyering)
Date: Tue, 14 Oct 2008 09:05:55 +0200
Subject: [Ovirt-devel] [PATCH node] Updated the configuration processing
	to remove the need for scripts.
In-Reply-To: <1223500473-12273-1-git-send-email-dpierce@redhat.com> (Darryl
	L. Pierce's message of "Wed, 8 Oct 2008 17:14:33 -0400")
References: <1223500473-12273-1-git-send-email-dpierce@redhat.com>
Message-ID: <87myh7k65o.fsf@rho.meyering.net>

Hi Darryl,

Ha!  I wondered why you didn't do this.  Now I know ;-)
I've just noticed that I never sent this message from last week:

"Darryl L. Pierce" <dpierce at redhat.com> wrote:
...
> +networking=$(awk '/ifcfg=/ {
> +    match($0, "ifcfg=(.*)", data)
> +    split(data[1], ifcfg, "|")
> +
> +    mac = ifcfg[1]
> +    iface = ifcfg[2]
> +

Please factor this out:

ifcfg_dir = sprintf "/files/etc/sysconfig/network-scripts/ifcfg-" iface

> +    printf("rm /files/etc/sysconfig/network-scripts/ifcfg-%s\n", iface)
> +    printf("set /files/etc/sysconfig/network-scripts/ifcfg-%s/DEVICE %s\n", iface, iface)

       printf("rm %s\n", ifcfg_dir)
       printf("set %s/DEVICE %s\n", ifcfg_dir, iface)

> +
> +    for (line in ifcfg) {
> +        if(line > 2) {
> +            match(ifcfg[line], "(^[^=]+)=(.*)", values)
> +            field=values[1]
> +            value=values[2]
> +
> +            printf("set /files/etc/sysconfig/network-scripts/ifcfg-%s/%s %s\n", iface, field, value)

               printf("set %s/%s %s\n", ifcfg_dir field, value)

> +        }
> +    }
> +
> +
> +    printf("save\n")
> +
> +}' $CONFIG)
> +
> +echo "$networking" > $OVIRT_CONFIG_OUTPUT_FILE



From apevec at redhat.com  Tue Oct 14 07:13:26 2008
From: apevec at redhat.com (Alan Pevec)
Date: Tue, 14 Oct 2008 09:13:26 +0200
Subject: [Ovirt-devel] unable to add hosts in web admin tool
In-Reply-To: <48F426A4.3070706@redfish-group.com>
References: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl>
	<48F2F6C7.4020300@redfish-group.com> <48F2FEEB.10705@redhat.com>
	<48F3128A.7090800@redfish-group.com> <48F35A21.6070101@redhat.com>
	<48F426A4.3070706@redfish-group.com>
Message-ID: <48F44696.6000305@redhat.com>

Justin Clacherty wrote:
> Alan Pevec wrote:
>> Seems that ovirt-appliance firstboot failed and left appliance in bad 
>> state, check the mongrel log.
>> You can also reinstall ovirt-appliance image and try 
>> http://ovirt.org/page/TroubleShooting#Debugging_oVirt_Appliance_firstboot
> 
> Thanks Alan.  I can't get to it at the moment, but from memory the 
> mongrel log on the management server was empty.  I'll reinstall the 
> appliance and debug firstboot.

Check which process are running in appliance, empty logs indicates that mongrel didn't start at all.



From jim at meyering.net  Tue Oct 14 10:14:36 2008
From: jim at meyering.net (Jim Meyering)
Date: Tue, 14 Oct 2008 12:14:36 +0200
Subject: [Ovirt-devel] [PATCH node] Updated the configuration processing
	to remove the need for scripts.
In-Reply-To: <1223931861-1575-1-git-send-email-dpierce@redhat.com> (Darryl
	L. Pierce's message of "Mon, 13 Oct 2008 17:04:21 -0400")
References: <1223931861-1575-1-git-send-email-dpierce@redhat.com>
Message-ID: <87skqzv5yr.fsf@rho.meyering.net>

"Darryl L. Pierce" <dpierce at redhat.com> wrote:
> The system now takes an encoded configuration descriptor from the server. It
> then parses from that a set of aliases for bondings if such exist. It then
> also extracts configuration details for the various network interfaces on the
> node. Afterward, it reloads module dependencies and then restarts the
> networking service.
...
> diff --git a/scripts/ovirt-process-config b/scripts/ovirt-process-config
...
> +modconf=$(awk '/bonding=/ {

Hi Darryl,

A couple of nit-picky details:

This should be anchored at beginning of line,
so as not to match a commented-out line:

    modconf=$(awk '/^[ \t]*bonding=/ {

> +        match($0, "bonding=(.*)", data)
> +        split(data[1], mod, "|")
> +
> +        if (match("[^[:alnum:]=_ at -]", mod[1]) >= 0) {
> +            printf "invalid bonding alias: \"%s\"\n", mod[1];
> +            exit 1;
> +        }
> +
> +        alias=mod[1]
> +
> +        printf("install %s bonding", alias)
> +    }' $CONFIG)
> +
> +echo "$modconf" > $OVIRT_KERNEL_MODULE_FILE
> +
> +# now build the list of module aliases to load and load them
> +modules=$(awk '/bonding=/ {

Same here.

> +        match($0, "bonding=(.*)", data)
> +        split(data[1], mod, "|")
> +
> +        printf("%s ", mod[1])
> +    }' $CONFIG)
> +
> +/sbin/depmod -a
> +
> +networking=$(awk '/ifcfg=/ {
> +    match($0, "ifcfg=(.*)", data)
> +    split(data[1], ifcfg, "|")
> +
> +    mac = ifcfg[1]
> +    iface = ifcfg[2]
> +
> +    printf("rm /files/etc/sysconfig/network-scripts/ifcfg-%s\n", iface)
> +    printf("set /files/etc/sysconfig/network-scripts/ifcfg-%s/DEVICE %s\n", iface, iface)

Than factor out the long, duplicated paths above and below,
and it should be fine.

...
> +            printf("set /files/etc/sysconfig/network-scripts/ifcfg-%s/%s %s\n", iface, field, value)

Thanks,
Jim



From dpierce at redhat.com  Tue Oct 14 12:53:15 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Tue, 14 Oct 2008 08:53:15 -0400
Subject: [Ovirt-devel] [PATCH node] Updated the configuration processing
	to remove the need for scripts.
In-Reply-To: <87skqzv5yr.fsf@rho.meyering.net>
References: <1223931861-1575-1-git-send-email-dpierce@redhat.com>
	<87skqzv5yr.fsf@rho.meyering.net>
Message-ID: <48F4963B.9070700@redhat.com>

Jim Meyering wrote:
> "Darryl L. Pierce" <dpierce at redhat.com> wrote:
>> The system now takes an encoded configuration descriptor from the server. It
>> then parses from that a set of aliases for bondings if such exist. It then
>> also extracts configuration details for the various network interfaces on the
>> node. Afterward, it reloads module dependencies and then restarts the
>> networking service.
> ...
>> diff --git a/scripts/ovirt-process-config b/scripts/ovirt-process-config
> ...
>> +modconf=$(awk '/bonding=/ {
> 
> Hi Darryl,
> 
> A couple of nit-picky details:
> 
> This should be anchored at beginning of line,
> so as not to match a commented-out line:
> 
>     modconf=$(awk '/^[ \t]*bonding=/ {

I incorporated that into the processing script, as well as the long
string replacement. Thank you for the feedback. :)

-- 
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081014/88cd634c/attachment.vcf>

From dhuff at redhat.com  Tue Oct 14 14:19:20 2008
From: dhuff at redhat.com (David Huff)
Date: Tue, 14 Oct 2008 10:19:20 -0400
Subject: [Ovirt-devel] Fwd: appliance-tools-002-4.fc9 successfully moved
 from dist-f9-updates-candidate into dist-f9-updates by bodhi
Message-ID: <48F4AA68.1090409@redhat.com>

Package: appliance-tools
NVR: appliance-tools-002-4.fc9
User: bodhi
Status: complete
Tag Operation: moved
 From Tag: dist-f9-updates-candidate
Into Tag: dist-f9-updates

appliance-tools-002-4.fc9 successfully moved from 
dist-f9-updates-candidate into dist-f9-updates by bodhi


However it looks like it still needs time to sync to the mirrors before 
it is available via yum.



From bkearney at redhat.com  Tue Oct 14 14:17:16 2008
From: bkearney at redhat.com (Bryan Kearney)
Date: Tue, 14 Oct 2008 10:17:16 -0400
Subject: [Ovirt-devel] Fwd: appliance-tools-002-4.fc9 successfully moved
	from dist-f9-updates-candidate into dist-f9-updates by bodhi
In-Reply-To: <48F4AA68.1090409@redhat.com>
References: <48F4AA68.1090409@redhat.com>
Message-ID: <48F4A9EC.7060702@redhat.com>

David Huff wrote:
> Package: appliance-tools
> NVR: appliance-tools-002-4.fc9
> User: bodhi
> Status: complete
> Tag Operation: moved
>  From Tag: dist-f9-updates-candidate
> Into Tag: dist-f9-updates
> 
> appliance-tools-002-4.fc9 successfully moved from 
> dist-f9-updates-candidate into dist-f9-updates by bodhi
> 
> 
> However it looks like it still needs time to sync to the mirrors before 
> it is available via yum.

Very cool!

--bk



From pmyers at redhat.com  Tue Oct 14 14:49:07 2008
From: pmyers at redhat.com (Perry Myers)
Date: Tue, 14 Oct 2008 10:49:07 -0400
Subject: [Ovirt-devel] [PATCH node] Fix ovirt install/uninstall node scripts
	so reboot is not necessary
Message-ID: <1223995747-12847-1-git-send-email-pmyers@redhat.com>

Signed-off-by: Perry Myers <pmyers at redhat.com>
---
 ovirt-listen-awake/ovirt-install-node   |   61 ++++++++++++++++++++++++++-----
 ovirt-listen-awake/ovirt-uninstall-node |   11 +++++-
 2 files changed, 62 insertions(+), 10 deletions(-)

diff --git a/ovirt-listen-awake/ovirt-install-node b/ovirt-listen-awake/ovirt-install-node
index 1d998f4..7fbf997 100644
--- a/ovirt-listen-awake/ovirt-install-node
+++ b/ovirt-listen-awake/ovirt-install-node
@@ -1,16 +1,27 @@
 #!/bin/bash
 
+PHYS_HOST=physical.priv.ovirt.org
+MGMT_HOST=management.priv.ovirt.org
+
 . /etc/init.d/ovirt-functions
 
 PATH=$PATH:/sbin:/usr/sbin
+ME=$(basename "$0")
+warn() { printf "$ME: $@\n" >&2; }
+die() { warn "$@"; exit 1; }
 
 usage() {
-    echo "Usage: ovirt-install-node <stateless|stateful>"
-    exit 1
+    echo "Usage: $ME <stateless|stateful>"
 }
 
+# first, check to see we are root
+if [ $( id -u ) -ne 0 ]; then
+    die "Must run as root"
+fi
+
 if [ $# -ne 1 ]; then
     usage
+    exit 1
 fi
 
 backup_file() {
@@ -73,14 +84,28 @@ elif [ "$1" = "stateful" ]; then
         exit 2
     fi
 
+    # Always try to uninstall first, that way the original pristine files are
+    # in place before re-installing, this prevents OVIRT_BACKUP_DIR from
+    # being overwritten with an older version of the node config files
+    ovirt-uninstall-node > /dev/null 2>&1
+
+    # Remove old keytab if it exists in case we have a new appliance to work with
+    rm -f /etc/libvirt/krb5.tab
+
+    rm -Rf $OVIRT_BACKUP_DIR
     mkdir -p $OVIRT_BACKUP_DIR
 
     backup_file /etc/sysconfig/network
-    sed -i -e 's/^HOSTNAME=.*/HOSTNAME=physical.priv.ovirt.org/' /etc/sysconfig/network
+    if grep "^HOSTNAME=" /etc/sysconfig/network > /dev/null 2>&1 ; then
+        sed -i -e "s/^HOSTNAME=.*/HOSTNAME=$PHYS_HOST/" /etc/sysconfig/network
+    else
+        echo "HOSTNAME=$PHYS_HOST" >> /etc/sysconfig/network
+    fi
+    hostname $PHYS_HOST
 
     backup_file /etc/hosts
-    add_if_not_exist "192.168.50.1 physical.priv.ovirt.org" /etc/hosts
-    add_if_not_exist "192.168.50.2 management.priv.ovirt.org" /etc/hosts
+    add_if_not_exist "192.168.50.1 $PHYS_HOST" /etc/hosts
+    add_if_not_exist "192.168.50.2 $MGMT_HOST" /etc/hosts
 
     chkconfig ovirt-listen-awake on
     chkconfig collectd on
@@ -93,10 +118,28 @@ elif [ "$1" = "stateful" ]; then
     ovirt_setup_libvirtd
 
     backup_file /etc/sysconfig/iptables
-    lokkit -n -t ovirtbr0
-
-    echo "Setup complete.  To make the changes take effect, shut down any"
-    echo "running guests and reboot the host"
+    # We open up anything coming from ovirtbr0 to this node, since it
+    # is only intended for demo purposes.  For reference, here are the
+    # ports that need to be opened:
+    # 7777:tcp (ovirt-listen-awake), 16509:tcp (libvirtd), 5900-6000:tcp (vnc),
+    # 49152-49216:tcp (libvirt migration)
+    lokkit -t ovirtbr0
+
+    service collectd restart
+    service ovirt-listen-awake restart
+
+    # Check if any domains are active before restarting libvirtd, since it will
+    # kill them.  Header information from virsh list is 2 lines, and 1 line for
+    # footer.  So > 3 lines means domains are running
+    running_domains=$(( $(virsh -c qemu:///system list 2> /dev/null | wc -l) - 3 ))
+    if [ $running_domains -gt 0 ]; then
+        echo "Cannot restart libvirtd because domains are active."
+        echo "Please shutdown all domains and restart libvirtd with:"
+        echo "service libvirtd restart"
+    else
+        service libvirtd restart
+    fi
 else
     usage
+    exit 1
 fi
diff --git a/ovirt-listen-awake/ovirt-uninstall-node b/ovirt-listen-awake/ovirt-uninstall-node
index 1f820e4..3e4d300 100644
--- a/ovirt-listen-awake/ovirt-uninstall-node
+++ b/ovirt-listen-awake/ovirt-uninstall-node
@@ -3,9 +3,17 @@
 . /etc/init.d/ovirt-functions
 
 PATH=$PATH:/sbin:/usr/sbin
+ME=$(basename "$0")
+warn() { printf "$ME: $@\n" >&2; }
+die() { warn "$@"; exit 1; }
+
+# first, check to see we are root
+if [ $( id -u ) -ne 0 ]; then
+    die "Must run as root"
+fi
 
 if [ $# -ne 0 ]; then
-    echo "Usage: ovirt-uninstall-node"
+    echo "Usage: $ME"
     exit 1
 fi
 
@@ -31,3 +39,4 @@ unbackup_file /etc/libvirt/libvirtd.conf
 unbackup_file /etc/sasl2/libvirt.conf
 unbackup_file /etc/sysconfig/iptables
 unbackup_file /etc/krb5.conf
+rm -Rf $OVIRT_BACKUP_DIR
-- 
1.5.5.1



From clalance at redhat.com  Tue Oct 14 14:58:20 2008
From: clalance at redhat.com (Chris Lalancette)
Date: Tue, 14 Oct 2008 16:58:20 +0200
Subject: [Ovirt-devel] [PATCH node] Fix ovirt install/uninstall node
	scripts so reboot is not necessary
In-Reply-To: <1223995747-12847-1-git-send-email-pmyers@redhat.com>
References: <1223995747-12847-1-git-send-email-pmyers@redhat.com>
Message-ID: <48F4B38C.7050602@redhat.com>

Perry Myers wrote:
> Signed-off-by: Perry Myers <pmyers at redhat.com>
> ---
>  ovirt-listen-awake/ovirt-install-node   |   61 ++++++++++++++++++++++++++-----
>  ovirt-listen-awake/ovirt-uninstall-node |   11 +++++-
>  2 files changed, 62 insertions(+), 10 deletions(-)
> 

The cosmetic changes are good.  The changes to make it so you don't have to
reboot are also good, and seem to work in Perry's test setup, so that makes it a
little easier to use.

ACK

-- 
Chris Lalancette



From dpierce at redhat.com  Tue Oct 14 15:38:08 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Tue, 14 Oct 2008 11:38:08 -0400
Subject: [Ovirt-devel] [PATCH node] Updated the configuration processing to
	remove the need for scripts.
Message-ID: <1223998688-15991-1-git-send-email-dpierce@redhat.com>

The system now takes an encoded configuration descriptor from the server. It
then parses from that a set of aliases for bondings if such exist. It then
also extracts configuration details for the various network interfaces on the
node. Afterward, it reloads module dependencies and then restarts the
networking service.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 Makefile.am                  |    1 +
 ovirt-node.spec.in           |    2 +
 scripts/ovirt-early          |   14 +++-----
 scripts/ovirt-process-config |   70 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 78 insertions(+), 9 deletions(-)
 create mode 100755 scripts/ovirt-process-config

diff --git a/Makefile.am b/Makefile.am
index 1d63310..c55db13 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,6 +30,7 @@ EXTRA_DIST =			\
   scripts/ovirt-early		\
   scripts/ovirt-functions	\
   scripts/ovirt-post		\
+  scripts/ovirt-process-config  \
   logrotate/ovirt-logrotate	\
   logrotate/ovirt-logrotate.conf
 
diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index daa3d7f..ea8099d 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -74,6 +74,7 @@ cd -
 %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/logrotate.d
 
 %{__install} -p -m0755 scripts/ovirt-awake %{buildroot}%{_sbindir}
+%{__install} -p -m0755 scripts/ovirt-process-config %{buildroot}%{_sbindir}
 %{__install} -p -m0755 ovirt-identify-node/ovirt-identify-node %{buildroot}%{_sbindir}
 %{__install} -p -m0755 ovirt-listen-awake/ovirt-listen-awake %{buildroot}%{_sbindir}
 %{__install} -Dp -m0755 ovirt-listen-awake/ovirt-listen-awake.init %{buildroot}%{_initrddir}/ovirt-listen-awake
@@ -145,6 +146,7 @@ fi
 %files
 %defattr(-,root,root,0755)
 %{_sbindir}/ovirt-awake
+%{_sbindir}/ovirt-process-config
 %{_sbindir}/ovirt-identify-node
 %{_sbindir}/ovirt-listen-awake
 %{_sbindir}/ovirt-install-node
diff --git a/scripts/ovirt-early b/scripts/ovirt-early
index 4723426..3c8c494 100755
--- a/scripts/ovirt-early
+++ b/scripts/ovirt-early
@@ -12,6 +12,8 @@
 
 # size of the oVirt partition in megabytes
 OVIRT_SIZE=64
+BONDING_MODCONF_FILE=/etc/modprobe.d/bonding
+AUGTOOL_CONFIG=/var/tmp/augtool-config
 
 get_mac_addresses() {
     macs=$(ifconfig | awk '/HWaddr/ { print $5"="$1 }' \
@@ -43,16 +45,10 @@ configure_from_network() {
                       "http://$SRV_HOST:$SRV_PORT/ovirt/managed_node/config?host=$(hostname)&macs=$macs"
                     if [ $? -eq 0 ]; then
                         echo "Remote configuration bundle retrieved to $cfgdb"
-                        bash $cfgdb
-                        if [ -f /var/tmp/pre-config-script ]; then
-                            echo "Loading kernel modules"
-                            bash /var/tmp/pre-config-script \
-                                && echo "Kernel modules loaded" \
-                                || echo "Failed loading kernel modules"
-                        fi
-                        if [ -f /var/tmp/node-augtool ]; then
+                        ovirt-process-config $cfgdb $BONDING_MODCONF_FILE $AUGTOOL_CONFIG
+                        if [ -f $AUGTOOL_CONFIG ]; then
                             echo "Loading remote config"
-                            augtool < /var/tmp/node-augtool \
+                            augtool < $AUGTOOL_CONFIG \
                                 && echo "Remote config applied" \
                                 || echo "Failed applying remote config"
                         fi
diff --git a/scripts/ovirt-process-config b/scripts/ovirt-process-config
new file mode 100755
index 0000000..caaf82d
--- /dev/null
+++ b/scripts/ovirt-process-config
@@ -0,0 +1,70 @@
+#!/bin/bash
+
+ME=$(basename "$0")
+warn() { printf "$ME: $@\n" >&2; }
+try_h() { printf "Try \`$ME -h' for more information.\n" >&2; exit 1;}
+try_help() { printf "Usage: \`$ME [config] [module output] [config output]\n" >&2; exit 1;}
+
+case $# in
+  0|1|2) warn "too few arguments"; try_help;;
+  3) ;;
+  *) warn "too many arguments"; try_help;;
+esac
+
+CONFIG=$1
+OVIRT_KERNEL_MODULE_FILE=$2
+OVIRT_CONFIG_OUTPUT_FILE=$3
+
+modconf=$(awk '/bonding=/ {
+        match($0, "^[ \t]*bonding=(.*)", data)
+        split(data[1], mod, "|")
+
+        if (match("[^[:alnum:]=_ at -]", mod[1]) >= 0) {
+            printf "invalid bonding alias: \"%s\"\n", mod[1];
+            exit 1;
+        }
+
+        alias=mod[1]
+
+        printf("install %s bonding", alias)
+    }' $CONFIG)
+
+echo "$modconf" > $OVIRT_KERNEL_MODULE_FILE
+
+# now build the list of module aliases to load and load them
+modules=$(awk '/bonding=/ {
+        match($0, "^[ \t]*bonding=(.*)", data)
+        split(data[1], mod, "|")
+
+        printf("%s ", mod[1])
+    }' $CONFIG)
+
+/sbin/depmod -a
+
+networking=$(awk '/ifcfg=/ {
+    match($0, "^[ \t]*ifcfg=(.*)", data)
+    split(data[1], ifcfg, "|")
+
+    mac = ifcfg[1]
+    iface = ifcfg[2]
+    ifcfg_dir = "/files/etc/sysconfig/network-scripts"
+
+    printf("rm %s/ifcfg-%s\n", ifcfg_dir, iface)
+    printf("set %s/ifcfg-%s/DEVICE %s\n", ifcfg_dir, iface, iface)
+
+    for (line in ifcfg) {
+        if(line > 2) {
+            match(ifcfg[line], "(^[^=]+)=(.*)", values)
+            field=values[1]
+            value=values[2]
+
+            printf("set %s/ifcfg-%s/%s %s\n", ifcfg_dir, iface, field, value)
+        }
+    }
+
+
+    printf("save\n")
+
+}' $CONFIG)
+
+echo "$networking" > $OVIRT_CONFIG_OUTPUT_FILE
-- 
1.5.5.1



From dpierce at redhat.com  Tue Oct 14 15:38:51 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Tue, 14 Oct 2008 11:38:51 -0400
Subject: [Ovirt-devel] [PATCH server] Replaced the config scripts with
	configuration encoding.
Message-ID: <1223998731-16081-1-git-send-email-dpierce@redhat.com>

Rather than sending the node a series of scripts that load
kernel modules, or are tightly coupled to tools like augeas,
this patch introduces an encoding scheme for data.

A line that begins with "kmod" describes a kernel module that
needs to be loaded. It will containing the module's name, an
optional alias for the module, and then the module options
if such are required.

A line that begins with "ifcfg" describes an network
interface. It will contain the mac address and interface name,
followed by all needed configuration values to bring the
interface up.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 src/app/models/bonding.rb                          |    1 +
 src/lib/managed_node_configuration.rb              |   72 +++++++++------
 src/test/fixtures/bondings.yml                     |    8 ++-
 src/test/fixtures/bondings_nics.yml                |    8 ++
 src/test/fixtures/hosts.yml                        |   10 ++
 src/test/fixtures/nics.yml                         |   14 +++
 .../functional/managed_node_configuration_test.rb  |   94 ++++++++------------
 7 files changed, 118 insertions(+), 89 deletions(-)

diff --git a/src/app/models/bonding.rb b/src/app/models/bonding.rb
index 4b6e8a5..859df31 100644
--- a/src/app/models/bonding.rb
+++ b/src/app/models/bonding.rb
@@ -44,6 +44,7 @@ class Bonding < ActiveRecord::Base
 
   belongs_to :host
   belongs_to :bonding_type
+  belongs_to :boot_type
 
   has_and_belongs_to_many :nics,
     :join_table  => 'bondings_nics',
diff --git a/src/lib/managed_node_configuration.rb b/src/lib/managed_node_configuration.rb
index 4ade235..fc33560 100644
--- a/src/lib/managed_node_configuration.rb
+++ b/src/lib/managed_node_configuration.rb
@@ -23,36 +23,57 @@
 
 require 'stringio'
 
+# +ManagedNodeConfiguration+ generates a configuration file for an oVirt node
+# based on information about the hardware submitted by the node and the
+# configuration details held in the database.
+#
+# The configuration is returned as a series of encoded lines.
+#
+# For a kernel module, the formation of the line is as follows:
+#
+# kmod=[module name]|[module alias]|[module options]
+#
+# An example would be for loading the +bonding+ kernel module to setup a bonded
+# interface for load balancing. In this example, the bonded interface would be
+# named +failover0+ on the node:
+#
+# kmod=bonding|failover0|mode=2 miimon=100 downdelay=200
+#
+# For a network interface (including a bonded interface) an example would be:
+#
+# ifcfg=00:11:22:33:44|eth0|BOOTPROTO=dhcp|bridge=ovirtbr0|ONBOOT=yes
+#
+# In this line, the network interface +eth0+ has a hardware MAC address of
+# +00:11:22:33:44+. It will use DHCP for retrieving it's IP address details,
+# and will use the +ovirtbr0+ interface as a bridge.
+#
 class ManagedNodeConfiguration
   NIC_ENTRY_PREFIX='/files/etc/sysconfig/network-scripts'
 
   def self.generate(host, macs)
     result = StringIO.new
 
-    result.puts "#!/bin/bash"
     result.puts "# THIS FILE IS GENERATED!"
 
     # first process any bondings that're defined
     unless host.bondings.empty?
-      result.puts "cat <<\EOF > /var/tmp/pre-config-script"
-      result.puts "#!/bin/bash"
-      result.puts "# THIS FILE IS GENERATED!"
-
       host.bondings.each do |bonding|
-        result.puts "/sbin/modprobe bonding mode=#{bonding.bonding_type.mode}"
+        result.puts "bonding=#{bonding.interface_name}"
       end
-
-      result.puts "EOF"
     end
 
     # now process the network interfaces  and bondings
-    result.puts "cat <<\EOF > /var/tmp/node-augtool"
 
     host.bondings.each do |bonding|
-      result.puts "rm #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}"
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/DEVICE #{bonding.interface_name}"
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/IPADDR #{bonding.ip_addr}" if bonding.ip_addr
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/ONBOOT yes"
+      entry = "ifcfg=none|#{bonding.interface_name}|BONDING_OPTS=\"mode=#{bonding.bonding_type.mode} miimon=100\""
+
+      if bonding.ip_addr == nil || bonding.ip_addr.empty?
+        entry += "|BOOTPROTO=dhcp"
+      else
+        entry += "|BOOTPROTO=static|IPADDR=#{bonding.ip_addr}|NETMASK=#{bonding.netmask}|BROADCAST=#{bonding.broadcast}"
+      end
+
+      result.puts "#{entry}|ONBOOT=yes"
 
       bonding.nics.each do |nic|
         process_nic result, nic, macs, bonding
@@ -66,9 +87,6 @@ class ManagedNodeConfiguration
       end
     end
 
-    result.puts "save"
-    result.puts "EOF"
-
     result.string
   end
 
@@ -78,24 +96,18 @@ class ManagedNodeConfiguration
     iface_name = macs[nic.mac]
 
     if iface_name
-      result.puts "rm #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}"
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/DEVICE #{iface_name}"
+      entry = "ifcfg=#{nic.mac}|#{iface_name}"
 
       if bonding
-        result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/MASTER #{bonding.interface_name}"
-        result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/SLAVE yes"
+        entry += "|MASTER=#{bonding.interface_name}|SLAVE=yes"
       else
-        result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BOOTPROTO #{nic.boot_type.proto}"
-
-        if nic.boot_type.proto == 'static'
-          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/IPADDR #{nic.ip_addr}"
-          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/NETMASK #{nic.netmask}"
-          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BROADCAST #{nic.broadcast}"
-        end
+        entry += "|BOOTPROTO=#{nic.boot_type.proto}"
+        entry += "|IPADDR=#{nic.ip_addr}|NETMASK=#{nic.netmask}|BROADCAST=#{nic.broadcast}" if nic.boot_type.proto == 'static'
+        entry += "|BRIDGE=#{nic.bridge}" if nic.bridge
       end
-
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BRIDGE #{nic.bridge}"     if nic.bridge
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/ONBOOT yes"
+      entry += "|ONBOOT=yes"
     end
+
+    result.puts entry if defined? entry
   end
 end
diff --git a/src/test/fixtures/bondings.yml b/src/test/fixtures/bondings.yml
index c2a47b5..7023e08 100644
--- a/src/test/fixtures/bondings.yml
+++ b/src/test/fixtures/bondings.yml
@@ -1,6 +1,6 @@
 mailservers_managed_node_bonding:
     name: Production Network
-    interface_name: bond0
+    interface_name: mailbonding0
     bonding_type_id: <%= Fixtures.identify(:link_aggregation_bonding_type) %>
     host_id: <%= Fixtures.identify(:mailservers_managed_node) %>
     ip_addr: 172.31.0.15
@@ -8,3 +8,9 @@ mailservers_managed_node_bonding:
     broadcast: 172.31.0.255
     arp_ping_address: 172.31.0.100
     arp_interval: 0
+
+mediaserver_managed_node_bonding:
+    name: Fileserver Network
+    interface_name: mediabonding0
+    bonding_type_id: <%= Fixtures.identify(:link_aggregation_bonding_type) %>
+    host_id: <%= Fixtures.identify(:mediaserver_managed_node) %>
diff --git a/src/test/fixtures/bondings_nics.yml b/src/test/fixtures/bondings_nics.yml
index 11a3d1a..607ff8b 100644
--- a/src/test/fixtures/bondings_nics.yml
+++ b/src/test/fixtures/bondings_nics.yml
@@ -5,3 +5,11 @@ mailservers_managed_node_bonding_nic_1:
 mailservers_managed_node_bonding_nic_2:
     bonding_id: <%= Fixtures.identify(:mailservers_managed_node_bonding) %>
     nic_id: <%= Fixtures.identify(:mailserver_nic_two) %>
+
+mediaservers_managed_node_bonding_nic_1:
+    bonding_id: <%= Fixtures.identify(:mediaserver_managed_node_bonding) %>
+    nic_id: <%= Fixtures.identify(:mediaserver_nic_one) %>
+
+mediaservers_managed_node_bonding_nic_2:
+    bonding_id: <%= Fixtures.identify(:mediaserver_managed_node_bonding) %>
+    nic_id: <%= Fixtures.identify(:mediaserver_nic_two) %>
diff --git a/src/test/fixtures/hosts.yml b/src/test/fixtures/hosts.yml
index 5b8af15..28282c2 100644
--- a/src/test/fixtures/hosts.yml
+++ b/src/test/fixtures/hosts.yml
@@ -125,3 +125,13 @@ buildserver_managed_node:
     is_disabled: 0
     hypervisor_type: 'kvm'
     hardware_pool_id: <%= Fixtures.identify(:prodops_pool) %>
+
+mediaserver_managed_node:
+    uuid: '6293acd9-2784-11dc-9387-001558c41534'
+    hostname: 'build.mynetwork.com'
+    arch: 'x86_64'
+    memory: 65536
+    is_disabled: 0
+    hypervisor_type: 'kvm'
+    hardware_pool_id: <%= Fixtures.identify(:prodops_pool) %>
+
diff --git a/src/test/fixtures/nics.yml b/src/test/fixtures/nics.yml
index ccf71d2..5b2cecc 100644
--- a/src/test/fixtures/nics.yml
+++ b/src/test/fixtures/nics.yml
@@ -78,3 +78,17 @@ buildserver_nic_two:
     broadcast: '172.31.0.255'
     host_id: <%= Fixtures.identify(:buildserver_managed_node) %>
     boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
+
+mediaserver_nic_one:
+    mac: '07:17:19:65:03:32'
+    usage_type: '1'
+    bandwidth: 100
+    host_id: <%= Fixtures.identify(:mediaserver_managed_node) %>
+    boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
+
+mediaserver_nic_two:
+    mac: '07:17:19:65:03:31'
+    usage_type: '1'
+    bandwidth: 100
+    host_id: <%= Fixtures.identify(:mediaserver_managed_node) %>
+    boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
diff --git a/src/test/functional/managed_node_configuration_test.rb b/src/test/functional/managed_node_configuration_test.rb
index b5a7ec5..e5b9c18 100644
--- a/src/test/functional/managed_node_configuration_test.rb
+++ b/src/test/functional/managed_node_configuration_test.rb
@@ -36,6 +36,7 @@ class ManagedNodeConfigurationTest < Test::Unit::TestCase
     @host_with_ip_address = hosts(:ldapserver_managed_node)
     @host_with_multiple_nics = hosts(:buildserver_managed_node)
     @host_with_bondings = hosts(:mailservers_managed_node)
+    @host_with_dhcp_bondings = hosts(:mediaserver_managed_node)
   end
 
   # Ensures that network interfaces uses DHCP when no IP address is specified.
@@ -44,15 +45,8 @@ class ManagedNodeConfigurationTest < Test::Unit::TestCase
     nic = @host_with_dhcp_card.nics.first
 
     expected = <<-HERE
-#!/bin/bash
 # THIS FILE IS GENERATED!
-cat <<\EOF > /var/tmp/node-augtool
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BOOTPROTO #{nic.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
-save
-EOF
+ifcfg=#{nic.mac}|eth0|BOOTPROTO=dhcp|ONBOOT=yes
     HERE
 
     result = ManagedNodeConfiguration.generate(
@@ -69,19 +63,8 @@ EOF
     nic = @host_with_ip_address.nics.first
 
     expected = <<-HERE
-#!/bin/bash
 # THIS FILE IS GENERATED!
-cat <<\EOF > /var/tmp/node-augtool
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BOOTPROTO #{nic.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/IPADDR #{nic.ip_addr}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/NETMASK #{nic.netmask}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BROADCAST #{nic.broadcast}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BRIDGE ovirtbr0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
-save
-EOF
+ifcfg=#{nic.mac}|eth0|BOOTPROTO=#{nic.boot_type.proto}|IPADDR=#{nic.ip_addr}|NETMASK=#{nic.netmask}|BROADCAST=#{nic.broadcast}|BRIDGE=#{nic.bridge}|ONBOOT=yes
     HERE
 
     result = ManagedNodeConfiguration.generate(
@@ -99,22 +82,9 @@ EOF
     nic2 = @host_with_multiple_nics.nics[1]
 
     expected = <<-HERE
-#!/bin/bash
 # THIS FILE IS GENERATED!
-cat <<\EOF > /var/tmp/node-augtool
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BOOTPROTO #{nic1.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/IPADDR #{nic1.ip_addr}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/NETMASK #{nic1.netmask}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BROADCAST #{nic1.broadcast}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth1
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/DEVICE eth1
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/BOOTPROTO #{nic2.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/ONBOOT yes
-save
-EOF
+ifcfg=#{nic1.mac}|eth0|BOOTPROTO=#{nic1.boot_type.proto}|IPADDR=#{nic1.ip_addr}|NETMASK=#{nic1.netmask}|BROADCAST=#{nic1.broadcast}|ONBOOT=yes
+ifcfg=#{nic2.mac}|eth1|BOOTPROTO=#{nic2.boot_type.proto}|ONBOOT=yes
     HERE
 
     result = ManagedNodeConfiguration.generate(
@@ -137,30 +107,11 @@ EOF
     nic2 = bonding.nics[1]
 
     expected = <<-HERE
-#!/bin/bash
 # THIS FILE IS GENERATED!
-cat <<\EOF > /var/tmp/pre-config-script
-#!/bin/bash
-# THIS FILE IS GENERATED!
-/sbin/modprobe bonding mode=#{bonding.bonding_type.mode}
-EOF
-cat <<\EOF > /var/tmp/node-augtool
-rm /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}
-set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/DEVICE #{bonding.interface_name}
-set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/IPADDR 172.31.0.15
-set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/ONBOOT yes
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/MASTER #{bonding.interface_name}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/SLAVE yes
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth1
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/DEVICE eth1
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/MASTER #{bonding.interface_name}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/SLAVE yes
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/ONBOOT yes
-save
-EOF
+bonding=#{bonding.interface_name}
+ifcfg=none|#{bonding.interface_name}|BONDING_OPTS="mode=#{bonding.bonding_type.mode} miimon=100"|BOOTPROTO=static|IPADDR=#{bonding.ip_addr}|NETMASK=#{bonding.netmask}|BROADCAST=#{bonding.broadcast}|ONBOOT=yes
+ifcfg=#{nic1.mac}|eth0|MASTER=#{bonding.interface_name}|SLAVE=yes|ONBOOT=yes
+ifcfg=#{nic2.mac}|eth1|MASTER=#{bonding.interface_name}|SLAVE=yes|ONBOOT=yes
 HERE
 
     result = ManagedNodeConfiguration.generate(
@@ -173,4 +124,31 @@ HERE
     assert_equal expected, result
   end
 
+  # Ensures that the generated bonding supports DHCP boot protocol.
+  #
+  def test_generate_with_dhcp_bonding
+    bonding = @host_with_dhcp_bondings.bondings.first
+
+    bonding.ip_addr=nil
+    nic1 = bonding.nics[0]
+    nic2 = bonding.nics[1]
+
+    expected = <<-HERE
+# THIS FILE IS GENERATED!
+bonding=#{bonding.interface_name}
+ifcfg=none|#{bonding.interface_name}|BONDING_OPTS="mode=#{bonding.bonding_type.mode} miimon=100"|BOOTPROTO=dhcp|ONBOOT=yes
+ifcfg=#{nic1.mac}|eth0|MASTER=#{bonding.interface_name}|SLAVE=yes|ONBOOT=yes
+ifcfg=#{nic2.mac}|eth1|MASTER=#{bonding.interface_name}|SLAVE=yes|ONBOOT=yes
+HERE
+
+    result = ManagedNodeConfiguration.generate(
+      @host_with_dhcp_bondings,
+      {
+        "#{nic1.mac}" => 'eth0',
+        "#{nic2.mac}" => 'eth1'
+      })
+
+    assert_equal expected, result
+  end
+
 end
-- 
1.5.5.1



From berrange at redhat.com  Tue Oct 14 15:45:58 2008
From: berrange at redhat.com (Daniel P. Berrange)
Date: Tue, 14 Oct 2008 16:45:58 +0100
Subject: [Ovirt-devel] [PATCH server] Replaced the config scripts with
	configuration encoding.
In-Reply-To: <1223998731-16081-1-git-send-email-dpierce@redhat.com>
References: <1223998731-16081-1-git-send-email-dpierce@redhat.com>
Message-ID: <20081014154558.GR10745@redhat.com>

On Tue, Oct 14, 2008 at 11:38:51AM -0400, Darryl L. Pierce wrote:
> A line that begins with "kmod" describes a kernel module that
> needs to be loaded. It will containing the module's name, an
> optional alias for the module, and then the module options
> if such are required.

This is wrong - module options for bonding are per-NIC.

> +# kmod=[module name]|[module alias]|[module options]
> +#
> +# An example would be for loading the +bonding+ kernel module to setup a bonded
> +# interface for load balancing. In this example, the bonded interface would be
> +# named +failover0+ on the node:
> +#
> +# kmod=bonding|failover0|mode=2 miimon=100 downdelay=200

This options must be set against the NIC, not the module

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  Tue Oct 14 15:52:23 2008
From: berrange at redhat.com (Daniel P. Berrange)
Date: Tue, 14 Oct 2008 16:52:23 +0100
Subject: [Ovirt-devel] [PATCH node] Updated the configuration processing
	to remove the need for scripts.
In-Reply-To: <1223998688-15991-1-git-send-email-dpierce@redhat.com>
References: <1223998688-15991-1-git-send-email-dpierce@redhat.com>
Message-ID: <20081014155223.GS10745@redhat.com>

On Tue, Oct 14, 2008 at 11:38:08AM -0400, Darryl L. Pierce wrote:
> The system now takes an encoded configuration descriptor from the server. It
> then parses from that a set of aliases for bondings if such exist. It then
> also extracts configuration details for the various network interfaces on the
> node. Afterward, it reloads module dependencies and then restarts the
> networking service.
> 
> Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
> ---
>  Makefile.am                  |    1 +
>  ovirt-node.spec.in           |    2 +
>  scripts/ovirt-early          |   14 +++-----
>  scripts/ovirt-process-config |   70 ++++++++++++++++++++++++++++++++++++++++++
>  4 files changed, 78 insertions(+), 9 deletions(-)
>  create mode 100755 scripts/ovirt-process-config
> 
> diff --git a/Makefile.am b/Makefile.am
> index 1d63310..c55db13 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -30,6 +30,7 @@ EXTRA_DIST =			\
>    scripts/ovirt-early		\
>    scripts/ovirt-functions	\
>    scripts/ovirt-post		\
> +  scripts/ovirt-process-config  \
>    logrotate/ovirt-logrotate	\
>    logrotate/ovirt-logrotate.conf
>  
> diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
> index daa3d7f..ea8099d 100644
> --- a/ovirt-node.spec.in
> +++ b/ovirt-node.spec.in
> @@ -74,6 +74,7 @@ cd -
>  %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/logrotate.d
>  
>  %{__install} -p -m0755 scripts/ovirt-awake %{buildroot}%{_sbindir}
> +%{__install} -p -m0755 scripts/ovirt-process-config %{buildroot}%{_sbindir}
>  %{__install} -p -m0755 ovirt-identify-node/ovirt-identify-node %{buildroot}%{_sbindir}
>  %{__install} -p -m0755 ovirt-listen-awake/ovirt-listen-awake %{buildroot}%{_sbindir}
>  %{__install} -Dp -m0755 ovirt-listen-awake/ovirt-listen-awake.init %{buildroot}%{_initrddir}/ovirt-listen-awake
> @@ -145,6 +146,7 @@ fi
>  %files
>  %defattr(-,root,root,0755)
>  %{_sbindir}/ovirt-awake
> +%{_sbindir}/ovirt-process-config
>  %{_sbindir}/ovirt-identify-node
>  %{_sbindir}/ovirt-listen-awake
>  %{_sbindir}/ovirt-install-node
> diff --git a/scripts/ovirt-early b/scripts/ovirt-early
> index 4723426..3c8c494 100755
> --- a/scripts/ovirt-early
> +++ b/scripts/ovirt-early
> @@ -12,6 +12,8 @@
>  
>  # size of the oVirt partition in megabytes
>  OVIRT_SIZE=64
> +BONDING_MODCONF_FILE=/etc/modprobe.d/bonding

> +
> +modconf=$(awk '/bonding=/ {
> +        match($0, "^[ \t]*bonding=(.*)", data)
> +        split(data[1], mod, "|")
> +
> +        if (match("[^[:alnum:]=_ at -]", mod[1]) >= 0) {
> +            printf "invalid bonding alias: \"%s\"\n", mod[1];
> +            exit 1;
> +        }
> +
> +        alias=mod[1]
> +
> +        printf("install %s bonding", alias)
> +    }' $CONFIG)
> +
> +echo "$modconf" > $OVIRT_KERNEL_MODULE_FILE

There is no need to install the bonding module. THis is handled
automatically by the networking init scripts. You merely need
the aliases.

  # grep bonding /etc/modprobe.conf
  alias bond0 bonding
  alias bond1 bonding
  alias bond2 bonding


Danie
-- 
|: 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 dpierce at redhat.com  Tue Oct 14 16:00:31 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Tue, 14 Oct 2008 12:00:31 -0400
Subject: [Ovirt-devel] [PATCH server] Replaced the config scripts with
	configuration encoding.
In-Reply-To: <20081014154558.GR10745@redhat.com>
References: <1223998731-16081-1-git-send-email-dpierce@redhat.com>
	<20081014154558.GR10745@redhat.com>
Message-ID: <48F4C21F.2040408@redhat.com>

Daniel P. Berrange wrote:
> On Tue, Oct 14, 2008 at 11:38:51AM -0400, Darryl L. Pierce wrote:
>> A line that begins with "kmod" describes a kernel module that
>> needs to be loaded. It will containing the module's name, an
>> optional alias for the module, and then the module options
>> if such are required.
> 
> This is wrong - module options for bonding are per-NIC.
> 
>> +# kmod=[module name]|[module alias]|[module options]
>> +#
>> +# An example would be for loading the +bonding+ kernel module to setup a bonded
>> +# interface for load balancing. In this example, the bonded interface would be
>> +# named +failover0+ on the node:
>> +#
>> +# kmod=bonding|failover0|mode=2 miimon=100 downdelay=200
> 
> This options must be set against the NIC, not the module

Thanks for the catch, Dan. The documetation is out of date regarding the
configuration file. I'll update the rdocs for the class and resend the
patch.

-- 
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081014/8aee3c58/attachment.vcf>

From dpierce at redhat.com  Tue Oct 14 16:03:17 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Tue, 14 Oct 2008 12:03:17 -0400
Subject: [Ovirt-devel] [PATCH node] Updated the configuration processing to
	remove the need for scripts.
Message-ID: <1224000197-17453-1-git-send-email-dpierce@redhat.com>

The system now takes an encoded configuration descriptor from the server. It
then parses from that a set of aliases for bondings if such exist. It then
also extracts configuration details for the various network interfaces on the
node. Afterward, it reloads module dependencies and then restarts the
networking service.

This patch also includes updated rdocs for the configuration generator.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 Makefile.am                  |    1 +
 ovirt-node.spec.in           |    2 +
 scripts/ovirt-early          |   14 +++-----
 scripts/ovirt-process-config |   68 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 76 insertions(+), 9 deletions(-)
 create mode 100755 scripts/ovirt-process-config

diff --git a/Makefile.am b/Makefile.am
index 1d63310..c55db13 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,6 +30,7 @@ EXTRA_DIST =			\
   scripts/ovirt-early		\
   scripts/ovirt-functions	\
   scripts/ovirt-post		\
+  scripts/ovirt-process-config  \
   logrotate/ovirt-logrotate	\
   logrotate/ovirt-logrotate.conf
 
diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index daa3d7f..ea8099d 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -74,6 +74,7 @@ cd -
 %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/logrotate.d
 
 %{__install} -p -m0755 scripts/ovirt-awake %{buildroot}%{_sbindir}
+%{__install} -p -m0755 scripts/ovirt-process-config %{buildroot}%{_sbindir}
 %{__install} -p -m0755 ovirt-identify-node/ovirt-identify-node %{buildroot}%{_sbindir}
 %{__install} -p -m0755 ovirt-listen-awake/ovirt-listen-awake %{buildroot}%{_sbindir}
 %{__install} -Dp -m0755 ovirt-listen-awake/ovirt-listen-awake.init %{buildroot}%{_initrddir}/ovirt-listen-awake
@@ -145,6 +146,7 @@ fi
 %files
 %defattr(-,root,root,0755)
 %{_sbindir}/ovirt-awake
+%{_sbindir}/ovirt-process-config
 %{_sbindir}/ovirt-identify-node
 %{_sbindir}/ovirt-listen-awake
 %{_sbindir}/ovirt-install-node
diff --git a/scripts/ovirt-early b/scripts/ovirt-early
index 4723426..3c8c494 100755
--- a/scripts/ovirt-early
+++ b/scripts/ovirt-early
@@ -12,6 +12,8 @@
 
 # size of the oVirt partition in megabytes
 OVIRT_SIZE=64
+BONDING_MODCONF_FILE=/etc/modprobe.d/bonding
+AUGTOOL_CONFIG=/var/tmp/augtool-config
 
 get_mac_addresses() {
     macs=$(ifconfig | awk '/HWaddr/ { print $5"="$1 }' \
@@ -43,16 +45,10 @@ configure_from_network() {
                       "http://$SRV_HOST:$SRV_PORT/ovirt/managed_node/config?host=$(hostname)&macs=$macs"
                     if [ $? -eq 0 ]; then
                         echo "Remote configuration bundle retrieved to $cfgdb"
-                        bash $cfgdb
-                        if [ -f /var/tmp/pre-config-script ]; then
-                            echo "Loading kernel modules"
-                            bash /var/tmp/pre-config-script \
-                                && echo "Kernel modules loaded" \
-                                || echo "Failed loading kernel modules"
-                        fi
-                        if [ -f /var/tmp/node-augtool ]; then
+                        ovirt-process-config $cfgdb $BONDING_MODCONF_FILE $AUGTOOL_CONFIG
+                        if [ -f $AUGTOOL_CONFIG ]; then
                             echo "Loading remote config"
-                            augtool < /var/tmp/node-augtool \
+                            augtool < $AUGTOOL_CONFIG \
                                 && echo "Remote config applied" \
                                 || echo "Failed applying remote config"
                         fi
diff --git a/scripts/ovirt-process-config b/scripts/ovirt-process-config
new file mode 100755
index 0000000..9af0822
--- /dev/null
+++ b/scripts/ovirt-process-config
@@ -0,0 +1,68 @@
+#!/bin/bash
+
+ME=$(basename "$0")
+warn() { printf "$ME: $@\n" >&2; }
+try_h() { printf "Try \`$ME -h' for more information.\n" >&2; exit 1;}
+try_help() { printf "Usage: \`$ME [config] [module output] [config output]\n" >&2; exit 1;}
+
+case $# in
+  0|1|2) warn "too few arguments"; try_help;;
+  3) ;;
+  *) warn "too many arguments"; try_help;;
+esac
+
+CONFIG=$1
+OVIRT_KERNEL_MODULE_FILE=$2
+OVIRT_CONFIG_OUTPUT_FILE=$3
+
+modconf=$(awk '/bonding=/ {
+        match($0, "^[ \t]*bonding=(.*)", data)
+        split(data[1], mod, "|")
+
+        if (match("[^[:alnum:]=_ at -]", mod[1]) >= 0) {
+            printf "invalid bonding alias: \"%s\"\n", mod[1];
+            exit 1;
+        }
+
+        alias=mod[1]
+
+        printf("install %s bonding", alias)
+    }' $CONFIG)
+
+echo "$modconf" > $OVIRT_KERNEL_MODULE_FILE
+
+# now build the list of module aliases to load and load them
+modules=$(awk '/bonding=/ {
+        match($0, "^[ \t]*bonding=(.*)", data)
+        split(data[1], mod, "|")
+
+        printf("%s ", mod[1])
+    }' $CONFIG)
+
+networking=$(awk '/ifcfg=/ {
+    match($0, "^[ \t]*ifcfg=(.*)", data)
+    split(data[1], ifcfg, "|")
+
+    mac = ifcfg[1]
+    iface = ifcfg[2]
+    ifcfg_dir = "/files/etc/sysconfig/network-scripts"
+
+    printf("rm %s/ifcfg-%s\n", ifcfg_dir, iface)
+    printf("set %s/ifcfg-%s/DEVICE %s\n", ifcfg_dir, iface, iface)
+
+    for (line in ifcfg) {
+        if(line > 2) {
+            match(ifcfg[line], "(^[^=]+)=(.*)", values)
+            field=values[1]
+            value=values[2]
+
+            printf("set %s/ifcfg-%s/%s %s\n", ifcfg_dir, iface, field, value)
+        }
+    }
+
+
+    printf("save\n")
+
+}' $CONFIG)
+
+echo "$networking" > $OVIRT_CONFIG_OUTPUT_FILE
-- 
1.5.5.1



From pmyers at redhat.com  Tue Oct 14 16:14:26 2008
From: pmyers at redhat.com (Perry Myers)
Date: Tue, 14 Oct 2008 12:14:26 -0400
Subject: [Ovirt-devel] Question about managing strage server on latest
	oVirt
In-Reply-To: <48E48EE5.8060508@np.css.fujitsu.com>
References: <48E48EE5.8060508@np.css.fujitsu.com>
Message-ID: <48F4C562.7030504@redhat.com>

Toshifumi Fujimura wrote:
> Hello!
> 
> I attempt to install a guest OS with WUI follows "Using oVirt".
> But I cannot add Strage Pool to Hardware Pool.
> I can't oparate in the way of stage 6 in "Using
> oVirt"(http://www.ovirt.org/docs/Using_oVirt/Add-Storage.html).
> Because "Using oVirt" is a little bit old.
> 
> Would you suggest me a latest instruction of the way to add Strage Pool
> to Hardware Pool.

We are in the process of putting out a new release (0.94) that will have 
some updated docs in the ovirt-docs rpm and should have integrated online 
help.  That might fix your problem.  Try this again when 0.94 is released 
and if you're still having problems, please let us know.

The release should be out in the next day or two.

Thanks,

Perry



From pmyers at redhat.com  Tue Oct 14 16:44:49 2008
From: pmyers at redhat.com (Perry Myers)
Date: Tue, 14 Oct 2008 12:44:49 -0400
Subject: [Ovirt-devel] PATCH: make "warn" function more robust
In-Reply-To: <87tzbsda8t.fsf@rho.meyering.net>
References: <87tzbsda8t.fsf@rho.meyering.net>
Message-ID: <48F4CC81.6030100@redhat.com>

Jim Meyering wrote:
> I noticed that the warn shell function (and hence die, too) would
> misbehave when operating on something containing a % (or, far less
> likely, a \c sequence that printf recognizes).
> 
> These fix the four definitions I found,
> 3 in node-image/, 1 in appliance/.

These look good.  ACK and please push to next :)

Perry



From pmyers at redhat.com  Tue Oct 14 17:01:49 2008
From: pmyers at redhat.com (Perry Myers)
Date: Tue, 14 Oct 2008 13:01:49 -0400
Subject: [Ovirt-devel] [PATCH appliance] Fix fake node installation options
	to be a little more sane
Message-ID: <1224003709-16110-1-git-send-email-pmyers@redhat.com>

Since everyone uses node3 as a smoke test node, I've purposed
node3-5 as follows:

node3 - No config persistence, always PXE boots and does not use disk image
node4 - Uses config persistence, always PXE boots
node5 - Installs on first PXE boot to hard disk.  Need to toggle to hd boot
        after initial boot

This ordering seems better and will cause less problems with people
still transitioning off of the fake nodes.

Signed-off-by: Perry Myers <pmyers at redhat.com>
---
 ovirt-appliance.ks |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ovirt-appliance.ks b/ovirt-appliance.ks
index 0497768..ab904ac 100644
--- a/ovirt-appliance.ks
+++ b/ovirt-appliance.ks
@@ -125,11 +125,11 @@ cobbler distro add --name="oVirt-Node-$arch" --arch=$arch \
   --kopts="rootflags=loop root=/ovirt-node-image.iso rootfstype=iso9660 ro console=ttyS0,115200n8 console=tty0"
 cobbler profile add --name=oVirt-Node-$arch --distro=oVirt-Node-$arch
 cobbler system add --netboot-enabled=1 --profile=oVirt-Node-$arch \
-  --name=node3 --mac=00:16:3e:12:34:57 --kopts="ovirt_init=scsi"
+  --name=node3 --mac=00:16:3e:12:34:57
 cobbler system add --netboot-enabled=1 --profile=oVirt-Node-$arch \
-  --name=node4 --mac=00:16:3e:12:34:58 --kopts="ovirt_init=scsi ovirt_local_boot"
+  --name=node4 --mac=00:16:3e:12:34:58 --kopts="ovirt_init=scsi"
 cobbler system add --netboot-enabled=1 --profile=oVirt-Node-$arch \
-  --name=node5 --mac=00:16:3e:12:34:59
+  --name=node5 --mac=00:16:3e:12:34:59 --kopts="ovirt_init=scsi ovirt_local_boot"
 set +x
 echo "Add new oVirt Nodes as Cobbler systems to make them PXE boot oVirt Node image directly."
 echo "oVirt-Node-$arch is also default boot option in Cobbler menu"
-- 
1.5.5.1



From pmyers at redhat.com  Tue Oct 14 17:07:21 2008
From: pmyers at redhat.com (Perry Myers)
Date: Tue, 14 Oct 2008 13:07:21 -0400
Subject: [Ovirt-devel] Re: [PATCH appliance] Fix fake node installation
 options to be a little more sane
In-Reply-To: <1224003709-16110-1-git-send-email-pmyers@redhat.com>
References: <1224003709-16110-1-git-send-email-pmyers@redhat.com>
Message-ID: <48F4D1C9.6000402@redhat.com>

Perry Myers wrote:
> Since everyone uses node3 as a smoke test node, I've purposed
> node3-5 as follows:
> 
> node3 - No config persistence, always PXE boots and does not use disk image
> node4 - Uses config persistence, always PXE boots
> node5 - Installs on first PXE boot to hard disk.  Need to toggle to hd boot
>         after initial boot
> 
> This ordering seems better and will cause less problems with people
> still transitioning off of the fake nodes.

Ignore this... Alan had already fixed this...

Perry



From pmyers at redhat.com  Tue Oct 14 17:15:37 2008
From: pmyers at redhat.com (Perry Myers)
Date: Tue, 14 Oct 2008 13:15:37 -0400
Subject: [Ovirt-devel] [PATCH server] Added a link from bonding to a boot
	type.
In-Reply-To: <48EC9489.3040902@redhat.com>
References: <1223390662-16536-1-git-send-email-dpierce@redhat.com>
	<48EC9489.3040902@redhat.com>
Message-ID: <48F4D3B9.6010802@redhat.com>

Chris Lalancette wrote:
> Darryl L. Pierce wrote:
>> Previously the bondings had one of two paths: it could either
>> explicitly set a static IP address or else fallback to an implicit
>> DHCP boot.
>>
>> This change will require that bondings be explicitly configured
>> in the same way as a standard network interface.
>>
>> Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
>> ---
>>  src/app/models/bonding.rb                      |   10 +++++++
>>  src/db/migrate/023_add_boot_type_to_bonding.rb |   31 ++++++++++++++++++++++++
>>  src/test/fixtures/bondings.yml                 |    1 +
>>  src/test/unit/bonding_test.rb                  |   20 +++++++++++----
>>  4 files changed, 57 insertions(+), 5 deletions(-)
>>  create mode 100644 src/db/migrate/023_add_boot_type_to_bonding.rb
> 
> Yes, this is reasonable.  I like things to be a little more explicit, so having
> an explicit "DHCP" (as opposed to implicit) makes things better.
> 
> ACK

Darryl,

Did this ever get committed?  If this has an ACK we should get it into the 
0.94 release.

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 imain at redhat.com  Tue Oct 14 17:22:30 2008
From: imain at redhat.com (Ian Main)
Date: Tue, 14 Oct 2008 10:22:30 -0700
Subject: [Ovirt-devel] [PATCH node] Add collectd and libvirt-qpid setup to
	ovirt-install-node
Message-ID: <1224004950-3674-1-git-send-email-imain@redhat.com>

This patch adds setup for libvirt-qpid and collectd to
the ovirt-install-node script so that they will both work
in stateful setup.

Signed-off-by: Ian Main <imain at redhat.com>
---
 ovirt-listen-awake/ovirt-install-node |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/ovirt-listen-awake/ovirt-install-node b/ovirt-listen-awake/ovirt-install-node
index 1d998f4..f81a4a1 100644
--- a/ovirt-listen-awake/ovirt-install-node
+++ b/ovirt-listen-awake/ovirt-install-node
@@ -82,6 +82,19 @@ elif [ "$1" = "stateful" ]; then
     add_if_not_exist "192.168.50.1 physical.priv.ovirt.org" /etc/hosts
     add_if_not_exist "192.168.50.2 management.priv.ovirt.org" /etc/hosts
 
+    collectd_conf=/etc/collectd.conf
+    if [ -f $collectd_conf.in ]; then
+        sed -e "s/@COLLECTD_SERVER@/192.168.50.2/" \
+            -e "s/@COLLECTD_PORT@/25826/" $collectd_conf.in \
+            > $collectd_conf
+    fi
+
+    libvirt_qpid_conf=/etc/sysconfig/libvirt-qpid
+    if [ -f $libvirt_qpid_conf ]; then
+        echo "LIBVIRT_QPID_ARGS=\"--broker 192.168.50.2 --port 5672\"" >> $libvirt_qpid_conf
+    fi
+
+
     chkconfig ovirt-listen-awake on
     chkconfig collectd on
 
-- 
1.5.5.1



From pmyers at redhat.com  Tue Oct 14 17:42:21 2008
From: pmyers at redhat.com (Perry Myers)
Date: Tue, 14 Oct 2008 13:42:21 -0400
Subject: [Ovirt-devel] [PATCH node] Add collectd and libvirt-qpid setup
	to	ovirt-install-node
In-Reply-To: <1224004950-3674-1-git-send-email-imain@redhat.com>
References: <1224004950-3674-1-git-send-email-imain@redhat.com>
Message-ID: <48F4D9FD.9080108@redhat.com>

Ian Main wrote:
> This patch adds setup for libvirt-qpid and collectd to
> the ovirt-install-node script so that they will both work
> in stateful setup.

Conceptual ACK, if it's been tested it can be pushed.  Otherwise test it 
first :)

Perry



From bkearney at redhat.com  Tue Oct 14 18:12:42 2008
From: bkearney at redhat.com (Bryan Kearney)
Date: Tue, 14 Oct 2008 14:12:42 -0400
Subject: [Ovirt-devel] Patch for the single exec issue
Message-ID: <48F4E11A.4040907@redhat.com>

Perry found an issue with the ace tools where items marked as a single 
exec were being execute more then once. This should resolve that.

-- bk
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: single_exec.patch
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081014/558d40f8/attachment.ksh>

From pmyers at redhat.com  Tue Oct 14 18:28:33 2008
From: pmyers at redhat.com (Perry Myers)
Date: Tue, 14 Oct 2008 14:28:33 -0400
Subject: [Ovirt-devel] [PATCH node] Add collectd and libvirt-qpid setup to
	ovirt-install-node
Message-ID: <1224008913-18798-1-git-send-email-pmyers@redhat.com>

This patch adds setup for libvirt-qpid and collectd to
the ovirt-install-node script so that they will both work
in stateful setup.

Signed-off-by: Ian Main <imain at redhat.com>
Signed-off-by: Perry Myers <pmyers at redhat.com>
---
 ovirt-listen-awake/ovirt-install-node   |   28 ++++++++++++++++++++++++----
 ovirt-listen-awake/ovirt-uninstall-node |    4 +++-
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/ovirt-listen-awake/ovirt-install-node b/ovirt-listen-awake/ovirt-install-node
index a4a4b6f..95ba4de 100644
--- a/ovirt-listen-awake/ovirt-install-node
+++ b/ovirt-listen-awake/ovirt-install-node
@@ -28,7 +28,7 @@ backup_file() {
     dir=$(dirname "$1")
     case $dir in /*);; *) die "unexpected non-absolute dir: $dir";; esac
     mkdir -p "$OVIRT_BACKUP_DIR/${dir:1}"
-    cp -pf "$1" "$OVIRT_BACKUP_DIR/${dir:1}"
+    test -f "$1" && cp -pf "$1" "$OVIRT_BACKUP_DIR/${dir:1}"
 }
 
 add_if_not_exist() {
@@ -103,12 +103,31 @@ elif [ "$1" = "stateful" ]; then
     fi
     hostname $PHYS_HOST
 
+    collectd_conf=/etc/collectd.conf
+    backup_file $collectd_conf
+    if [ -f $collectd_conf.in ]; then
+        sed -e "s/@COLLECTD_SERVER@/$MGMT_HOST/" \
+            -e "s/@COLLECTD_PORT@/25826/" $collectd_conf.in \
+            > $collectd_conf
+    fi
+
+    libvirt_qpid_conf=/etc/sysconfig/libvirt-qpid
+    backup_file $libvirt_qpid_conf
+    if [ -f $libvirt_qpid_conf ]; then
+        if grep "^LIBVIRT_QPID_ARGS=" $libvirt_qpid_conf > /dev/null 2>&1 ; then
+            sed -i -e "s/^LIBVIRT_QPID_ARGS=.*/LIBVIRT_QPID_ARGS=\"--broker $MGMT_HOST --port 5672\"/" $libvirt_qpid_conf
+        else
+            echo "LIBVIRT_QPID_ARGS=\"--broker $MGMT_HOST --port 5672\"" >> $libvirt_qpid_conf
+        fi
+    fi
+
     backup_file /etc/hosts
     add_if_not_exist "192.168.50.1 $PHYS_HOST" /etc/hosts
     add_if_not_exist "192.168.50.2 $MGMT_HOST" /etc/hosts
 
     chkconfig ovirt-listen-awake on
     chkconfig collectd on
+    chkconfig libvirt-qpid on
 
     backup_file /etc/sysconfig/libvirtd
     backup_file /etc/libvirt/qemu.conf
@@ -125,9 +144,6 @@ elif [ "$1" = "stateful" ]; then
     # 49152-49216:tcp (libvirt migration)
     lokkit -t ovirtbr0
 
-    service collectd restart
-    service ovirt-listen-awake restart
-
     # Check if any domains are active before restarting libvirtd, since it will
     # kill them.  Header information from virsh list is 2 lines, and 1 line for
     # footer.  So > 3 lines means domains are running
@@ -139,6 +155,10 @@ elif [ "$1" = "stateful" ]; then
     else
         service libvirtd restart
     fi
+
+    service collectd restart
+    service ovirt-listen-awake restart
+    service libvirt-qpid restart
 else
     usage
     exit 1
diff --git a/ovirt-listen-awake/ovirt-uninstall-node b/ovirt-listen-awake/ovirt-uninstall-node
index 3e4d300..1046a37 100644
--- a/ovirt-listen-awake/ovirt-uninstall-node
+++ b/ovirt-listen-awake/ovirt-uninstall-node
@@ -25,7 +25,7 @@ fi
 
 unbackup_file() {
     # note that $1 will have a / on the front, so we don't need to add our own
-    cp -pf "$OVIRT_BACKUP_DIR$1" "$1"
+    test -f "$OVIRT_BACKUP_DIR$1" && cp -pf "$OVIRT_BACKUP_DIR$1" "$1"
 }
 
 chkconfig ovirt-listen-awake off
@@ -39,4 +39,6 @@ unbackup_file /etc/libvirt/libvirtd.conf
 unbackup_file /etc/sasl2/libvirt.conf
 unbackup_file /etc/sysconfig/iptables
 unbackup_file /etc/krb5.conf
+unbackup_file /etc/collectd.conf
+unbackup_file /etc/sysconfig/libvirt-qpid
 rm -Rf $OVIRT_BACKUP_DIR
-- 
1.5.5.1



From pmyers at redhat.com  Tue Oct 14 20:32:23 2008
From: pmyers at redhat.com (Perry Myers)
Date: Tue, 14 Oct 2008 16:32:23 -0400
Subject: [Ovirt-devel] [PATCH server] Fixed regression caused by
	cb2fad05d45bf51a7c8b7c06c9700b94024ae442
Message-ID: <1224016343-20232-1-git-send-email-pmyers@redhat.com>

The above patch to allow iso and disk image provisioning broke
profile provisioning because it did not remove some vestigal code
from the create_vm method in task_vm.rb.

This is now fixed.

Signed-off-by: Perry Myers <pmyers at redhat.com>
---
 src/task-omatic/task_vm.rb |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb
index 8398e83..02e41af 100644
--- a/src/task-omatic/task_vm.rb
+++ b/src/task-omatic/task_vm.rb
@@ -163,16 +163,9 @@ def create_vm(task)
 
   # create cobbler system profile
   begin
-    if vm.provisioning and !vm.provisioning.empty?
-      if vm.uses_cobbler?
-        if vm.cobbler_type == Vm::PROFILE_PREFIX:
-          system = Cobbler::System.new('name' => vm.uuid,
-                                       'profile' => provisioning_arr[2])
-          system.interfaces=[Cobbler::NetworkInterface.new({'mac_address' => vm.vnic_mac_addr})]
-          system.save
-        end
-      end
-    end
+    # FIXME: Presently the wui handles all cobbler system creation.
+    # This should be moved out of the wui into Taskomatic.  Specifically
+    # here, and in the edit_vm methods.
 
     setVmState(vm, Vm::STATE_STOPPED)
   rescue Exception => error
-- 
1.5.5.1



From imain at redhat.com  Tue Oct 14 20:34:19 2008
From: imain at redhat.com (Ian Main)
Date: Tue, 14 Oct 2008 13:34:19 -0700
Subject: [Ovirt-devel] Re: [PATCH node] Add collectd and libvirt-qpid setup
 to ovirt-install-node
In-Reply-To: <1224008913-18798-1-git-send-email-pmyers@redhat.com>
References: <1224008913-18798-1-git-send-email-pmyers@redhat.com>
Message-ID: <20081014133419.57ba3c40@tp.mains.net>

On Tue, 14 Oct 2008 14:28:33 -0400
Perry Myers <pmyers at redhat.com> wrote:

> This patch adds setup for libvirt-qpid and collectd to
> the ovirt-install-node script so that they will both work
> in stateful setup.
> 
> Signed-off-by: Ian Main <imain at redhat.com>
> Signed-off-by: Perry Myers <pmyers at redhat.com>


Yeah this one works.  ACK!

	Ian



From pmyers at redhat.com  Tue Oct 14 20:42:59 2008
From: pmyers at redhat.com (Perry Myers)
Date: Tue, 14 Oct 2008 16:42:59 -0400
Subject: [Ovirt-devel] [PATCH node-image] Moved requires that are needed for
	all Node installations to the Node package
Message-ID: <1224016979-20422-1-git-send-email-pmyers@redhat.com>

Signed-off-by: Perry Myers <pmyers at redhat.com>
---
 common-pkgs.ks |   23 -----------------------
 1 files changed, 0 insertions(+), 23 deletions(-)

diff --git a/common-pkgs.ks b/common-pkgs.ks
index cd4f243..9f9e277 100644
--- a/common-pkgs.ks
+++ b/common-pkgs.ks
@@ -1,37 +1,14 @@
 @core
-bash
 kernel
 hwdata
 passwd
 policycoreutils
-chkconfig
 rootfiles
 dhclient
-libvirt
-libvirt-python
 openssh-clients
 openssh-server
-iscsi-initiator-utils
-ntp
 kvm
-nfs-utils
-wget
-krb5-workstation
-cyrus-sasl-gssapi
-cyrus-sasl
-cyrus-sasl-lib
-collectd
-collectd-virt
-augeas
-nc
-bind-utils
 syslinux
-cronie
-hal
-# Stupid yum dep solver pulls in older 'qemu' to resolve
-# /usr/bin/qemu-img dep. This forces it to pick the new
-# qemu-img RPM.
-qemu-img
 ovirt-node
 ovirt-node-selinux
 -audit-libs-python
-- 
1.5.5.1



From pmyers at redhat.com  Tue Oct 14 20:43:08 2008
From: pmyers at redhat.com (Perry Myers)
Date: Tue, 14 Oct 2008 16:43:08 -0400
Subject: [Ovirt-devel] [PATCH node] Added Requires for packages that Node
	needs that previously were in a kickstart
Message-ID: <1224016988-20445-1-git-send-email-pmyers@redhat.com>

Signed-off-by: Perry Myers <pmyers at redhat.com>
---
 ovirt-node.spec.in |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index daa3d7f..3fcc166 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -22,7 +22,23 @@ Requires:       libvirt
 Requires:       libvirt-qpid
 Requires:       hal
 Requires:       collectd
+Requires:       collectd-virt
+Requires:       wget
 Requires:       cyrus-sasl-gssapi
+Requires:       iscsi-initiator-utils
+Requires:       ntp
+Requires:       nfs-utils
+Requires:       krb5-workstation
+Requires:       cyrus-sasl-gssapi cyrus-sasl cyrus-sasl-lib
+Requires:       bash
+Requires:       chkconfig
+Requires:       bind-utils
+# Stupid yum dep solver pulls in older 'qemu' to resolve
+# /usr/bin/qemu-img dep. This forces it to pick the new
+# qemu-img RPM.
+Requires:       qemu-img
+Requires:       nc
+Requires:       cronie
 ExclusiveArch:  %{ix86} x86_64
 
 %define app_root %{_datadir}/%{name}
-- 
1.5.5.1



From mmorsi at redhat.com  Tue Oct 14 20:58:47 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Tue, 14 Oct 2008 16:58:47 -0400
Subject: [Ovirt-devel] [PATCH] fixes / improvements to test suite
Message-ID: <1224017928-26999-1-git-send-email-mmorsi@redhat.com>

---
 src/app/models/vm_task.rb                        |    3 ---
 src/test/fixtures/quotas.yml                     |    2 +-
 src/test/fixtures/storage_pools.yml              |    6 +++---
 src/test/functional/host_controller_test.rb      |    2 +-
 src/test/functional/resources_controller_test.rb |    6 +++---
 src/test/functional/storage_controller_test.rb   |    2 +-
 src/test/functional/task_controller_test.rb      |    2 +-
 7 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/app/models/vm_task.rb b/src/app/models/vm_task.rb
index 31c4ac8..6251919 100644
--- a/src/app/models/vm_task.rb
+++ b/src/app/models/vm_task.rb
@@ -122,13 +122,10 @@ class VmTask < Task
     ACTIONS.each do |action, hash|
       if hash[:start] == state
         add_action = true
-        print "vm: #{vm}\n user: #{user}\n"
         if (vm and user)
           pool = vm.send(hash[:privilege][1])
-          print "pool: #{pool}\n privilege: #{hash[:privilege][1]}\n"
           add_action = pool ? pool.has_privilege(user, hash[:privilege][0]) : false
         end
-        print "add_action: #{add_action}\n"
         actions << action if add_action
       end
     end
diff --git a/src/test/fixtures/quotas.yml b/src/test/fixtures/quotas.yml
index 757c934..037fd67 100644
--- a/src/test/fixtures/quotas.yml
+++ b/src/test/fixtures/quotas.yml
@@ -46,7 +46,7 @@ six:
   total_vnics: 3
   total_storage: 1024
   total_vms: 2
-  pool_id: 10
+  pool_id: 5
 seven:
   id: 7
   total_vcpus: 
diff --git a/src/test/fixtures/storage_pools.yml b/src/test/fixtures/storage_pools.yml
index 0610333..ac042a0 100644
--- a/src/test/fixtures/storage_pools.yml
+++ b/src/test/fixtures/storage_pools.yml
@@ -45,20 +45,20 @@ seven:
   export_path: '/tmp/apath'
 eight:
   id: 8
-  hardware_pool_id: 6
+  hardware_pool_id: 9
   ip_addr: '192.168.50.2'
   type: 'IscsiStoragePool'
   port: 531
   target: 'bartarget'
 nine:
   id: 9
-  hardware_pool_id: 8
+  hardware_pool_id: 9
   type: 'NfsStoragePool'
   ip_addr: '1.2.3.4'
   export_path: '/tmp/somepath'
 ten:
   id: 10
-  hardware_pool_id: 6
+  hardware_pool_id: 9
   type: 'IscsiStoragePool'
   ip_addr: '192.168.50.3'
   port: 539
diff --git a/src/test/functional/host_controller_test.rb b/src/test/functional/host_controller_test.rb
index e1e977d..7939aca 100644
--- a/src/test/functional/host_controller_test.rb
+++ b/src/test/functional/host_controller_test.rb
@@ -24,7 +24,7 @@ require 'host_controller'
 class HostController; def rescue_action(e) raise e end; end
 
 class HostControllerTest < Test::Unit::TestCase
-  fixtures :hosts
+  fixtures :hosts, :pools
 
   def setup
     @controller = HostController.new
diff --git a/src/test/functional/resources_controller_test.rb b/src/test/functional/resources_controller_test.rb
index fca7aad..49e8d0e 100644
--- a/src/test/functional/resources_controller_test.rb
+++ b/src/test/functional/resources_controller_test.rb
@@ -58,14 +58,14 @@ class ResourcesControllerTest < ActionController::TestCase
   def test_destroy
     pool = nil
     assert_nothing_raised {
-        pool = VmResourcePool.find(2).parent.id
+        pool = VmResourcePool.find(10).parent.id
     }
 
-    post :destroy, :id => 2
+    post :destroy, :id => 10
     assert_response :success
 
     assert_raise(ActiveRecord::RecordNotFound) {
-      VmResourcePool.find(2)
+      VmResourcePool.find(10)
     }
   end
 end
diff --git a/src/test/functional/storage_controller_test.rb b/src/test/functional/storage_controller_test.rb
index ff728b9..a9f7eb9 100644
--- a/src/test/functional/storage_controller_test.rb
+++ b/src/test/functional/storage_controller_test.rb
@@ -24,7 +24,7 @@ require 'storage_controller'
 class StorageController; def rescue_action(e) raise e end; end
 
 class StorageControllerTest < Test::Unit::TestCase
-  fixtures :storage_volumes
+  fixtures :storage_volumes, :storage_pools
 
   def setup
     @controller = StorageController.new
diff --git a/src/test/functional/task_controller_test.rb b/src/test/functional/task_controller_test.rb
index cc07502..a9578b6 100644
--- a/src/test/functional/task_controller_test.rb
+++ b/src/test/functional/task_controller_test.rb
@@ -24,7 +24,7 @@ require 'task_controller'
 class TaskController; def rescue_action(e) raise e end; end
 
 class TaskControllerTest < Test::Unit::TestCase
-  fixtures :tasks
+  fixtures :tasks, :vms, :pools
 
   def setup
     @controller = TaskController.new
-- 
1.5.4.1



From mmorsi at redhat.com  Tue Oct 14 20:58:48 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Tue, 14 Oct 2008 16:58:48 -0400
Subject: [Ovirt-devel] [PATCH] added rake test to appliance autobuild
In-Reply-To: <1224017928-26999-1-git-send-email-mmorsi@redhat.com>
References: <1224017928-26999-1-git-send-email-mmorsi@redhat.com>
Message-ID: <1224017928-26999-2-git-send-email-mmorsi@redhat.com>

also removed unecessary chaning of the rails env
---
 autobuild.sh |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/autobuild.sh b/autobuild.sh
index 98a3b46..07ea1db 100755
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -58,13 +58,6 @@ ln -s /etc/init.d/sshd /etc/rc3.d/S99sshd
 %end
 KS
 
-# set appliance to run in test mode
-cat >> ovirt-appliance.ks << \KS
-%post
-sed -i "s/#RAILS_ENV=production/RAILS_ENV=test/g" /etc/sysconfig/ovirt-rails
-%end
-KS
-
 ./autogen.sh --prefix=$AUTOBUILD_INSTALL_ROOT
 make dist
 
@@ -115,4 +108,4 @@ for i in $(seq 1 10); do
   sleep 10
 done
 
-# $ssh_cmd cd /usr/share/ovirt-server && rake test"
+$ssh_cmd "cd /usr/share/ovirt-server && export RAILS_ENV=test && rake test"
-- 
1.5.4.1



From apevec at redhat.com  Tue Oct 14 20:58:42 2008
From: apevec at redhat.com (Alan Pevec)
Date: Tue, 14 Oct 2008 22:58:42 +0200
Subject: [Ovirt-devel] [PATCH ovirt-appliance] use rawhide repos for Fedora
	10
Message-ID: <1224017922-27412-1-git-send-email-apevec@redhat.com>

for experimental builds, until it gets released

Signed-off-by: Alan Pevec <apevec at redhat.com>
---
 ovirt-appliance.ks      |    2 ++
 ovirt-appliance.spec.in |   36 ++++++++++++++++++++++++++----------
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/ovirt-appliance.ks b/ovirt-appliance.ks
index 82e6a57..b344e47 100644
--- a/ovirt-appliance.ks
+++ b/ovirt-appliance.ks
@@ -33,6 +33,8 @@ ovirt-recipe
 lokkit
 
 %post
+# cleanup rpmdb to allow non-matching host and chroot RPM versions
+rm -f /var/lib/rpm/__db*
   exec > /root/kickstart-post.log 2>&1
 
   # the code to contact the host we are running on and make it configure itself
diff --git a/ovirt-appliance.spec.in b/ovirt-appliance.spec.in
index f08e0f6..d96e7bf 100644
--- a/ovirt-appliance.spec.in
+++ b/ovirt-appliance.spec.in
@@ -40,22 +40,38 @@ The oVirt Appliance image and scripts to install on a Fedora Host
 %setup -q
 
 %build
-if [ -n "%{?fedora_url}" ]; then
-   cat > repos.ks << EOF
-repo --name=f%{fedora} --baseurl=%{fedora_url}/releases/%{fedora}/Everything/%{_arch}/os
-repo --name=f%{fedora}-updates --baseurl=%{fedora_url}/updates/%{fedora}/%{_arch} --excludepkgs=%{bad_pkgs}
-repo --name=f%{fedora}-updates-newkey --baseurl=%{fedora_url}/updates/%{fedora}/%{_arch}.newkey --excludepkgs=%{bad_pkgs}
+%if 0%{?fedora} == 010
+ # XXX current rawhide
+ %if "%{?fedora_url}" == ""
+cat > repos.ks << EOF
+repo --name=rawhide --mirrorlist=%{fedora_mirror}?repo=rawhide&arch=%{_arch}
+EOF
+ %else
+cat > repos.ks << EOF
+repo --name=rawhide --baseurl=%{fedora_url}/development/%{_arch}/os
 EOF
-else
-  cat > repos.ks << EOF
+ %endif
+cat >> repos.ks << EOF
+repo --name=ovirt-org --baseurl=%{ovirt_url}/development/%{_arch}
+EOF
+%else
+ %if "%{?fedora_url}" == ""
+cat > repos.ks << EOF
 repo --name=f%{fedora} --mirrorlist=%{fedora_mirror}?repo=fedora-%{fedora}&arch=%{_arch}
-repo --name=f%{fedora}-updates --mirrorlist=%{fedora_mirror}?repo=updates-released-f%{fedora}&arch=%{_arch} --excludepkgs=%{bad_pkgs}
 repo --name=f%{fedora}-updates-newkey --mirrorlist=%{fedora_mirror}?repo=updates-released-f%{fedora}.newkey&arch=%{_arch} --excludepkgs=%{bad_pkgs}
 EOF
-fi
-
+ %else
+cat > repos.ks << EOF
+repo --name=f%{fedora} --baseurl=%{fedora_url}/releases/%{fedora}/Everything/%{_arch}/os
+repo --name=f%{fedora}-updates-newkey --baseurl=%{fedora_url}/updates/%{fedora}/%{_arch}.newkey --excludepkgs=%{bad_pkgs}
+EOF
+ %endif
 cat >> repos.ks << EOF
 repo --name=ovirt-org --baseurl=%{ovirt_url}/%{fedora}/%{_arch}
+EOF
+%endif
+
+cat >> repos.ks << EOF
 repo --name=ovirt-local --baseurl=%{ovirt_local_repo}
 repo --name=thincrust-org --baseurl=%{thincrust_url}/noarch
 
-- 
1.5.5.1



From sseago at redhat.com  Tue Oct 14 21:00:42 2008
From: sseago at redhat.com (Scott Seago)
Date: Tue, 14 Oct 2008 17:00:42 -0400
Subject: [Ovirt-devel] [PATCH server] Fixed regression caused
	by	cb2fad05d45bf51a7c8b7c06c9700b94024ae442
In-Reply-To: <1224016343-20232-1-git-send-email-pmyers@redhat.com>
References: <1224016343-20232-1-git-send-email-pmyers@redhat.com>
Message-ID: <48F5087A.5020501@redhat.com>

Perry Myers wrote:
> The above patch to allow iso and disk image provisioning broke
> profile provisioning because it did not remove some vestigal code
> from the create_vm method in task_vm.rb.
>
> This is now fixed.
>
> Signed-off-by: Perry Myers <pmyers at redhat.com>
> ---
>  src/task-omatic/task_vm.rb |   13 +++----------
>  1 files changed, 3 insertions(+), 10 deletions(-)
>
> diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb
> index 8398e83..02e41af 100644
> --- a/src/task-omatic/task_vm.rb
> +++ b/src/task-omatic/task_vm.rb
> @@ -163,16 +163,9 @@ def create_vm(task)
>  
>    # create cobbler system profile
>    begin
> -    if vm.provisioning and !vm.provisioning.empty?
> -      if vm.uses_cobbler?
> -        if vm.cobbler_type == Vm::PROFILE_PREFIX:
> -          system = Cobbler::System.new('name' => vm.uuid,
> -                                       'profile' => provisioning_arr[2])
> -          system.interfaces=[Cobbler::NetworkInterface.new({'mac_address' => vm.vnic_mac_addr})]
> -          system.save
> -        end
> -      end
> -    end
> +    # FIXME: Presently the wui handles all cobbler system creation.
> +    # This should be moved out of the wui into Taskomatic.  Specifically
> +    # here, and in the edit_vm methods.
>  
>      setVmState(vm, Vm::STATE_STOPPED)
>    rescue Exception => error
>   
ACK  here. this code isn't used anymore and no longer works.

Scott



From berrange at redhat.com  Tue Oct 14 21:17:55 2008
From: berrange at redhat.com (Daniel P. Berrange)
Date: Tue, 14 Oct 2008 22:17:55 +0100
Subject: [Ovirt-devel] [PATCH node] Add collectd and libvirt-qpid setup to
	ovirt-install-node
In-Reply-To: <1224008913-18798-1-git-send-email-pmyers@redhat.com>
References: <1224008913-18798-1-git-send-email-pmyers@redhat.com>
Message-ID: <20081014211755.GH5994@redhat.com>

On Tue, Oct 14, 2008 at 02:28:33PM -0400, Perry Myers wrote:
> This patch adds setup for libvirt-qpid and collectd to
> the ovirt-install-node script so that they will both work
> in stateful setup.
> 
> Signed-off-by: Ian Main <imain at redhat.com>
> Signed-off-by: Perry Myers <pmyers at redhat.com>
> ---
>  ovirt-listen-awake/ovirt-install-node   |   28 ++++++++++++++++++++++++----
>  ovirt-listen-awake/ovirt-uninstall-node |    4 +++-
>  2 files changed, 27 insertions(+), 5 deletions(-)
> 
> diff --git a/ovirt-listen-awake/ovirt-install-node b/ovirt-listen-awake/ovirt-install-node
> index a4a4b6f..95ba4de 100644
> --- a/ovirt-listen-awake/ovirt-install-node
> +++ b/ovirt-listen-awake/ovirt-install-node
> @@ -28,7 +28,7 @@ backup_file() {
>      dir=$(dirname "$1")
>      case $dir in /*);; *) die "unexpected non-absolute dir: $dir";; esac
>      mkdir -p "$OVIRT_BACKUP_DIR/${dir:1}"
> -    cp -pf "$1" "$OVIRT_BACKUP_DIR/${dir:1}"
> +    test -f "$1" && cp -pf "$1" "$OVIRT_BACKUP_DIR/${dir:1}"
>  }
>  
>  add_if_not_exist() {
> @@ -103,12 +103,31 @@ elif [ "$1" = "stateful" ]; then
>      fi
>      hostname $PHYS_HOST
>  
> +    collectd_conf=/etc/collectd.conf
> +    backup_file $collectd_conf
> +    if [ -f $collectd_conf.in ]; then
> +        sed -e "s/@COLLECTD_SERVER@/$MGMT_HOST/" \
> +            -e "s/@COLLECTD_PORT@/25826/" $collectd_conf.in \
> +            > $collectd_conf
> +    fi

Anyone fancy writing an augeas lens for collectd ?

> +
> +    libvirt_qpid_conf=/etc/sysconfig/libvirt-qpid

Doesn't augeas know how to edit all sysconfig files ? Be
better to use that than sed/grep IMHO.

> +    backup_file $libvirt_qpid_conf
> +    if [ -f $libvirt_qpid_conf ]; then
> +        if grep "^LIBVIRT_QPID_ARGS=" $libvirt_qpid_conf > /dev/null 2>&1 ; then
> +            sed -i -e "s/^LIBVIRT_QPID_ARGS=.*/LIBVIRT_QPID_ARGS=\"--broker $MGMT_HOST --port 5672\"/" $libvirt_qpid_conf
> +        else
> +            echo "LIBVIRT_QPID_ARGS=\"--broker $MGMT_HOST --port 5672\"" >> $libvirt_qpid_conf
> +        fi
> +    fi
> +
>      backup_file /etc/hosts
>      add_if_not_exist "192.168.50.1 $PHYS_HOST" /etc/hosts
>      add_if_not_exist "192.168.50.2 $MGMT_HOST" /etc/hosts
>  
>      chkconfig ovirt-listen-awake on
>      chkconfig collectd on
> +    chkconfig libvirt-qpid on

What's our security model for libvirt-qpid / brokers ? Our
existing libvirtd setup is kerberos secured, so it'd expect
qpid to at least match that before switching.

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 pmyers at redhat.com  Tue Oct 14 21:22:55 2008
From: pmyers at redhat.com (Perry Myers)
Date: Tue, 14 Oct 2008 17:22:55 -0400
Subject: [Ovirt-devel] [PATCH node] Add collectd and libvirt-qpid setup
	to ovirt-install-node
In-Reply-To: <20081014211755.GH5994@redhat.com>
References: <1224008913-18798-1-git-send-email-pmyers@redhat.com>
	<20081014211755.GH5994@redhat.com>
Message-ID: <48F50DAF.8000002@redhat.com>

Daniel P. Berrange wrote:
> On Tue, Oct 14, 2008 at 02:28:33PM -0400, Perry Myers wrote:
>> This patch adds setup for libvirt-qpid and collectd to
>> the ovirt-install-node script so that they will both work
>> in stateful setup.
>>
>> Signed-off-by: Ian Main <imain at redhat.com>
>> Signed-off-by: Perry Myers <pmyers at redhat.com>
>> ---
>>  ovirt-listen-awake/ovirt-install-node   |   28 ++++++++++++++++++++++++----
>>  ovirt-listen-awake/ovirt-uninstall-node |    4 +++-
>>  2 files changed, 27 insertions(+), 5 deletions(-)
>>
>> diff --git a/ovirt-listen-awake/ovirt-install-node b/ovirt-listen-awake/ovirt-install-node
>> index a4a4b6f..95ba4de 100644
>> --- a/ovirt-listen-awake/ovirt-install-node
>> +++ b/ovirt-listen-awake/ovirt-install-node
>> @@ -28,7 +28,7 @@ backup_file() {
>>      dir=$(dirname "$1")
>>      case $dir in /*);; *) die "unexpected non-absolute dir: $dir";; esac
>>      mkdir -p "$OVIRT_BACKUP_DIR/${dir:1}"
>> -    cp -pf "$1" "$OVIRT_BACKUP_DIR/${dir:1}"
>> +    test -f "$1" && cp -pf "$1" "$OVIRT_BACKUP_DIR/${dir:1}"
>>  }
>>  
>>  add_if_not_exist() {
>> @@ -103,12 +103,31 @@ elif [ "$1" = "stateful" ]; then
>>      fi
>>      hostname $PHYS_HOST
>>  
>> +    collectd_conf=/etc/collectd.conf
>> +    backup_file $collectd_conf
>> +    if [ -f $collectd_conf.in ]; then
>> +        sed -e "s/@COLLECTD_SERVER@/$MGMT_HOST/" \
>> +            -e "s/@COLLECTD_PORT@/25826/" $collectd_conf.in \
>> +            > $collectd_conf
>> +    fi
> 
> Anyone fancy writing an augeas lens for collectd ?

I nominate lutter!  :)

>> +
>> +    libvirt_qpid_conf=/etc/sysconfig/libvirt-qpid
> 
> Doesn't augeas know how to edit all sysconfig files ? Be
> better to use that than sed/grep IMHO.

Yes, we should be using that instead.

>> +    backup_file $libvirt_qpid_conf
>> +    if [ -f $libvirt_qpid_conf ]; then
>> +        if grep "^LIBVIRT_QPID_ARGS=" $libvirt_qpid_conf > /dev/null 2>&1 ; then
>> +            sed -i -e "s/^LIBVIRT_QPID_ARGS=.*/LIBVIRT_QPID_ARGS=\"--broker $MGMT_HOST --port 5672\"/" $libvirt_qpid_conf
>> +        else
>> +            echo "LIBVIRT_QPID_ARGS=\"--broker $MGMT_HOST --port 5672\"" >> $libvirt_qpid_conf
>> +        fi
>> +    fi
>> +
>>      backup_file /etc/hosts
>>      add_if_not_exist "192.168.50.1 $PHYS_HOST" /etc/hosts
>>      add_if_not_exist "192.168.50.2 $MGMT_HOST" /etc/hosts
>>  
>>      chkconfig ovirt-listen-awake on
>>      chkconfig collectd on
>> +    chkconfig libvirt-qpid on
> 
> What's our security model for libvirt-qpid / brokers ? Our
> existing libvirtd setup is kerberos secured, so it'd expect
> qpid to at least match that before switching.

We're not switching over to qpid until they have integrated with kerberos. 
  It will be a few weeks.  qpid is on the node/appliance now just as a toy 
for people to start playing with.  It's not tied into Taskomatic or 
otherwise used by oVirt at all at this point.

Once they've secured qpid upstream, then we can swap out the existing 
libvirt remote calls for libvirt qpid calls.

Perry



From sseago at redhat.com  Tue Oct 14 21:28:15 2008
From: sseago at redhat.com (Scott Seago)
Date: Tue, 14 Oct 2008 21:28:15 +0000
Subject: [Ovirt-devel] [PATCH] fix validation issues for VM destroy
Message-ID: <1224019695-14686-1-git-send-email-sseago@redhat.com>


Signed-off-by: Scott Seago <sseago at redhat.com>
---
 src/app/controllers/vm_controller.rb |   25 +++++++++++++++++--------
 src/app/models/vm.rb                 |   23 +++++++++++++++++++++++
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb
index bc88760..a9ac9a5 100644
--- a/src/app/controllers/vm_controller.rb
+++ b/src/app/controllers/vm_controller.rb
@@ -137,26 +137,35 @@ class VmController < ApplicationController
   def delete
     vm_ids_str = params[:vm_ids]
     vm_ids = vm_ids_str.split(",").collect {|x| x.to_i}
-    
+    failure_list = []
+    success = false
     begin
       Vm.transaction do
         vms = Vm.find(:all, :conditions => "id in (#{vm_ids.join(', ')})")
         vms.each do |vm|
-          vm.destroy
+          if vm.is_destroyable?
+            vm.destroy
+          else
+            failure_list << vm.description
+          end
         end
       end
-      render :json => { :object => "vm", :success => true, 
-        :alert => "Virtual Machines were successfully deleted." }
+      if failure_list.empty?
+        success = true
+        alert = "Virtual Machines were successfully deleted."
+      else
+        alert = "The following Virtual Machines were not deleted (a VM must be stopped to delete it): "
+        alert+= failure_list.join(', ')
+      end
     rescue
-      render :json => { :object => "vm", :success => false, 
-        :alert => "Error deleting virtual machines." }
+      alert = "Error deleting virtual machines."
     end
+    render :json => { :object => "vm", :success => success, :alert => alert }
   end
 
   def destroy
     vm_resource_pool = @vm.vm_resource_pool_id
-    if ((@vm.state == Vm::STATE_STOPPED and @vm.get_pending_state == Vm::STATE_STOPPED) or
-        (@vm.state == Vm::STATE_PENDING and @vm.get_pending_state == Vm::STATE_PENDING))
+    if (@vm.is_destroyable?)
       @vm.destroy
       render :json => { :object => "vm", :success => true, 
         :alert => "Virtual Machine was successfully deleted." }
diff --git a/src/app/models/vm.rb b/src/app/models/vm.rb
index d7beacf..6853157 100644
--- a/src/app/models/vm.rb
+++ b/src/app/models/vm.rb
@@ -84,6 +84,11 @@ class Vm < ActiveRecord::Base
   STATE_CREATE_FAILED  = "create_failed"
   STATE_INVALID        = "invalid"
 
+  DESTROYABLE_STATES   = [STATE_PENDING,
+                          STATE_STOPPED,
+                          STATE_CREATE_FAILED,
+                          STATE_INVALID]
+
   RUNNING_STATES       = [STATE_RUNNING,
                           STATE_SUSPENDED,
                           STATE_STOPPING,
@@ -272,6 +277,24 @@ class Vm < ActiveRecord::Base
     end
   end
 
+  # whether this VM may be validly deleted. running VMs should not be
+  # allowed to be deleted. Currently we restrict deletion to VMs that
+  # are currently stopped, pending (new without any create_vm tasks having
+  # been run), or create_failed. Also, get_pending_state must equal the
+  # current state -- so that we won't delete a VM with a current pending task
+  def is_destroyable?
+    current_state = state
+    pending_state = get_pending_state
+    DESTROYABLE_STATES.include?(current_state) and (current_state == pending_state)
+  end
+
+  def destroy
+    if !is_destroyable?
+      raise "VM must be stopped to delete it"
+    end
+    super
+  end
+
   protected
   def validate
     resources = vm_resource_pool.max_resources_for_vm(self)
-- 
1.5.5.1



From apevec at redhat.com  Tue Oct 14 22:08:52 2008
From: apevec at redhat.com (Alan Pevec)
Date: Wed, 15 Oct 2008 00:08:52 +0200
Subject: [Ovirt-devel] [PATCH] added rake test to appliance autobuild
In-Reply-To: <1224017928-26999-2-git-send-email-mmorsi@redhat.com>
References: <1224017928-26999-1-git-send-email-mmorsi@redhat.com>
	<1224017928-26999-2-git-send-email-mmorsi@redhat.com>
Message-ID: <48F51874.7050404@redhat.com>

Mohammed Morsi wrote:
> +$ssh_cmd "cd /usr/share/ovirt-server && export RAILS_ENV=test && rake test"

instead "export RAILS_ENV=test && rake test"
RAILS_ENV=test rake test
doesn't work?



From fujimura.toshifumi at np.css.fujitsu.com  Wed Oct 15 01:41:36 2008
From: fujimura.toshifumi at np.css.fujitsu.com (Toshifumi Fujimura)
Date: Wed, 15 Oct 2008 10:41:36 +0900
Subject: [Ovirt-devel] Question about managing strage server on latest
	oVirt
In-Reply-To: <48F4C562.7030504@redhat.com>
References: <48E48EE5.8060508@np.css.fujitsu.com> <48F4C562.7030504@redhat.com>
Message-ID: <48F54A50.1060705@np.css.fujitsu.com>

Thanks for your reply.
I'm looking foward to being out a new release.

Thanks,

Toshifumi Fujimura.
> Toshifumi Fujimura wrote:
>> Hello!
>>
>> I attempt to install a guest OS with WUI follows "Using oVirt".
>> But I cannot add Strage Pool to Hardware Pool.
>> I can't oparate in the way of stage 6 in "Using
>> oVirt"(http://www.ovirt.org/docs/Using_oVirt/Add-Storage.html).
>> Because "Using oVirt" is a little bit old.
>>
>> Would you suggest me a latest instruction of the way to add Strage Pool
>> to Hardware Pool.
>
> We are in the process of putting out a new release (0.94) that will 
> have some updated docs in the ovirt-docs rpm and should have 
> integrated online help.  That might fix your problem.  Try this again 
> when 0.94 is released and if you're still having problems, please let 
> us know.
>
> The release should be out in the next day or two.
>
> Thanks,
>
> Perry
>
>




From pmyers at redhat.com  Wed Oct 15 02:11:01 2008
From: pmyers at redhat.com (Perry Myers)
Date: Tue, 14 Oct 2008 22:11:01 -0400
Subject: [Ovirt-devel] Issue with ISO provisioning
Message-ID: <48F55135.2050100@redhat.com>

I tested out end to end ISO provisioning tonight.  First off, the good 
news...  I managed to get a VM created and booting Windows XP install ISO. 
I even got WinXP installed on an iSCSI LUN and booting consistently.  So 
that's a good start.

To test I set up an NFS share (/local/isos) on physical.priv.ovirt.org and 
put the WinXP iso in there.  I then used the cobbler image add command to 
add a Image called WinXP.  Then I created a VM using this image to 
provision.  Started the VM and it booted from the ISO and started the 
installation process.

Now here are the issues:

Linux installs follow this sort of process:
1. Boot install DVD
2. Install from DVD
3. DVD is no longer needed and can be ejected
3. Reboot from hard disk

Windows installs follow this process:
1. Boot install CD
2. Stage 1 install from CD
3. Reboot
4. Boot from hard disk for Stage 2 install using CD in drive
5. Reboot
6. CD is no longer needed and can be ejected
7. Boot from hard disk

So Windows installs right now work because the soft reboot in step 3 does 
not cause the vm to shutdown.  If it did that, the restart of the vm would 
come up without the ISO in the drive (since that is a temporary association)

We've talked in the past about changing domains so that on reboot the vm 
is destroyed and then restarted by taskomatic.  This way the boot device 
can be toggled between reboots.  This fixes linux PXE provisioning, which 
right now has a problem because after OS installation over PXE boot the 
domain soft reboots and tries to PXE again.

So it seems the requirements for Windows and Linux provisioning are 
somewhat at odds.  What we may have to do is make it so taskomatic is 
aware of the OS type and sets up the semantics of domain rebooting 
accordingly.

Second problem...

I tried to provision a second guest using the same ISO image off of the 
same NFS share.  This failed with the following error in taskomatic:
> libvir: Storage error : no storage vol with matching name
> start_vm
> Task action processing failed: Libvirt::RetrieveError: Call to function virStorageVolLookupByName failed
> /usr/share/ovirt-server/task-omatic/./utils.rb:124:in `lookup_volume_by_name'
> /usr/share/ovirt-server/task-omatic/./utils.rb:124:in `connect_storage_pools'
> /usr/share/ovirt-server/task-omatic/./utils.rb:81:in `each'
> /usr/share/ovirt-server/task-omatic/./utils.rb:81:in `connect_storage_pools'
> /usr/share/ovirt-server/task-omatic/./task_vm.rb:314:in `start_vm'
> /usr/share/ovirt-server/task-omatic/taskomatic.rb:99
> /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

Seems that if the NFS share is previously mounted as a storage pool in 
libvirt, it causes taskomatic to fail.  If I manually destroy the storage 
pool for the NFS mount on the host and undefine it and then try again, the 
start_vm succeeds and recreates the storage pool.

This needs to be fixed...

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 pmyers at redhat.com  Wed Oct 15 02:12:59 2008
From: pmyers at redhat.com (Perry Myers)
Date: Tue, 14 Oct 2008 22:12:59 -0400
Subject: [Ovirt-devel] [PATCH] fix validation issues for VM destroy
In-Reply-To: <1224019695-14686-1-git-send-email-sseago@redhat.com>
References: <1224019695-14686-1-git-send-email-sseago@redhat.com>
Message-ID: <48F551AB.8070008@redhat.com>

Scott Seago wrote:
> Signed-off-by: Scott Seago <sseago at redhat.com>
> ---
>  src/app/controllers/vm_controller.rb |   25 +++++++++++++++++--------
>  src/app/models/vm.rb                 |   23 +++++++++++++++++++++++
>  2 files changed, 40 insertions(+), 8 deletions(-)

This seems to work ok, so ACK and I'm going to push this.

Perry

> diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb
> index bc88760..a9ac9a5 100644
> --- a/src/app/controllers/vm_controller.rb
> +++ b/src/app/controllers/vm_controller.rb
> @@ -137,26 +137,35 @@ class VmController < ApplicationController
>    def delete
>      vm_ids_str = params[:vm_ids]
>      vm_ids = vm_ids_str.split(",").collect {|x| x.to_i}
> -    
> +    failure_list = []
> +    success = false
>      begin
>        Vm.transaction do
>          vms = Vm.find(:all, :conditions => "id in (#{vm_ids.join(', ')})")
>          vms.each do |vm|
> -          vm.destroy
> +          if vm.is_destroyable?
> +            vm.destroy
> +          else
> +            failure_list << vm.description
> +          end
>          end
>        end
> -      render :json => { :object => "vm", :success => true, 
> -        :alert => "Virtual Machines were successfully deleted." }
> +      if failure_list.empty?
> +        success = true
> +        alert = "Virtual Machines were successfully deleted."
> +      else
> +        alert = "The following Virtual Machines were not deleted (a VM must be stopped to delete it): "
> +        alert+= failure_list.join(', ')
> +      end
>      rescue
> -      render :json => { :object => "vm", :success => false, 
> -        :alert => "Error deleting virtual machines." }
> +      alert = "Error deleting virtual machines."
>      end
> +    render :json => { :object => "vm", :success => success, :alert => alert }
>    end
>  
>    def destroy
>      vm_resource_pool = @vm.vm_resource_pool_id
> -    if ((@vm.state == Vm::STATE_STOPPED and @vm.get_pending_state == Vm::STATE_STOPPED) or
> -        (@vm.state == Vm::STATE_PENDING and @vm.get_pending_state == Vm::STATE_PENDING))
> +    if (@vm.is_destroyable?)
>        @vm.destroy
>        render :json => { :object => "vm", :success => true, 
>          :alert => "Virtual Machine was successfully deleted." }
> diff --git a/src/app/models/vm.rb b/src/app/models/vm.rb
> index d7beacf..6853157 100644
> --- a/src/app/models/vm.rb
> +++ b/src/app/models/vm.rb
> @@ -84,6 +84,11 @@ class Vm < ActiveRecord::Base
>    STATE_CREATE_FAILED  = "create_failed"
>    STATE_INVALID        = "invalid"
>  
> +  DESTROYABLE_STATES   = [STATE_PENDING,
> +                          STATE_STOPPED,
> +                          STATE_CREATE_FAILED,
> +                          STATE_INVALID]
> +
>    RUNNING_STATES       = [STATE_RUNNING,
>                            STATE_SUSPENDED,
>                            STATE_STOPPING,
> @@ -272,6 +277,24 @@ class Vm < ActiveRecord::Base
>      end
>    end
>  
> +  # whether this VM may be validly deleted. running VMs should not be
> +  # allowed to be deleted. Currently we restrict deletion to VMs that
> +  # are currently stopped, pending (new without any create_vm tasks having
> +  # been run), or create_failed. Also, get_pending_state must equal the
> +  # current state -- so that we won't delete a VM with a current pending task
> +  def is_destroyable?
> +    current_state = state
> +    pending_state = get_pending_state
> +    DESTROYABLE_STATES.include?(current_state) and (current_state == pending_state)
> +  end
> +
> +  def destroy
> +    if !is_destroyable?
> +      raise "VM must be stopped to delete it"
> +    end
> +    super
> +  end
> +
>    protected
>    def validate
>      resources = vm_resource_pool.max_resources_for_vm(self)


-- 
|=-        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 Oct 15 02:14:50 2008
From: pmyers at redhat.com (Perry Myers)
Date: Tue, 14 Oct 2008 22:14:50 -0400
Subject: [Ovirt-devel] [PATCH] fix validation issues for VM destroy
In-Reply-To: <48F551AB.8070008@redhat.com>
References: <1224019695-14686-1-git-send-email-sseago@redhat.com>
	<48F551AB.8070008@redhat.com>
Message-ID: <48F5521A.6020109@redhat.com>

Perry Myers wrote:
> Scott Seago wrote:
>> Signed-off-by: Scott Seago <sseago at redhat.com>
>> ---
>>  src/app/controllers/vm_controller.rb |   25 +++++++++++++++++--------
>>  src/app/models/vm.rb                 |   23 +++++++++++++++++++++++
>>  2 files changed, 40 insertions(+), 8 deletions(-)
> 
> This seems to work ok, so ACK and I'm going to push this.

Ugh!  My apologies... I didn't realize until after I pushed this that 
apparently when I ran git am to import Scott's patch it totally messed up 
the commit message.  I think it was because Scott sent me the patch 
separately as a forward...

Sorry about that...

Perry\



From pmyers at redhat.com  Wed Oct 15 03:08:21 2008
From: pmyers at redhat.com (Perry Myers)
Date: Tue, 14 Oct 2008 23:08:21 -0400
Subject: [Ovirt-devel] [PATCH server] setup symlink on rpm install based on
	version of installed ovirt-docs
Message-ID: <1224040101-27325-1-git-send-email-pmyers@redhat.com>

Signed-off-by: Perry Myers <pmyers at redhat.com>
---
 ovirt-server.spec.in |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/ovirt-server.spec.in b/ovirt-server.spec.in
index 1339b52..71fa2a1 100644
--- a/ovirt-server.spec.in
+++ b/ovirt-server.spec.in
@@ -31,6 +31,7 @@ Requires: ruby-libvirt >= 0.0.2
 Requires: rrdtool-ruby
 Requires: iscsi-initiator-utils
 Requires: cyrus-sasl-gssapi
+Requires: ovirt-docs
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -146,6 +147,11 @@ fi
 %daemon_chkconfig_post -d ovirt-mongrel-rails
 %daemon_chkconfig_post -d ovirt-taskomatic
 
+# Set up the symlink for ovirt-docs so that online help works
+docs_dir=$(rpm -q --queryformat '/usr/share/doc/%{NAME}-%{VERSION}' ovirt-docs)
+%{__rm} /usr/share/ovirt-server/public/help
+%{__ln_s} $docs_dir/Using_the_oVirt_Server_Suite_User_Interface/ %{app_root}/public/help
+
 %preun
 if [ "$1" = 0 ] ; then
   /sbin/service ovirt-host-browser stop > /dev/null 2>&1
-- 
1.5.5.1



From pmyers at redhat.com  Wed Oct 15 03:08:48 2008
From: pmyers at redhat.com (Perry Myers)
Date: Tue, 14 Oct 2008 23:08:48 -0400
Subject: [Ovirt-devel] [PATCH recipe] Remove ovirt-docs from recipe since it
	is now required by ovirt-server instead
Message-ID: <1224040128-27354-1-git-send-email-pmyers@redhat.com>

Signed-off-by: Perry Myers <pmyers at redhat.com>
---
 appliances/ovirt/ovirt.pp.in |    4 ----
 ovirt-recipe.spec.in         |    1 -
 2 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/appliances/ovirt/ovirt.pp.in b/appliances/ovirt/ovirt.pp.in
index da98f2d..66f7a9e 100644
--- a/appliances/ovirt/ovirt.pp.in
+++ b/appliances/ovirt/ovirt.pp.in
@@ -179,10 +179,6 @@ single_exec {"ovirt_installation":
     require => [Service["postgresql"],Single_exec["ovirt_appliance_installation"]]
 }
 
-single_exec {"ovirt_docs_accesible_from_server":
-    command => "/bin/ln -s /usr/share/doc/ovirt-docs-${appliance_version}/Using_oVirt/ /usr/share/ovirt-server/public/help"
-}
-
 #
 # Cobbler Configuration
 #
diff --git a/ovirt-recipe.spec.in b/ovirt-recipe.spec.in
index b98380c..9fef6af 100644
--- a/ovirt-recipe.spec.in
+++ b/ovirt-recipe.spec.in
@@ -29,7 +29,6 @@ Requires: iscsi-initiator-utils
 Requires: ovirt-server
 Requires: ovirt-node-image-pxe
 Requires: ovirt-release
-Requires: ovirt-docs
 Requires: rhpl
 Requires: cobbler
 Requires: rubygem-cobbler
-- 
1.5.5.1



From jguiditt at redhat.com  Wed Oct 15 03:40:13 2008
From: jguiditt at redhat.com (Jason Guiditta)
Date: Tue, 14 Oct 2008 23:40:13 -0400
Subject: [Ovirt-devel] [PATCH server] setup symlink on rpm install
	based on version of installed ovirt-docs
In-Reply-To: <1224040101-27325-1-git-send-email-pmyers@redhat.com>
References: <1224040101-27325-1-git-send-email-pmyers@redhat.com>
Message-ID: <1224042013.24332.0.camel@localhost.localdomain>

On Tue, 2008-10-14 at 23:08 -0400, Perry Myers wrote:
> Signed-off-by: Perry Myers <pmyers at redhat.com>
> ---
>  ovirt-server.spec.in |    6 ++++++
>  1 files changed, 6 insertions(+), 0 deletions(-)
> 
> diff --git a/ovirt-server.spec.in b/ovirt-server.spec.in
> index 1339b52..71fa2a1 100644
> --- a/ovirt-server.spec.in
> +++ b/ovirt-server.spec.in
> @@ -31,6 +31,7 @@ Requires: ruby-libvirt >= 0.0.2
>  Requires: rrdtool-ruby
>  Requires: iscsi-initiator-utils
>  Requires: cyrus-sasl-gssapi
> +Requires: ovirt-docs
>  Requires(post):  /sbin/chkconfig
>  Requires(preun): /sbin/chkconfig
>  Requires(preun): /sbin/service
> @@ -146,6 +147,11 @@ fi
>  %daemon_chkconfig_post -d ovirt-mongrel-rails
>  %daemon_chkconfig_post -d ovirt-taskomatic
>  
> +# Set up the symlink for ovirt-docs so that online help works
> +docs_dir=$(rpm -q --queryformat '/usr/share/doc/%{NAME}-%{VERSION}' ovirt-docs)
> +%{__rm} /usr/share/ovirt-server/public/help
> +%{__ln_s} $docs_dir/Using_the_oVirt_Server_Suite_User_Interface/ %{app_root}/public/help
> +
>  %preun
>  if [ "$1" = 0 ] ; then
>    /sbin/service ovirt-host-browser stop > /dev/null 2>&1

ACK, this links properly to the new ovirt-docs dir for me, and I can
view the help page by clicking the icon in the web app.

-j



From jguiditt at redhat.com  Wed Oct 15 03:41:13 2008
From: jguiditt at redhat.com (Jason Guiditta)
Date: Tue, 14 Oct 2008 23:41:13 -0400
Subject: [Ovirt-devel] [PATCH recipe] Remove ovirt-docs from recipe
	since it is now required by ovirt-server instead
In-Reply-To: <1224040128-27354-1-git-send-email-pmyers@redhat.com>
References: <1224040128-27354-1-git-send-email-pmyers@redhat.com>
Message-ID: <1224042073.24332.2.camel@localhost.localdomain>

On Tue, 2008-10-14 at 23:08 -0400, Perry Myers wrote:
> Signed-off-by: Perry Myers <pmyers at redhat.com>
> ---
>  appliances/ovirt/ovirt.pp.in |    4 ----
>  ovirt-recipe.spec.in         |    1 -
>  2 files changed, 0 insertions(+), 5 deletions(-)
> 
> diff --git a/appliances/ovirt/ovirt.pp.in b/appliances/ovirt/ovirt.pp.in
> index da98f2d..66f7a9e 100644
> --- a/appliances/ovirt/ovirt.pp.in
> +++ b/appliances/ovirt/ovirt.pp.in
> @@ -179,10 +179,6 @@ single_exec {"ovirt_installation":
>      require => [Service["postgresql"],Single_exec["ovirt_appliance_installation"]]
>  }
>  
> -single_exec {"ovirt_docs_accesible_from_server":
> -    command => "/bin/ln -s /usr/share/doc/ovirt-docs-${appliance_version}/Using_oVirt/ /usr/share/ovirt-server/public/help"
> -}
> -
>  #
>  # Cobbler Configuration
>  #
> diff --git a/ovirt-recipe.spec.in b/ovirt-recipe.spec.in
> index b98380c..9fef6af 100644
> --- a/ovirt-recipe.spec.in
> +++ b/ovirt-recipe.spec.in
> @@ -29,7 +29,6 @@ Requires: iscsi-initiator-utils
>  Requires: ovirt-server
>  Requires: ovirt-node-image-pxe
>  Requires: ovirt-release
> -Requires: ovirt-docs
>  Requires: rhpl
>  Requires: cobbler
>  Requires: rubygem-cobbler

ACK, since this is just backing out an older version of what was added
into the server spec file.

-j



From xxqonline at hotmail.com  Wed Oct 15 08:26:01 2008
From: xxqonline at hotmail.com (xxqonline at hotmail.com)
Date: Wed, 15 Oct 2008 16:26:01 +0800
Subject: [Ovirt-devel] How do I provision a redhat ISO
In-Reply-To: <1223995747-12847-1-git-send-email-pmyers@redhat.com>
References: <1223995747-12847-1-git-send-email-pmyers@redhat.com>
Message-ID: <BAY124-DS59D8DBD2D3C851B51144CB1300@phx.gbl>

Hello folks:
      I have to provision a redhat to the managed host. Is it possible?
      Is there doc for me to follow?

Thanks,
Qiang 



From clalance at redhat.com  Wed Oct 15 11:14:29 2008
From: clalance at redhat.com (Chris Lalancette)
Date: Wed, 15 Oct 2008 13:14:29 +0200
Subject: [Ovirt-devel] Re: ovirt-listen-awake
In-Reply-To: <20081015100051.GB25659@karma.qumranet.com>
References: <20081015100051.GB25659@karma.qumranet.com>
Message-ID: <48F5D095.6090209@redhat.com>

Dan Kenigsberg wrote:
> Hi,
> 
> Please pardon my newbieness; I'm trying to understand what's what in ovirt (did
> not get very far yet), and stumbled upon this:

No problem, happy to help...

> 
> commit f393d38599283676fbd33c81783fd7164faa4251
> Author: Dan Kenigsberg <danken at qumranet.com>
> Date:   Tue Oct 14 12:14:03 2008 +0200
> 
>     ovirt-listen-awake: what's the point of streq?
> 
> diff --git a/ovirt-listen-awake/ovirt-listen-awake.c b/ovirt-listen-awake/ovirt-listen-awake.c
> index 7ecd0a7..b00a54d 100644
> --- a/ovirt-listen-awake/ovirt-listen-awake.c
> +++ b/ovirt-listen-awake/ovirt-listen-awake.c
> @@ -37,14 +37,7 @@
>  
>  static int streq(char *first, char *second)
>  {
> -  int first_len, second_len;
> -
> -  first_len = strlen(first);
> -  second_len = strlen(second);
> -
> -  if (first_len == second_len && strncmp(first, second, first_len) == 0)
> -    return 1;
> -  return 0;
> +  return !strcmp(first, second);
>  }

Heh.  Well, the idea was that I wanted to be a little more defensive, so that
"IDENTIFY" != "IDENTIFYFOO" (or whatever).  I could have sworn I've run into
bugs doing that in the past, but a quick test shows that strcmp() properly
returns failure in that case.

Ah, now I remember.  I was taught always to use strncmp(), and just doing
strncmp(first, second, strlen(first)) runs into the bug I was trying to avoid.
In any case, not a big deal either way; it's not performance critical in the
least, but I guess your version is a little easier to understand.  If we are
going to do it, we can just remove the streq function entirely, since it doesn't
really serve any purpose then.

By the way, you can send this stuff to ovirt-devel; I've added that as a CC here.

-- 
Chris Lalancette



From dpierce at redhat.com  Wed Oct 15 11:37:32 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Wed, 15 Oct 2008 07:37:32 -0400
Subject: [Ovirt-devel] [PATCH server] Added a link from bonding to a boot
	type.
In-Reply-To: <48F4D3B9.6010802@redhat.com>
References: <1223390662-16536-1-git-send-email-dpierce@redhat.com>
	<48EC9489.3040902@redhat.com> <48F4D3B9.6010802@redhat.com>
Message-ID: <48F5D5FC.9030204@redhat.com>

Perry Myers wrote:
>> Yes, this is reasonable.  I like things to be a little more explicit,
>> so having
>> an explicit "DHCP" (as opposed to implicit) makes things better.
>>
>> ACK
> 
> Darryl,
> 
> Did this ever get committed?  If this has an ACK we should get it into
> the 0.94 release.

I thought it had but the changes weren't in the repo. I pushed it this
morning.

-- 
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 333 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081015/8f66a20b/attachment.vcf>

From dpierce at redhat.com  Wed Oct 15 11:46:39 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Wed, 15 Oct 2008 07:46:39 -0400
Subject: [Ovirt-devel] Re: Issue with ISO provisioning
In-Reply-To: <48F55135.2050100@redhat.com>
References: <48F55135.2050100@redhat.com>
Message-ID: <48F5D81F.40703@redhat.com>

Perry Myers wrote:
> I tried to provision a second guest using the same ISO image off of the
> same NFS share.  This failed with the following error in taskomatic:
>> libvir: Storage error : no storage vol with matching name
>> start_vm
>> Task action processing failed: Libvirt::RetrieveError: Call to
>> function virStorageVolLookupByName failed
>> /usr/share/ovirt-server/task-omatic/./utils.rb:124:in
>> `lookup_volume_by_name'
>> /usr/share/ovirt-server/task-omatic/./utils.rb:124:in
>> `connect_storage_pools'
>> /usr/share/ovirt-server/task-omatic/./utils.rb:81:in `each'
>> /usr/share/ovirt-server/task-omatic/./utils.rb:81:in
>> `connect_storage_pools'
>> /usr/share/ovirt-server/task-omatic/./task_vm.rb:314:in `start_vm'
>> /usr/share/ovirt-server/task-omatic/taskomatic.rb:99
>> /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
> 
> Seems that if the NFS share is previously mounted as a storage pool in
> libvirt, it causes taskomatic to fail.  If I manually destroy the
> storage pool for the NFS mount on the host and undefine it and then try
> again, the start_vm succeeds and recreates the storage pool.
> 
> This needs to be fixed...

You shouldn't have to create a storage pool at all to provision an ISO
from Cobbler. As long as the ISO image is on an NFS exported file system
the Image record was given the hostname and export path, a storage pool
need never be defined for it in oVirt.

But, I'll dig into this problem and see what I find.

-- 
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 333 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081015/164f3078/attachment.vcf>

From dpierce at redhat.com  Wed Oct 15 11:53:07 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Wed, 15 Oct 2008 07:53:07 -0400
Subject: [Ovirt-devel] How do I provision a redhat ISO
In-Reply-To: <BAY124-DS59D8DBD2D3C851B51144CB1300@phx.gbl>
References: <1223995747-12847-1-git-send-email-pmyers@redhat.com>
	<BAY124-DS59D8DBD2D3C851B51144CB1300@phx.gbl>
Message-ID: <48F5D9A3.9040507@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

xxqonline at hotmail.com wrote:
> Hello folks:
>      I have to provision a redhat to the managed host. Is it possible?
>      Is there doc for me to follow?

With our upcoming release of oVirt (0.94) ISO provisioning via Cobbler
will be supported. To provision from an ISO file you'll simply:

1. copy the ISO file to an NFS exported file system,
2. create an Image record within the Cobbler server and point it at the
ISO file
3. within the oVirt server, create a new VM
4. when setting the OS for this VM you'll see, and select, the Image
created in step 2 above
5. attach an additional writable file system
6. boot the VM

This will start up a virtual machine with that ISO mounted as a CDROM
and boot from it. That will allow you to provision from ISO.

HTH. :)

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkj12aAACgkQjaT4DmxOfxtDbQCfYybsehyYl9sZ7Et+l6G6glTR
zlMAniUw4eWW8IFWacrR8ofnAu5GaNvW
=HWWa
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 333 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081015/15157435/attachment.vcf>

From hbrock at redhat.com  Wed Oct 15 13:21:10 2008
From: hbrock at redhat.com (Hugh O. Brock)
Date: Wed, 15 Oct 2008 09:21:10 -0400
Subject: [Ovirt-devel] Issue with ISO provisioning
In-Reply-To: <48F55135.2050100@redhat.com>
References: <48F55135.2050100@redhat.com>
Message-ID: <20081015132109.GG23882@redhat.com>

On Tue, Oct 14, 2008 at 10:11:01PM -0400, Perry Myers wrote:

[snip]

>
> So Windows installs right now work because the soft reboot in step 3 does 
> not cause the vm to shutdown.  If it did that, the restart of the vm 
> would come up without the ISO in the drive (since that is a temporary 
> association)
>
> We've talked in the past about changing domains so that on reboot the vm  
> is destroyed and then restarted by taskomatic.  This way the boot device  
> can be toggled between reboots.  This fixes linux PXE provisioning, which 
> right now has a problem because after OS installation over PXE boot the  
> domain soft reboots and tries to PXE again.
>
> So it seems the requirements for Windows and Linux provisioning are  
> somewhat at odds.  What we may have to do is make it so taskomatic is  
> aware of the OS type and sets up the semantics of domain rebooting  
> accordingly.

Yes, this is exactly the same song-and-dance we went through with
python-virtinst when getting Windows installs to work from
virt-manager. What we need to do is figure out a good abstraction for
the various possible install modes and either a. allow the user to
specify what's desired, or preferably b. figure it out ourselves.

What we want is some way to say "OK, the install is finished, now
change the VM to boot in the proper permanent configuration." If we
always set VMs to halt on reboot and we have a way for taskomatic to
detect that a VM has halted in mid-install, we could have the UI pop
up a message asking the user if the install finished? It would be
difficult to make that clear but it could work, I think...

Thoughts?

(BTW great news that we can even do this at all)

--Hugh



From pmyers at redhat.com  Wed Oct 15 13:24:59 2008
From: pmyers at redhat.com (Perry Myers)
Date: Wed, 15 Oct 2008 09:24:59 -0400
Subject: [Ovirt-devel] Re: Issue with ISO provisioning
In-Reply-To: <48F5D81F.40703@redhat.com>
References: <48F55135.2050100@redhat.com> <48F5D81F.40703@redhat.com>
Message-ID: <48F5EF2B.8090501@redhat.com>

Darryl Pierce wrote:
> Perry Myers wrote:
>> I tried to provision a second guest using the same ISO image off of the
>> same NFS share.  This failed with the following error in taskomatic:
>>> libvir: Storage error : no storage vol with matching name
>>> start_vm
>>> Task action processing failed: Libvirt::RetrieveError: Call to
>>> function virStorageVolLookupByName failed
>>> /usr/share/ovirt-server/task-omatic/./utils.rb:124:in
>>> `lookup_volume_by_name'
>>> /usr/share/ovirt-server/task-omatic/./utils.rb:124:in
>>> `connect_storage_pools'
>>> /usr/share/ovirt-server/task-omatic/./utils.rb:81:in `each'
>>> /usr/share/ovirt-server/task-omatic/./utils.rb:81:in
>>> `connect_storage_pools'
>>> /usr/share/ovirt-server/task-omatic/./task_vm.rb:314:in `start_vm'
>>> /usr/share/ovirt-server/task-omatic/taskomatic.rb:99
>>> /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
>> Seems that if the NFS share is previously mounted as a storage pool in
>> libvirt, it causes taskomatic to fail.  If I manually destroy the
>> storage pool for the NFS mount on the host and undefine it and then try
>> again, the start_vm succeeds and recreates the storage pool.
>>
>> This needs to be fixed...
> 
> You shouldn't have to create a storage pool at all to provision an ISO
> from Cobbler. As long as the ISO image is on an NFS exported file system
> the Image record was given the hostname and export path, a storage pool
> need never be defined for it in oVirt.

*I* didn't create a storage pool.  Your code did that in Taskomatic.  What 
I'm saying is if you create a vm that uses a cobbler image as provisioning 
source, your code in taskomatic creates the storage pool on the node so 
that you can access the iso.

If you try to provision another guest on the same node it fails, probably 
because that storage pool already exists but is not tracked in the 
database like other storage pools.

Perry



From berrange at redhat.com  Wed Oct 15 13:27:32 2008
From: berrange at redhat.com (Daniel P. Berrange)
Date: Wed, 15 Oct 2008 14:27:32 +0100
Subject: [Ovirt-devel] Issue with ISO provisioning
In-Reply-To: <20081015132109.GG23882@redhat.com>
References: <48F55135.2050100@redhat.com> <20081015132109.GG23882@redhat.com>
Message-ID: <20081015132732.GK25527@redhat.com>

On Wed, Oct 15, 2008 at 09:21:10AM -0400, Hugh O. Brock wrote:
> On Tue, Oct 14, 2008 at 10:11:01PM -0400, Perry Myers wrote:
> 
> [snip]
> 
> >
> > So Windows installs right now work because the soft reboot in step 3 does 
> > not cause the vm to shutdown.  If it did that, the restart of the vm 
> > would come up without the ISO in the drive (since that is a temporary 
> > association)
> >
> > We've talked in the past about changing domains so that on reboot the vm  
> > is destroyed and then restarted by taskomatic.  This way the boot device  
> > can be toggled between reboots.  This fixes linux PXE provisioning, which 
> > right now has a problem because after OS installation over PXE boot the  
> > domain soft reboots and tries to PXE again.
> >
> > So it seems the requirements for Windows and Linux provisioning are  
> > somewhat at odds.  What we may have to do is make it so taskomatic is  
> > aware of the OS type and sets up the semantics of domain rebooting  
> > accordingly.
> 
> Yes, this is exactly the same song-and-dance we went through with
> python-virtinst when getting Windows installs to work from
> virt-manager. What we need to do is figure out a good abstraction for
> the various possible install modes and either a. allow the user to
> specify what's desired, or preferably b. figure it out ourselves.
>
> What we want is some way to say "OK, the install is finished, now
> change the VM to boot in the proper permanent configuration." If we
> always set VMs to halt on reboot and we have a way for taskomatic to
> detect that a VM has halted in mid-install, we could have the UI pop
> up a message asking the user if the install finished? It would be
> difficult to make that clear but it could work, I think...

Two ideas

 - The BIOS boot device is not a single device, but actually a list
   of devices, so you can do

         <boot dev='cdrom'/>
         <boot dev='hd'/>

   and it'll try 'cdrom' first, falling back to 'hd'.

 - The installer will try to eject the CDROM media inside the guest,
   so if we could make sure it stays ejected we wouldn't need to
   change the XML


Alternatively setup boot order

    <boot dev='hd'/>
    <boot dev='cdrom'/>

and dd 512 zero bytes to the disk before booting the installer so it 
picks the cdrom first time, and on 2nd boot will find the harddisk
bootsector.

NB, we didn't do this with virt-install because we didn't want to
make changes to their disk by accident, but maybe its more acceptable
for oVirts use case where things are more tightly  managed


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 hbrock at redhat.com  Wed Oct 15 13:56:10 2008
From: hbrock at redhat.com (Hugh O. Brock)
Date: Wed, 15 Oct 2008 09:56:10 -0400
Subject: [Ovirt-devel] Issue with ISO provisioning
In-Reply-To: <20081015132732.GK25527@redhat.com>
References: <48F55135.2050100@redhat.com> <20081015132109.GG23882@redhat.com>
	<20081015132732.GK25527@redhat.com>
Message-ID: <20081015135609.GH23882@redhat.com>

On Wed, Oct 15, 2008 at 02:27:32PM +0100, Daniel P. Berrange wrote:
> On Wed, Oct 15, 2008 at 09:21:10AM -0400, Hugh O. Brock wrote:
> > On Tue, Oct 14, 2008 at 10:11:01PM -0400, Perry Myers wrote:
> > 
> > [snip]
> > 
> > >
> > > So Windows installs right now work because the soft reboot in step 3 does 
> > > not cause the vm to shutdown.  If it did that, the restart of the vm 
> > > would come up without the ISO in the drive (since that is a temporary 
> > > association)
> > >
> > > We've talked in the past about changing domains so that on reboot the vm  
> > > is destroyed and then restarted by taskomatic.  This way the boot device  
> > > can be toggled between reboots.  This fixes linux PXE provisioning, which 
> > > right now has a problem because after OS installation over PXE boot the  
> > > domain soft reboots and tries to PXE again.
> > >
> > > So it seems the requirements for Windows and Linux provisioning are  
> > > somewhat at odds.  What we may have to do is make it so taskomatic is  
> > > aware of the OS type and sets up the semantics of domain rebooting  
> > > accordingly.
> > 
> > Yes, this is exactly the same song-and-dance we went through with
> > python-virtinst when getting Windows installs to work from
> > virt-manager. What we need to do is figure out a good abstraction for
> > the various possible install modes and either a. allow the user to
> > specify what's desired, or preferably b. figure it out ourselves.
> >
> > What we want is some way to say "OK, the install is finished, now
> > change the VM to boot in the proper permanent configuration." If we
> > always set VMs to halt on reboot and we have a way for taskomatic to
> > detect that a VM has halted in mid-install, we could have the UI pop
> > up a message asking the user if the install finished? It would be
> > difficult to make that clear but it could work, I think...
> 
> Two ideas
> 
>  - The BIOS boot device is not a single device, but actually a list
>    of devices, so you can do
> 
>          <boot dev='cdrom'/>
>          <boot dev='hd'/>
> 
>    and it'll try 'cdrom' first, falling back to 'hd'.
> 
>  - The installer will try to eject the CDROM media inside the guest,
>    so if we could make sure it stays ejected we wouldn't need to
>    change the XML
> 
> 
> Alternatively setup boot order
> 
>     <boot dev='hd'/>
>     <boot dev='cdrom'/>
> 
> and dd 512 zero bytes to the disk before booting the installer so it 
> picks the cdrom first time, and on 2nd boot will find the harddisk
> bootsector.
> 
> NB, we didn't do this with virt-install because we didn't want to
> make changes to their disk by accident, but maybe its more acceptable
> for oVirts use case where things are more tightly  managed
> 
> 
The first idea probably works better for the Windows-multiple-reboot
case, since presumably Windows won't eject the install media until
it's really done with it.

QEMU should deal with "ejecting" a virtual cdrom OK, shouldn't it?

--Hugh



From xxqonline at hotmail.com  Wed Oct 15 14:11:43 2008
From: xxqonline at hotmail.com (xxqonline at hotmail.com)
Date: Wed, 15 Oct 2008 22:11:43 +0800
Subject: [Ovirt-devel] Can ovirt talk with Redhat5 
In-Reply-To: <1223995747-12847-1-git-send-email-pmyers@redhat.com>
	<BAY124-DS59D8DBD2D3C851B51144CB1300@phx.gbl>
	<48F5D9A3.9040507@redhat.com>
References: <1223995747-12847-1-git-send-email-pmyers@redhat.com>
	<BAY124-DS59D8DBD2D3C851B51144CB1300@phx.gbl>
	<48F5D9A3.9040507@redhat.com>
Message-ID: <BAY124-DS4EFF041E3FE621AA023C8B1300@phx.gbl>

Hello guys:
      I have used the PXE to connect admin and managed host together.
    Seems it create a ovirt node on the managed host.

    Now I want to know is it possible to manage the redhat physical machine.
    The red hat is pre-installed on the managed host.

    I ask this question, because I saw your architecture picture, that ovirt 
use libvirt to talk with managed host.

    Thanks for any feedback.

Regards,
Qiang 



From sseago at redhat.com  Wed Oct 15 14:21:33 2008
From: sseago at redhat.com (Scott Seago)
Date: Wed, 15 Oct 2008 14:21:33 +0000
Subject: [Ovirt-devel] [PATCH] initial model work for lvm storage (revised)
Message-ID: <1224080493-29248-1-git-send-email-sseago@redhat.com>

This includes the model classes w/ migrations for the lvm storage pools and volumes, and some changes required to support Storage Volume tasks. This patch does not include all of the necessary model API methods to support lvm, but it's a starting point -- some changes to clalance's taskomatic bits will be required to support this, and we will need additional model enhancements when the UI work is done, and when the taskomatic back end is finalized.

revised to fix a couple controller bugs and to increment the migration version #

Signed-off-by: Scott Seago <sseago at redhat.com>
---
 src/app/controllers/host_controller.rb             |    8 +-
 src/app/controllers/storage_controller.rb          |   35 ++-----
 src/app/controllers/vm_controller.rb               |   34 +++---
 src/app/models/host.rb                             |    2 +-
 src/app/models/host_task.rb                        |   11 ++-
 src/app/models/iscsi_storage_pool.rb               |    2 +-
 .../models/{host_task.rb => lvm_storage_pool.rb}   |   30 ++++--
 .../{nfs_storage_pool.rb => lvm_storage_volume.rb} |   12 +--
 src/app/models/nfs_storage_pool.rb                 |    2 +-
 src/app/models/storage_pool.rb                     |   12 ++-
 src/app/models/storage_task.rb                     |   11 ++-
 src/app/models/storage_volume.rb                   |   15 +++-
 .../{host_task.rb => storage_volume_task.rb}       |   22 +++-
 src/app/models/task.rb                             |   15 ++-
 src/app/models/vm.rb                               |    2 +-
 src/app/models/vm_task.rb                          |   15 ++-
 src/db/migrate/025_add_lvm_storage.rb              |  106 ++++++++++++++++++++
 src/dutils/active_record_env.rb                    |    2 +
 18 files changed, 251 insertions(+), 85 deletions(-)
 copy src/app/models/{host_task.rb => lvm_storage_pool.rb} (62%)
 copy src/app/models/{nfs_storage_pool.rb => lvm_storage_volume.rb} (82%)
 copy src/app/models/{host_task.rb => storage_volume_task.rb} (69%)
 create mode 100644 src/db/migrate/025_add_lvm_storage.rb

diff --git a/src/app/controllers/host_controller.rb b/src/app/controllers/host_controller.rb
index 417d11f..a40d297 100644
--- a/src/app/controllers/host_controller.rb
+++ b/src/app/controllers/host_controller.rb
@@ -139,10 +139,10 @@ class HostController < ApplicationController
   def clear_vms
     begin
       Host.transaction do
-        task = HostTask.new({ :user    => get_login_user,
-                              :host_id   => @host.id,
-                              :action  => HostTask::ACTION_CLEAR_VMS,
-                              :state   => Task::STATE_QUEUED})
+        task = HostTask.new({ :user        => get_login_user,
+                              :task_target => @host,
+                              :action      => HostTask::ACTION_CLEAR_VMS,
+                              :state       => Task::STATE_QUEUED})
         task.save!
         @host.is_disabled = true
         @host.save!
diff --git a/src/app/controllers/storage_controller.rb b/src/app/controllers/storage_controller.rb
index bbd7840..fe524f3 100644
--- a/src/app/controllers/storage_controller.rb
+++ b/src/app/controllers/storage_controller.rb
@@ -111,10 +111,10 @@ class StorageController < ApplicationController
   end
 
   def insert_refresh_task
-    @task = StorageTask.new({ :user            => @user,
-                              :storage_pool_id => @storage_pool.id,
-                              :action          => StorageTask::ACTION_REFRESH_POOL,
-                              :state           => Task::STATE_QUEUED})
+    @task = StorageTask.new({ :user        => @user,
+                              :task_target => @storage_pool,
+                              :action      => StorageTask::ACTION_REFRESH_POOL,
+                              :state       => Task::STATE_QUEUED})
     @task.save!
   end
 
@@ -144,12 +144,14 @@ class StorageController < ApplicationController
             :location => storage_pool_url(@storage_pool)
         }
       end
-    rescue
+    rescue => ex
       # FIXME: need to distinguish pool vs. task save errors (but should mostly be pool)
       respond_to do |format|
         format.json {
-          render :json => { :object => "storage_pool", :success => false,
-            :errors => @storage_pool.errors.localize_error_messages.to_a  } }
+          json_hash = { :object => "storage_pool", :success => false,
+            :errors => @storage_pool.errors.localize_error_messages.to_a  }
+          json_hash[:message] = ex.message if json_hash[:errors].empty?
+          render :json => json_hash }
         format.xml { render :xml => @storage_pool.errors,
           :status => :unprocessable_entity }
       end
@@ -181,7 +183,7 @@ class StorageController < ApplicationController
     @redir_controller = @perm_obj.get_controller
     authorize_admin
     @storage_pools = @hardware_pool.storage_volumes
-    @storage_types = StoragePool::STORAGE_TYPES.keys
+    @storage_types = StoragePool::STORAGE_TYPE_PICKLIST
   end
 
   def addstorage
@@ -226,23 +228,6 @@ class StorageController < ApplicationController
     end
   end
 
-  def vm_action
-    if @vm.get_action_list.include?(params[:vm_action])
-      @task = VmTask.new({ :user    => get_login_user,
-                         :vm_id   => params[:id],
-                         :action  => params[:vm_action],
-                         :state   => Task::STATE_QUEUED})
-      if @task.save
-        flash[:notice] = "#{params[:vm_action]} was successfully queued."
-      else
-        flash[:notice] = "Error in inserting task for #{params[:vm_action]}."
-      end
-    else
-      flash[:notice] = "#{params[:vm_action]} is an invalid action."
-    end
-    redirect_to :controller => 'vm', :action => 'show', :id => params[:id]
-  end
-
   def destroy
     pool = @storage_pool.hardware_pool
     if @storage_pool.destroy
diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb
index a9ac9a5..585e524 100644
--- a/src/app/controllers/vm_controller.rb
+++ b/src/app/controllers/vm_controller.rb
@@ -49,19 +49,19 @@ class VmController < ApplicationController
       Vm.transaction do
         @vm.save!
         _setup_vm_provision(params)
-        @task = VmTask.new({ :user    => @user,
-                             :vm_id   => @vm.id,
-                             :action  => VmTask::ACTION_CREATE_VM,
-                             :state   => Task::STATE_QUEUED})
+        @task = VmTask.new({ :user        => @user,
+                             :task_target => @vm,
+                             :action      => VmTask::ACTION_CREATE_VM,
+                             :state       => Task::STATE_QUEUED})
         @task.save!
       end
       start_now = params[:start_now]
       if (start_now)
         if @vm.get_action_list.include?(VmTask::ACTION_START_VM)
-          @task = VmTask.new({ :user    => @user,
-                               :vm_id   => @vm.id,
-                               :action  => VmTask::ACTION_START_VM,
-                               :state   => Task::STATE_QUEUED})
+          @task = VmTask.new({ :user        => @user,
+                               :task_target => @vm,
+                               :action      => VmTask::ACTION_START_VM,
+                               :state       => Task::STATE_QUEUED})
           @task.save!
           alert = "VM was successfully created. VM Start action queued."
         else
@@ -105,19 +105,19 @@ class VmController < ApplicationController
       _setup_vm_provision(params)
 
       if (params[:start_now] and @vm.get_action_list.include?(VmTask::ACTION_START_VM) )
-        @task = VmTask.new({ :user    => @user,
-                             :vm_id   => @vm.id,
-                             :action  => VmTask::ACTION_START_VM,
-                             :state   => Task::STATE_QUEUED})
+        @task = VmTask.new({ :user        => @user,
+                             :task_target => @vm,
+                             :action      => VmTask::ACTION_START_VM,
+                             :state       => Task::STATE_QUEUED})
         @task.save!
       elsif ( params[:restart_now] and @vm.get_action_list.include?(VmTask::ACTION_SHUTDOWN_VM) )
-        @task = VmTask.new({ :user    => @user,
-                             :vm_id   => @vm.id,
-                             :action  => VmTask::ACTION_SHUTDOWN_VM,
-                             :state   => Task::STATE_QUEUED})
+        @task = VmTask.new({ :user        => @user,
+                             :task_target => @vm,
+                             :action      => VmTask::ACTION_SHUTDOWN_VM,
+                             :state       => Task::STATE_QUEUED})
         @task.save!
         @task = VmTask.new({ :user    => @user,
-                             :vm_id   => @vm.id,
+                             :task_target => @vm,
                              :action  => VmTask::ACTION_START_VM,
                              :state   => Task::STATE_QUEUED})
         @task.save!
diff --git a/src/app/models/host.rb b/src/app/models/host.rb
index de5c5ee..546da19 100644
--- a/src/app/models/host.rb
+++ b/src/app/models/host.rb
@@ -31,7 +31,7 @@ class Host < ActiveRecord::Base
     def consuming_resources
       find(:all, :conditions=>{:state=>Vm::RUNNING_STATES})
     end
-  has_many :tasks, :class_name => "HostTask", :dependent => :destroy, :order => "id DESC" do
+  has_many :tasks, :as => :task_target, :dependent => :destroy, :order => "id ASC" do
     def queued
       find(:all, :conditions=>{:state=>Task::STATE_QUEUED})
     end
diff --git a/src/app/models/host_task.rb b/src/app/models/host_task.rb
index 0aea41b..82298db 100644
--- a/src/app/models/host_task.rb
+++ b/src/app/models/host_task.rb
@@ -22,11 +22,20 @@ class HostTask < Task
   ACTION_CLEAR_VMS = "clear_vms"
 
   def after_initialize
-    self.hardware_pool = host.hardware_pool if self.host
+    self.hardware_pool = task_target.hardware_pool if self.task_target_type=="Host"
   end
 
   def task_obj
     "Host;;;#{self.host.id};;;#{self.host.hostname}"
   end
 
+  def vm
+    nil
+  end
+  def storage_volume
+    nil
+  end
+  def storage_pool
+    nil
+  end
 end
diff --git a/src/app/models/iscsi_storage_pool.rb b/src/app/models/iscsi_storage_pool.rb
index 1280834..7802a90 100644
--- a/src/app/models/iscsi_storage_pool.rb
+++ b/src/app/models/iscsi_storage_pool.rb
@@ -19,7 +19,7 @@
 
 class IscsiStoragePool < StoragePool
   
-  validates_presence_of :port, :target
+  validates_presence_of :ip_addr, :port, :target
   validates_uniqueness_of :ip_addr, :scope => [:port, :target]
   
   def label_components
diff --git a/src/app/models/host_task.rb b/src/app/models/lvm_storage_pool.rb
similarity index 62%
copy from src/app/models/host_task.rb
copy to src/app/models/lvm_storage_pool.rb
index 0aea41b..08b8938 100644
--- a/src/app/models/host_task.rb
+++ b/src/app/models/lvm_storage_pool.rb
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 Red Hat, Inc.
 # Written by Scott Seago <sseago at redhat.com>
 #
@@ -17,16 +17,32 @@
 # MA  02110-1301, USA.  A copy of the GNU General Public License is
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
-class HostTask < Task
+require 'util/ovirt'
+
+class LvmStoragePool < StoragePool
+
+  has_many :source_volumes, :class_name => "StorageVolume",
+                            :foreign_key => "lvm_pool_id",
+                            :dependent => :nullify do
+    def total_size
+      find(:all).inject(0){ |sum, sv| sum + sv.size }
+    end
+  end
 
-  ACTION_CLEAR_VMS = "clear_vms"
+  validates_presence_of :vg_name
+  validates_uniqueness_of :vg_name
 
-  def after_initialize
-    self.hardware_pool = host.hardware_pool if self.host
+  def display_name
+    "#{get_type_label}: #{vg_name}"
   end
 
-  def task_obj
-    "Host;;;#{self.host.id};;;#{self.host.hostname}"
+  def size
+    source_volums.total_size
   end
 
+  def size_in_gb
+    kb_to_gb(size)
+  end
+
+
 end
diff --git a/src/app/models/nfs_storage_pool.rb b/src/app/models/lvm_storage_volume.rb
similarity index 82%
copy from src/app/models/nfs_storage_pool.rb
copy to src/app/models/lvm_storage_volume.rb
index 2d05305..7dde2d1 100644
--- a/src/app/models/nfs_storage_pool.rb
+++ b/src/app/models/lvm_storage_volume.rb
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 Red Hat, Inc.
 # Written by Scott Seago <sseago at redhat.com>
 #
@@ -17,12 +17,8 @@
 # MA  02110-1301, USA.  A copy of the GNU General Public License is
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
-class NfsStoragePool < StoragePool
-
-  validates_presence_of :export_path
-  validates_uniqueness_of :ip_addr, :scope => :export_path
-
-  def label_components
-    "#{export_path}"
+class LvmStorageVolume < StorageVolume
+  def display_name
+    "#{get_type_label}: #{storage_pool.vg_name}:#{lv_name}"
   end
 end
diff --git a/src/app/models/nfs_storage_pool.rb b/src/app/models/nfs_storage_pool.rb
index 2d05305..a27944b 100644
--- a/src/app/models/nfs_storage_pool.rb
+++ b/src/app/models/nfs_storage_pool.rb
@@ -19,7 +19,7 @@
 
 class NfsStoragePool < StoragePool
 
-  validates_presence_of :export_path
+  validates_presence_of :ip_addr, :export_path
   validates_uniqueness_of :ip_addr, :scope => :export_path
 
   def label_components
diff --git a/src/app/models/storage_pool.rb b/src/app/models/storage_pool.rb
index bc98f8e..7a6f8f0 100644
--- a/src/app/models/storage_pool.rb
+++ b/src/app/models/storage_pool.rb
@@ -19,7 +19,7 @@
 
 class StoragePool < ActiveRecord::Base
   belongs_to              :hardware_pool
-  has_many :tasks, :class_name => "StorageTask", :dependent => :destroy, :order => "id DESC" do
+  has_many :tasks, :as => :task_target, :dependent => :destroy, :order => "id ASC" do
     def queued
       find(:all, :conditions=>{:state=>Task::STATE_QUEUED})
     end
@@ -33,14 +33,18 @@ class StoragePool < ActiveRecord::Base
   has_many :smart_pool_tags, :as => :tagged, :dependent => :destroy
   has_many :smart_pools, :through => :smart_pool_tags
 
-  validates_presence_of :ip_addr, :hardware_pool_id
+
+  validates_presence_of :hardware_pool_id
 
   acts_as_xapian :texts => [ :ip_addr, :target, :export_path, :type ],
                  :terms => [ [ :search_users, 'U', "search_users" ] ]
   ISCSI = "iSCSI"
   NFS   = "NFS"
+  LVM   = "LVM"
   STORAGE_TYPES = { ISCSI => "Iscsi",
-                    NFS   => "Nfs" }
+                    NFS   => "Nfs",
+                    LVM   => "Lvm" }
+  STORAGE_TYPE_PICKLIST = STORAGE_TYPES.keys - [LVM]
 
   def self.factory(type, params = nil)
     case type
@@ -48,6 +52,8 @@ class StoragePool < ActiveRecord::Base
       return IscsiStoragePool.new(params)
     when NFS
       return NfsStoragePool.new(params)
+    when LVM
+      return LvmStoragePool.new(params)
     else
       return nil
     end
diff --git a/src/app/models/storage_task.rb b/src/app/models/storage_task.rb
index db604d5..785f0ea 100644
--- a/src/app/models/storage_task.rb
+++ b/src/app/models/storage_task.rb
@@ -22,10 +22,19 @@ class StorageTask < Task
   ACTION_REFRESH_POOL = "refresh_pool"
 
   def after_initialize
-    self.hardware_pool = storage_pool.hardware_pool if self.storage_pool
+    self.hardware_pool = task_target.hardware_pool if self.task_target_type=="StoragePool"
   end
 
   def task_obj
     "StoragePool;;;#{self.storage_pool.id};;;#{self.storage_pool.display_name}"
   end
+  def host
+    nil
+  end
+  def vm
+    nil
+  end
+  def storage_volume
+    nil
+  end
 end
diff --git a/src/app/models/storage_volume.rb b/src/app/models/storage_volume.rb
index ef9cd6e..378b58f 100644
--- a/src/app/models/storage_volume.rb
+++ b/src/app/models/storage_volume.rb
@@ -23,12 +23,23 @@ class StorageVolume < ActiveRecord::Base
   belongs_to              :storage_pool
   has_and_belongs_to_many :vms
 
+  belongs_to :lvm_storage_pool, :class_name => "LvmStoragePool",
+                            :foreign_key => "lvm_pool_id"
+
+  has_many :tasks, :as => :task_target, :dependent => :destroy, :order => "id ASC" do
+    def queued
+      find(:all, :conditions=>{:state=>Task::STATE_QUEUED})
+    end
+  end
+
   def self.factory(type, params = nil)
     case type
-    when "iSCSI"
+    when StoragePool::ISCSI
       return IscsiStorageVolume.new(params)
-    when "NFS"
+    when StoragePool::NFS
       return NfsStorageVolume.new(params)
+    when StoragePool::LVM
+      return LvmStorageVolume.new(params)
     else
       return nil
     end
diff --git a/src/app/models/host_task.rb b/src/app/models/storage_volume_task.rb
similarity index 69%
copy from src/app/models/host_task.rb
copy to src/app/models/storage_volume_task.rb
index 0aea41b..78f2895 100644
--- a/src/app/models/host_task.rb
+++ b/src/app/models/storage_volume_task.rb
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 Red Hat, Inc.
 # Written by Scott Seago <sseago at redhat.com>
 #
@@ -17,16 +17,26 @@
 # MA  02110-1301, USA.  A copy of the GNU General Public License is
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
-class HostTask < Task
+class StorageVolumeTask < Task
 
-  ACTION_CLEAR_VMS = "clear_vms"
+  ACTION_CREATE_VOLUME = "create_volume"
+  ACTION_EDIT_VOLUME = "edit_volume"
 
   def after_initialize
-    self.hardware_pool = host.hardware_pool if self.host
+    self.hardware_pool = task_target.storage_pool.hardware_pool if self.task_target_type=="StorageVolume"
   end
 
   def task_obj
-    "Host;;;#{self.host.id};;;#{self.host.hostname}"
+    "StorageVolume;;;#{self.storage_volume.id};;;#{self.storage_volume.display_name}"
+  end
+  end
+  def host
+    nil
+  end
+  def vm
+    nil
+  end
+  def storage_pool
+    nil
   end
-
 end
diff --git a/src/app/models/task.rb b/src/app/models/task.rb
index efbed64..f231c18 100644
--- a/src/app/models/task.rb
+++ b/src/app/models/task.rb
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 Red Hat, Inc.
 # Written by Scott Seago <sseago at redhat.com>
 #
@@ -20,13 +20,20 @@
 class Task < ActiveRecord::Base
   belongs_to :hardware_pool
   belongs_to :vm_resource_pool
+  belongs_to :task_target,       :polymorphic => true
   # moved associations here so that nested set :include directives work
   # StorageTask association
-  belongs_to :storage_pool
+  belongs_to :storage_pool,   :class_name => "StoragePool",
+                              :foreign_key => "task_target_id"
+  # StorageVolumeTask association
+  belongs_to :storage_volume, :class_name => "StorageVolume",
+                              :foreign_key => "task_target_id"
   # HostTask association
-  belongs_to :host
+  belongs_to :host,           :class_name => "Host",
+                              :foreign_key => "task_target_id"
   # VmTask association
-  belongs_to :vm
+  belongs_to :vm,             :class_name => "Vm",
+                              :foreign_key => "task_target_id"
 
   STATE_QUEUED       = "queued"
   STATE_RUNNING      = "running"
diff --git a/src/app/models/vm.rb b/src/app/models/vm.rb
index 6853157..4885b5c 100644
--- a/src/app/models/vm.rb
+++ b/src/app/models/vm.rb
@@ -22,7 +22,7 @@ require 'util/ovirt'
 class Vm < ActiveRecord::Base
   belongs_to :vm_resource_pool
   belongs_to :host
-  has_many :tasks, :class_name => "VmTask", :dependent => :destroy, :order => "id ASC" do
+  has_many :tasks, :as => :task_target, :dependent => :destroy, :order => "id ASC" do
     def queued
       find(:all, :conditions=>{:state=>Task::STATE_QUEUED})
     end
diff --git a/src/app/models/vm_task.rb b/src/app/models/vm_task.rb
index 6251919..d1966dc 100644
--- a/src/app/models/vm_task.rb
+++ b/src/app/models/vm_task.rb
@@ -107,9 +107,9 @@ class VmTask < Task
                                       :popup_action => 'migrate'} }
 
   def after_initialize
-    if self.vm
-      self.vm_resource_pool = vm.vm_resource_pool
-      self.hardware_pool = vm.get_hardware_pool
+    if self.task_target_type=="Vm"
+      self.vm_resource_pool = task_target.vm_resource_pool
+      self.hardware_pool = task_target.get_hardware_pool
     end
   end
 
@@ -141,4 +141,13 @@ class VmTask < Task
   def self.label_and_action(action)
     return [action_label(action), action, action_icon(action)]
   end
+  def host
+    nil
+  end
+  def storage_volume
+    nil
+  end
+  def storage_pool
+    nil
+  end
 end
diff --git a/src/db/migrate/025_add_lvm_storage.rb b/src/db/migrate/025_add_lvm_storage.rb
new file mode 100644
index 0000000..697df4d
--- /dev/null
+++ b/src/db/migrate/025_add_lvm_storage.rb
@@ -0,0 +1,106 @@
+#
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Scott Seago <sseago at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+class AddLvmStorage < ActiveRecord::Migration
+  def self.up
+    #LVM pool does not use ip_addr
+
+    # VG Name
+    add_column :storage_pools, :vg_name, :string
+
+    # LV name
+    add_column :storage_volumes, :lv_name, :string
+    # LV capacity==existing size attr
+
+    # LV <target><permissions>
+    # FIXME: do we want to make these user-determined, or should
+    # these be defined by the model itself?
+    add_column :storage_volumes, :lv_owner_perms, :string
+    add_column :storage_volumes, :lv_group_perms, :string
+    add_column :storage_volumes, :lv_mode_perms, :string
+
+    # VG pool ID
+    add_column :storage_volumes, :lvm_pool_id, :integer
+    execute "alter table storage_volumes add constraint fk_storage_volumes_lvm_pools
+             foreign key (lvm_pool_id) references storage_pools(id)"
+
+    # use polymorphic tasks association
+    add_column :tasks, :task_target_id, :integer
+    add_column :tasks, :task_target_type, :string
+    begin
+      Task.transaction do
+        HostTask.find(:all).each do |task|
+          task.task_target_type = 'Host'
+          task.task_target_id = task.host_id
+          task.save!
+        end
+        StorageTask.find(:all).each do |task|
+          task.task_target_type = 'StoragePool'
+          task.task_target_id = task.storage_pool_id
+          task.save!
+        end
+        VmTask.find(:all).each do |task|
+          task.task_target_type = 'Vm'
+          task.task_target_id = task.vm_id
+          task.save!
+        end
+      end
+      remove_column :tasks, :vm_id
+      remove_column :tasks, :storage_pool_id
+      remove_column :tasks, :host_id
+    rescue
+      puts "could not update tasks..."
+    end
+
+  end
+
+  def self.down
+    remove_column :storage_pools, :vg_name
+
+    remove_column :storage_volumes, :lv_name
+    remove_column :storage_volumes, :lv_owner_perms
+    remove_column :storage_volumes, :lv_group_perms
+    remove_column :storage_volumes, :lv_mode_perms
+    remove_column :storage_volumes, :lvm_pool_id
+
+    add_column :tasks, :vm_id, :integer
+    add_column :tasks, :storage_pool_id, :integer
+    add_column :tasks, :host_id, :integer
+    begin
+      Task.transaction do
+        HostTask.find(:all).each do |task|
+          task.host_id = task.task_target_id
+          task.save!
+        end
+        StorageTask.find(:all).each do |task|
+          task.storage_pool_id = task.task_target_id
+          task.save!
+        end
+        VmTask.find(:all).each do |task|
+          task.vm_id = task.task_target_id
+          task.save!
+        end
+      end
+      remove_column :tasks, :task_target_id
+      remove_column :tasks, :task_target_type
+    rescue
+      puts "could not update tasks..."
+    end
+  end
+end
diff --git a/src/dutils/active_record_env.rb b/src/dutils/active_record_env.rb
index 3903c87..26caac2 100644
--- a/src/dutils/active_record_env.rb
+++ b/src/dutils/active_record_env.rb
@@ -80,10 +80,12 @@ require 'models/vm_task.rb'
 require 'models/storage_pool.rb'
 require 'models/iscsi_storage_pool.rb'
 require 'models/nfs_storage_pool.rb'
+require 'models/lvm_storage_pool.rb'
 
 require 'models/storage_volume.rb'
 require 'models/iscsi_storage_volume.rb'
 require 'models/nfs_storage_volume.rb'
+require 'models/lvm_storage_volume.rb'
 require 'models/smart_pool.rb'
 require 'models/smart_pool_tag.rb'
 
-- 
1.5.5.1



From sseago at redhat.com  Wed Oct 15 15:07:09 2008
From: sseago at redhat.com (Scott Seago)
Date: Wed, 15 Oct 2008 15:07:09 +0000
Subject: [Ovirt-devel] [PATCH] model apis for the storage tree view for the
	new VM form.
Message-ID: <1224083229-29533-1-git-send-email-sseago@redhat.com>

HardwarePool.storage_tree returns a list of storage pools in the HW pool. For each pool, the :children hash element has a list of storage volumes, filtered to include only available volumes (and ones attached to the current VM for edit operations). For each storage volume, if it supports LVM, then it has a :children element with LVM volumes defined on it.

The hash includes fields showing which are available for use (:available) and which support creating new child volumes (currently iSCSI volumes, with NFS Pools soon to be added)

Signed-off-by: Scott Seago <sseago at redhat.com>
---
 src/app/models/hardware_pool.rb        |    6 +++++
 src/app/models/iscsi_storage_volume.rb |    6 +++++
 src/app/models/storage_pool.rb         |   27 +++++++++++++++++++++++++
 src/app/models/storage_volume.rb       |   34 ++++++++++++++++++++++++++++++++
 4 files changed, 73 insertions(+), 0 deletions(-)

diff --git a/src/app/models/hardware_pool.rb b/src/app/models/hardware_pool.rb
index 160f663..6780329 100644
--- a/src/app/models/hardware_pool.rb
+++ b/src/app/models/hardware_pool.rb
@@ -101,4 +101,10 @@ class HardwarePool < Pool
     return {:total => total, :labels => labels}
   end
 
+  def storage_tree(vm_to_include=nil)
+    storage_pools.find(:all,
+                    :conditions => "type != 'LvmStoragePool'").collect do |pool|
+      pool.storage_tree_element(vm_to_include)
+    end
+  end
 end
diff --git a/src/app/models/iscsi_storage_volume.rb b/src/app/models/iscsi_storage_volume.rb
index b254cd8..00d7db2 100644
--- a/src/app/models/iscsi_storage_volume.rb
+++ b/src/app/models/iscsi_storage_volume.rb
@@ -21,4 +21,10 @@ class IscsiStorageVolume < StorageVolume
   def label_components
     "#{storage_pool[:target]}:#{lun}"
   end
+
+  #FIXME: should also take available free space into account
+  def supports_lvm_subdivision
+    return true
+  end
+
 end
diff --git a/src/app/models/storage_pool.rb b/src/app/models/storage_pool.rb
index 7a6f8f0..aed2902 100644
--- a/src/app/models/storage_pool.rb
+++ b/src/app/models/storage_pool.rb
@@ -28,6 +28,9 @@ class StoragePool < ActiveRecord::Base
     def total_size_in_gb
       find(:all).inject(0){ |sum, sv| sum + sv.size_in_gb }
     end
+    def full_vm_list
+      find(:all).inject([]){ |list, sv| list + sv.vms }
+    end
   end
 
   has_many :smart_pool_tags, :as => :tagged, :dependent => :destroy
@@ -73,4 +76,28 @@ class StoragePool < ActiveRecord::Base
   def search_users
     hardware_pool.search_users
   end
+
+  def user_subdividable
+    false
+  end
+
+  def storage_tree_element(vm_to_include=nil)
+    return_hash = { :id => id,
+      :type => self[:type],
+      :text => display_name,
+      :name => display_name,
+      :available => false,
+      :create_volume => user_subdividable,
+      :selected => false}
+    condition = "vms.id is null"
+    if (vm_to_include and vm_to_include.id)
+      condition +=" or vms.id=#{vm_to_include.id}"
+    end
+    return_hash[:children] = storage_volumes.find(:all,
+                               :include => :vms,
+                               :conditions => condition).collect do |volume|
+      volume.storage_tree_element(vm_to_include)
+    end
+    return_hash
+  end
 end
diff --git a/src/app/models/storage_volume.rb b/src/app/models/storage_volume.rb
index 378b58f..3bd5da0 100644
--- a/src/app/models/storage_volume.rb
+++ b/src/app/models/storage_volume.rb
@@ -70,4 +70,38 @@ class StorageVolume < ActiveRecord::Base
       return []
     end
   end
+
+  def supports_lvm_subdivision
+    return false
+  end
+
+  def storage_tree_element(vm_to_include=nil)
+    vm_ids = vms.collect {|vm| vm.id}
+    return_hash = { :id => id,
+      :type => self[:type],
+      :text => display_name,
+      :name => display_name,
+      :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,
+      :selected => (!vm_ids.empty? and vm_to_include and vm_to_include.id and
+                   (vm_ids.include?(vm_to_include.id)))}
+    if lvm_storage_pool
+      if return_hash[:available]
+        return_hash[:available] = lvm_storage_pool.storage_volumes.full_vm_list.empty?
+      end
+      condition = "vms.id is null"
+      if (vm_to_include and vm_to_include.id)
+        condition +=" or vms.id=#{vm_to_include.id}"
+      end
+      return_hash[:children] = lvm_storage_pool.storage_volumes.find(:all,
+                               :include => :vms,
+                               :conditions => condition).collect do |volume|
+        volume.storage_tree_element(vm_to_include)
+      end
+    end
+    return_hash
+  end
+
 end
-- 
1.5.5.1



From clalance at redhat.com  Wed Oct 15 15:07:17 2008
From: clalance at redhat.com (Chris Lalancette)
Date: Wed, 15 Oct 2008 17:07:17 +0200
Subject: [Ovirt-devel] Re: ovirt-listen-awake
In-Reply-To: <20081015145415.GA5890@karma.qumranet.com>
References: <20081015100051.GB25659@karma.qumranet.com>
	<48F5D095.6090209@redhat.com>
	<20081015145415.GA5890@karma.qumranet.com>
Message-ID: <48F60725.2070209@redhat.com>

Dan Kenigsberg wrote:
>>> @@ -37,14 +37,7 @@
>>>  
>>>  static int streq(char *first, char *second)
>>>  {
>>> -  int first_len, second_len;
>>> -
>>> -  first_len = strlen(first);
>>> -  second_len = strlen(second);
>>> -
>>> -  if (first_len == second_len && strncmp(first, second, first_len) == 0)
>>> -    return 1;
>>> -  return 0;
>>> +  return !strcmp(first, second);
>>>  }
>> Heh.  Well, the idea was that I wanted to be a little more defensive, so that
>> "IDENTIFY" != "IDENTIFYFOO" (or whatever).  I could have sworn I've run into
>> bugs doing that in the past, but a quick test shows that strcmp() properly
>> returns failure in that case.
>>
>> Ah, now I remember.  I was taught always to use strncmp(), and just doing
>> strncmp(first, second, strlen(first)) runs into the bug I was trying to avoid.
> 
> My point is that your 
> first_len = strlen(first);second_len = strlen(second);strncmp(first, second, first_len)
> runs into that bug, too...

Ah, but it doesn't, because of the first_len == second_len guard.

-- 
Chris Lalancette



From dpierce at redhat.com  Wed Oct 15 15:35:40 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Wed, 15 Oct 2008 11:35:40 -0400
Subject: [Ovirt-devel] Network configuration wiki page created...
Message-ID: <48F60DCC.4000606@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

http://www.ovirt.org/page/VM_Network_Configuration

Please take a few minutes to review this list and provide feedback. The
network configuration page is the only part missing now since the
backend support and processing code is out for review.

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkj2DcAACgkQjaT4DmxOfxuQqQCfRw9pq32yW4ZjgCVLh2K13O1w
OlsAoKma437gsvUKUUA2hIVMlvRmjtet
=ru1j
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081015/35002025/attachment.vcf>

From pmyers at redhat.com  Wed Oct 15 15:47:38 2008
From: pmyers at redhat.com (Perry Myers)
Date: Wed, 15 Oct 2008 11:47:38 -0400
Subject: [Ovirt-devel] Can ovirt talk with Redhat5
In-Reply-To: <BAY124-DS4EFF041E3FE621AA023C8B1300@phx.gbl>
References: <1223995747-12847-1-git-send-email-pmyers@redhat.com>	<BAY124-DS59D8DBD2D3C851B51144CB1300@phx.gbl>	<48F5D9A3.9040507@redhat.com>
	<BAY124-DS4EFF041E3FE621AA023C8B1300@phx.gbl>
Message-ID: <48F6109A.5010804@redhat.com>

xxqonline at hotmail.com wrote:
> Hello guys:
>      I have used the PXE to connect admin and managed host together.
>    Seems it create a ovirt node on the managed host.
> 
>    Now I want to know is it possible to manage the redhat physical machine.
>    The red hat is pre-installed on the managed host.
> 
>    I ask this question, because I saw your architecture picture, that 
> ovirt use libvirt to talk with managed host.
> 
>    Thanks for any feedback.

There are two issues here:

1. We need a way to install the ovirt-node software onto an existing
    physical host and get the bootstrapping/configuration process working
    properly.
2. We need to be able to support hypervisors other than KVM like Xen.

#1 has already had some work done on it by Chris Lalancette with his 
patches for 'managing VMs on the appliance host'.  But these patches have 
some things in them that are specific to that environment.  They would 
need to be generalized to allow management of Fedora KVM hosts.

#2 needs some patches to remove KVM specific stuff from Taskomatic and 
just end to end testing on Xen hosts.

Neither #1 or #2 are very difficult and they are both on our roadmap. 
They're just not the top priority items at the current time.

We would gladly accept patches for these things though, so if you have the 
means submit some patches to the list :)

Perry



From dpierce at redhat.com  Wed Oct 15 15:48:23 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Wed, 15 Oct 2008 11:48:23 -0400
Subject: [Ovirt-devel] Standalone operations wiki page
Message-ID: <48F610C7.4080209@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

http://www.ovirt.org/page/Node_Standalone_Operation

This is to capture designs and requirements for working with a node not
controlled by an oVirt server.

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkj2EMAACgkQjaT4DmxOfxugWACeL7K4UOSBBxHlYdXdI6Uc4b0D
7X0AnArogvVXybGi8g7Ef+hB2346wl+c
=fbYt
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081015/dc0156ec/attachment.vcf>

From danken at qumranet.com  Wed Oct 15 14:54:16 2008
From: danken at qumranet.com (Dan Kenigsberg)
Date: Wed, 15 Oct 2008 16:54:16 +0200
Subject: [Ovirt-devel] Re: ovirt-listen-awake
In-Reply-To: <48F5D095.6090209@redhat.com>
References: <20081015100051.GB25659@karma.qumranet.com>
	<48F5D095.6090209@redhat.com>
Message-ID: <20081015145415.GA5890@karma.qumranet.com>

On Wed, Oct 15, 2008 at 01:14:29PM +0200, Chris Lalancette wrote:
> Dan Kenigsberg wrote:
> > Hi,
> > 
> > Please pardon my newbieness; I'm trying to understand what's what in ovirt (did
> > not get very far yet), and stumbled upon this:
> 
> No problem, happy to help...

Thanks, I will bother you again :-)

> 
> > 
> > commit f393d38599283676fbd33c81783fd7164faa4251
> > Author: Dan Kenigsberg <danken at qumranet.com>
> > Date:   Tue Oct 14 12:14:03 2008 +0200
> > 
> >     ovirt-listen-awake: what's the point of streq?
> > 
> > diff --git a/ovirt-listen-awake/ovirt-listen-awake.c b/ovirt-listen-awake/ovirt-listen-awake.c
> > index 7ecd0a7..b00a54d 100644
> > --- a/ovirt-listen-awake/ovirt-listen-awake.c
> > +++ b/ovirt-listen-awake/ovirt-listen-awake.c
> > @@ -37,14 +37,7 @@
> >  
> >  static int streq(char *first, char *second)
> >  {
> > -  int first_len, second_len;
> > -
> > -  first_len = strlen(first);
> > -  second_len = strlen(second);
> > -
> > -  if (first_len == second_len && strncmp(first, second, first_len) == 0)
> > -    return 1;
> > -  return 0;
> > +  return !strcmp(first, second);
> >  }
> 
> Heh.  Well, the idea was that I wanted to be a little more defensive, so that
> "IDENTIFY" != "IDENTIFYFOO" (or whatever).  I could have sworn I've run into
> bugs doing that in the past, but a quick test shows that strcmp() properly
> returns failure in that case.
> 
> Ah, now I remember.  I was taught always to use strncmp(), and just doing
> strncmp(first, second, strlen(first)) runs into the bug I was trying to avoid.

My point is that your 
first_len = strlen(first);second_len = strlen(second);strncmp(first, second, first_len)
runs into that bug, too...

> In any case, not a big deal either way; it's not performance critical in the
> least, but I guess your version is a little easier to understand.  If we are
> going to do it, we can just remove the streq function entirely, since it doesn't
> really serve any purpose then.
> 
> By the way, you can send this stuff to ovirt-devel; I've added that as a CC here.

I was trying to keep my general disorientation lowkey, but hey, we're
one happy company now...

Dan.



From apevec at redhat.com  Wed Oct 15 16:03:50 2008
From: apevec at redhat.com (Alan Pevec)
Date: Wed, 15 Oct 2008 18:03:50 +0200
Subject: [Ovirt-devel] [PATCH] add flexchart Flash movie blob
Message-ID: <1224086630-5890-1-git-send-email-apevec@redhat.com>

source is under src/flexchart, but build-requirement (flexsdk) is not RPMized yet
see src/flexchart/README.txt if you want to compile yourself
---
 ovirt-server.spec.in        |    4 ++++
 src/flexchart/flexchart.swf |  Bin 0 -> 165701 bytes
 2 files changed, 4 insertions(+), 0 deletions(-)
 create mode 100644 src/flexchart/flexchart.swf

diff --git a/ovirt-server.spec.in b/ovirt-server.spec.in
index 1339b52..4719657 100644
--- a/ovirt-server.spec.in
+++ b/ovirt-server.spec.in
@@ -85,6 +85,10 @@ touch %{buildroot}%{_localstatedir}/log/%{name}/host-status.log
 # copy over all of the src directory...
 %{__cp} -a %{pbuild}/src/* %{buildroot}%{app_root}
 
+# move Flash movie to the public folder
+%{__install} -d -m0755 %{buildroot}%{app_root}/public/swfs
+%{__mv} %{buildroot}%{app_root}/flexchart/flexchart.swf %{buildroot}%{app_root}/public/swfs
+
 # move configs to /etc, keeping symlinks for Rails
 %{__mv} %{buildroot}%{app_root}/config/database.yml %{buildroot}%{_sysconfdir}/%{name}
 %{__mv} %{buildroot}%{app_root}/config/ldap.yml %{buildroot}%{_sysconfdir}/%{name}
diff --git a/src/flexchart/flexchart.swf b/src/flexchart/flexchart.swf
new file mode 100644
index 0000000000000000000000000000000000000000..5079f5039132f7ac82f2149edc087a64a7741c0f
GIT binary patch
literal 165701
zcmV)$K#spdS5pbwA_V|=+QhvHcvMB!H-4*b-CKP-ou#uA7Na<$jtVZLGiF>Skf0gE
zGD%RJ8Q-2xx|6i&bjQ9OAkI7QgdLH62U!%v1rbz~MG#OBML}GU#T9YGUEEjrepUDO
zN_6J?p7;O!<8w|`ojSFhI(6z)-D(`Eup^3+b*G{fQ>DV)O;MD8<vl|b<<f|+v8<+I
zK<UWVV8|>(>asJMqtUjqzI{iG7}00Mg?+-2roQK2a>*rq&%2=S1s9wPj&se9P}Do}
z+>qJ(jLT&O6 at IfJ5@?GC!l6=;_ST2nqnDj=hFz<#Azo=)dn72U^fmPL2mP)7P}J;u
zexLJEk*}ewF&t_2MlbiawFLtWUQu1&k>{Gt;f9tG-r at dp8-rf6`O>}#Mo}gjhz9+a
zm;1u?{?Y+K|H#q{OUo1GCAY;Qn0<+kUY;~euPEK8A>7)xEfV&%H=s|As7e-2E+VRE
zYp)Lm%w~V&^7c?mC_KVyB0&{A4H3UL8cyYi(L{dG8)|CzHu*2F93=DNY1v0_)PMQl
zhG^;ezdfh)g7eP%z10mty|izdv~3C|@N%Uh=cszA(w~lBbk|>;DrQ&*sAR5Fk$?ZS
z`p^$OFyrqyJz{JP&E81V(>l`A>J6dgi0P^AFr)s~fmTx4nt$X{qJUp%jCfo9=PNl%
zALT6N1pcy#Q>Wk1FV%e4rAN7MRA*;SXJ=<IAV<~M+IM%8-3!+0 at 9sE8A33&PLjm5|
zNjpc4X4^)M(L0Z;ot>ju=W#*pWSyNq^3G8RN6{0be&i=ksC$l&VJ9}x&X11sLvuE1
zid*)+bHE?1VdVUA;R5k@=n6$SjJiK9zfk_Yb%hnac*WOe{%zXhUmdj5A6{Yc-(#n@
zUt!hroK4?&#Xs^_U-{-uV{Q83E7~TK3%751;ff|19=T#~hN2Iyzro)SRRf`Drc}Z{
zzJS>l^mb%cSfQ1#*G40OP!k&-4*0b4NW|OWw78r6;Z|)(7{z(Na5(7qhIs2p=v&0^
ztm at w!2>Pl6CQ7$O0#U!SI_&lNBUPcsuu+3bp&CKIRvX2vWS~%Ny0WTL=Bu!3K)9jZ
zv{U`VSfGKBKVr8Z^^c4?>wpHxbyJwq>o~JMsJ*q`A2I48-jFF)Se{kd+tA=Q%|Lx1
z7>IThl_#f$M8a+UNHpL#9Ru1!4MHVdRYR-#hg;jiA*^lIjxoEeYW%~+V%I7~;H(R@
z`Xe%GU{F?;A(pR|JuuvE`eigTWnhBYjCKV5V*Dbs=@;bnudS7Y3V%b;8<A^2r%Ki!
z2J4MBU~SqRF{R+#NmimF+zJU~)%qLSF$En~GBZWMT7Q%^Gcn+%2*z)9voaD1TcdDQ
z4NfGqKM%r^F{Ho){-7_nN{nnEEKAToz}o;T(BZC%=h_q(hK8EM?GeZ~r>e$|+RbOj
z3H{nbzMxcvriiz#InZF{)PzCv`{LT-sHv^CdR2)D^&x8j=D46LIaT9tg3d)cvQq2i
zRsGtd(QqhTpX~W`SB0Yf2s#`X?zgnZDRfef%*?2=hA31w!-`r{7;D0sZ)*}l{-|?k
zO?8d`#&*9M<>+x0gzdP}9+NXsm7_Y`;6=1T$e;~I6#WSXP?MuyAmsDb2mLyXS*Xch
zVy~&Plf|t|>+5F$)R!A)i!Z&5P<yLPMEs$Qh`%*F+%J<^P5!8i^y?5anwgYU9?gtp
zRzdh9onD{M&d5iGB^+}ovLbTfXPPP8v9je+N35Wu!CHuBNzyVeOI_whqnMQ;-jLrJ
zjGKw<C~Qhype;56XTYorw^d_N1vA^iZA0T3I`$2}Ka?9Vg$6)0{+LE&M7$$nTm at 0P
za7xR0=y8R=F%Sxf1!Kv>Ar%2~b^83VXcm@`8IHs%bNJ9<vCHT9lax=$JR35{9C?G+
zViv<A%v?*j$!eDk(IlreQ&>T3HKmxa?5ci&Xsfra0>cmrk*WzPtbBL?#tUmC5{}BX
zpBWVDRTsW87_RpQSqS6OMg)A(=B!q~*KCjYeOLJdP0djQg+e~`*zYujK3;NVB;eC!
zbeI)fml-Q at ttemQ?b=eJcqAMQiq)Fg;Duc(H?7`hHpwp3g{8vl&9Yg&%^MM`2IB80
zmbsY|Zu4Tz^z$~fG(`kOXjXYcwA~x54cz3{yur3+ud6u_t;4#Ks;9RKYdXvdu4AoU
zvxTEN(E%eGv-L~}pGCsqXr^7(k{20CI(TCsh*f7A1H;1uek{JWZpkW|q9?!U(yf9U
zbFp-(`nHbj8xS at m<PBzEda+$fRVfU>_{dGc6BYO>udqfDBZQ7fW$ca~SB?}GI}jZl
z8JIFP-9zDMps_>R|NhbxRE1&+Sem5So~{;VhEQp{IZa5y%&=5gE>xEkT7PT*;2vvE
za?o*U%Y+{Lv2*4~E=b33S7Z??;QQGG7Z%mPuo;z=W at Awd5MEVmlx-2ewVX2{*LcD-
zhQy+Ia{u>Wf4~&SN_k>yE6Z;S#u7(SyoQ952-PU*QiM`h3q4&f`b>{)S}a+3lC6Zr
zSd*a0MeRxLiYvK%jwj7f<yv(lSHQ#!=pMNMbCS*hvI03(0dEjv@#XkOVz-WBYJ$Of
z4AX>L8?%iDqSoYO1WYNp8t8RVvL+;1a at Xle)<4UWVlf>NQ?4pAOHSy}He2 at H(zGgJ
z*@egwGwt^I8~qVTd63xc#gykKmyB8bTx((nCh1yMC{{wQiVSPlY>x(lrY0$l*o+l+
z)tB;URw!JT)RX*(ze%VnOtiI5gyl&YM(PIDAZrl at JI|6;io(0mxrjGehcl8UtJ}{=
zx;)wogN<UwghLSs3YR6>`7o^wHf9rCo}`7yJ(d--!|RH>Q1Yr)Om$Zo<-#WBc+z&9
zlCA`2?QFf`m3ZQ at 3V1;FV7qFge>fP1g|N0*XF^j;AejEb`+#7?u!H_+TxP=P^+#dY
z!)#CL#+fp!3E!e1RV`xHMb1`@l(ervv>jU(F|XV#PV^||99Uw=_M|F`+mpWRauWW8
zRm6xJ>&)14msX at _LTaM5n6GSivcv}gR?1b28Lmp|q?zSOsVBdyv1dh7`f&Pxa*91I
z#gpptgyd>WqGp=OrCrG<jKcWIqb!-6ANMqpPCeWo5?+Xp2h1VDnz&=58yE=Lb`icn
z132YyHEa`T+a_5IIrU!CA4CU-giYyjF)*2qR_{nz#L*fE$w*GTYCFfBM6ex~)>x~#
z(Gk#12tVPBxMMC$ylXj0os~5jt+AT21EGdsyAQi-wYMYO9(BTGTw}RYnU<Sk?Y_R8
zq*`Sir=ILDr0pE}DHCToV`k~kx*0Y at QObT<7T+(0Z{DvX>c7St#PLFfM&|<36f(nX
z4v(;%!#tmTO2nzKGGy)US%I)T)5V+v>6mcr2*MI%BTUZCMLMm17*27<@<)<Rnu0CO
z3b^dM1bM)8SH;I*_bd}7gn+DTflM5f5-C@*uhc!cp0qadgdou~Zxd!83L9z+G`Xxg
z`pZOV7Yt>|482aCisb3b3x-F)8VW;LBepz$sKKAt-qw~*%dM&nh at M${kUYlqNUW at r
zGYy#|OtQ;NxOcvSswDM^ujQWc#n at GDw|H*)(L38Z9mdHy=?ulOqUjmVXpCSwD+1Ee
zdLteARo425*%~>L6kYC$p<8>Kxa5n?+z^~LFc$-Y-lp8)u-hUpv2OEXBwI`55^9Tt
z#fii3i`@{0Bc?0HDBPIrv|EK9$#)KAX_-!OcCzlI;z#BL3GRn=+m#*5vybrIVUr<l
zU+gj^bqV3n71X7E`-}#Aq`pGCh`6>$;x4es_SK3_jWMTbxZxK(Vt(?_yVkU&m?LOi
z)sn{NY>x!(D+wlgsUj`wOKYuXir~^OYjQ==I8EL|IOX|GUi~?Qt0C5?pjmetW-rT2
zN^^$>gd<kITOQX^?tkQ|RV;@<NJnlJj(L{;h@;(5oNL_JI8)1r+YD>Y<lSVE=#tD3
z%PY}Xeph`l;zuVVUQ2#^=;VQlT4BO0ueUnU$zF|tP+EVk4Mdw`l!AnNl2k~vWnW6x
z2E@%)G#qlr^es-wi{BuY#cvR`h9HdeDXH7TNwzh+KGj9ckQWTrX6KY~xqBtCNiQ!c
zEnUv6`jm5)buB2Z!mq>;P&66Svwq%4AFp}(MZdkcEWyRZMwC at oIjqhzu)OBVszIJ1
z!?NuSHD<jsg5G+6(7M0P8CX8db8S^c-Bq5dLH)0)tj!sSGRcIzF4{dcRTy1x<fEFZ
zfkOv+DynLSRF_}psjC`TnIk6Da!urZ;LG&Xdn3{X6*mYjPm;_sJPDz>Jhnq4?-?+q
z4YgukGm@!d+|^=S88K$)SgznrJ-OzIj;8tfZXAED5kL=QCA`{7WQl6+E`!mP+}(nh
zf10wj=Xhk1gd`lEj=_zMaBrOT;RyIe(cBcLR=Vxok~|1ZO+}(ZP9Y at QQhMwwrz~rm
ziET{G2RD~B2Yh~A^b{vLQAV_sExUtSVrtr!YNfJ0sS20cvpQj8<+Ma#TZNyU*M&Ep
zlP*1{Cq5gxXSnd2oF1ujqDMKNG?h;#*r%(sMZyz<v3g?9PR!4>RM{G8VzM+b`NJf>
zE<3JhmLTOY(j6N?OVf<Jiow?osvcZk;Tcj{)4y_1UHO%jxv4WHq>}5g9j02*KRKU;
zwsth6ozqNzTzrNl6zFM&C!rhJVlGqk2TpUKwY at bvttw5HcEy?&hbY~u(U~}D8gaQh
zJR at yAw4^Bb6JAbN_xa+Ir`$Bd4FRZ{FXa;474t_0e-_$FN{UTMgl2wMmG+1=*;S^i
zD#>3fOm^my+_(m@;fa05*?>JTBD1>1Hp27|H)c*C)a=KULtSK^nHLgg(Nvnl6dMs@
zIc8dUN0XhC9UEe0W23nB%dDyj+5Ql!DToU)nVJ!Em<GWn2SUm2Q$Zq`>~<xn3ID7|
z*A9aHkwx75Kq|Vmi974#yKwg|9WuL=$6|MQ?Benxf)#}>#_Mn<t~oQ3zJ%m;@pUA#
zHCaEp{p at Mk(hj6Eef~yodoXH!B$A6t(yQRBHi*yL`6&#Q);YMF*!#Qup5zkO8Fk)z
zdCwpwRB{>ddJSP7WvqvA1>_gZE~?2)`50J~u7fr`BVbC)B!u*vm}U%-+icQwChLMM
zT at +(YQ$VNHhPYaEM?2d5wf>-A$Wh*`6{qW at X`fv3Vp^M&cY47554sUBg$|xXcL&UC
z1Vtv~dADb*x-R)$Qfq866j?6ZNeeJDnaM2Zk_Qc^NhG$<M8nd16Ou9AG3mvt>zyk4
zE<4#X#?xhPLBfV4b*OuCe-a<Nt)4ZVEcN1_QIiV{)1FDQu*-p8kS|GTAD6S!(&r at C
zS%pnN_<a{&a$Z?ig-crFpF2Hin|)DI7W at ZaM;CN|k}s2OwHwbo;}`pp;BzHc;!18w
zw_3_D69sIWZzXclTPW%Ju1sVJ4>7iCu&2cY?MkZKbbHdxe|9A8faN)9!SzhE*~L=;
z?zc98d>o2oUR^k$rv^?tkq8WpnPpoq+aU5rE6hshTX{4Z$+!HtR7KB}JcI3;a$+N^
z at i$7(!XBX2eO(?-%!1UDlYM at UZ|_~^=Eo$Fa`%)t0L8xiiw_r;QAI?0gat|G^u!I4
zLuk0Ls}6aHM1i~@GSj>)Zr?%a0aM(46$_TG&iBH$RLRpahRp4R3w&as%i42A(bNNd
zZt6gVE}olqppL8U?=LJnnL8_zLP|W9u#et}g;JFA5+SktF8B}HODmGsMUm29x=s-c
z*{MA>dnSF*g0&hH4oP=+L^#q?-qzOh7eAI5mNzia+m`EVZ*5B(v)FMhz9O@|tt}jh
zrd4jbJV{pw!WFYF_0rDnrUPS=U!5Gnb`M3&9ix=RC<XS*lXfh(3b;VE&0d@?PEC5E
zQr0Dhqdr)JGeNuQsE=3?twHP(&Y-_BYOy%&5BuJz*YHGbcBk;Rt$Yw;Mdi~M-6I1d
z8fzoZTC7&Wsti6n+;4QJ!JiQk$5ty7Ma4lzH|>gJeL~D`SNF*7Ibuz^>cjAITJ6Ea
zdgq8$&aG!Dz8)!pNPDZ}!kWbK-YS~km7i^hkD1c=Sl>0}%ZpgV>51n$ty>u}A$jpB
zO3>o>boL7$r at s}W6`vh_;&dLY77uHF>4QnkWs at IFY|qXRGa=cWQE$CXbVO~3&MiOH
z4M^h85WeR%s61d at +r%#wZQ4o42TPrG%S|crhde`TPq!GvK50AKg^4#vWl3+4G`Wd!
zoT~g@)33?>jlqrZa{INW24AebEz>GtkFz+bu9OUSN=mHeU#C!nz4-0#FDg5UO<ZE7
zSR#37NI9n2`^_o8P@#NOCHEN1a5FJ;y0!CL7pf86%E_>IEm>kfBCZ7kt at U98CP>)h
zhNw7Ci2I!E*nOXUMemXqhjv1 at e2&aeduyC#y1nU7=a{EG64X6Xo~2!mBB>+J`i`jI
zx~9lZ3=Z4r$d1$hjRYi<<`I*a+nRV`7Q4NT#JcD!NNkBoFVV!uV>uBCA1pt?m>?D<
zZK%oS-(?xaT9{ModqTq6C+GA?PKZJL?)>x0Vz1a-Z4voUsv67R)crTMdxNH{!HWYf
zBr0|S-MYJX4EII?UUb1>7cj+Rh5!^d)HJx!i7ne75=+Kp;`OjQ{*VWrjr6N^;X;Q)
zS&|Xc>=A5cmeq~e+5NPi?`iVczpJZmYp;!@-dGnUzQCkB)ytM!874*^6#b at CI1<+5
z6)2>|nf!@5R$5+E3-`}T+NI?~QCQtJzb3Ie<@1D~xMJ at J<@OY}hAC9bn22&orX)W_
z0qw7hr~I5vu=BI3Dyl0zbyw9?)?PKZy22gwn$eW6mExpcd+h+}CraL`L3Nci*OXVg
zVR%zG&HTh^Gx33(UsG9ATQztPzp&4F;y=wJzLPP5@&uB%C>0PACOXv6kuhj+ou}N>
ze{l8Sn!+w0_LznB;&29~X-hme9$HhK;c4><CqYbyGZD>@&Y?Afj at VQ><ed)ukIeWH
zPY~4diV77bB&V*Xd{FIx!8HRt{jVw?bY*3BTt%&;aAwt at sycLX;E?Ldx=L5_<(^(s
zIdJebmAYk_GWrdzs~bGXBd+zF^>XtPH?7XfVJKf)S6)|X_(uk?2|`8O{c9 at A>maIl
z#W at XWk1tU95b)@hQgLxnST*QMZr_EvtXxrVO<jh?BQFS at qPtb))m49~%%~L8XEp7V
zSGTh53<%I3YlZlbWS{t*c8!&TDr{Y^4EfkqRTY(*tVfeIWDTjQ6kS2R6 at v#=W~Mwl
z$?QM0rgm_RXXua$H0iQliVT&Xdoocj(KAsjv5I)rAm~_C1-Eagn9w~Y9&c!pu1RVJ
z>MXbW?G%>P>UVzmkRjDo{ZoaRmt^^4@^qoDp_PJVU{zg)yg5czYap6!bvIr(EA<1X
zHUC3u249JFQ|n5;qh?q~*Sg~aiCs}!_uMHYS5*=vGx<i-)P!eby6lThY1}g{XHcZC
z_IKo3sbpWvffZzm?^0Q at yGiRkP?1=L?QJJL8Sl~d^LH4gvmt(iQWE&Nn+dab+rPc~
zF$>Ku8^{_^RSg9iSUyCEaY%tjJP`CphQru<tS6gToi3dB;!@5?dZl29jLMpt!8MN9
zTL#G+o34zcrwY8mdZkq0OMXjRXMX~=mY9ENC~#xDyn<vPx4Hu6wao$STW#J3zte25
zH=}`QJC>-(l!m?1{sB;_<tU5BFgokKtnCn54RmklBFkQ0nYL~8T;Ms+bAESE3aj;v
z&3*%w-&HNySXwn$haS6{j97ISdd at 5P`MNTaS}pK&RdIfdqr4g>sp2}1z`4V%%<`ag
zt7?Es8h&=zdFfTuR at S*wYpC@{i at T~o)GSm#{*hFZHE7m+$JD_QyKB-=^UxvsQ2E)!
z5z_!i?BhjtNGNRL<7^SkPwdlmzm6esx2qfM{?K4F&?*+0y?0q`IdalNzCp2y3Z?ag
zVpa_-uer`s4eK+s{K`s~MXss565}qm5|zX1U^^=-;!L$UNf|;wwRW-E{xwxY>YR-c
z9Ll5wvn={G<uz61gX(It;*DN|u(ntTNIF~nI)pn`F1}C;r^#(q<f*Fg^t1ZLElTaF
z6_o?ZhgR3wJ&a|0$_G{0t!JlI>ayzsXH`Y1^@?8HF<C8%ukKdMR+%0rwJfW)TFV!w
zts3h+O at qBzj?A&oYw?-RXdUT^J+VI3evO at YiCtcMq4gTOz8w|<o_kxn*<65b{TYsE
zpfTY0^^bk3$xM0juSxwUe$u8k1WjtT>ON@#^{})BS at NB&{KPBX$U6oNhCIrvD-AP7
za!QW!V4x}Fs2e=QQ(ZZrPV<VS9`uKrqRsMKnYie%HLED)r&eY0$LIN}bnD~b>8Zr7
zf8lgWD$_|nX6gP5mGnsd6;oN-ZIC9NNoK;?id}cf%a#Fk&HmC9&#SZnE_*c6E>1(G
zBfPMESSNm8>4;{3s5A=h<l>US8!hc!Iz*mfOR>Jd6fjHSO_oN(rS<JirRQI8$?txD
zK_4cz(+v5*MwT^Q@`rn-_0islzZ=!WNBtU2eoi#RT|}dJ2jd(#cxY{<M|fQhD>`&Y
zPP5lcdG)KK at 7Vn^#k9w@#IW2H_&%ghhVXpl(SL9w>1#-vFMkn-t;EzDd^HGM?WRBe
z4x at X_b1&;33B!ez8f9N~X0(N|*>((oMwr|eX!4ub)5X27=@18 at CiJ>j%Gu<kcQ~h}
zW_NKR*DKzBmmgE(cd=c5_)PkMkopCods0UF1$eigD|7)lM}xWrqPeM;gb=K$nazR5
zXzaqIPtsG<Twl1oUVde5XtD2Dvc!Ug-nIJWCl|NXT2<nvF*Eko(RwKpz%&kmQ(O!G
zQ5QXE at Vo6VjES>BrmdFtPvf8&3CqBQP?+$xviu>O=_0m^Wpemq;>M5Fhl4&n0L=_E
zI7PflMjf$BF-_iU81;~A2-6*ONINI4DBz9>LYDX;kbDRrjbzW1rI`LJzaGhVSY=iH
zBH<CH at Ps7gl$6ZWJTX1pQw#T(p0=Hz@&vLhB})`dYxgSXNI25bWxJ_)U9_9>JTT?=
zU}e9MRV7~=+gUwRvXXN|d#Slqb=D6vVyc+h+tf@^+ST9N=9T`2_&t-bk^V>>Rwl3T
zn=P<`-BN3>h<Ka2dXZf=$SZ7bQufJmOv@}uEZFq7nDO_WC%w|tTLU9;YGp!SyEk-s
zn=ZX{-LjZ53oZ{BnxtvMv5wkCQk+9o>|lDo!8n%=WO5^`sk-v2I$B+4h^<W~GOTR5
z&$;Zl%+O(av9+>+-e|Mh>K&<xLsf?nf6t!R7H-3`iTckJr2c|*ma`$YhnY+aQZrjH
zBHdcsc}Z{K#TAHH>!*4mfre%wiArA}YQ2mshs!8Uj`eK9Blg8eIM~nrwpHlCt{bsG
z-6!~ZdZKpOYii{$*JAt<<$Id_@|bErptZg+d#s<b+3iHbK5s{&NUmpue8O)XVyutY
zo}{CdbyV}%YG-}F^`tB}yNvZqIPr at gtEDXKIy6=&U)&S=r6NH6+mnc1@!P$m=CiF|
z{S1WplIfDzprCy6$}xGomcvlztxpg$Jc&+Zd*bd!+GxGe_E>YNf-LcvBZTdemBf`d
zP54)JA^Z#v)?UC8Sdrba^y$kJr<3}y`065_eA)Ap#Dxy}{Vf&AGgROS20|_AH5qb|
zh|}Cv*rLtSR&PgXI27zCt at oFjZT<%7J(kvYl(w7L^Gkz)dN?m3U#U2}nx$}e?5~LD
zl!n65()w_;xsRi2uyq72Ir#}q?ChDJ`~)XP?B2ygoLF9lykEBc9-qGfzUR=IDkcP(
zpZGm|pSYki<L}%BJvZgUru9RB+De=ftLm<^`l?0YG~$d4gV%ddxKv()mBy|fAb~~<
zRXX5}U at JX?p3#Tbx7XLp8v$`~78Khw$3e{pZFa}IQQjU6iy=C^cEo7KF(Dv+1mYMG
zj`*&{Zs|-svUA(tsuTAKhV|Q{iXl~MYapb_Pg~-%uKcBr)))+jBbqEqewCSWlF(s^
zB7u=~NR`_<$zK`q`oy(uzwk&`EH3Q3UR^b)vb at GEcj{P%*r1)(_iiyTLv&c`i!Ltj
z>cYAp)WL%gavB`54rUo4zqS71TxSN8<*&jU;Q`Bs)GZG(+nP(EQ4w#Xqm-3~8%v$g
z!BRO#rAGXMhvT3$w7R^8^&4DWks*+$s;<1cs=sap<n)ZB%idG^huecbsg2@$X=%*y
zDzzR{mBO2 at 7C&p~FFqeNdV{98*l72&tNk6Nr%B&j78PQ|gr8Jg7o!M8GpuKV*2=fy
zb?|yxLO6H3h1XObiUx2j@|r@#&PMsu?AAcABU?m;r5X^B($AEi`e5bTL{a$(P^gI{
z$7_`3ueE+;WEnC0w>!<@NZ=-6nS$~NmYGOj>22dJI4)vZI2<wgNE7QwTx(*n%O{)G
zFLnFL&z%`|s at mTeb=mP6`C{5m)P>tJFl*r!>mjfKwXpgiJ`74y=5R3q4R%*DVkvY)
zw?3)nBzo6hUXL>INmzwzkriXM=#JR$q%!2~vUQiH)d#UmSbebFuQiD!!Qg3j=w=`|
zT-1c+py6mS+^>xg_fvX at KNt*;&|AHcFr3+tcX)@2WvsWgM_^81HoQUJ*xt}=2D}XW
zjhBlzrsx at K=<tS&W^XVo+i-}OXwoSn;fT1Ll2NPKETP*KFh<sc6y4e&#lKt-DUXug
z^t_RpDO_)Io~vE@@#1ITUSGc1#cQFA5m<6{Sl`$Rv&@u#w8Cf;uTq3*(&R53jQBlZ
zP6&2T{-CqYdbN^iW#PatQh8R&I_uhg6A9${Tic=?Da1_73|7B4D2tJ at v(gq(%)dHm
zIh>JohBS at VvxCwzoYr-)_<_smL*<agiB{NxL{aOjOR2cfDJ_b0{Su>3S3g5I^Q_W<
zwLClg(Ng)VB5~E|_w~`Oo9^zOuAf!Ne|IJJ at 9~(9Sd5mHImKM{7eb5 at 5BV#-{;%wY
zFeGq2Yw!nxG&+(-JF=x^w4NCVyJ-JwG4}80a}rM<21tsdB@}LGfjgfY`)#g87e-nB
zpti$G!~1LN7!nxi51OQu7$lQ8iA%>hv~pw{{o6n2-~LIOaM;2|*x+|y4VV~4^prHA
zN=-WRALsq^tg_O7od3^0q}3JsSBrdQefv6M`(B2LO}jokQW|{mA*QZU{F=h__Yjv3
zwp6{cPFcS-N18m1Wh8x+#nLdXn;czya}GwG7?FLoqr*~^2ZL at i>CK7!w9MNq^(bub
z@*0sty<5XkKexC{asz20L3dlc0=s^4E)ASZyyPZwNfx>>ctptdD>|6Cx at 7RKL(Cs-
z4lr-TThHqKp(ZTnNRUOFy<Qd#)JI`5{4K1h{e}o at _SZ+4&p#Z?KhhdvH?(<SQ2gNt
zYiVu;3i-UO1ui)%4To84u%nf=b|3?5#fu6e?F{ZvGmCm#QN2IdF4_pNPz#ua^jS0P
zmOxR~8b&wFjz|NoZ=wxe>Nn|4%``fKHiT${NgHmWJ}>pPP at kXrgS06^{UO?J(#8O7
zjL>F3g%&oq(|}0>QF?=y-q1!{!n7qqLqQs<r=c)y3(~eIt&h-1m`2)ZbA*~L)Vz^;
zgVY>OO+SsIxd?5K(6$yD at X_`b+U}+Gep=r_P4EP$KT7?68XQi8QQGLGfe0NQpu<D7
zxr2IJsrM%8Z>Oy-)Z0jJ^3oPB#mZ?6)8+sTglMZtTRUh=3vIcHwjk0(%@MT4Pup*z
z(I{;Lb32WCY1B_!z>L0mX={i!1=W^tiwdz&vxEAE)7IfM6ryH?HgwRYdfFPGp_^!H
zRJ{@P)Q4#_L`OE$o7&Zo8CK2K8vtH_2?)`8lh%8wx1M?<)N4|22d#%_o2d^S57WjQ
z)W%4JHlkj122BsA%~2XaCxf)5l?J^uSWkl?8Vu9cCfeFeTZ6PUOhaB8^3jl=h9K$=
z8g8Xw2+*WAw$n(6Mn+H*BMnp2q-K;x12hU_fqt5FxSx&)(~f}J(B at ZtW<6Rr)h2U<
z+Kf1?xeAk|hJ2<P3Sc-lVmRTDiuIyKTY_q|wONg}1=Q&9pn6k1X1;|squ0$Gt5~>Q
zr%CUzEolATq}CrbJ at U@3Jmiag${jw?W+}zt))Y?F at POIw4VE^<{_%`v?{L^}>~2X8
zzOdo)4zeM32~~P#BI=7 at 3rXKUkrDfBd{&=4I8mYa at 5`-s<7%HieOxds@!yA+#GU}e
zERH{x)90L&4 at IT+2NCoY#|`VNh}C5g?ehy_sBN#8KIu5}za|Iajg<bZFyM^A>+p5S
za8 at 7Z@Bn;bxfNwxgJ`K0=k;E32j<TgsMHts$Hal-MxQJ*DnGp0x44DzSgFh?Jp<<c
zj6P at ohXTXs`#eGlNg*pV3SEV{g$0Erg{KsrR`~0}-xOY4cu8Tu!U3A1DUQL88pnS*
zqQ&!wV?NQ8!j+_OH!1#xIKCytKN81Jq<9w9l;SzGcrL=iduZ{!w0ISwj{B+OA?kRT
z7H<%#&9rzsEq;O)KPgfNXz?es_*3dQCJKKi&?pu3ooexJ)$y$AIHWpWSBsAb+WV^G
zL)Gz(>X^pBHd~+ttoSw&-X+jO0<B}k8=2^E at e{20X+hZyRJflNA7sTZi}V+)_$v|q
zz#Km^#|c(EUUN*)if`5&leFTQTJdZRnezo&sTJQR!UqI;NGpC=D_*Y^ZxE at Sn&U~$
zu}dp{UMqf4E8eFS at 7F}DssA}X)r)d9rDPr{8O=+^@RG5-WE?LU&r2ro66)B+1yd0z
z`33?lT1iTT<Vu9hid-c^SS6nbv>Ssjy13+sTJ-A at G1?L_+LDc|WH&3^Xviw|vyvYK
zalBU4uVkiHGFvN|ua&IVN;YUEJGEaE2VsN~jdT-E1j))NF4D#mGJ#Aag*TH)<Q6iS
zOd(UrG%}rJ&m?3PnN7x%?sG_bW>#-9mvozl%+uzlWRTO1Gc>XQRgNdWUI>EooFYbU
zC5w<gdoj|+zm^cfMDoI=g5Mw)J39$@#*^E?b?NPbr<}O{xQr|Z?G8}|8Q{FSXa!P#
zx>FPxkTI}`IIHg>f^@fR)~F%(ShfCnr7Yp99VUujd#}~2T5=u9H0~oHUALO7A%DML
z6dEnk4~TLN4~p~{l0&lAg4Xm9l8zk2rjtPP!>GefOd~BftRp1H7>nMyiEBJD*MrR6
zGPgatAr>7+hHoUqJ=4hv<wWIF<3#6#bK>ACh#8z^a+<|yHdk{vb#pC`Yx!I+<g|#B
zVy<@MygMg7IP1wtFYYMij#IhOn>$YD+ON3t4DLLWJI>-6XY-76xOOfleYm49cbvx^
z=W}ua*DvJkx13$XUBBb5-}B5eZv26>OF6rYyDsPK3a<T;({i5GpBok2sN~sKa&{G`
zRXpcU+<i4?)jW3y&;2vctL1rhJZ~t^yN2go%kzfuyz6-0UwGbMdEVc6-u1>=#K@$^
zZz<3B at ch5?d at s+h=lKmh-^cU)Jin3WH}U*to*&@(H}L!xo*(4-tvo-(^TRy9jpyIU
zS;R0^UeL}9hVz0EykI0R=->r6 at q&Nwg8$|P|KtV#!wde!3pxoe7zG#&7y}p!7zY>+
zm;jgvxEU}Ba0_5EU<zO=U>X3kRPc9RFayC%z%0OQz#PDhoX#aigc^B_7cC&Xcp>3M
zw-OG0<VA}COF&zS^!1!H^WxhOYvo0^BM5TxS6;jf*~^h?<j_}6!n}9|0uRT^;Kg?$
z>f=Rsp_;pqyoc~^_aa;cxDQ#Y0c!yD9IJ?v`vEs_GL#oT0EPzvYYEpLLijLphH>&Q
zPX5e`)**ob7q3Sqbgp<K;1RU23E^hIqkt{oY2d|M5!7+=H%^A|;%!LW$cr8W>*I)e
zdGU5|?m+ZfUi<{8I}r`=;wM3U3dvna{)HDmjpQ?gm+V0jaxZ=sS$hG`A$=V$dLBU=
zCw^Y^0*EgnwGT`$A>0qRh8G<`@*uJfA$%F(D}Yy#)xybZ2tu5^j+{3 at J&f>8kd7dH
z3t<y4dK=Mqko7LY_dvRd7ac|PeULst_#sHOy!azTKL&h)<fniRUi=vX%sM#+^5=jr
z0AHfiSAefU|Az1$-vPb{T+f|95Z=qfdmTq`0?<i$uTg-}fH8ovfN=nHr`LFd69Aa4
zUK0`C444E6@?KDxUbi5MMte<0I0Y~jFbyyrFat0XfO+qQhD%YsHk<O^^8oV!3jhlN
zw*nRcF!J7u5iX&;XemqynlHKy;q6E-1ARH=-R?lRf^v2z!n*)>Q-1nN%FnnDuo{3i
zoNFjQ^8vtv;9E=iS&jTR>kwT}jf+qlqUUU+yyOw|W)tP-J_>*yox26$Rsa^mx!Vvv
zM!D;86x)F^J1IZ!DTKQKPg8#WGf3|S>;XKB^j^@P13ZuP3kY8X>_hw|g!?JK;2_`-
z;AOxofL8&p0bU2Z0XPhJ6L19Z7T|5bJAiiq?}_q+UvL!R`+yGs9|Ar?-#$kDpHY6%
z=YTH&Ujn`YVC7x(HNtNIkmAMPg716EfBysEN6LTq6T;(w6Od at 9YTN;neaUE*UouAJ
zWn%&30OJ7 at Km%{tM1(g3CV_SfU@`#pl}$l774+$V8HmqBh?%<tvsE?=>DfrnK{yxT
zJcRQB3lLw3 at Kyk3uxybE^+cJ)NG|~_MgDCFZwD*`EJykdzzXnTd}Viva)7&$Zs!EU
zF1rWGm7*Bp_aa<{^nD0dBU}SEh@$L%#2)}Wh&04iwiY2oRrV109tNyK-g>|W#5W>*
z1h5IP8Sp4*TL4=T--dD!Z`osrKMvY<ggXFFsQeF40-gfw0z9p9_Ka#=2FZg=Kq4R!
zWIOk$#u}>g%V0|`+pF at +o&!7&cmePtU?1Qmz<vNs@?{55)j^eC{xaYdz^j1QRDQ)9
zfWv?{Rpa-Z7rmwO^0!s~$9K>Sl!hRiK<Nk+s_0$Bp-koPAw&`KCO|0AQI+ at mK;`{C
zy#GfCZs7etM(_#XQ^03{V}Q>A0p9-$1YZKa!Wh0*dBwMY?*QKeegOOk_z7?va01ZD
zcm>8(F$&>mz!<<-z&OBozy!cVz|DY3fLj2Q0aE}|nenx%^UCRrSI%I3z)Z#+vlzc>
z4qz@|9%%C!Ckp|$0u})lGwxghSjvnubbj^ij9<MBWORq1n`A2D=psS4uU?Kgx<=5I
ztM5P at O%im0pet9eK#1-V42xh`SKo;^hC?tMg5ePihoJieLm?Ov!7vDhLC{TtArK6K
zpxZ at v1MXqGdL`1BN^&p4RRByk!4wa?5BaMBYXJ8%KJWp+gNP%Ktz~@h!{8N$Wj(?T
z02q^+M-XmeyavXoW-~$<pqfWP+k!X at Qq5L`Fi2z at XpbTOH~<EzW;^4xJ3!mXxa&!T
zPa(aF at oON?Yaq^RAWqja%=jIgHrS+Ldl(<~EV{B6tgv0fo<j(`MPRoG?AEa7kv<|+
z4DlDh`y$e?Sp at cJ*gnKz&j at TCfej<DRRlJRz`hN8Nz{k!2)69H1B_=L67>RJ1-!=i
z-(F{&zJc&C(r+R>g77VbZv)-|ybE{_a8yhc;eUG{@ecqW0zLwK4EiSsKSlT%;27ec
zBm5HZHRGOd5PpmBJI1g3o*6wU_x{AV_c-JAof at wn1%R&Ck488KFjnJioW^|<;nCi#
zaX(g8<1HF*#1_y9^WHca at hO0*fN22CZX;%?aXR8ClQl!*IkQl9j>ZFX5zf<i%L0T8
z0VqpQw&hlYuq`c%G)@;Ij(S>_pxjc#;fJ-{hVXU(+HF~ea5>-(#8)7MnQXZe;ay1I
zjS%g&+=Ec`_g>VoN;CR9cxW|}=wfIM;LkjCzsB1h)VQ%$<F0iYZ{LXQM*y1;-wb#Z
zum$O at 2)6+qL;P`s+W|W??tVh!Bc9Uu$fp6%0CofR0G@@k_F@#zY5ckuP-dUT{{e|*
zy`=Ht0~#+n2-+dUUq<{Dz^j1Q09a#1Sc^qiTmO6mX{^zI9 at h9j-$Y!jt0O4)7T|59
zG0LKM5Pui&p2p8Ps`38;-~S-|*ZZJ-0QeB_G2m0cF~ApquK?cwz61OK_z7?V(20Y}
zXuw#&c)$d}&460~QvlNdGXS#ya{%)I3jntQ76X<7Zqu<@AzZHWPI3n#D at 5c@fzYi^
za+iqRt at HAGbY8R)00VsWy)aO#0QUjFb at gh5Yji#kgB^H3>Ua?F5MZ6oharCy*?`1G
zz$1W7fX#qM0b5YvR-KO~+mLunL>@<EJ75Rk3BXRklOp3OM0Nq50qhopXLUY?>_zH1
z!1I6?0Q&$h0ru;BEIEkCArX05pjVK374RD1b-){d!+<vdM*wdD-q!gz@{U073iKXG
zM at 8g)L_QFa4-xqY at UhO>CpsTbKGS*0F%Uind;$1U=M%_R0(~tIcE}0j8xi|fpzm}}
zzX#V3fFBY63E^?T2|y?BZeadk#3li7{2_nGG$J|`FbyzWkO4CRI2GZ at 4|5Kfh4gH|
z9Kc+TKFvb}CoZx;ByJUGF*jbK1|q9P>VD)uh$X}g;~|bVA4Yl|V7<uPfXGI`CeHQE
z2p<J(0c-<2#*J+#guvJ;3T_8&2jB_7PQa6ZrvM|-al&VaiZk{jeE at I-@HXHbjtp`7
zdKZcJ07n7u13m<N1o#;62{#%I<9amlDN>(t<6PF=iOwBE>Je__GvfzwN}uP*ew<|Q
zCD~t*?4u<6F_L|NWFIEkJ4yBnBzp<T-bIXu2s36=ti%P5?ity)(d=b3TlnXT9h at uy
zEOi)9(+p!5%|O5Q5#wH>87rx)d#14gCD&5gJ<C{6sj-PN10J=pgHoPxyMsHHq409R
z9e@=M<0{%c+xQrn<Zck|aTvXGxPC99s{r=_Rs+ at m?gu;oc+kO19zysqU>#tCgR2`6
zJ_6X};B+&>M*&*^TLIeuj{zPB{F9Ua;U&#{9)abZN47hFb_fKen at 64i$4&>t^`t;g
zA+<;|I#td1mb$sV8|giOX90Tw&pEp18qcWI*rV#kL6v47R<l>?*>9=Y at 2bW=N1m~o
z=XK9BF6YKkF#U>k&o}O2`KWk?VLVUrjm1PH_Bo6hM!qo{u+IS^I97<AbcNXYSCDy_
z%J~K&i$&@#f#CG45XOH6Ss*eNisY@#Sju!`CMz)Jvx4r0*lk23g=nNuWDCYcvKoPw
z2=oaDS}I~#bt}kiB6hn#%M9a8-B`=0 at rRu5MaDi_WZa3_EY9A`jGe5QFDG{zK<M6b
za<_;r7O}eof`hSKbZxol+H%pg<<d`EX&9q;v2mCeV at eI<DXrLehCwA*H)9v;1}Ur&
zYizAy9AG7wSd4icU_D?10B43(<Pk(R0X74^g!I<}z5;wMW*f9EhH;2>H_Eyjmr~R<
z+vwf{YfM!8lwo|&N{lP0 at kfT_PI00$y7x53Y1CK(q0P~H8S}JWJO?_E1G|$0i<9$b
zp7V^sbH3BNpTfmpGWMX2X90VS?xmP}<h=lR(J*Fc4r7*fs_~~&jim at y0V;B^&E^=D
zIT-#vqx)$>T0$QC1v((mL4ghl^s+#&2=uBzw+Zx`K(7n*hCtXkfQ;_Fp&`97f_Dw0
zllL~>GeqJ&!}v_^Z5-phyPuBy(+zCy#?`+vp3r_}z~?insj*kXkhf$QFK8vkOPXT`
zm;WyiqA>Y?KuP|iAgd}uRgFc76_bboQIW05w2q31Lrts0kaa6WBUVIliiG(8v}D*V
zXw+sC-~wdY at hp*<eKI0wSaFEPa?%=8?b4!Wn&5I<M53v75e-Pm6_MP38&PuqL*97B
z at qxNT#AW?|X^5sLcPURq@{)K6=P~3`Z6t&vWvM!Ha~+C<IGswq;LlHVi)y)Xocu?$
z0x>&82p4~vT_V#C1+_3;^zlT>RGmE1_~el!5ycDB<b=p6vN>7W45u`im6XslR^Xr*
zu<CRYfGW~*`2SCeD3n^WWFS=_9sR%5*@g7w<Wr3~{;k5QF|Cz7Do#fZ;&R2ZM4V{d
z;<+Ws<nAJoK;4pNBSjU`7IhE7+{0d4CoR>UY4e{J(QI|@h0$PMdd0_V^;ihZ5l7lD
z#Zas$Ml2%s3L&zlQ<%e1daB}J85vHe3xBc+2g%4t>1u9r$GTkCN|%c`uD|gz$%U0)
zHU(}$aCgZfO;uL%de at SeEq!s=ikvQYqMR19wLfog|07$Q^yktXy^C at Q%gxpC2YI^e
zKcbzIke#JWr^j{dSGF<{?bqpgm)u`#L8sW=)6O{Ke__LjO{rxm)3=di#xu`KWB5&1
z#Q5aKjm^pPu2~UjVzn+LdA4mwlea~dy2N0%3dEnNDMgs^znEGu=(kXBH6tTMxrug;
zTo&<N!d`5$pe~loIV_G<g&`1ghmaxHK}BV%9wV!{@feNAisCUxJk~oN(@OQY>Lw3W
zW4%G{&0<z8Wzv~YY3jtEQk=RttyLiwxmJ|CRO4nqF2a-7QThbrh_dcvg<#2vlUM%#
zeUs-VLA>&KB*)&dVqus1WADN7ohGq8<fdfEy&^`T4tl!8)aog<oRr*DCF+xkV)j36
z=lFH<jP*S$j?WTUNt;vUJQQJlf%*!SqEfLmBKXCGrqm$H+O;JAu`V}=ULw-VUJ_J_
z&k~}Z*c}~RC|OKCap<C{bc;jJXQfgWv^OGRNye5zN(mw)99v_#Vpio6(_{LaqSQna
z<4hmx1tQ~u<Qb1|A}I#tLJ_&}<k64|e=Cq}VU#Yc-N})Y_t^iX{Z&21TC-wzP3){)
z$^B$wmD=@-M70+uBg-aSB+OvkolyS&cPWyGoZRDX at c}y1t#Pt#m+LK|(8+2|5|gYF
z;cz?U+GJ__SNaa|yX0LBeWUpMJsNTdLrPWaKPm9y<Vy6UN~Cx$NpiU at HB7Mz2{Rp^
zlAoJ3>~X2vl)W7wuy!Opwb(C+&f3VV&FbH7Xa8SpWao%jLbH<9nlPaltShhS<ZU7O
z9P^(X7G*@!%5oDXKW^P}CDEZlN9_Mn_fX4LC98~-pB#y$(ulDxJsYYO=+?2JOTQ-u
zG~wu^{uS8g#l*&$*e_WZW?DJvgwcgPbJ%7yxd&1qgf+2 at bbPN&Gq>a-(ezm)t!l+0
zQkflJR7&a3G)8~6K>$rOtR+rj^dvvHIDMpl_z%V?>+N!&7bmLXV%Cd_*hPv%7mHqK
zgk;9 at OkVW5%?H&<u>D^#$Vp^40bqGL(IN0iKhIj9da}x0%95s8D&D0wQf#HM6*8fl
z=^I9R+S=(I$q7AfPA)r1ms0#{!&*xAa{48;i;)HrWl;55=)OuXCknX&>S7?}&iEr$
z^m3vY{fOe~4=Y_kl*~#Teg+UF`%0o at T}70PDx&Z|5hW)}(bTJ}2mYpT5LJo?Q>A1G
zRZbnGD&77}lrw9n(zBK-r_>SUtf5rtbq!TcyOt<t3?s^~t|Q8?|3a1gzp6^%->6b_
zy{h#1FQT0OSE>|TPnGT-qV)bdRZ6{zM(eL`xVV8Tzx7e&kA9+D+enqZO{!AaOchUn
zDno9dN?oI>oY$f%e+a6|Wvx{Cdx$F6hgD@@8&$5lkto+hs4^g+Dt|Vqa(<L3!`i9x
zryEpd=y0Ock5HBVAyxUWCaP47B+B2~RHdqgDrG^cTpFfIbq7^0zlkbWL{#O<f2hiZ
z|4o$ZMo^{SKUJmne~9A!7ghe!NvLw}C_<FKwyVn34cJBgL6r+e!*u;_4A3S2q)N?L
zL<Wxr<Hciuem at pykWW?0$05?^wDH6!WYrVMz=@>!W^yyCx}8h{eums4+%lq0M&f=l
z1^6K{75F|f4R{NgPEJ)8lNpF_Br}Q7nOUfC_-wRh&H-wl3x at e*9ucnCd?L*60x(P>
z3qhYrZbiWjWD)Q#vKaJ#EFq^UyU9`zo+7t_a0|H|wag&PKzWQTM+J8fWd#yXk~_uv
zR_+4Rh`WI%l6ydYgsemjd&s?ruOX{|*OB|s)B>`ah@<}+YdH5Kcz`Gm$_}kX{v7fU
z>iE~gDDcm9h)p5uiO64!*8h70*fxr~6(w8QB+G0Dz3ov%;R$R3=WS%G9O5>Vy_q~F
zy5 at 4-1*VaYqxQLEJMe6>1Ds396QWo~#!hs!<w+uj at D#~aMw4AAJDEIfH75Qi=(@|b
z8|4;~J>YtpJPUj;*$ezIdCnTg^GF0{qg><##8#6R!G0^51448k2#=DNz_%Y=Ie^A)
zIA}F|2s!tVm(jUV<P{WH1Q}ChI(ZfJwd6J6_2hNn&EyT>Rpc=6GV&%kXOSa_Zzpeo
zKlC;T^T<0O+)dsEew at 4qyqp}hy0#fS;dN+aDtTX;fDa`85ab&_0-8WRM&?-Z3F70(
zr&giQP{T at c40s#)92w)u7epN9zC?T)`3m%<<ZIxa<QuENx0bZNL;nAKkBmFX55POf
zkHB}3pQJ{<jLc4Q91>_f0rC^1lghFmgFc3gqVf)8G$okYG4wPgIF<^TDdRwSfQ+ZA
za?=Dvw~~oePWO160y}P|LJKBQp^UdsaZ5Xyo at R6>1D_*w2L$sxc^LQwlC5au>O+K0
zK{fly6cl}lOa(qbrlIUXGMy5mC%TUcG%|tQMbDlA&PjA8cutU+h<DOiz*FgLP{z?Y
zz_)?|4W)B|=h1n<3+Q~{AISpLc_&>6d^^1rl<9O4 at LakWl;v~@;$!Jj;4vtrDhugt
zh|fWts<MdQj`&Yx2Jp>v8Tjv@%R#@5-T^$3t^l4%??mo+(5bSN-UU1jeNdJ8^lsqE
z^d2D%x)OL9N at 0dkiYhbcy~v$SR{@U(C)PA5RG9?|RYuYKKwpB^RpmIj50u690YZ#Z
zNcBqUnk)2=ZWs23?iTBjz9 at 8*-Us{ueOuThdK|NOFI|l}I1Sp1ML=H>R*Fs+>x4co
z>;PQ at DW9rrpil{?ahkG;=H8E9ZlMpL)G034gGf9{*NW*yK}<D$7<dO=2fUN6x71;S
zHTxSudz?N3yqRtS-bObAKT013evEDb(^l-=+YmlR!HCsDw*x;xcc2fyQg&0QD=~ge
zs`t_?F}#=LVD`(w?305$K*ca#piiKVGZZnHLvq*$<xroaJ0<-|Ibbo!m*pT|lwx|G
zJ|$eH!&Kb`fxb?kM$>Q5T at dSQ^cj)!HYK}}dW-%BiKCS40mFOrS at i8}vX_2L>2n}_
zM4w0PFHlq})b|IPu at 7awru$ImH}oaoV{||GzNH6%zo!S0`#I=T`HUU{{*t~7`gfqK
z$`_!h%2)IiG|@-tRFzk$)99;=QORrcRAsDs2{F!7CaBr3Q{mvg0bE4X!&dO7CGsOO
z>n(}jmiQei+ at 5#Q$j$0|z_+MJCH;Ni-zy)0GEx0d at _dB&B=u}Dj1_9p$4E_AKcVHy
z?KlE{if|di&p at 549s{1Oeh$1q{Q`rSs(y+5rO5vZv^k)u$~5(B&~5|m8_;H|-y*eG
z6+<P;eD!<aS?Uj<-3r=|2p1vzNvu8fIPeVh1n at ky6V!$3DBwHP(Q3J}1To0NxKO!Q
zRZ5DD-zuwBGFClRS)*>16R=Iq8mFqtT6Mfil}+jd;78SopggSJ4E%^X36yo}Ex;Sp
zalj9PQ&l#Dhbj+&Usbk%M^)B?M^!eelhNW<b&BdVey8kE^{Gfcp-xkE_=@UuRotG>
zK*{auOhMArSt8KY+2Fr~%u#o#*Uweu1kFRiPt^IUxRF}`oXgdPB5<g;s={n9LM?|?
zA)znSC5XSJE=BwAsJ9{aOgRVNs$vE{RhI*Qt=<7To2HT#;CfHJ6D1C*cOhpqyIV+7
zy+_DZU8%}#>|W85p{@egE9!k#07*c$zlR_=<x6#qDz at VLRjEA>fb^mIAn*t3THxdA
zLt at U=hf(eYbsggGtLx<mHdqBViV0O85nUl<lc?9JZnm->Mb-&*3wrmOx)tRQsN1Z*
zJSO@=)D at t;t3EErzFj>{d0O28-u>zm;&NRPM&qcuQ?RP)lc?$k^(j%kvJ1stR-d-o
zcm|0h>TWBs2gRRPp9SwRbuaMe>T_~z&x5{4eF2nC_9EhY)qO%KF(_4eQGH3&nxXC&
zx~m?rB(nw8zN#JsX%ssI{4u(Q%}9M&PQ at O?pHp9vVt5|$-Ri60`AB^c at n_Z7tkG>n
z<p<T*k at 3Cy2I6n1hs6g1<xRx*fkKtn)gzYJ-jcn1TNRn_So5 at 9?X5hczAH;CMaJ9e
zc`!jYGxi=ToWPC(k7Mrxk7pkMPh=lrNnA=kQs*-EF$i<mC&07Vr@*t>XTUSrF%`?>
zbM-Ek^##%^*q5kx0s9K^W$bI<<?I_!7P4>A!^P}7P;O`6gR%rzRhEKIl||rDm0Q^l
z$i0pIC{`u=3HVNS9JMQ}89Ra0eXNtg`(mSjSFzE+E7>{7eu$}K7#18G3%r(%1Ac&=
zPmDj3 at oXc@oFI;L7>k(xn^EXdHVJqey9Iok*kr`FuqnWgv8j at C8sd+$>A>6B4Df7b
zGl3srvq0I(W{WSRPcb@&sme|^2RTo&9w5ES+;frG%jSV?ADa(+h%ErqZZ;SAIkph^
zMRqHA_OM0BeVHvr{CV(D<r(B+C9ox+zr>aTA7r-y?+3rCJj-rJ`~X`9{0dtxI`BQ~
zeg{&YvlYOfvO9r~vb(^0gx!sr-eUKF@*P_V{4To}_%pT&_#<{7a^GO95&w#<0se&D
z5Bvp6smj~z0mQ#y4+4M5)&hUc9s+(JrBvlG>W3<^he7$4tph&B)&qacHUNJJNn;md
zj{twbHUYoGdO|TavlEOyih at 6}Eg&9eTiG^dT&axK)W?t>t33`pPTLMVM%%%NQKd}K
z*b_|bBs(R368IuWTv2v0<!NyIi9Ew5X}x#L3Ed;{vnW1W+Y7uzdk%P(_B?t#U3&rX
z+qD-Z&puG5YA=DZT-z at x2M}MN9Ryya9Rj{hdzp#5y;l%lti1|6PkRleCZjg^S=#He
z)El5L)eZySs=Wz3S33fHhxQim3T+=ar)X~r-PGOzUZ%YZJRkMI=hEIoe1>)u_#W+j
z;Dy=;z;m<@kvmiC1<6z^_i5Q5G2t?QjI4*XPh_K?BEDMtObX<f#Gixmfc6FO8tqHq
z_1ag!4{BcnuhYI^mS at hyweojNIuhR_=YH)6c8M`ac|@Z>BDq=n01m(=t<UMk5M`^T
zi4AX?_LE!&$3+#&35h#3v8O)<_u<dVb}eU=hP_G~4g91wMiade+x-r0EGSQF<0NIg
zCdM!UlwI0HNx2#E-P$A>zXkE9w8_9bwJDnH>r|OB4WwtZ=^8QWl)W080pd(eN!Ev1
zn$U;Y8iX}ed0tcJpu~&XT;P4$Jm43!`6BOHvOqhal`hn%a!^~SsmdX33M*GW*2KIC
zkuK7tbzcm^E7~MveWVHXA<AKGsbshf@%Oabf#1=V0l%d!2mV^S1NewG4JAI*#FUpS
zpCY^y at P&34 at R!=%!0&7K03X$6f$tMdsDqHly@<W5twNd45xWoYwzeAhRc#IM2ipC}
z`Aictiv_AZ2>h}(88sY3Y%SnT?IDQfFUk)ZRD&3QRgP<=>oCMy^z|6xRDA>RSbZbf
zdPKv#$}M9v%1zTBwG!*WJVoCEJWAgxN%}U6`!TRh*B=)&s&BVwJHU5BdqU7ueWyix
z(yHhwE7$;zG5RiR3b&y3(fZTClk{gS?%haC1PLb^eGlT}^=CD?TkipBoW2`)g1!S8
zo%%Z9$@;l2<9cP5PWD>$_a(-EDRXu992n>8&uc<6UqF1G{-TWUgB1R*EY+0 at U~FE}
zR_N+}<Sx_qqq61t0gUMm{X!VbH99{C(mnbikXGw23+d|z!Fsp;3h=%9tH7)D*ML{*
zucOiiWuq=Ej;1`SlQ+P=SwF0uZ}^pMI(bt&Re4OmNVtX1>8>LvvrB&q_$mEuq2u~H
zz<cy}LD{Ll2fRZ+3d&yneZ-#xMOB{AKS2B${X^iVb)k9B>QGIiN!hPMU7)|s%0XQf
ziuJPonN&xi0*CZJAnOL at RlS$cpQHL0DF2pz7_RbR{Y#;*`d6U5u77PQ_c3AZ^>2{z
zss1fU-(lwvdZt5vlpi(aCnP at Bk89FCoDjOHKOr^?y;Fy&*GK8HmeD$P4t)&phx%BH
zG!BVRbg}B+(Z}m@@;lM++xi3)d`;geb_ac;_$G#VhcBg1vdZ0pa_{RuVx&Rk3tgRT
z6%`ikEa-u_pq`>*gso(%{*|61#`V1%S0 at +a`c|K&OHp80-|1o`$Mxwt&O@@lKgj-^
z&}X2H(R?O2|DcFY{RAGIob*{%7es%4)I~=|@rzG4!pb<#EQ>c=7nbEoR6d>yOE`hg
z(N8ySR3>pMlDBY+?RTde5oM}Hn`YDI>clXWd0e at a7*S;*&zxs9HXqF_<_myt<qLJ`
zmc52fF5<W9!W=A;crmh<@Fj9+OD(3`Kw8Rgw-U=F*K#y5T)Be_d#EXQb8-g;au>f0
ziM8CZ0*QM$)L&V}??n7Qeiz~o at VimbgNRe*etr)qYk;Y;ny=LF)r}5i9hXPI^?Vg-
zze(A|u`13t{-JE)WVL>(vX!p^{lAsRxxDAjQ_fNR{C-`hxi0kqUC~Zc9 at O2eX|1lS
zxtZ!iy27AG59 at BVah<LchIO<TW*G*SocaoL7k*0MCFQ(N*6VrN>tutTtG_`u>hA2L
z<XPs<e3$HH?xN4gBdDgQvPsW%ya}E>ewe(#+$CR-H<-Kl7&*+``5%*an7jLzWRsp}
z93gKr_bK0!mzcZ9SL7|`?)44Xtmmq)k|WIB^K0^`uBcBlWxbxuUL)@^xBCOKMRz;j
zA_tkf;1lv8%guP3ywBWuACV83JL^3X>-km;vxw=3n7iBO<N$N$en_5UZr3~H2khQ7
z&bFS?ZMs5q7zCW$#Q7qYvx{n-S}uErK8`Lhmn%l!4o2*j=;PDk&>theie-Y63&mcl
z#%NDKlpoTaDDWGcl$GO at J&E{yIH0KVY$ciP1Rbr$>l&YkPEnP+RBe}R^J(zi9j|<q
z=4SV(D66f+(XHn*7%zh*+O6x|7<Q~Zx}M3f7d at -%`3%-(udXwOwfLN_JK5J7d0y8w
z_N_)<(Ded_wfLeARlv&Lr|U)RIE=BbXS25n*{|yc8>N#2y560^h#b`QLI(R0>&78n
z&tN#DzpU#HHc=<9=z1QTq?1?0SD48<c}>UEP1VWkx}L+P!xrnhi_O%@VO{URX2Tfk
zI%imaN1%iZ>+LOF at 5vVG<ZWFqVT*L~j;?31B|3Rm*NfTrlsup+I2`U&*?X9QC*#t1
z53N3>9u<?gOebTRatkxw*WG+N`#{Q0$apgQP<K0Ku#Yg(DePm+!FlmH_ylsC%0AWI
z`ZPHI$~{cEpDF8 at _8E9Luw|NCUC&~?$566V`CKZ at 6T+!g;9CC3lu?>+n<i?GFR%ox
zCU4fh)D^7ZuVg2_))n3p<_<egyy0(A8O}pmd?epliu=8g#{)XqsKrISMPomRSzN1=
zA4TrNiCOqb%>H_vJf7gjM*W<oyriXQ<9_WpdUCe%trj262 at r(+=WeLMDDGCj(|$_S
zGBeS}oJ4e?u8jugt@;@5))wnA@>uTHm+0eA(;^+l?=D?=K+he|-Npue0#}?cs1v!)
zin7$3x#B2*Vb0SZ)^Fh$Z?-y#=V}k>lew-UF@@)0lvBB`73HYYxMF}dokLNc*2xT>
z=UA`L<dDQ3olN1m>VxqP%;33voj!{z8E9*hu58s6EY}zG_+UT9M82rcMz3Gek6{7r
z(+}v%E4r9WOw?Ge&p`(n+}pY66`P`wdFT*(F){M_=o5o~yFj!*Q6o3=c-;#{kpsFY
z!bFj|qA04E^6yz at aP3y~X%3GuE`oGt at x_qmT)qVIoXzKR$5O5n%+zftOx^13sEexV
zGA``7x*Ro8UA+V47Vs75B+XOrgv6)@e#c#0 at ZXJsFn*{-S5|@_hjCQBjITmX at Tbs$
z<$N`Y!W-sbP#)&-VQ=I#7F~n79^sF2<uOj~=L#V%S3gG1V#41um_p7bSxlim;$@2Z
zEFq^cg}q3~WXg#4G9lSa(Z45TI+hN<o03ANIMz||k8~);MoQLz?0kxnJCM%UL&*-L
zU9V8G5$Vh~DR~O%tam7R24VL5l>CM%IiFDSERyaYDR~iL?oX(WW6Ldaj8e%fpyZ8H
zVV#+hKUpQ0Fs0y5m7L9#!c{66qcWxFewCCkrT8(GYz0%dF^tXzx%(8Ll1Yr5$CMuP
z82J#%o_8~H3}G*vypJP11!w7Vm{N*!@A*tQbr&PE8B<PsjgcNq>HPyE%aJ_2QzJc@
z@~e9_bt{s;ej4b^9YAMn(8NQavmVvR4 at mw74tyV`oV`aQkD(vue50w;HKv?9AE at ta
zpgu6p4<S4c4${L2&xi3mmnj#(JL$`m3*mC?1NFCe>f{2ZTy(!qE at aBZkHGMP`nxSU
z*@Z at a|2Pb<#>gel>*8ra*%+=((V23^C*ZmC4@|l2V?_S&Bhcj&Ik}iAf1E6S1IU!}
z>74wIDg9P(^-`u(EC;C)ZoSg~9!_S0eZWJUT*j0uH*m5N<f}GwvI=3<Hcsw?(*0>W
zCu at +tdaNej$&xGK8Bs#0^SSe`A6Pm}X+G;p;i1 at Bxv{M3(qW|8xKjLzfG{Sq&K6l2
z$eKt>htcLNkj{za`C at q!kf%0#LGr7__&=<@36vZ~k{}u$het$KNvbLxoPq)+rK3Yg
z(A_`}-95ncWUK4VcFv#w#IUoQ`6II+C#DDH^B1I@`TKXLbd>H3-ADpe=|(~qx&`RI
z52%QwGC at K&0&ximAta%rzL|MMWLBv}_skBcGCbVP&CT7--ObF+Jt9A8?3-N6t)rT=
zmM2&62hQlu3Z7iWqt804cycvQcyd*>C$rRQ4p}maVn!Zq>}#*)Q+t&Iy*=%fd};-g
zq~AiI_Wqog86j6hB*}f&dy at 4mGeP>!TxV|lEggyYdzD8ztYeLR|F&1I?{n<F!7nJ!
zvC7)^FR1vad_luUw- at +x%zc49#}cdb=h*Wswn}GpFUV0T55*3yQOo{blFa8=TFu@=
z2mnU0+Yc9L;6=^EGsC$+m*@r&@O)mzUWj#L0{!y{$5&Mt&<c>jR)+U0E0?6kzFyzI
zlX}%?z54#-1=iKj9#)m|iOtQ1YABWc*gs5Rud+4zTAi=c at hHi9UE<xO4LS)&x}>&8
zAyccA-ocSCIf@)9nJ7d1UT05B&UKcYh|h_v at pqEFi&fk%;lqAc&ur3Dn{^Ct(KB21
z)HdB-E@!sz%yvC0E$>x9&Af|EtpG_i`627>e8}Ln9N%`r+fHVG$SO(z8|7-mwob0(
zjj5G9v4+LgFv%LEXLjhdyvcsZtz0s-7goEcE6`&`H!4ATT^Ur#8lk7Y<%vx!zKKbR
zoqBwyE&=+1B9FaGkFq6GD>_P2VvTN%2BP(PYm8oB4b!1w at 74pj-Fjw^J`mkCM9{uH
zvsbsrv-k`q10Vc@!XhQV2R1@{_4Yo!J#mnD+po6+ni2=}_yJuidjM+L#1c6ceYQHs
znA5~;_;*L<pl)9!bnqH~PnQ7e9~fZefOR_SCrSS(L-Y4)?AxgBVzup>+zJ^g+7Ie7
z)o;;dY+waUh49SS{VE~H^FjW%G5-rPyumoL4>9{4)&Md8gfTdTy4VX?tP2AD-$9l^
zGQ7QrMM9S3AlY>WVMYHR9nyad=^wIkzpTIOXJ2OJQK;5sme{}=6W#5Vy0w;7cb7%5
z0fW^WnBrV!019~jTTsdwe0xb&A|>UGeO-8Mcqx}W!(8VKj;@yjumuP<ARuM|q%Xkq
zfiU_?8esHQ*0QF`x*R<6_EuKeX#^0nmGzgLtt{Y}c^o;0HASTw)g4@;m34wKm)6qi
zJ#{(A<GCKBr*`NMYijvv7$BOVwrbj+it7GXC<KvY+dz_S1IbpT{l5n_c?;kEIjG57
zP?NW?CjSzokHlvGe}nXq(Cj0z+5bn7z8UlXf0+I&Xs`-s^~83VjkYreJfC`B$KOWX
ztxUOkax-Ax%y1e=Y-5l!zKt=6tb|BF`9Be**4Ved1Q`DpzH|lrqd{AQdXAQ3b7W~i
z84O8#kDkf10RZ%`Hv_#^1T;iOpjsA?T8mW~1e1KE<ZkTTS{XaH7OGS$CmWdEz`S~=
z0ZAE5d30p$8(6;~A&zhGbtntk;~S{aH<+W2A?ua_>-ydMtqd&>u)_$pXCdJtCJb(J
zZBOrngieq%n|VKYxUthJVjtcb)%QNC5v>z0`3WQ0&4b`?`q}%$AlO$l2pS86U|~22
z_AvkjG@}?!8g~Jj6|B5H<XpiLD_LXpN|+Q@;H72&Gn!hW6Tn=c`7tq{#pg2#-XL*I
z8+812KYP8PV|@`F3k!6t4e40V02I)S4O at FTzK$#O*m4?<%c0Siv*cuEPsSdbjO{<3
z@^ql0aUN>y2ZclC2_ddVe0`;WtC4Uu0<K1uT+8gWh-)q4n#e#&E%^fi-I+PYm-s_&
zs64eI2K5*!!(3^v;xt(fl_6eCmZQXEIaJ2UGBJbMcV)7=J&RRAv?AU=(Cvfbz0viu
zX*I3=eg at N^$VnhWL`s~X$WH$!)BqrUe*$tg=@b`h(!<d|R32DiLHj~kuzCPRl|V at 1
zL|A0}1oL01M0_nX3Miq#$yDI|z)Oc%uUzI3+miRPsYA?A3_0-wb74-N6#IeUh?&Av
zEmHD;0L>#P%r$8hfnm`m;CG<yeCVl62E_Li5N|C)yqmeP-3&Wo8dF-9Ukr8{*8{gc
zcA7w^GhF7|!C<7=znn_3uhO_OA=drNr4%!RV%ky60TwJNGnooK-X3F#%-?5eeVoN)
zJyP;tai&&kw8~mu!=ILFc at 8FlmuNOE`#H>{jcFB&t5rZ?vCCIg+zSj}p4MXJP>;h9
z&wJHyl*PO>kLB=ci`+I9gr?3rnwvc+`!yy*%Z-EeAS&fRxWckjpbnU_VgRg_nY`ZE
zsSEZC68uumgH|sE=B?^i_Ov8HhO*xx5!rwS)!r|!s(=iM{c>83?Uz~R08AUz#PL=A
z(kjweK{TpFBNjwS+mtNe?!2<OxjWGHI#ZzXFGJ<)YE-DK27jR>GaV(Fx|~<psgIaO
zKh*1>XlsTZ`$%Um)xhFn&GN$>SeS!E0Znp9m+NwgZi!cz7kh;XIWV8C0P!^Y6wJXW
z`M_!jh0kW~$|5DNacq<t4u5)O?Uzc831VqYI{>L^Us?N$nhy3(R&h6swzp9d%WPJh
zw^?#Jg?A{<bXIn|NTX at qPos4K(vovoVjioW2Lj?;X2ZWbGpD&dT&CekuZOvPUX0d%
z(;NwzabXKu>UCe{3*Kjo_gqyzh^faInCLrpKyj`pZeR%V21Af;!=d(S7KA%AW~Wt>
zMD586#v)(VXr3?ldA?BjFMttS+iK9m_O5A%sV|9EEsLWl(9TO^d4g6yJf|o;w<tWX
zC_Ep3pVF{9K%8ig67M!Wt*3eCH=3Jo7IA-u+*~NSD- at mhg-fV1hxO`TFzix5)S(E`
z;pS$0h+-|!MLiY<^@#7|vVB;N?c`GJPihQ=S>(gK(E<h%7W)ZHS|_~OW&&`?4$#DK
z*#w at BP&IUH at Q8&%H>`PS1Hw!7*vC3cT?jHP*F}bs3h2jliJxA}1yghAo>E{9m=o=9
znSGYoUom?TLk2D(1q8UaSSBe-*r60lG?kUmLZ$JIaw!b^dYbk6;sn*X$<FKLD8HlV
zWZKtR?1(NwwEJu$sDSWJy>Q#9=4Qy)z!aEt at -pTuhvCg~xElWoO36bhI>wdtMAlI4
zEX*dIfse8{n`B`&`A~+z{8FwAtEu|HX|>#KZcdJ7o--Pz`Yx+*!b@~<K|F6vEtN$x
zuPiWO9$|W64SNcxOam;Or9mEh3QIM}E|pzQWxH6kJ(@w$sShFLXOv(c)v2JLxv`(I
zs?<@PiY^I at jxUyhn)Ax4igplpUU6gR6<As?C=k0x7O{H(_a2#5#`guV?F+D#Rq<<z
z91J-(yNc$jXWb`R{FpAa8GoFVpgGhtQCO=Jcfwq<pI6 at rE3DqCZQ?Uz1fEO46#?*j
z0q}3p4I0<0F1Y3w*Q^q22Fdd&`A%3NM}j;(lCehj_c-|+hqvP(UBgtmfTWqbib1^J
zuY#q&2xei3<}--=jL?ACowx>X*96EShWbu7S~zK?$pNhA!+t`r9>U_1_D0dND;DC#
zH!Z|Viee5>%$r1L1Y<mZ0bW`JbeMpa6~#=TnB^q!f`FemsoTTk*h!t0!>j|r0cFrR
z_G;1sRun at mWFgc-CZMhm6bP|Eg3{O*%6^N;`Ew8oVJPCbf|bM-i--s7hdqrUqrk&W
z4UysDrSdFsLQmWdO7<ze`u3m)S1|<y#s7sP?L0^k-E;P<Ec1jfKRk{@^;HHVs~-d2
z8x9~KMc{Ok)?DP%#9%q0z{;tx*kD<#(*Xh at MQj2o!k=eBwITlPK>Uk}4sbAG0Wwz8
za{emw>EPY-0*zSP%YNe%q7 at UuX)5C`4h?vCI2Hs!yqKU6(>4vY%Fe5so3pJ*y0;}s
zfUoG4 at B)czh{gU2DeRE5H?oTE(7qd)ixY4JkxisIj4h{z-^c*U%Z!!d(^V-6U=IAj
zE0&AT_-qx&)><Y*^Iv2FD~L<j?hpi74N5rdm(aR^?G*1L7twx?y at Cxj5qb=l at ea^g
zZl}M+i4f;RUmz?b*Jz0dG-(9#D^*ZPDb05f0~6jv5YIL2XCNyS2%#Px)T8WSiA*kq
z+ynnuW(O8Zs8A#%TvUG at jh7PO;)$X8Z#{|CPf;9J3|pnFmmoX~bi1AI63x;HnlkYw
z<a-k&Wk`#%_$RvjTaXjI&W*H=Y#>4YzmP2>FDwt#?Rnk4q6sPViUx17D;mq3*2x}N
zR#A|1Hj?a9IlQ*Awle3ru}^h|Gbw~t!`jL6Ss0WXL+$KC9Pe*ajcyY&V(}6J?6d^Z
z-(iX&41SfhpXoIm#8=(ToB?Uo{!EX34r?M8J^7C)e|)BAsjp(6L3y9)!1EbT^E&+}
zNwPNUnDGlVrg4&DzSIXIan?3SD7y!_><gVDwqQg%jQCQ=Zn3sPM4D$BwY1(zh}PIg
z(AJ$t({L3g+ey$|<)#Rs31%vertbaxH;}3{zj%^9w9HpJz*hvMgwbE?QwR4dzlY+#
z0FaQ{sUgT&0GSGH^Dfhb4W_d8&zf)s>q9eG<{KT}-S{~jZIHd<=XDvMLMjm=Nc>w}
zg{g$rwoSx84w;`D8#5r6)M_c{#+D|=6DT;tVCuwCODTh at ML~N>e5ZT%92WmhmpvRZ
z`Lg!d4d3Zm`y|Dp60%S4{6%wf;v$P*WLV&4S|9I#0*mBy)LvZ{cL`z($upZ6nR#lv
z<ccMDB80?pv?R at Cl_2mZr?JGxa`nfu<V?e<+?vBu7xgxE*G5Q=O0;5rz~Ub;w8NH{
zQM+|dZC8 at t>kx9jzeVPR;=xoIWtiWi)%_%`?w530ED8}~vDnHqVBYl#_RxEB4*3+P
zXH<JQO04^QiFJQ#QTBkJaIkg4dw#<EtrHsk1h;j9=O<)aCw$;1G_^>$tY at z1)`xnh
zzl1gcsE>T8L#?xaq{rUWSY at X>TEZPJhAaEAL`?YDPdHMX;M>WQBjhS)gdEH*M}?-9
z&-zMH)>lKG0!fY35V7+81o;nfW?`W0D2S*q74)jntz(EKt)mQW=>7tC5Sa5*7XOq<
ziDnSRnnC&rIdL09^X~ru0R at SuWlewTtOyf<E9OI*4BcS2An#hoMF>>;K;waR2Teoq
z>oN!jnG13`NetQeAX at 9UlQHJ+kcqm5I^+pL!g8o1;-ur*Kai4H(Zg2~{fHvP95wn=
zRDYG~uNJDggN9`9aPMHh-mYu7TTr|;a6)ViT&0;~C*wfaC7PSN<UsYvC*NgN&buto
zU2tqYUeH4FS)tK%gFecl0NfGO at MSE~C5wyTQrTI?%1W_2ec%tFW5|YfO}A$Y8=BZP
z@%L^9A_CmuK at rWK&$>q?1k#dISaP(S=#tpMVmp`w$f4 at aXwY~J6+%EOhMXy=m{cr>
zdfw~B?!_6#<@Wb1eqEPa74thNW(R48Fg0%Des~8 at ZRfW#RwPnhEX7*PxdY`g)VxFj
z>4icGganw*kf-3`#oqyGY9tdg4GQ=m+50ab-lOUW)oTRep#yf2h}ECezFg5xK_2+v
zmxXrEkvQPlH$ZfQ5t+CF=xzYMTD1@!1oDL^pgmOn0Q+txn;>h+$Q7i}=6wA%?`yTd
z!9t5g1CiGdmFEtq;lQ^dgnMt9ZKy*VxCM7Z?_}cA0SRUApwf+z&3dO2V)X`$o*zWl
z8UZXXn-D|}G6)t5!sveqqPOZxdX>|{Xjot9OHi1kLPYMr3BU#$oyz=_0L3Fg+7L?f
zsSx?@4AO=go!W<KeonN511ZT1EKyorDmfPz#H4xZeI1{Asu7<a>Jb-M7W4>IIc~qT
zUCSjAU#v#3in#vbv4^RVNJ*nimc+_hCEvYZxI>Ez{27(CW{sJ=1S^_ziP>Mnvr|_l
z1%hw;@*oT=wc=*#4B#R_1Z<xfW at KZ-4K@%Yr%!=7XzqO9mv(XD%y!z0%~iv*AUZDb
z87pgd5L)*8EYTqw>%ijggDAO$Wzimq_KhtJ2`U5FMhv9QZ0tAeC75_$0wxH>Q)u5O
z&>BI7;g%R?x1f~^5x;?UY>%tQ2%}}J5gTd9fNdL3bFcG;=H|4K)|VG-Xa=Imrj7V-
zL9&JU-Rs;7^cQ4o1!k1a#MpZSDLQC5h}+jj+<uabehymZB{W!H5(e{2WU#g`;eNmz
zdj)TgCJle_KUTE(A0QpIGmM_kneFL!Vxy?9vwrXjvfIHh^@~F4Vo3c0Q{RJBX8r_9
z9%b09uf0X>Yb$;2pY^rN``VGd_ArKj&!}C+f6o0--uon23vIU%!X>33WH<f}Cu$eu
zsglxv1tB}w{YE((H>gJ&wz_I6zBZ~mK=+T0G30&%Y6*&)*0(xN$q7{e$5d9=hRL at a
z#KFpbWb{Rg^<-6W$z%|dW0O_Zn3 at 71sFufi0a?>PuCu0d>w*r8qBTN)n!%E2eWzO&
zb!(AoeXm=W^rtmgJnhQNSi_pG0}-(NTbFeUM3WzM>#A;D)2-{ebwjtBb*t8}1{v01
z!x~~(Lk+9Wu!b4daKjp5SR)N<lwplFtTBcKsKy!Ac*B}tSg#n?M8le7Sd$HFieXJP
zp1!v~2LiL$?vV!@`#vY#s at d;{f6r)LgO(qIsxAy%-y!4>3p_%`8I{j)rvt<tMi(lz
zQ?X0PX5L42Hly#y$4rI9`+*NO@^V-nk{fxVtFUH*Y`|h&S!yGPG$8H>bgH770QwHk
zEX4La3QP+uN-=I~p$hnp6$33rpyMromLkxJVxUC`bg~7|A_O``Kq4x>hSbkbiu1jT
z`A$>55|J<VHf?5p3T>gN?L?fHjW1Sl_vtgHD2iI@$Hq6P*l=fx%Xovz_`Dcnd;zuU
z7cELzO{IL<B5otaebplGddmBC3%EB4?raOVbp-cK3%KP3cdiB8e1bdQ0&WSxecQ5b
zYpHG*S^&-?!0%ebt)RGzEed&y3i-YT+%kf@#5As`Wqu*Jkr>;gVjo;?S^7#U{R*_K
zs)aMa56G8FIq>Cpno!s?dRJ!x0$v5))if-0ksR=DlUDhR;dFtxH_%ZNafiGMk&9(n
zR<#ns-RL^Y5X}+*R5jd;T_)Qr_1XzW<`o0YfHKgg-A3`fa(>E0!*icx2JRg$Z7Y3J
zA$=KMgreOp((``$WFzZ(Ps)aZ2E(=xOer8((N_A at Li)<K(x(;D-)bv;dLexk5qL*S
z0$&vb_B4?5SGR>>MghZ`w$f)7($~sC-_7#-&g|-}#2#Bmy at QL^7XGx9+Jc?4UT)Fx
z8^X-5`I#eKo#ohL8zIFoTXpT*xb8&4-0#SGxfvO&(#Bmo_!Ap-m9<yZnzFQsn<=>I
z-!m=tRVY{jK{9Qx(XHu5;KPKrgsRNzhP{UN<kF_Ex1>#9k9z{QSt`-IK$~ABl<<-$
zwCpb0TuPhi_L<p6u(ed;Z!NV?w@<h0d;~;+(g10xj}%3`(jq+fAfBsgx>O*#sxncN
zl5|-Sszc4q$t`kXtDG*W-YPR^i`?j at R>{eA=mijskQ2Z<*<R;60c;byjO)k=z^!-|
zCh<+O_mt#pl5O~RduE1iZ<kT6NNfjD9^z1#-wu+~COMlLfe~pnRYy-PHHw}*HJYA!
zYB)WO)G&O;$0!m!8dD<`dy5<!t$~Qv{y7x9{6UwfH+%*P0*QtoCI}?v1Tk~|q?q^@
zvPOExdQiyMBkQ~?E1()Y0`i14!?53?y1CZOLU2|X6k63<dVyA4iP<;FDmNo90K*es
z)Rr{4nYqSGIX5$gzm$i%kY|sm-%Dg_k^=R<8!0kdprK-8K-)ep*T0m at 7T%A+d)`;;
zo0^-geX?imm9zbE7;Pq^yTM5Cg|&l$ux784arYpxU9OC8r;V5`vaFdAP`Qzc!9Yb0
z0v;Ao`-^<yLHohXRbKrdt9=l}9i%-q*GQ{KergN{B_VYK<Q=~Psb(@3elDkKH7FUh
zeBU-CD^SEAex!)&VG&uV7!^T*KdlJpEi}oc)l9RxM0DFWDl+pUMP3Vwj7n4>Jbtve
zw3?V_xS9DzY at WeV*VW=0ZkKf^?l7Z%Ce1&wLXNG#Yh7|)W`Xfi-pedBpl7i|qINVh
zP4C`4n^vo%8uiM08HRHb)sD2f!k=7JlwQ$ZM?v3BCrgn(6E2b<q^;_OyNNv$!x+5B
zhB21er$^=GH^uIU*cBCz0k0Je<r88kU)7~x`)5Y5{Sz?G=^`nAhm2aXkh*sghYiOH
zZ<0}|D<1xfKxf#k7ddYRvmq9^Qm(+=+Lf|Do)8#bW){E9DtZY=6}%=_%9YMaIUw$E
z5plbSICN`XEyq{W=Hzaou~T6b6jx>sE*3@=B)-w6+7WrC#20(#A^2WeemWKlw%d4R
zY8x&j`*7J&(agUcW!L at T>o$Bn&~lMF7%oza{Y9#@tFr at H_Pw^`kN5FPRjqR%f9#eU
zJ!hxfn00nxmPT0t++C3CWP6vKSz=&dCkD_t$dxrs)&884!_{^&thOOIuG_Lm-33cJ
z#Jp0YqJ1v4#4uC?#17m+_3(B#?JoqLV!<RV&8sH~K%@hv8kJCK<OGJeG*Bc}#Fd2!
zQPuvbC9dg!3nTyqMrnv~nb<e-LRy!i8%A-iDU|D`Vkfm#><3hZ-?S`tYH=0nk$_qy
z_eYT7E^!mdK at YS<Hqpq2xZD64Lgzx6XLp-YS02P)RqKAM7V!#Q`V!&$5bwg&y0wIV
zwT<2Y2KlJ1vWw)gLsa%Zk=>;j-Aupuint`9Yn|zmS)mCZ0N3g3=H@>}?TVZGk2aLh
zL+fxj2;TGuLA$Qb1{`M}%fT^)6C|R;a7cWsR6f(**@Fy!GE6=lCNBl;vxBoAlRpiU
zKMw``_vOlG%A8)PTD3L6zNAPTLc2I_X(e~@#;2szE)MUgX32`KYOe^NXWV}6k+WUd
z%`7u&JvpDnZ75u<vx93m`fQnLp4RR`$V88{8tcIT9_5LLxmJFnx!K@`=9Po^=aL6}
z57(+UV!viS9Inefs(VNf&X%Jk!aq4dCBXuhT4rF`S$HBJd`*KNb!}G;Kpj^W)6Chh
zg_rv+T;A1r58LP)IZ)uQg-y5uny|vjV)Au}W3rg!Z?x55%`#}b=5O%`MpIvV4=)G7
zGr5N+ej>b`NR$5wOYPz4CIw;>o`=ZMaR`K(u2oNmWpxkl3iHk$-jB7rzX}gTNVQ6f
zX>yPf(7)2BzhhVDFcLUeX+xGD0%~ETgC&Rp49SbSy;^IG4bqu&Q7<cNMF|xCTV~#N
z7nM8|5SkHGKru(HjtXd<608ny-C}j<<gX4NBTd7UHX3TU(n59o5&=gjFokG~fSr<O
zWY;+(CqI!r=My=3O3pf`<m6EhkDa4(@+3%k&Ph3OMXSD|NwrtB8lG5XRIf6m+Eqr4
zp8Q-+JZ66>S3ky_&q0FDoYqOEus;<V2Sw0o{8do|t-_xbMXWY5Yr+^|f=UhNX>J2f
z9YkTIcqG*VW~bzF8O1;6xSTvDqx|O_lkGEdWk+ONs7(9}iIbxU{!V~D0V4DX+5W at _
z`2;{dA&}9E0wD9S5l+iRGL>^$_A^0QQAv~p&tr08tzn;*<7*A(X4V;0ktJe_*ghqr
z4u+%U6clhuW at W#_?QDRe+67=oL$IR&b`-$w_rXvS44_UD6jFN<piUCCV~7*cEq%Su
ziJiMTzkr0XN-&TXD8Xd&s#f_-7w0Dsw@|ss61JE3mr{F?H5S3Ftf<gP_FnF0HW*}B
z#7z-+^->!Qv_>d_l}do1D-z{;s3=#?D=!z?=K@%Btc8X+N8|O%Tc2qFk$qAk!@-i4
zgX_(3aBcLfbX!+v2(A}P6*O&(kc-LQ&#kXCXFpG#<kocVoaD*(x%Hjqyw8&^w=Qdr
z%ab2-3mD>Ko;<;=soXiilZUu9f;)$JGRLh!+{y7|Be%ZSoJOAfh+DH1=Odmx#;u9K
zMm%|tTjw<AAWxp=*6Z9k&67>s`h+=6Jb9E`6S#AfC$rqTra4)jJi at JU+&RLNhq*P1
zJBNAlJ#KxgIq&hL$E_bU$K%NlxmCxV4|(zfZr#wF4|wuZNRpjTdGY|a&T7s9p8N#J
z;LayJndjCJ?&Nv$IJYKq=QvNE;?@lAoWibJh6^Mow=FOGJ8Yxnipn&Ot#_vl{PVV9
zzhhM2iOswM+ZFpf at h-LN?eOoJ+hLNp6SA!g*=4H|%)3)yWxK=KObQEhkztB?cRTdG
z8Mzk#%Bstx+Oj4*WwKs#t;I&_jP6DwsS6qkH9H6{oM9#)bvqTVnvu;gxZKJmy~+z-
ztV_fpy9r7Lk2B@`l_sCHHyN2)BemJcR;9M!&sO}|2GYzcN at _bS?5X(>9%0y%6x=c2
zVa)MxpKrVpmFG0z4n=B+Oz9JY^lWB`9NQTtL?th?12Z&aGkGSmH0oKzf{?g_hTBOK
zltwfZG-mM^1$vt2I~Q}}8E(ztsWaFuyQ#V8NE0s8d!Qu at 6OXK%;jVz#OVj#KA!?gq
zf1)_sl;ljseqC{9D#^o&{ifm^R+7^ddx7FiSCZ=#d#~cGQ^Ww-r}(BJdj<CEero4m
z((BY-6$-ZLK(hPHQQ~tHsq8iwx+~DriIT{>Ik8%auU4ew3dMC+V8<LFdTtYbe7h9#
z<3s<wT}r<w?UGO-ScP4XWfx|7FC=3RlJR~Bu?HabAVgybu at fQO5Mn1l>_iAJgxH7>
z*$`qQKx{;a4-{0Bo`a}U5Cwl?DcPXlvfzqk<f#9G#sGVF_;Q`wZ-g(`xV^}KAy1cg
z!<U2H_7wl*UQ<ZVt4L2Sq~}#A{8gkUA41GPhz~=E82~YZq*_G-2poaEqwS+T9+<(R
zYISe44<AxEq;&LCx?>8DO4YqJ6gnxbg3_d353FU;Ut%^)`Zz3d9u|2dEOH(cIS-3G
z8bX{zh+_nC2fA`~UPT8fPXgpgCGnOLe at j6YI)2j_?%k=aF?@pRg3C)OP+T5;Hd<C)
zO4}5KpsEOgwaQ3s({C{soGQZed{m9zAK>{Uq<jlfewxshqa76}-cm&Iry<}01pF)n
zJOF?PiU7|jc<#3=q<pF*b{Vl<hU7qKtzyHxutSNjC7;O8VX+e9 at 3aE5fNLLC{LvoU
zjcdJ<T!Qf)#>2D_#4o|t{z6fq>|-#A^=Pv9DHVSW<K!Ks{65+wO-xhlt%`j_iA_^v
zyGfZ7eRghakHH2sl|^p`h&~G-4G06zdLIrqp^JeAG}(s~G^fG?Iv8d=yI!g21 at 8xx
za&)|?SI}b$9u|W{lqVsaP~DiytaU~`W>~HSZWN8mzzQUFv4TEtkU)7G=|MvN$BG;O
znADUn6%(edIs?^<9y$2S+vL$^XO%u`$2(v|L&$cO(6LRl at VB~ZA5<zkqC56n1%mOp
z3QIOBiAZ%savGK7az6;q?F@>ha~%*`P9e8<=RN{u;ynf1|9w3Mb4}uXdTG>S?<-7n
zm*^Y<(O|w01M$5EFJz9g`WE@|Jwy?e8w3_V0Qng%9mQcnhdz33Q1%~(9NK~W1wlF6
zXH at S4S$dy=C!eNMO{Y^$M;Mv?2Jj*lKfSnNrUwlZKVWESXnrH}p3%EY at 7tc1qpTPF
zNDnl#r$KCwzmMs+&flWA=|RIzFKXDL+(nh2UR?R<LFK0hmA?fhtatK|LaV(4%nd=n
zy)B>&7hZ^ZpP~eP=+beB-iP1{?uYXXojVQz4>uYZH49|}<fuc$QOSD0h<Y3(Sj5cY
zBI>D#nZ-ra)4M1_ghdhcq6moE9~4n9*msRqy#{olHCiup3V}H=&7*&p+60e2T51Qr
z$*F_z5dRAf=vAYq)@f<o&@r?&4DF*(>HvWMiDMxCj;6U$*8BE8JnkAw%Uq(c`WBhv
zo*}md)gZ980?ryZXMUyVrDo*12J>D`2 at F<Z*PMs$t-WvWef!fgc>oimp;KLfje(2T
zAyyYBx&hcg!YyeXv4`3)pvFK_)&-;ts4=npbwT-2xqd)RBn_>S26-)QrX$Gap5XFq
zAH9zOtgQ;>_AnU%aT+ShqSv>|WkgxaTnG_n<WZ$SBGOk(4^$zNHtHu0s42N6QD&dW
zO+-Z*;>MSf;N{0CjPxmKi^2jHcyALCjIY+XO8S(x!X<!Oprfb)#vg4180*j{Eux at F
zV66XGqeS}f|J_F6eU$&OMp15R;6K_Z=*OVoEg^qHqOyyEvVV*MUOoR+6HYxVM99Mp
z(0lO`0wq!5#wwVzRY at L!u!rFzMY79TMF#cgc^F`M7dKVP{p=7bE at 5E!O63nk!9FVW
zi$3el@#YT5Lwwc;^EYLd`4HJ?O?wR0^n;}&i{b`|Qs0p1{{V<W>y;{Jy^?rMiNB^u
zK2^!%p%ir-g`aaIhY3yaJPBb2%9*E?dUU at iL@c3*3nVK2D at jV5l?UqCQsE*9VnXzv
zmsWIwM)?2+qVs`~Y{F-gfhQ*s^c;d30`!5YY-vSbkS10taZprIog;|3B5f|Ja|4<H
zlPeIph({0Mfzt1&&+Y`m9(YGv-V2?gdU~0;hL;(GlhIQ2{!nCv1aS9(H|6C)&(YC`
z?-fmrbXY3~7rWpkE;2q8aly+KP2BLZ%D_8W=x&$inZE;$LA%@Vffbc_7Yp6j;@{IE
zCq7W{=9Z_V_y-CrYofbaf~!a<o4TrEv&fam83~oLsw|c>0t~`*NSC_gebXVKthfua
z3FJtmC`qAmULcI2=?*D>UJWgBACe{%M3GHyp&wN+ at nJ2W*AkUvldG;|so{9%jGA~X
zq_O%jEL|fj9UJ%xn?m=>Xn8|Yq1X=%yg=q7LsAs!kRi$4q{D`!0q#qR7BM4lqhwv9
z_oy*?z(TMJ at 3M%m0$mL~U2`tZMfpU75^GST0kF!P)YB?*JNcV3^c%&w3eCG|wNJY_
zFjt$vEjTc0^t1^aGbal{!%gccV3 at R#YBGSK`m_fiFRjmMm_t%HELjw}L&>I%Fp|4z
z4X at Qma}W|xQ+9=>tfMIGDzMH2uU#h9;!&|{@v#BY`x*tW=70xC<FO+K9yX6QcSPG*
z1w=+AFLu<BVJ;ZZgu2od1viIl&_{5t at iOhjznu5Sp#7=R at KTLxuLp6yoDME6Q_>*l
zFH_`!6}_R1eM<Rlq2`}Frr4Vl=a`b*2P1o*lK4nLoQN_05vf5xD1}Yat3}~!q;;d6
z^q6Apg&a53dTXCi?`E3SdO(P#c&g?q++#hZgi1N?p~7pRmiw=PVjjK<)jWI^%DMj<
zsORCUP|)#py at FR`1ho^>6;imLD1;@c1(AudN at FIkSC3U#?N}w}xtZ%~d>m;uH<Y5y
z*A`pLxQC!9+>DGzE^N{6xx`Yu2OzUlc?JEfffbf2bg9dFw7cMxlE^8Zy;O<iusd*a
z%Pa8e<dwh_gInC|m5PUi#t5S~`3_X#9jt`?83&p{AzZ4=vENqgywZSk`A14N`mEnu
zwYawt`CC-Sax5h6IFd#jK|AxFJylsshYxZLf?h+ERp*$DIkIAJeH9JpEIP^1ED7(c
zXqFtL;w*_)0VPpFUdkmbb4>Uu=U@);a00<i4z<83L+~yy<9Cqf_$~G#?(+8{CM$^(
zw*a}*2N{cuHB=3@$wsMx<@zh7@|n9GEN`@WljZsgv|N9IR<$u|uwC}G*e?5;w#&Ze
z at Q!zzsA#n=#gXM{Zl+PgC2E|ias^#(`&QQFx}$G*;v4STCymT0BlZoKU+RUP-t9Zl
zJyPLa3w^xq-K+a3{Q}reeiXK<1?=e`hpj4x{q)Ca5U_nLCa965 at hWbB^?)jRbW22@
zTry~{GmG~V)T6m|3GQ`f`$e1ajuusGr>Lh2TZpVitE{Wx-D~vjAoBGUHvrJSSzlJ$
z7mxUv?%<k8*<9RDjHFH4Pju62<}(BHLORHQgKJ95{yPGcrc3Ur!?Or!4glRdsghKd
z#KW)FX1x;#F`^he-U(6LD5|PPuY#!iDQZg)g-~>A*4nD0Z(4VP$|m|G(6?D-DCj{G
zc=0oe{BUVW`QYYeqtqyQIAWGR4Z(<kSINCXt%LjQ)V+0i*SCs#1Ig2gI;SpAhY*8^
zPcQ-ow at 2qfs7vbT{NzLx!~*S?$erAceZ^T_-u{ATu^l|zpD*vyVv`hRZAeY4sn3kG
ziu<LX;YP|NkdIXD at 5!xC!^Y>gz*gDu&*{v?A3igB`iBo-;TsICQi|<tq;>2FzD;}B
z(96Gu8XJb51}Hphiij{DUOhuZKSs=s?tM*o?c5i1?Ht`+rDpG`%ejfO+>4#%3|;Z?
zj=0m}jyPPMrl`0__ at 9Yj!7Y$Ipjl9x&sIQx0=s=?0OP92Y+gS)!7#W+$4)fy3W|Hs
zMP0Ld4)6D{&da}m5_E&(J!MnX7TZD7)L=X4jK3WO6UCP}QA}5ZJ&Q$ZuxIhPQTfb0
z&Us9JBb-N;hsj?+^1aRtOkNQtuL-A_VQS?wm5znSo7Fb<OxLNZuBemnm{naK&kp*-
zrS_p3?$Hhz3PiP)zAHoG%fNN-OT%(uU8=V{qduQF$FpAS9GCGdoQeiKw{<*S`~a(i
zTh}@k7Mf0UEg==~RZzfJ#=wf|VnjCs6iU1=M0_hKEUAJdC~=ZNvmc^^1dY$Z?DHh6
zeF${;ez>uhHC(Z&CrRsRY~3Rc$N5K&OM at fFbjJ#fnhh%Yd^`yaJ3{R*IU`iOE>Mv1
zwNHkd3POpqe!xqeH6TM`q#7HkVlH%>RdF{E4{o%C&78&U$hQM7vPYnu`JGn4K?#|!
z5%^sK4z54jq at q_7+O{WvXf**O?r#hU#=O;JbfS~QSu1CV^T+7vuvx_oW3+8ogc&MO
zvDy+Qs9^#*kZ)Dd^XbV#0eGp&IRmdS@(L&7yP$_<TD3m_)l|)#H)4ZzmO5{UW9g^F
zB}dy-e-}T%1aaG`g?r$UUDbtr=;Vh78nD0exDorIQEyLF{moe1s8fSI<Zt~Ec3)TL
zA>6GChsfS=1YLj;biXqhJ78a!d?Xw}-$8OW=Wg7S2ve_yncso&6?Nuf=4;{Lt<{3e
z`yu%Orz=V#8g__~Fa~Q}*7z at IK5*?vGE;SXyGkbvuj?8{faJNgMZ^@{-WEonjH1D;
z$8n~f!tE&>Fu0kwL1cW#sGh==+9 at 1mL-HN<eAiKu6@?e2=Szh{3CYhwB-8#VlA_FY
znhcrm4l{$eIfXOKR0K3kL)Sb}>ET*S&pNfyb9SkXS!X9U-U#id0C}>-M)*Z;HS;Q1
zFsrO1YL)daJU=q3V708WW at uIY_0&b4yv(gb5O)~<K8C*|@OKpcj=|q?`1>C6oq*>_
z_&WuEpTOT~`1=(8K7+qA at b@|VeF1-8!rxc$_ci>Tg}-m$?;QM{H>&#Ik-E&27r6B;
zykCI7 at 8EA0{9VK{;O~-w^jzS{OMeXJ5>I}|t;+`fyJAEo>j&e3W at cSAdf#DPGkV`?
zT{n8)W!*4(-)%J;y}MeqX7AgrL1yoJtifjQd#xen1GUT=YWA+Q>dfBvS;NfU_gllw
z-rcMbX78vq5<{afG}`R_fHlVKU1g0mdv~|SnZ0}Tzb*A0PWmIYK&Jd&$duocO!+;B
zcf7Yx!-)kqk`Cg0c2G at b@tIYVhk|3p&LK6K!^oVPJc`ews#w}aYr!0K0OzPN8V+XM
z*gK%Q&H?P`u^~hbA;yIeIe^F^#P|^6C_+pKA&vsXQG|F!Q<-osJgQ|z>G(TFFNIYE
za9ZQdKU_3=V(2r2LPtn$Ngh${gQ_*b%v?13OO>(j4cR$@$R=tsOkEGPlphYNC_l6-
z$PZp1IDAzQ942WvEeW+4q}bRcgIP25j(6j#<zH_`YB65eivH4|6SKM|!0iGJkbknK
za8-lx=b;XEN!{Y>V3$<V!2r%nT{My|Hn6K^X_xzi8b3j2nWktmWUhws*9h}uqsnUU
zDLTJ?37whoGN!CRz4a#4*fd^Clv6d7q<-zo&Ej%eXb(5M`QuJ>Ow0oDbQZ5Fe%WAY
zwX!OH#gOTykK=R%a+;=y8QlIrb*rETDA-UZmWnt)P=!XQSHsAQJdB(X=Dy5>+%rSK
z%LTw$A>f4&@U;-|LILpg5b#n6I6DNqQ~<1}{={=e-+}P=gCThWxPgE>7UCg;?dfmg
zJsEQ}bWKI~j~==E2IpP0aJ at lFP3$VL!$h;wLueGSCYf%O#jY8^1r=;SF0gyj$yU0u
z^JP+8Z}Vcev6uTHEM}j?{HtIBd{fLNc-M_Ey8cl#MDKN?cQB~Ro_=THhS0=qS%86u
ziw{YfOP&8LGV{xz{g6+6q38c1=y^Je)804LVuUc)f&i8{t%``#Dtj4^YEn5J(U62X
z!bO8vWF4`{JZe!Bt*U-I&ezcI2UpZH!1l2-DtgN<z%@qud15c{%x*RFxfc7i6x$1|
zzE{oJSrPe#24#Aw8;0F%v}EUnD3WOZR0(TR-ae#Smvn2YiL0PpYd$T<uE|PW&K_in
z<uf+eWO$_KR_iHhov;vQ>Ci&fgM}2bW^tLr>li=~@ksbU$sO2D)1vkeQ`jbknq=r1
zV$#jbb*4Scw1=DVPc*cDyrFTf>F4Q!?HY{?u|F4=YHwCw(D9jLFPQl3{6fSx#Cm9{
z&7z$)t)i{d{#qj&<u at 7=nV(po0XP~kH4+{0=IlUrc#b7Dqe)Y%-VE(13VC87!W%yP
zRD?GIcxYxsp4g%K*K#9Tqk4y`K#x90*E~yjXvwGZiA9>A^m$Qx2t<Ob6EG4jH1O2>
zNs$pIel=mZDXI6BmJTr`GsmQnro=l-&4wf!B_(yHr2SkPWJ>yGRT^eWN at ZzjtqC%g
zG}M$Lou$RZvHurNS3d`K%hJSByF&$K?Qy*6VUHR=ronT!TKjY0$M{zoNdMFz*~|b}
zK&Zbi6^}R2>r{B%Nw0{a5~|f|T3mwCocdEdFl`E9vPV~EpPCqL2Bx1a>N8cK!fjR)
zV|<A2U7a1cxV%YgY1d+@<_ezAy~2|}aBC%Ze!vBJsiuNF_y|B<QA5w-E4ZY(sIw$5
ztA$g$cGuw!ykAz`#_s;{*JU7CX?!{`(S3t)60*;#XpeK at xmrvg5OOnPO&n}^njN0~
z{3tOm+(Fh8`#k96_e1h|SaDM0%*1)M`n)O)MlrAz<T)SmoDX?Utv=T_q=z>OFV_ at P
z<2kyy6ffvxHAdnaShl`V@#?1T(0jCC33DHkvBVFaqo5|L5Zn~ty*U+4991={hvndL
z at E>5(i2tC{_JNn}L<fR`xL_fJ0VeL01WhnXZsdA!zqJlj<C<nv#mAe$g_55%Hxo?f
zRxoZ=e1a+aK;n|b6;!`7vbf#qK9C)H__hzE at J^f|zEj=!cc2}3xI&<{^fD>RZTGE*
z=XVF7mU at MERPm08!8vO4Ujru5)_CO=Hnw*MUcq%%MP)sC7Da`#D)z0H8f&6u0-3>}
zhx>=ICN(Z$5q<mb#d5CDMc7*vx7{)~Hlclm%sP(;W}U&fJp91 at 2IaW7ljcZ9Wyexf
z(ZvgujknbZL}&%tB&<N_-HEd-Z;$Gmii=460v%0$i=uynYA;@>gH2XWZ0Z)c6cf(-
z3Fk#Z&=^fXDXhIv8p?O8G>LIeSK@`CHJYk(V~|P{wu%#W9nQ2kKht#0a2~}slag+p
zv%CA>JOIY0O(#Ws(g5jwff2!X6Tt`qq`?#$P>p!1UQmhlyNUJ!Oi+OU2D)n!p=sGo
z4`5MGtkMLv&+8!qe0i#nAI))q0}oj|DL&nR$1I?x5Q%Gmm`m;~6B~ROgIs|lC3r6Y
zV%Kr4e7!i0K{Z|^KH^X at HLN)_+7qia(QMD-pB9j15?KaPgt(EU$BIe9wFb8WBg8&k
z3A0fY=MxkuP_i|k1R+J0pJ%|1m<d at f;_ozSews>l(<{{4#2XlZ1?&|Q_xvWp!o*5T
zC&4;qNRwerW6~5;k`-wxENPvkX|STH(sWp`ROwY%$~sFkO!{CFNI)9D4`j--s=u%5
z&&UId2O65_V3{M9hRMB+F$VoWqbyH at te~^tT#OisbQV0pO=}sbeu<gIt5;80z3#yi
z-Lzb_vJq}1Qt|eB_jfo1-qsXD<IbOWq at w5|DsF!%$G(<X?Y+HVPI%NmKXF~hvk;H^
zhbMx!sk(hl#Wy at DPNoLD1H6j%Z>y_VZI#&kO3gPKz2ARE2M6Azx^>30>{Pd3z`tjD
zLCvn>O1ueDHQv2=CBDwBb=<kmlh?SlhCA1I at +!Ahapx-5db7qOTz^3Lp`-5fJFPLz
zof~RnT6db^*Klef#&oVD_AOe3aUBl;KN$L`+j9+j47YEnb~A{antffZe$Yf)8PbW@
z4kTVPeXsQ>{CnmnxL@=jx~6MwSZcQiN=R~;_O#>-(}Wpi7+QmNkS+*{XmXt9I^(qD
zD9v+5X~{Y*>(pt<A)xy?L$u at w4SHmRmK>`^o1L**VvrUeq|s$tc>4qClEbywa7`-z
zB`gqQwO&n`vD%g#&c2!<8_XW7*~4%REyd|)m<I2e*G+qzW)Icu at tQqSvqxz0*(Q>-
zi^#nnB>bqfRNP(Yip(o2=tdWKaUnOf$L>(yAB(=hd*~G}0wHjS*-Kp6jsScd5W7$F
z55Cx=G;!i(l;*}qX{=DM{h{Jk=Y!M%NFCisaUe_^;-?LPv>}vsPzwz7^}al3b#=DV
znb9JH*843DT9dRE2Cc>-d!Ku=y>FV<%HB6cYh~}7sukJ$JTlci1{6I?gCo>V9#v`|
z{ZnjxSwhg)M=<S=ASlZC0S&&}{fsm8>PH!5C<16|YtG0~B$}9R2ouu{GBMqN;eaNl
zJPk%jPR`a~CY!A#XX10FCag#wLfe621i2R at M|?yR5PC*02KHX8C6;LMCDg%(G_6GA
z<7lVTzqP8a#`Nf7P?Yt;1ODRX_~IzK>k7{<nO>S_8caWbS#P{RE^SbZ8C+Ok_Ns{l
zcNUoGhzp{h`J~d*h-@=JpwT+-Z*Im*qta^U<s=Ut)|80GXUXD9{A^u~mbK=Z<S2o@
zg3ah at 460<B)4nHO1But(!wUn@#2n4b#^z`;9U$>=pCzr)Mhotb`67}vL$6Qk^>rvs
zcO%~q+MX!G8~X4i_;yka5LkXMl!kYk{wNTL^I1{IkHg(2?C$f-Y`rz#toI7Xpb`(I
zji;p8L$sS>2HPB8<1Jeh&Zf>9iFsPujL)NC_Aw0$bjg^Z*;BcjSgFNUYEorYY?iJ%
zGm!6(0QYfj71V!N17~W1;@<!=;#||7XOhAea>Y?iRXP99m9>xNt%aryM1rEfz@&jg
zdj7)z-Nra-L&smxwvK-c#7xek_CjCBUnF$=g+j-F!?YKh_L4xyKMt(Sjka|B$(oQI
z{~bDhVlsIwRZoTpf#!)Lfmj!6{dz&`f8ywm==d`Ud18X*>-dyfJwa1a4Q3lU{;@wv
z$A at tqd6RVfB|^tvD0KX#Bn2%Z6 at CFoN0T*ao=FP-d{XY;Ahmz7(DzT!?9&dvQKMUL
znEuAxNez}O-Uq!NhN^WrH&dt9<?Y#;2ONR34F*9kZ7}_~tP5ehc8U~byiaE~@KA$^
z+K+#~7=q#94Jxlk2;u#q!R(n>q`9$0nz$C9cAp^;6Yy9x%}pgDgCF;)roi-7<chP*
zEV$x)rpX}AwK6x)*8T)@^BGNJG+bb;B<i(Ty(YC7F#z&82m%^^ly-CJ`y;sR=2rzj
z=hQy at oKxP*QW2V3{-yYk6YiURp~)cH4WwyH=&!gFtiv=cnh64h-8{Mod<I~nxl)5-
z(i$}?OmTS9s_Z_Y)<G1^2RcQy$B&!nnbGQM)Zo*)xbC>~n&xKQC;t)+b{wUs1sX_Q
zu?3n^YvKN`Z?k}+hNyl|eFch`#((X at rqux0r!)Z)n-7c^%hm8K?)KUrXlb5}4aG?p
z=4(9Et!bdS|NYHH5|*$)XgtIi6C0cKwFbNZ8qEn}+3?Sz8&m=<AGEpIVA2YqqiLMV
zJFBVCL%rLs;>SkI5-XrY+IRhia#=U$5>Bu!GU0tSGTkutZ^(2TWFj;0dCK(DHru0n
zTkV1Na4Tn^{rp?X+vAV6CE7K*4M$&E8ppjL!$K{-P?NHi^ktJdTGqw&uhuHVGk?ng
zS!_AJ;w@*yBL4t`V3sEC+MlIWIkPl>K+q5s-=-6e3r()I#KhH1ToTibUW4^4=Vg|g
zwLI at -R+!}9|CWZf>iAol0!va>EI}7(gwvNZc$0lux85|N61X^qFOYzg;&IHC=F<%K
zOwh-c^rR$ad?*J4lD^EAd5Z?(pZNo^8zd#x8eZlVXqt&?e61m)T;jn9LC+E+ at GPmz
zqf5zo;ZlNwcC#3?K;I=&dqB8MtSVON`hYSqT}!O?1=!wQoe5fEO)<oS=)p$ro!U(f
zXw7)yqZuW+D;j!;ya;oxKd at HmE`8rI=UK~yNCWF8ZE|_ps4O<Qavq9blVWR46nNBV
z- at +X`zgUJL&st&D=e$HSS>@n&i}0v|GEp~2FSZ{v^kS<QUTi2v;a8P3w^qrQ4MrI)
zlh+6PSDR-uyBLNe6waf4mo2IA9ka5Ti#m!}_ODh|^aOVLRW|l3mYFXMf at rt`VQM9G
zhV_;iTW7L*YqePqa+T^;(k+!~wGLN*A#r*2b#=Mm#?Q)5|14Y<u4*mZd#;7r!+O8*
z`*w9!V?$qWOR>ArGIw*R4ednPx0a)tatFP-9q}t_ at N{-+$@hTm-$SH>c#vT;W*8i1
z*z9M3r?a^z!;mn;Ud%8w%&^zb08eLcQHHuO!#2z?EX=UY&j3$nTTzDLVTQLc!-z1$
z+kOUkI&T+c7#U`G7c-0sGra3(fT#0rQHIfBhCP^JOqgMhp8=lEo}vt6!wkDI!?-ZR
zZa)J&o!vzl#^aa6wfA&%-0sk$rmROzd5 at Zk9yJ|%)O6}m)44}Y7yCVpJ^-^-i*MB=
z$k`oo;-#``Y=g=024e_oBCOdPG}@%w0IQN5Dk0q7E~2-$h}P{bB6^FK$+Ixpu=k7T
z{Vk$#-O=k`!UH^M6P|cjrKFw?B$cMsbVLN(6&+q`4`ld9DWHgf6;IPKPWylc!0C2$
z_MoPNA5&7FE)_9l>Gq&1HKaD0>Gq%@HKg7)U3(XP&FLLeb}<QK(;d=f;U at r~Ud82P
zL^=D4%PIF`3guK_IVx&5fE|yp-m*jjN|%dr%hMHwatrm_UnqBNak(A+m_oUoTGUUg
zhsHz#@~q98QhK^mL%L(SQ(N`LatDfX*A<uB*^eod+vOJZ{V at te%{zy5bZJO;PIoD;
ze+4>M7AgeOIilEbQ+JisqaihI5Sp?Es8Mlk0xW8MF_!Jcgb<brpeMvq(E#)mux#<M
zK;{-5xuuwvbO(V*O>?SR2k6iSadJ&y+20zAR!>;=x4_b|o?0Zp(h-`a0rbtHPf|?a
zkq)Z1Uqd%KWN_dCydfbf+XuBd^@16pe=x3oK$8!%uQklt0!&U=xcqZXOGzk6EaugV
zxm3G^=d*OC5EjASx5v-x%zl&O?Q*?bPv8}p;>&eYoE=SU1Zk%V^sSAWTDwt$B`WI=
z-1xhuoY-Un3HBz<Ua#3ZwCYW!TD!>vNwg}p*-VrY-s)1dwzNj4gJL|k#gyR<B+$%O
z6U5T3X2XCQ3~U3r0)86s6r!Hlj#1l9I_YL)c3|2Ld at D`v(tsj}8zRF`o&j01vr9u(
z1pEmd&$w0Va+=3?nrZ at MuU_z0tHW%Ax0gf7?b9X*WHG<z-q+LZgGr at 6)d+8CGX<#I
zNAWCbasw4+Mny3jaMC2EPq&NjG8MWfa)VY03F!zR{ZEKg44HJKLEzrk0(Ybc_jbY^
z at o{h0fQeh<-VV5dwMznmky2piNIl`E56==dM4B!^q+1YaltCLH(k&YBbZewr04Z>K
zX-M$eVx(etr%M}J;4Ven`+eM{gnPdRoZcGue!#sS7pqrzAad;XMUIEMI%_axB5%Vw
zHwnaaGN=jL_V3ijwC22z;FEc9qsksaR0{u|c^Cx6-sp0~+Yn!-a&&;Xo5Yu-3yY|$
zC9|6Sr2-1Tmt1zTh;~}I`ntIKP7hzR`1&djyfydw)c>@r(+9H6Xsf`P9It@>JG^hD
z6Mp}i^@~b5{B)kVO->BaL07nBu-Fig_(69 at 50*(U<?+K^W_D{H)3aeZD85;*19 at j<
z(fqd0l>1qz1kK`T5dQ}f`SZb-Ra`5)s~$gCh~I97vPc!o7k?$B3mFhKPz3QaA^U|M
zxZm_|4m}BaAi%XZ(48FR%{tN*UgLOi-2ZIsi at Q%|RX?+PzcT!!XU^JedUuNN;`|1`
zALPF={K9~>)qj)Adf>-~{5J*tw5;v^n~L7_Wf;;(V9*TtuDQ+4T77eK at jr-?q}Mr$
z-2Y1T23;j+UzFuv1|gsMAHRZW4(es|RVY0NFT+uuRtXaC==Tr<wZ{YKI+QqIT02cN
zW9~BRt=(qz0h5lYV*4C4<+>(po^0n2pvUl=p1g%fTpx1xdp>{stgG_@@>K&5_GK6F
z at cuco@|mAI52FJR5BzmkgsF{?`iS#W+(9Ph>R+t&jMjU1a7OFNG58##Cr9YL+dCul
z<T$-|nKMpLPSmY~+?l8+C+OBb?o7~=<8^zqo*J(whwI%_!}a7Ocud0m>9=@rDdkAq
z!dS)q+oh5tbvHE<Ay!lQ?I3EBUIm%#@d&tv<AvKJh1TOj9QiWX!*%)q(^$Q-6Yjl;
zJvHm1Zco%>*JM086Idq`V|5o|<70K%o^-2R6WYu*fpS5eTv4Mcs1Y6<;OGXAxABb9
zqqi at 3pqVXtxe3E%BAkP8 at 93hJ^KQ&FB~p_xP>-Q3g`i&Rh_(KjuJ!c|D7l1ZBKKs?
zm}jz=^YqGsSJ1}sT at K&1<S0EGy?s6mpR)OA5l at Xm>el}UARgZe at pweMp(PV;44Lo)
zp9vrB>KsKTd^=>bO+0W5Zvr-Z%-M_j`DR|&2-?EYG6(>T)(HF*!SB#Myp^MYp+jR|
zYpQAOGyAhzMsvcpU at jIP40s6sJ@X5gijQNV+j-z@?uNWQj#obOXU at -YyQr;+GfO-O
z<s>HSvB|pR#&Rakb|2gnpQrdHLQ;v}&E}aEdO6z9mh;3}t@^AcrB>)78t)Wp*;4tU
z3V+CPqo+L(at=3m&iNZWA3>+_l3lED{FsSz$B&C+$Cbi9-VN>AWDifQB3}hEJiH*I
z$@CnVOa};805#i9V8A_m`|;rd&+}@gR#+l`?{Dd=^Z_NZpLg?Z-EwFRB9A$8URWi3
zG64L%+7CaH>Yqri(flLH8k%N at 3e#+5Klab_*dn$@zo_vKO^J7tJ~Aa)l at 6JbRw*4e
zCG~OXWAqY`j*!Q|AsFHse-PUBoaSbZnnbUEv)tou_2UfQFv&|DH4|gGR}H!=UZ+&l
ztREB0v=fW&2<|!~u!E0KV at Gk*O$$EPb5#@Pz^-cI+fnq1S+unt<+#Vzk$~x-&-dEE
zGKNMzNjmo9h|a6EJq4nk_zj5Ghz9Wx(TUb+LknpqTc?dGq at 5xH?!SqE5<$Qi?km4&
zvFE{F;Rv*^p62K+aRtxt4&uT<IEYs{gLv`=2un9WKj+o~GFwF@;U at MNL{&e=Y9GrN
zj)UXX+i3i8p~dhH!|+^qZ6#jVsCubmriZRI=m~2dH!~+p{5@$d!38p{+V|nrj>pX8
zWz9dA?p)UF%bGZpzE`)eYjm%B5Hmx!FBQko+2cB16hr6McdA7(;xfrF3hkES2FXux
zGoOza=O3G(y at D3J0WJ75Y_=Q(2j_*P;@ty4$*Y=cU(<#=SLrtPhZVW}6mYj<$U(DR
z)#z(m(5C(;X&$j3$-JspKSKK&P|r%JAvAS&Z0b?)7{!xA;W3mazt_4u-{YM18O?rA
zK-T~pgfvY>XFMn-bbN%;s6dd0PnkejrB792G>?zwbRiauAl~jY^Y28xtX1UE`ijj`
z at n3>a*w80#YUmR;HS~#_8v4Y|4edvbR)z5wL)K^z$|<F-J5RB>?jq3mC#Doaup$UZ
zf;xpsav{lY)88upZ48 at 0v&%xZjJ-vnZEP<)NFnKSYSh2NqfT1<TkY0eBs$V>&p*;r
zUvPAz13?hFL0n^4G;BK3sJf~pu4&cRfU~b+XSu2KYB179!Gn-i6_5t>Ob_S at BBr&D
zm=Z+bbzK~{<Ir7c81L1T8OF&QWf(_q6uiENlB){ITMNndFb*Re+2%Vf{vGWLf6X<O
zw>w(2>O6wmtgyheu8rtiyXSDIRa-Ywh*_{aMi);!5^Sil%-aS%-Z82lQ3UemW!h8r
z17mQBkuBF0&KdYZHEqF6IG(Tivjt4rFyVwGumTBwE8o<vzm at NO@L}YPIcz0cLp&m%
zhIQw5=~Gyh9+A%Sz!5~Wez*gU6#tkb$TyVn&u*2`r&r|mUs|I$M<^Z#Y2bUU3YkJQ
zT`Nq~U>>!Whga3MbYwYCtoab&5d2kWDp8sk1#L0Yx4huHbD^ck@?Fu|dXb}7f*rW^
zOyn*#ul))SHo1L|ot6<(T1QN69r0>$1b&DoT)D>M%5{m>bW{<>!-75 at 7xc>nfv!*!
zdFCRj%2$eG&f}Kv55+OZ at zliC;+R at QeXTfVB*t8C0fU%t at L(ewY8?N895k9~C0S1^
z$s>74h&RIoGl}Ds75FxUOUX&l3zN7YkiP!zxBS$g<;w;VFwj;}BSIs2MgIa|$hm^t
zia&#-aAJUBvlxFtL&pq1L_C#kbI!o68mxfluZ6Wb3KIB<pGmyJr+P3^-5sdL-4h+B
z&;C?xoQdHPbT`fS^g6BO>y(zSQ(L~i8oc5`Pu*|SqHpgF(NV1bJN$yWuSh)J)%jXW
zoGIR$`z6TvXSKxV#c{uaxW^M;_?dp))w!l6zAOg#bG&Z?D>amA{flDNcB*cT)tsq%
za++>sxid{qPSIh$ai-|W>AE#RbEfObS9NQI=Ddo^Po2&UuHVtx`|&z?KTgInhCvxz
z2kpe3%;`+QWZuuNGwh$^#_n+4fW)peSG016ysp~2)#^u3Zy2Emj*wrqaD;pU9U&jV
zZ6W<8pUoM%mFLb3{pJec?HW3V|2y7HHSQScI*{a_SG|d*>M0zD#TcRps-5_{1w~IH
zMN_caWB-jLjr$Rj#uG_*l55?~6g`RrO$eLlYzu;(LV_Me%b(tcrZ-W?^WK*Ijp=62
znNzGux^Ngb?Qcy#68 at q82fqE`9C at uw(pAvP&Z|XkN?fR63^k*uguX at aYtXMrzY%hB
zFF~MRzR=+ozDrL`)N4Dx(Ed4w9w~^CJiY;C;&q|ay^c!z3#CDX>_ at aqyoRss=$@z7
zbXk;+UL~e~4yhFVl%OW~NQuXm=h#ok%?bbT^Gx{p at ql{7hL*Y)B4vFTVzGbe7oY={
z*gPnfs_}gLXN%&WWIcnZ4zVM$1n;O5nyn)#SkEOCoo|Vns_-ky?Wbb}s12X*KzT|K
zIQAN+y9R<XN(BCv)r;V1x}Z<|>b~@XSwLU<zlGiu=%3dqHaIU3>AdqsGkL{7f%$JL
z{GOtg3CeF9dycTf+SB0zI?qQU-+_R_rHiK2;g{0)pfIbYrI$>peP`(#(5jhq*_2AT
zbRM*7E?qGtU6y_ at B}103nvy9?*GwrQOW%T|!=>w{RH8~ZOsO50ChKS}?%mke_lL^U
znIA7P6OS)K&&<^6PLOR%7H!4BEd*0w1kr`@bl%fGU|J_kYq$B7Y^@-JC0^>Gqgm|d
z<ZI=HpD6RtN?ZY>4GQoOd0pPklHA;kcf7ddb%hpjy at dcWorW<=Mzi&(<jmHS4SJM0
z4SI5}9+jQBda_=RDo(wgoUcb!XTF}CqenGoj-FhgN4c{Ar<zxFwM0=Ds=|DWSKi>M
z2@{@?#;2s(U*_!D`b&BD=E~rM3}<Aq1@%_=HI*G;=#Q4>nPxLq8<7BC7EpA;Z8*c4
z#PB=1UR7!uFY8G$^(KDm*7Gv6xpmU4Pt7K|mEO|^zS<2?e%Z at R!p$cArCv2ANa$#u
zNnw;YK#k1}1ZM$uneQ`VMwKOa*PNG`1BkHwFod2yN+%6JY>Zg%VNw=Cg*@sK{7RCS
zHc~UVU5_AFB><^Mka7VcFY&)HM<w{s4cwlO&<7EEK0-f9AEC2OnJa|134}i}3k7K_
zdX?WJqNfyroGt=USK#MIyv$6Weo?|dVhIcMr6CwwQt{iMZSio at 0v$hNHH%|!VjJ6Y
zDB^YWFKaeyx!80>zD5X<kk(SoCboMPpgZ6fYc)|O`6uh0tsBi={8cU?lh4p`ZwS<<
z<Q)FA<jmp8nfRQ^ldtpslJh!G&cgRuT=3{j9d~-plWDpMjR>#v!Fl at HZq~b}t_fb<
z*q{ijcn~OsFp!uT9DyD#74Ls&HhY#;h_Ig?8xoO#Tr at Xq@XZZ#xIKr*hDLmH?3v<a
zCemWh5-$*%!7YZ|mW0lo%k9}bwnS&n43V(J|A=}6r@`2<2n^z43w0SG8;T%j6d)S{
z$QeAg6d)ULL7k<mnyPITR(VJyA1|9{#+jMAhzk_Qhec$<f+q=F2vIjTgb at uQBFr(9
za-bdab-Jmjcj)>F5gs+;ow&c$G8ZI4t6@&GKOPYFM`#t{^>#bnJ1~j0%rc7#a&d^S
zBdabfr2Z8yM`T>MT>PP9 at _OJBGaEW*Hh!bS6m8>XW^ja<t>d?OJXv^T)$%-gWrf9K
z*HRzhmRpp?Khfo?e#9v?8r72Hwf*9QJw?@2U|`fW;km4n;#`)CpKJCR#NS$rGQ2V?
zV4|vi*=%tc(3k}Zh-F%&Qm_0K&JzKjz<Y#v!a|k-5bUQ;Jp&NG=j-sB_N-$C at kCk$
zMrf6zV|U2m^BdU#iwanR*O?{}3i1K`oFWp5#fwQqi)X$53a$XFJHTjsL${c9#<V^+
ztuIXLOVj$ww7xd2v!?ZpX`M5z^QQH!X<aa_?@a5WX?<^6mrU!jX<ad`A5812X<aj|
z>!x+Xw3<z;HewBmSc4<hkcc%jV%0^gVG(P1<mvmIH}vG2I+PP-P*PNevZ4x<7FD6V
zs0JlQIg}aIq131W<wmjOXavfRmO$yzQYb&#4k(DW2O6RsfQo1t&=D;MN}?4&OSB_U
z6YT`_L^}gT(Jnw!^fsU>dOOe+y#pwV-U+lt?*i(gcLROVu0Ub*9-uLLFHjk+>|g1;
zsV5hMW)g{NFT!tsW{r$Q*^AaF42}li7p*an??r2Dq`z#9qqOmuHi3e#U~nP at Ct`3?
zBx<~9O~&99ik*tVQ3aIKC^!v+(<wL|gRe%Skr%BQ7 at SG5Gch=eg0nFA8U<g&;OmiS
zyBDq57_5&(%U`q_FgS+*=3sCx1?ORKJ_YAvZ~+AuVsH@!7h&)Xs`nchTuiZxF}Q?+
zOECB*1(#xQ83mVPa0RsNi|`A<l at z-YgKtHm%8S-246dfw)fikuMXbf(Its4G;06NN
zh{3lh_zni&rQo|5+(f}m7~D*Fw_tE9#cspk_DHn!MQaBJcT((5!oCyxX;-1acT?<c
z4DO-Wy%^jViMD^y+K<5l6ng-J2P4sv7p?a&_&&upV$dZF9tN`%`~ZVZ1dzjEo`QKw
z%VY5$7FzYANVJQO@=zpd`oY7I=<R;+W8hRjcq9 at n^MgkVlpHGrj}zYG7(7v^;mHEP
zDd6cBtxqs`IuhkCTAyO at vjRh$q2M^eGY(1poFcx!v at a?66$Zbi;MW*DOTlk2c&^ZX
z=L^Aa3&9J8;POJ5-xY!v3&HOT1L0C3c$tD%AlU!^a2D&yMY{C^5KCPLeGT)-RbU3|
zS_I~i>llYDMWffcfpM6hMzGb4KR8~giZonlpi;wFwIwj~;9#X;Y7Huhicw0;NbEyg
zN5j<`jH$>bG-RzI_&OAS>hK49!WxDl>|kp+hHyL+H_ at oFMqnHcY+_m(9ME4;F~VtV
zTO&&#2M%pwP2xFg6lNP;0&^d7290)W491PcpK<szz67R194a()tO*$R3jQG5TN6uQ
zj+}(A$WO%6)V09ZFmF!A1e`3aDHxhs0w6ez5Whet!Ot{Im`*jqpBW`E(;`RH#A3}X
zffiao^}y8E at CWA>npLdV at pU%-Y>dFPjB^T&dg~I0pL$Hd$;E2G&>Z~135LcMjSm_b
zG}BmfOQ7TDAqcXdH6KGb?^p{kgcA(SJ=Q{e#VNvCgrW093pOnBsI?g5mQcC)vy_U&
z9~?l|a;*Le!i+y};m at iPSUZrZt<_Wz{;b8Hb@;O$e>PABOQLu8AHkeOdUBZ#s|G9<
zu+%`^yW-+;kM(v5{6Ih4(_e$pi>dcwss`ilqX<lxKsvBP7kGWA#Cq574Ax)nuR6<6
z_iE4;O+hDodztQLhDY#ZQQ$t4^(X>wy!2!2H}r&@R%0 at Ql-P&}?qkl;(eVR>aeI-E
zA?LM#_ga9 at r2=s;ZE;Yb{iZHTs!_9*{!Qy?JoWFBQ7E#m7oGv>Nxn|=S}LOR(cq-u
zp^=dhVQBn|uFh1R80EkHrmOSI#AyHJFS|N(Q9NFt2Obb_=z#~sm`LR_F=rwgx)+DZ
ztM$NFVJsy7*7+6Qs6d9qRu-(a&>BX&f8X~7*8xJ^X!(7?^;j^kL??+z(S^NBIQ~7;
zkFM%nj0JCK%bvDT=N%Mvg3{O*9bN~3dYabi(N|JUYfHtBZ&aQ$0KKfz_$iP9=y}c4
zrAz4m0Uv;y<>}J at pS16QZ{xV~)}rmA7m^@ExzLG|*s?6kPA<9VN<xW{g$s+qVoN#a
z_CR1sA_4&h3rJ#e_kE6giQ^u}Ev|`s at 4ffldw1M>@BaR8$`$}}^80<19;VMuee>ST
zn>X+U2PS=0+gAnKCVVy9SDOe*-=O6So_V|YiH$;ZBDh at wX6(L+&_sA5cmjL<g4tsy
zz=)mzTl9qC14BOYjgd2iXcJ-bn$Schn#kmSlH3i`qZqKpV7-4Ldc2*({VZGh)tJXb
zK%@`I^bbq~j_1iAKzd6306-*;9sj`n2!DVjRYg+OF28!h11v2o=mV_uR_cimWk|oO
z^x*a74|rVR9=%tpQb^|@F+_8lPM=9#c$I3O at La7rrEosvQaIPBDUUz!lY5sex+c8n
z+VG<5!i%mCFS;ST=*IA(+XIVk3NN}jyy%wjqFcj at Zi7#F(H-GMcZL_;h5vy?cZbJ=
zLTcw)wN+~8KQOw^qEcMPMi-s&oU8Wc&n3)py}JfCST#6U)Zk~EPM<?*x2AK~dHQ78
z*ie|x*XsJr27M-9$xj(IQy-l(>&DC=ch39iyxT)oym>#-zD7c2-r)8J50vI9sk8Pv
z_rCpBd2WU0B!$eI*BjmDS??0hf2}$BvAr%nzT+3WP8xR|@h4^NRw4hHcl>Tvy<pz=
zjz0R%+1WoUJ8V#H?!Wod-t-Q;?z`7ve;M8Nzdre?GVklJzut9TZ&&+FmiSLQyLj`F
zrT^~u&aOQ at cm8U6-XD=BvBz0IUF|t_o at ZWl{ra!J-sWHb^=stt!{fb6{IC9>!)|(f
ztN-rUVqW(VcmCHd^Y&iiN$>kVkALUmYdijH*V6P|C!MJLkN7I3*{avORbc0z-_h9Q
z+0<RiZ{E11vg@&11y6nZKlXclN$UK02W)ccee)*g-52zr3HA;Id at wv{p?UK*kCAO=
z!(wx7sbVfJG-_tGws={?oLkPU^RDT9;W_U-YW2xle#Y2gUSi(jc|WGl#^-tby-MP^
z0|Fm-iw6x|+I_r|-s)}&IEH?1Rbsv~J>F1Q3#tK%uM%AO(xQV;?7#A*GnJ>VcqDM=
zkrxEsdg==G$O~@vef-u{-lwkkIB?~MPy2V>^$Ydmx1UkJzQS|C%cuK~yx=9 at DVH7P
z1GBHbe9v*}V;8&}xaGj(0;k=7Y2f*r_E%rJ^GNT}7u at f=^T<O3PoI8~XI?k!(RrWz
zUv9qh6K?(hHGUSQc)Jfn6y`I1%=_8#pYrg`Pv4z>VV{dWdGX)B&;DNc$x%nr-(w>E
zD?hpGPWpRMxS#zAkN3b&CfVOxKlyFv**iY>n>~d4C6WFz8UGsYzD=aN;U`CLbHZLn
z?-BU7lhX72eYIMC&bO{wDh7rpeq|Kufzf)cRGCtjRjXwqUs2IZg=)>{8qY1S&dgRT
zMy1|wn1xztwqC8Jaw{;{`%C6*IX}nK2a&*7hgfFUPWf`Fn6H<rl at Y^il<QgYjv_qY
zs8?rLKr+{7*?D?zsZx(jmh<Mc$i~l-X)79)0>$deWoIUgV$mqBs8;GD##G6y*XE);
zMUj^z?JCi7#LJf|MlCSZK+;+mC6LoMmg6H%%-?8kMYYf{g)4%HHN&hnY6Zhg<VJ*5
zgvN5NsUPAcm@=v}!4Z5lUzsW!ynP0%#YWj!kuRXd=BRzl`dryCJC=`*j*_k4D3tRx
z)&_ym*;=V?1o5$1BVXr*EuaFmY8geK+^9OnhWemUX+&N1j9ZD8mrH0eQ6h>QAH&Z8
z+F;N??-tC!U>@cM|EellJDEd<HI%Nj&fqzPvy+oBSi|%3B3IKtN=AtKmj#<@j>n6P
z=P3Ub)fzg|*Fct3>Zw|Ob{gMGj8q#HbeGjAVaHI4i!5>#e4|n at f>c93PJU+0O;q!>
zB6EdUzwiPLR at WKK7DkVhe#7k%=cw>6N6k%bM^S<>Z-^PASjxvnsWfA?e8rqZc_UQt
z(Mo>SoUWqU#VOfB^BwKJ7{k3<F0)JxGdRjz%ks5QZuxYnTpYj%>}WGNLW9+YDN2`f
z)Hy1$W at FOyE~{?vt;A2rZo?287NgUKft1Y7dz7+au}Vg{sO82mMaN3B)FTt6N|DW4
zZU%U(#@vmY;?A*rZOT9%W%PP7=k!}yHS3}NT7GJj4Rq8`7BgvoSB&F?{Ja?dJH&H+
z6PSt!<ym&Ds#Rx=T77Q$G`gL)L&hFF!W4}fcSkmZ)|aEXTxFd=B$cTS*5U}HFJYkN
zDwEX|n-LYv^KxUR!Xm_l*GP3eb0-J#bJa%OPG|No|Lg|zoq?v|pXFmM?Lq=pLDbx`
zM!jCGGzW`b?ac9SNPpI0!D?-4adlm(hGxyz^P@(sWSD_6vdh=h)q?{xbV6h64Wq(G
z`B-Vjs4;7t<E5WBjE0c|mPt6KJ)a+Fu_<6DJ}J7L!?lcDMY~3p<xPXWLZ1&WC#qzi
znlA#k<%YAhT9tn+K!|R(5F!+Z+8{XUs*Il%ag#!IW^uk)oiG-gs0jMxHw<Sj{*_s+
z1pi}ncxbG;)~IMS2J;hTBUa}FM6_+npzrb3MR-NcLcVOQcDdFFSC_G2wp=Qd>MM=X
z)O20=Y8#|QjFh4eGk3jjx>Pg*HHHqlWx~NyW#>|{J}n~J{`n0~|LC;y1L;zwP;L~B
zTty5S?j2e0NRe at T!Bsl(i5CA*sZy%51~XD1c4}yHhD&*HBwwDL&Worqqe5+0Z244v
zgDcBGqXOho?3Cfo8im)DjP)`e$6etPMu+g)bR8yI32jXa0!L<}D47hMuGUJwp+R5f
zVXLb6fNbr}?a;QVBjx;rQ5KE`@<VMhvI?;Z1FR*Rc!6do+Nt%kZR3Z49YhO8%g%oD
zGa4c`>%uOHVyR{@VnW2~Kwts!oQ)WtaSxODjC(jGW|}&=Q)J at uOw2U(Tclp9mu0aN
z%#pLZCQ2)9!<18iHRh^vzF^D{eiL!()u|~fi!g9w!vGeVDb at W2H1OI@T+7SiM!i%n
zq2?SPBy%<n<O6*1H$`9C5<OY4JUG5JW3~^_tr^V`su?i|ix{;oK|U^Z`TD54d|1r-
zBUU&Z-bSg|opY}QL)Cg|vSic}Ifki-;K|nu(?)HJT)#01lwuV5@`m|EJ?dCzx3<6i
zcVfm0d1SfLXw-lyONGq~H6o)%C>1RZ!<AKenzQ}D`_vI(7M%}gPpKHMF(MR*o3Ctf
zV}ns>)D5u~o0}JnvhfYsg^Cu*K%{|K?5Z_0mD@?$2iQ7g)OuYJmbOL+JFskOokf6;
zHYV8O-My}fCSRGa6w9=}+a1l9uK8B$HHV~3!?BX?MB^_t)#BCFL?7_9TR3R%rEO!V
zV%6B(#V0In;S<ullWgx?Kbo~3v(pTLbDU4BL#|@ST8XiguN9`}I#FcXn^6OO^^~2u
zADuRZ4|LgHWBG{&2z46C-NYA^*R^~;T{DOv7v6-)`D$)w!W*a3m}&YrMg-A%v?{Q6
z=(O73;TdtR9x0Hj)72s)5wc~5BEI7o)Qj`xmfQbe$<o$Xff?rI1I=fKh~VZ-M~D2P
zBa^U$fl1{?OEa^eOKpNwon%y`xu8x2b%`pYbGj~DDT<*LtQcl}0C>0@&li8yFzbwb
zB5q*ebiF>ibi3`=uU{|d3Q!o^?XYCY54WQ|l<j6VY*!-Iq>?WuFy_W9j6f(dEW7~S
zmlbQ at aBa}Yn+;5Gj%qs)tvo=Ckc}=h#AgK$Y{{1LV1Y0k4Ux25iNG!tsZyLbiqj}}
zw00C35HZCZX3)a^p^`b=sIfYw7+xqkIgzBJ+&q3)Ns_aM;NEEJs^DpAu*Zl}7 at I~n
z0lQXf0Zt(G$l+5MK at qE*4&AX<ZOod18DcV4Yi7MVOO$(Xl1j2FUold3BHDlk1VRPn
znX#8qcV$rtiH-Ot*TmKubN$uz714<ue75B(R4GA<5@~@i#Ml>eGG^Cw-gHEgi<a&j
zxiL3wr)*H>)O97Zgz2K`C397Ec6>IZ*913f#&pxgY3GZ at VcuL3=fa(AA<L4iaX9P9
z$*MRF8(04 at Ry=3XXT_ej1B-n?-I9}v5wy+ttf+5f%bGER-eZ$Erq4JN#7ib$6Hx0~
z9gFphJr at JBY!Tr7w<d~l(pRWA@{FoUvnB<e(>X~iKGnnL55+(e*G8$M1i!Rt5i3j$
zgVM0M$Q8Bf3>)%hKxbpVLvI}to%V3FJrku0rc8+#E}ns1AWlxoQK7f4FrF<pc($BN
z>jqo=+zhB0H}mU^Wz|}d7$=PHgtfgQDWYcLy at O*I9xR(&Ocs_!mvC6i>vAyo^=|hl
zT!w0o;?u=VYwk at Pz2M9^>KbP;;*v$ZQHkh`a~mgN4bL1ZiVA2Lm23<os>D}1sPeFG
zFYpoFW(A5`QOvpEmNGGo1AF=>npu{pKIs_D9N+Yr%S!c`{4A??fR9j3600=c<*pF1
zkzF<8*A3ufFc{AH$ZBe}R<tDg3so~VL|sEVRc3?+x)y_s({nM7 at mHW`CeU9PJysU;
zbADT7x1yY%iaWkR%@<-6e;>`u_*A(%kuQ%`1rr}cgR-%{+On-l=`D;=rrk)UPes`T
zWn3pd(M9u{6Kbe|BsL>#yohxv>X^}ebyd{g4{T`Ex{-Vcv_%8_hjXx`?61 at OWZ!K#
z7pzY3AgCvJHhYK2RCSKvg}ElFn at t;nT_Rc5)yAm;Blw+t7;j=+JBniMb8M2)pmhy@
zO)@zhdY*m2DB5k;q08}Um$;)%cXsLRsussmGv%1- at dEG7vFeVjd&N+eTdlf-ruNZt
zr<r2*(ZV}skr!dd{E1uGmX81*ddLhR-A;Th30u>uuijAsiPnVGyn3k^&{?;JZ34!O
z8cv)Y%FoW0=U5Y~I>*@w-uiY+MP00)e?4C;cw|+qXAx0WhP{(k$t9i(V`y7;*~mlH
z^_Wf6<*Pu?*MruIn3SDs?S;m4*G at pNSj(?x%@?0^?->V6G^xQ0^(P%=;3W^Ez2rQJ
zH{rLm)$p8Vtr96%$9gR`ECPI!xZAOG(Ik>oV7xI)HChhJY$9J+Yo_#;wK>r|_EW`b
zV}g;Ig|#9MIC+EGb*#!-WI=`4!#PfoGEAPcsOhK}aBLTLwac}J5DBkx#5rrDvRPS^
zcIvHrHN^y{@$6Mru0QUjdcLTxXr)zrH6*N{>KsK!^YuEi5{MG>uZ8nS@&VL0Oa011
zqPmmbiR*4&CswW&9B4D@=s;sbLT{o)LLAjl!Z7bDR?Q^HVmGBt6OlD=(8321-N9uh
z9qXMKMkUjtlta2j{;Oi7M4W3_hnu$RF98`x<<w_1e8!&fawTJjR%T)XAECX}RaHK7
z<GP!!jO1xKk!w3|O}SxYV+KFle$#ZpcgEb~R?`KG6SSC$&Nl4D4skJ=R*nr0(BKH^
z79q}A4`SF_*QZn~ik(lqG%+X5XG3NOVO*AzjSmyeh@?|*gX!XS8?y90`bPO;kg!fV
zhcP55Z at r3^D^(Jhe{3H{qL;8^t?absK6!}-j9GYpfQF|Jqh&SytigzMlK|a}$8g{l
znS&e4$2couO>=&5C6;s=IxK_@`p%j$MVlfty%~z2xf|!DY{;z-O_F&@Oj41Jm?N4l
zxRRvaOc7J*UF&VE;bQaRf)AEiCG}>?HtM3 at 1kEAPLD1SZj5t@xP@!z(Ypeh%=R6hM
zj^08p7MzEhDZK^ZYZ6EJ^hT+uZ7Hgok(kdOXS`v0^o`;*5bBj8?L$^8*5r>cqHcsw
zsMwY+vZ~u2l6?iD9!e8z=P}tr*hTo#$Q?loYbEril`Y;x++^f*Th at dpItn!E%6;YX
zaygUDl-|NUcDd^+nGe%mY{2iiR{k`hLI-y#>1kSw*(oSdmp*EQu;>ax6&g~p?&^|E
zHs5a%sbjOQ-9me7oJB51UF-fP82=8U3rkei#?&!4jhf{3b5L?A=boQ9^_ni#`|zch
zxgIQr_;g>LI0oigHb;G-$-~|#R#$2$etH#UYrIUw_YjD_;242$W2Ejle~nJLCNEr^
z^D at VY&0uHMG1GN?8?H2FWcHfa#WvH;#}2&LqeWvf-zeAl?n%U1pG at nS2Tz01hS^K|
zDiKx{v1o;4LHp|AdVazx0qm^kd=rK`I|MJ0h at Hxa)8$YRD*!)p4Nb7}pv#S3babwg
z7qg*kwA4PCqh2CDPVS^9Wsg}M)|DH{ua_mVd^_76#e~s>1%son?+UDHcTHcV$RkhW
zYi4e8$S^Rfduw*)db<t^7s{nskxNXRn~V5K{)wWsxd;x!(SKq*&(}A0#FSto-@#%8
zCfG>t%(IP?<zn^Vb&CnqBM9cS?r43~Y!#<;JDNLwS-uu_R1qX#>zGX-Eh7-+o_kz(
zf2>m+0PqPSP5~mk_Iz?i<RMk9I%C9nGtnRsSX<PDjisc!=TN};Jg4CrnxbB-&e^@>
zqf@?gQ}8m7g=>x47Hz8P-p$!m4gt|Uw0~r`c2aL{{tzaFXvc`|Xtazq>Kr4H+RCrf
zxlgy={^&2={#Y{N?74LN!^xE1(n#IBYBr at MHzN6lPm!<UU8ZZgi#YSK`tH;ghiq<R
z(4E?ir_9F2uHXljf%TcH5em!Apz?$vIwyGl=<M)Ll03Q#S at C_$ou>^$_El!ak}Yv>
zd}-@}urbOu_(!MnvqrLITBqB$euvJG0eG$1SvK5}R~HtO{ucUl^Om-D52IMYH4&|S
z2p*jk+0PC(qkQ^Gfg62eXS|Uu9atg)yEV~LZO}&(f^rgrju5$4B#Ab+rXTf3Tz8kh
z+nLNk!MHx;qB_&<ihw0kcg^drb$@37xf`KNU<@}gvU$^#HQjU8jOY$@+`&ulLS5Z@
z`^9qpMrw@(k8z!R(eUepaAIKhSWogLB4me$W$g(o at S?UZDd8g4jVYd>Q*VQ%l8#<p
zW?+~aF={*NFiv(wrIVpgSM%F!Ue9#iWY$3%jQFD6Og-&7j1xBDf<1Ght{IZ#t<q<&
zZz;WHfdh?Ns+o?lk+5++FT33VO$bBZ7){cxw?~4Tw(m(nqIc=-D1gm3_7Rb40r4Rl
zi4t)x-kso5XJ*|I%y?7f!Q&7^f*@iTI@|SAKxe2y6-aTubu8jq-GR>ImP8j{YPuyM
z)a0MiTLc!w;w!{md3;spo|<f>0C#tbtxZCSq6F;pCN@#sAihMbddju=!*;Pl;FQbN
zd=a0q7Ic<0uDb;$lHf+x<xNL!VaJw_btvoH2BPuKMfAo;27=;4MlCoClrcskC1GA3
zHXpk6yq(msYDHaT4%6Ny20WqF2(e~@i83QaW1=xNhP4T?I{B0tk^MMOnkm)e#p)2K
zcuQ1`Z8kXgvIx-$vW#FfYvq{kszI!X&R))?*D&8BD40=S2 at F-O&1I&!$%{iPksznL
zU~kapMvXH1QB)%}OWT63u1aBSja6M<axdOpY+g4K!DH15*$v`FnS)FceS}Vex%`8p
zwA76JFt}j(J349kU{2#AsEtzG(J=JYpmkfIQ{Vna|GdKwfACK~-u|B$XG@;j>bm3J
zfnyA8 at 9b5%Dg>=`U5-?v))A*RTb*r`QH9PnTl at MJI)=qGairN|2_9r4){hIL(oaIS
z>&-mUdLE4~s1!Tirg~kZ-O0k at b|{d%K|`URHnNEQBhQG=PkqF9>eXU?&Q6lj*Mp3%
zuIE)@ze#6nFrTO{<Vl#T!_fjH!$9@#&|T8rBA at DP{?`qIFg*WyjPGvBj5>*GHQ3qa
zDm0(NGrwc4RCE+6uFuj=KXom0_sEKZe*_`AVb0kGeA{X)KVf@@b-NI8-9lkaEkFWd
zB8t0ldvx%$Sld`8mbh+HhpcSVA(;DRe2Lk+MZuc8v;$acW}?~;dK#suh(2?~LIDk9
zZNIbEy7Y3XvbH&=1vbmtA~GG|BLBYn+^nJ1t9;uctj}6heA2dx4a$)1vuPUv7CY}K
zKk66BRIxp`xpiG(Y1``xYK_ at Vbq4qXgT_Bejp{Fyk$b}GB7UT0W?Hy$5s+xkdo#Bj
zS97ptiqrHU8;Z-TMMEu_Y%3?id<J=G(vF%gw-3-ZYts;p;BYQCm>q4*&Q@!6YkhI}
zsX&3WAJOR$&a=i-m`OMl*vt(T at -?H**7gu61wOP^YM={<m@!qs7ibJ&ma8>8(oRHp
z3m!<YFCz9%J{qba(~^KsGKwr;TSjbCo&=~v6BZlQ%_P|wm65OINU$!?wxT*jDf!~S
z&uhXH_QqI8zPvs^XO2!|MzJVtvj=(1qTFVXNv=@5q~OEs^By`#DjF4H$G~VM#f_6b
za}^fu_4t5B<S%1e=-fo+-HA1DL||8<Alc1^4pRm%Gp0(MEeLTxTH=B;_;86fE<*-w
zD$<UknY7YmE1arwFo$w`3QGg%H~LnT#2x#}rMx*tQ;G_>Guo#E%|>0sGU%(bof~bs
zKEu#Pus)5|p4uVhj5a(;Z49Oj(|JbpqE at 3lhEjoT-8tIGbh^S*K$9y<bt(bLBRFr1
zu$Jb#9^zZWlaolDtW+z%FltqbDK^yYPG>zsN7qy!GgP<Yghd{dipp*chXJE9g-?{G
zDj3dk??;R)XBz~{Jfg@)B&*jNl>#kRRn#IT!UPqiVUCc at EZtZ@sm5VVNw1}rSDax!
z`xs at ubqQ!`Q%Hx6kF2xZ9+%LhYY9u(TnO_vJH^gDcdp^BDPq|d?B+KrBSL6(tU7Kw
zLP8`-&#iG+R=NJ}TKgo_+l~zAWQkjYT!ap`h+rX^!(GJHyoeF8cJmt;b|W~wV`48&
z)P25v?`5ewB+5 at Kge%@8IqbNEveXqZ#9c!`eVe-iNR;viKl;&9J6xUQ%ZMh=uu_gp
z#hsdTAwOGh)PPEB20H~}qMv32<7R3~T=P)tY!jG72U%Q4yeRbqmr0==Hkg=q{MJsw
zXu7nM5XpfPc;W!hS1UI7*<k`pq>%pP?HvO_Zmi2!IQ2yg40qZaX2FuV3Yd+~4Y&Za
zl;VoZV+tYE<pr*xyBDA*eI$k$;3uXrcQhZNN&jpfxJson#F}Z4C{ACC*h!GcCDu5O
zxnTK)i?B@@MWUSp`2yeAhZmRNqgz)+>;6*8K_QBTxTg&}C4wUTbCvu|sn9$Eo!-eD
zyLFSFVZxZBYxzv(Yh-hXwKZ>D%L`g^_EC1OfTm^0Cl0=Nu28lPO2T4-P#ygR+KG!0
zwTTa`!;m0Rqviu~DHqH)y6n~8MzmU?Iy*<ZLov6|wF|engAxw82MZ60MrjVxDh4A>
z4LZzXmM%N8Ljq}2+qcd2Fv^9EUmx19sL5L!lqd5J at bkT%*10A}S%gLzQQgGGv1>Ox
zJj4%j43Zh;5;fxLB6sk14D-`a7AwF%5N7Fk+_?J|i7BG9t<nW%!=yFW-r!wjZ5(Xk
zxSO at K`3h%DFq6WWXjI%DX``Z#k8a5>N;~M_n7oX-tU-KlXi6jklH>y0a(6gmH at G{X
zE9aEbl~kfdLbnYKPdW}YSuU$;rE0BIpR?|HwD^jTJ8qN;c|i-ESQkwBs8UI+qc~g%
zl3)!e2g8<j%5EqLNeat{<inYl53|(R(*EGa at ApN4>u8&fZvdqnG;%YNXblS4C*qxU
zxouCCm=^dc3xktP{Fe3$Tr2i`=Y(^GSfse)8mbrg)K at kp>j6%8`D;YybUOCZ`{iAx
z%^b6{P4KrjdZBfxeW6viZbpHZb?raL%C7CnFwX%MFRTr44lhW2VIP>2^~o79ldi2m
z8GX7jGZ7xO?LBl~bS?MbbI>a90xLV6pO8AF(NlWM7dCMeh>Mmv;z!wMtV3O1HPj-c
zTVnjkQt~D;Ud(+s#9ClgxncGjK;q?OOZ;S=s>Ie)zD%3n!uXgn^p>Ix+Tt-$x*Xcb
zmw71?j`m=8LB-W&Mo#*fkJ^}JtrFMWJ<?^hm$L+M-CYSyRz2qK-jD#VKv2K!Y;8#r
zN|Bd2&|tj&v65+xo1YnTaVpJVsUn*vP8mAfB+<fco3`XXVC1d#=n&O&RwB$=MeMNI
zweB$G*^Ny+bT>DkEswX6u at rNppv?wZExJX`g4Qf(Z4gU%h{QH!+xE1?vn~k)bt#a&
z$u|uK)+zQ7i- at ryBs%5H2-$l$Y3I^nd-t~NLo}VlCY>09eQQB`?7_mit!&(9?3=fI
z#vLAU9yM50iPJN*Q~Rpe-fE7YEyb;ciMvxdp-+HrWO1(^2f@`8)HUHgcx8JDW@<Wb
zHl4_dW40#WB%`aGYlx${TEd8mVV*>{FiY6cq+M+rI#6US?FXe@&ug<%pwVhremc<I
z(%|BpEjPG&aDcC8_J)q_mss9(2D0rpUixf~9n!71@;r>85bJP;4N#B1;oIMstvqSr
ztVwX0JVE*HH>R?pg-WJ8l<#J2k35#@D}%4+*XrOe<Ji99g0~b^VA9#b5nb*)idpy%
zwhE$p^trfIeIcfXl3J@*k1MOC&Y;M0$9d1z-~35O%*1RSER#cnfq#O=XS`4?kIv?8
zsb|{6GEhQzf&*$wl-)4fB_z+pVOU?K$Pb|?y;E*;GbZ=mS1C+a`Bt&n-=N)CaU*Iz
z??v4q;U^NN9miY76rBU+D&wXRudy;&1&uq-<!Ea%)L&xFldsK1bTP_k!#ZV^*YZlR
zI`RszYLci}i-w1-Hd2A{W~sNdvnqW>Df#<7XX~>afFJy5X&dzuniNB}<dMZr<y?da
zH|YpX7o;@|qE6bQjG&V)&$>d46M9y%byhOZbm6;g%haO&LSvc2!#`c1Uskg)^W at yW
z57cu-n=WvdO65en5SiTT+u!gZsZ=9?YQP?Z!4rjL1He~XCo+%l`fx{(I}q+)SHN#f
zrr^QfY4_EZj!oEy*2 at i||6}sdmOGOU-u at rC<K7ZI;#BaFankF~fCLlr%iD5#p`yXg
zPUw7XN^FY{PtqA9kI-%3cyL{3^N}QD6bNaB%+RDw#=-oCF(FSFrad(gJJC$shQUG9
zm(BGXvviGzVy at s9GK*BHYAskaCOL&ZpG0)qDlhSq^v}#Dl+%i)TFEkqJw&^V9ajC(
zYegm#Wp+x*{jsWD?=<ZVS7+HB03OKZTiOJ_-0u`~;+sAtc{Kp2NnGSf+AS+9O`Btq
zxUx3NG7e!(R}*((?VuwT-uSY(U2BcG*6!%G`;G-lMln9nH?m_^AM0DD=Z5;TtF at BJ
z at 9}p at u}}9WCxGxwgWn9cwZyb*;z$K;CEGbDYg(jh%msE_Yd3Jv>fd-%i)=y{)7W-T
zoBj=wv^WdtbP1Npvvj?kZ&=iTj)FpzK_5fVsn#JD<3mtZL6b#`lxX;fPVBZtVO<Rs
zb1TkqZ+5$aVp8 at _DAy^OLN!pDBn+l$+rXvaA=$DB$7f3$j50>&DlWF2a>pPwOkI}B
zo}~_TIX;qJh|(?`-*y?Vl~v4GQU#zId|%bi&Rsj)IWoUZTvuG0SOY>8E7>tICnMNF
zv8r=LAYt7WD4 at d)Cfq^71-es>NUAQpZL-x at Gp1J4&zf+dTs6gUZp7L-#5(9_sRBHw
zq|Dqp=Zn={P9dAlkDu*Gx?5ohJNq)~LgUx+YK<BpI^~p?khjiwohheIp0)e)A>GoA
zl5y0)B_-MI2yijIR#HB}BJy(l6skR6Hdf0nfhI%ZO<fY95igq_bQrqSAxD!E*Lxhz
zl3-|fxm~)bB}Yz0=(6uyITCgA&4Lz=cyka(g|&42SL<unyaC<?NxfN_OwjV!tjz#)
zu$`T}JnjyNo9^OiQe9)Bd83=@Y-7@<^JSc+&2hSFRoV(Gy44OuEftW{`EoV75<k`@
z+y$<%rLM3rzg)#tB-s2R|1 at _e+p>o|MoUnV>2{EFhj^QK6T{fdKng_ at G@qJy#kAg*
z*X(Ta<x(I8A-Ka<KB<buu=H}t{%K0f*sTz?2rqu7wW)YOkXoDF$countgMy|IwV=o
z;{<q|_=I~@#aIk05p$C82l}~KU7vC_80&`!#rS at aXF9(%+%a41eELWqAiE5~-Cd5Z
zv17$_m!xoqU6($(x<_)FT at E77{_wZm4bwJGR2+Knf;WviS6GPc-S?S9>2i%J%x*E<
z4!_|xf=0T|PVx1EY3eMJshjI3NtZ0&+~;?-bo(S#-~LBC?C>MN5B at o1`!;p99iUBP
zWug%inkiKpoGwT*f_Mc<u33Z=Gnt5Dl-tGqtRNRYLe|~xPgwpPRmS at WL@uU)&hX(f
zX9vaE?OGdu#s%(_O}=SUBfCT6qxKFNeYGieQ)t|=o4oPZGE~IoJB%BPZH0!!(gJHs
ztIL3pJip&C*V%fg&sK6qFa-Ib=wN;}q+8a6wO1nsS}Z3HvW2Fl))Q{)5FQLHqouO^
zu8CGOK;bni1=Xw-$V{xS<!7bRRJ!LDS<jEZSCnd`Fb&bUcvYkV`fk+tb at tbdd>O;T
zT$$&mZHc1z#0b|JVTM7Pv#%jlykxQwMLIs%$!L9jb!Sq^(V!7Gi`6b at 5%N-qw!bOA
z`BcPNtZbr`qYZZTX|hoc=~m)Yqhyh>JM$VaYL*pI6*p}_*Z^sXrbxD&?<e(^<8R${
zx*iqh=lt-Ta1^uAc`0XBNPmre{vP8!C{M6D^w!h!gig1Fcd{??ck%5Awqev?LP<z|
z)>Oq{NHl9r0)^)g6G-aKC;naXWM5vrF3*87NI6s&SQnV3hyg1AtJheSXVlqrqRH-6
zGa^w|Eg`iZSkeo;yqvJ28?)SdId8wBr8<N$*FjyDk}*rfOT~4!;6cc`1#E`7B1|qj
z;pjt$cd~Bj%9Pv#s7bnkDu$5n7uD)a+>w~vvESf_qay0jFge*8I#yLlOGT-&I$}q$
zJl7<}s2GvEv}V*wN*T>>8ECTENMa(-n~hE(*s1gg7kVhB$gy*&K0Q?J7p)T_0+pYC
z#rS1584{c=i%AtR9JP+<j<e?^`<U~zV-x)wj-x|%^i9Q`c$!}()-HD?R59q{G*yO0
z4`76bb^9<q!7|I1^RuWKtE%oeL{I2V11zdLTOz~HwnY;<PPaE{J>a)Teh0c*ZU)I~
zkb;6Gc1+X(<Zg!PzTpu at jTvGK3v9F|1?Of*-L$1Aol0`WbeChSTQJKjT)x>2U2Xlv
zgb}yKxx+>iNz%td2w4`;wC>>AdU#`#OoT&pt{G&yYM7iIF{CTlHDA&iOfFD&MXn-C
zL|1uYQ`3cIlW$PLw?o{P@#4CL%|fj)!8(&khVjOU3XYA(Vf!yEN>pAO=R5qw1o5O~
z6Do;i6rMIBb;J_7=&%$iI_ at kN`7K5fUnNNrm??L;b0DKP+qfhP1&4I2IPKUW=Z2bY
z*EDWhvqT-Uy7H4*mMmw|;b>U5n<=V0tCSXw!KPzF*$O0X$+^oJc8}E6IDU2!f_DLr
zKwr<zFh$mNqdcebq_d<IWnHN%ch+LMs~_Ta>$5sUT{^EaQrLa4>8LlX+vz$P51O0g
z8A^?)uyU~o&f<jSu at y4wcIRqUJVaZNj$%0~lOR6Y*)eIWVZhqj$SrMkfy+Cj+rzN#
zEN0Xem!g8XI>fH6%5$9!%FT$`?luBSKSSxa_(l;Xim}zkv|KkOF#QaX26Mwg(xt-|
zDY5(l9JTq`LcEoWt)O8|yW~Io;SZNKsf*TTg$PcVvlV=Pal5OLwStiDOtxgb=|&}0
zC^SL6!?O}Hp0tZ8Wkpj$cLH;+G|H&;d?5pB%Qi`b7UE^#x}@64uf}C<Xr;oE72ydu
zu8X=-#An(JIF3e>LNe8kylKHMj86B7Tz82QJU)?qJo*Ah^ycxC(3_-XJGr8?71f%f
z#$5$Rb_2#FQEF30yx_jonWo!tt<4lAfhc=JPH!hhOEPLqE4WCsKx{QRyIkg%Xc0e{
zu$W2ei!kS07*UwA4&<$K%tilzK#>)>J4ft%uF|Z(V7razEnm8k_*z-$GEX_h1vop_
zEwSKE2D_Xl)t!XFc+X<ZB$Z)IQLT`bEC{tp?)_LlMKuz1dy8U_jyUp&pxtYEI&H+F
z#6pStvqGi#JKH&<$~%UJpDxLoVe2{osd*L_7C%XhrAyJ|7PODb=|KmgW4KKYYdeM}
zGfRn$LUE?T_}!+AES64IKH~JSLMf>$lsuZUrvxd|mb`XuCCKJ7k<PSUyLDEF`C3Df
z&6F(Y_^j3TZm*cTcN__1iDGWAP{Yb9z^x&>uMsGd1-La at VEZBB95cdYf%wEpIXgip
z8Y){?N!eXqU>lcWtO!Y5$<J%j5!c-<z+%aAXwsqTT#I*%jTH-91#~w0JdN3qSf{|$
z1w>R{+z~VYopeOGb5)Hg-m^r8Q37eF?=V%FRvD$EQ?_EiqXvm)PnOmyxpZhHnVTts
zd}N6 at H|AaW%N!ETo_ at BWqRF|W$tf3>5m9%3+nkT!gj4elyFn}?4m&EDX!Z>15@)#L
zw-ifyvMVWk%bWEim4c6A3N<%rJ2$1!L^BF<4<X4RP_f2Mx;02^z4WE*ZQrClkmY{9
zE{mG6nzCs+ceV>?i7l(%*)HHae-Ev*&9taIQeiGXZOE)qiT{`>ReW<Z`3-5uX at +Bo
zK^O)<i<sX)_rgY~YChUn-QpV$=_$qn&M(@L94up}J2fLe&A3DIg*^Q1cguEBmo`P+
zwB?l#Cb#WSEpPKs-xM>9;+Li>EJ}w|GRh9k`Itz#QZt>-n{706791poewO-=zbV2N
z=}!C9()J7&>;p`-ROQzPYqUpea9){lj4Zs^oB?~OBuICt=w6f=<^l;^3ct!We?shh
zi)%`Bh+SKrA$zMh<31F%1ESQe*1{RIi5tlTyTZecYlt09mmJ7%LEUxf)pg1oZ&c(p
zE_N}lODgtpkw)?w8|T((GYg|@HP`58DcW+Y=9LQnG+o at 943tdri|MZ0W=zjI?}`97
zQqDSZFLtKGvNzkD>F at yFG-YuKP!8V&5lKR61MBDSwvD#5Ia-+1R`Mrb%#dv*&571q
zFiHM8%u at Sx7(c^T0e&^MGrJBPAm5#~Vr=f%xo#J(ia?h%yz8((v_4;|_pzgk&1|hZ
zd|%wH-?yi&l3~UQIkR6}wlyrEZ{-~Y7O%st>W%qjn!hUb`gXY0sIkaNzGav%uaH^-
z=C at Nv%;F|2{gI+4y7l(*3vnwV-)`+HR@=l1b8eT3*YvCe$2e-S?aocC?{AbT-FTV>
zeMKSL*BbVNjpp|aiM$wB4rF1!eB@`(m~=R{dgU(UqK$s1O=MakjkUBc^X+yP#j$%G
z7Ti5~``KP{s9NFqREkky<pP2}$_YFz(1p-u6QR9i`K9k{v{=qqzKXGaji1KGYWBN^
zjgwVQoq-f(HCICf%96H~8F86#MC6LMol$twPFBaJJ%yyL8A|dBloeN?ZClsy*OrRI
zeE-|!S`*{z_R73TOLtKf`%xWEo=f<J9ZLTFOv^xANE2A>kZ5xYx4X6y<TTu3qniyf
z#+Dmn6`fC9X|*bsy$%<cI3%+#aHf=c8${|vzi`VO7JWnHrOlCpYy*~R)ya9#0T=Dx
z+sdT6BZRppo7LT|k(obRBZU&3$?C$tOC?!ReWU<`w8QYnZ&abG(nmC<7vz_hXf=Aa
zYm0As*lQ`p_})hG=u#IR4bsyL3|9#?x}!5dVTM^xapwTx0-+Kpj3UUy(L8N33{P^!
zzNG44X0|>TMggrDt_(WdxwHI&)>Y_4^Wl+dawV)ONuKj5PIw~7zRX12bnC(^zb(iQ
zLFp<x<so-Xw6aj0MQUwobZE*h2k`|&Zu+Zwu{sL;AxZnJ>yV0Tm87q0bWNXf55ppZ
zHF>HQLN4O0gdd#9i;Z!cPv#MeRrZGCI#R2Sb;pqSPGh%jkTOiYn5`60&)Qahx4T8e
zhykoHYw(SD-bG_VCr6M8J&`R$sl;AACk$mAlJKUYNH;4(zwr;2K|~BQ33fiFLd?!;
z7Gxrm^xRyqPQMt^wW#$39l89>Uz10<JS`hv3;*u7txUY-Y9RtLY?c(;(vpRt*$)(1
z_Y|f<F6E27W?F?K!CFKJVe*nuLZ&5xf1K0bC6jqExpglZEKIR-j8rU!KswTMs`voQ
zoxfN5-G8jS0iCU(K*DpghTRsVb>SbZF-47$Yn4^pZT at abJ1!XQDwnR&q$TN6sJ^mV
zT^pLruQj+5cK^@W^E>_76 at B9aWBOpWZ*+Vl+pq7O>mOU0w7mOPbDsq*5eIWa`pRr>
z$CYDSh{vFuiiByCnju-PM{9I!%|KQkAIc5o#&UfFxnE at a?Xs-yG}=5Wn{t+cf2g~q
z5Zu3q-+ym+-rA+N%Uj(kJ2ILZ9#X%*cnSUMX<Iv1 at s2_G=T at Qgt44-bWk<$x+0oFy
zO3#1qWa_o}u5W3bQ0E$UXou=)s|yOarDFK#Y~)}5KLnH1+|W*F%zjl+yME^KGkb__
z7&88q%gP%?>)w*DZ+vXnGd$#}R=mS2R(PwElS%%%%`$dPfwYh85Ux#443Z8MP&tX_
z(C at evldq`O9Jh5xrIKh8t9QK9z+P99gotl&c&BV^Y<PG;M@#CXD~ER;lIM{`4_D$=
z*z%EV-&i&(Pxjbgi at H*V9SQA_mAU?`3?VW*VufUf`sEfMNKZ#8#`;FatWwZAL1(#A
z_=o9YBfYL*HMriZ8q+Py{6(aQREe{5wN|9pFoYmYr;rJ-NkcA*>U_IyjLV#e<8+}7
z-IBE6OR88S#fwm+x{@RS_-%P1YC_aUhpkN=eZ!f6O_<8_;o5kGS-7XvfF37#1!fcP
z$L1 at g8RD_fjgrPq8_r@<##}sx_Mdnvp$0TA3Y(LHBW%faW>3-qEHP!`%yquuY at kuz
zXiU&TR9QU5f=U5jcJPVsYSeDd-ZW=y@<Qxnkme9^yi7~I!yW7&>Dy87$28YSjRl>7
zM48v};X%yxu`EehPFd>SSWtF#Zj8mI+wmdpH8hqT2{Jz-3%Dm6S<I6SE1noLV1y;6
z-Or?6Z+_&r*~3RKz;)0MqyPF1Y8<0dnDgu8nO;6VGJ>zu$Huby@|Ar<JLZOV>}+{R
z1Fh8ACT=z`k{tzVjtfk;MtBP~ww!EZZJin%9v{u>{g|`*@c7s$CYpUSX1Gx|={S|g
z*?DC)J0K%Dv?YmHs=&PJvfNNV3LBT07+>xm$c_ZED^_Hek0nvu(cuxS1w(y1W(QI5
z2oK;58+J%ug+u`6c+isTiY#B58|c?ZvV?WQj%#yq>Vtv4H3G@>$K>l)d?W{Xy1xE?
zO<qvzvi1d>qf<P5DwW<;<XsR!I~5Juha~DTQ=k>uQhlG at P%viMCXtB4h~c_1Gs}gv
zGi{!`U>}^XZ!DuQyFw#a@}Xg!H=RE_xN2-oXyx!o?iZjq`UXPwMJ{b8TGy8M4Ftzl
z=9d3#C_6f;4&;WgV6S4&C6CW)ePj9vEwyUCK0=Ftx(fY3;dE(wd^X6U(|FJ*0S$v7
zi^04o4tc4_Wgxp^ERe6$@oR|1VA(R|nJnYj*vj$2W%{b&QBVrQLs53EUtaPKAcL{t
zRsK9(Y2x3c{Ma`s#~{L&4Udft4{G`PGIrZ7#A5M}u-kD=RTclp*ht^<pM}^Lm`E!x
zGRu+5Lpgf;1_r!n<G|0yv*X$Rz^{qXD*A>%ru!;b?IJ6)ef`-HtU|dJV_~jwaCEvf
zSr3RQ#Sbr1d>pZ>OJY`Wh3by0OM%hlBf|p&THmtK;eqk7td^fJ!A92&rIyh*a at is#
zKEDbh6tgF~Y<Ps6jB**J$B#%nIKYI2O+Q2XNxIk64{CCqRKp#fF|ZPF=C6|!ip^q$
z;Cl+3kLl=RGYV9ZO#%hRSM_7Q1UTmv=+6><3~*INsj=+pF<u5)uuUf=Z_Kt+Oj=T^
zHFo2)T%PMH5>-~3KwYzR&?`1rntWNx9xEfDG<PnWSwTE~(?|Tv2Zl$pe%6p3tc09+
zlto-1cBr|EXnwUy>Ul}9C7$pm7qw<{j9r}lnK2h-;$CuxI5 at U*HakSvN2`mitqAwx
zEf%iZyIf%&z))DIZta%&R-#;i!EAqSe9${Eyt5ZW-pA$*AKQL5nte32d~~GgBOK-<
z#O1++EHc(DU@$Jy&(6ohGck<U)k=a_jR+l><jLO8W44G4X5xg-)3vB0lfHUj2ooqf
z;$P7>Fq)0B0_n?WI%UUvL*oMjzOj+<Y}oeCs^ddH8$yZwSWE}|B2*ojATT;Mf({5-
zepy5s7#<3P2$oNfs(e#ywJ_HNM at w{jq0Tk0u$}y+xojI!zteTZAQZ`@>*7YFE706R
zJc(*QhuSy#ef}isL<1A9RB;^}@GA$MTuF#fMJVneZ0YtCJL7yYu*mSu-I3TP0`C+a
zaltoavI!59`hDCw*4(%FTy^xblfjU^Jsux%zuV%+Y{>Sje5LHyRtzs69|hhDatqdR
z?Pu9F46O&qGQMh4S4o;5icYe16^Ps-qCz$gXunULljT9L`iP?U5%F&8Lu&V`hU2{y
z3Zh-XZ+*kbpyYjO)oR_(B!8S5HZA5Q>S``h?KHaciV>vg-T2i=enJs4g(e+(WhQT~
z^_R?{{E!#mH^B`WVHz{yXqw$ULTx#-EIh-4E7iZRFY)aBt3ckQ9Ya#9 at bd;*XR>7Q
ztx#gEJWH3VC4NsfU^XT&(v|=8{PI72zp9oh$}dAgaVcs2tXmIS&fjS3_&{t-gZjhr
zG!ka?tG;5SZ!nv-FID6m4-aqR^lpBYIJ#;iYj<&Xiyk)dmNH8rKHpt3=`6=N2)N>0
zdC9kJ=$10naqiR-$v4|DrvoOj<AxUtYFFEtFDP7jKW<rdgJ)GvS+7h-q!)1;fswv`
z)G9ea`a)#@7UFV%XpFv*APXQ5jlDTUmmhZ&PxFu-N>3gCYo3X+XQI~WdX-3=TdTAW
ziR4l7mYjI2QNGB at p78QBW}d%sLlOi00pKyIG&E%2&9gPK(7<zH4~<<2#E|nAs;1X0
zRYJtaa9%+4KePKNeT)f3(jzmIm_Y3Qko9mZJC<~!k7!?QimA3{n^NA{>a4Q3L%#m(
zcutM0m^Eo)bz<#d!St-4+);>dtiol5ojL{jt1}1=(NJdZG?`KUUX%Dfdsy5ws|6Bk
zm3))CB?g@@tocgdmZcD*$eZg*CpJ2nZ~m|<RNE$LpN~tFVWJTw5GYiMd{7$|ljy%5
z=d>Md(DuKayL8UoPmNh}>X={bKtc{b`?jy8tCuycVsy;RwX};LtAE)H%*;{41{lF-
zDrU&~v>BuboDif7+^%QUf(_ZnQ7J^n22#w at dds!)itGF=4Wke>w!@0`D>5Z?4Ko1=
zzCS`EKSZkQR^(?&<vC?h65cb6+!U9BxW-?mGRB{$Ulx65en2--C56wFXH?3=u`l>2
z4%0qMBy^=7C@~{Q-u$WY5;&VuL0t>_0mV?upv`F?e3pv at Fb0HFZVcvYn6**R62#JR
z5yOax#F+)Q>&2sKEPGPFLtmy{a&c3HnyyCtMUrClIraX=$!AAf3vZO=A+;Sdmo<I;
z?2Wldfn5U~;deth-Ds_!wE0hh1by|G#T#<@8iw>c+ at 4$*ge}hOJS&v7ti&vhkyeGV
z49OE&!r(+U=co8qG8K*qE43r7BI4m<j;pOX)-Gy~Yg)QyV1VP^=sKtBpfIZ3Cm5xW
z=nSxYQDNn*9VmKmtC9ZU at nr*OA9953jR|2TGDcX5Ob!Yw=ooGrUln$2RPcKRVBnaL
zi*1+0$G2wqjwsg_I!e2>Y)S5`6eY{uZC{Y>cMjN2Ief({gY5Qfyy-S=f~&)~cd|qL
z at -1O{p+TFq_9ks!YO%Imds^NIvVy#z?gE^)`-ZBFHYOOx=x`w_{wB+Ow`h#xzOzzL
z);TUq_pujNnQn&3(gvgGpDb6awKxqm#|XppoFfJ68W<_2mfN>-crfb)C6aMHwdZ(e
zVS$s3X;xAph|vw4Ye;5=h0)fNz}vz6x_pVf0Hg8qvRr?hx2wH`mQ1NIC9*s}n`bl{
zDLyZm{frGHtuM62!WpHs)ZXE~Cf?JghlDPUOiTZWfVg}<O1J}j<qz49S*Ua=jz~p^
zFnrjl!IUmiEF)eeS0N-}MkX8%KYO1eF_;}1*K=dpL46c#`|`0cmy74|3*wDnIuG?T
z3e(TlvmifZqodwm%X<!<UeKJqN^gLk5HX5AGJ?DZDn>n8$*(I-v71WcBLg9TxOy7U
zC(8NC+72Ew?>sgV{Z|z2ET{l3J{9E- at gl5<$!bKWpVC=HxKR_O*f3KLvSp9X`#RdZ
z*%7l3XGoZ!!+oqli>SHD;%|7Eqr+?^ZDR5!8pm&bM(KDbC$KD+ir}P^i<_VA$SmH-
ziyZ+jG96#+ezSwFGnW}s36eZ8UzI6~5$CcUpLQ#0i<#^`|8jb)o>VtbCPuNd#x)Oc
zlq$7aROq%^nbVfb${<VGwxso0Giv9(V}3R!bo+~(!(2F;+xfE08YXSg5iZ0SWm_`V
zZA|t}h7A1^GzY_?*gR+UAr=}b$z2+hAZcqc5C<;vK_2GIOgAjMXIYq&UvOw+pq1QD
za)xy+UtCAnyC_--CFI!LQBfv(QsKOmO84S0=F=^o;anFr6)UFMC1<-Uy`P;ts_QuC
z7ndIu7dDbDxyJa#PKk6P)mft=E2M&dECT<rAs}x#@b==RWIJbmrhTWQwLWH;o<|TP
zC)r$DGj2C6&(n&LpAFZ`z4cn}M7ejO#x+v8^;mQffz=C)-^*yIUao*lE at V=>uq7+a
z^6zS?`?7MQX1}~3YaO4K7aw>#hZoz=)<hROU##(MzhudGGIp;^)=i{i?^N>>AV0IG
zo1a4Ffr)1C=p@&}#Di7gipdv_xwj^raqECYoHkkRsJH_o@)53(EyNdfod~MJCEh*~
zXIa7_kNtv{JIQUMwkqwg!zU`PK*+4QD<<iGQ3vUaa6H6ufHslmw#X##r1Z5^Bs4J>
zA^Un$r){+t&B$WMOF&V1fsqm5!Nt-UU+jJjD8AVJ5Kw5b^#)Ma;&#vf#233?{)sr>
z^$|*UEMiF&h`gij){(*P<1`TspcpjZ46|BZXJ<-9;+mYSJUg4xu?luHc at l484`HT?
ziXBo2MSn~&uGnp^OH~|ETLUrCic*m;yHX()aKx-B!)My!c25 at Bi&4{SMS;cap`z5{
zmN$xGi(StXq3Djsh!TsN-XZc4iP72SjUYYU_URx!)w<WIgw%<~1S!G`@#mxohop5O
z*KCqPKI at p?;Z6H9borkS=Yy7a3|L at zeMKH~(~(WBuO4>Dn2LkM;fY^`9pa{5u-d9n
z6yXK!lbUdxaGUIuF15~azRbOXe7lZ>x?Jb!iBbjpQ_c2J3-wwVWN{#0uEWq68Afil
zJG7b`YkKVM at 3E%iV*7Q3=8#m$T){Z<f+4vzU%@E3FP*krPxrGMAi+wN-)bm!jkBc|
z_`R35OnSff+a>?|y~QD0$#WB>?h-8Zv#G?#GQUp7^@PidK-?v7D<!$haZ at HLMmSF!
z7cQAvx at CH)*xH#xc-i>a*zgcz7US0J;rS&kx6IM at k$KuWzg at Yq*(PhmX025ta>>+u
zR<avcoc|oi_U)AQkL3olBYvjWA;7lkS94=c$d)^eap~HjD!6ab4ppfNb+XJEMuB8d
zxKbtkvdkVJHG#vG09f+uhFN8)GUeUH+{RB^qxBGN4H`_OLhWO-dv#o@#FR(cwhCz0
zzu)@COE_!_YkkYday#{nWrer^KSB_vpLBTO^a%B5W%M9PeC^aXFrM{MnSD#}w}tZy
zi(OC4_D+JMGm4334TmweX2 at iVddlc1y`%`PgA34E8a0&?lRA`4pi+%4o^*U21mi50
zNRnn{c#5qN-m$)ADPj<rYZVVOis4eRYzVbHUR2r7g+o|-(701}(3WhV`mI=@Y at c)-
z^6~-H;qZ~e$mu5slT#O;b1=r8$Hp{dn-&^Q^mi28?+Vg7)pP^KRzoF70Di=pbRCD0
z61tA2(=hT2PDl<S%5T~ThBYY^4G&oRt(x5A(sILkc4TCDBxLVm`I$$Uy>&9j)OTvq
z9^hNH(Xump2c18dH`glP3E3a=W1%h;1Jy<y3#y;-V_H!xUm?1SE?x>}>)KGYLabkx
zi+{8fL)NPU)%C>un1-)jYZx6epJn!gXH4>dmz15MR+(7ESk*t7FPnx|6wHP{PiLB1
zz07z1w7S>=)F!0Qgz#Z1<Tz2 at hOiYpnxvZgCh$$mwah42*C%ZKZd{Te#I7Lxm`Ew_
z>cIi`g+9^!ks at 1@Ck(<9bR`?TYO<A31*1)p*-_{IuNikd`PN at syM06+MKwEih+CW`
zyHUG+lY0mLxPxnCyYt>bX=pOoPiuvd76N%odu?S~z5mu5TGY!L0#=n-a{Y-?)3vM+
zyB5i<HOs2jr%PsEZ7SZRH>+b&uTc8c%dcc1>m)sQEbk(+F&@T9nkjLaw-9^3kfEkP
zg$WsJ;#9$U-;cJ<NX04bvV=IjPu7Tx$DT}e#AS~a(S1x)W4c7?sft>oLL1-zHa2ba
z(zTdgPHyyqVCuyh-aCPnn^PJ_v3FvwH{WY>95Q5a+ at ebO2Gl}s^h(u2y)zAyWtHz`
zBcT^f%Nu)fM(&9A=F22cJ=bf{gD~de$TZ1;n*4HOT#9uH)U3&Is$rhecFdfg2?@u9
zDh>Hc6Whe%`&Zhkk>MRjvZJF>i_W1D>dy_W8Xt=g5x5R4FcH%MPPzt3&W20haT}ts
z^@cXt2XkW~+Ew8gj%~1T4f_)_agxh&T#*l#?WgDx&DVJ~$=QbNTk{d;b?1olO16J=
zRp0V#f{WAiP1c3#u?0ib-sT4Z%-%_w?29w5Fk0tDz-BIAPL{DA=fPVvXV?-WI6g8U
zF0OL=)uabRxP-e#Q=86o5<)7lQUce;v_KY}M~w2`K}Q?0n$C7tMTHy%1ueDuQ6-c^
z$2xV|4<H>%DSpgmRM<fRlaW*MN|DP-G961iJ8?8bS4i0{sS!R|!b8JjdY?}6B_m;p
zf(EAQ2 at B(JA?NLzJ$8t*-6%`j!uCz>9eP?X9LkM?PUnq9Ya6 at GwMiMK)~hRM&pc^0
zM4x!qQUm2qv%>II8s)NQmv4D?*~PQVglCsY&n^|uE;Y|CKrhpI_GoEe-Lqtg7sQ2U
zmxl5!Wfw(LB1%*VYU}c~659gjd#}}+@>}J9gKW#67Dw+|V{QRxMA~lw()=aO=|#OD
z>-q5Lb%gzIb6DCATiQMe=Y1Su-QyL5g#rx$3-?whdl`ilcK9oGM-JbkW%hfH9F)mT
z9HDGYbp=<PiK*ROq1#4!Nmz=}Xhu=l?pwWFmJ*-M_fCVpEYg(_M<ti`M(BB|<)WFD
zi3Q`7cBaI}q^uywYNN)EAmpd>JSSzzxBIw_P%+KAlC6gcUnpaJ?p>l}m2I{gEzoja
znk*G)cCty-%U6tEx*KT%qjFNam(5L;Us>sm^_EOFo!JoEVpAr at zbzrF-U7c$!$KKx
zSlrTC``)b#yQQ}K9`)|`7JjdHYvsqFbH=gkF*---Q&ybdODkzL9ZE;i at pMNzot~fG
zB)xh1+v)G6w at q)C{(kx=>E-EM`se9i`sby81u)a=)4xq$plBB<+GUD%rJ`M at q;FTW
zI~DCdMSDom9#OOx6#u-;OG at T7nA*FFc9bu3sSjS~`tfrOe$r3-GtZLaWq;-sf96$x
z<~4ujb${j!f96ep<}H8bZGYw+f973(<~@JreShWyf96Af<|BXRV}Irof96wv<}-ih
zbARRwf96Yn<|}{ZYky|fK<0OW%x;0q?t#o6fy|zP%w7R};ebHqpg`u2fy|!*nLh`#
z;{)1>f%H>>%rk+^bAinB0quoA=G{Q%{Xpg;ivCGJ`yA2L%rR=_&#HF3s-2)_PFE3f
zmYO+7&77}hE>N}0RP81;bE}%UQ`PQPGxw>P`_;^Y6zg#{^OTx-M$NpaX8xvTURN`3
zz&pLCmN`YsoT?$l>00JYEpxV(Iakxp*R%_@%w<~UDlK!prroGzZl)-A(9hlU^AP<!
zre&TW^KC8jnU>i-nE8D$b5JmIND!@iQ!sN|Fmp#Rb0=Jx`|*?hDwz3Q2<Gmg%$_ha
z`-C$4k$E`%{56z0mCQ5f=gd&%Y%(vRpUXp;D?^#9Lz!zsnd?KD8{wzj8p_;GVb9Rd
z7op6q;mkf^SdR&7$A&W}hBK$ZrJWbfTuZ($hcmB)wb#R$x5AkZ$m8IMc4#DXcm&q>
z>F3Kx=Br5h>qus|sJ2H`+b5dYKML=I=;!cg=7?zKsA%RGa-9~<oDof*8O at vxmv(+M
zb20f|il6kA(adep%pK9pUD3?F<oh`NyiPywMl<hGln<kskE5B-qM0wEnXjUmy<(ZY
zV+cNkeomvG^XTVt`nipM?uupZfl2?mf6h(!ziw5#Khg7=((^!~=fOnJLy4Y;6FrY4
zdLB*m__W6o+6xKorG)lsLVGQty`IqCN@(vUw7rtreo1Zrq;^13J1ePOluTclOkbVU
zu1jkBru_4IXiD^)>rY=uj%)nshhTOq>Bmy($5ZJiQt2mC>8DcZr&H-?Qav<T5bG6g
zyvmK&x$y=!-sHwx+<2QC?{MQ?7(MTC`}^GZfEyoj<0Ec-%#BaD at hLYx<HqOQ_<|c>
za^ov*>>6OkZrs?N8+&kLPZ&LWF?)BY=b%8(>m9Id-t!#!zaQw{uID2j5z}qYP6Tb+
zLo=y+dCwba_XSGN6I#z5nsxz&q<antY8Q60ta3ef1bc47c<=sI4~_jE8vET}1$%xM
z>Uq4g=Lw3xd#HzIK+k at mo_)xq835z2WWR{pFDLue^m8r!Tu(nV<a=ny_t0R6aUzT!
z8tOgQhI?pacYnKwMm4nqj2;@mJ;y|Qj*9j?)CKDq<fg%jn7{0~jaho`AkW96Jv3&!
zuZ;H4knEu$+5Oud8k9Zf#nvi*#iRHXRS7A*N=8|r#FY67<-1!i^qlEA%d^$lo^w3s
zdd~Bl at 43Kpq30rx^4;XN3l-0;EOgOrp62k>b_*9Pw|iLd9iG<kj_ntEl)G5)lDpf+
z`0fwx^(glt{C>{^p1^}1|DB$PJi)|0o`*e;cy9DWcGyFC)YB3A{$rl@>C at Wdo+o$?
zKYS8y?J3XG-1(zt$oZ`2Iqv-N^W=QN^CEXH{Tn%7^1RHQ|MChsU-i7ko&WkeIp6TS
z$({f97CGPcyu+RU{w|!M_dLq`9&+xX-01nq2NdHtkMbe&`sqjH{MhpePtf-%IY0A!
z&YjD?Am^8!uefvh*W}#Q`#Udl_V4C}b9e6^+?m~zoO^lq=FS!SkaJ(}e%!g^{^b0<
z_W<r(`3G_y=sk!#a|e_25bvSf`5%Xo^KkDUx$|d7kn>O8Be`?nC~_X{J%&4njwR=x
zy~lCqs^iIdg7-x3{P{`bJlXpf?i~3mIZyGP%AKR9!5JJs-K(&!A3Foi(3xK4EU))$
z?^&Lm&+(oMAH}QuGIYFWVMsa8dp^AN3n<!&o`olPF7zrLXL$-2QLK*eNuGsD%(xg)
zikEoVurxxKdKK?wEVo}>&T|Wgf4fkLUg^CGe!sbz$BQO+R~9PC-IQy**TVZcZ_5Br
zDyh&hin5^VdW0XX+~B>D^6Cnmgmmi7-do^%qH-(zQn!1R)E(YC;qh1HF7Msm*0C5o
zRZ;Hortd|RQ<VECpLFVU<a3&Gzc)n*A83;(b{1lssXXXCLwN{M9`-)sebg%ocZL!>
zS5Y4Go~=BNpmUTbysqH0mBa-|{E+uaBtFY?zVej!X;+NoMasfwyb4c#q4KP^IYR6?
zukyUe{$k|?clJu^8sz?>2)<hRo3~8{FL{-hMT~2eS6pH7Q>ciqdMWIB<+Y}i at lz@E
zbryPq@<wy$X%zY<3%yZ!t0^>e8w%EOt8#+pZG^vrmJZ*cEPU6i#AuM*uDr*3KYR~j
zo#lzW at 4eW2xAFn=3x4QT?pI<Tc`4$@G)f;-5a$yw2I>RKr<Btp%0gB7jP?A(%IAC>
zb%rn+x}Q?W^GW3k>e}w)bIAT#CH$rLEBJohGPHub`jiD{d4A`+-ut4mn-57|Qi5+P
z%I-ckLf%mJfM5JQ1sHNqA5D{YmA!m>`}Xl!8Jq!6WnUk)?gz?#l*5Ng_zNoD{yr+n
z=gRMWtT_(wDV=}t9q2pD^ObUtkE#_q7+!}kudkIunO9^Fk8+r=le~8K9Paz0kGF`j
zpGWBl9_%^7r+lgW34sTBj-*e0se}*pu=YF3cd_>n&(Z8t!NWbuF}|K-5$`b1pAj#3
zgr^6Qj`JPs`=jT0c<kS!Djrqws)|ol{HhXAJ(}tXs@|~bi>gXY^(Ry%sd`dspi@=4
zRJB`GGpg33steTMrmAN%HPovHwopCaQo~!Sf$ylE at 2Zil)Zo@?aG at I5M)fXIql?wp
z64kT4s_dY~f1rB)Nsawb_5Mip|Fi1<vFcr_djCcB{Hv<`n;Q6cHStq5(x-ZssmXrT
zlT|${RR4~uXQi6 at 4>k2OH8P+^2G!7z>KRr&tJIDWH8!fo#?;uj8rw<r?5uiLtDZHg
z`U^GopQ?8kwe!DJkFI+DTkXoLT at z|oLG3E4UPDzURnL^FPOEB3O|Mmz8P!`+{Z+Ml
zR`vf{_1Dx)T}?Ms|2lR4234I?W4}>*{zqMKp`vbbG2jwK^<1i`n_dp{3Ps)QDwtO*
z!D|#Hcm-M$Q!BXAqi%k^qHcZz;6}hrfSUog0B!}`rl`GlDC!n>0qzFegDmb<)NkDn
zctBCr2bEyZqkj8gMcwjIz+-^N0Z#y)1Uv<J8t at F@S-^8h{=A}o=S4;R?%zN!ybO2+
zey=LQs5hAP1g}**!Pf!*?Fp8A!K-2Wt|$10;tvk_F{gaNJCs21dHCK-qv1`Y#+SE#
z3+CI3y45?1y6`>N--q7^Fh7L*BbXlpJ^_3R|Ic84j<{dIM5VU=5^=tQ9VOrT|EkK@
zaPI0+7yb^}?*?;sm}oX-514xb_5$n;*axsL0BwSyu5PtI;P-GJ0P_zp5A>*89|ZGY
zz#)J`0f)iwaKIk{M<DM%!S6`GQGlc2J_hEofIq{29P&9H<_U;<BK**}3L16cNpPPG
z_g?^i1)Ku+sfc$P?5D##119=t>oZ}V1vnew=K#({*m;2SVZQ+W=)Z**;u{yij{a6I
zhW{l9zZ7s8?3cqI9l7-tFt3E)RWPrH|1~hLg?SzPu7`O8+&9906X0gpZ-L*fFfop{
zz76K>fI9%_aOF-4hyPtLF(4M+O=Sh#i!}F9nUKc=fCpiJ2<F2uA3 at lofXCo|9Pk9-
zNx)O^dz$h=9iD~x9Q>XKya4x$aQ_YAF9BW#yaIR?@EZJIhxrEJP1xT;{I>z`!2T}$
z-h=&p*gpVZ&~E)9{62#H6PTaE{0!#jFuwqNiMU_E#2it+hX1Z!b?e^&JM9M89riuE
z>cTy}>Q;Nfy*FSVxc7y*AHw#BiHWiG?_oax_CEj)1RMnS!GJ?xKNN5n?1#hrBhnrL
z^H0d{NcbHE`_V9uf&Z~E{|xtWfa3ut08Rv)1UMOCe}VZ|z$vhw3OEgLI^1U<?U~5$
zEV$2x8xvDG2ljIT=fQnG-~!k$1Y88T7;p*vE=9V_0GGpk1>j1+Rq($Wa1HF&0<MGo
zdcX~^-v|?U1uL4m^-Zwf47dewEAqGv;kN_sfcs9Ecfq_H0GzY+J#gO(`+bOaKg<W<
zeh}tEFdqgy0(cbg7{VWi`2 at nAg!vTAr(r$=coy&+;CcAHfV#d2^KXEc058M+3d~ml
zuOZIsfHwed!v8Jg`8MDkguM&%J*p3(6)FeJ4`6<XxE~?xW7t2TZ==kgQk at lA<<XyT
ze~$1k5bsOCSAehK-qi=(;#0TU4a?Z>K8zEXd&1lcetRQqAHcqV{ouDh!hR3)0Kgw$
zKM-&b;9$59LHt8uKMdyKF#ia at BVhgs?jwEbHb(=F0UQg!xY*{;FpmSE?YB7|<_Ulk
z0Ve at Y2B1y0`3uay0!{&(3OEgLI^YZd>b%XFFwX*<4LApIF5o->=HNEKjoX|L`vrgt
z0T%(#AKL&|Y;&<s&0OLOUJA6m+7q1g1uyZb!OMJ at J(v5`ZLa`a=~EYBWG}o5H9*Of
ztKq%|t#B>Et^-^TzZ>Ab5&k#9ycuqka@$*A-U_%4fKqLHJHj!dl{;X+6MlEWeK$<h
zMnNqW-2?x7VZRT6k}CJZ{Q&%dy_E-He+cj}{2zh&D8BO;%*TDI=Lwik0-iz`T2y%&
z_Ge%|3-dX^^MDrsFT(F{NcR%Vm*IW|@G9Un!0UiF;Ez__7NdL7n?5!07UI4QzjxsG
zF6{5Yd>`%)V15YmBf!U$zgOM%6NG;X_zdtl;0uJI_ZEH$_zHEv=-&2g*mw0~gaLN*
ztK04lN@)+kp0Mu)b8ndYz}y$+eu%R_>>v)d{XN_V0R8~?fq;WxKN#VMz&sRi7~pWg
zAK`Zd%s;_A5^xmYXv9ATe#Zj-3_C{9w#UJKJm3U`pXgT?0Sj(>66`0#?=KVw_ETU#
z73OI$PltI1%rg-eqj%w1aG&j0J?Hp?7b+T7Cq>=vJiog5e80Nj0+{H>?Jh(<7Xv`#
zEXE43-6in9)UR%L8Q^lj6 at V+@cNGA6dag#?YXR2*uJ^0k-{4o5Al>#i!hRFJcQede
z0LW+iTM_3rn70Fv-}ZL^kf(Ad;@w5 at z3TRN!+sC)Kv|S~5q2N!_ap29m{?Vp5axdn
z?uQWeFyIluqkzW{j`D2(IKogy1+!@TCtyAa_fvj#hi71a*028HIhfA_Uch%=g!^xR
zm*9RG at Cx8nz-xfl0dD}_1iS@!8}JU`UBG*Q_W>UOJ_LLO_!#gB;8Vb7fX at M60KNo#
z1^61UYd}?g2iOg;J75pMo`Agp`vCS0sN?&=+#m4!fVvQ?weknp4}=}7*g~vS%E53S
z0yq?K7|8X*18VOPupbFH3UD;w82BFxI4+?6=Lvz}aRHCI%Si!s7htSiK+x at SGVFf=
z{1tEt;8ehAfYSkI0Dup6ITPktfU^PT0L}%VjJuo%I3I8U;6n08+>2md47dbvDc~}|
z<$x;yR|2jATn)Gea4q0E!1aI|09fUBxe?|~fSUog0B!}`2Dlw?2jEV?U4Xl(Jctj<
zVV8SgzZY;H;C{dZfCm8&Q5jLDhpGH9AA$KOl^OQOU_K6b0`MdNgzPV$4yd7L(PmiL
zz;dhk7XxbkZ-AEoF9Tiyyb5>?@H*fPz?*=#0B;9W?>hmt<Gp|y`yinDKMbhG$H?nb
zz-NKre+Jd5F9Pb+mw>MTUjuek)v4bBb_47V*aNU9U at ySlfPDa<tEcvbxgTJE!0!PE
z0R8|t5O5ISV89`OLji}Ws`qeJRgM7s32-FfC{^_w4gX_d9;d2nK at 6=0F;+fNRm&#<
zP6qr1 at K*rPdHEEWrvgq>)d~nx1zoG4$rqjhHxbb2Dg|9r!PKsRwy%IdP|rmEXX9Jv
z0?q>vQG^9lxe)e?02c!;0bHu8=H&pigNgc^R{*XApbgBc09OO90bC2X4uJMB(Jm(H
zYhDjPdzfeg6K!DL06?8h)ZM%hfOe?g47df~xm8uQ+f=o2JIZwj>V220uD=K7y$E|i
zRTqMIP##j%--6&&9)|l7z at rFz4DbZvJ*leEr(s7qlxG3YtE&0}%$EQ!16~2Vio9P_
z)!mgh>E|u at yp3GmQPuFfFyDjweV8ApYVt#vSZsDzKBAZ()6XaL^C|s&Mn9h;#usGy
z63M=T<7=3^YU*yv?=<-Crh!i)%O0A#hq4!3dy{J)im)%)_5%vvAMkqw9YDTVt9DoZ
zKtTt>>mb0vfJ4aRQ2IHHA{|b)Kavf7x$p?2{}cHfNk2!?&(TP83|Wq)pFhKO99fQs
z<pi>vNNH&~ISD=|BmG}AHT+ji-IFrhn^*<~q>uMBP4%1sI18cYXzKnH>N!tSe@{!V
z=K?Kwp5{>xP%hH&b20r~qN(0Xk=^A03>D=HxUYo$YQQysYmwP?fEzURU}72;+ at u9>
zKpqOl^r6Zv8h$`pF1(d2=Mue377+c1Dj(C&?c at YMakz3PGTVdtm>5N$dYA$Valu`h
zdW3QhYIHB)KEVBe2Q+oTgPM9I<$k0B;_*o3VX_ at S#0*)$I~}Qj7(bG7PCbg~k8A2N
z%9Hf-6#YC+KhMz5v-I;E{X9=UFVN46^z%3Rd5L~rrjCAvY_HPKYxMIv{k%axZ_>|O
zDEm8rcLDDK-UoaD_z>_B;A6lifKLIR1HPcf1bhYf8n9~+OAuf;z#f1-0eb=V2J8da
z7qA~-f4~8NKLphU2L at I3;9xN0Q%_P3h2LR8SPrM3KL#;^$nq!pIg);kqMxJb=NS4q
zmVUqyoTU7jY at n=^<H&M6{hUBQCo+HfIhlU`f-L_^mQ(2GRQfrMeu&FCoh)b2&zbad
z7X6$}Kj+ZTx%6{8ed;{2olid(ptu*3<s$ldjcRZ)ye=WvrLbH^mU}48<#1g=t}E$>
zDA%jVay9+X&ciiixfYSGBg^&l^E{=y0gZEGP(7L0&6Aaz$#x6<e68T;R<eP2IGHvL
z7GiY$g-smLTgvT0IA{dk6;w}E?ncJ<kmcT>nz}C-yi4_{rz;PjEglTQf&`~455e^?
z;1Tk96qd(=>S;9RPgfo%uP5jS<lDk0$shF7>B>{c_G$8d=Kpc`Ch%1pSGssrb>G{!
zy8CwDdx6+N&SLC%A&DokC${4_PK=$5C(I;q_Q{MhnRt>(X36a9n>PbmkOV?IXhT8*
zBmn|RNFW4~5JEx%iG340h<y`_*g?SiPPHVo;fd$>oB#5ZoUc!vsyelusybEO7bE#m
z5_f?)Mui!W9;c`iB&Ma{B!x~P{xmUX2;k@~A`faYKTE;=6g-C%=PAzx5_J=IkpM at p
zMf?)UE)!fKfO9#qha%y%O}t9XHRQfdQ8x%~q9(V9xeewHF?T5u^-(V|_oPwAA4o$?
zG38uz$r6fM%A1M1#lhjMy_D~wV1fX*f`SbMJtRw^#P=y!M!{&)DCe=JQOT#7Mg^%V
z<MAdS(UjG+kYEL(^{AT9Fab#fu%~K1lelDp6oORKpcSi{r<q0-sj24aB+nqgT2jt4
zO=IG0(^#%rl7&DvC<l}ag10g;56?NEd{6;sE~wBnR`4RzaOY9Z`H(E23KyG34e2T8
zrKV9!@|6^<rKDmJXt605nZj7j?-J0h))LCM)HE7+1wkdjGJ-0CYKmQM8jZZhG}iEy
z#MP2)m1(T?N~$xBCXZ_{jddQ^Xd2BP*JK(k#F@>e(aP7OH(H5lGmSP5x3P_G>&9#}
zjg7nmjo1X*Y#JN*79`w?z&4864yHwb*#TxJXcuTVQtZLAlTz#@*oV-5NDolpAeckM
z95&_Wq|w2TLIB6AgLi>}XTjkyaCli0kC{e0KMo<>st$ev415O;zk<Vm;P4qZd<PEy
zi^C6T=O>W>P8pA;)Ta<gAm%g}xNjV87>C<6 at r()KSqKv;&p8U6C%Aw*c0&vohNn{0
zMFilJ at p#g5iK=oLNv;sn1Li8|8U?N+-3<_Y8$N^5-b5gsm|I{nh`CJ#+%XO3u4!!I
z_o%(ZK#lXjG&U2%r&_2vC<YV at iUUmp#ar at aOe=U^TU7@&5R- at q_*)aF;|bqt;tb1}
zm;{<>Au<_E3Nfh!X$0vIWe|g=@+Q(i&CMjqECSj~;m=K+O at S<eY=RtuTmrOdE6+n|
zb1Y*UhikT-7g&I~1cd}eh at 1e5Ky|-w89Vp_f?|Y9K&2oWmxY$Gi!Vl?477v-OTm<b
zDkxBC8M}EE!5R%vP26&V6$CW|D+y`|RuQZws3WK+Xi#}A!)UbRk9DJy=VGbCA*z!%
zq3P>T4zhOgW&~P5>mfiPq@|O$60{L)K-5N1JEBnX#10Z}0<#$c6gF`S3ATdS20BLz
z2%g&!xsoDwAg~hw)O_MD&~EUk9aXNA?}4C`n7v^3f%bzAAhwEx2MG?*s6q;_XyRc!
zkC5;vglO@^F3>U1anK3SNz2eqA?~bY1kYK<e!5iK&o2<y4e=$=WzZE+5BlY*B_E^v
z7r$|cU#ECtZdd?1C*T;w&ywUONp2C`Cb&azm!KDUPEd+_6uOVlc?vzC&=eam)rM;g
zH5W)6O_CUbSb{i$X$0{EXx|~8fb`vzHjzZr31&caibP3Za8l!^DKL|wk_l35Bb;g*
zkEh$l5uRyFJmoKS`DeoD;<Ifm(V%SGILdPf=zT{nBzd4YpnOmPMa;F4zK}TVx)X~~
z);yBT;eh$XEr6&PRDv9(Bv=S$5oLf2G_eeUrHCyDRZwg?3aW%~8K at ex98`nIT0B>Q
z>Ol1fXHwz at 1lADK2xcv49jKXf!`qs;o)~y7M|mryX(QN3a8QSg{ET)a?*MHAZ3b<j
z9P}<^D+1d=J3+fadnjTrn0>@xTkqlr5IP7tL>dnh93ePL321BYqR??9I6;zA6grL2
z8Dh>7oI~h5G33%*K%kQPteYfDeAMq$3S5GT7ZG;}bj3D~^J at gx32xZNF>2>=ev^VT
z32qVGCb)wPcWoo87kzc#HcrwqbBa$1Vr>lKd=)g#@Hm2L2*n4DvpkUigY=Q<LE}76
zBAAKP$;709Ndu(^jc%S1G_=g15t$t{E>R^#cF?eMf;d|T<+p^<L#qWZ@`K3_0t%4t
z0L*V8Xg*1CRPNz(DQb}hpjQHgNVA0EmXTxy!773Vf))ZgZx<m|E2XNVQudL!nYcZ~
zT_ETtfa^1H9;xr4$oq8DPnocW at a@FRhnh{OOeX~vP(r#5$GG+IVhWWIOeIY?D2dXb
z;a?cU4!<~PT<1%J#!X%U1(l#>LE{#$CRiRc#;gd+f594t at EyJqvCE0c2+9^oH^<WG
z<*R~#)zk<IZPx&GLE|28Ao&^sRK1rs61SG%3I&^pJ3!nz;*Jy7Ok4}WdV&&C)k<6&
zw8PaNyCG=YSKCG$H^#OHjRz{Q39(y(#@MYvBU)?^!tDwgQ^igS(KfmZ(Yrx=K%I!)
zi=_L4MyxnMaFE~-!C`_U1V;(F2#ygPCpbZHlHe4<X at WBZs7kCj8#JtQLHTWAOcNJ^
zMx4M at nI^i4!xV`VSVZCkdEOUMflDNYg-sJU9vhc~MxwZj;k=6aT?-o1#SJjGpzt>6
zZqSIjhwuZ?6bDugiU!4iVjW|A9G(fFM9_4{NE0&%k`S6nOfr}hP%0>m1f{x>Au=3e
zB7B7mk?8=|bHFU(W)ox~X*MW_0=Wcv1ak=Tk+A at Ab16_rP((0~U_Rm&fQl(lLQsnO
zEp&`oVlhD(@+~1|DM2|w1rk&`MwY<nWr-@{stJ}8tUzQ9F)NX=mY7wJkt6B|>IoVM
z)(|ujtVOaWV%C9aCZ>g8J;73fR)RKy4UUl~+6g*P$R^Mh$0!inka0UP-DE?K@%&B*
zc7b+-_JBIkyuF}(h}#c30NFv%A<$ujk09<S_+yUo+2i0(f<J}lX*|z3#$0h0%sJ2n
z&_&QC&}GmS&{fcN&<)T{&@IO(6t}_L0o?`lg6 at N+xG(`wENB`i!8M9RBADr}F;C0@
zlLVUS8WWRUW4`DXfE41?-7+z01nEeWK};r6&LU<uK^8*UAbORYgJ&*?URmZ*<QxR@
zK`}7b0uszcpb%6<0jxKC9<(k1m4Ft47K4_!#;?&ezeaccx*U83GQgpk2)Ab<T$u%;
z(giFds6z5;&<aouXeFo?v<g%QY5=VPHG<ZHnn3G7EudD=22eZHZvt%wZ2 at hCY#V4h
zwF<P;HHyV9FyuY#c8wBM>K+K-N|aD#N~kit6SNn!A9Mh85Of%H6m$%90(1&=26PT|
z0dx^`8Po&12D$;d1-b+31>FZt31R#|v7oq+F^9*8a2ie^NDScsi#o30(?d9_%^*k$
z8Kq(-L2}4gNZdl=77 at 3IxDK8|kO~DNEd+1y4!t*k^2`wVQ5f{u2xNh>K{=pYP#$Pb
z2-7)4+ZF*?Zy_-lr!vyci$L>2Sbs_5d<2R?rJzNi#h^0K63|jmIj90u3914u2dx0r
zgs>E>L`k*8tOB!|m^v`^#554BLBdART2K>c9jF=90$LAh1+{@TfHs2KLx$)8Z3!91
zHiWl_qAa6E><4=wWCRZ4xeV4=1*!lYLijM~2<RxN3v?`GtP~xHJb}Q;kWnkLanu$M
z=$jfy&OrMr-B=|y>c(nOPEev7zDD}c#gCkcKBG?1d+ZA#!`~e;>IHmc;}UXS4jB#N
z5{Cq*-Wq_c7nUp*R6!h<c at NTD1ziJO$AF6)DC#Bxw?MZ+cSA-j at 1>ag1P=(J!*U<D
z<WX)JYs6U%&`4K#VN8EeV%QMpxm<%X>P4$&G>X%jVP4?IT9Kq9G*5$^?!=SAMw8er
z0Eq;t8Xy}<lc6L9lnP1<qr7y241_YnXbpDa8Zir@*`O>?fiAPdmdpXghb)<n24<je
ze=g$kKyyI(lnyjEY`j+(mPJTA4>TXNAdGFh7;z<_QqV%sqA*%Djk*j_Pq0?RQSGt(
ztP`d5DGpLqfGWcfq|#{7habxzsY3S{meDM*!|)oa`^vDqU|F);qN7n5Mi-VTehb>l
zg)B!^C)PoT6|qG$gpKv05lYsEjaIP^Obci|DQQKTHexmqYz$*u+7Z_Q+5*}dHkQyt
zSt4$7z%~kQC%Ekg>>zF@!7hT`1bd*coIc7y?!BM`VR;=x$`67+gnl|4mPe>>y2A1p
zJ&%Xw33{Fk%TwsL)5M=b+B0E!miTjFd7hpZ!m^v5-C=o=o)^RN5<M at 6<rR8f3CkXO
zUJc7@&~u&m8)119{4LOJ&>fQ9h3?+4Oeg+cSSA at 5SH$f@&#e at tn!Jy|l!%3vOpO5M
zb94)xB%>pSFD8OD4HOrVbC7;D`5N_t-VscL^gK*79?yh`(I%!x(9<&_axYB!Fz5iN
z3v>u{1oQ<VPjVZBoI#e*tU=jY0XT@^o(UzXpfpfAC<BxUngyB-%8En<WwRbca{5fA
z0HXPz1rey*hqJ$!OGdwrX2cp&+@@hvOQ<yq2^JykQmXiQx?PJP0bOJ-g|s|kyjX!}
zC1_bh{;`O1WQ9){o5Tu8YCtO^$aj^~q(?vNu1wHe*)CiNRz+ZGtC6NIg5v5aVS$hf
zk){l^CgRFQ&{|MW2zx|x1bLb;!&^}3dSq(_wShK(HiFtCay at sks<^TPnKnh-C|6$M
zF2-XsHDe3G)(Dz=T_X#m;6b0URqTlXIwNw8PspT5NY+MZO^mp!H1~wh?a`w`?rFz8
zjv`KiPDPCE;xxe-jA|q-3qi at CqzG9U=2V0%i>xyOOC1BN9V0JB#=;uM%1d}&23-O5
zfbv0CLDvy?4bMAx-oW!F=oaWU$v}5Oy`X!bM*mop2OUUzAI}G%Yv8Ah87rrPE`dJ*
ziUz+J&lo%};yIV};Tel?E%-P*3-PRizMCWmB|w%4nhu%)>V+%`Y0lCU;hCT~@F{qv
zg3>_gpbXG4$d7<#floo6*?8VUI2+F#P%fy^7>n6CR_1{(!*dRvr}69o6;ORZMWA`0
zQ;^NabAjT=LH{_k>m#W5V`%?la)<vhnPfhOzI;qBgzQrIF_illbUlW4J&rVwqiv5P
z-Q#Hc<7ms{=%>fgPmd$*<4F5B`u}mHf80%Wqdp4D8Y9<_882HwRsJYsjFL at bqGU5@
zD(FP`2`GL7il0FI6R6Y^Q1}ECJ^_VKK;aWm_5?coW61k4bn?fL=i{JHpz@!<^OK+_
z<+d>spl1T~On{yVNIL<Q!xQqUpq-#g2(QAk2hTltUPIbWJYzt0pt%Uwg7$(>iA->@
zY;T7*3%yUFUQf&YV?G7_pMw5R$phdIf)0Ut!=I9e at w|j*3gVA|?*U&Jc?M~pkw?co
zgZexJ<9r6~dIss9fdM`PLxc=`a^zXWKZ}lk79IaA;-7_{XA$=-4B|Po?>W@*IT+k?
zNcS8J>N%A89P0WU(mscDl;(Npc^>lT(J#-#2%d+rKQBA&=aJ at l=zAXNo=3Wgh at XhG
zpN9O?kbfHTPe*+QGy2RJENGvRE#fos>p})Z)MsU$|Fc+SKZ_NA3|9Lw(s}`#=OSIs
z@(Y>e_se`d5Bq-$^Z$Xs#`ifetsJmZi~1ZE!eSwh`hD`X7vyFC3-Z#K&&$hWJ|FdY
zd1cJ!QC`m&z|}GGkokGp<9{*gC3(mHlI+l5!e;f7%*3-^yd+B^FBvr&j&3#D^)Y}O
z1UCs{4Ztnp68wPMV`QuW9b;aScgMVh(ywUH-%IiL#>i5ry9f0NpgZCvER69&Ci-5I
zv#pn83g{lny5^VirvJBb4n}jQjKw(^6b*{O6f|Ctd4`Dkg3JduK^S!!PT0K0Po4yl
zG{Sj3NT1$}m7f=KiJ{AKr2Enf@{eASPrnSGXsqmjV4ET2XI_YUMZWN={P_#=AcBXD
zSLJb}pCsft;{}5!Lt7T8aI7p1e-ZvM_<10@`6btLKKKP=<=d~xlEBOEZQU*NxmiAU
ziqD<lbEAE3j?eAY-KjpeL3i)z at _;VnqQDEXEFk1kP(|QnS&MKzs0rcqfq<;`1<)fo
zv<-F;#M8cYmz>Ls6ue5VQM3R|CrF at RyO5iaa~EiD;7d`jyBh*-nQ)hAZn_WA=>qQB
z>)4uJhs*Xlwx`#jXEyD4X+qu$ypEw+jCPcb1yeCr?uVK``Lg`km*x9kmVf$XnIZ$&
z0>{GnttVHlYOJwdtF@!vkd^uy#zyUy0MMtmHPEpVv;tH+7Q#jiP>H>C6=_~gkmxts
zv|<6c7eFL=>uZsG3S0!OX)FM~cN@$Hu#SSw1TAAx)m|zl4|d{z1Ge%8Dw2uKvVp!_
zfr1U7jbn|8?RajY3U1P5n$+btzT{T<WO3jta`Km=zAFFm&8SJ}he_y^Ol<arIyz&L
zOw}jJ?ea^sb8<MXZ^3DO3r_1>a9ZDjv-=i$?=AG)TX2Bif&=`Pd?4S3NBK4RKzt2`
zhONc?x{Np9#(sYY<sSwe0UaG{_`2{s25Jr)yS0lNAl(nZoY}1%9}764Kmbk>cM5x6
z=y&9U(C--jv&eT6`<3~2)H`VQJMzldcTk0QP=$9;rFT%JcW|aas_UQ|V^P(2(8X7<
z#UR0a&^*wBFcRHDg4>`wpu3=6&^^%ou`<*AderaAV)N_9ZV^3BmV)6i<K$u!6UY39
zTuR~CaZ!`$E0u9Fe%xdy!9N-9;bddK1}}HNmM{*GE&#<eI+Ib&$*AUJRC6+_IT_WQ
zESHm-#Bou-Cs(1b>QLtI%jx5OU(Ns}fo6h|K at EucCStxRQ$aI8GeOCqM#Ovzp>HAd
zE!hNpjqt%`v+0u?%@>U#(K0sb+wcv?!6yV|fwDn4;}DfgusjIJBQ7I|`hQ#IkNY+P
z1tgg}PJZXbsCVUA>s@%j?_%+KS9Y84%IOGS=kLl|?OmA7yRuZg3yXOd%UJ0+K#d{4
zE9G5N$_Jo(;yYL|zk`lih<?<*gY(TenCf at r_oV!RjQXzpzKr^w{2`rckXclWlNZJJ
zqrNX=#rI_is9t;@Zss`IXzB8l^@9A#59B%PRfvBW^+V&uDl}#qIhxgAmV;J|Luo%m
z0YAh-`a{F6fo$bCc@??;=0`Hse$C*kA*ve}^#=y89|x1)MhnJq&A6{Mi~}S`06k&A
z8VWWNZ1n?DDB>2uT9V~Zl3f(hM8RwdUc#xN4ca%1lUIzF<#pq=s2|Iz&W~j*C>j(4
z>a_!MO7IV5Oi-8cK^<P`=5ca*@Xe?{l7I20%nZIDX9vGzytfT{wu5$zli5M~X#{!S
zejI+^!{PTmgYQAyF1qH%b1!Hg2=(Oq@$B$Ny(c$mNOgD|&Jpj)yr7V!K at s&6d1TyA
zU_d{CdHqBl1$BXDf|5bUK*vFggI||RgMTbn1YeB$soWp>DSG>-IQ?$d0A&PMpiU#v
z9RWBg<iF}se<C*oe-QOE*&h6X{PhcRD<09}eK{SJ4$1%}Xz#;N-p6!2Jx=C85D!6z
z{=Pgt?)|9uvEsb%?hV41e_y8f-gjqP7{>SIzTgiG`^-3bF8H#%j6VAZL*5Afsl1Kg
zUC_N?K*l*gkNO1;YrlX6|3Yq#`~ruyU&w~wpGEyr?hgJ^?g8!d|5E-N*2c52KL4+1
za~~J=D`%haE6IL^GxM*Ed>vbOzK+?OuTS|1U at 8HQLHT;iSh)~I{JE at jeol7+9|078
zMAkSzm;e5Axe1Rg&d+PdF#6;8zu<$J!G9VFwP8Y?ggSfV9~V9^74uWTKPU?q#sK(O
zfScyXG6&Q@%oG?_07Z$BRT#Bm15Fr+rIu<Ez$s3e5E1$MYfe(1^&99G%;so>ZL3gF
zNjzeM^^Ig4VjPcQE(P2V%k=9K!q?xC?r3Fsp at G45KBRiqCw-_P1PW6Cz#^bA6d2<%
z)RA16gNJ^g{|DOv>+5GlV?pC6V%*^51I$N=`N$A^pxloU^Vq1}``_!)|2bx$V&>qE
ze0*?VNX$Slxqb79gdZj0M at Kd2!OT!I9%1+oqX(p7aMz9>55f5HW*^Im6M~S^jT)^Y
zgfi*zBVb at gs6<gi1w$kI>!OUhe_{<u;TgKJoqoCdkcM_Te?spAN+*Qt4p}$!kGU?1
z`k$7dr-nZrt3trAhx~cj`;>hA<0F85qOUsR2WH*)A at xV0RC&wdKE1y+p9DNf71DL8
zDt}TX)B90%h?t=FcME62Q~j_JUJ_E>H?B0=PYqjJg?Rc?19j2FGlN20SVLBdXZyg5
zd#=wMIUl-kYbF$+lPHm9Pyw3Z=@Lp|U(V<I!KXT9;s98KfNIhg_%y+12I2xkl9CSX
zvpSYKrj1h%uDyVw5$J2dC<}W3I_ at pz{g%@I_gh03(XlKbOtWvq#*ezbe2$pUJz^Gc
zbA10y at xtTvzG{4)Dn^##`}n8}v`=L;y@@t{*mB`5rUO%X<XYE1EDt3wj=Bbg*$4lP
zSn%B;8^}O!jMyz->|0m{R<Dtp&Okc`)|`P_546l2wbm~Y^U`3+fQlE0d13f!=?*TA
z=(qben-8V?MUQ+!w|(@lDru%EKpKU;nKh~j42=6=WAKe1ZL#ZH%ESk)DubrC*P%lu
z at W3P=JO at WvfO&tB{z2O(Ek(lkf-*n<qbz#V=6IGozQ5jmE4CQYLZ7#(b4)6x`Fy at U
zgYA#kh3>lgVDsu*EnXg2Jf0iAPz-kfhdZr99E*Wo?W^M;SJ3lMUl`&|3~U*~9BcsE
z;JE&+^<g%1*tqtMql$YtBtz at t4aAuKZqQ8IfN^n+_84k(- at +`sbgxjhS9}A@>WHoo
z15T7s#QIBkwXYAA?28om;?Qj5Yl&gL?Eim-p6AH^Z*JoMg at ZQW|MxkdLnHLTTN8GC
z9S)&xnzTh at j!^8NnIOa`J~8~b<|DTXlS}=Ly5)^}TpZ~i4_;clsHcf}dQ{1X?eR5Y
zUi)Ch=I~9+9CfQVN7XVoqsI)%Fl1l-5;0#IoO__+BOK`w&GweIvE-+iYN<1avK~A!
z!0G**cnuh!f1XNHIy5*tdcV)34UQeJ4{G#>^Mghndq(E!KLU6@^3#2W36Ff>4Bu~0
zPe1Jr!l#GdZ at dnrn)bRX^UK5S2gZs%@r;%Gxqq;sKCIM8f24nRG+&@T4WIyl|9Pp0
z_zt68%IH+=8_H8rUhJSUp+x_R+K+r*fb#338h>PPF|YI=GsIUl9j><Tt6zPyPd*GZ
z>{9S4goVGp!wbOMwuG=W+Uv$UrqzGy5pVW^8s>pDg4921qOwVpWzyjOdW)F1MxCHT
z9KMmx!axTONCvi6b>8vLp8Q#@&(Xq>NO1a>QH5=LPTSA{d3Ml=iVwO0>id&4Hm|&`
zlOq%en5JcUr%F@(F>CZjYm`eJN`|EoBTHak8 at _^Qqt2H8Btm at 6H;NXz!TLJg5slF`
zbrjaslLdnIBmV|&Zp0IPN8ABMd%`=gdFM8773}}}o&Lizc~Nf=^Twz*IPVbi&ZzTc
zAgcc)po#IiKJZW)eQ%Jf`HC7j8p$_CnXI%;Jlt8V-*hVLzpMI&1(Xi2pNxJreSKpM
zGva}|PatN(U?U!K{`v+5zA at _JK5~^G80Mi)qWBGH$fEX%J{ZLk2mUOtOFltPJyvaH
zz_d#B8#9H5w0hiV-r4YV>)BD)ts%xPhGiK)dX|yf!K3~{ee^%KAgha|fG#xef9g!}
zK{w{Z_Vs=zNFTN-e?UP0;A=>2&^AAqA98 at vg;#Ih*V4ZALY>!qPY*qyy*w1GQMi|f
zH&h?$YxGw@>3-+|PVO6-|HirW!~PAe((tN`7&SWAim`(Zw1fT(WtpyPv4Gz*POc7j
zgH2SW(Ounrn8r`^sBHk-_GqtKevhj0d&6!&KK#|Rr`?kc{+mp~$wQ8=!)9fll<Zb{
zfUY~r9ovwaj;zIpsr#d9+P_A5*SOw*P9Ay(@Csc+fPcl?rfCF!|CNC)Te#n(RPMK^
zq;J16aNqgv0DRih>!_K5Ki&HqaZ5a~V2$=17|y|+DcE-&-f4UD|GUI|ckl`}aP{^b
zV!kuTum2tizBl^q>Ig68dsy0q&l%r;ePe#_dwt#H5+_VViHB>!cpo$Ac1fl64a_!d
zg+8C&U)uNjuAtQEOCMakQZVEWXXKU6;A%fVe6e_V>iGU(@GAHHL2m*cd8&JOC)01K
zBd7hqIJ~N|{a_TQXy`qtHmXDU%HW-D)Yme@?kxK*PDflK4ZBF{XZzkAh=I2){aeu3
z5tp^E^mimhKLh%5AHDJcEB43+51)g~9rZx==;POr3%Frdp2Nmxh?!Dn4SzY~Q_sO~
zX+AdeEzMu at f%!Ms-Fo!9#1Zd<240X2x^Er%YWl^ImjweGf>J3SzVvcG_zLsIAw%q;
zzi)-<4+r{J9JN5X{a(R~BL|GRqps6K3wh*U|M<T6h<no!JLag(;=cYn$kEz1yw;->
zF={(>?dgXH at c(8CP5Unr2===6NShg8Uhg~lKYSyt4S0Y0hqR`#zrlADI)m>p^ae)5
zqD<$QzH2kg1Y2VcM8fyOANJ2FpZRbR6YBEI1LmD)|G#jY{!P!+!pF6KN#Ds@<)RC3
z)!WoCom>Nr=H4g!ZWsn%B at Qa{M<ZjrIzK!7_R;;22eyI0|5GP7F_7aA9(`JScrx*p
zWNkE8QuFb*w1G!ohYx$%;yGVJ*y`nm?p>Na{QH0ZAg}Hd{wJ#9y>lB<9pCuh<Wq+?
zMh at 6$ZRk%whO~?wKgu5ca^E2L!6yfA-lMM0gDt?T%QJoOsDm(PW4y`mp%25t{PB+m
z`y-Du)d52^759fD+UO<wqYr2pdygXD8-4$JctbtP^cs+SfR8qye8loM at P!o{{33P`
ziQ%vR27UbDU5B#1ciyUzhVC6ld;^aWUH0Xne)02<GK*oJ+^CL*7&z1S_3_K29nLj(
zGNtHy=#*Z~`^j!Ue$cfLAN;z8`9|B<M(!#@Z1yJueWx1n$HVQJ4?S6`J0P>~4v1^R
z56?rdQbvC7G{X51LmChqd_-^tUC4~`J(WA$Zy5C}wBh7MjQqqz{|$`T_lU1GKEQEz
z2iyMW??oQ*#o9ocfv^1B;h$0t`RHTt>l~fl^LSII at 0HKsPqrRTE8)G78S;_UU|-4^
z{B_uCgI?VXEH8bpaE6~R)pgLox0YibUPY^~g8qw7Kp$xxuswJjBi{<Kfe!iUXj|}5
zg<sJ|jr)`T`t&>UxcL2H-^C3sXvB6tRHEjQHtJm}_r~5g^pf!5iry#m{R~?H?Feef
zy{I3J*0w%<)`&~fevJc1^^r%?7e`&YAMx?Uz-IL2M}6s}>#ryyRoAk^y>LIGO(alP
zpdacYQN37W`lxq!{qs%x{$Qs6b4TC!@q<m~X9M4&{H$-^H<;>Wj8H)5eIJalp`QWM
z`Iig(p;oT-ujIow@!>b>d|-uEChWby<6euz$Tj}`zAV~ko51^nNFO;(2gA at C7&r!G
zLxa7LQNKQa_<GFr-tP+#Gar63 at Z0~Jv;P47Cuj->OeKgWh#`n2h$EOr5KoXmkVr6{
zU<N at F!Ayc=f)s*Of;573f((L8f>{K!39<;X333Q>3GxW$5abgS5X>bgBq$=72bj+n
z5L--8LQqPukYEwPVuCV)B?L<e$_Xk6DhZYmRPi?cr}Uq}(|;}){{_107dS8d9E161
zkecF`f(3r5G5ITmT=D0E1^*nU$iHAd at t1!UVZUZR{@0%{|3+iu{+6?-zZ2{uf3LCe
z|G?SD|B<tg{k>ox{U^?z_-Bnh{?CFv_AgNKtnXhn_SC-#_VoYa?3sVl*r)zgunGT;
zn9m5*=hOee*~I^Z+9~|=Vk#Hxx29sL_?$%io55&|-WOvad^r~I<ru`g5(n9rrXl#-
z at qn)+AoyA$;H%RR`-SO{y*dN%dMtu(Bys5Zx|j*U+cP2fS~8aQXW8$H6d0+EAtTd#
zCXLJILg_q%XQCFf_-vlVvw05B<#~J#|Lc5Sz~}OBCTfLz0{g2XK8ba58WZ%dm=DEq
z7#WO&C<dlOqQQ1bz^95*;BK)HxJoSI5%v#@k$gKZgJ6zW0xT0tfy+cWGF9;k at cTt2
z3OI>_ at iNryv$kCYVWy}?#-n@@AH)7}IpjXmTmgBssNr;xw-S7VsO3LnKjmT-rwOnc
z8TRoy)cBgH=TEXryaAGYz6K at z??$B06Kf$z=1mZs<?E35XIyJW#9q+?JSWy8I*qr2
zKOowG7sLiSPqU4vUlZqgJF@(U`#SLWG52r6<4=VV*i5x!TU5Vp<+QPGL*8{_J944j
zatEinRRg>DPLxo at cOm|a*bR(9+ckEI?*X48I?>pF-V1i0*vG at Hhwq0vS7^2TDfTDp
z0Pn9x>izrxl5~rMz)Ru~G`5Mus`Mjh`wx!-u8S^2&K1Xi$HZ}9vS>io0)7H~qc}-=
zQ7mUC#A%iF4EQPHER<#PbKsAP^Q!3=Fou8A4fwl at D%~Z-<%-MHWXrmOzz)#^Y!X+|
zS`3PL4WUzF6Ds at j>zqEQxdAkVcGDZfji|*s-j3)$xCQnE?*RLUw~^_jxC229zYD$u
zou^?|_o6=O{GKZLK8Exhf1qkUMbO4HRVbCwLSU`hi4602j0m&KJQhCK8WATZu{zGJ
zX+l*t9?6n;f>5<d#8&bXZcoQ at TFGYsxAG)p+Ad}S*NS91C15}}>k+BIvmy<-*Yk9w
zT*x!Lax)Rpj{eu!1~ChKi<s?2WFc)U&xYtG&jA*RTtVaL&+{I0=)v;6#05xji_Zma
z5rv+pNIc29`8<ebiuow<2MYu()5TtF3ACq)Qpmrv(9^fbdn^`o6<3C|^j}28dPx5%
zKnD8`mLs%SR0#T_r4kvJ^JR37XH}{js}Y+emV4S)sJhiaR47&gFTy4?Ea$a?zL{P{
z{c=<A)rct;b-)#(9tywR4a@!e22~Gj4aBEKBk&h%F&tNT6WDEH9qK)sH>;j)5#)%j
zR~Ou^h}|eIK*8U(fvpxBROCkR(?vU4fb~LlV7&f_JDWs={q<E;sFrVrx`TWRQYDG4
z;ID{nUh&&i3w9tPPV5Bk61xz+k?#h-NbFIuo#0EwUdVUyeZT{JKd_h|fcyqOh!$<;
zhrr+EhrMp;MVT4=h^p{WL>#C8>?6Czk9oFr9656M3Go#B)k(;AVs)E at y@$J}5ULla
zq5R*@0RGq6zAl1Y|9c!V)$?fJbbb!$W{4(;&+zjY{;T2wX=d?=oyofeod_-p>a0tU
ze6JG|@}DlNrd)xvS?oZ0t2hrOq6&Z9Bj_WWt0?cXxP}f);XHg at CB8wuZ`&9_HecLA
zf)0M$Yv3Ja5O)z#C3;obd*D}#`$~Qb6+6!F0HgT>(!u!@jS@}Ou=$E;O--s8O=Eu%
z3n=7qn$kKQrDKUVry<!9F$1A3oJZmjy2leVfrT<1l_=$jN?8_~*2bqpK^~uh*ke2i
zDG!O6!0UWIQhvV_ at NTm9Bs<S5p{*LzJ4Jh+{TUyVN}pA+G$cJN(v|0#0X`n)DcH9%
z!R`^WfV0JH=uhBT8l5+ at A*m2Kz(kRY5 at +zGs6z|SgJh+cqp88oM}`HwfG!2uTtqAv
zg<eFFMsD~#h-$=qufYdV+9tjL6}-TU5z!@%Ly`^Cn81En0>L~{swop#=sgyxsxC%M
zrzk@~i}@0b*1Dyr%?@4;MHhJmB()fL!M<Aw_Mlh>Tp+4|9irN+%W_q{6<(kQnKQ&n
zr8-8N#QvO*tyMi7i-@^=mG%_-%hkxeUeuw;Ip}f$$E+TF4R3%vN2~!qg*Sq)Lx%}?
zg=>|9b?BZf-sJI+|3@<t9^v_5=kpe?N$Zhot7wI217 at kl4)HSZi+CI4clZW1P93n*
z_u3Iz&Npgf*uS=Gbf?_mb>b!@tQ4DpxA_(=%&wwplNfgYaa$ql<=ar^8opgsVhvRP
z=MD(=@Mf at w`A&^~8 at 3A>rgHv~-N-Oa>;Wc-PL*LV_)TITFjnkWl8st~{mTIwOWQsO
zdA>LVED%MQ^LzO&RI(jKPGSwHz+uG95<5`RZhpjT?oo)&i!LNc#XLKP&;z~~nRfBx
zsMcD30+Q3<Co%XSkDWwls at RYC5`GGNwkX5~`0KBclUb&{bQ)P6h%;1*b{058J4ZvN
zod at 0$7l2c=Zph=bi%6NFT_W4mE<-+3yF#r*ddxqq2YfPOF)Z3uGH>k~_-O3{Vy9}?
z!6#`qAkWlpf?ufJf_$EKn<j{M2Yjh^7xKkgFC=%xJxB_)`{1WT4>oD-0b*0NDY{@e
z+Eg5i=4huOxi2mP)3s=vmg1okzK#|HzE{K|O*S+OR)X|`<!N!iVwA42McOp*_fQJF
zHE7l_i{p|04sr>W1zxb*A_01)p+t at 4YKh=uwdueVZHCT#{v`b`r@({F<$qnSvB}TK
z&-iBQNjm)}D^vAl+G?JLY!|h3U71$~@-5ag^(WbVZ5H@>`fNm3Ygxb+EgO<botE;I
z+9|BW33?97U$5mNv&pqQJX~Fy1KC<FU#Fw!8O-e(t$<$Cvbm5qX@$^zS33>)3M~g(
zTeTvcPVMs$yGuI<tyA>*;E!tykn*Nh>{YA;f$4fF at QSujy+ON)q|@|8s8Y4Q7+9>A
z>5~|Y;qi|y0kemgrI0Vs=c1T(TDh)FvH>pODy;&d4O%72xuh)ve at -g{UeKzLVX0n?
zVwUU6p=H0u$FG2Fp<V;5)mH+u^%yJ?wc0%7*say7%B+H>6WVI<bvmo3TU*xPm6xDR
zV9T{N(0EI0ghm*7)LPZzCWJ8Ko}eZBnzl}-pBXiKt!>fOUbJ3UOI9nCAJLYexK6DN
z6)4p=AnP`bf2;xXW3{#svPF73aJAl{x_uM)75ZjfZ9Q9%y+hlo)1tl&xLs#E5MQD1
zgvK-4E=t9ALo!R>qf=8lkzu2 at 9I*$qy^t)^_n|yY|Bt8Pi7EDp{YcTM9YEYly#&>d
z(`i}1t{wE+d`OS5I_)qL9n+3LO_w$sd=;!nux9NjvK8tT$dIUap<ixm#~_)n9|xA{
zCm^|}&BWj)>9oY((M~Gs$$=zRKZP`N^wYp1y%CyEX=lI}=oQf1rk(Zda2Wz;wR6DB
z8hOT7wev{2Q_F^mRJ{rOKJ5as)#%;8Ed8R_&9e|aL%)Rbd$h}5L#`k`U++PVE!tHt
z6*-_cv}*{wVB6ObU!vbY{2Fa1`sTF8KY3GslVKV?c?)q%^a3PL({FpjdPj}%UDe^e
zUJ3WS#}QQasCFM&^7IG59DRxphZKFP52I$=)zC5(qpq>-S{pj0SBv(+Mb%@FC{wRN
zY>XbOe(-r7wb-HY37e5BUEhKno3uEevV$H(VdHpenr{ND*W!JidHU3xy at B!@v_wy~
z4|(JD=|0b&o#A_uJ<yUUip}hk?L>*mda{zG_^`ETohYeYOZ7_Hhrl5%4V5d`Pa^3|
zJspX*Y8gJ&g_(%R)o1yXuQVI#qxCFmCr*}6vJ^cV(X;g&-(>j$&-FFvWAl)CjXp=U
zFCSRogON^PE&5#KZPWA66^(i!saxUWMF=(P^N?k&J|FSx^#wlF`NckZRafE#O6mTY
zEmSHODO{|g%aEg0FY--d>vaC~Jm_lDm-upg@^h?1e{Ctk`}OUZblX(By7Y3Tr-I66
zm0s(XLB(NZ*a!3~A5HXXH0ZLvTqQ*f*=e1|@Sxs~g><VPkEL+4Uei}enCl*WB@&&|
zYpFBYD)8s@)n0TR0%!DkrKy2LY>g_q5%Np=QZ#y>PF=HCuY#i8`dSs+gxHHZjp|W-
z9cp({Z}zI%;yu<Q{)*lTyr8!s{)D~(ct|foLwD#KAwR3HgudfCjr%dZ-A8uTp+<k7
z{uJAyZ$int^h%VxQ{N1}6N~3lScSHzG+UwVh`tTEy7ld<vv>HO!ZNheD}I-czBt+q
z+~Z at Nz9l~S61$}b_WJ1eX#0 at suD%}wa!==<+K&OauOEP{SM}j-{UG=|`XL`3)(-nL
z`2`l^V at JTe%wXC_!Ms9N+Xd!TmhNN6z<iOx+>V2Jjlrl+fcX+D^0AX(UMB-N1?I~z
z1$G+D8#JzGz<h;a1kZx`D#nDJ1M?>J{&_GsN&46YFmJI9KGqH9ZMNCRE`s?Q+R840
z`8t}$E`#|UcF at PJfO!YCVm)Af7bUW*V7>uu>>8NKNXf2)`8^=J0p|DF9Ur?1=9}z+
zkKF?EEf(u%x50dyCHfJo$#+?@pWOxX9hTu|y<on}vi<A}n*1Ki^UHh6Z0;*Nk5)&Q
z2k5*4{}ey*bjgwLpX#T3uxP(vbNun at IO_j``~fTS`(x<0pHw8`;}kzl;R6irJb%36
z1D5<DEB5ONDwGH<CI0Dt(lW#UBrEkN`8D|?R_13j!TbR$_v^_jHbr5opA0%p@#%ie
z`Y~JPr-t}gjbCK?F?al#P`TXyWq38S{B$vwOBZqrjK7%eM|F%W#AX`Vz+58-xWS)=
zT(gW^@O%8(;PZ?;@CW^KfL;E4<SH@>z<2uRf=@IG!5{Y*0h|5vfZhK2!1MkEh`r-4
z2H%Lh8aw7Mfuz at 83dwc<Lhy0MBFJ0)iy>L%F9V+SF99YSOM#dC<%r$nuK>T%UkN<q
zUj}UOS0Qga%GKBje>HHru^jT#{uRKJs0rLIe+}>eN{7enUkTiTy1{4j*CNds|0?kN
z{Hvkow!aRNI at B4ijK3b3kJ2@E+1~*9P5&CCx#w>Lza4ecSc<V0{8fJw<oEsSz_<CE
zAwP;%Xl%8=1 at c&<4E#B?RAV>%>mf-nTETDgw}CG-Hh|ADHiDmr9)L55Hex66w}bET
zcR)VXsD$J&+KXKh{QzeKEya1#*aR#vHbcG+?GkJ=T8%9o?G<dle+&5C{;lAzpe-;+
zV;i(Z8`~jIGgd*e7qx|F<lg~#jIk5)4Ac!9jei3$+t>w3mQe?+_iu)z$-f&Z at A~&Z
zGSk=s$u9qPU at B4yHX9n?pc|dQo#-)~?2!_O0rZl_uKD*O?*son;C!PIk{$m2;HMY|
zfOCz5u;`z##RdjelYh)A4fbhE{*+Z4+F?Jffkzb5G+1tgVA8FIdlVU)j4rC4aSVL3
zaU8hbI00N^oJ7$pjZ@%TjMKn%#u;D(<Ql6r&Vp|=&H>jN=gH)t2SX1Y17}?DTk>aY
zqk&@@eceK(wj153*!ygU0mHfEmw(F6888e@{(@aF#1+);s~9iF-em9Kxb>Hp3>-Oq
z{Hi}I at TqGkWme!i^d|&vK!1GTCM21GTaer}Zj%WacgVnu>xfN+Tw}e)U8I>E=!HBs
zaGN^NxJQ%4xDUK<+yG7s+ at Vf39)OPyOfhi!LVAtG1*RG>9wQof&xkQNn;E!A=4Zr$
zpAm=yW(4j-^1zq|J}nRrObsMJ!yO|Ld{SUKFgY*-m;%i>86p-ZB_j!v^uSEu^uPmX
zhzTScFUw!D+<=dIDKC&>&|;Wss0$N=Hl}po+psK6{)!a at u)tV>KW9Y&PU+_bW*HdF
z(twx^mBoQ9U`gO{h*k!I*(h;wAP2Qt4iv09kPE&lkO#gzFb7x$iD1hD`N&oiC_rpw
zU at rI-fkMcaLLyiNQfh2T;HlT-U$OdtQ)JLB`aFZoiEiH31m>&CE<nEKKrwJ#phQXN
zJl+^6RVf!j-V|75sCNi-*RwW2_s0zZSS%aI$_$vqU$esjw#2aH->|NLwp8gTH~Lra
zV}Z|D@^9J6fJUKHfeNL!QsM7f^6%KWfPb0lyegHaTJg&jQjYV16^efros%jj)SziM
z11o{CawQrVCu_l953E8(r^(fjJP6c5ay3v-Ly1 at zK%jvJRIUMkFVKkCD}l9;#LFh|
zmjdg6(Z~w}3pCRZ%Q~dI7H9$9MtY6)1lA+=VxS59Wu%7z$W}5i*+!-%TM&CIumSSB
zfsJHHaswoH0`1 at vQLbRUfetcMxe1a4*+HfyKZ+*Jl43L2rQ8C{lv|B$hWtmCE%|oi
zNtPpbz{>uK&5_D#^5sslnt4*}LjFRz3mS{$ZbP&Fg%wNoNlX4KTPOu3T_pFQ*Pdlh
zVtoFMEs;hi)Gw8LRTu9wlvB8${y7JB01*}PAh28>Qqk{P^50pN6o(D^){V4P%Of!3
z|IJoQb`;Eium-7h8FagJjB<1t{CMB<1fu_wZI|ptO-|u#m-L-fBYjHYX at zGDZ%N~9
zw>*o=PvvZ{WG_7<qfr|<>73y?<aAg*B+nb_XmJ5eJt4ahxM;9T-s3Vl;jFxZK#zf?
z1gosPW{~T99elKT!^?RSfjIM)D)Y7{x(sFK<Q)q5w7Z_Hm#jkG10Iw2fv4mHvLZ>B
z76&DkI(A%631BqMsR3A^>?Ny^(E)~~04tTMP#hkvUz>&mM`e7#J0~H~EfWK<8|c;8
zX*nHQ?#megc%d>0e2h60Y0k)G at Kekb@Le($cwVLfPs()26U+?oH)JO88nnS`<t%8p
zBWEM_p3DOF%52~?GY2@;OhAbjWo|%?bRIp}9AvvL^AR0u7EtZjT=4N`A at PQWrHM^9
z=RxaTIUh+c$OXV#vKX3<04K4-l0Q=tcuB^=@J(ZCU;;}sOOZaqEawwgs<{A?baOh+
zB`Iby<e6r1;3<}D*6Es@#(4(MGVS|t7jw)m998F<<ycP&%{6ooH;V)g=;kz>0kX}7
z0s3`NGGcShMW|JgSx8q(<^o9a%ms9|HWvppD*;QViN#Q}5;<FFVzJY#>713BSOQ;?
zGhorCuN?KLQuSM=>Qt at jSE*`NVO9ia$u)T;T3TZ+Lx@)e)|h%V!mG{Yz<RS9?XNRe
zpdJlo4LsFktca#>rRu=i0DV~NO_WuE{+)WAxf<zGuqT_ox&Te7dKK3&kfIgklY9+o
zoXXio6ALbCvf1QoQO+i_DS&yK&iT5)HZ!Uj)!1&f1n7589byvOXL4t~Qblh=51IVg
zW>j&9NpGR{m>t0VCSBz3Hu-b(vY^xC&wDQ?TRn52w{|<tHl?B-{oZBLt?EH at 1Ij*T
z()+u;CcP^>Y_<cBnsm>4z~ql at R5{ue(o2+Gh at ZrcnB3Q)WSdl*3UGeN<m{yB->k-Q
z3#xz0+=42eHn*aLGv+qnS#x`UUY+d-6!_$9oFL7>PKYm=yMR4N at +7-x?goF=+ylH~
zb^<R$!IP}p>pUzGd#RhUshe(i-E`C3r at F~|jYHjX%j}>x>DGQ#!$j2jj(I at w2fg;w
zrMz{B=9qO at N$54xREtj>)LHjTx>k?1jtq2JyhU%(Vl4jYL_BYs+@|aF2PXdvy at QXo
zsC(|C=t(Tj;{Kz7{x{xtO|H}H+Flb|rIm}l!@>@UF37_MWsN(Idd#*?0F$kg^v_da
z!^C{CP6P9-Gr%nCEU>^j2h6ajJJPK4;Pb5uUVXQ~uv4vWmH8s at QUE&^{TSd1Qq8h@
zfZ5hnV6H`-oNiqMpJ`nO&ar-9llhpFmUAQUaMix4YJW at NZG|TXt>br;<gP+*eeYFy
z?<vWBg%6bEo0=@ZG`6fMlEJCKW~d%sA<>e2rWmQ-s3?q6IL%8GuL7PPuiS5GaxP~J
zEGGd`djr^J)yp`QV!9{t^mvt>As?2KBp+@@US(%`8Irw6ii-cXCJW(}S;h_ZPeW2Q
znaaeJN(OI)FiqhZB}tb%0usLSB8yYsF19kHCg*XUDVJJr&!TSu*=z}S%gO?7x3J5z
zBUX;o*h(uG{AMc;xXQwI&-Ph#$lh(`gFj{!05 at 85r5fQv1R5-QU0i1sN%}e8JV at HD
z`M?%yfuvvY6@%Ykl>qlzrK;eC;CEPyfV(WZ-dkoZ2EWOo_g<^5GVra|5 at 4gX6u93i
z2kx;dfK65<@UXQExYeRh9#&XY;E!6>z-`uY=r;q}3Ix_$HNZ}^3G1n~68u4{R?@#+
zw+eiRwHoqTtIlgjy{dbIRF^q)*<5L at L8`S at BXEti7P!-*&rOzFO_Hwp)=Bz3Vl(=y
z+G_E#tw*9RtCa$*O_Hr`fTZ5qh(r}uJNP!M1Gvs=M$uK)Ch%LV&A<al1Ap4u0{)P-
zRnqCD+X`$$@SL?Bc;4CpykPAFp0##C;VEl3_%q<KFI#)SpSE6|EQ_%)Sw<&<H!RvL
zd#t_kNp{WJhx+UYu>FX*ZXJN=sztl#6^lRf#aCqs&fONLZRn2m6HS(48 at Kd>Nc+G#
zq#A<Vmfg3GfPWS4#ALaMi(FrqjJCgV3^7&qabT%^LaKXBx;D(VPfB$)dJ6TMVV_3)
z68ntT*JmYN at 6-Kcvdy19hsxyIbUhkxpI63yK_R`wjJ3O=tI+P2-Wq#RdOjDj%(X9j
zy-s(fDK_1eCfZlzB$jUT&-Qp_Uqz`)?Q4=gjl2$izI_9=NwRNx^|+-*>Nb?kvF{+d
z!lui=Ec-6_V!IbuWZ#o?({x{1?E^Jor<j~Ax2FOZ+0iCWfHvLTCfMX6#@Y0yB*u=R
zf9S=wW09!LjssTObfY=jo at UawP4On&X*&V(5}U4Pr=#LH_uGk(EVQSabl*CIz6xY?
z-&tTML0*o!<HT>zMBY3**;Fk^LBwJ^6}Z4o16JGV6agnlV`+A#muQwbiDlaSg$z7X
zZT?%ck#L!v1wHw8Hu!n=EF_<0=a|$_xn`azmvG+{^~qQ+pJT4HpQF#ccG~$!yw#@9
z!`9mLNm!Fz;FXXFFQ(R}_t!1<TqN3U)8`HyHhs^v#ikD$*4u?94Qi2>VIC6gvguof
zRW^O-(rnK+>Gx*zrOGCIfvGOwi at mh;0YQUJ at 006nde2;M(+4Syb_sNJ+NGv40{U!V
zolUQa+idzWYNJgrfH&I<RjD1Q-)fsK2e;ewxxgBG5i;+w={4{Mn_l*|+Vnli4x8TI
zZnNoofp&YbnQO`l&hz+wJ5;6=(dSbKZTev5kWF8HoVMxPsIxY`z&~TtmjFj?`n2Gb
zO<%<wu<8B!Nt-^jIAPP9^&>WYBy-qag3do?FQn^en?5b+vX at d}%Q!r~3pS at WQ{8sC
zxzv<ZoL88a?NB8ue8XObfx2o}fxl^2o8;&%2Y<(2p=wtH{yNeK)?=?UX`8JjJ7lXM
zxni$I>}|UaC111a!QZkQRIW89xjv0%xha=p-rEtfxd--Im9+`Urv%q2z8RUO23u67
z^~%gzmAnn|nBWFrY;YrRTCg1$9qa(c2R8xZf}4?Yi^=w565O}9Dg)nU(!#Qx+Fb)@
zKd7Z+lx76WFoBYSJ5cV-;7+R4O3qS)KFXOE+@*5vMr1~is+k_#<0<Z>ufb;r;VY(b
zxr%H1%qi%~oS;G0lNThr$qnvTRX?DRjHDn)29O`5?w%7oXzn#-9p-!xZY;FaV^Rfu
zhfVda at rd_0ipG=%yMV>PV>Eq($IV7luE8`922Lo&RIR1KW>m2}cv4lDs=g%H21!Nm
zlxL6ND}$%0>1#1*gZvBx%Y$cWz?(Q*>Gege>WfvubBJ6WJWrA9uoroejVf|&@B$*6
zg54C^j4jWLY*mqM!HbC85WGZ at Etptd<YpDQC3qQ;TZ30jO|B;!-w}MQN6kT+I7fq5
zVKcje*VF)Ch1Km2l64;plGUFK(hTSfuE0Tbe~_ln;ULX}(?OaCr-C#~_5^7L><rQj
zI3A=qaUw`FU|*1C!?7UEgS|nTut$Qlx^zLC#tsB&HXI7RL0?OB2es=c`9kmp>T)i4
z9e6%?lLq>7kbOmy8{m%zKXQvEL-4jqSNeAp-X%j1_5yo at _mq*{r%4igpc*s9BFmj>
zDQ7fV1!5G&0>1(eS!36O(=5!7V7!tiC``2IFhAW=H$jNK5sb5N{0%07zZ?82T>o~?
zXIfL8x05Y()=ok6Y$pZkvYb>)tz>BkBspn_nBk-&Uy+jmEO9b{i=0`&#SR@!W;xV%
z(avn7PjRv=`t at oyV&^$IkW6!OsV;sk52Crw98Y&X0t=l2ORb!95h!*FQBaIi1dMm)
z(GNh_d}L2^7I-;|k*L%u0Twu=NR;T*qU;=Jq2>8NIKgD1K*8diMHcm9A#%r}Qi3Hz
zE4DmmG5DEI8B~-zODsBlF16?vqvc)+6<%%TBUP$XiBxl(Wx%CQ6)@MShK>vric_|;
zT-9#{<V&0y#jgaP at 6-azoK>m|R(o3OEZULl5wQR&1WR`sz~?z at sNbd5h(IA4gk9BH
z>*Z*IXuh*fsclx+VtrL^!Y=4&>k(J&v_fjzcAJIsxwFA)vE*jXY8<%{f?B7YG{awe
zlC5+)6u(K~W`$c6ZdF#YP4RES8n$r0-Kuk5-+>yosxfbIcB(Wq@&}w<z$4CX&sNAV
z);oJ3I_h*HX`9o9$<U<Cpg|3KBjg&};E)*{boL_6MrA6yU<`tFIQt;)a`t=eEr4jN
za{yTHkdf?zk>J#>Oktf<0YzJ!gWlNeMWEd|gha=nNn at Lw!(PM at h>jy4&hpMtPi>c_
z?w80)_Q29Kwhh&UFQAN}*&&13=^RsLa2&b!q9nmKJ13M$oV4g#p3G^D(`O#1EV{Hi
zt)|o&WaxCxdJ$w2yB!+g!_GOcIy8ibobz6HUGQYx7XAGAqBrc9RNvCz?{_X++YGr4
zE0M#mV9-uGZz1ZUqxT^8oO2a;-nj<scCG_2IFmHF1E+e&xIt#XZbEp~xdpuD+*amt
zN8w#adYoQMxpr at BawirZCvZ>I|32b+9rBWII}d0{aHiNKpK2qw6KxB2%ZZ^Mtgzpq
zjmmv277=M~93o<Xm{{&K at QH3b_yjirv6+y-h}}fsG<P~;A2>6>C%H4g&v27~GZBjk
z>dpjCMP5vG at Hq3k$>3Am6zEBJ;q<XtkZ3H`O#`0+ZCD7QL1W2ox(##P!+D0C>%N(3
zdtZ^z1MaHo+AL&gce9arp_^mVZ-#RrS?lK6${yw*qQuQddHHSuA}Zavl+V-(ZJMY>
z5Vg25^pTr8&!%-`J|qq90xx&5O)qy!AgXsup`*-Q=tbm1ZGpQ85moMD;A*!FxY1pL
zL`CjWo1C9=@Bm^!oxgc*h2kp_+vqNXWWHMkzQd)jRSVr}@as`~!Ajlb;455p`|Pd&
zzs8*dd9hogTD20AYE(jFOWa!U>)chqRqkqFt6K+L?$!g#-3H(?)I?+R+%@2v+;Z at 9
z+(z)V?poVhbr5KC*8w-U&D0~7)`C=vQAdp}aMvSZh1&{T>9(L2i`+Kw&F%(Zox2fO
z<F?zHwHGe5%f6w>eehmgZA*a6szVu9y)wN`HioLx)ixu`E_VxXkGmDP+x at X74`4pH
z{%uHZYT9;Neebiwrk5`}Z8eG7)m>bN!d<o|4|2ZSKIDF84=Q=w?ev<m7xg>p?z7dl
zv!Alt_5l=e#yyCb!|oyQH{HX)OYRY6<p+`dh<nsl^R){Rr`=;V9h;AXKkJ at QLv|AU
zb at vqToO>GB<DLOtaL)p-y61o=-SfZ`?gg(N-3VNBFM2h<<jF33k1L3}?e=(qJ*d?&
z_bNme-D|*8?sYHXhF77Rklk``0nfX)f!*#M;AQtN at QT|Dyy4zc?bwTUbh-Bx{{W+L
z7}MN^M@%k6NK6f4Qo2)vm`tII#xwFL_b2Jm!I)r*-X&v$v7ukb1+g22rUg~$^Z{CG
zh<`jD!qQLzur`z!e3C5)!TV)dp&5`Y4kaP6tNCXlP!dW8E(@gqSA<f7REsoZC<vuP
zk{ikhsxRy^J at vCFBb;DNrBD`XmJrH at +MH017o8ha^D2+>U_#A-o~lqjg_hX7z)LgN
zdlUw7j1KY7Wg&lJsK^t}gW~ege9D0NMW2(+2rYnYVW^m7m`^42#4Msic5<i`RY(dg
zBpGJVqM%w>76;V;l%ask5Pxcks`653SrRH&d<CV))TyNBS^AH><Jn^KDx_H%s`jd~
z9Cfb_t$?ToT?aoaR71%ybyj)_=qx at hR2x*MA0#dctwxD?A^!O~WU36+11mxeLAr-n
zqp%UFmWS4onr$}EM(XU4c=4qs66~;fA$lSsw2nf%Y~HM%I&Yz8r_I+x-KtP4h4$OL
z4XW}(8`Nm6M!q>Ax)g{D(Wh(E(P%oyr-U{lPjQG&3-i%cIN68VAz2in at 0H?19n=nZ
z?5Z`Jy}sK5y>mlbsgz?j-xj3b at NcIO=FyHIo!xh;T)UuWX=pdFA+!fr7V7l$>_uR8
zXrC9 at -*1y}2}1|Gz`>xpHaUcX=7kO;bzSI)7ju+iF5A2eHJugeqEHWvz_ at 70W7rEq
z)-j}R4jorxctYVxXlV(ZQv7Mewub5;X$qYIzdm$U$<HY~56QaFg`g%+V6h9a?jZK>
zlUVLT{35dK2we(Z4$9M5(n9PCrXG(8?hlC`<k}ayis9cIx<(VSE2LjX=uqee at JQ%7
zs(Ki_#*T(=Liaf=Bq9A4O8g0q2Uw9pcYr5DcY&uuKhWd_tV1EK7s2zPd%z2!`^tbG
z1TA?HOIt|L`x8^WGr1g^;=C#^VVw#E()6d;?NAf&Mrf+ at B)c0T^ScJg1a>`il0N?o
zrGdW{S}LAmH$%}*j3X~|c0a`FyQ2r8SSQ+%SGbYRAAS%N=fs2)_%z4+Ws{?^xna6^
zSrJZf;OT`E9ok8!gFh0ctC*T_IbxTE={I^?!*rn99VYK_W_SkD90(_&UYo)*9rfxw
z8KP5R`dvy&IK`o#nA1=362m)yv%{$l{kVj#I&;HmNVz|p?qD{BGgOiEJGL!h`ngDV
zIMbo-nWd0^{Wd*JKOkue(+O`+csuyI at J9N9SD1bZk`$&5IW0ULC%>vN{rqD_n0_YH
z8m2RPWte`&*A}K<zMT!z at 7&_T-Y-7r`e<XA&g;9vvmLec(=T5xgz54(FHAp at J0H$+
z`mbl^h3R)BC&KiblFl&Q3pIo*fs4c0Xw2y_-Ty2I)6LYOFx?0p4(Fh6I>Pk3kfLxd
zni?CXAFf>t=OO*EF#R~BB22GIGQwA(KPyacqw2%)j$j30`u?CgJjbE$59rrz>%#et
znlN!FW>%Pfxt1I*P(3tPAzhMf2-6SG&V&oS(Iwv~HC*Hc=;vT3!}NQnOJO=M*P>#A
z6^7{t80BI5wZ+0P{UjqHOm`Y(VY)qA6P}06PwW2qo({T=-yWu4V{8u7yQ0-$`k~jk
zFrC`xhZlGiEJo{ggiC-&!*rom94<wRn!^hnwWrW;ypD$#p=;X1bXH#(rr&#Q3)j;x
zJ;L-$jQBA9LaQ{q7{-|&rjz{Iu=mR at x<S|*F7p&Eap-z!saLah<X9ChM?odwZP1Y!
zrrU$YaD^9L=}>lh|CbY{`?!5!`iaK+FkRE^1dl@$iW6*3_&Bm<hnJ~Qr#riYVfw|z
z(lGtXYe|?sDOnz_a;hD96>ddX&9kfF<&Gw=VdoFC6%H1Z8*tOZT8*Plo6y=Du0?O$
z3;z^rNpwW4LSSlSHE>F#4modgUhl+3^ae=cBWoPGEocNkEwWaP?4Q7mzRP)&Gb0kU
z4t+8+(u~;bNQ>9s>k*h8X$7W5+92BCsIL{1BOARyyO*rP8Tch^YGjiawHcW*B3qpP
zpS{hBZ1qxY^WwLAp&j01r}x<9&`tAhWKECk0cJ)zY4Z5|dlATrtV4s7BGh#$k$ui2
zc^^mUh}e(uo)bCXjmANUA8<A|A`U at Z7&+{Te`LuiaIz!fh|~XB%!0^K=S?{k)({D&
z<HS`K>2lOQe+*?Ui|nu_utkyM;4331fK`!tB&vus0hdP9*_)k2hM%!c>nXM{k`4Ki
z2u^QodE_*(I?@Qq;>a2B<&m>q`_4H>9T@||j68APd3X-Lp!ja*;VJ#1;=Pl(cY431
zB)g!qK5`j4*F?_HIX~i^;jgIJ9>^ObSAh)?@BDua{MyKM6`P0jt0La{{}ei>E^<T3
zZz{Z{@HFJBBe%UyyW>^*uJeq<%Fyd{$>vCy9D!DK-MTq)j}ox^G~Xf*)Ji+Wr7fKt
zz-^JK?vrd|BpTQeA at 6E^BpnvE0Vr5oB*w*}ABhESiNqnzrik~um1!;}OeEgbtau#F
zBkVm*CJ44CV$hF__eK(2bs7`&Qe&U~Rq*^N`iXUCB+*ruT?%Ko at 5vd09f<HGm3}7F
zCBf;B;OMAXGX?94;Gn6=WGuQ7nd*8M8r~z_^={w2x7~ypUPPvfnB_iv4LTbtQUp62
zfkA6B73+J%%0i2}BiX>qksRQqNUrPsMo0aNDRUsY8p(InmQaAe#mHRXl}I75CsG8w
z7Wo-{yCB%z$dmJ2H3aj~DZP;es%W~3Nf?tu!)R-C at p3OxtQuWHX>njwV at EeH_ak)k
zk~n4|{hL8JtKl>dS*-Xnm&~`%D3_?fQm>?Pq>3HWiriDiRH*VQA(=X6nMzcpa##N!
z-rhVujv_l8 at 9M6eo*9ia-90w2W&!Q4kc`o?Ua|=}Alcn4gVzuyy9s1-%%o?Oot<oe
zeDfuC&Tlfdkq at wqPx-bb`L=w?7Y5tl6JHol&sY*RHoh;6 at d4O?5B=VI)!j3a&F&_D
z{P^JMI$pi1dR6u6y;rYF0(6xi3tBmbMpgsVkjNVN9UMV}#<0k10t)AUePk`d`h2eg
z!6v{Oj`-dH$X6rl;CD=9J^YS}Y at m^P6T)L7Z^7^A$VPx}0Dc?sZ=#2QHbd&<$QJmW
z64?sB4Uuh-{&pBNR(#502P935?1bM*k+-4fWZ=1x at GhdwZb)s8yaT^;BYUW#cOg78
zvKM|EBRTk;5wYQSb|eqK^CJcLofFwd-EAZIc1UT8binVt$b0ZRD^jNfrot8-@$DzD
z!!WIvL=I4OH&xi?A~#jg$|Hwi(l3p?4-J|Q!cIgw7zQ>zLzY%W_#p!R00wt;<S^BO
zYhz6W*Fi`!q#n{Yqz9yjq~DVM7*zfK`jN0y76R2yDnAwmMb{^X%as#AR?yN<hJ9+d
zLOB(d0wK^_CBFiSt`q{evtd(t^24xC1E_Oh9|x$9!iM at M=fhI49CS?|<3}sl^fH4#
zbs_9i!eQkqbVQMsE3%t;5vt<A1lMyf=~7sd@!~vJE(88uyj%JwoP83O7=*Ga`!sAQ
zgVlNw7^c1~0wdK|MPRHtK?EAqDIzdUohbs1>TD61t1b|MMd}g}Sf;KJftBhSRmQ+t
z^)smQA!(gR-=J<3fz9eR5!kNo5`lNry&_<%`$V8!-7f;~s~?EK5%stToK(+<z=!I2
z5xAgU7J*OIt0M4)dR+u=s)KwK7~&f$0>gc;h`=b{7!erfn<xU4d{ceQC0t`MILD`4
zL5iQN at RF{=$nf(OY at tv79I4>@0=jyiw4_*QxsQK|g|5o%8jLc(Tr7MY3&T#Z(kHF;
zN%J&sux^A6zCgPPvtgmu325hQi;J0A-B6ZjgLH#0)duT^x=dT4dBZ<MhpNVKwnme7
zXxdA<&&O|6uzF1GtYAZRpUMY?*)Sa%0*rpR4h^Uedkq?)`!qf*%-+$oQL>@#)n10W
z_Gqu at 639a?&`90TY;BZo_;T84XvMqQKJDIDA<(Xk(T(s?ZLBW&O;Gub$VqLyE(I?5
zK|PmH)X)v{gw~*g(j`rT^6zPrb)({lcBsrSj%zOdDY{X1NSmq~f%mm(x`bDbbxHd^
zXu-xEXSA8RapzgBC1mtCrOncf;6bes+OuD4(hdEX)~riDV12W7!+$`VqZ>U>Yjc4_
z9ojry0^M}JZiGJ27U)L#VQryqDs9?14P5{(Y0?zGwg{;)JIq>;T64o}F;Z)Om at PqS
z0heBi)M+VFYZ+2^Ntn&>v&%5*iqz;YP8Gkj&@a92SC>Q2%cWMR><z!0xdM6>l~(E|
zU+3TEzk3yQY`=eqV)}Q(ZzS-Je|E_D+Cl%~P^9c#|Kw1_*ayF+UhuCD8NCkqr-#f6
z+dn^K_UQ1h267zmuhEUW-uEvJMbsVst)WPy-TxX?_%>iLgM0jIp$X$cQfnwuo`b at X
zaNa*7Wcqf(Z$#S#1x&LI3Y&bpzcplr_ImA{AByyR&;L5K_6g~TUwH%RvntHi(Hvu5
zUr+eG>9-!UhB0==ueeDYFli2BZ^BeM>p$<8#s#EF0cl!5c?)x3zuAa**B9wJD<I7Y
z_%;F6VJqGYnZcm41;!$%D_eo&K||RFC4;6{#r%NsHsaV)#IYT5Z-cQ6cuB1Rz5}7Q
z7om3I$il|73!z~vS{*3c4a9<K-_a$uHz4hSX>%W15uo<qUOnP_J&*&+u7TeOe=T6c
zRK7>rtDEZDKpw~h1q(1&$pgr%<gGx at _E03aJ+Kd^|K7mCkg0ACw847W6le$Zy0@@C
z4;jY0fe!4Otb7_W%69>9#J45z9xSC?U_Vs6F>nB?*%y+Ihm7z$fm0zv-xD|&GRk%Y
zJ`5S5oq_j5M#b*Hdm&TX8fXuhfwv(X at ox(h0^S(C4;4Htbp(`y*z5gab_l70{xA-}
zfg<b&020=ekwGuBp%|PK3?J5g0oX0s5hUc{FgvRI%K6bSJBCZ+c$gj6eL;RQ%uZkx
zr^D=|?hEm=VRlOQRq%6Rb{d!1`7k?!OY1_Ioy8_y3bPM&pPzpcX6JNYn12>#AL+g_
zeziDo^MmSnMEM0IVb#~d>;j^?Q3P?B?xNtY<-bdceOeuqUJptegZv_*?F_R^*rGwY
z2XGmy9ip?XL61nEAjl-fb_DrBELB3%Pcds~vGnesw6|E<iDK|vG5A?A_;T4-4$`PH
zul~<q%Jz_El}Sxy((E#6Zke>8%!6B844x>HE)-**7lYT!q(LDLB8n1{t`MX2wl^IA
zh_WW+RrWblc8|0_RBU-Mc%c})UM%qi?H(h_y}Vb8!HMP4<YKI`T$){sEiCsI_?N&t
z7L{KkL at SCAYl^}3Md0fMb_0rRDBn^{zDdcQki4~gS1~zjVDcctP<EHwMSN$=r3>ZK
z<zm9kVv)fB+*v-vFnG3Nd2u$auJF42l7ZXZ8^t_ONI|H-SWLK54Bo7eCWk%bz!;P%
z;d(&ugtVuaJk)?`FkWZF444KJb(Skm^g>wLUyQxq71hD;a6qL?*TP>plWvBkAvy}E
za!49sNJ?1qd915AbAfff4E^4zzhW4^cl42lq3zMV$!HkrZhbURWS5 at PrG3R>9lCT-
zmyYYwS>SWJN1#`+J2P}xO&;WpVsMb5jR1fkSH?hhgFTe7hQvVzHzZ$CFdlD6Dn6 at Z
zn95+|l2Kef2A at b{+5pYHVz|kZpmA4?FN<)UhV+tIlzhxCWP9113^<a~)FQ;pVzAld
zQ?LVbicOwsz`~!WvuQX!3v at QG2)(8l+-!OjST0L)xTlgg`E=~6Pnm&TRlHWr1cbpm
zl(u5w1I6GWQ=Mf1yE~<^My&9(=4CZu!_H`|85?v~V at FIr8<SdfHU~jh7TY`*L3V`L
z at gm|=raTV_b;g_z#5--CE9P7=0}EgjhWJCFg)rJ*n2T_#+^MwCR9_6>SIs3bBw^-T
z3Nz$O)02__-{<Bl5ovrxnii23Mx^DD&~n2U3f`r(8oogAYsv}(cJ&_0O2Zcn_EJ_E
zK7a6TWi=8&QPvnf21@#C2JMP#q1Ql_*9~7;@J{6oB$-cHXZW<>*OiqKX(RKozvGfr
z#(u#irnA52k{n_Gz$K-Uy}%{joBb=7)Nix@<dW}U_TOC6e#in`@;|{wGA;$K$nt3T
z2CKPLwpd}0a|wO%UV*7szK*jexm2-(vneW<!k0N)3}3yIvksLr<0X}S0AF*2$_~Rf
zGFoLv;M-%o%8tUf=VX-~gYO+PRCXM`cQ&i+1bpwBud<Wy{n}!coq}(#R+XKG at 7=IG
z&%pQVZ>a1neD8TnWgo)#-mNM-2jBa4s_Y~9R=%sU^YHyf0hTj-zxkfZF2MI&hg5bE
zzE#Imb_u at spH|sr_*Q?UvQOY!a|yO4`1Zb{vd`fAz%`X!fp4Fzk6nfDgY`c4Iecqh
z_OUPE`|VeK>`VAQG{MKN!S_2;eC#@W`_A&Q-{#VHXZx6sOAjybF+Z1nYq5`wgy{E{
z`PeA<{`LwV8wcOtdCkYh!}pQ78heaOzuTg*gAo0_R*fBk at 9(eH*n?d9gY6pAx%B96
zjeP{Ej}<g_9=?BgUXw4v_xm5i&mUdXSU)cPV6vZmlS at CG?q{PlF8%Q=KN}C<AI<i&
z3GjV<fuBu;Z*;An-NmIRw))w(xYX~kpS3{hkB|EqC{<Gb(|%UVr6)h~vmbNmsj&f8
z!=*oI2(Yhl>FKEfwpZgUHZ#ET0Q;x21FQhwpUexeHu(N at QGiu)>Ccu2 at K2Hd`Kkc>
z374K(7hs1W^Vv58><E1SA|GHU;QO=o0DG8Af4M)v&O-FBUJ0__;?iGF46=DZw7;1h
zWb0s}#peatB8Vpz23ZSy|8{YZErzePD#(_=H at P;*mccjmR*<#Aw{A<2t%2{~Z4a_H
z;QRAkLG~tm)9(h^Tk!qG at gUm--^_<WHWOy--+vlpd5HgVL>YSzzW*??j2(sVbMwp8
zKjqRt9fR=mf5N2~p61d&#<=u<TFTfsSR()Tco`cH-xohF1G$(>|9rKK{VtaVTq|S0
z$EAVU5KD0BUsi|M5y<@4_d;xHkW2seVF<-9>EAyNfsDna|F{-nOX2&U!^_!Q at cn<I
z%b5+||C&(F3h at 2!N#(2qzF9V_oV^EuL9Dr)9fZJOwxFCHg1`{gTF#C`;3c-YoSlY1
zJzH1K&O%@)+guKE6qkmvo#pI21ctL*IlBOX5$sGky99xk*~jJV54rRTyHw7uLc&OP
zqn!N_mqxK=73}+58qHQ!u&rfWdX>Enn;rzluoD&R2V5G<&Q!3AWt@#;7b at 5vb7?&L
ztb+ZJOA{Dq*gxXZL^dhRp5Rggdne4sg}5|{?FH2W0+U%j%=&X_3VRQ9Ye<+1(y6=;
z0 at K-FacLUp`>YdUGuU9AWy`rV6SO7vG0c)#pvbVx5NKq3b at mZtHL-%u&X;r6%-VH!
z0a9jzL=WBJ(i{-G*{2Yg3-UC(3W0g-yw0BG(tHqOStlec0O^QjE4Z`}1RpjS0*ly1
zgS`ZS7WS#ZRzP4e`@#S!aA^s<X at FG2rKN0$$t*4{W5Z3h4ic8LDJDyDsg=zz*?ve^
z!J15V5CSXNT$BBbORLywlO2JC)ohc=K7_y;W}EC91YTqNOg1dcrL}Co$>LmkogFmU
zE0FL8J8ZI15Lm~KnQSx!*0Yl)dldp3*oP)-fWVvVGn4HAG;gt&BP_*%=Z}l9*CA&U
zn;KyoA+VV(h_JUIu!Sv)usSYnWh){e7;$MEdo98aLf~z-0AKD`6!rxE;TXo`vRvQz
zRJHPFQs(cTKr^3{SLWu8<dr{TnO{7C)>bD^$GjlqJzx1VIrH~V;FE`pbIgjk#U``L
zpDCGtcmn;Wna_uLm2Tby$m5w8An6+}%HD3?49HV6{|ZSDxOv}p^JYPwFY}*IphFZ>
zRm^+X&6^H+TIRo>z*lvgazAwQ#zCGx6L<nW=$yPKFfRmoGa)aK8Hs8A7*n{C>kGjj
z%L-TZT;JS}rJS94mF4o8F$mJ1vq13qT;IgU;o74WnUBMX<Kg=oS>|{+aUopQJ98nN
zI2W$EBXcgCIEmkr;lzpX{bQcaoCqgAq`-&a#Od%eQu1^-aV8u;7Pi(KweRTtkA>yr
znQ-E$o3uwH9SuXJPhzFt%=NX-hmD?+lsF%bms=Z*+P!+TO=r<^mOLMZynd4Ol&l1T
zcL3yJtxsEex4yC6&L?;4e%X(W{}Y)9f`6IoTbYft0R-e%Nfl8^Lg;pgZR*Gu5L)re
zZg!6v$bQpEzhzWO>5T>yv<LPveK0t7dXq8G^h**3Vw(;8QyNc$#8URE4CMKMJu78C
zV2Ne2wZ(u|N||MHVwGZ5r%#77tCYk{Cpc3{9F_s}u$<V2-)(Z at H3hz}DT!A387b2$
zCq710A2S$<#8#swv(-p!Gji6Sugq*S5^qDo+eTuDQk at y1Bz7t_nVm{}KDWx!+YM`^
z5}VIu5#3=}V=0Oy%||5(ll!E18rIv)h3b>uWmwC-LJy>O8`c(9jJ{)7?}_Lo7Q4hG
zYo7v`FX`47tfoq;j_onj#7UOpyXDMDmbfVA_y{?35wsa8#(*w97?wf!M?(Hok%MIq
z0+9yEb_V{LUx((rC0i?%>eySd96u+=dt1HJ?;8Dkv)DNqNA4#sf>ns%r-+~u5Uc_O
z at Xs^=fm3R4NvS_`OYK&m)St^x3Knf*w_;~@E0F&T=HCVRTV*o<<GfYQR_H3u2jG-Y
z;#s%ER;XtycH}Rx#Mhw24pCwUmVnui<4%#EA%F(!hVNn!{Yz|VZxOY7Fj#guTiwOt
zXIShEqc)e-4q^Sv+!p_pS9~`X|7)-K?qc!XU5md|Qv7e+4xhx*aYYH1J%`i%sdnqQ
zVn- at q?Z7v4T#27lVkZ>|;Oq#La}lm)vDFN_Z#^{(3guy{134bBmdFFmpd{sEIRk!d
zLxOR(VUR@&MwYZ7;kMu+4%FY4wqPd{Er4%kCv#hHQT|`H01Cq75-oVSqy?7Sf(6)u
zBvP<1#RLHp5XdZ$-TFi;1eR<GmXwQSA!4a>u`G14Kp?a5wpa$0VEH>2%SxPpKga2W
z?D#F&hKY^<X(UiTm|-hnSXL_5df7nq)=tH#2LiC9^Ts!v8EzvLV4CNRdYpF<Dj4;}
z8UG7x=$$ZOZ1q(|v}bHddoteiI)UB#dsz*ZSvWl3Yp=}SSI42)3E&X>jFqMd749=~
z(R~I>w;2GS!+ei_FBknDgGiOsq2Db at fqWs_ZZPY<VcGlo)N$mCDQ+iE$eWcyKHXvT
zJlNR@)&9~Y!v|RFKVTbckVgUyKadmW<;u)?*%^7!=5Zx$eh#U2H+AWCB{3XUJJeFe
zbQ#}_&J4#@`MkR-$0 at Wb$0=DRR%Ij0;!1cyfsW2#xxQ5rHoY?Yo>9jU`u7Mrz2A6|
zx>N;Sf_MQqz4e|k48X8gA?#J{Al>?u#SR$Mx1Q~tor!TUHsh546`DOoG&z7&8?mSV
z=#9={Z1n%>%1ZtT>EI_i>_X`O+m%(kSj^sy+5cS3MxqZW$wrb5^s+}__P-RfM_~59
zdfD$F at _#F4zk|sC-5t<%nEM}Y><GsG(~X_R*#C1`=xJE>r?KpR$uQ-Agp*EhM at HML
zO@}=;U|Wx at 6dP;p=Zd`wsbxb5_guX_-_K4HsBP@)?6gj3xT6C0|3>V;3w5oPO;G;f
z)6YTKi%|Y_B`%lvPwnVWS^9mWh~;Q!XC;)+GPikaVJ@!4o)2Pf`<EeM27^QtENf=i
z-d=5$*$P-Fk91gjSwkO#7*oA6(EKl``k;Y`fn8}R8(4>ol?^6xyS>b|BEvF!nf?>#
zk$E>I#Sa;F^pL at -r05*Zoc!-P8&A9bO<Y;lBg3Gkf`g=x{=h&WAWJ??P<dlN%)xrt
z^6M37543d%^~QkSK&1feWJ0H2VlD&wlA#D=fCwCqSchSKA2C=oA`(MgM4f&%pse?(
zF&H`6P^M_XvXxA*44CRwQXQ|%K2xVwW*@8b*;Q<rAOL{dEe+-{Xgh>5gO&JEId)W*
z1aC3A at fO`*WG#RfIme5HTK^-YM2ZuWd1hGlnLc%@Sq|$+g{m5pM-3fB2RHw*VcEy}
z)cKGDq<oY=*|(Xec%kPT#D#`=eaYg;4)?}B3uB+fu^-_<+(d|%8S=*@cJ>iq7eiIC
zy1x%?iqGK%8af;#SlkB8KK*`N;OS!qly2!`Kr<f@(eYaPa=681j>imI`Ov1sO{n-L
zR{V-r at d~VXq!-<S(NSJYw?Kg{SYR}h8Ldcbu$*fFm{%Dtt4Fb|)$K6K>ElLLX|r=Z
z?neRjgpodJSk=QIFOT%gryU4g0j(sfASfUiLr8u|9fr9cX-DimYH40lPupzVjcw=@
zt}~do0F%e0JYefr*-yvKX)v~VEGkIIww)P=>(EZ0GO|5Hl|2AvoY&1JoLu9H+<!w|
zC?WSBl#&~};F7zN$bFqv0<nXF*w-1L at +f_s5vAV(N;knIY{Hc=!K-r>);ZB5?J9s+
zg%AxM#7u;k<Uz~?h?xj6*@IYwU7g}VEP~-#gu^q{gLoYwrqS~2Pf<Gpb2<Uv4E(dk
z`O??JJ<2cz*6QmDE`3V9=B8F-YKVf?aJfoa263oiI`O4HBa{gLWw^&5BY(LQR?=`8
zw3*@ZM$~48%c#xZGNICuNHKp?F+WF{Ee$H+p5e8A5>j9$^$$3<ZNkPDzsc;_O~&jh
zDY=V&K{TyQo;DJbfIgEH{Vsr+qd?Kv9EHKBGI<8`Dj^SW&+>2&MandKv>OT(8H%)P
z@*s{OM6(BR3?Pmn#B2{DhY)i-h#WxV5Mr(eu@!qT&x6<sZQP3OnD0RxK-RgygE#=J
z^8oHs3q6PpSj!?0VguB&0c&aTAU;Eg#k6|9Pf;Pg#m at qpKWi`pSW=>0wmvj6?Q#Ng
zGoQ&t5x1*c3wW0l+lH-Q>ft at 0+y?Im1 at Vqh5|EoYp!^EF%ZO=!z60g0PZ(jqUGo#x
z&zgZXEvG(4pr%h8bt3_R%qK{W*3!cHV&Oa#K7id{;T6uig&~m1W8sxl_#RQXUZ%pp
z^C37uM<gf00|3J+4 at 12xW<wxTkF;K0iXo?X7;=ih at F8JX<6+3T0yG3NIUMoVJgTn6
zzOH2`djEi;4k!dNYdzKIE9fW$)Zrxp>gyij4n+Khhq%K<41r9?Z-#hO3F37g;!TKn
zy at z;{ix>i#O}`o95haK>c!;Ot$i3+yp6=2e0-5RZZ-jV!3F5ar#O;W9BOy*w^foj1
zGg=X!$*?qRSQxj|_LaJysCZ&Y#hbi}M<A&-dliqk-I6&#OXh$AYsZF_^FOV4a7o2m
zyoy(2#apT3#~h7!HR#+AL4EMetX6(C8DA+ux{WD-^j_3A6;#CF1OJ11F&^Zy7fJK!
zgv#EgHSu);7A7zdD9;(7^N39rIoo!RZ!LsYEX0+tgV0w(xp$cf8v=abe+PZ`E>ZR_
zD7({LbO;zGK(7K=bk9mu!!ECecVWH1iyheQb>If04%}ey|1BMOhlqE#04pajz%F&c
zzQ at CU1F+vf?C(-BwDNr<qXEtuE!Pth*um<d#9rEM(X_dk+0`*%%TOlAxJ<gP^^uW2
zZ{Y98Mu<3v(J$VnMB5a}aHAh6wO{Jd4-}UDdYd&uu9EHa1*5S_ZVdH=%`FH?m;j%q
zDtUHeG|2inAW*waGoTODei0<xiw3K2vukhY(Mtw<u{~ea8G&ux&I7LKWy*shd2bHA
zhI6RkMGF|+M+B&$DD}3W<YMn?EKz{*gnyM0H*t at K)M at jIe~D|bov866irT$saYG>U
zrEHyLWP%jSW0_JNTc)u1Yb^E}XyN;n+Ik+_4+*Da2vx^U$w<Wx5BC^s+Ix&EqG at B4
z`u4;aXwVqNYSD6eJGM%9><|A{oY(tlKJ`NLnS%0hVuup%RHL1$l-Z#`8lXJDJXJHf
z11IbIR7Y<pGfb{;vnI(|1`DVMYKK`PUpvT%eqyl3+95_`qoC$NuZ??f{v7h=&mNdR
zd$1WFco3J7LWhY$<p6ORB(lJ;%w_EA5dy*~d`0M%S3tMiqM&vIpY*3jzgk3p)I)y-
zsCorU9;1 at D2^GOVGx|M?3hQyN>PGDC39ob`(5?~td(wmG#KxVX?*BGLfyA9qNvG_P
zc(tx1R<Y{Ls;&mX|1J{zG?m`OsCa`AlOY5P5u`n{8YVOBrmMw%3?z-;kZV`?AR%@`
zmJ=5N^+l#X3_ZBWP_TrQ8c0d3mg5T;07e%umVpSB!laiBOv1u6fef5L)|*P!0Qny^
z&R%x(iXlaNfetR1Os{OOc6+d^G^ei`7zScLkk7T?T#t9i)v*rh${CL?=aBAaJ<6Sf
zVLgWsA2JRi at h?G6brfU=Z{Av20m?Wi1wb>DNv|+ZO<%)6OGOs=IZ!0WhpOYF6T<R~
zXavUCi!XM>-<R#!`!b7fl<h)nBXn&tButhW&b4#Q2UTX=Dmw}e;(}LY;r3PDMOEgz
zRvVoNRkxQ`nD1WUN7U`F<FO4S&IG9aAdc^6EWSsvV|x?=I!^*4EK5+EY*d?o$^f5t
z;PVcA9^vx<|1t9^!i>_rnZ3F-vr29%HZ*7FpI)lqjK4ta{@bu<pI*<T+Z(rUHCA7w
zz65ZoKMo27G~^QT&LF1bA0MsY{J&fR1cZc?PfAjnWK8*#svn87yg at e0=sYL=j-HDZ
z0?eA*C8Z5gW^_quhm<dw`4pslz-VDCb9Vpna)bFGB=2SEO@>vL{=%^4)A5Iw@}--S
z7%x|6#yc6#S<q+H&L?4R7!hQ3a%E<RoEQvSbY`%k_eDML(UsT|$g&|zzXy{dU6O(#
z2$Kt9fb$Bms<R3pC36{oJ`jJzjy}RbC2ug%NK7%%!O0LhSOygzw+AvoWR>JG!?voS
zU<eCV+tF%93bgqz00V&tu2M>d80gRX-x3n*ngL~qc?_1**NsZCXdFmNLg0smp#brR
z2|vW#8XAygivlI-P|CInnq&C08>nmrmMv&@w4kx{J`Gw2DQ*I`YoCU_$Igr1=3+Mt
z!1K&XYSc4!^ciN&W{!dAPNeE%E3rlK$L#21Zq{U<ZQVzvDC>kwR>J%2=zXj at c|xXv
zLHI}Q=%cJUcGF;J+d(uA$q7+<hi at QBEr)y}AvRctW^@`WF*V)^0%xbeDq~rb5yp^<
zv9dZg$dqv)s9qup?z-Jl+VGJN=_+$<oRoXFo10!Q8%5CVilm#^!bb!GB1>$ri3mO?
zON=<x{eqA^B&Lt~Ef*3dj~(&KRl+QBLP%IB_9ZPaWDx6Rlf(t*ux*Ix96iJrE3w6j
z6hEfKj=^WI659)(LvrkpjBU6^8$WXE`LIyt<5a#*Nj(5(b^27eGJ+drbuM-)j1}JS
z*3Mw}u=OQ#u)9%!oZB$iJB6(`8_auQoq%`?Kp^3w7 at 8hxf+UI}V|th=q{f at Hfe1Qu
zGUw#4+X0R^g8+c6jIH}Fv~GrM)ByGw(C!(iv_rjqYy+{6f!#O>+K;`Gb4AIyP;&0C
zF4;yU2YV$OM9Bsy+3>4N7O3P9x!ARrWF*~UV1_xdvI00^x3lPWCJjXLIbF6v93TRM
zc;^_<tl_2|9bqy7CP>l^%n2GT1mXybC1-Xk&Aw=90z5C9jAr~(xY(a!sO?btE8WtC
zX`-I`UO at -<)G?bnHdMw9;ZJjYd$;w*!vX^|hnjxYZZuXob72IA&2Iw6yd2BRQoNl-
z+nF?=Ek2J$=Ru%7ew4vR3WAygQ4L$hFd1b9R0lp_ at zIdqe>9V0BTYu;O4`S<s|7ma
z{~ctYG$e&?J3-<0`#_<%3k;W$WB<gngLZKqc!&_2HNuC$LwteDb}8Zugt!Jbm=8b!
zi;XgoHX~%mAcGqka>$)>Y^RJfwFYJ?0K80nJSIETTOeCg<;cI%jxHjzqoYj*geqEt
zaO?Smq4lRZ^9jR@<BFGYT){)+W;{JET5&L=UPgmWbEaNSoMd>U+?+Yda*3%jRMV#;
zGgU756?HAM7RuH%uLTqlEod(>DIvZ*gIK;flcyH!EN1Lv5QB`Jti%e0894=Fkdado
z7iH_B48e<XE-_7pYM=$vs0EvuwToHvl@^%NxG1dM%vu03n#yf*tWB0+W?6 at e03$$2
zk{y7ha%?F8tYUN^vkD|(5W7z(u at edo^DDCK3ziKRCyXH1cGTdx$WwKyje`tn`hCKT
zofq<0M*+7hs06;ls$;L3Y_puVhN?aHcXp!4f({z*%F%aaX<(l^UTTlPncnq~9M44X
zY*EEE2ESrOjg%E=(P0%vzrA-y?>gSQPOWJ}rUYxq?pGY!fqe{;20T&^G{4Vih}JS1
zo;r?^%}zv3 at hTR%3yCgUIXT5=XL54l0J9D-48yPL<Zo51tx8Iro!P1+Hptcn8N(ao
zc(WX9mXR;k0ADOlz6OWMjgui^3DPD(!OS?hINwTu>g8oFP`&H`<-1^NQ6NEJqF|;)
zDbAY`pq#SI1<EM^)V+tzB|U7uO%Iz(de{s-M47|s9-shu4~lO^xo at iyKh9#u8L3 at 1
zb;ukFuyzR<$g24X6IRU`%7Bb5Cv2r;h4{(nD)JA=kgp^<OP4C<A9t*x;~>A2C9+D%
zLc;u=PWcwVpH-^c^i at I?ynPb}z-+bUNPt>efCg2!eRX>XSP{Sq04oCc_Kic}PDa3;
ztN=|Fz_)KH0%ry0EMUfVqqZ}O_~5rdwwQr5o}nZTAk7cRFf-sgPKI%XZwo5dqh&lb
zSr5y!cLz-G0c|j?2ejMB7=KD^$@bV{2T;KD_+jCz_+bJ0AxuEiV}u1_gi}F)p9)JF
z7~YeP5;e`koEMmh&lQl*K{rj0!4;6f!Avwg&Q>7KHcie0Cxc$RDwo*8Z%<e}%qxYu
zJw@@HPDatrKp!c&xaMc$=^W9 at LRk^gr^=Y#JfPibm-DVgHGex(ZvIwNF72nK7S#f>
zs)EC*#(PZ|As0CfHeo`SCQS31FhaRa6H1J_`CE;;zq$z%NoWcKtxmA$2 at sCZ_y-MW
zxFvlerB9-U<(P0KL<WnR=bJ+R!Bf#T;`=rp#Evmr1go*r$Bi89CTK%E${abxky21R
z0otP|qv3urfV8&Vm^OO=^mudkEFjfp%<7=2bsh9_pv`yuA at p9mE<=gWje at mNDNWv}
z4CsiTQu2k^DMe0Phk?2-CpN-L+Ngl2Sp%Xbo^8rZaYe}~vg@$4fZ1r-fu2t#i42Xa
zH_$wBgUo`{WS=VRdLX^odI1=y1es$^RU|;U=>+nP5)f!%dYoA$&+Y~}Lk=3jvgsVw
zXkB?_meo~MX78yBS7wzu-5PIZzf%_~zy{6f#J7Rek(96UYbujcK8vk1&%jowVW3<D
zh9L^nq*Gc-dsfC+Du at fXO1i(3Q9_VvNcqiQ0+ipnM`(Zdr2Nr)80P3d#c2O~BmriH
zSE8z&3PUgA5RZnL=uGqdtC-Ur-0xG6m!4q4&qVxbz at JI@GucFtRKS{Irl*=cK&eZG
zL>Rj;ECmfrg=5nI%bjl4^joreU=~#GgX-a<!6!Duge}MjV~(AN*2QL;Tz?W}18j38
z^dg*60kBGL9#B{A0Hw-P<*|c`56_;hS*Dw+rW;N8X~Lgo{F!aW=9qz0nfXtEunfAB
zRr<h?0OIcuV!Z at 0<U>!(pr`ON0e^r5Zav?1>bWhDj at 9Z|t&Y{|ZnZGPc&s0a%_XgN
zCau6&u5V3;jSf<gJ0wZCR(3TzRd?jkL5i~T=sMZe3{~AxC=vhge46n74Dph4ByRJ!
z^>wW7Ksl50;d`qmVzqGHaoyU4_y`p=dW&ivXhZW%TvSb7+I&cxPif6Es_n1}aF3f^
z8ks|p-bH5~5a=rV;riL5lf9Wj{ZNHSFEF9NT+%^)etR9{_eFs``Z`C1B9cokFd?ln
zxktwd2*Df#iz>-bauL=IFDpJ?!Nl?8SU!(B^BB}7EWfS-nO+ErIyDu8>7lB_(Lh>8
z{{~DH?oioY(B}Cv2l4fgf*iI2W$B0NR8#<o?O$WjYfQ at aYKJOJ@>)`$boNeRRK7EN
zXNT=_``Jo^`5gv|8`@_<lm;A;7`lg`^#hntM6C5libo@?GP%gq$*crXG=#L6#L!oo
zj=vPTN)-?YHP}Zm{s_cdOf-HkBI7r<Gw%>MpHf#g&|Z^ABQSKdJ&$Jgl=?$#e7<&}
zkvyb9=1s=(s1G34XY#^)l{^Z39c at V=vL)rwmXu2_HqjOP!SoQ_nyXa9FeoK)*HgPT
zy<WGDF)!PRcX0+kB2#w0I{6MuG=kRJD97ip*c>M5X&`8$Z2m3G>_*rY8fD?(Qv;Ck
z3&qMnD=mpuLtMeQS9#aC3+`18*)Ula$eKS`wpBr9j~Ys4_TD;Q?>fy!{+`SBLUGVe
z at 0J}!rCcZ~c6x+JA?{D}3 at A%eLvtoaRAX5Umf$Zym09i?P?ob=G;5>(nRi?P`i)*L
z66)OqjI=lrwcwcp3(-ee?P3G?>Jn2fV7sbN<Zs0Gh)`^)DO<}-(*hbUGfQ at b0d-pZ
zUOT-Dlm|!!ZoS-OBG78GrsgI<cH6AR=BEDl%1D)XuR^pJ1FXqqCN4`Com12WLt}BS
z$JfyZF69FN(0Ln^0EaP9cy~h#K8GOznGco_k at +H0ph5&2TLGO!lMb at 6rwVASS!qgo
zPgGhbYGPte)C$pw8jCe($lDgmj;%8OAkB;Z53=loZ8qrK$q#%sDBH=yK46nJ^2fw{
z1)7$buOt>I(5lP=oDPdT1hq7A`q#2-Eg(3oB$sP8DC5axnup*pl#?@umBd*Y#G%Yt
za>*g_<nK^od<8W3K6tg at f%qWBjt)|A7KB6;GAW?}Z99q4Aghm-6VpL%oQ^KoWLaJ;
z#}><y4*N#pBUm0E(bB<73DzQ7Xi(W=S30yEXHXkv7x1nnq<ViOBkx+Qby(9CGEA?N
ztsTr7El1bMa`u~oSA8 at 4&9?YEij(n<BG<P=n2vdOuzEZwuVwWxA15oAKUrbfZvY?M
zCC(LhDY1G at iqFEl*erz!=e*ceAGBVx7HjD@^!|%s9Y7mkLr*T%3IOOGm=o^g5~OE=
zOt^!v8Az7W>lCXz3-2{-em-_hmJ`(4%nnwhBnh=nk=1SyVx`+fvF)<#G-}-~jq2Xv
zl1ACcriD!~mJ3LUU5cH7e^zCByKXg;AGIBOnI_*-**y{5rBnhCIy{jDEQLa+d;00k
z1+f*OWd>b^0U)2=Xr$Meb`NZei1tIH%waq(?fHIZr?pS1U1`*=GVEtr^fgnd?})E8
z3;oxc42E*K%z=@OlJVjf)IcNE0l~a8XuMQrRj`-+pecp)dzv#dD at 5Z`+)Z+!masx}
z32ZE^PK7XROd{f|Wp$d~2igu2-Rq`QU#F#fF$jR9w%>rt&^ik17{Yj>ioHy!l!rbT
z#12F-vc9vE(xDM1mMMYa=|ftJa9oEFRDrJAR1$y<s=&ijAXp8Jqy(DMU at 5f9cog|N
zxxVPl(T=`>fxHbpL{lpg3Oh>#Dv?Uw(*_zHot=0xxq?>G-{V4Jb)ZxL35wLUg%VgW
zqo~cjuR+BJv at C;79v$)PR6T;k0YMg9my5k&0+-xW2fZ^+cXlG>^ATiW*JKLg#70jw
zs__ at Urp6y(FI@!N9Rx7NMGHhZJ?vCZwXZYTW~e%aZR>do>W>|yS-Xk|^kC_<X-CmM
zkdJl1+J*__kqEZ9)8xp!T9&n7Su^pMBU+sg*a&$`TiawI3)%+FowmIAwo`MC<22tU
zQ+uFTpE_UqxK?{qYY``VFpkHZsE?*;6<dO052PQ}umb3oK7-=NHTx?I$z2P{P$=UR
z5^#RESiV?D=~_sELcdi~)9s4zu0=Q$ffa-#hCU*V4WKc41mcyyvSTDi-qD6iqy~XH
zzm-?aKSRrvV%;Hj_d6gQy at LUi{`(?BTPao%h94zst#!zki)D581SWBDdN|yyU28zR
zF}mKw(vXne0J>4TCkCe9H0jVLewkr7cA4P at Y&|+G`zS~#cjH`oi<Bu%IOL$Tg$<?C
z*FCcNG<-_DmX^C`U)EOHI}+O}V-s<kc@)ARrw~fOQSP4prZ<X&AhnsA2r|huB|1%!
zN>&Zb6(14+r>+mD${l^`{3$IL-DJvGBIVCJ;danuH=85|TxJx;o^1w>kWzcT+1Y8E
z55RU*Qq=ZJ+E`Ff#CFOh&N6F}jDrdvuMk?QQd(BYoMnm4G6IANz{P~SD9|di8Q1P>
zGFQs<3!o<bMW435KL>$(i}^gmFMFQjr`PiV{M_+;@aN3hYUZNbV8nVpFaMl9Cs#&5
zJ^ne1Z!s|zecP03w;0g>=oWxMJjiRIm~&@B;Ce2AE9_aR-_IFF(%a4S4%4aC^Z$BY
zp<Jc*h7L0&y3>>?2?t>pRz`PRsD;mQ+`;h+2$5qxuR33!^VOWMUq1pv^i at diKqL@S
zF&5no9RN&v2ep4VL5sPHba*a^+{^(E#@;cppbue?N5facxD)mxoCtSq9x6m#%f<I#
zMbz==yC#e7F~5QmC}M#K)%UNYKJ9(_K1c%w$@lniSd>Z>;*ix)xp#~%(LE3~uHNkY
zb*<F<6R{8sw at N`zr^|j!@o01hGD(-FKFmU}<VFLdut1E%om3kJTPUdZV?&gs$_iz#
znKOg7DRCy{O-bSSQYzbGO8ZQF^sdd6<epNyDFu2-9j2r)={-{l-XZNbB_ERxn3A7K
zYiaM9FYX$_#?!3Cnw9_Ym6=5G%1pLbACMLw6({|Vf}B8XftU>KTq4PK9UOpnKDLrB
z<30u%<lul}3Hdir0y;Q|8#U8tBYK at guKPj00+PLN+As%69bctja4;DvXNoX7MpO6Z
zK=<%48O5wb9z^cE@`UxV&yF_fpq!y~A7i;#qb}2V at j;Uf>~MV*TN+3=BV%M9A}X)~
zqZ$w`lH+&uzeCC_LLOn~u{5aoNTX#+0UaCh_F_qv<7Spp2NGrXE4Jh8Xcrt;$8}^h
zsSt)v>yYV~I at ePt{u+m<)2LIO%ZqqfMNt0{am)ww$LlJc#xMZG1G;<Y(h~ZDq-aFS
zi{#IvH;5qXW+Lkbyu at Di7VTMzIK0D+OGS~y2emjm*q6Zn+K?qyQ`a2r6-r=aztCPg
zFnqvOYx9+hy_5cY^aB$Q!BFHQ7rX$ueRUcu8wL+Fe~iX!PPahC24{=yjTo+t7lyD?
zXhKo3-ou#H4&nV29?${710s04TFrli-n%=G=n~$J3&75yxmyk)_ZK?_VYg2ZEbWrR
z5nSv8N!$hcZUzyQq|=^rK$^T2PDJBpje at W)2-lvoAoU8{0y at OJB<Eu<$*j8HuPxuu
zt$YJI*2{SB^aVVE%_B8&dp=^uxgF&!dIV3tX&Hy at Xjq(r(`kkobX+KoB7}9&m#=y_
zdLt~uU}88*VOR$@aAXVQZFvI+JjI<k`W7j{!%;p2b at IHN{Z^Z8TmhuVOjw%f<7Vv<
zBYFauZ+rY(@i}sIjx6Q-e~Z8@$0rNGPMXP6CWTI$wI_|1<Qa$!QJe*yK5IIzWf1-l
z!pU={olkxwN}M;7AB)fhv-Tq>dr`zLnaRr#nyI8eF_WK)&}U}yipafcCO;QxUzo`+
zMcOqpIX+Bj*Uj21fa!)vziB4tX%y--le0xA8%Z{c(4a_iz6NX4hP8<%(~UBBJRBPo
z*A~>EqzB6bsXG*e?%*lOQ3Yo=kj<C3hRM0uC>b@$O|l9j`7Bbjj@#Zv-$!w~0Ct5p
zeUX9HgBV3S7Aaqxj7 at jYTMH=;aOp#3HCCIJ-m1sub557j-lP at 3nNCNV(1UReGoHf(
zHD+f%V~I5^UfsW1%B*3KQJa;MhcpOOCwD6Gi86$Mc}$d*_$4`Z2?h}@|DM6`W0`yv
z*D$)MCBD0vV~<W;VO1=1g`qVkeueevNMB(aK}iLT{0j4PKlyI|#QI5kr(RtHW&8hx
zyB8klSg{=V;!Q+~wo6FeD*K at Wf0^rBKxfDJ{Z&#QYaUdtR7w5sSF`tb*l9ev0rJEK
zM?jm*$7TR0<c0JuR!Hy0f1o>!fPX_GRdTcQ!NUTW)WYDujV5)1oK(q2^DbO%(DXKF
z`ldek&Ihzy_A_z~BHQm8Si~T-#V_#MVGQYUfy+4{;^S{}T4eG4)PwyD>0AjkhHBoH
zxwu0s=xcq(Dv`pFvt4!_kiS63)E%C=;R~2%U*NjiNz47;#3Zp^gFOXg5Ig;r79FLb
z`inE>yL4$DrVE0!!cK&D#1EN0aLr@%SqX#<H^Yv-6rnqe$i&|6>`WYD)tN(pa;=7P
zaALMnotdq~JLDS2NqU#;bB+c+W>mZ5>?JHHR_}Cu#ClJ0AM3!28l-+!)71l<)oo}H
z!9UyqakPNMhDKm==Ix#z(L8-ecJA(XMTocJ<1I2&8f%f6`(O#c?*Z(=vbSY)i|MG$
zl2c4g=|)yx=Z9}V)IR>jcKrjW8|kzQ?{6cWvNe5(nAn;gD}YKOh-ffa#bTrI(95H;
zvz`1~aXW!Jkf44+=|~(;{^|l`I&sre0kU at V=pjZyBmwGS5gDxrn*%8iG(9}hb6aO;
zNwiAp5pc@=a-;D;aohRN&Q3Ie!2lx1==p8fg*LV4tE9W`rlAy_hPjNhwOVJAR0D%c
zvWZ|HFwEqN2jg4=<BT_7Xwu<JIIXhn^rxKawn_dkxi_;{_JI)bAqkVL9pnd+PtX!j
znf)=^3_u|R2Iq3aVKOnRwRDRJuUMc{kc}J==A+&u!dQpWQLxxbT;-VZtOQ#%K&1SB
zKV;=ehZN?I-v;^?@?>tHa;V-y!8`Fdgi^bfMS~Gw5Jr;mC<y@=C({kCh#zBZP8*z0
z^i7>(SL~E8HX?%4Ehqb6x^0z<efF$4sMZS6NvZQA1p>ErKES$nz7jisxl8BinBiHW
zF&A)&<xBMDZ;3wpihcGId<uz^67WJn9^Z2x^^lBHVy2O8X#9(=Rgcr;74r)ZjUbM&
zc}jLlXq%91RnndBc6L&6;*1r-L?XGx$%5x~2MwxUP0fIv3OLlXiR0p8--nlO?5fTl
z8s7BAMz-Z?`W>Ws7kxQ`GcI4^g<5bAEb*0veI-5xZNMYTbbN~AFZ#5Tjy^#{1>Am~
z;VVoX>AddjLwOzdA!Iarb=ue_D5y}zCV(&>?HYXqHOM?_kR6T&8K0olb{hRBXw1R?
zocwe7IhK4SVtt94069R$zn_eKyob<JotsMQe1iSpsXx6~o-^f<5lNn)NuweXE0fw~
zeEeVmt*Frq&rO^cr05U|k5=3Bu01B7-b8m<oQnhl(Z at 62&BrtUl|G(X*5N)NRVZ0e
zIJ at GbS%FqhbTo*?qZyj<US*Xq<;Jks=!h)VPtP`D*B!*J9}*YkdeTWo4W49(vkli_
z_CoPo;{u&)yeAhu#`l+m4-of(9nhvH2i~Xo5k+zs?eS$S-pfwE>yP$g(PfO$%?WWZ
z=b6E-iubbIOFh;|pPl|d%f&tqW330NvG>8w+Z~lC<L+^Xs1 at JCJ2$UJtTB=F*hqv%
z;4rfuU)jf`Gs4I5Z1!=MzMu at m%I(;=i1Y+r{i4Eu at V_XWsE5s#9 at 981JCF7_WA63O
zap}#M9+U$`os;=;Cx>Fi6L!36Ml{Cf<irUqBptmq>DaAF$7%Qe2KMG%e=gGXY`l1C
z3y>#BG-(nlL1lK7k9Gq)eN(mk>8s%$s6yi5Xyj`!OE8dG&fN2yt6}#%=P*ERVkF=a
z-`qsUsjl6AxNo5O9Br;#|1;daA%(;ktgetA?F0B8zl+w+F+MsKPmlH0(_<&ULDj$j
zP(?<ZxR*A<)=F;EP^nP7oE+RvD at 2B1fa4?e-c2y5Coe8vK}GqJdai_vPbi)A=qz42
zgQQcgtXF)i=QNT2A28`RG0)i12@!@zPSySJ-3of`hMWq-{fmhae6vQwc8dpU9M%B~
zt-;83c8UdeMpn7Fr`^g(>2GD}h6q~7 at hApklOopSNWKuA5|LZz(qb#?muO}2Z`=7o
z|8FaqR)#5(be1sP37F1?<NH91C`9)$1(d(&)CdZ<AIhpfST+_|UE(T;oL3pBj(8 at 1
znAGl~`UpuUD5<^!!{<a8cquB3=qilLU!5=Uz7iiJ!)BNAMaRfW2BJq4>wWQ9)B8%c
zCuv^SS+-~VqG6-aG<rmlNo1(RJ;(l`Bm at M!awp52F8|{8ZX*UeADtFqxHsbkIXZ^}
zmD{@N-WIrB)7wg#-d at u5jy$y-I)DvVkv4dQgVf1>8(99?aLVV9Dcchzn)j6!)b!8O
z4Cx{6d<N*wryZRR+am6NA5&(}u9-6+ldgnbxLwhiPSK0<t#?UhMfz1?!Aq29cFAju
zP_fIm!`TElYw!XcF<SK2I})x$gIoMa*v`d{gyo$5_&IT-PUcKJSaJ}L5^1p?H1JWQ
zK1PKTITIEF=wg#DORi)6;`7b;y<Qe*e)r1gR*<IWt3H#}UyJf+SCmH_lvR?K>7t}3
zudaY9$^yR!E44XdDSfRAzP?tkzSezxt%|<Zoqesb4FCPC>>lx7raC^G;FO;Q at 5zkD
zReV);pXOYwxNl{S;*~!OWgf?OI21Q`nc}{d`6}d=XI|luxLiR^xM%5Gm>0vfCn_=*
z at y*Is$Sn)qO)qFB-ZrZ7nZ|8K4L;iVIjhNhj%ZgX3}8^DoXep<D-~HT3!zFmm)n`S
zSjQ at bD`lZ&By&8{-sSH44}{OkNR#IEDb2kQgN{|p at J3X84tL&{!l!$jR|nE_BKh>(
zNMpYoAFllRi|^KQo<6BHSMf%=-~N^N-vwNi+~{6|Urk-ZIX_6H$vH?(!xYK!)5u at e
z+$Q%3=AOaa*A!VT3q4hQt<8Oz4xt|w(C+I%_n;OxNENRG-S!!}o`*;lT1&)zklrvG
zqFBwG>TL!vh_#AXE5#h08SUHN`0T~;c|(zTSqQnJHCG<kZZ*gQJDlrX&Rs2fA;+4{
z?by7?ZC=RP3&XmXljGcM4me};BMcHNA<=VK8>9}z!LzZGyBH$C&~AoEFm&2LOmpSD
zsI?&6cGpo$>A|+4D!vs$@vjL2mw6;3$L}%fivY2~>)R*Tw>K3TCfe_bhbt1FKttgl
z-4O3`HSSluF7p;m_=oX65_c7=8Qg013%h5lA7ar~KT9w7XCKDB&U!fgzMg#;&2wH`
z)?!;WdC>(J-Rv!k1<<SoxGc7K5FaDNR)Y8%Ma3JF at XdV8i}(4qc?DiV^1SV#d`Y!4
zFQFx5y9aR=QSR^{&H}2lSm{m=;v_=sA_!o=iIV_vlE){jc5E`e$-CQw+>Ma$5G20K
zwi_UKa}azhlV2c{*y91NN5FR#1pq<4Ppk*P_1qOt7DQYp9Ir!ry^{6Vp_~_;hKOuJ
zgl{Zv;nkTfJTVRMP2*kOSe#aJ6+7=0KZwN(-HRWD;s?7HZ!9Uk&nx~V7H{)t_a&73
z5^2{?lf!vEXte6R9yD6*XN|xPbWoLlh?f9V=M5SNWJaioZP0{m9ACynQ^;sY9IbX~
zNkd6X-t$`WGGg6NSbI~{jsUMnz&G=9*YZ<K${+B`e~LYMpUT6;N_+}E`IL(SlS>L5
z^a at PG3J-Y&CPGCMRZ(DiNr4X(1qz_W4Ombav7q!#Z2&Qa&kbuSw{Gwz;M)_zbc^G#
z2i_{cTf2Y{Q?2Wz;77dXOvUye^+sYUw0|m&#4&<E(QlSOIExPc#dDhYLIqWbZ?e3>
zabr%r!Q<<AuKzmDGH-B5#AhoA2Wa<rmGY!l<#43HsqS-UI1plZSBg(5p~q>j_y$CM
zrhD-X(C`gir{2tx;%B|$o3Z$ZUWYeBxy{(&bEQ*nWO3?^gsFEC%Y5Wby^GwLdJxE5
z<lUy;Na)DOubz76y_SqZI(+O+y;088gKuV3*YYz;%3n|v*j?Vm-Q at t!KHLT)O`29u
zWTamJOT{}24_ITlwb-A&7H)wJsQI=Kn>>h)Jme~PkCi;H?S9rqj;55vMs7!6 at kyDD
zT<?uHLqM-Or6o^k6gs0N&xp`TEqPLePHV~2TAp6Y*vR330K%F0vfK!;g_88s8cyh?
ztP$WLjv_3HFs<0HCXP0dJF$_?yrFw at F^{^^>g9QzC1s|G_k(|Q_o|7<AMXFKlxgCS
zg2Y-5zwLG&x`9H`1(N0)p+}H(hLSEjNoO$WBqfbDMbb%3I!#HhI!UKBJT|(d`21y|
zHH;plpgR#y&*!Rb{Z4veq(#WE7+F*rX(^2?E{!ZHjVvvVEGvyHkF=OSK*t~c?R%Cu
z4y=1P+Iir2BYOFzwB#P{*Ze*-?cE`sZJBIVyC;EDL=dLbWrh37LMxp1KYf8K|G%}J
z43S>jIkbIKA5;iaDz;tq^Db?#DYm`FY5OO%e(?N#G_-oC8Wrz>e5!C*B?Er#i!1Ic
zDk%Syll)`nV}OEOy*J7>Y at 7MUF0ZT5+Y@EQcQH1yfuuT}_u194(K?+YenxAw*?UOX
zwq9@^#)!XQM_*v+e;H{0Hk6sd>2CKF?wu5V4dv7+ypV2<*u8?3R}g0xB%>bf>~vpr
z`Be?6!G>U$LZVC9Q!+K&<`tMLL_ibmMT+|nOjJCfa+R{~5z=8mpu+5aIUtMO_&5e7
z>2nfypCWG*>_aK=n+R;<K^k3ZAg{w*{_&$Agx9N0FLo5Fq$T3sM*-x`<-*w(JvzT2
zIrCdYz*2-q1wt1=JHmdcC|X%)F;Tmt at M0a$zgVYYp=x(Pmnt%duLGT at c*k+^a)IEm
z`uFfg5Mq3>BM(R$0cpW`L!BP3ao`G6As`oDHNM7gt?{QX>;2dGS$2&dR-T>w0GAz4
zzV1iceeyLwu<w+w_^i#W5<Y&-6GltA*C at KzNQAwvC_sZ3a(%xsxD8L}H!{zoZ>r*1
zjpxe^<`1FxR3$ywH at L(<c12_$de(ugOwR}jujHv_^ffZcTrAJ`zgW(c#9EG^nYBFk
z^me+Venas=!`2A5bhRz_G(Om|h{qOjDZYXi`EZfz7Sp=(<JbzWSRK3)PoEMqIRrB^
zIlhdG3c`~s(XBrIB$`p5WNFB5 at uxr5d*}idB436P+ at N>~93)x-;KHrY&!RJti|P*`
z@~KQ_x5X-iqKj1qoziuYuvkrB4m)YsS374d<CVGCPL<q5t?{IF#?SNEc`jL3cnw;a
z660XIAID3NHb3GeXQel3gLfVfab<?edLZOZS+cfr^M3pj0^GVN-ukT+Z_;h$^#Ed5
zKYdD;6I(&o+X})AkFDnP%m_zK_qn2`+pCUaa~wZcn9(&Y=$>br-*X<MB4+XpU?#c3
z<8)UFPe<LWLn$78hKbh%kg4nkrXuc}(_`rN(;w0V9mG}G)wcL>9z0B!SMg8`Z{PH$
zyEold6kcZk0x0tZOr(`EhHD^9d~^vHhy1Z6+|_{N<9T#EmrQ&#xGSE>ZSeqn4B+Eq
z)#zANqEVU5W0N^98*?yT-l6S%4a0{Ix;r!A0sTBVxtmVv*C@#mGRPHfovl!38AE~D
zu at IL?6CeZGwkN|hp}f=Vfo<vr=87~;NebbOI;a&TrY6MEG at u=2b5w^NbOTT_%ZoyE
zvA3DzD`+7iYjUu~4gvFO73eVMB%*`t0UcNg+Q%J0NND8(b%D^ea;hJyb}Gcegf1so
zLXN=6dVpa-L-qsYL at 4L&5+RW8AZ-J~mzm(>W?_i3oPlue23wP0BlX5(h$61;(bL2z
zI88H!pB5TzIXZml!Wk+ahDjNA-j%2juz8<=t>dY$1ceFv?Ryaf3rshit61n=MG`!+
z$nOLo1)AkHe3I8EF*-=0#-;&vK8L(WU5sl0nI3PVBZ>&ctDxd4mQwNltVpVo`k<VJ
z_h%jGxh5HHCaLh7?l8v3Rz^@v8O#+}!53s<kM50zs{GTZU~^f*VSj>kVQu4dIcBUH
zg9+}^bQ?^5&@8ra`qKe0-X?vl9X$CFPBQBpPmb{8^e{>1v)-Z%2ox{_l%pC at j?h at -
zSX#(3G|)T&(7$4AItobduuJcPNAB{jBSY5w84lIC^)U+Mx0VtMtx(GVXD=btmn^;p
zXCHfAX}~5Td2mZ6n`IC&yAO{*!ZNCNpa(}cPO4ahi#QtilB**40fi??k5mugxXs?(
zb(_WOv?cdyU%DL(Uau{=XIoD&_YsWqG|C#;j;@he_TIJ<xS_YgITaz?6eu!<Oy|RB
zLKNtvt%JP9DqBjPP#TDbQMY+*Nys9YCqQSJEo4ia!O?XT=3KlN+Ru71vKh{RePjlA
zHt%AgM$@Y*@AHBqgI;iQ5nzfb-f$8)U~|~7u-i9nJCAKIt)&S{eut*3JNaO~;!V|F
zVsx8K=R~N}fE>KHT1YN7i{+c4{C6dXG5f`Aq4HlB<(p0C6bTWu5&{st7Mu8*5?4T>
zS;$=XTiOzZ<L%!FLokR>^mb2*gE+Tju%i=G3<S}}<!C?7rTF9j8}Hm1ot=4fD1&Vr
zwslm!=|&d}Fx_9f7^eGcc0F$Ko(*{f&4+2M%N`HpUZ#+4lI?2F{)dvs?h(+H`k({V
z!i~EccoirGjzcuLaf>9I+?;#Ut>(wvC;lFTEa#;<&y$<Gp4=!Syh_ILmpR%<(5Y{N
ziY{>z$c*_4D4AuUL#VkU*GDe|ybfzTj2?a|4lFi>R)1i(DKrQ)QBo6d+Z5UXnkcg=
zr3wc?^pk}xsp~~v^!>XfMed$5;+B*lk>d4V*R#+^o`pW)S?K!>JPUn}XW>YW28zf3
zm(HO!xhE{-c5EU2{kKsZ6`aS2Pjq9>LTQ7b_eT)2J=*im`3D{lz_d6i)03Q|IjRVE
z<D2`URJ?~B?ZF5p|8#*g<X5>5X4ZefpwS_6_K|idj}M1-wb%o@>P=SvDha&|6ZN!e
zGWBYFjM}FoJw|o>ZN{kNZ$qsn#(jl1;KKNIV(}Pi>JOk9T~#4+AKj(*{|U?fq&<%+
z6aeJuQm42k>Ke77)ssmu9ZQ%VMr*~>GhMJXp6wg)?YJF2C_0Y&Kvx}1mX4=E0lt+6
zc$5JhZif!jA3lKY;-7iDl`Q{53f!syj^}73cu?GVZ1et(g^tJm?%F0tFkF8hc6Oq&
zK7kfsuUuceo)w5U$yHLUNoI7IcjtLpqZ5fbe=VH4=Zkk3trfB>wXTpsO(flr{30k^
zq94xft{<Wvlvp9#nH4gW%_RrplxpCpaSufHs-dIclXX7O!E8{!?D}@w(Y=t at kyZxn
z at YwI~VzV{x<^x^7$IB;AiZ?5t1ZMgq%RY%_EKnO!-NL0hS#|D{Y@#ksB3?O(iTZis
z8vYfK%r%~v!k?8gQ at Ax<n5?Iln5+eH>2<Z&5P&Q!(bu?)7_2FP-J><$;q7oVNLQon
zaMaBf^17!Hu1W3-Bo1TM)-~RgIn0ZXR!-(zFAI%Q$;DTz%-)Sp$2?kB2C)$QE06o^
zsE=jQ-DR*3rB}d!e^<jf?>@|{I$iH@;6%Pk=Ne_a6J|vxcP}N2W>iBn3hA3__939-
z52fr2K)XVEn4Eku<x9WlT-d;%@LhB+{J)rdEdtyx`7gkIVKO+ohY!c0Cyj#-#)0yZ
zYk at YuToHKy#;+p92iJx1Re?Y%oT|9DUYHrl2eCDhY>hk|t}u>ucKXBq3W2Q5LzYjD
zSFtl_ at q)a&SE3#qzZ>%IX4$*@)CDm!`I4D}z))XuC<TW3lEd&t8`x`qi}qR{?6pYA
zLi#0NW#m43VP<UvrIAz_UF}J(jZhK-BrgFaZm8s6iBIKG5B%7Js$vg9DSs*it%qTO
zzJy>z<WxDt at y<AQr%iOHkgoTkGiSi0IhhK?{+WqxguHI#Vy{OaF|HvJnA)*_!WR;b
z83s`u6O+dbD0J6KGW*TqINXU at IB92bh^FXf8vG8B;&%bYyI3wCo2AM4=Z)ewS-cmd
z^&(e#g83Dbw1Q|%?t1TY>`BUpe}RU?qWL6apo{e*b)X6jgVmn*uFqM6<vesAL>1u_
z<1O62xN;sTE?nG5aN)k-iV!cr(nZUr-6H&##Dd)kYiSmz*FMDolE8*$&iD)1We&B8
zay?3l9qH^u7nG^QBL5g4j#tIIGx2)l&Gjn%(VBYV&CYH%M7Co?++Cs at w?)=DjhM#2
z(Mf22iE!b|JK|myYg}S}O>q8OwmS43K)~{zqWTW3UI5e+fYSi?9qzAe!F1a4d%_NQ
zgxk?0oW0l{zr^#=OJwbvLG7Eu#1qzJFwNz0e~Z7X*s*sNm<zaLq2+an7%SUpeV3+h
z>eBQ+&W`Si^C;|^CH>e`+K;ZAVYd#Tv at w%(n}FLwNSRfV at +PG;mZTh|lqQ;W|KX;*
z*x}e!(V)7- at ri`sa at qi(U3HuqCJq6hWzaVLL5b|I%ZuPk=}#EB;2XPu- at 4Z}m$Yi3
zA6qrMBt at 88=g`JkMUDxiqwM6dog7sw(DLz-69}O#*`&W5#L=+#3T;6TwLwmU^MdYY
zJo*`z2AVGjC1sY-sUK>yD<gl6?*nuDhZ5*yP@;A#2PTZZ508kqQyxLh?GXlwdGZZP
zM`fpip7p^T=V6}`9S=7DbrHFE*gp??5Hb!h_hNHt1JK*~ITl|Zshw{|*GE`HI2oGV
zF4b1|qYJfIve7XI2)Afd#qe8uBaHjhJ>qUHMbQ*p?r7+fsnFnof(HmhuC>6qK)u)@
z6%}WT8%jZi#_xf)bOCK?=*RBp^ALGlZ-_|jA?eMCBrDQ<5{mFJw+Zy!COphtKx4Vp
z`*VDeb~Jb3U$>g1nvP%1B$agJNor+glBzdQp7AP-(IhoKmh~UYBuIy}+9fJpr<$Zz
zC*O)V1?NT3jzouK)-FyLsNSSM!2(0`rgH0FFKD9+J$9}Kdez^?9oR3Nek+p;O!3H-
z^Y;gLk-W2z`++sQ&1h;`t^Q%zRzGBtWOsuX-#ETbr)B7hT$x<ye?lB~0tBg at H~0Xu
zY0s1K^s^~XCdmOEP>8axJK1X#JoaqLlZnxJ;%JfZ9cwXrfS_o{dmsXY0 at l&L2ZyRq
zoh(Tg4hjWyHW1DSuxCJ6z~b{gq)Gid4o;7 at ns)1BZUTb%aUMO+B}j^Y4*c<RkaOB`
zDQezQ%=bg<etZS5si}#s;L5=EVwuEJI+D&T<%wY`n(#8iRPPV;%y3S8Tr`r at f-k;=
z$k7?}=KyG|ZSW6d!~q?sz0#kRb1rL4a<1z7qK+XwKyT{PruRrHfPT3fBjWLtUy8>;
zQvuXqCx+z#ZTRdWM0blQ-rdBQcoVrNK^F*`QX9!VqeB1*Z5Hpr;3H3*kWjLKs^iWJ
z3Q5>uN$u9+J^J?mQh=~yCr{x649S!5TS%UPUtsd5HS2Ybb_t02Z#nIz#O{aNDL?+b
zGOm`Fg-)VBKa?8Kj>Ls|GY{JU(`7&%Syt&FPds0F5+eiad``3Qy-J3EP!3IXC2xl|
zV)@N(o+|P-dwKN86_0L;I4=u>ctK%I&r^^ducT0iFfxU at nB^P9Ysap2916C2Kx4ZC
zan~Y`re=_3fqI%_6^2~}!Y467n1$714R!t^qPjrJKhSx)C*THr1D%&a){r;6usCT%
ztz}*e$+c`?T`<M-p&tP&tP46dd>Mv?9iie1!8K7MnySp at PWn8Vur*O at o2n|8qZdbY
zoj;`(TvTJbq3Tw|L)EPc7ZvnMxQ3(xU5-5nVaaI;#0NWzt(gyYgRPt%;};i=97m8m
zy-O0JTlJ0)NMSj$&YC`Tp at C3g$PXXC{zIIo&h`61LpO}&U0UKHEY^W-uBr0_uYidi
zNCk;q)Rh5S%6n?o4H#_KIF~9L=ol+en1T;pjLN5YlXZ^ACiz_-p9Gf4+~B}%^1y0<
zwG}*c*I}x3N7pLQwL(^vR7j~!R-p?zER(s8EUN(gDpiKBf^ii%({hdO%YbrSU*{7_
z<ag@)HDu|-w?rPuJKuufY<V8bbICThQ{#>Gu#GkI_&k6Ad44I=jAuKwJ2-4(C5Bhf
z6T2B^!$Q^&#@Lk46E>R3pp1Lotw#?Kc*CFmM7P$6Z4lxhzmVrFz6mFu at CO9qRXA6+
z6t-gg^PR2Sy^TzNM}8$?!Ha}A6jQ}%hgSjKk|}8sZr{zY<u~KFz>t8PRu_O_Nd^1?
z7$j>15Iur^Oc*Ho2;SNVynsafp+T&Ml<GVK222O`a(s<9Oc#W`M&i9Jvz><4*bOzb
z^7s;e|0O_dI)kgtyTopGiLG_BVmrik4A+`R>{gH1w;bnSK+vLH5WCeSc54Z-Tfdsv
z&9@^qM$sk5dPmTHxtO;L#etGnpGW&vkM^xV`&OL9Fn<N at VGbkhuXF1ncW94+qLbWL
z(!TkBM0<?7ZN9+8ajxkd=l%tqZ5mJEyVyKFE!clrP|D;uq}86sae;ti4EBHfUa|xG
z at gh3$4(B*_rU{J0J<Q8-91mR_nY!X*PPk>~fCf2W3it;&Nu at xqpPDwBd!dTr+^cTG
zJM at rjy{cA}Q96Vuqh#}f%CBnxBrG*J_eZEnNI at bJHiw!Hwu{_)n-ew)QAWuw*Gkwf
zatB*0jtXEyU33{&{AHoz%(-#>h;W!8r^W^ts0I>%+8jAJduMyTb}CB2`Re4`sEp8Y
zWKj``ZjRs|%XzWG@#J>?uusvKdzGIwg3a_U2>J-k=J^6DFJuk)L$WQPQ_<tDX`xQd
z$9usHaLgTQ9{<D)>bP}2QgVfR8)&(jpZ<8W-E&=MXJU|=&kRzb2Q}D(L29+Q)wZ1b
zw6ai67Kd^qHq-I6EAe$brYEVU<eVKy0|II-8UaSAjdW;_GByg-pgjXg8|mbo(m;x?
zQ&ED4jRp}7Q}Hy~6;kVbdGFPM0)@m8RLTbxFLz=p#7=uL9|;S^*hvv1p<*A*g{8E=
zh+_fz(D7$Y@^yt=fAK&-cqF3m4Imrnud2YuyCVQYG}w8g#2Gz|-e&wNO1<-AtNo~P
zwvuj-4{^TX7p$WH8-A93!`}y_!sJ{OM3NiuH{X<8 at 5d{r$#vuur8<iF3XaZWPmoK#
z`I!5ciTCk7?dg4-j6C}|{bk}vF?mxl+1dA;<8pkLkE|#^=>E63Yh3G9p~QH_trvuW
z@&%AHUto4 at fUy4-Na<R|Rp{C<vf<)^eY{nPwki at n*k%o>SSjr4FzhW%vd(JhLwbFO
z)q;brcS2=}77j7s-;J3T9)Az5EEr$pPao4`?{RL&wnQZTA6W at xQ+LS2C6JF7Aq%%c
z9xZ{qyA<-4+K-n&UUJ$AY~rHU9q at Ds;Ep2T&07G^mH^HIKz%CeuUjLqY_|P>ti1`G
z6jhcloROK45t&()8M#yzVi%NcS%sJ`V=wm1^i115-KFAmSNCW;%zH0$GBWL)_~vzg
zGxHq${l0JB?|mgZ2q+-9YZVBHYzppz0xl>ZR%B9Dh#(^S4vM={-}#>#5gAzv%(wi0
zRT+0Vaqc<yo_p`PH|{+rQCvuR`|tqzJlhMVltp%mq}?h~_G(s&7fK&e_Sq at y01YW`
zC9D*`HbSIqvQxOf;p9?NfVcVss(kT(^z{YqI at h=CTwnLOzP at vPm-qGkU0)xiqVqoE
z;TGG47F*6O_77liIjNISZ#s?THiyfZ!^18P$GIUp`a>RdLEenIXm!^`N2M+-9u`#U
z!sfxtJa~zR*Zcas|I*j at U|-+s!knW&5O5zV6_$`8f-`XWn94MZYgG&h0wa4*y`#r<
zA>g<oK88qlz#RZqs`LWZTV-oW$pS13>1p!i{R>J9EC~`KP8$0%zg-HDvXoBZTRJS-
zlfXaG`aJKyjQ3Vs06Ff51(56<8lLID$92ae%Xd6zj;rCj8#KqwV!ND_i1{+eshBTk
z$pdD~S+ejNhZ%JiW>id at voLKo_u#FgG28^H9O}>Vp?<3 at 1dJJ?tQj(9(;%l}Hk~04
zm`i8aWzl>)L#Fu_lj;nstQlO^47ubwo(6M+yor4kjgfmWe(e$C*B&0f at TtdB8?}t$
zrdP)+_lsZj2dE1F5=Nm+8d}%HuOt#lTzepX%(;+0A<8AnqA}QPrQx^uifT2(OM~H9
z1{|U{f2+7#w?tV3alGu8NUKq4^$!ul9Wp;Il!BkPhrCYNOn+k|4fc)7n_&@+cj*%D
zYmjH6E&3VUZ(2urHMPHlZx%UIQpc1?kA76nJ|*WqR*k3R>>@c=QjJA&_DT6RkMX3O
zeFV=(<m^&Bm&#o?d2)}+UHUfcF1_lP2pM~=#s!PlsQPPa|F&`z`w=<um*|%Ek!zTL
z&1_K3a`Bx+>jqWo(qC739ymlA#Urvw<qYuqw%#dYDazQ;zl^1Wm9fJrV at JO-mQoo@
z2bQtXDWd~ryzcjTYid_W95)jSV0N8e?2w6bJ{#~T&Hmd|%FMm07SC!)9Gj);d`cek
zl#J at sekl?b$zv9Af(5!;OJdF~(bO)tmQ*RX7ilzk^PF3iybH;d@=)P}eKc6$+IfG2
zn-(71IxWKZBJ`WgTokTA7kGiI?LAf~-oh4k?Qp({@SFLvmvYQfTNlmr;s6qE;4#QB
z0fLirU- at H|6H4$~4FL`RfCO~&`2_T4`WqW<aD?<hoKkp)$sJruH#5yaVucN*5*J(i
zeyKL{CxSL1h^Cy~t)ve|3|eCBQ8MoZbL(R1HSyMNO=^8FDCsl~I-hI>4iHYEF8z}z
z?*CHj%n6Q}6Xezr^$Xdb6NK!4DK(4hz+0(D)<(nu<9CVP+6c}<_@{WS-SRGRuGzAP
zo7<8oZcXqm0fO%)ZUiW95xUU4M at yI5NR)5AZgzc9=yIi-u4{#+>)nzoT=vWU+Q?)G
z>1vs8;H;L#4V=|7rI60u<>y^#ERA0j2M2rkI*z!5!#9ceE{?c>!}p1D+np0K+vVc=
z1Uok~p`n*M0d87b&fDeIZ3z$0Wqer&CS|C}Y9r`F&!P`?Gdr5&&#}w=&1$ww)-y0;
z5oh!|2wnw(9bDZ5r1^aZYCWKKGB$jWSWi84J>=>GPQtN3W=4FB+b%D|K2=lSjn2oi
zT_oJKk<*f}=_nj=WM7rd;(OF|vhk{%eO5%a%Eq&D<~iAHdrp?J?cPSC-J5&J7r%q*
zyw@*o0~EUwMlTNCH`<;Xd;OMA=NbVfPR-l!&~1xmqLJ6_Tf7Jx^!R5pae1j&veKt{
z5jN=Y&!q%zA~fpX$(dK=wpU~iUm*~_BR0iyugTa?Fk8zBk97<ow>?qpPBbs$gL6HJ
z+zaw$yTWZfd_s1&KR|Uj6W>37bGPitJ}p<=RvAyr*|J=5P-T?m+|#msh_o!T at 5Rg-
zITNOm*J>Dj*2q%sWf|v9sS-Igw??)P<78i!n~j%ceAy)++%Iwgv5xYx+(H1jhw1lI
zgZvjvp<TaOD0{3+cLPKc*Lg?)d!dCLR66)jG0n4c_zTD!ZwXQfCu5KLknpHaBs|K7
zVz|v?VnACayN0 at tXw0vTT*s%C-uFr3xF*QGyz;ROp>^Do_-sn%H6LZPy~aLP_A+LC
z at c%s)E at oG97M8JFyt<j7)vQ-9B{1phI}*?z^!F1baaT~^nJ9^Sh582+>f+F at L}sr9
zk9x~|I9^U_2&qoX{iI63ZJNJwRUWovDp%z>)+J(H9Lu~XTlWFplf5Mp{R3V}-<`l`
znU9&^JG-tabtMbz|H>pGG)dsB1M+<Q2Iu5=Cah9I;zEA$gM?L3hzl}{yO2Os(kz at 1
zbehE-2`D`7^1I9;6>S}r+voQNY9o`RDvPSAg53417bMS}-Dd2cgq_n3abXy_%DAaz
ze^jp6AC+D9N5 at wThq4{e at dFKssxCvK?6Ph at PcPp`k2piC%x;-4P<G4KS*?wHR!jdd
z0c$jVKT*C`T;co8<8r at Qk)^iRHRu+^#mM$+iG?zs(CoxFBMKkj at Bt1V=I~(-AL8&}
zqwz0U^eY>X)D48gR-|r$(LG at 1?<v+8&F)XO%XZEI1)tYpK!>N20Q9JC-1%kkZzR<d
zV+iZrulh1`gI#0h1|{QFpV`&6hfR<j=1z*kvpDp&!`lcWLFm#W#Rv3}6mA_U<vvR2
zA0=+c>`jc>oA9*nO>~=WAEU$WOEl~I6Et|of8v~k+i0DH%XZ6|9=X&!rbqS~RQL4v
zUyBD4xi`h=Ry>%XB%IsHev~kcj}lg~HI-sb6zcID@%w9QBdgfRp)hAi{~`LX$(gb+
z4u at V^2((~#%hV4g_%7LDKBskreoOk%1c8UOML5H3%K32dSfY3|aYvyNJDgw{sYHv%
z6ZQ$XLMR^~@TR^5yfXxw`j%PWppcpmuHa8$;X4Xyb3xH=qV?!svgLe2S!)H{$Z7-z
zad0e at uc>~WI^o7}KAe~9Zt3gGE4aG>qWFMQvt at 3c;#3WkHZu-)D)tWU^Rn=y`jXuC
zl8jOCD9 at c2({%bg4cpJ-+Ez1ZWbh`nS+=}M9ixFGk~k+-Y`Xh|N%!mi<b_4m`!t^T
zB9I2>J#8yfA#zr;*>h8FJwc+uFXO;O at le9D$eSDQwGyae+pmM6Xe-`+9ZJC&1)O+8
z2{*HC_?xBXwiABI$`}p#z1+zvI)}G-3raAHFYtWUVRbx5DeuPEM`+anjSP{#S at txj
zUOt)mJk3*FBdnuJW4fg65+9H_nece8^PEa}B%kNF-zV2bZst*~;7?24g6VO*G`T_u
zQyE-Qu9 at zNmpjsCyaT7R6CLRihmIyXIwp1VlI1<#jX1%5^B!2~rk>3ACB?`fwkG*_
z{0Me4upQ^))8EG0PA4QMT8<-{-A?)u!S;XglByS*Jn*CBdbOG3)e8^tL4gQ6Nz6tP
zoh%8x*RaLFKS(9(5X+4)cjL<pN6TSv8TVrO2uv9 at T<~)h-_W4?d2`!>%FU7aoK2U^
zmIS+GiEl8vAn+x?!6Uix&`XVYBQvW~D)BSR=e at x@Y*ZRemHXF!=N3CdEhc+Dp%$Zd
zW0Akqve;%F|FlJQRdx3`?Wchyvd=3#_>x`}pDMhxnyf4F<;UR|iH1wXE#7fG+SNoT
zln_%A1|dkZx8t|tm;%KqoO=`C3z}|UC>$?aj+|>PFQpW<Pc+!>VC^i5VmqmakHVuw
z($H+0HhTxqG|fA%*P&^%*P>~&*NzLCHhU=ynx+YwdR?xaMZsl6=UE3RY_GF+R!Pv*
z%QT at xXhF*?_cvuqSvH at 0ZndBHy;6y<(p45dXISj(X`%3GB6Ai~#+b7SDZL}!_9<(z
zpJ43?`#71;F0l4|P{#jQt)a34T at HowQ(j_V@$e}vJU_+4^DHH4TBIvY%c9Q{T}>YS
z3rr}V`Bh3zrKk9sZcjf*6_viv+njzZe&vYY<8##Ke$A`JeuD9^AIR(eOdvfqko)uW
zn^Jn8oSqf9{;WTJci{TZ{J-~)2}rj|jNl7 at z#G*@G6MURkAi^v-2Z#8fa43`1Q&_^
zJyE<{7EsG&Kz$*gjNQCHvo_ZLWg_!cLIk>WJCyl4F}hm>i(e<qpL;G>rLOeec<z1K
z@}Kn;)p;Ze_W|OCZz?Z*lQ46;<)2G<$GX1!HR%G8=x}O*teM*?r$3GtzfFwEdfT%-
zrM6u`fP6!}D-y*umR)jgr`)!Sud#gV_xU5yn`{p-Qjb;KcNU?=?-F9uzdE^Dr_j{+
z=w1uzT%rsfpxA#$%fd($)|QGpur5634-je1B96tDc at ev#)OW~TxtqGEDM}{nt6Ezp
zeUPQvzv{Z?51tE)(sKSE8*6aMQ!nJHU6v%DUo6k>l0A~2ub+&UiQB-fws}<^B%#^v
zw=`QZUSj$52Z_&BBS`=tqou7c0lTW+VtcX?_aYF!{w`T>Pu}41-j(!tQ=aijk5uQG
zK*jsz0NXdCawp2flTWjG@{Nr*7$1VnNiH%c6OiA3B?Ns!vMaqy)+Z*rnnL;{iX4gS
zlQ}Ylf2Z>AG%D3IWeAq$*It07`L#o{G<gt~rdG2wtv^eN24fFcn(kuhZe~g8x^kpG
z9mLKUg4m-Ms{f<sssFnNA$Ddpv9tOUn`|&X0<rhFh`rYlli5R%dF(=D9y<@2_YOkl
zoN6-X_9wHh!PpBj?{kqkkLxtrl|B&D?<UbW9 at l4}Zs!j{^oa`*ed0Vs&l`m3`>Tn5
zpg+;62IFH8{h*8Jhh&+EzRTZr<p_Odva3a(mF&8*QNM?NFVXKME)FUBY>IqepF^T8
z>2s4^&H8<m{#{g`hw%I)`o;Z}@>yJefFMU)c`5xj-R9RHq%2i`h|(_8AEw`C{Siuu
z>5o#lMSm>Wb=lXF{x}NlU?iRVyCB(hbx2<b+)r?CT14PY`eH7A34=T-N?S^ii2hWv
zEB91LUj{tODaEU=pp at 4_`bvgfMZdS}PxIT)(0gBa_0{y4oY2=0-ckCq6q%CHpQFg-
z`t$t$3ltu$zX*gcF{v*zrdJ5^prWtk$U34jcy;LN at YOZM>8o5ruhH)n`g#JJmC!c`
z3D`(*wfgJy&ZYVrg5x(ut-eK%`x5#luIaZK={rp2X3Drfp>IL?TTu<~;%6JZeAcJG
zCs^-dc$3L3(QiO66P~obozuGs=+T7ULyyN3dN1W%sqdg1pZ<OlU4Ew^<O8BD(&V|#
ztM7uGK0Jh+Zn%(~Za9yeJ~W7&K2j~GkM at _-`UYbk<n%F at oIcK-D*`dyEo$~d(A+Tu
z&5IHjpm|YZXqq1%gyzm_niuq^d02z7A2cs?(fkC{tnz at c2h=Vag4)FwqIU6lsC{A(
zY8O{iyQDw07d03MK<$$*YM07BqV})4(n}KhM<gu6^t~i3SLq*9Z!$yrK2huYA)=#6
zWDYRMLH<3&zlXu%Q$w)$s(b+!UzLYuap at o|E~{p7d4Cp%Hy8)O;tCgwE4e{#?n?Ja
z`VsCsM|p5MM!#3<$BEH$NI$_DC+Rn+pW^OxntuKI8BYI%`b<>+lvB=v;Z;M;oEMtr
zkDh0mUpWZFPggViOn-(iZZHmk;ngmN*T at aB&%eNr^DF_JFcCW8XUV)jy)==2D)Dpg
z<*I*R-m*k``A~T)66uvg<*iDjpB^gj*>HNYG(_GriS+8B-dmGMKRZ<3bBXl5{vq<7
zPo!TM>b(~e=_y0e@=_xG@=))+l1Q%|DsNpP{pwJ8uO-s!hst{?oSr0TNq-SbPmHBc
z#L^GP(|0G*r{n1(vGk-^dUhiHSuDLFk^VZC{y3K26HCuaq`!=%&&1Nl2sn{G8%rOG
zrT53u3liy*vGl=M`m0!aV<J5<k$ydKTZ84qB`UncmCD7>lWkul9TzQ!#Q~#g`FgIu
ze0{IMI1KrEo-%y?8d_d`7R~Jn>7QXq_=2VT<aUSjFR34W7S+E(?|5;D-my=)K=0V6
z4Bb0k7^HW+R89TM{i&zr#}QEfimP|5<q at w1bIR9HT=Z|~_nIsJj7GO_Idm<BzT-Lh
z9GF=*1T&j1G<<J5&+xr=5N2MjX6Cj2%#3I-j)Ix>E at n1x3;c{Hn?4$=-%jZ5br_}Y
zs_VM)2m1IrFgT$OquRtejB1lOcQXG@;oqrs_{={9lkZ%J$#>4f<c2|*e7%~<H~KR<
zvcWh8Cf{^1`4%%7Cv|8V^D~_}xf^tE8iMZ47ovOfdFXy?5W3&4ru&`#bT>8_$3gdI
z7u{Q2n!pTDyLAX^w_J$YE$5+j%OKRgTTSh@{?uO5V4MK8 at 42Y$vKKO>XwIx-Wpx&a
zHisa3>xGEkdLE*?1|hmsO?0_G(cf<{PJ-y|E~2|#ReTSq?HPjFcP~WkyXT>{dk|`S
ztEt`5pV~_sj8mZYeHXPmUDVzSYCjl)+HDu2cH4QV-8l%gyQ-<(-JjZ~2IDk;Xm(M%
zhpC+?b*0}+=(9;8%!EFNyWU*thCkHr<IXsb2a)-8UAaRc{r)<v;vT4j&h#LIK1A<r
zPv{SG<PnN=C-g__XpQq&9aedd*HN$T5HOvDV_!&Lz at Q5``w0#&LREbv%YJ`gsmm9S
z1P`rFm6^e+Dl-ODnHh9d8GjBD)A8auf$5Jv+$VKsWu!5ZXLPT=xUQ`FY#`DUEYGbz
zQVgtMbpz}X4d4?Eu%yo8ldNXgTipyF_iu*F8jLe&hJCJP*l!CBt-YT_O&nmM`MUu^
z^N&>(aM6GY_{X6|X8#}}bFiA$L;Y!OZZJLpt%qH-9<eu=exxr2sYi#9 at Aoex-|wGC
zzK;w-?6GQMkM}3GrNQ_V#GY^wdy*A_-$BBjVmVt at hpmC-^!wv0uOTI11qtMlkiL>0
zCqnuv7WAh@<QaZpHUF-mq+=odS&lphwoeVwLchE~3;l9vrcVyS^yzA*&-7<{RD*FA
zOn>5H`crP9zviuw=j*V4 at dEu`r at zRZ`6W(ynSWm)eq?=Z9d>Zm)nUQ(DyO^#4$ltJ
zuzN4muzSzbu%8aX<7d at 8e%_zQ%NvZ(z~dJ#9=~*U4!;_L%#SZb=EvtD^UFcV{JNUV
zZ~Buty21DyWPa-+^E+;eG^A!d*Zu|?2PJ)@n0sGmae9M)-{jx7Q1R!6Qmrq<(Z2I=
z^xYsF^;L7!9_Yu>6%EE0;OMSEg`@ESyW%GVhS=G^5SjbWL+1FvKr$x=s>qzwpUiZF
z at g>Nd>>_hY!0H3X<NBsLR(RgVJoFA%^JZ>~Ep=D`Y~_ at 9`F9&j|9kw~g{GJ~1dj(U
z#N&bU at Hk}<9;a3FIK4lQS2h at 5fycXDJkDSquV+=m<oUS7<5#(k+1}1c-Td1_<JYN>
z-pe!Y4o-TX!#ly{%ptfubD_1|ne(jWW(>mRtZFXr>Cfd=4aV1O!pp_w>_BDn{R6?-
zE)YFu2%-;OsA&$Kr)g#nLiF5fqVMZZ^wkZ<Hz0bRi|F}G^hK!W-CWxr^6wu0{RrgW
zKLq)QE=2yJ^N>G(5b__WCjY_y<X_WZd<*g)3fQZE`#>^wjst$#FJHsQo#=fWIUiqO
zL&?FszdV8xOJ=FKx6asGcdg$SJKWdD{t7*wM*=>-UmnMfFT2HI^;~;^t>(7}Zp_^k
zXiUJKa(jS+x$)lCkLx6ZA_VdS1}W|%m95*v0gcMx_K5Joy0?zr(D&EzA(7*KeK0sq
zn11gO7+~TC)i2}Ic6*?aQnBT1C#8=ha#Or;3G}#K6`2EdqAvcd!T1sOo*A}ZRdfct
zUO9kotmaK@>4kvg01zIv5iSHmf07U$WQ0GWzp>XgG#DV at 2}U}?ec=1^X!=;h_&l2Z
zBAPxCF}^@Civs?D9H<i(@^A8W<^9I=Kv!NirUJ=gs#Y0V2hP^8e>qVzKjsafK)HCR
zu6Vc(2CqyrEwMq(v@{-epVP+^<2xpGn>N&uI{TQ-8^Yq-l0bm?!GQxccTUb7t;-#&
z%S{gu{1_GAl%I5%JI>67>2K^0h&fz^Sn87frvg6J=YQ5K?v)1`+ixi-rS_4%CAdxE
z8=%4p6q~9nE#pt!Y%MeIFYb|qnFN?68QH6`xz&-qdA3}G(@WRo{no9`GJ94UZ=Db%
zh+nO-Z|7%zMNq$zieLJK>vi_N6nm_%FE=Al{3<H$;<GIRjyGBtCG-BqW%2)DSQIrf
zFSm}AKr?&54cMi`$5N(M!Z*J5*yuulZ+ccr&D}Dk{g%-M1$Kt02*TtiOgfbu$Saho
zpQsbpfU2?@DVb_-S#@_^&N2%3&nGPz{b7SK1ER2Eu>QI-;HCa5oP2ee#=U{Ak})d)
zA(|cNDjWCU#Z?Z<Qx?h}H5fCI^E9Juaf|5J(exKy<LhYl+i3c1#P~Lv{U)0JBw~ES
zF2$;8UF{$~Z6W?~gE0q)*O1cS<KuHL1Z>A;^8$@yuQTQ%`^A9m*KCnudp(;JX&n0#
z<F6p|${>s`QT)^u{@8Vmb-%1hTYOoc^kk`nesMO(@<3x>KWkD4&1QQa$R9LQE;nh5
z^8O}u(bBxU6kR~^QK9eB`gD|aDX!GyNwV!-3e;TV at ig6D>fnP+4nYgX^*W_5paM-h
zB;$%-sS3CPY6F4 at dX_s&3p&P8KcH~l&k@)QK};4g7%M4T^fT8C%Q4HSi4z^b)>6e6
z^!amL*PNG*lAVdm#dfYz5>K_94=kYILPnieM3_s+s~kZ=PbpRMvP`k%<%}gSf8Jp1
zf<P=EtjSj>{*ceVpU0I{A(;88SzI1xD}6m?Zupe;;k~8eCv|M^d%k0H7dB~^u|1}#
z@#4BT=N3P$!!b8Ak5Jp$I;m8AjdNuCJ=uCMRC%u;o2{SKv72Qcc8T at ena~>86N1Cz
zB(B!orRDvlme#v89~%lk6DqZy2}#B06hR(N<7#7tA8 at t!c^!^*2lH~dbwk{X0`R_E
zYPQ~&^O$0-Jbypj`CxHlTrhzUnAoW1)w}{nq^4PXF at ckBcslqonC9hnpZ;3B8o=)c
z at Dso%7>8CW{#u{^ZL7A!_^Dxz9S1%*T4%HPX{g;NY)~<IrS_kad_zkh2pUI4Eg+Gq
zmT<%l^z~5)wL;Ql*Q>(y$_JLUt58h}F(;}iY~qMA(MjmL^I?nm5{H=iAk~&yx4Eyc
zL_&eK48{MA*a^)`&#g^fjZiKnOkt$*q1KcHcKF)aU7DHsDJA_>DvQeP=KJiVXuTNA
zhdP8ZR;bC>Ko!Z?RMAo6&{1R2Q9{LPu(9=G!VSun5EPk4k7Io1Kh<k8ojoPYI3=dC
zfEyDjVe2_nVj6q3F-U}*HN)`LPfJ8639J5gz$D6rY>HGC4Sj9khJH{Y@<|=C at SR9-
zR<aoDMKAiIPQbH$P)FQp8gz at lzl_UJ<-9*L+=L+pOD at ZKxhg@XUWIb=G76+ArMk;M
z<8=8ituFr;4aRN&u2!HPRXMMmpr!Bi8x!D>c#SeZEBcVNqCI%`S;baeuBfOk9|m%J
z0%NX#>hhdot1e$vRF}Ub)#VC&^-}D)X_GVgbk{VF{i%V1-)6FY;U;U6mhOufleFwq
zEj=k}Ox3bewDg3iF-6Nx*3x%HjmcVeqL%(HVocPs)3o%Is4)$w-ckIr9EiGk=tQxb
z6`80{L9q%{$nTWK91q}d<Q66##vH${5dT+1{Bf|pl}E~?o4&iX-+T1CQR2G_>16(E
zaJcuII(8vXIp5Ub_uD$8mCE{e6!^9-GgB+I&eWu4isNH~;w4cX%i22)TmKHd?Pt`s
zxi8TFh1ZvJb$3EnM<6FnvEj57JkHa|`dwZ7&uBy~>65~F|LlK<76sSgFt~}25{i##
z+s5}OXt<a!E?AYIva$(nsB$U3x`q;YP&U)260Lo8j%ymwf2Z&??B;+9z7u!T;Gi5J
z;|l at 4bq^C}BPNZ8&G6RtlvEOr<X>aVD^ZW=Xgw2?*nVY{XO2?3-IXTv!_qS0%K4i*
zX0Y6LS4z4zAjfFTRRby(QC*5p_W5t18Yh%^`;H!y5OJutR2I4d&MucR7vBML`jR!`
zI5XcTyn`m(CL*czlNhc}nu^cs^OH#C?$%7JaZ1%)s_b;B at hQ=z{<^_90omBD`1;H4
zecEjv{XQ-GFl6LmExQ=c#aebg(&ua01scw2Y1z42=9Jnz=9DVwb0JCH+zsHOceaM3
z&e_>o?)6w}x8~6)G+QH5dlaHnh8Qo<Mt2t%XtR6F65&$4D&KGHpFOuKdxrwW^?FF$
z&uJ9mTNHQnl;++coXb!`xi}$JoS16=IcD%}s+nZ9zHM#TQ{DjgPQ!MvWWBG*wD5%2
z&&8TauT1JKH`*@2%WRpLM*UJ5S2cErTXNk>@eQqQQVJK)cPg?hhu-ws2l^Y^uliE}
zkL&-Wh>ISo`;>p~VT~8yREG80KuU(~uM6p0I{qZSLGWjU*2yUtoAguIFPu{$l)H+3
z6wm_yDnwhal0=Dr#J}_lNdWoTdy#cZWJ*eq at kbT?nTX)qy&?^%c!MYc$r__31lRM#
zN2OfPrCcuwhW at Bvrot1L^=)`pxe>Ep^(}=4)o)QK6{n`sXR-g_?`WNtk_5px-orj!
z at w5nUyiuAieJ9=J#f1ZPddlPXdG1bml<Pe+QXcs#&&-r3aFu6P3YSLiNqKyJ&%G&+
z*YBB~@~A$~2Z}G`mnZW~DPio9goQ-<SL`cIxUW#A|0Jy(&DPan4<JicfF>{2C8*B}
zU5!<*(IiN$T(DVbKj~l-Qly^->0y}!h8Cf~_Zcfwfx2zNI`A&V at Ab<##{B^G!sfOI
zG;DF~cBi)3sUKFswpgiqs$lKZkCZ^rFQ4!UGszgSaBn7%o6piOQnX7U{_{yQg#6D*
zneanp#{tbZpk!FQsp}@KDu6Fs>4}P&{yNd*Nq<8>zxP>K#jU7Pd=iZsFszghK<S#B
znq45xF|X=#Q>v;e`9Sf$lw&>!9_4VQR``=^*8f%e8~erkQsYM3uinS6R=qVku2uZd
z{g2$704(Ss*KE<}rL?mk;>Ud7Yc3U+NLA>WTSZSb1uaCu?fe#qO#DNIn7N||(h?H4
z&QJjL{Ipe?UA0MeeBX~ht1kDWF2#$EO(d?C_+N7UyISb`{aYw%wUF?q=W3uH9-{Ut
zej1|w9;-+*EhTQI at rZ_wE5%ONI2y|WtAyb}lY*VC^HWm#7QV?$GlP`^Q`+<@MB!nr
zWa<-A8172+#3x6ZTIJAnuB}DNWOr4IHSWa|Qa3{P?YgFfZr;niJT2YWpwbX_qZDtr
z1ie<epL(a?vrh?--g3VWeQ|V8qgcjJmyC!mX%<)3<dikS))i)t2+!ZS(bW7G3q3*3
zjV^AES*F9S_&c#>xB;0NZMKe<2ydzQA<Wh_vYpzMHHfx8kiuNgE_v*<W#erZ8-xW{
zzuj2F#kXUYtw;<Gpp4qw1^#v{xdD~DO@;3g-1==s1l~*5dRzErStVt+1jmtVH4HY~
zD;Y1qn+P at ZgQ?;}DS;Jl!Zw&22)fQDT8p7HUj3CD6F(!7FYb|YktyvF(v2DuuuxCy
zGZ?ELjo~fY0Q1w$!Zdz!nK0$%Xk}RHGH(EFK$5 at nx6So=*@MzN%>;98^E6yq*{{f&
zUq0ur3?lYWNvc(l{zDi)!}zJePc42Tm}aAyg(N#vH?0dbZ~OJVWp2fC?(OgzyBew9
zt|(5>mSLL8E!EQZ1k&dcd|j0m;HPWzL3Z6xDn6WQNw%>vD3gvA5-(Yc=}<0RT<eOB
zDwbmISlJZ|7td%sM$n|&djrOI?EL+o*!e>QCU74~VXYXp{SAbzn`*aF%~_*=4JT6X
zq-7b;0^Ccl6r(>+i$Po%#pqv?S1|h91#VPm014E6NE3kQuv_~2%0ga*aZzd%M?UV1
zKT#>Omdlt5<(B~RwT!;?ajyhoBjVzxAu5QggJp)vxdG%vm=3fFLx?Kki;DSZ at ksbi
z7+<3hQGzTA?GCp+n)2qOE&7pgJ_;>}X-7$QD=qSC5&08wVCpZb<y>QNlLobCSq-i`
zWgpSXI{mjk9OlKh>Kf245*k<Lbf8SrAUGLwI^bou6{1 at 9pjsXYvn9IbwnxIyLl2PZ
z>zBVzQ`|jT+dZ16WR`LJFtbQ&Tckl~^M2D3*@KFo#*}@+Xf`Ij2nLcKrM;!c()@bM
zbBP%3GC_#wa1&D{9$68$Mpj%G_HQV#4b@@gzP^mF)asLpkENQEjaY<lRJgvZ<i}H}
zGo;dN-GR^xie)qwL1zrX)X49m-*P|2CXZa{xq(K^Ru-RFSg?av!Dy+tMX~DTc$5!S
zkP6Qq6LNDkvq=&|^kKzIiD8lW&l6IY<6wp2rD>s=y>P-A>0E7mFFtJq%cT+HyPI#k
z*5{3#p_PVD^+G8*O3MH_;4A}<DU}`g<E(3I_Ac-l>;iv+6~PH!OI}88)S0qxdYuZ4
z{TZz$PX;mzto6h74aR9epH%Emy{Da(@uz{tu|GF%#8CvwmH9r~1FD at nGu$}#7smJT
znMuXhk*c-FGA+F*YAn;TPig6eQR68syFyDZjT$So>~bx=Bx)?zva7W8im0(l%dXVY
z%c90g^p1yAe<+|_>0UR_R<QP;L%#vzUiwvxg{iK*YCJ)|L1PhW_+d5V4Jf~WyI!TT
zs-CUn<|w&)mE6Kq?uk at xQEJRACD=Yo={CD)deJ{r=(#whFHX^ONlIUmVs{GQPrisy
zJ(;pr;6J9nv44ZBZ?hC!bWkgm|Cm~}JbPTVmuE|@>iuPdF&8g&sDpiFQb`5^L7Q28
zXHv0k at C*I~m$|RP%b5EVU;BLuiArx*^*1 at Q)Kw}zmC~O|xxUGPk%g+gm9Q-3Y$g1P
zn79x0JfYefAy2CICjBF!#<8u&JY+9*vR`!CdwHsH><z{+7yuiLnU__+#6v>vX$?lm
zvrlW8T9_(&Ph(R>wUYj{MtMZqD-P&t0lHetv;uTul0jP~eYHk;1iDs at MCHJxs3N0N
z=@M2a**gpyV5XtHhQ{B>O|>}Kt6H5T_mo1fzN+FI9=;1crI^N3VCyy2?~?=2%%4=u
zmQw4JijM%-yHlI()D5bv%7OW`Kr~?zIW2X!z_75ES)}BS$8(3{xzq91MT#%?t<?HZ
z!rNYl!DHEcY}K=ep<JiZUWf5+0u6YX36b0yQW9HN&_ZfLMB>B}=G}ZCE$I(MG{p+e
ziR1%a`pOiQ0bfekRwTU$+arXq;!uU^qIFeDx>J8T#h<(aEfmTJa*GvxG0keZg^Ioq
z&jpIU0M8|gzC<bET^NC&@&Y1+;+j0I&(MnXdj*BJ{qit-L{rojZ|mxmq;K)s3DZQv
zG)kcQ*{ISC5coNal_~5Kd8tyIpD>q+T^hvhPvjm*l*+9SCcMIh`cmb_>{2CjB}x03
zD}BaN1t}iS>)cSVkCHteH;c#P#_ at P|E=`VeqsH85_86rdiyOz{*~1h%95)Wfv!^L^
zI&PefXTPJ+cX8vpc=lb{gfXLc<t+5UZK|<N%^sxOgK^_vJo`C?K93up$FpBk=<B%g
zbv%2LLMP+K$$0iGh0ex}vvBkGhH7shuHlaJ7xXvwM(Q}1;u!N_qW_j7&o2pieo4#R
z0C}D&<oO0ke at UY};&l at b7_j#Bf>xYfLn&{om>oi#V(QatuzBbPnhBuIRX{TVw8afH
z2|!z`fF=RxT{qA)0Bx%Rng*cv+(1(R)KvvE1wf`7Xfl9GRX~#gRCWX14WR8+Kz9SE
z+YK}WKs{AJGXT`<2ATz+9aTWH0QA0!wN<T1DwW$N)?f_X*)R1TPW?c&Ct*r$n_Yvk
zZI>Dd_~n=liJ_%+Y7I7#ce|lm at 2$aw^bgglId~6?3HG6%bx*H1k)SNYSo4uO;0VAg
zTKZnecty*;tfilg8ZTqQ+p7-P>|V(e-U=Z3SjA>HW~1e<iEX8lTcM0uu7J{g&M^O6
zWtbm>YyWtEzdB%}eXW+BA{lE at _JM(AKh0&Y!n+4md!s#FDf($8w at Mk4M#+bqe)4>!
z<eRDFG<2SU1+UZ6Pe{f(6nsSW26*4DE4NPjh17l%d_HZiDNc^*t6>&Me^z0uzR%FZ
z)Ssi at lD>w1p$Vz}pd4s%)4ZB#Uc(B)v#cOIqd-A;4qO~lgTzH6QF&8^i`7bQjgos-
z$vvawo>Ru$1cwyI9d=%*u=BUX&P~vzocVBe(4G%X(tmz!wBU47(9WIj<i1F=<!_9O
zaQG((Q5O2b13 at 2AL&HZ`dRj95LCsCjkRJ?U{EK#7lb)VT-<|xuWPL+=2*~^?`}9ti
zg8#8?MACcU?BO7^t||e0O-sKVHD1%Q>$UXSsIeY({YbE;CZJp-Dy;wPc~ck)O|V7^
zC|3~CC6|ybPUV)QavxT-r`$`a+*)-^Nr69s$AY$+^m3J&^joM&C6M>HQz;9BwuZ4c
z*f{ogMwu0mAiib%$W8s5+GTG`#+zDpqt<l0u~Exzpw+msLCe0bHElCq*RpSDO^+CF
zfT=~nD!prQ(AK+NvGlILYcRS|%#z at MUbsn1zZo?)Y1y~5^y^XME#P}HIN)<l59>ie
ze6E2|G*)V+M;X(Ik2OyPZHZZ1k(gVE|3-Z84h}L=EaxVRP~uMIHjlAW5#+B3`bYr&
zk_}Yl-dAE*(G>E&(rmo1Py$S{2Qyo1ayu2XxGvSYwMJ at tx5l$kGAX6<k!2-IR#G^^
zWDl1vtFNp2XFlu7eA*VX%&YE!>{epr5`4vDMyk$<Y}V3SqQ+(|`?i+e6gA$~vhQf=
zccR8SsLIs?tMWrs<r=3df9Lvcr;Pa>s`6Q<DqpKq<?o4t-{B4$i%Oa(*n%$>TeNHm
z&ytokwM at g929IuP*=<^jzD>)P=}`t5&j+EULmAwLdG`hCV?IBW!EH2qYy-rL4n!Fc
zFF6opf?ymkS4-I|j+Cvpr0li^V-I*+8yw^a!@BCXUv=KzV7>kK4aP^Tl?DfV*6W4j
z_kxD?K|f_ex9AbNMUR%zpj*rox`ig`JsRafV|5sMAJL5*4RW-204L>Mw^^hVQ$K)Z
z-y3eAV*q-y3g{Ss-f{!&1<<A{puGTkn}I}9+u;CTs&Xgo=cLU+S@!v(;zf){tw+R%
zPevFP>1{{(e9%_+>mTv!@4Ax?and$-(#M?iUKO%~jI66FZ6BwZ)h$$VT4<xyLSq|@
z{b-?bFhFHo>~5hCw5}%4=+RA{U-*p=&`{fhRj08I(qhFppmddu!wUMqA>iqzKH!%j
z=GW#9D!Btn?y!<Oq>Q;1RnQZ(Pbj`_75@(n#<kFeSU#%8uw7dE{iv}^%kI|F&&kGa
z5U`_~oA(`V-muX9mj>eqsMtw4p>UPFeW*2Q#)rW20bvQ(I9PTCVW(M4Ub}<vL?O(!
zPViN%7ky~Ik~<1 at eoqii>@Z*)rFGX)WiVU5i(IyRKjPQ at wC1Ik_Xc6lnbv!`MQX0E
zrnp;JGV5m&{IE6&W*vuy{kQ^qlwtQdG)}@~zn at t_XP=~+#w46-JTNr2BNc2PF}8ya
zwr{}kAqU$x#PK(%<HJK^J5<58pRpZruze0}M;&aR6SmJ;i5VK(-U_zkjP3Z)u=^^o
z2N?E*Q}S0R`J_|wS5)#>DEX8FaSRZr9f)HDaSRY=9Ed5X*-wK0K)7a;B<zNbD)_Tg
zsD`Jgxid<96_x#xF9wT?ulOjTnbbc06<?kf+6E;&tj1;vS7*6%isR_a%$-*Fh+a3P
zQn+(m5Bs}d)3cc)v63)zsbK$p9KQD9h0ff4D3O+|oeN3}bC0MUa7y<Cr)}|eHhCAq
zYUR!ZyClP*xigAz4EAP9V*g+CY}@UFcJ`@TJkQcZ8m>vf<%gP^sJ1SaJh at W}9vz*O
z{TahzEE0LJm*sx_3#YE0#}>nvPINK8|9?e8eYoarA1re&_jz(Bl-Pf#syd-$PAX$g
zDjws6LTN4fL?1oUyAt{vwFumk)Su+Qy-9r|2WBVrXE-n?sXvN<+vnp6#rFA_IVVvJ
zo>1_3kV>4W#yY6PiK<=VL~z*xUqBPpX8rzJj!i@?J(r86z<pdS1?F+F6qwJ&Qs6_T
zkphyw*m|zFo~x|q!?hq|qRM1Y!Dm8Uxw-0?Ga;{DLOB*)q_e!0$~~yEgQ8OklX=Ri
zm{SU+F`1_nCi9f2rc+A#0Vb0I4>Fk)c!<fQz{5-?1$Hx;6ksy>x!!uNvYvv>Q=+!0
zV30Z4A at h`|zEg at I^E1V=G4?gh8{wM!B-<c4v2)Z5IDVWEkK?i8i5PxQ#-hK1{dMju
zI45#OY3-3nsM)*CIHN;F-k02jlnxo|5%Pyehf2M~Pe9lx2cXEtTVE^vWYzc at J@=cS
z><`zhhC78`sYw#n7D)u~guT~;J}-4wI8hVbwPkcK_13cLLuZ|67hs`gOS*1W at DYiC
zo&cQH=bAj|Q}{$mX>fl^u^bCEBf3i+fCML}34oBCusg248R7~(5Dj5-FBlu}J{)77
z;`dM4 at 1y4m=uW04$skRhe(9O})!bB-h7ycA#}sz2_N_u=obfH{?%N>zxU8UlJ*psg
znfg?fMnrs>h+renKMwXx&2cnB!rov>95U8VbF6H|&M7oBQoO5p8hF`q^Ay!iJI87B
zI1MpCb;7})FlRc!cV~P$SAMfC_7gBH;2~UZElcFSP%56dRwQyW)Jk+^BKN51OlOo>
zky`kSlKDg#^9gk(8Vb*F_sPsct7rE5Q7?P_629;t0kYqx*s^~{Nk77Ui~^5xAEUry
z+{Y;Jcv63z1ADlS-AB#7!XB$H5`(?No!POF02W~E9XAd;0yJ2!lxlv4&p at gb33IoA
zy=R=25Q*a$6keHfOnY&TS7bmOa7L|vZeC_VIb(N=CQpZ}^{sgWB!RTHW3}A!e0Dtd
zEvKPfkk4)Qt-_>O<D at kXoe&S|$cjTTt_TL<+2~J at 8h_&?qI;4$u7?`h<Rjl at k~Me=
zp~tvhbmKC~Ukz+ao>q|it&)KIzi$<qv52HH6>XwE;c4|AbrR0>=Dt%V5#G$FaGx%>
zeX3v>I>)8{UzJjik-R7H)-h!qzcp1I_x}?e_gZu;R0q=07lhA}LHs)PmP`68DiG`I
z_+i4aQ<*dveGwcxl`U1VJp>0ZhVVSX{(F)wObD?vOi<L5MT{t-qD#4%DvEBt5e|P$
z;om2D83Ph;H5XN0p{V`NZ0j9-ce^VDeTS4O82@}sWh<j_<?@(HFB*@jnfYo{U)y{>
z)i(Y=0V`Rs6Bu^1V~JH9dc-H+6Us7izTzR3MQ6O)wxxz`9EPBYW3#f7GlxIMP71;C
z?UUZ~V9P$FHX9GAup<5A;;KaMaTONpeImX*k?VBg#SJl$)GmexkrFO$O6BH=@neKp
zT%0nCOHyM-c-u$xpqx_c+bM~{nI-X3>ykKv*)Nq+af at VpsSHsa*|Xdmw at 9MDbpU#W
z<z%Q{bnPt?5?66zpRf>ZoK-T@)!bR7ZMrH^6~smn%JFJuf(nK1H3bS?lQd?6>NUoz
zl%M;D;ybC_1A-T)E+>buMEN(W%d-kie06ql7Ad(e6+YR5+`eSQ$^BBP;d3Ky0&FK|
z<JICr;U;NWd>A(ksF}m+rM@{uaac~kUfUFIcx({PQO&kFEDTe*{pR8O$3tpM|7P0R
zubFlZXr at yGn&}iX>&Q>aV+liox#AXBHK4clkn~et3DS>NIvS%^f+b2Oxn4+DZflB>
zWIBobP9}dkcgi2&`~HX?2q$$g2+6x7B-<<@8B{QE!!=}k{dq5SUavp@)iFQ%16+m;
zVU5#ozh!0!PF5Pl0vs!!U7EZ|&Auo#^%*Zp*;VnT#l|Xp;F(1|sisz}Y3~Wy?r^@w
z`sQ9I+JVK)Y$wVJ`Wz?9>ib+S5ME_|Gf(xvDZ|$aoG~o((c8u{e08{w>aM2tM=)p2
zuDWn$)EP6HZ#0FwE<05csa at u;X0bQ<c_G{7OxO8p=LhsR_P<pOv at S-g%?}N-C3Szu
z`m7=LD4qo110n41VMpdk)v};rrl{}-sagGUJ*SVhtkxDwsgn6~NkwHm6vAhgVIto)
zQ(I1z&C<`kDyrw<!4Pb(Ab4c3{O(Hrql4x5RPrAiEWfvs|M+0}J1Y4d%)mv}47 at KG
z5SDg32g9(lf?>g6`5#pB7l!ODm|fNuOs2tj1*ean;MSQgx%Xg>Xz4Ri<A|2sucZ$~
zjs05oBQ3orYJ8++4{7NWQR9%7{a8!yiy9wm*~41;RMa at EWshp<Pou_BExSic?~WRK
zwCp}DeIRP=)3V34^cPX%xRyPjrH at 3716p>kmfjmR_G;OKTKZVjIH+ZhY3a|R#xdSg
z4^{7}JH+p{h|e|{PeEdqF!9$6dUNoEmi{VgoY1l-we&Yp<D`~7rKP`%8mD-dy}E>@
zP6;1cCH!N9v5Z~0hyI`4O<Y!uc)5dkkA*nbU at QmX6@v{NE4d$Qm4Rb71`ceSy9SD<
zt4D at ss>hAh1BL<`0mM*1V*(EaYj`Not)XDiphLmJ{zHK&JQ;H8biht`QujHjl1O!i
zjc1)<<D&}>8+v8fSOJ!w3pocrLiSgi)oSC|ys-+|FNN$=La#a5t3r)q3&u0ZULP9p
zt>BE7zDqOCXxUG+^aRcLM9ZGm(tT0mGz4Np$gj$QORB#W;A7rPDn91DpyFfRi@>}w
zq)KvNBtAB(?#~Cgm(<(~YVJjK%=0RrB?#G{L-$rbB-~EiJr68zga&+-{8UTdFBzYL
znl}eh^NI>;)-g4Un3}b~^Oi%+%PwkOQFH55?7FR0Nv{Ppn;dFBu2Ay_qUL2_d3&Ig
zpViWnHREh$U)R~`#ddnNly7#Ve4i!d#RlV5Al~9M;x?z1Hc})0lkpm|-wO@$X{sw!
z^>y2{qq#RA?xm1 at mgWuBG~NJ~vIDUd5ZfJytpu?Z5Zw;MW<d0W at RjSw95oYHklsd5
zW3!rjUB%uMJ=(fr{4itIHt`bIHgT_m?M-0Y;b42y!bVTy&GTV<(uM7P2ipO3nVpR7
zR}|gnGZTM7*yw5O^HHuqPEX^2bROh0T*yCgkiP>`cQNw6<)|r69v_LB>_`9#@g`Qa
zHmO<4HQqTN1M^&E>~_l7gfc#K%Gfkm8Siiz at 2FImNkyHfjK!`p_Bds1K^Y%$8JA!L
z+oIx7WOfT-+oFmWC%9hR8}j<ZsjZSeg;vU2yw;_huA(WiAC~M}v><s4Qu48lmFqg?
z)b+q>-50V?T<mv$s5GcQZ2+eIgQ+|RSlHou&s42jOopinAwOt$sNB2Y?@-7(VUm59
z_<9#84~Ht>?vI2ByA?j_^t}UC-}~PhjK^>(?ATzP>v(nNIuY_k<-oms%>L%?QH9Vb
z9NE6EP&2AfJE{=r@^4cqJyTX&%c|#2b|y{#IIlYn2foMQ0PSS?j?o3hzCqi^o`}tS
z(B+7 at rno+V#?Px83aa)2F0{gt*tkM11-2m&DaCK+Js7x)swo~!vAp1nSWWRziuWD!
zwd2ap<$9cSwr<Pk{o<X&?stx)#`8Oo at qA@HkdM$apyg<=7_<ZdT{|AP-Q|3(b+dg?
z#DbW}xV*n|mp>oL2ShAjUFP}fTwkVF&8w}wsx+<;%Jd-IgK*d^=R+O(qdqh5&xbqo
zonDiQq?9>cT-~J<o}^EP0^gGZuLZGHqEXGpMit_t3W-sLBt`1bMk)N%k17lsRk&zW
zVfd)R#iF at -%c4oBk+}Pni%0$K*B0b*`jq9ZD^O0)vfN}TneA%pc9ohy&2+1+-3SHC
zMOvz0gAc2Bj^F}Y9j*~fhrc%@!L9DXad0<+#Bs!9xwz5&)<)M`EBR9fCAr^PDbZVD
z?7QVds62L|)yY1yI>!}iuv?iATN#Hq;{Y;h%f$u$_8$}?<>E7VMsX}Vd546v`b{2}
z)YVfXk1Gtz*Ha6QD_oQx7Qc=~j1mr|#Pet>KdkBYC^kxK#=+xJz9v76-LGI at O|<B6
zPOldNJ3N0;1<Mf&%du4cA`45cz*3vPs2`S#Ei5eU7t>3}Q&c_HWrF(R3B+J8AYTuh
z!&^5bP-Xdx5r8)_Y*pv$^TYEOBbJZy`O6xv=-K|<a+NPRg_(gUwFe1sO+MlR+E4{l
zn~zZScW?)!(od#3^Xh_pfD)3FS6 at 6u3Bd(<g%T2iqNGhxf+<=}6kX!=SOY`6R`Qh7
zk0gXhX?g!0g&3q%yO;-qa=y-L7K{Vb_W9U`LTqDQzAo>t+uhffJ6>C+Vq<gj+Ja6R
z5oX1F;|lTfkRP|nkN at W?LZLT;FjtXas&45=75Wl^r>g5AH8|S at wmyL=E1#g?sZ?I;
z0Ah=qMSXo*5S8&|{Qpa3)Yz3#+dBP1mEmg3p(`V9S4NzMm^d*B7Kg5kT4v290~f4}
zBv+rPjAW%U at ZC0Koiu_z%0714rReDpPMlwlQ!y$JP(ARHT4J}7y=IfNO6+D?64tT|
zXL-v6Yt^hdm$!!r(HTbcvnoUf6u4G(5CtoU?sV`7ajoF_gw at 6t#*;q7g-q%;)5qgU
z8t<>Jz0ph`Q4nmBZfwHm)KA^;GaUFM75Kwd at Mj&J;WSUwkIDES`_DL~h6(<&!KUla
ztEcNP95v{Ds0m*>n(q6gCcF<UUpWw`vF`uc(I(%Kgf>Y};~j}|g*Hh~<FxlYTG(`#
z+VhQrd=HBM*3tC#45sPrVoh(Cnx$N0&-paH at vbtybISM#Wt?+Z{D`o81Qz=ohz|kL
z9=6r*4=weZp2mmgD{q;ryt~3Sww=H>-oduh!bVSH=lQTLbzz&}VA}<36T_hXuQ)nL
z4ej9?+M`lcnN(4OmVsS$2k8euIyvkpzaI$Y_XB$U155dx=%QvyxLWz0R#AR8d;2NB
zQ*Ep)8YxFK21>!Sur0`E+{*8NCqdo;Ow+^vsY60{hpX0*Gs3nW`-!E;{;|Q>3w$%f
z=os~Ge4lBV<d~#K{|ty`g-KTqjH3D|)euXiaov3OqKxmKWr~Ev$32W$<M=e|Jz<<d
zY$AjQ)Z0A90X2I9&l76)q-xtAFiu*U`MqJEEC*hca3qrNpb90c$1Ei}sj&D>u$1z<
z;$|)P8Si!@^0t;cCL++pposPI^}o#UQkjR@;Syg}%pGB<jlQzD+-3rs>0pEVO$QtM
z;_Qdb9Dr?!3tN{dv%mP+VPA;q*(-GXMyP^~?MYZjyRM)#wr@}iYGeBjwGgzleNyWy
zioRKVnw3Y6Xd`fQnG|0tHFw<<yr0>p=9RX6s+9N7hNkTYk##%z`os%A0-d*;t+z|X
zKfvx$ii#Uuuy=RQrg-kKqSP1k&r&uX`z at R+eR&XcMS*Syp$k@{3s%s5-XC4jLYFzL
zwjEYU#??mSw3<1iww_Tvs1#Dci<V2*4&l>P=;hRRSOM)|Wz^Eq=Y;(=a$q`Nr0+#_
z`nftoT%BQ2oudmfH(MYt3%XkLFH(ert5vZRn<>%ED^Pvu_b~KawM3x<96y9OF-~h9
zt4g3}$M~MRl~}BJPRt&sK7Cxx9arNU at S#db3oiUR&E`k5`O$2UmH?y$aDT?tYn4*A
zTPsvuy&-pN(d%xq>Rug)s93h!DO`;x>~1F)qN0V!Y9rtqF_3|?DxVzpx1Cjef{71U
z-IyEp(~5SZxR+dO=KklD_Wx;JG0vS-nU-JE+6ec%sS?aqs)P1lLqe$Tc{NG3Pb(yP
z_NlZyqUQmMt8f-dPZ$gQR>gwucAEB?ZQOEpVny5ohO9>TGVuH+Pvk*%44GGW)W`Ku
ze7xU=gD55x&L;0d(y?&TK;JBBh5(iUJip>VIlytOrAm33;7TP3X`n;j;zgfuUWtWl
z2vnK#W-JDiZ=QZH{<)oqiV`vs$!t*b;e0LCQtJj4{xM0Ni)^eVg%IqZic9$jE at IVG
za~JB*-8ACvl;AETxZC1zr}pD6=;BT#I3kjITd+f)=5VK0xC4aEUC_;4^^1SaCp!ue
zk>h4 at hl-neU~z{Ecbg82H7*vX;grCAVgEI9;PVK}QgT$GZd4&PikIAtld$Ig{;0yG
zqY6!<3YU#4G`AF5S_-3D3YYU3FuJ91MN1*wQn<3Ea21aSSC?59A$zO{>{H7^_%K2o
zWSNs$_TVuZvZwNZ1DTUq_CoZ8?BNdi=PK4Ua`8)bQURB~zoBP at o?p>3O3$z93Cj at Q
z(UWAOc#fWNdVWFAL`z|K3#~z;mNCqHtsRKWzq9bYeB6#|b|7X45(LnIY8_#YD~v>-
zu{5r5N&b7WpGdS4!GWM=jks&Mv(S={xTB-;QFrumRH)XDVPb<?=}Y;fC3#$h`4$*s
zqJ|k=oZ`hN1`2GZHPr~J>ij5PEk{IN%*vx57TJ;168X#FpEn;B5DA9ZLM!o0Ei9K&
zQ*BJ<la<n~d+Su}2>4A_(~FYn#k3&4O=^81?xPmZoT7#Om{YZqkBYB?i3|pFc{NOQ
z5EzZR4AtIn2X0AHm^pC4V8t~uKcbUQBXw7XgGvWdL<brHyL<tfFgnMLF4UEahf>go
z at Ek`Ay}#xzQ?_@$T99)v)pYwpa{*;%_N#e*rCdCkYTd8WqO-2KFdP at b%VO)JF5fU;
z+^DRKcGjdbg&JRTH}4hsm^+%z$KBB@^9gtKDwc&uAPYMxvQQMVKwXqOPyPy)1ucKI
zEelr{w@@oKQa{V5Sr%d<FJ|S at 5BKd$s2k?5WLby{hy+7SBU$*qg{6u5Y5poMA<@4C
z>eyFR$qCO-zau%h!qvV{CiB{0GLWu at i46vGWi?EEFqo^VVG at JM(ocwHv{8JJHku!=
z$k@`sW$coCqmZ$l%Aj14v5+HUrF^h6AA*dLupF^u><GzN%8{|dE*U!v8H44~6l9EF
zDHo4fGL~vCTr6aaH^x$xvHma6ciDm_k#=dmj;9i}BYzpsCgTeAd|VQnhjx~oeye-t
zyBGrq8}}W-`#Sa5d&~zANV_NIkr+&1uZp at F>0EW4fM7$Hc8oWJ85Y9Eb}aMF<>I15
zXTF9I4`akN6aZk@;URAG at cq1)4#OS!CX3c#77ryS%TB-5J->kmjd^IK$;~b*h(Ovs
z{ep)W^Kc2Z58(s^&zW`%u=V!&r*iR2YcsokoW<X;O5PI*kvEL;hL!X6`C+`_GhA#^
z=Ic7lNZe|G`c4cSVxO}ve=$Q0%cnX at 7DOpOtP{;HAh?a|`bk$xNEb at Z*X2{#<AiDR
zuv{w#Rw;ZP4K at KSyIj{{1 at qfNU{paFRZvG2g5tx)s6tKdw95CpPpdbQZqJKE((j>=
zkPa?R>x)yX$JIOI)2Z at YYFuxX7RP1-Nx`|4v6T^<O9N8zt5hZYb*e)@tU!JVg!GKV
z3L5~Uw^}$U at 8>wfev@*?zNI%0x!yd)_v>EvdV)lPS<!Rl%%`LVw0=sX;BQ$$Sf7Z&
zw)8A7EQ3({v9>^M1#Ll$)1)ql&J=Q=Kd$+mr6yYA|NPOhtJ%8L_|cFUp=FX9!g=Fi
z>`-%34_m2s;-D6k5h^yQ=>rh{&3O>I6A!yeu~SJ^VKmi+49>yf^KfurP!10D;{c;o
zsKUYF^KfurFb)n4%E7s64!DrqXIfstL2-IQbHy`A3N)S}(lRqgso^Nnc2q?gYbFW;
zn0izWcu^4)z=RcYMl7ok76E6}v=W6pC{PulCpsgEm3<Ob>kJ!K;wex|x<3XOn6e0A
z=bVHS`uu5?+Dv?lAsMeE9#UvTMB*W3qhyxquK%tNJ<sErAC7)s4m at 5{u~<FI)mzy(
z)TBa~{%h#Jmi{C3AEkc{JsjKRan_<q(;Lakb0hTwQ*?u#lCWf`T}!<sb4bOuaqA(K
zEgr?NtwsyValJTZn~$M0N=X`pGSNI?g+dXPC=(ihh!ZIkk|;E;mysQIAqxp)1;2J}
z1zVyYHp)%9(1mSuv_=KKdxHb<$>+r<SK+I1 at X3ttz##Mm&WkTlg|F7Z7hrsc2EnJC
z7oSpvFXG at +7~kwc_*Kt~Pp!fib?~W-?{jq^zTkQB1*`CB4!$7Hmuj28>&yIR%x^sH
zzrjK%i8V|eep2|UhvaF`@a~1PCW+e{AtNgL7c-zxke-+iB`;y6afCiOm`{}TDfF9<
zk1kw-sqhl at 68)gkTu2JoFb;e(Y&)R*`UD1Uk~$bZ#qftK at HGznT>zBzNmcOm4Bw{`
z{Kj}bUcHX_De0%l_~Urr)W_3%#mT|(w(+t=u{}6{yk*RVW3H^pB1;jmyMlM}2c$%k
zq)!a;SI9&@MH&&sTCfD9`r_T0L~(pDcR=OZD)yydcc!^8623D)9OZzj9-?X__fdjm
z4`<W_nYJ-)p7yrFFtor$_!*9$i}CY4F5qK#gA_%BU_+^~(je=g9ih@{liz3cqfwt4
zq(?xXhKFd8i at 3%Pa1AqXglibUGXbUOGZ@&e;o%H_r~)5#;Aa6))$gu?znI~_RULTE
zfu9b*pngvk{P!6C^8qc$D~vF=;8S>?TX0x$YH+;ec4Am at CbiON++P%tO2*V6PfIZ?
zIxFZj=CI;)t1*XF8gp2Fc>baRjX4aBd1A=MJkhT)333=3GxO^qj3Uu0TpRQ2Nc*n~
z4Y`x5nQzcPP30SCqPRcouag6tBF^qQ5Bs$|=0`>qqN57hC_ehoi2mA0Qj&D5Y~5~^
zt*0dRq^u8qrWHfQWRI&Y#&PuqYiqP}dL?r+-oIJ0wqu<rObu0S#yUB$IaIYRdmHTV
zh4?qjzcr at N0Yg6CyZoc@9>Zfup%&9_ZPAoiVTVc|&ex*qVBS>ZZSh*VaV_u7I3hlu
zR{$XkJjq|UIc&o;>u0fziqh-u7W=S`VuK|gD!cYoYN>5d4A{cXX~=HO8bLR1=W%zX
z at K_F~`_#7fdWo%4UMqRHpY!hfZ$=jq#fd>0g~O7EM++<vsYKJ{7z|LmONL!}9%9^J
zlLvxb%3$q5ELv at __5ol#<_M)%qwu64uYE+2v=>bq#b~AkS?Dzmb_m!Bm9z<*=B|5e
zDDoL2h=C?nEgBZD8YNAqA*T4WS1eyCA+NQ)txB#cMK8&GLc<%WWS^*BR5B_4)&RKi
zT%Y~X$=)Z=*El=vK!MdBmDS|ovYI^o3POYNKINO#V5Ho|fkwBQIb7Y$lvf)R+n^e3
zcYvojOCJuWh^6L*`O<7T;T_<4La;6qC7P}RM`I(BG+nj;$-8i}EsdqVzJa}@BqZ#n
zN-rr{UkVBlv__=3+3V^h5qB?%zyg at 7mqZ5il8CF9aM*^idP%8&FWF)D5^KjPLgN>T
zK^GsammHToVjQIK{Tz1pl7B-lIbrpZw$X*8=p|#Qmn3OSX7S&lmP#D6<=QS;gA0iy
zjn;0k=>x&WFxb>8u&D#VE at iNpqBB`wGY5cCB6TKSIL0V^kLXMyNNpL at u4goNSJLkm
z>7zJ(n&?n54t59}Gb(8_IL+O3b|*tT9}}G{24Rfxc^3Lv>l4C=({-`7-6V{a7U52I
zP|YW4VRI0jEXbWqOiUA~lUZMM(Y!ygnzzQ)yfBVB&DGaXq}|t?@|?c*Dm8o1-Pd;5
zea)#oS6_=&`Wj at o($_A`Ud)y at cV8Rf>Ka5hsWe+8oM;r=n*m#x-{;R?4}|>@IWSMg
zu|aHzj4ITcG{RE<>@{f!#lYY<sim>Ez%w9z6cYnt5O!iG1no=S)ay-*ot!+yl^iTv
zt`N%9&F|z-d4aO%@d51 at xO04`<E-Te?kyIR=F%o_rx@*etFeUKSQrEAEPl>}#3>x^
z!1Ci)9uHpTFB1OwFy`$p<Df$7l|7>NLlmw;1SGX$^<K7y{yVXGTBgQp@{}<el34OE
z=(h~ELW2DcEQS|915=_4TI|HY8B9>}p!#`hE|d>MqT<<^SFyat{trbtjMlNh6bp=$
z3|@^}U>pWE#}h?6>2rDHWuhhxFtqwvI1a;bup=L+sTcd4VU(8-cDjqKwO0AH*icm%
zQo;A65cIZAcd51FEeLKH=RC{K6cHvN1+%4mxN}?&0BWcbXcqB1Ae4}=5im8dm4T~V
zgNf(VAW1ff=S(~Y7td*y98Rki&ly(ojKRfoT17mkT~IuWCMk55c<ykE=d_A=P8%Se
z(_G>??SkS-WgM`@b4Rs!PIHOpw1MI|ZJ>D400M#AJwQCC4JMw`ybiS3A9TcX>LB77
zbcttBi08~f#8Y*Nrz*sAYDGL}4k4cE0P(biuEr&FVHVT=;%N(V*d at p{w)D}s>UYLf
zA$_}T>9a(5rBrqxScG at mA`J0-C=5S`|AeDe_*QFgHD!J~=C_{q-}aVE>C<ZK|B`6Q
zM!~}hf`=3e(sW9}dxI1_#Hk07dW3_A5j at Dj0|?Gy*x5mxIea*bvy1SQBMLHech#qt
zC(|pEzwo9@@z!_Zu(*%JmC0X7t>f#Zc8L!wKEkK9hIL(&8E(R8ef1F_SkhyFO9unM
zm0VhcQR+W`$`+s><6~k!wXW4(w}xG8U1wT`&(|k}84hvmsf5fDtSFUWL&-Wo10#Fk
ziY?-fus6z{23!WH4#NOdpNgwY2l!&uA-0nEEnj8&T!odyFIAXP{)T=-##i(kHom6c
z8sj_qtu at ZkZ^ZZlWp%pBT2OtAY at sXbiR!FHuB^q?Sxfjx+s#y46Y5=OGyl}kV0^4*
zCf17sY5#kJ@$1YaEAlT5#&0r{t;oMN7;Tv;R^;CrjNjslVc07SEV|EgE~Rn<ic{`W
zVShNFyy#_n2+l64?Q5j5T`7cM{-jIwI!F5#u=7bC7sSbZTH<1fe-V#W&s1{7X at 1U)
zZ>LeiIsNaioc?!>v3zO3y2J5X=r~H*y2GJJ?FtPR#V=ENe~tKH1zW&*q;y)h9w_oe
zA}`z7u$hSzD_gPrq&*4e7I2AS?MNu>9^*RpcM#NC29|0S8|V=Dl at 5G^vXGgq?<_;h
z$={=vo9eV&NyY!z|ADK7bAq^q86M29Ul><rUzNBmvTp@*+Y`lU_33Al%f$3hns2-n
zG`sW<V%aBxrtw5DJCD}-#=Ky5os^j^jhQWZjCE3Oos^#J)pskIhl0W*S=&QF$z(4P
zxs}1TcVk|Y&AaEGw<53%pL at iKlw-LSB2t`QpW72#18)>&W={<9);*-8e-cf=2?xP$
zi{;*RV9mC>>v0@&r7g<2$AfV97PhYrJx)|V4)&jRAl3rnnJ~<>-$vaXYo*LBX6r3d
z`z^wa-YxC7(0H>pnD`+z<k}$L+g}@O(Pz}>Iz_CLW7)OAlCd_J?W70&<C|KknbKi(
z(JAc>l(xp9=MAFg4bbzf1F-=R&p8kq2x0>uo_8Rg0K^LpglGxe3FSkfu$299u=U}f
zhbC26P7K2tz)jqpNUFPY^Ma1A+RI_oe_pU$oLOI-Rgdj?OqTWvlRspN8$H53tts5o
zzRX3#1J#2;s`TQ9Sn<ht`^fIh!l2o at Fo+v_uY@H6QK>%L?x{zwUK_ at B?g!Y<z%9L*
zkvx*Zr)y8<xnL$jm|7!Jsr9*_7tR8+8-s)_GqOY=z-Vj?=IHO1H88r(p(%s~)t{(T
ze`l~v^<GAm!@~q6TN}6(q6VX0RqqC-B!hpgHd at Cb5T)945eLhVoc?Fk=|sbw)>qTF
zf_!S2Qow3<Q!xEp(%6Ldcx?!b>$#m8aR5Dt?dI$|!DizfaL864HU^v9?qxCF-~x;b
zz?Le&77K7=I6#1JQSIhl39_FRr)hGdi?i!<4+LA9Jk2x@%I=Ig^|{sV4E6?-dpjts
zjc|N(EZ5=0trx?^x%Ii%2EiCE-dCSnUWJh at 9X-k&6w%9zTVlC41;Xqr#P%!94XKiu
zm%XUMm-#sL>tUGeepGUan9T=I)%|&}5-arY>_`93LFli>WYKP8vgzL0kM5mJcMH*t
z3(MRQe%N&lkJD!ER?AsS=2o-yR;f6zo(<oL*o`JTQtmcm+xz-pZSGB$j!U6eZI224
zVtdSN-A<!hcdXQUUxHpKwRZT?o!(;DUqN$0PZ=%&SEPsguL<oW%GwE3la~`vn_8&2
zt&$xg;Njh7DM|ge8TX!fM7R~Y&HVa1dQ14F8L+934daK3_fujX-tbgA3g?pkRhIde
zVeETyg=O~zP4`%kD19vGy#of*!|*m<KtI2=H at gJW!;+vi=D?Q*pI4 at MiN+j)C{y8g
zTE}ya#4=IDNhuabA5i|1V41z0cuOYs_b8s*9Bg}l#r_>q75p+x>#)PFNreFYD`}}W
zEfxIfSCR!)Oh4_z3pi&kLLu#DOsWfL#-xg&nRP)B-v8t#t at XirX_D|M+vKmo!6%yf
zoBVksu%{=QbP0c6DR)fj<+p)2AG8|<7mauhN7kLO2mAW8Ut2|mP*mvuMNxS_J^lPX
zXs2~U|H49C*!_Kd+(a<mC5_YKRvRJOXRiZcsU9cyLw~T{>Qy}Gv2Q#t?1<fnL$K9u
z=a9`pTF*j?s3oWT(nb>1KY0Hr`5IJz=5%d(ZIWFPNt*Cp<$b8$BSkz9*L%FfJzH2j
z{sZDMa!~R3wM#rkl6aJ4Xm81ie3WEcK5UQUNV7g_WEKV676obebBoOiAvTZMVzV_2
zXN++gTsni9AE#GKV}2~PO-mr_U9KOv*s}c&-U{D=jqMRQ3~chi!(L<i58)ZmU3c8`
zvA{!p%#Rn@#ow)5Pq#_}#UFh%9>o8aUGw>hkJQ^L>DC~FZ4HWrEU}I_XwR;r at o^nT
z)9aGCZ9yz!IQD8X_kt74Mb^akbAb`Y6p;k61ov7p_p}Y?FTNFvujS%JTi(v^RJEpH
z3|wkIfZ#q9v>YJHtvxYT;)ZZZ_(ysDAEYaU`$4=??BxwYjoIyokHMkNR^gM*htH4u
z6NK*u?<DU7-bcKT)<0I??LF*0&Y{5L^&a1?o{oA?;D?^hdXGQiSy1nhL!N~sadIg1
z1c~2p&$cjJ`m|a at DD+5-24Xd9jggUF^c&KK-inFTvPdmkQ+>I#Y<}!RF^0a!=&pkt
zpRMi9EF;ZlS<oJEb7yNsUpZTAww|q(08%O!KdVi0KHl#N!yfU!;Qi|ge)eI~)ORC^
zsjZtqJ%b+^NHX;W6R(zUWHs!F*aK~;<nqBNv2`MxZJVu&>Pes~@097CK6o(=%Qb#^
zr&suUQb4`Euo{j_8Was%R1{?MjzU0dkvyc#(m-Nv=!TWAjZzuj`$|@&uxU9QBJfF`
z(tIl|FSAP#?G*hdabQsH$jeXM(VY*NNu>8u-8=*0O(LFD%x6gLdyUeDlh$XYLha)w
z8eLGhJ|E@!%qv!fTFbKk5S2hfE{zw%aWMn11pynfU`H3iRQY+8er#7>;o|4Dcfx;Q
zW+Z`)lxPT{kRn3P*s2oLeD(r;e^A)NzCY-{F(166o4 at -~v7)Z({tsxzTK75Dk4yGq
zLX2zHmGjJc;%iZ=b$yUVgq{-i*-E)HMC|wByt}s4dZtza07_0DRxoC#4=Qb+)JoXa
zA@!(aDM#h79Q4aCOG5Svs#6MYm*mz3*_P}}!M2xz9vVYhXbh=R)Q9(QJy*1A(GzIe
zEOF%}xbjL)-J#kh^=8%tORZ~y66pdhxDtZfJJ1o}x*S4h3yr_IAX9CT2;y=IRo5K_
zMYL*Ov6>b3NW$>M^>3s({kI`Br>gj3#My^oe`RO<ov5hh at ht16qhvL*m|=;S8HxFF
zq?Ej0s9oJ*%i=@^8eywXYF$$ANxzxIQmKcRzb#^eh!l1)LKL^AaBNO2W<@fFE*L%G
z$!s#;gX?j<(_1EnAcUCEeup8&n$eQKz*gnPAUjX9)OT9zG}8K}Y>n}xf0nHQ9;zt4
zCmgI<vjKRbNlmnQ-4lI%nZ?0!OWWcgHn?{1BI|K+FVDopFq?!7ZW&E$E+CW`I{pQt
zG1grsO&8Vzkk?+f@(jd7%AizQnHH^2)_d&)L9vw}C@#;vqt~LEh9HaL$-*-*E6$p&
z-qUZ}9-e=94$N4}bM^<EG1{d8Z<Xv7*egNqqy2I1a#qNK2$*GI&G&yfNmWZap at i^>
z3wB5Pf3x at IadH*cz4*Po_g#9O(KG_YV7F(m+#o_6uh=hk>_(pW=XRchtw++GJ3Voy
ze|dI3`Nc>{elN=)p^Y7FAV4r92_YD5Ff2msk`My1Om{OgXcwTBMG`_FAtd$hd{5nb
z`}WL8U?<M|{qbPb_g2-Z<yM_Kbxzf(b0{M3p>HcQE)k03IIYsS2afHZkH&C>=&6{F
zO=%e~i#0sJJy_<W))<4ZRaBHEx&<cL8PC2aHW%SPl8yFRZ3=Olu#6M#(W0$0?v+~z
z>0D?AjW`9wi0@=l^Bs_aDWL)EUm8<r*poN_;P>f>FBeXGQyUt3#zuYYVDEt@(|2d4
zhlTT9+*3rbOi8p<SRaQGt7T0lxh$oZH%aqie?T9yIv6{jA4DgOhl4C5tPUot?PYIn
zHQ~tW;1$`W!BS>vP_~MHQ}qTs-s{<*%IHCO8Mj<xG6D0O1Gh6ey>n-jD5Fo at U0Tsp
zYe&NviAC#85UochaT|iMcktPcrnBkC`-0|;jF&AGvFPBSNe3%VI>@p^g$ZE;6T*s3
z2>l?09Uh{D6+sD^(0M_$TgB4w8`yp!5`G!G2J?nnsMV|Ms4w-8=sQ!qqOOyu>muVs
z4!!lPIf9&nx}CBZ>w?0rf%VBNn|dsV?8d7ei#aA9m&hca)?gpxfna78PpG#T2MdIQ
z7+Xe%?ESR~k-k4D*dxYFvF}hOVt{>0E|&K>O!O!N>BKs@#+Ci^GLdYoRT!{W%)OAe
z?W at cWnp?uZIlnj?DZ5q6XxTy4GKckCsCmNG#n+I0NFBi at ++o!;=$6|Y%$5Uf<$zS&
z9PIm%WYBLr-|+oFg$X$JiV-Z_%eL=n&C&E$jw!)%?PqvC_>fBoTh_rh2Q#k)fX+v$
z=QKUehRA+0&+9^Q<xF1y^YJ6qt!ny1vf%4XHT>*gFg+M_nhG+ougo(5=68bGuV)vN
z>{qik5fHxM0?<HaUvL2^C{OGNTJihs_`Qf%Y8M_tko*+b?D6nHkY}wAh}C#IF at S%~
zmp4oC5YwfF^xD0s(v3)%L;ILJb(m3#V;B|nGFX~xI*Yx!Kc&A36KnSBzCpcloJ$-s
zcArqB9=edXn1%XDwztXDRiPKIxcy=5$emDSmmU&_6Q80L+SlMn>oZ#M4f>lf>HJzt
zz6pcij&qJvYMo2Yox#3xaXV1$wCX0tYAu{2fHVGPN1&8GsY{*mKq-Anr?IO{6c&WM
zEM#|h%7RTcb_O$3yb?W9$788i8#1R{E*{%oLrZ~V`bV1#d3sW&Cp3b;+4fDT^P9p$
zwr5fDs)g+ at xk&u~>%4bSdr8g*Qe|K2H7<nS_xV$O*873lI}B#iZ{``7Ox5PuKEFB8
z*YgTnWs(kq1jqEgwqr!Wj_Lg+V|y at jLT6jen&r;qF>^lt<N3uLY(HpWnr~^RWr1Un
zWT<#7lKVK4DmCD*%zqXBd!7IK`R^G&{$|DL?@E9B$1p at NS@RMK{1p{<y+X47^-AtE
zWd75btl9fKsVC#`gS%aAHTwO9^$`+QJ&0a2JUX}Ap6a`U#%`YHx#Mz6 at i-fq(12>+
zCggQqkD!6-^UQFM&-T01{cZ`@M2vT$<Be$w3<e(!78b|5 at VGY)_U~E^HXz&BgUaJ>
z<8imeU|i!hO~@G6x#2whWZ1GP14F`P9}bTAR6SevWXc|?=6q!;7x~AgQx>X<w~CJv
z{h=?MuW)F-!l9~2tBSOPB6N^KQ*f<*nr2zF{21PYrrW{m6$;MK+#XH;G4r9!`dzQY
zzb%}Yi;e!ct(&&G3A$;0?dt+87w)T8X=F+?F!kgRHZANrPUFDgx}kNP4vtXA8)hAE
z45{OEutbACtd8sLI;yDS20M5XQo at bgdja%b`$>%QO?LYG0KZuSMPDv+xD;OqcN|pD
z`#=xwzTLs*c9>QU8czobM<WncfJScx+TLO`iu^!C)bL7xZjUrTd at l#6gmgI|gDP#0
z(3*jdtdHJ?=vsZi%8?e9g^q>g7W*sq;45y`%ylWZhZ?^pm^(&H*s)-Czns}`WnbaQ
zKFiL21lebEcDQOgLfMZ5bNea#emlF_mKQvk7d&QR%N&Kxu?ste!sc>emr!A+sIXJP
z+#IE)I7b;$7?-l#QOZ2cS~|MDqN{o7xJ~l~HC-@%mkkWN_R{BphH-!0jQtB)GOkmg
z2$#D~$zCR$IJI5oDPE^gJVA?01DJTL#fj}8-rq0{ZFvx=m;o;WgJ!^oz(9j(;;n=$
zGWKZ~n5K%bcjuYh)xH<Wd;GQu0Y|czlJ_8azu&%4=}7iX#_hKfu8`DjC4G~p^`zR(
zK4HoL7(?a31;WS;;fH at RZpCG1DCrprTcopZgF>u>?o2*_CW#uDHLC^-&l1NM;q-k-
zfpQCq!S2NEJgJ&_%2{eD^eTM7PV>T0?VEh)FrNn%-gI^a3wy)O?2=$turISWj4{7M
z^LRCVfOnEE>2L15e4x3r8XfHW$!-soqeNjRXqu93X={;+(-ew<lLdN+qm`)&+k9U{
ztdNpf5|@nw!RQ3)2+&g=Fe<YYOH&yKf~D_E#REZtFfN}?)v#mUa_R=f*dEI)kGYUg
zCE0;0uYg`x;5~<mB}wrBBt@)^*^?xqWKIU<>_>R{C at 2$YjowDZ9}HS<Y7Pb|j@@TW
zRxI}!2ZOZU!F>k3l-Yd-y;RtJ2EDw_E^6qdzX9$uxPWAYc!c&B<-8~0X at 46fu&*0D
zUPh(H6gON?9K;dR{c)pH^aFLv!619DIY=aA5m?DPc`81 at ha3HUKe^sZlUPo_AWN~o
z<RyfULisC?;w!Or|C|2o?Mmi$MWW9w;cHD=fR)CEp0CuPZ&5P05cEd`O<iIV9%FwH
z0wm>aMc$)9qBHFaea4e6=I{>%jU_JQQFrE0&}Ga~Vt+xPbCg!162=q-r<9_aDX0d{
z*mF~q=He8E=nF2vQYd>W*mf!?A<hAbZy%|KW1=y~s4>UzAw)CJ&=`2r)I5GoKg1lI
zPq6K~nQhO08ccs0lsX&wOSn8plJZO#&2&(n<-Cctg=h;q;kvA_HPU%m=Vip?u^AM$
zfzs7AaUkg>x>C-2ldgpn!YAW4F+B^9HzDF6%cf;|!t+hihdj9jxJ+I)7O-|&ae*5q
zs1Y%X70`+l8a8_`Vxj at 1Nv^+3G=RvM$V*v;c}>a;)g}!x$wf7pWVb1k7z;eSGA;15
zw6AHR4sQ{zPVUy+M4I2i?48OYIXsWhM21X$Ik?|yl-S>SV#lDAn(FD9G|*T2$!51)
zo at 7N1#C!M#{ZT%KXY$HZcj_QTRcI2{K>Ols$q|UyC_wuJD9J+e0Bt~$zm>eF4tTJk
zhqoG>eZoGn&J$S&8$?zw9A;4;Rikp=TUSDvs=JmkG4`+ZL}hG;FZQ>Tav)ekRY4_y
zst1D2L}}=e_tnuHlKokS-aiu6Ax=KVve*#1la%0+2WnuNca)|-7ywoVn>)u at 7qf*u
zS?7%&Va)WRjz$dQa-s_Y4F?^o9j$POqcoi9!%<rGAc03rKD3JgQl)s0Wtzmpi$L}=
z+_J|1w2o3?XTW+|Y%0Kbr|A`#TCvxjvDk87DI|VlCJ7;{V*ld8-acOn@`_7A!R$<>
zB{Nfz8P%Q;823yZ9QW*4=eV&QN at g;lv~uwn>YfELS6-nd9=c1JyJMcblDRjALBVY)
zc0Wb0NP|D113~ztdMM_~`q96BnNwEKNDwW(Nda}eNr`=znPzkL;bHlmB2F4goZQT$
z(rrR?=L04Xj18d5q%yHX#gB%$eF+suQ~SxLiQ<Y7peA;ND2}gRJk{jNt77gaJuvgA
z)-f|WPmaRNKFZBrQ;1T(;N!T3zVr^a%=ed_1#@Q#8(R}Q!UTwFX5*_thoQDw%B$UZ
ztverPJ+i!RTpKFf67AxS7+UvyrSKZp{S^^d=u64*bNHRx!BJK_Y-M3*drDMQ(u3Ln
z{F0AGID&4D;G&R4<2+p)P4hTnHJ0c!!zTk>q7}|&(&rx^h2NKaT}ddeMgentR6eS;
za^pbXDCQu=h?MSb(<|4(QK%-`etcBqd@;YlJ<U{FO_XaDDAx*<BZ2A(rXqYHJcbus
z0!IR0_in%ou6Q>>=yLRYx5+VaW2-?<DGP(UW=c1IBvWcWv;}<%vbG;hnN>t+^D$8`
zw#!t$H7Wq?aD!-t9c~nj>0z$0CLeWa9um54;Qb^w at mBAHxAG<>>;z`7QJOQ?DDoA&
zeMHf-?G2=Xve6mpjkVE2RCp^&IZ1?th6z1{9t5ZzjuNtq-L;5vrTwiav1Dcpab;9R
z8CCEJlvSN1b!#44ZT<;s#{i8Z`$0S!%zh`kUZ!zQub1WYcjV$x at D8o*kN8T-DsCh@
zm=&z{kw{%s3B=N|hM?dw2r3ox0WbMSnRi+fhk~o-Cf4*T#F|c1EFt}9a8iw=AGJyP
zQ6lL_vAeT~8$Cr9t*+&pugr_#1LiA3KY)>V*ays4hJ64>*&onneZYK$KY)svt>6Rb
z#rlB7BYePo#qk02ZT4wCu}||A=;~@dVz}2aE_`vYx%0dZPqJZRe=;-?ePu0`Oj{-~
z;W`@3^u{crLs=>!v6W`LtMfc!Q^5-LvmX3JwALzu$-<=Af8)8xMF at JqMR1~71l##8
ziOU~zOoyOlTd#iNK(>KMHrtsLjyubEwl%<=?h=+lQhk at A$2JS8tlu&O%Bz;(*r+Vy
zSfooBsl1PcRRxNzyd+W7Qq4u3@(ppE4Pl}rqztxgf?Wwd$(g3Goje>6djP=O5_@^0
z?0!azXJzPNRfBv|n<H{iq$xd1fwi98EE0idDY at f8<82qu_P1TBqrBD<E3ga(n_7yL
zcs$6>K7~Xoskvt!w(1=G%0PJtJ7c>16dVkrN|o<!Ae|8fFTq~cNCkmO2W65aWJ{JG
zx|i~R=AkbAGkAXu!oQR8lH6T<H<)`b2v1MOCJMb5w4GJWQyf0VR>qCDf=(Y}?5gTk
z#Z;W{(LB`eSHPW$Blngexwj0<eaPdYw!oe%Hv=#4vF@?G=`anuSIh0-QS3piu!HlF
zy0U(YXcZ&Qw at k(SgJQ(saM7Gauec_eTXP4Z#=Ajr>jUKLW~G$5naS6K+))=mIdxWC
z%5HaaZ at nAr=6-rF*lqfjeTb_{2$yl9DClTsuT?VFD(Lav&jNUuWw<8c*}bY8RlRU?
zw5_UJ`zDWQmM at s6KXY&WpK3eWyI3EX^7;dHCSZ at 74%d%k=k+m44+IlJm3yf|0z+}B
zlIv289(S<|^kg-4Y#_)!bI{L^)5ipYQ7W%XDG@{svDVmtO9A+V4Y-s5mpTBSWI!(@
zR)Tw~F7&ir$lWO987>5evv*S=ccVSe+7OEY at tj@FVuD!gsAjDVcrO6g*+tz;fcK)P
z^)|$PfOy`9xQ`(21H=X!Vi6!-pn(bm&*NYzj@>7E66;@F<fwO}=5hyuI&Vk5B=?ou
zH?b0;=JEuBG={B%)IX&-j2MfKX&I!REpr4tsY_c1EA`9!OWX=^EU`(GUDo@{v^)fY
z7~5`=th<%$0>#+mBBndDKmlgH!muEOc2TeLaDN$FaEhtEVl0C10rn8vO*E`qF?RY3
zFGu<^71myOO_SYLg?)~OlpOD6evfjg-1J^orq_k~D%_{%aF6lnJ9Sw4nI?HMbcC8G
zL&t;GE6$s}Ut#4L;^FRBywJfImU5MuGNAc<fgnvy<9LMaCeW%;m=#<2rHAE3B+%X(
zqX_JO4{Ayz5WLn6kxGYsoDlIx#4tm~=+G+cf!fC+5WVu at X5QC)&fj5&&Pevc3t(Q$
zCP{)$%Gq$<pAO3qMxcC10CI2a2N3q~qKcR4oy-H}{dxb-U7a#2%q!sBlG2x|GNL+^
zyhaiU<({4o;p$iB&X_mvjpAOI#vcg at 2fC;9QDMH(Ks7^`G3i>!P6rq$ujlp5Hn%VG
z1?tj!VpgoT at N5(PJcpmP_*vJKSsWwj0NV0-wXnXa(><2Hp9&tw1&194Q~L8w^s at m!
zFW_fmlU>grnDvYZ6h^gSR2xRMVXIo|OGvyL#5L%hfQ<RSMC19QlZ=%-ml}5}_&4F7
z1>w2_Q*Se4>X1{xEre)6#l8fz)e5Gr#q`|9K^*3m-G!H$C}um&fS at 9fbcZu_6H<3N
zQg=~xK?Ob?M^Sou6t*_sbfmwfDY2k3*$-42Dw0DCrx}Mu{9|Fwo<;G~F~?@}vZ!OT
z`DE0w+1wMg{E1NDZganbeNRp`Q%JUO9^S at G8+M8zWMvhya_;4(O7Z2Ud?2-eC3{9|
zA13x`neSG!ZC#xWyW%Gd;h9Z31XA5mTxm~AVH6y}{l7qJ;gGlx#Vr~VM<QTq at sPN1
z9`_PGm?uCOl~}t{8I}YHmBNe_8t-WPYLX-+4viw{p;455XjGVMz-%ieU3ve)?y`8)
zRi^^`@UbMS^7o4RBg5;D46i>jynaX2&~N2B_y at KR%edzGzx%@@ud)dUvy}oN_(m=b
z{$x?!WF`PnYpA06C}uo?n$aUvW5I~N9a6k5+1)*~h7mgGx2_IaBDAOkm2-(RqiNN{
zx>P;NWNgUxm3~Mw2FuEBT7`p3Ou*pALav7v*B(%oJ)FJ4ObT)mm`+aI%T$8ck)MMd
z*++|?MFI9ZsKEip`#T_O0qC5)G7?$4ga1wVe@&+B0aWttNVM&}dfN6r2LnW|u)9ZX
zIcV4O>RIafUzQ_4)N_c5+EA?+;u;k73l#aZVmZ@#S`i2B;=bL(7DxX9<yTaY%wDCL
z&+3j)s}vOs(PN;vA5vE;D!8x5h?jZH!37=Fyk0f(szXKo5~!P#{3Vp*dqYqnZ|;1p
z>DPXGPW^SDrYmpklv$zZmoli}4GQncx`leYv08~2Whwix(wuo%k#nmR#1_TFRBUFr
zOQui4>Pcl>f^hm087;^@3P8{IrOcy>9JxT2%xnQGo2NInUF6C>8P9q+t4B^h8JEox
z&ZOJ!f#&HiWl=i5QdH&Til%Xq4~5zu3Q6Xt|H at bBYoh)xH5qFZQ~REy{;E)JGM=o9
zsx%c|uf=6wYifI~Niw_cSN`m}n6WNa=x=IU7n9pJ#*iy}wAT2xqj5CLpV=04!R#rb
zaa!_A*?3w>ZPilOH6Y5gi~H+9_OMRj0N>7_foFzpm6BOSvWonuT$1}`+}8*UG)b<o
zG}t5sJklFYlIId>bCcv9Ep2I%+-_-WlO%_wZB0I3Z%EqSB>AbuA88)1qHcl1)Ludt
z`e*cpdZ8wsdrHanhDzz)kWAlO*yJicrQ{x|i<{{xKB7PYj$o-(HVoc5t>loFOOTam
z9f!2MQ(R<-^Q9CD*|!+ at Qqoru^HsU?tDRpR$lj^6-Kj{OCC^|bwXdOlyT8I#-YddH
zdIfu3<vv_w`AvtXOcg^}vn%sN+(qw|_We<~ozc7zMZLyTyO%6XH- at mIA2!4tE8~Yk
zJ^6>F^bh62RP3vJ%?)<*(E0(fOWzagnKwvNjdy$=Q`n-V2QSzW_QL!QG5k2A?k<as
zbq{g>IF#-#3maSB>_bZWA%zWg*$2 at fp_t@PvI#+$Ch(1mESv}nDV~MKQ_3RfdWG`d
zg~lUz58zAv?W<)x1MO?EM>9^(dk7Nbd7&`T5)`ps%99V+u^1k-4|Y89w#QFBnJsxR
zYWt(<l1HZACKkqo$*U%ab(w;@3I?cyW at nvn<M<%2n89NRq7ro40`9c-n}M~cfXWMY
ziJBQ>WcZ5PBoFB_ZAh2FU_Z?CW7Aa;mjGtE at _Ns_*q51!7ED)|4=BPHkD-N6&WCY4
z0i$9#o(P-E)G^KDQPdx?nl+3s_A^f>PMF*S*3F1ANDj>Zr}j6bcQnbr8LT9$abQQd
zoRli*olP#-X5^i%<FxE3s#tbD(cErDy&Nut1hveL&hBbrz06%ra^X$$<_b}vGDwg)
zgR}3tO6lu;lDV^Rf>udI{TcSfzB+)p{zJm3&p%<xVi+^`(Y&BnJZWY()69l09 at eYi
zIQUIH(|Wa>|4sN8YsX>*@}1P8GJjZY$Kn&XA5KcCcN&s%YFa$$O1;}aKkqdp-KqES
zb`S}N=<Uit`zP4eI7N$`szrtRAZ0JblkWDnp)Pn@^LbQlGYkjxH%}cjUQ<}5;WcG^
z?R0GFKp6*QrXn=e(*t>_?%<@62+?bGswb~0(6tn+b>t`pbeq>M;xH9qXOSt3Y-ZU6
zz;_xN?i2@*=J8!^kJG~}Uq5Fo(SITvH`P2vt)%XW$0xu{!9G9p;zDKkHHE0wUVjA!
zG={|Pq1Xe%V)s+*{$a8E{4i5RU05!>-SnC5LN`iMRfDtn9}t7p+~YVJwqCnp_Ur1}
zYgfF7U9h}H`16{Bk?7Rnnf_P2d&X5y64R1`WwC9?Ha18EdqQ#LHYnK_mGp~>RNSEC
zo>y9n&nvk;g(yR at Psy#NqSq?9_4HlE^-Atp3O=i3*D0lPW*v!dFW}_`-Z{BOKd(jA
zo*xY=?oCQp!_vdm9scI2tgMT7rL{xFQ^U4`*jqp_jGqX8qWFom!t|mWhqadb3kscc
zQOCI#b)47S`NNL$;Zz8=dN1l|Mj;m>*B4sZIfertS)N=hNQaE8HI1h1HyUK95}U6{
zk&UVpjNGD0LBKx5+J at 9*V;gw!H`1rrfVc>qBSK9gbdd-pj13BQ2hM3;W^Rg{laiP5
zk+mOf&c3ANoARUbiEKE34pF4~N9HBP7m0tK%J=>5l_&C}&RqFC`uw^X`meH7TNEaC
zoQuFUmdY29;+i;+V!cw6$bl8lb6D)$r*}6=={-$S>PSNmVUqE@!otRSr6!7<m))qa
z;6$<Xmp?CmUS^{bAW$g46OLUe5t4zX{&0Hd565<#AM1y&0bcYw#t=%TX1VfXXgNyF
z#&eH9b$ir2!5zaV=3}r*;h-cnUnG<n3<>+pgz1EES9%GxjkQW)ZxbKC^Q8s~?n5xv
zPIaD}_r||ORAwWC?Qg>GfhLi~f&?u?^Yf##VHy(Z+x)pK*^NF^9$xWAW5vVVvj?B1
zU&Nybboj7Apo3<0RnkL`qz4scmx!oTcQolqEu_y&Eym9x3SQ~C_!~(%vqbTK2Gp2~
z$Nbzijv{{U%HAU&)AuMI%E{%+V at tD1l<Y=scYSU*a at XpRlP-X|&jgx8MM>GLgdy#U
zY##@+aQB7*h&en%lk?g*-LCY%qIonp%@~uv4-A>2R at WwJrkOQu<Tg=@(5f0vM7~OS
zBjf0&#2cr~ykOr{g)=-+JmEY_UuRM(;wVXM?6|-=^_ue+#O{@){AjivDDK=qX(p7E
zX@$9(_fLtG;yvG-d8f$@$g!Dsn+OT1;>>$^L938P^U69c+X-t2lT5_tfN^<m>|$yg
z&G5 at bO!{)3>CZG_raL34aTH07!x7DT+qk>6R5(G2G7zYPGQ^#L=*^^DD$m9cNn(f=
zp-37i`lXQ%<(r2hspto|+l;bFPX2ncLx}DCM-!pWTCSJ`dC!OwfbfQgQ(%rW`)rYa
z_Q(yhhV@%Mfi=fs<_e at cDXX`BablU>3SG#GwhTC_L(L{ZRFZ^uUl>YvsS#0UM{cw}
zSkP7R$CQ=Yw9HbppAkcWJ7UBIT<Gj2P~tD-y(4u-4M5Ldct(JvYZ1B{9lVf#7g>{S
zcvk~<cnxRHJucL2%#RiBiZv7Mr})_};$Ux&mWaSJ9he?DQ{F4RREKJf%3{yZx$MyY
z3OZQCjzCMt7k{gT?l@}B2TgsNi5*F-Qb8<HL9{d<Ou80!qrK+a^hiE=r5B727QS!t
z!gr>Rpye>%K#BPzrO}Tgsr`LyU=uq#AJ$&$V6gUL7c^<@DFSha#&HS5tFEovLo(M#
zilzn92b-j+V><#hcKX|}(+Uo`Dc_K9prsFDCH*!O-lsLQ{gC~3xXE}{;TZ8e+(eul
zebL^bB^?kY?c<X6jZo4DLrVI<EXiiuzsjD2hd1T}`|XIGRXmTFMeHA1#L!k89#+I*
zXAuUbXpgBo_{B-FE10J+7m*qRk at vG?Jem^(myi$UgV@>)imhFG)VPO;SC*)f*h96_
zC|Ka{FYqT6xHW~tO-{anVz6#CH#g at SFgGYX1bIal4vpjzfdazpnlsHp2l3UP0du4Y
z)+_3Hz#6TxTe-fzl{6Qrz}j at Q%cXf4d4)u|jxUkGoBz^i7|)R+vn7e7UNb01uBG6+
z4Q9|4nMlF+te`tmpkT=Y_C$U`!S}6HFZPj1ST=(`*l;1S*$nz4V=1`JYX$>wyG??t
z84N~<;zGhrDmc4MDuFMZJNeV9a_fiHc^_8eN2|B+-xofvK6<Qr<XH9CvFdxDR0#st
zyY!%<YBNaYHn4-`H?Vyb5WOZ&tZSHK3O2zKqYtz>VOo_DB}gk7*c4Z{6~X5Z!LkWz
zr4k?GNUd0@`M~TElKJR@)5ngK>aFEQy(2*Q?Al#s+mfDcv%M~q>2XGxdqY$7^E6ev
z+iPtTLJag_i_miPf}`S#I#g at 5V-{zFLP8O{n9xmS-rJdaBgVRBHeal at v414#$7JCr
zc6gG!Om9-sn-mE(i4*YJ%@)(qfv7=9U|chA6~g5I#be;DMdwWlqfapxenAT630{!o
zfl09q*i2-fivi4L!p)I{rr>ZIO$*Cn`e7PO(}o=&u at 4~wUN=R6l`dzxI65Docbfd3
zyw_SysR5W=>`LwPmau-r622v@$@1XSpw@~iaT(nl(Ou>*?dAkAx_*qVQ*5tOq8993
z1=~rYiz~dz6tf2NIbN-sdty_?UeIEji&lhbcIFGY7srLD7gdK?bOu%<uMT51WQ*09
z{h5pg;pw%yPgk`SY-Uq!B at vF=HHF*NN*@t6TP|W!#~MtrU?j~7z|Dv|n3G#f=0tI5
zr5|o+_=fm+lV=>;!KbFlt0sc{WM77&w~~HYapC)6FEg0FDaM{_&aY2)q$Xh#IB2}0
zVA|wfQL?WpZLca)@fC&Q^1=2GoA6ZIkK&2C at 8p)XzZ;|QI0gI3l<sZ+h~a$gAM-QN
zevF^~_TzZcj1uY_pEP-Kqf>XeRqYpjm%^-V!#R>fqRT4GgD*{&C&HV~m)?{oj*nc9
z-M<6=hJ*=#PrX>AKjEVECP(~LBK{^9EObrd^8bt#eh09-0MkDGCEI}Tn)tj}i|ENa
zW7du{QxZk+&1Jzg6D2Q?uU${Yol#wuRgJy6Lj!Y$?viEYt9_SdPn>NRcLo2O at UOP=
z*)!P6ovDv-&Uu|)cg}geZXUQMar^#;y3mcf?hh&tvZa!%JA9^|1rsmc5vw*hg^s0`
z(BaK{qT|gA9VTz=IQ<|5y?6}8z?TAF)W%MfFBwi(i7)uH31>PYW}g+~g{u}?A6S9M
zTfvr_Lu~d8mosn&Rku!SPoCwp_TS9jDxtS-)^XZ8q_=LdhC}q$t-6oK{T1A0eO+u^
zzh1X--OpC`bFX8YIZR8Edn`6)Usob??PxcmlVLOdUmfv!4ZKhfZbfH^1^83K$$`|y
zc-iDmE+Q_Wv$1S4C!;BJjTv&;EQ6a_26w=9Zcnx9{$;iLFV*UtYLx<Lza-7lv15D*
zj^rJ?!@Oq<HnY?$_J&_4!RK|y-tcTaK&$AZUU8x6388}H+%mO>-!n{JeaJ=(hdvHV
zP at Qp+5*QZ)*>K!P$#uy;mx^6-<V~3*FTw!on^Mw8%q%VOV!c?R_>BQUXa;OTGoVmh
z(hWjG&#ORa2Ea}eff+Cf%m5ffR~KlE_4;w`^;qroI9{nyRJUZ+4Vn{KVYW#{yejr?
z+_>tGHnFL2uX&S3P5OB|1(K at H`zeTv+izwn at 9A~P*;7qPSMsW)G)`$d)#UlPj1Kso
zSs70O{Y(`Fk!DsEMuW^M8aZCPJ7CUMVV`7Hm{iYNV^X#1Gq;MUHi{E(ij{h{nt=J3
zM3oLTH6Z6z6U)IVZ;YEknK|XoMl<MQPWc)u=(f?`!)WgbsOPSzRz2lY)xzm&<#hE2
z)#?h?DxYH$*VCVaxc<9MTq__Kb9G5}yK#zl8;WtkqVHy<c|xaL97Ou<`UuJ&^O?q&
z>b_f{E?V5G<hCfp6cx81*B!d0;IRc0^G-Xs6~Vi7KLvjPE$gP{2K%@xdl`j^CBiT9
zTYT>j at 7TG1h;{mn9ycQPi3p-5RM-L?hmS)QW$)%#sFZASm5Q5OxtXqVk$sBagU<|J
zOrP1AIFlOmt at 4CxWUHIrzz22l7l<>{?s{Unkh>o?ORhO%fo~}IH(|1Dcm6h%x at e@%
zU95Zjiuyj^bsk5{)sG}vXj5<d(@)0a&QblP)CTi<;XoNGB7+s<f?hUi%eIAZ8!3BQ
zuHe$hxHz%f`0?g;DyCXOai?PJR8p&y_U(RpG0&lWd_hiTv*KRHZXd}io-SILyj_g<
zX4qQ`OCyDA at XW-XmZ=UjCAY(Fzz)UOp`=!F19qIP0iGcZ;IKTTLisZru!9>Q)RJC^
z8gH`xi>;;fmZhb1ukLm!YK(@FlTJj9T~^W(JLym@=@2K~$4M9B{2cvSSQ$%dUF|Dl
z27e`jGJ-HiZ{ywMv*Fzo8}GIQL+;mMk*L9WjQwfkN~!%*98W)>djeYcm<;WxflFEc
z$pvkwDG6vfu^v?Ru&}v#I4V=3 at o5A`Lkrg?k}@p#wTySfNWx$wf~l#E4Y+XR0Pp#7
z3ngWzCb+n%3E8X#7R=bn=(NN?O(t3H7b*GsvhYupCl2b1G_+$o{O1|d6I3W`*+IqF
z*M4o{{D42;yUgo>jpBee;Hd=MoxfmXqMr1O1X0U|klh4Y=B`b&TCIimyhO`*$ulz{
zxjfQ!3CZ&d>H37^o|2GmNDw`fdUW$1hnS+vbg!oA8-zN|aHB26qGnG-ppkGQB2Vfs
zv3+Em3Z&g~VQ;YW>%uns*E_#HP?wf|J18+b4ZVzsgJqL%F7usg`qHv+=LE+{yA`O@
zo^M_i*{uk1**4N3#Am*bm)k?^$sVO*?By)ynGQ(I4Ay0ny~?m0#vZ}S?NP?#lSn}K
zIur{auRC{k{Z2y`0jD90pwp0r;xuHTVvRISSqOKxel{Axwj%;;%OWps^42`wIv|2<
z&VnI?#R_F8gu)gr91!frJN6A>0o3ZOV9laMa599OGqi^vDx0*(?Nutpy^7V5?9$A~
zB6kIC%IzirzPMYdS)|uZfPFBEi~{x$gCIH?mxy%S#hHXP2e;IJ8wG_*+<qNsuwUP(
z#SX at YDKm)itud at CbWPFpvfJUcf;WAj3J|~^P!NplI;H-St|dNOoGtbZ8m_ND-u9f~
zcv~nroPG2E#)Oo<DRH(_ZhOP1{;-?+`K*WC0Y2;wh{NundDtB^54(ePhuuLw><$h;
z><;o_cW~sx?wb>Jhuya%tix_k-C_5w3H;7Vh%6SQy;tqG54(jLv;RzaYMVSm54&k>
zSL)|^HGMT-yp&<Y21EIRkV&kq9n<G^-8KB!l=|(S!3yR}B`Fd0u5I>sKF4N{=RdgF
zvr304moehDrQN_9o5%E4k{-l*sD6vUW+y&_Ykh|QO}JLB-Aa2Kef7{t8w0)d8v_sP
z=P5zuluHPA=KTs2!v~#Go2Tyl(Oc_p$oD=RK>LXgBUGJ}5RyIbrV(3In47p79enYa
ztCQ~uMHGAc8S-8^>E^kY_s5QcWD$!JsPK_Ay_T8Rf&C2dEJ5o;+A&Odocq&{qpS12
z%7{mf;uLY at Jmztu*Kyo9H1C-*=DmbPa}%G579(V~k>U~F$oLA4_PoTIH!`N0BV62v
z;eB)@?)WiFln}$anuFNs!J)+Cb_jb=YxG89r1#2oL%-FUA2gU1b1Z9fPz)eR`WRtP
z at +}ea(r{uVvH$Hew)<1FU<w2NzMKSh750S2H9$wUZd-?X-RB%GM>ooLH{!(BKDY&G
zLcf`M9kvcdg$i0IqTGv;u7!wAFSIv{o?s61QtIQ|5@%PHoMtnb2hh<^a!1!OnJ2+y
zo&=Nml<o}#mA~XYLi+lLL&7%oyr^d?b<D{Kt<|?DqPW?G_bVmh_S$bx<oyA^37_|s
zu%mffl<=0iwVZqvz1luMVP(dJ&H7P&rfyW9wL^SWQ$K%{qHc&Wf$WIlCx)Lmei|Gj
zEp~0hB!9 at cgLBe(iOSY7 at YSg%@Lcx;KkCSW<3iQd9l?uRt|kWQR0PLA at TFA1cN0Ol
zJ&`^Y at zCe<?y+~ab^fhcdJ}ognk0GcN&xBr)IJAbXarrAkR5=$A@$6g)DgBg9dLvf
zkC`}VVzAKTkO+Ue%Xz&bRCOYIeZ;KSwV(GWqmZc(=c~oVYPii-Rj_puhFK=NWI|SA
z{MEwz1ph#lh*hcxafxow6j*qsDd2HTfqY0zfyi>RXgHBWv-4Wg(^aQ`Vt3E*N~vk*
zP=2af!VVYmCj)3e=lSpv%Cpjua1RoOv<>yvT1Vr-q;6R4vn^Uz-@|#2-5zR7%xue8
z(F at dwkl6^6Gz_c#EInfp2M-em_%O}KYTs)Og-Ic5-|I}^8d-HH47+i5(>*ZAB1n$8
zYy>R2BWlCqVbYz*1T&*EF(0z>QOV~yT4a}OHmb>NR9(q-vm&cJKuoALxk9)`>rc7_
zj=C*;jI)d3;kX-T?<Qt8pUCE`WozJU!_m9p|DgA8h2BAG&m9(e$7=)q`@rvbzG37_
z!Zpk;JCNr$E<&E+gQx$W!E+4Wo&QCHrxxzQ=Px)*b!QmHWs>8Nz at C-$pK|fVb&9Zd
zwHJ>O at sYogq(}#`DBJxVjS;aG|6NH+-PMq9G`Hf%QE-73bm2}^>TWCO#%;aS&5dSI
z?8i%i#&b6vuX^Yo{r&Z))$UW(VzmkjG(^Ox3F+tJ?B9Kfl8?Y1O)WO*Mcc=YQ_MEk
z(p_gy|BTFCXHWMGPltgEn`^xLGq}d-HrMzrxW;wExyIAr8c&03T+dwN|2zZNcp8k~
zJ&EWa(~z9DxyF0W$~Cgae|uM=j*09}SY^TTMm-a`frGgE`iF%b;3Hoc8nIDtBvx{x
z$x8C|i!gp7zbj{XL!J0&Gm}1BaI9k{{Z3{wK)6ZlU*{+}b!%gf*n~S26KP7e8lk1s
z!wc3uV!^s6k*=CN=I7!FwS3U>iLA}TCML5cU1HhOVP1-Z^wVv|nKEpM`NpB_q*Lx0
z8|C^S7c~l{z#iTuwI{8`XFdWxQ;QlF*<|WQYd##no0WIfi1IykAR|alNUX_DNsmKv
z3f6ZOe^8j^Sc>!3;vx=FO((*n{q8*4=MmuY;XEt{B<wosS+r4hO(K5mA_tFFR~Dt%
zyqW)ZEiuyP{VyDkdUos{!H${35VhH{`XM9Xsg}(vvUzLSVw`RGsMZT9b$36o`9hzy
zP^?40 at 8JeZe&)ex7&17&-@$&{&4Yc-=NfFP#S$bOLtZaP)Z at Z%=Hx8c at V{p?)WRZs
z<zlP0|9_0jpStRAoP`T8cJrB&a-9AjpOkgg9vE>3#?9$9uCd#kVe~dsRLbk)^xymF
zf&KqoNhhtP-KIW{!dCT%@sn3X){V$#UJ>ar*~Zjtiyf3$S^D-G?+9h-IW^u9%F^>|
zyd#vQ=Qh~9BUC`{u!3Gz0hwn7eXIg<rxo<uDj)%7IRnIUW~<e}v&XBgpHzQ(qWaj0
z>UU07pFdgcKUMwl=_;kc9F))`j(rVRpqLl+ at g_69d#P)DLT4tF^w!=@D0+`vX652k
zJD*5JF6+&P;gG42{G!cF-uoHM<P4jcd>_o at OT(GT&L}aHov?<mN%#7LN}FINy at Ht}
zR?-cF&YjV`r?4auy^w|p?_ec;?Mn!W13nWv?<II}k`^$H$jkM-;wv_5*itwYru0`G
z5ql8vnm#I_s1*%oZX@!C_-Vw?C<mu#a)-kY8vY}kV)mLSkxk6iC1S2FNu;ldy6J0!
z#2QxwYYck^+kE+ebyF5<w>VP!nJ{kgGn`=mOfKBeM64m7k(ti7c`Fj3*&-M+gP3X@
z5jM9HBX at Xe6DAKkzN+Ke;Lxj+=4>VO6b&{XjvNkJ%XD!s_I~O<(qaijoVON-MfSPc
ztRA^B4$|YYFH2d%tA~YGd}NLKxJ*G37KyQvqcGR7cGg3h$1h=Q-G)ave(_toT`uQt
z7k}>>=Lb~s%30cf2GU7mHWKX=TZ8o#k32eN>qBUL=(lVAH^5yC;qjIT9&d?rr*8Ow
z#)tBFO9YR%#JN*9e9Rj at _h|pty+td{@42 at W*Y7lSf`$7M^t05SHuCQe9sfoiar!k1
zav;WoSOL%kD at v|KG3=-z_&iSk&l;h|{HT#XKe7sXm*$e)lzK$VH#wH<JyuXG*=wwz
zSh8QYf?~;DZw1AYy~PTOC3~3_6ifCID>!_~ZaVkxY02JtqDp_?`n0<LWOdYO{5{Tp
zf6p46efF|>|7R?lGwo&b5SGmnWpsOn9FdlFhtIKc at k6DrRD1+mJr!EiJYE>$I-(RF
zz%ux{4hN;p^`5NQlQ%83Y)$B>(&>g3P2KWuc~mJCkD~4YXKByGU?@|U2}meOzQHAb
zacIfZI{-h at NX4^K6$;<%$hU<{WrssJ?b~YCdxYvef_k?(>s=j(eMSb-IL3I})xH{5
zuXpHhyqywY%VN034JPpeT*Ky=^yRYgAv<3gFCt*e(W;JOO6|*_x3`O<R1uZ#jIl|_
zy0~YW5cif2ABUn5r82xWz{Z>tFmsq)h3 at 9|i#pODHNrsLp1Qp0Yho^n+*_CTbQF2_
z)m4175f$$T^0=X$*pm?6)vlAzFMfcoI-pCk&&Tc#b<5r1$x!oz>*eBiVc5;q{r$k!
z{au!5o^XR)JcjH?M#8QSb&uEMZL>VuRTV<96G~sD_=(b&_Y_YlxfyCpafX_kthN>>
ztGOxkn4;!7>Cvg?W~#|*ai(g#?<?g!eVOYb at HckU9`hM0eb7hzk)x>E8ET12DzWXb
zX=-Mg3SRAFYJgW;X=^=}ek~hQ)o7z|H{Kjq3HZ3ej?IrN@)gEpb<)@<e7YOgs*_FI
zZuDB1Od-CW-%0K5RIi{0w@`z#pDKOE4JzmVRB_|BTHmE*7-}25)O~)yovgxKDo4o_
zMKP0c{R42pF9+d?hd?OS{Qh&P2I(N&iT||lx03YJfBsiVl9xkCQPYm;a7_GFSh$J9
zgV8mragEv>hxg2D)XqbJ2tMUdpr!3lK&D`k(@QPwD-!T`sKY7v<;)cKbH0n&2Qa-(
z9>ivPuu>jFN!jbwQs#P9zRc~4zC)DA9dJ=a%~Tl7Kj|L7H*~^<zU=U_fju`Y>(%_t
zSD at sX_x#$En at -;|U1i&J><gY1HE)W$kb at FiIPq8B@sW#U>YlupZQJ?Sw%spXzml_0
zg!-T;+V(`qm02B<2?Yw*M~qWSVMT)dm#<8u<}^~cD>b*V3pu(nD--hh0Utbgivne<
zz~3VC9ad(Svo(cPi7y at WL%|aF=B$_xhQ%Bi7IRNvXv}ho0ahXGhNtw;- at 4}U?y*1q
z=_8>B6JvkeEkBg#rRNU$uzq)w_ZC_5$kM~C&iY6~^17u*6Ov1l9!p4W!krU3ybJ$C
z+-dTZ(yJ5F)q|BXp16|Dv9M)H7<uc}P(iIM7yH66p}!(g=HF%TFb~JV<3a0NY3_Zh
zdk7_8q{&6|z^E$52_^lh;sS~}KdPbbqwZ?#D)AQ?otSHUjdQv>Db`6{ah+;RN%Wet
z?m9L7ctV;q*)$n_omyHpnL6{^B4GTYcXA!zWZQfjr^KQ3c3NS`=@d6TeOhr%o`;<(
z;}bNtlzFSsm7`LN*QwU5mZX!q$LG~1S|%iI^N>?izEMa7s)Yy?O%otCW(u|~Y}<^O
z^B$V>Uo_)z*^4H<XEH20S(Dxy at baYhnAEN|=@Vlwk)*_Tzb{FyH8hl7=?NM{MLMNh
z9%`R7Y4(jov;P|mi}AWSgyvRtx6kAKYqkN`Dm)sOV}FKG9*lgCn$RNRBIm%rIq}m^
zCCU~0fx%J&2TQWn3*W(;qmA1!;81leF$i2o!$AR(9<8!R`OXk3+iJQ2fmd;CjX=-4
zRHht-rxWz;k%gv$H<6e at D;@=k_h<OMXKXZ!;d3O<O?5T)jKx;bmz|JibfeJlb!IU2
zp6gPcsinXtlnws3PbF%lA^`33UkL5;wXQOM|5wFFUK4V;yuPncH?LEFE*00QxhGVk
zwfKaZTZ`~oHTN){536F8V=upxLvFX%hs$_}qkXJV-(O0dir~oOHv{El6)O)E>$=iM
zIE|{A5|U-F4=dYkSlO=ST5&7oHbT<d)ZF9rcpOMN)dqYTfYWTi6@;BD)ZEhq_%r~g
z+kndfID-MfA1x<{<$#!JL);ID>$ufh-7vkcMoY4kyPqKMS0hASg4BTQwou!)kW}P1
z<8d{;EhLvxFY7(+J3^6#Cd}qg+hzf?nPD~qW~$uNzBLs2HxuUjZQln3B@<6i9R1H-
z?I+ZTF+6pKJN1&8`u*Xl55!xpl-p0Lk(S|Uk6CHT at U-qmGwq->EN!8cRu*Z^6d&0@
zjQU!>h4`{=-9o$$RuEL{7UI9aVuEblLi{@lO*KPqxKd8t;whUF!hfgGbTiEhN1v%h
z=Iupa<ZBdKY=+njUg};m6ySS~OU%%4(+I9}|GY{h_;i*2uI0a_r>h%IS9hPTO4aIl
z)#^8@)jwwe;(B|`Z^4+~U}MECG}gBOD{c(A2m%fk*Qu6$qjjpVoJ2WpvJ1Eg1>9^G
za1#}96AHM6AsPu{q009R7OLa352@*gRB*7j+8Gv7hK0y5%Pw*)ikxjjtR;xGfSAK=
zf?5BEMN2|(Nb;~s!sSzm at y&1%8gf&n(F~E4GB?KLQp|!WwLb+uXr5io!>H!A5OLDJ
zKZ45+_=+vh{>>mZhl3 at MjAmFQEa5ov#+a+}++ZasHN9P}(p)dmRL5;MyRc;_Y`)#*
zWdyMd5O*+yW!d at 8klXL|{XZa;tsTA+%pdd>ZdN<x{-3ieXS6|h;b!{$HS963QU!@l
zuTtgCR``fJ- at I(FhA$i7*O;fmopw3zV**XYyVAIh8oD~rTwEO};|^WO9q{@#^QC6o
zp6c+MwZ9sm#hRKk(A?QJ*a9nmUgJ>}2eK_4-t0Xp1xo3ARM#Xh1+lrbkhf-^P)lu3
zsB*fM8Z?l7Of6>~Q{}uD7cU5$9Zz!=u<{zDn7kiE_Sr<KL4*52GopRHf2|*O4jMOC
ztJy=oa{7=@Hku0?BF2L%U%INry$~^aIF698jBhkn2l&biJu{E{WqjfS?)@LaS<Za5
z{W*WuT}r!UV+Fk at N`39m_)A8&+WrJRZdKb?)8h`ceIq?qs_jqH<8GC at vSi$)wr_&)
zdp9G-|G*_KU#YHThqz^>x|SW{mf7xxv9MB at 7r4>j&*@!Y5qtM}lPBRlA!4R|OJxfi
znoW=O)IZI{ArgeKSjEgU+F>p`Q+7$l8kOD8KB{KtU}Rd;b5vLHQ56wWq7;#y5|t^O
zU5!+rR%W&8%05Ly_>{_8{yaDWyS at nQYOM(5!ccbjvhKW(`mEf(HbJQLte^RSyr;3h
zTCGqIck$ZL#$G=mIy|6So^760=fPNM?pa!Xo>k4R0F3aw+=^in)ns0xQfYC8=Ve at u
z<Zk{J_rai*uk at P%SXQXZN6Es2YG$2ZDnCaHsFc{oMJzl^t0tMPYW=KMy-?SxMO@@J
z97VFv%d-{mVqF1?LvF9v_h*(vY7DT4Nl_`Y!7oMr$S!Q4Oa$iwtFVgot;9959ZC<t
z1?5R>;gatSd8la#A~}z%?AwHR0>bNZ`cu_Cz6IW^7~pU0w%=^h%0FeiAtr^;WibuY
zVpSxG?-?a#YPO9c at kwoMGLsT~(r%(87RI$$7`KM{bPXuneIb%7eOIzl3_ITz)e)b`
zG!4 at s24C~pHm0do!R`w4S9 at sc&r!=<EJ0H}R7p9#DF!sgHOP>M=;ygaQitLE8u|!s
z!Tlkh>h;~=76(2aKJ~Gv9Q_N>zaVuJ>?s(Fh}fb%*~w9Qr`W;?H9a}Xep3c3reaLR
zv=I1jrVDYCn*9y4%O)*DC1qT!F=L*l7zp5I at EHoCF=E1T6BwmQddde0AUjtjBF(Sq
zxvGoSrnNyhjcnXnt(sKv)@s#ib+4n<z1-?g>{gHMP|RJ5yz-ydZZ6Ae_<7v$yu!^T
zf*@Yf>k at LU-P@e)1~2<S$VGS<@4K{IdKkFOoc4HQJNC_bLO#Xod%{&)jWB3|RvIS^
z&|t|yrc~JyQbg+kRd#$`GmwiLpAW!^I;~lyd_XK&K^TuVoAm}sGVFD+;>i3{?0ax#
zvx=t^4-0OmVix&uY%IJYsrkSVI1zNlWFApHW at Srh?0TIm;kPlrdetFS#lC=>YQy5K
z2nby36E3sNr>KVoIez~%D8VvfCVc8T+1`v9VHd{Qe0exFpU`NjT5~!e8~$F~ae<3C
z>>g}Am>V^6;dxx#b!RptT#+B0J?9L!GpCz#zmVXZVLKX)a1*isiHB_VoFDLAA%A(9
zyowF{dp0H{k6XHKl;oDA7x}*KO{1`<v7A?TmEDz<Ohe);7{xB2xYkl(z;E&+ONc{Q
zqRI}qmBcv89=JMt$=)wN<ePAleE#{xKgJa_W-NyY(GOCEK0mg_OFxn!?(GVZyoYOK
z#AN#XKjYh+#P?)(g-YpNA=%iVwr@~v&R{~}&ZzOc#m882cZ?7>--^R+G_JJ%D<4Md
zy+i`Do9x#AG5t-r8JqjX^?Y9{<d=Q^7Uy~Rwb9gMSL!;KkgiNA%GZ7^PRJh(`CR_M
zCADvR2j7-kN;G|`np>orIXO>ij_c>%;v&@Y7%{W{0NCAYVd`czb-zFGry#rUgy4bs
z1?r7=s5jmT$%rW%eQJB3S~fNjPeqTH)b^L?@rv613O!y{+h3-~t7`kJ^mt8ee+^YU
zj*s<SNFV#M^JCYm_&4DeKF%m^1mv2~2s<B7SXkna!=GfK;38@@%;6K)N2?P&8_ZYf
zeIc=bc+Bo12GDfn_|$JNxIfJp1m9pQ)OjZNv4^-1xVPS;7Urwtjf0R7o*62rA0$EH
zAU@|=Ta?%fz~^jHVlP4L1;kn#VmBbx*$}%4VmBbx+Yl8%Ja0o(2%-Xr4ZNIw8$QgU
z#x~WwK}21#P(-lq3`eb07j_wgDjR{4CiAWJyVc2E(2KQeIfPm^+O-^_S`ML>7j205
z0r8Rz at jgMk4~R`R#125bY(wlIh#i1<#fEqf5U<)0?-9g%fOyS at cn1)DHpDvw at eUwL
zHpDJKlx>Jz1hESc6&qq7AYQj2_7TKBK=j)XZvkS!hIor0-U7rRqsv`zFtR#OB6$nC
z;z2?LEZw>J>X%N)#rbOFpAq?Lprs}AO2U;pK*N7PrLb{Pp&T`~tC?4cU|xyi$e&{M
zKJ6VyJ!xAz!V%({xV6s!XXO_aD$z6BJ9 at HObx)~Q>F at Sx^-1O%-{6s-MBj1H*Oyrw
zkx_R`FMFzQq4#u)+?Uzll4+Frb~B^!AhGqZtNJF17XhTmZBqiS;+tx&U(LRjNWYel
ziv6nbrfU3;!i%GfokB!=Q_XDBB<v<<?^H8)@+r*bkk8G+S$3N`w!g4VeRiN!Zr`Q`
zTmew(Y%_~jt*w1+%^uJ_Y7tw&d^J#?)RzEB+!Aur$NUL>%$v0{nm5%#DKXh$^q^lA
zH~$k<4z+2PD&^j_noWt_#dk4$TkWa)CSyA{f0UHlLL;<A&AzT?Ugs~^#&!P8u2Zq=
zoae0cU9-|wE{S>&_UZul(kM#n7WN<BRVTJnSacMXy`9U3i$|tT5$f`7AWJkOyOVNP
zaT^-C<8wB2XUHeB<Vs~ECCY2{?+a({-xnPHI}&2dp&Y=Q1rc=rF2<#)um`q9wd_Qq
zG8}a at hyb;IxoO`K-_#TPzo at pA__`WGt^8dPieK#yev><f=rv6?`r!F$j%t*Pcc?kk
zS6r#)fYZgh)$H49=55aM7Ox3^h;5(KUY>$I!Wf4^6O;KFnxU;UL)nw7HATw_KBQ$5
z at I@X69sp|aJ5g#jVHf+8RcmO!+vYqfPR`?2a30 at -SFjL{GR0B$UPc01(E3s{8&Ws>
zeuT>Qg*-0aMoXQJrygib^)#lIHC~AW7A!mat>S+vq4YjK{!N&L(hmb=4uq@|+e0Di
zK=<`T^Mu)Q at lW8CD>TA^?FYQB5}M^cR*hq7 at nbc20%GF{HTMagpQu6y?g+_!;>7-A
zmM~onFe>!1TB at W!R$b%qR>mt%>^~${)#IH2_tqUA<D?q<9>^N*1FMree32H&7rwlA
z45gN%Y*vP^e;id^1d;a?`V(=Ez0Bv0R;ty2FW_w%pFNJcj;lEQJ{s}_J>L6yFQpBJ
zP34;SXYHzWcq0GCk`T)4Y$KkT#<tv0B)mMK8YEDW(8-tgnQiB+kw4*Mi^3+2nirsK
z^asbvgyt7Q;PMupRBI_i0DI=e*k;b!Kt7Q7H$Fn_JI>V_|5vq&qqC1f)|t+Ld8RW*
zKEL>VoLG-EEXR0Q#!zIZcBNG8)N-d(dY)2qQ#2ZtDVi9S<00#8e2PYud=i4DK%9eO
z->g$Bm)Zxh6MAA;+9}ma`!s~p;&GJLsg(+Y2^ew|W*Z3z5s)D1b?hJlmG4ObH*dh6
z<a}efOnWyhij{AQRw2leFeAjfU<X7$oU;4j4YMESQa}6vXInP*-WIm7ced6%VV+#P
z0-LYl5g5Sv9EpAFsZm~kr$+m}FSSpNQkW{cBMee;Ash*7#;2iT7rKp-VEiI`SWhi)
zWCvta(4Apx-Cv20yen+2`zy6laivBO3v7sc0dcntaW6sK3y6Dch&h1hvLWUW#2i3$
z+YsvjvCxKCM-b}(vB-v)4~WHK5H20GPAeJXrx)h~=w2J>9sn(|i at Ar2xd#yU*%0#p
zvDAi`M-cM>alZ}mC?FoND|%E^^eBLOY at jXxEwhX1qGGxLu{?~m;qT!oS&Ncvo?EOD
zsfT%bru2(7iWkKFIgN??odWF6I<Px6iWgvO1=v!JcRrWafi2Z?&uT5jXHoHrFm at 9E
zz3<X8%}zHY_(`$Lh?O$FR#+Z4Uf at y?SP?h6Igq_uE2Zz&*ylp_DXo-wN|V_(>LfG&
zJb0?F<v--ie`rYl`zinZ8Vj3eZAY)O9czC3cJw;ivF2>;SQW;~(MC($Jkvl>;pI_G
zl3K^(weW<@7S&ZVsjv%SGu;F*<6F|36CmRch9Pf%fyTDSU$|YHI6%*&)PB2`eT=Go
zOp_^GrXYmmuqCcPrZpo8!Y#*L4C3Gx&cmLdY)??O6`HYJi^E0z^IGP4P0B6TD6Y61
zB|XfDcmt94$UlI58~@ZB`zm3=LM{7GrSw0^g?}zC)Qp8%bC1P|EYwmm5nrNExfO(#
zE418PLXx at K6(!@}dtsm!dH=nX{&%@>jcjI)*Fm>3bV2ydi_WZ8DMvFw5=1jWK;Y(Y
zd6pNP_k8`vvl at F>AM|Gi{StkQwFSLEV~3F0_k6~CzQXiK+j~A48A_DW-YpX(i}~3l
zT4sqR(MQMr7H4Jj1?)WD%s11{M-ZIBxLsp&$Na%dHR3`=JuhmR7d0unLCb8Q$KzV&
zae6$UWgZ~@2`1WT^4+e1_gt)*yyv4~h%X&9QlhS@!|Ey(y4ihSZh?l^;sOnd3>3=V
zr?uUuNfbd})7rkKDf=|WE&a46cg6?Gg)NEfXi7<smf^$@8wg>rI6Yt-7l8iu#xUle
zh5+<wNT%;@pA|CZqWAow_n?P|jnB&ga=DzE>Pf9?gtlDv8C05ihOkFKT?Xq>S{?A?
zD#ZZUc(6X<VU=PyVZCN)pgc$;g++}@6Q?>_=9MT|u+ at x!Nt`SFSXfT{aVh;{Inx`H
zN~QE*Tq?nCTV at 4o@I4;(XkOo|Fdf%_(Li%&1DKI9Fu3(y%gXvi!p8ant?)7XRva{6
zXR at 2cxmxToS<0^Fj$BP0*#Jgmzdz~en%K|A(q>N_0QM9Pj_Rs}+GMsS*Ad{~Alq9b
zA%0 at N1w#2Mp$?LCOWjFNH*B}Ljr%lMs at s}?@isG*543MhjL_d*u~aAbH-%HneB!sT
zEz!O$VP_3e*2pEI>pp*WwC~WUq^pZR3a;(=#g6WtI1u?2NA80S+KB_U*)~{P`yB1Q
z=1lFjY{J!*gO8};RCY|M+&0FAk)s%lU3PTdPl#OD28+)35vMo?oZ?F|4T`U at Nv6jB
zgnD4Mzi=d6*q%sYFUbt;NF+y5^Tl{f>`+R1g@(ij%Z3UKl=$F at 9cnqRcI7=Gzqo7L
z%{fZt%tMS<Yj~Fa9mq|5z?`YmhEWrXI1m!iVoAZ&H4)<>US*&=P(M9s4e5y+w=tSi
z{uY|QG#!|Xt<o~9m^eJa)!uB8IaE$0>+?`F3bBwX2m at M_;1=<jmEAB}z9P7aLuH!n
zTRyyfTcVi2+^{>e%pKgYCwWrd!VQb}Gc_9}5zoL6s`_fC24|VuDD)r(H*;GAjV<hm
zQb8pr&4Ode1w`;E*HX>6i^=9vQNvxD5Yy`uxMfd;ank+|(1;7QeHxNFKMi$|Y=d={
za2d7WxW&Ycor%tPXMAjjpX$x~Kqd1YNS}G1N$F0xT=d=*%X`FYi3lX2DZvt!=6&T#
zX1klBjqgs!E+mgu0#YsNF)47#{1zBW;#DhaEn3UyD;mK0ZqzaxX at Q_2pg3b!Lc^yK
z1GbDm?N0tQj9qQquRRm)VJnks`I=dawY1ft&5Sdl4P}3hv!4%o`*q>5_Uone*JaUl
ztOO1v?zLereQS!kc}!9o%X4+0R8B9!%pAxzlxb>~X<n9y!j_1%wl%<r+&adZICCY`
zF>qT-eIvM&^;~U;)2RRaX7uxC$+BVOEH8v*if+MXu*T+W&ax;I_(ldNCfXbZY at l+%
ze}I7;@E4x(6DspKiFt`DwN}D|T0`Buc*!nIbUXH1hey2(dCEhGl6}*;EpZz*4rYP9
zc_j=Hbd2*nVOlgbJ5rn$%}tM{=0=LsagOk6*pxPf at cCNUQZ0YW6y<IwQSK!a*cTo_
zrY(h`xsAi!Cn3u|spd98w%w#TcJIq!OFVqrEOS1U*@nH_uq7V85w_IPcPE-B+#wfV
zMwI}8Kz_fQN2+p5eT%n_1hb7JAw$j(GUN=FA!kG>jOzp3>OZGEJ0W at RBuO04Q(Epc
zo~K!)oDns-_tLx}vL&kl(ARBYE~?KY1bY$`flWTEea1luSUbbkeTIX?n;rzjE*s)w
zK)h)~d`u7 at 1L7?kVizFZwjp*A#4bSWW+^#}O>IG?-y-t=GP-il at RU}OvN!Awdc0Gh
z>bqG3#iHM5I|A^N)4o{?1Ooowba=B at wOu83UNsgJuf3vyUX|##+}=mO75G~A<vs9*
zyhRiC5b348tU-mA-mR{n7-Od<l$q$ocvH*V-Xv%DYnlBT5mEZ4ePP^L`64DrpH`-S
z8jOZk$6LV$wjny6?fUHxLqYXQ;kBZ<^D5p7qGF+z`Uf?&)B%br7xpFypi-!4rG`d$
zCDzJ9Z^x`08;{Tu-6*s~vBkz6hFz4Mnov12K`HH>u!mZCDG;g7BKPx_MQ-DimOZMK
zjp^aS-O=<>&4n+fjPHhV83lsYDNU$T;1=>$EvryO`tg{QR^-f9CN}R89rSp2c<^~w
zi3NJ6nddn1hDS7dlX7oq*<0ndTV<*EmPSLGI;p~(Hpcduc<u;EM at KYnKYxF}u}w2}
z`wN2+&=zA~BC|h11gD}=eEc36I8m79HP!Fl!dG{@<lJtp)K(&4U^nH}VpkCuy<O0Y
zVa{Ga at 20WwQlYG|J~2J(mcl)}6b=wVSls^>txRIv7vQ5 at D;!8rRanNdpJ<s+h<@(S
zGCN38Bp{kOHbi<(ocX$17Ftv3K at DKD-XCh24>hD3JEJT|Qd)Lrlp at kQqcV%UFUjn_
zyDokg77`hLyqV3T?4x^Qmx|n at 0W^AOUMtp-vw`6OBw&yr=0f4QC~-T>;>Jm>#pw4J
zo{tdA=CKn<)ZgPw$ZgXw9K~%~?hP)l_=c7n;PQ$C8vJGC-Xj_IJ<T4-I3#8(Ao3+8
zk&B)Kn%P5(-9x$;gTFNdTz)?cP5&=r%O9=k+#c;O*=;61&Rwz_iV*G)F=kF>7VQGU
z%nJsLLt6AVVr<@y8W&8bXmllB25MepcEu;b`8r;VzbL$uFb>px`ys;CLt4#vwh3N7
zD>!z*c{2V(U29^-=W0!KNNezc^$my)X#gOo>Q+(p;V>@le4D71RV=Nxy*MH&8Gl)L
zH(?ypGVdi^B||Ngnv4(3z+V;0Rsh at bpQDWTon^f5EaQDH<4730vtOYxJUwK0_Ow=^
zsb3oHqGi?Ioh5oINgsy2E~d1EQY}C!3n`b!jrW~Bjf+`~BV#Nav4PMV*^|WJon(^r
z5idy0-R$r~>rr at 5)lBUrcq~6mbsg5S?`WBKoJja_7+co&!=>9{4O{R8*b2aRwamMk
zWK+Hx*|KK(Wy5E>@rE|iL^lRBo~>>6Jilb<Ja^=*O>-+>jG+lcKu~l$*ih)%4j3P4
z^Gvicri6OMsbRTrFku`@6b>hPAj0N8qHq65%MH?FP>cK_755QHV&aUs=JDptN7NIP
zO^i}@yO!C`YtS)XDKQIM`^B)NRyU at rjWAq4&%EenMH3379>?#bNdx8B<y7;a#=|j4
zWe*M+4&yzMCMb<H0;1QU9y!8b;CzCcLu4eoPh)0!pC*(l8qja2ISz|pcCVJ%%OCIw
zkNHKzbHt;Z!&;z^YnkJm;RJJx&6ME-lViM#IL6nt>=83~Ck3y<A;)kgcUvU2Ib7Tp
z$!(9M9`P2p!#3H;dY18&&E$S)mbZY)t74v?wmH(t5sM?8tT#`%TP}9$@V^&v%Zhrg
zv%;BC<JwSRW)yxOW`d=@mS9w^NH809;wCrhxm)nOMThT{Cz at J|Pc*^f#McT(6UNQD
z<(uMbg^v=(BaR?R&JQ_)E91rtNAUi*@w{%T98HbD)%`+{>8V5)&l{+-0{<)O<ISF_
z{Ux|WN}Y)GXUi_uMBeNnOg<Ob)1 at 0Xh70#Zd&Wl9TDUvf!?Mo~cPYKYEu-8XcbOzH
zHtAV76zv*sl=Z^mxCOyc*?xDr-z`OjlLQk2zxT$WdNM5nk4>#K6rL&W67P`qmAq5j
zxo*9s*sW*x%bESMRI_|Po#9)c=j82{OYAiIF#>%|2ggaTt at K(0pAoUVkiD!^Z8IZo
z%1yYMds#0P=^w6?<?hgN0)g`fxp;>ThLEC~=@nka>;hJ!fa at b}kE*SwuDx*bz=e|s
zbE~PG)w<EATNc>*bmRJPFEsioNA~(KMWn9}%Y_ at lg^v at H2U7CnK`4JvG}bs{wvJCA
zP<mqkN+ at jh5RjLnCl8d(<4NB3*rc=Rw%qM{+3-#;-md31(HC#hD^8$_F6hT*Po=oo
zldBL!MTg43MaD&irSZ0lWK%A`!Tz{u__!OnZ%KyCO{1 at xrsuX&$8L4>=1n&INwDEJ
zGkky@@0>(=x7g|1P~NTF+uwn<5*1X at DYnGdT<KZdrsw8R>>NG2$DP^ZwuTtZR8x1!
zZK~DCS$3hTQ0Qzfln^Gjib`2EV)m7e>~rkweaJqS+YHgEkFxh+i09c5j{@R0yB8iM
zh)0K1fKy5vekb7PbA#e=G(_LCNzcyGOD&mMI%eV>JQM$sK}&I(c{zF(cUoOqH!q<B
zv_ at yUdH4ug^*@N1pTQeyYjjioEYBMe$Qs~diP`|)X*abOO}&eodI>ePmzvS5=eAIb
zw+xwNq6=3!x^O`RE@&V<AM_XYhMVE3oL>7fd&BH$DdM5zZxI^&WSLu{sU5`_m-Xy-
zvg>7{h3WOOoc at knEbElk*S;*4JuTBJTh_7dLL5AfRk?^=Fx38&7hO{J1v&kKELl=R
zS;y at O+}&U7wlflAOLa7hQrT7X=daNuF6QSOPr6{gF#DpOc~O_LFX@?=bjj$}nZuwW
zrnuYJ#EqwPt2s~U*u_GQuhV<_>#~5LLR+a&V~dVOl!go2n>0~dF-y15V+)Y2E8=r&
z(T99c@$Kj9)|WxEm#FlwgTIt7`n7@|6+aq&bo_++ezMRd!PCw}=mX>7B5IARJHM2P
z*wVWo$SC5M@~?t8g8(GI&!l(PFWH>XAz^?Bl^}S;45}h{lW+loiV?io4C-7C{^3f!
z+J&?OoU^OTss+lxl<ikKq9|ZIt*4H8h at Ro=fW5>SLP2;yT)&p#4{+?*q?_H+{Mvnf
z01aHMrx)u|ryn}bxLOXT2v6*>TOLGkHN7tFkR#0}`o=FF0dv{v8nTQnq-E at 9$ZdX=
zw~Mp<ip1Y|GxsQc;BoWgLkx!GP}0>cAdTZu^OJo^Ul-d%`gI`k$H*#@xKt7Ex4Xwj
znFE|hiZ__mvt6>gc<aDSbpz?_I^Bi6;<4Y~)nygNV1+#*VIL<12m?&_IP}ImS`QNm
zQIc_kj@%K=ib$d{ej21nHIGDdb<=^brS`T=M1V`p&D9CGa6D0*tLK*S`zMLwGQE~B
z8aF?m!l=Rg`dT?PfMoy(nBA6J;LgoL_xQ&S6lb~00auY?wzzUVP&*G$B(WG2xy5yb
zyiI;rKEx{Jp%V$o7nVLvNLpArnUK`5bSfcv!_w)5<i1R*CL}p5b)F;XVd<K4q)=Fz
ze2(PtOH<B~0%7Ueb0k+-ntF~DJWrZ-j^qzZ)6bEVu+$y#sH%3Dw_VQbs56bH;T(Rd
zo|&o>cY?V{_|;GU1~3a-m?g63;MfjKKVxPThkKZP;0AAr;<U>`@WBc;3 at c8&?(mp#
z4t&Oymx)k%f~V^<<MP*W)5Ft6kR{8$t7j5UVe`HkCL<YEfb#+`JNzt#9FLYPqhCHs
zA|QX+D#I(v at H<ho!%tO2tt!4|RUybqjiPj+Hjz`%lo~lf5)jW;w|rVRRt9=)jZX>=
zD!udAI`ql_1=A}7a$!}V^D=Qxa9QVNa0m1SzAqVoJLQ0w9H@}q;f`5MijMzW{0<A>
z?Q`|K&+IS<ZkvhA^t|8fUV+zn-`Ea?&^oUK6dSMeenip}kz2qeER1;ls`fr_tN1&-
zt-?d?UboBGs`EPYx}JGmmxvu}C3ei%sMplr&c!`5KSkw1ZPR|alS=oN$~e0gx at kMA
z)%uk!yIe1ojq7ydrf^|Vv?sG%cN;78(n`@Y;LI2L2%Bwp+;ep6%<UC at QtZ28P2B8h
zCn#D_H~XYXgj$d3(NP!^(4am_CEgqiY+p0I<X)k6zXEozmDs%;)m2=9rEn25T99K2
zqJ<z#Ut04VuC%ZlVt#&hp`KYt3-gn%*s#?)@*SE4>4QyDYETmfh}j5?$cXzyBJp*P
znTP^JaVB?%3x3QTk&xL(<IfDiXe{re<<8N-y}r)TKUvJo%Dv3gy=RJ7QwN~?lA><8
zU1xt+Z|YN7BY1&6b!tB%i491tZA2NVb&XR8BKN^426z9x(FRAxd(DhXof+4Qj2kt|
z_;+^3#dR4=X2!M7jL(aVy%EazM|Q?V(T0m^88?_2A9QBiATmBk8M8MMs$_0tR(46m
zO-MTE7Dy_5%~zu|4KAVCU1I-Vm&l!$3|6B5H+3B%jrDph+Ssf^IH5SIX}(@lr1~~N
z`zzm<Ox*PtbN#*Z1gDkv7&pkg-JIJ at 2(nq{+<6bXM4L}B^YyGh`?RN&e%d2j`J=Ol
zjK*#pQfjIFu{af1jZUXV<Hj|vV)|^>kf@;G3<+k5%Xrj{`9tqN?lncKCtZBpoc%FD
z3PllcHF<8W0|e>^bNvJ}*Dq&o^GiH2`OM>K?p%7{>^%20MHh+IZMMZm3gBCTb~gYz
zeS<8Q+i!Ga<kS2q?%02KVnLLrW9o1$z10VYHj%G5huTb?8 at Ez*5wSOFMo<7gZ`nZ9
zeLNlK3bY1JpHoAWT_&R32}E(=AtA5>YLN-GgrUYe+v$LM&4hZEp}yd3Z(|MWITLCn
zpr9DNl$(b;Q`7bIbX~#*hKrVj@!9M3Qu=xw0_pt>)8K$XVuljoD>LHusoEX9zWZTB
zrFm+HcL??ll%oX;d)L*lcfc4F*t-tcd$)zX<w>|7pY at kbJR7W-$P4mSv2k~hFm+Jp
zycI^>yD8%Cp{P4pX>M2~N#*AFg8DLnx)s7)aqd!$R?^j|Y-4W4L|pow3Y3{38UDCp
z;%E!45VX8;vlxBn`YRS{Qd-4SX{$h<LE&Go*wPHmGD4P0g%-sMErys6#w~h<arr5|
zIS!nBN+9!7dZkD*(V&gXPYGP6??}mnV}wcxF|hTNknr(;Ix)!sRHJ$Xly)ML1E at yf
z2<Sp59yQc}YSfGd`v$ZfGb``K)T(_4<`%BQ_e8uGsM<<Z at PG{$b)47S`IV0IP5TXX
z92tHB_zB`i!H=4R=O+B<4r!|+<dC&G!VXERBjS*=I-)2dhMzdt%I^$iD;tQdOiH11
zV4gQ0c8XznBoW6GqZg>0#o0pl4tMHAq?VZzDm=Fy&}%$qBg%P;%bD6SO0Y~8L3%LI
z%Z%8A%!oZWlo9J_DoyN2l=G49e6)LF$2s{X=F1X!xNy$HYjYPxC-Rg4z6 at TQ5pfRn
zH+IG8!P-*+yg*$lcoru2nDA0*ie(*IKES$?m}q(UHvk@^>okNyUlB~o at hCMW(4E)1
z^P%p1*t`cfwqp!DvW^LiX+JoM_x8*GUvFOm=G2v)sV6-xwdg%PsY>{P=_YM8<<N4Q
zxHECL)00kjItsxZ*Gv*SOm`%nRBessOVTrGLQiKV^Q9V$F}B%FvDiQ at Y^K;31IDag
zfMTmBQB`)^7_aQcD;Q&g=KSZr_aqgC?JS+|qtIQ>J@?#m&pq$1=LBP}id3txj;m}D
zYyO^?V- at u>(7REGy1Get@|&sUIrfvm at ED3l<EQ*}!pEqBbUZtt#54Xnwv9 at 3$!!j4
z3?Nu%r^ehJ<C|{IV9uVoIirAXp5ywsqBhv}eKLrvqD}>4D#}x9Eo%OgO-&VEmI3k>
zo0Mu4pN*uDFwCk1gyGf>QI*`vjjFb|<440u%7OKpJmaOVtzw&@&qt+9sCB$>ccy2&
z6^VY#KQew{B-GBN22mz*Gc|S&<C<N{stJ8tbo&#QKhhxlBih{_DeLwicl+qFZV!u1
z_)@p^?_1PHLnjjRUf;E$*bSt at O0nUX;TF3fX&kI}w$JN+;1Ug{x-!8wEJ>aWT4#Om
zShW at -4KA%Zzy?2<HG%@()=aQ9=4k^1?u5TciV8-8^SDapFT)DM-C|iq$s)xA-eu~?
zHx0&rLug!LZa$dDWh+vL at Q9?~5KI7knZd2;%V-{97}A<vg3Ye*kKv7%a;QO>8cHUV
z$!{3n$W9E6{)W{2jS)>lF>WtM)35q699$AfpYTEVUxr^_>U`i7(Hf32-ptU(DG{F4
zK(nmDe%?+ at vW*A5vm4jYl4nO*&W?(ld|6JuJO?l5L*B2{)b6gf6gRZ?%@r$nEC+gn
zFazEj^!&+}R_IVEEMWh3g&rSBq4Pe0rMT^l0 at B|%52U|K`Cp{QNiPq|lj{AqF0^%4
z=z}sk6uNFH^g$%*IuyEYDfFBEH46QE|00F{yY|S2Gz}`(>6tJ_udUgKVzdqo46W4c
zWvPySh=@Ty6oVOAG?=f`*?&-}vj>%HR|Xi`KV5ug;Qo%cBubwMU2Is8KE)U>X>r_^
zDbut>7!6_mpaKi4R7&&qOY?_*GO%LwiygqY)K4 at 1$kB|0DnEq-vBsu=RLKBrD$|XX
zg{>5aoeH#~!_#W!X*H~72%Zi>qSKw!k at iQf8a@FDp3^HCTBcfWXEk_}r3P(!1%t#_
zC1Yt){*ZhF-i>Yy4&a(hl?CoE)1A7dJN1(8)JwV(^h15x>Q1CUi<UIr7i-d+OPciN
ze}N{w`8T3TSM%=1|LGoS?K810A>1fQF7Z%OK6~jVoV~Cap)<vzbEZ8fh?lZr|BM2w
zg0w<!pcOhT-5aoUr{(cL9&^jKa-5x*HB7?yV9V}$5 at uXaf_0ou>#7D?SJ8T_f!14i
zx5WqVf7U%RWv>i!4?E|eFGQ_lGGlHKd$`5|*73Xi7*V(*y&x!FtF`d4Iz_G9;OqFT
z>c0|oS0r%`|6*`><F7Rj#c at TZCc7_cyc%Q!Vhe)duQO@~l}HuQ9y^K)=&(=XoYv)W
zTDO5$vtMJYB<nnqvrvj)QE5l0MR<qBpu<Y<u*~dp5##wt_92}w6F(Ddd?v`wuz8bf
z^nifBLx9_ZjoX8jI|yLd at 9_<T(Z9zG>sR+?uKUM?(pkyzU9W9XVO`Z;x)HS5I7N4b
z;^phPuR3k%a3H`oKeNq#(8N{zwNu3s-YO`kLtwtMY!TRLZObeUwuDQSEE%YhS^Thj
zOGu_lzEfgNMgJbYu77d$LhzOG;aL%rIiiH2yi%LBPY1D?Y8TmNUw=Rmm{e+<6``7+
z4)QaqSwULHwlvNPN;dq{+<&kW-zqzI*AuO>RL<+AW%bzww{t~NXDpP%;PD0H9b5L0
zZ=hlFU8_@~1Bf&R&#XxQ!PC=k at a*7vZvLEl2xup++Ek;F59?*d at V`3JP(~VqMjA7v
zk;ZWPH)gTp4?cGR7XEheL3O{o- at 8NbMqkgDeNuTTR-MaBsl~zJxy6v)Jv8QOgDMW5
zi4(~;f{kx5L-vN;-rC?ze7E6DusfeV8SE~k-wJkT<n&n-e3rzeHh4D?`7L--`IglD
ztsb)>{dmAMvx@@8%0TvHsPRL;+azt6rUVwIRT1M<g|gtJ)67FWSP03U+TbW2 at f(6t
z33G2gpZ&~FXi{$m&Fu1M?#*BY!o$}g6gPpMr(UlO4#K^>BLU-3G{P)DMI+!8?}@z-
zlKr*8EqJ|mCTN at tiWiDsF|&uGR3a+gU?i7^^WuF}FWz4mZ_-kxuV5UMTJduxSc^-;
zXM*GVu)SCyEDE;DPEtat0VA5^;l!KNJ5nL{j+Bw9HQ0Wn3EkPC at m8>nun~&3b}EKn
zUOZAduX*K+Fa4Pxj?}@`bAqduSnq?V)chXx!Xuw2Di{3t8`J8@%h22h5Saa;0Uiq+
z2>DcxyhavIA$`M|r>n4LcBe3%c5743txdJJHU)2OQu6jH0(SA5d}j7R?>MX+nyNzI
zk?3=Er<tirERm(eol^6iBbrDg at G1;PR`gqoS8KIwTEyD!4rF&net`u$zVw0YnW*?Z
z7tPeheyZYm+4xWZkIZV at V?XT}kExmEu_si8EeJeX#8Tx9<_Xu~9fj9Q8CVtdCa0^T
zr>ib%7}lFL=~*fto}G%O=ZMhRX!<dPg6S!4ehx4J)*SrU{R<_zsy<Yu5a{`6OzO0(
z)djNeAck9FnE;4a;BORxAOhG#g!wj_{VJItZ?S_ken%x!@IsWP#4=l-tFGU5t(ftK
zmyi~ms^!u78DC<mCS%Ge%sB`?XM~}Ns_dh>Xij!QmEiS2gni8>%%7dD+O+v;ZRL;`
zV)Bs9>3ohR2x=)7E8L}3VXIy<^No*c?hKwHb+Oz$$#U}>6q%aO5t&n#$efL4YAQvh
z<_03u=ZH-0jYOvQdXcHMMdpknGUptTId}t+Ir61MCTMqy(obZ98RdGBdG|k3WDdGZ
zA|u47LS)cxO8)|pc?2T!h$S)yLtYY at 18(>f^EEX2e``Wh75!DyUk&}$(qEANl#I;u
zd-G-i{n$opNRlkPIL*^4X?$-;Vgv1 at Er&Px^M#HH*u)?_p#zqkM{4VY5luDOsd}cW
zokF#ln(Q>a_K(@=>olFJp`}SMJzZy`ki at z@Bd9tmm3~xbPS#L>q=*oZ^3P*8tC#2v
z{k_W-8Vh%Ylr=+F1il$MNUq5!Uml-g;rlJZr}A2 at 7KMFcS2a^TlNv*ay!E#iiy425
z7GgikF&E!y at UhQi$TbX)h2)?|J|+xNdT)jPzSDl8&7%!RKl##rPm>o7;DP5Y8+cVD
zWw_~pdp#s7*v^2BOpHRT-m6>j?)nT~4&wsA5HSFK)HnI|#D=Iu9aNL4Ry?q|EDP(+
z3t)Gj=R6o5*bN-sR2!O0bvIy-iRgG>KsqX_cB- at oD(G~Kg;MNXbanWy8&LB#-b}0_
zJ)5bHNv%AZ{Idli*pK9|zaVxz5nEfnRS7HlctsfU{06vt!D`~k|9I|JRQ-kAJ^O{+
z1!GxW{x#e^5~_TB8M5!C&(y`e^fqZ|?mT9n-Jz0|DKk`VWol_1Tbas-0&X^o6JK5z
zKTsckvM%0LA74=yKUg1MRu?~1f3Iv=oGOF{vN+X_hokSHs$-!6jPmq^@SN2z%uT`-
zRLFjQI*UntFNnV}9l-J~u=Isok}L!CW#=OOY<<|6B~tEv<i8TKFWSH1<UdCFOQqaL
z$bXX>?2$!--wIhiki?_X%gBE_<dOL?O>&MtdXDaDo}>5X`LRrQ_7k2C=fyjkPsPgZ
zqlh{Bqlnb}QKT<lXnduL-$T-zU-o{Baq!Y=jxGU@(W2(FAIOPin$+y+OWs!)eV^2P
zUz2QH#_9g6T=rC`<iYB+({C+Szb&JF`xs=NDQm{r%4S?c{yAp0iuXLh_>ubTT-}iH
z4*Yz1`cY0-k^WA|eoH&gs%kk^bsyepaf$l!mkHCg_`*<bI^HC_8<M?VAC^64zVN3W
z_-)#bx4G|yyuwL9vKTb3d5yF6#<_Z9dth`ii0{?=+|9_I&(+n?zcDM&$wg5A0WY=s
zyNja4pb{4AucZOw^+5KOP;Mz|`-nIYREE>?1h at YqgYk+McmJn**yB at 7;tlTGtH<Z2
z<N4V|VqQ>z->+4H>}T-Fd5O3lR0KOe4!J!+r2(_AyL*k*ZZmQd<6G^9*UP&nQ)(Vt
z0{O;$GQV574%;VX*sd_uL$EG<+v6e(d_aCT)-!iY7KTql9;%Voi1~Y7ta2N_^759#
zue`(3o8W=$Gq9`n+r+K~pSL=>d!+Gg`Zwmu((+_zu35p$6hhz+^ke8Xs<ujriyOpX
z>T$pExZa(3LYH#K{g{qa+_oJWaQ}%^HE0MfPP&SOFi-{eVJNXs$E}HGji~g0ov2*Y
zkIIP({>H2nbmb<1q+e;ka7*QjmzXy<MN7 at lVsdVVmYS_Kq-R6QCTKFj;?e6Y4eq&8
zv$SN;*rCObh7vs?DG`*?voy+spA^j}RaHNZ%V4V%<5>;%@pG$`)MCXLo;{`J7AvVm
zR&bGm0TY+Jvy{|xT0`zREwyq`LvH1u)bkX3UNdHEe9dC9PHTMKn5p6JX=<istWx3|
zwRoXEu_f$I&(!d62KVQUWs3EVCVs5mc!(neEAk#!8e%Riu)TQ6qq*Hx)%Ov5HC!r?
zdW<!Sbt}AEUZ9wrybEJYS1jFbwCck;@%2cpiBf8AO_bzufs$IGn7I{-(WbCpGx7We
z?{+kacmQu0``zs1V!yjtfgR9p`GnN0;I#}Ba90HZEj9tOYyzl~S*T>#K$T49O4v~d
zFg~Pt2qTPw%}`9EYI1G{I(Z5M;o0A8g<XBjRz?}mdRV%j^<>-hQE^Dl!%PkyQ_Q9o
z%|^*bxFno}l)&2oejf_ZQpr<Q{Wp9{*Hdvm2e;1aqcK-veN;l;6gPZYXFK$^Q8eb9
z*F&?ExYSAG7>+LDS3=az@=|$lT}VdEZSwOYmusp<!=?IPWczoT!=pLi(R8PobEuhf
z(99VQ#DjpC$q;x3wku-hc12PT65xYM at +D9Fq}KQnf7fO?MdqT&YzOIFf}IPbk2w%$
zF(l?xMq4VQb1S3soalOBpYLE_PuSN3`vQi*>J)BEG>P(ss(ZpIx)wzja?vpC;!)AH
zXv8q935y)aPCzbpD(NK1PE^wBK(qp)jr;qX=<gr(Qj!_LRxJJIS`}#JA5Et8JPs)H
zjoljkXKIkqb_dI1VCit`SxhAtqn;%W#6mzUbs!cJ#6mzU)8J1U>YWBcXA1!>w;2E%
zg)7P!@FZslSI=khAy`?K at D>s}85v~AdMkG*ipv+q65W`AXK(boRL?Hcv&;2%PI0+b
zF%B;#$`o5&R^6J4oV8^+>uylZ3LWRfqwp)Ld6KG`!qu#=K(?VGw$WkI6JXLNhe=Nm
zlb!&RHaie4fOv`_;EpgRt+igew2)S5!7b_(g>o&5aopG4I3XmZRx87EtCf;s+2Y_@
z1YBF4+7?l{MW}6CrN};A*7EI at S<jSZ?QpU>fOn^Zw}bF at 0Pijb;xRz%W{5aP&B44c
zPJ!HGkT^c4wpxJEIZ3uedk;(MNJ#3Py#||!6VB9(J10|$m^ox$)kZls<lZP2F_QL{
zk at _sxJRFw7ppN4bZlYOwiezMbkI+pf1cr(}S5n2W#rM1>dxZL*;hEH%n&B~XGdxD8
zzdLU>Zell?FO(1AePtEzcQ7ph2M#zqT0#w90v>f~vRqY-PjRbmeI)XQd!AH0;<?w$
z^`+-t2Q{y^s`_RzH_XWQ%vWRq^hz1fA;vdY0NwMbjpuk7$YCZ*5O{<odnifv8O?ap
z!^=8I_M0AIK6#dVJY1}oLmiMDr~{IK>hu7ro4ZOpJ7ha1CKn6xiClJ%)}3AfS37xT
z!k;>WDS1nBnv$5NxJKV1HQ&->8lOq&&m=RsQctYZU5!ipl4&gSr<eInqr;!>pr3Ys
zx}AQO`_s$)yi($dze*KnyCgG$`|W1BOX|)Zl=2+Qrw at XjV+==YFXJH1LNOJg-yAM`
zxbqyP-`o_e(t4Q2F>FpG`*PUKcItc<d4{K(^n;WMc-fl#E~cK}mDt(rgi(B at d#{_J
z_PTEbMe8z6^4NXQ$CdpElLt(Q_PdAW_Pc3R$6Pe5VK>Eu$+a5JGAS#BV?2IpUzS!a
zf;0#y217lJ^bWY6V|_sL4GpjO+bGti#1DChpiO-D6d`zTqTX1ggH11KGRaxdjWKsu
z&#>m(dWSXF_YG@~z?O?7PKO+6X%W|0x at BVHo1RWK0p3lan5@`xgu5{Ec<(`XNqU at 8
zQ{0q7r7&-xkeA}CmGFl|)=VWaQ*jXiX7+qIoTQX_3W8?#H2u97PRvt0M4IuKmM4ix
zEQq*?$O1c=O|6R#&#mJd5te9yc1q32Y`T)S4P-O1HY)uBa3L<jr_4Sal;uR^W4^Xy
z91lnSkN}qXOKG`f{!|CYFN=7GKh at 6hPei=kpIXlGD<Zz!Ps1C=Qo2nV+Y(JXO`3Fy
zp?S<6n$%Mb)Kk<&4b(-jprpyvha0FPl6Q^1i+NGHPLw_w=Ga>ti@&XPrcZ})4;_z~
z+Z71zY8_Ag8S11cb1sZm)HH$=1Qjdul$~iBZ-kL>Lg0K&OT0xh^7Eo1aj7+ZLB!4p
zkn>dSdm`l>k^g~+T at bO42<J)#*P>#sW)EJvl`d>Gd(xK#@cRPz at _@h}*uYl=@J9l8
zw#u=Kf{sf>$JKCZI;mCqgL`V0f7sS;r?hs(8U~j9m%fg#u#SRC7CA5xe|^%cWh(Q8
z=JQomvoo<tO|pqoV_M5hvY+eY14CblDGI3)#emVtJZz*2$F$arp>TV&b!|8U%`~FP
zOJ5%NDTPID-Z(8-P#y5S)6U!3=QKC_jmpR|SFD(zC_#6V47Z{%zbwSWpt`Jzwc62Q
zarh|Asa|tFJ7VntL+<uu60@)fkG>TOErGDl!%|0|=>e8z#uS2v6IKdfj{mUI_%NFb
zd6V(^uw&3kHNM6Cg6phx3a^;fDYRk&r>q6j+YU+VsC(9--jmGsI6q?NVan5-&m<!v
zo?k>T%p+2Bgz;RF*f!lM%}bxV?^B_v3Tx=8O133pc8<V>``<=vZp4 at u$rlpyBkoRK
zGEG%RrKT#$+vxi^`ZiB)s)7`k>oikTCl*Lmyg)J&YiJ=34xZs}y7hrS%Mshr;JNaw
z^A+>FckF2aoP}K|n-;uVK3{kb%lrT)mum-D=1<_iF`d>HMD78w>V018_uGE>fYwvh
z>c4LL;X~$q<@UozOc(5jth;`bWF!BLS!I*80c2g&aB5puz6CKyyVsSTgFS~!#9xn0
zRhZB#A8M%LV@(ct<QY(KEgIXQZ_zxHn!LswE#u9u*PA^fnta+q>I@{@>l)GIPp{WA
z{(zrzj8}a5*iREh)t%m;XGC-}M>pEhQykqSqJ@~6xJuE at B1(fv#GkUE at 8#$gJNjLY
zZnX>F%F%63VG(~?H#5HM2AxPiV53fzBd|%QY7yA1Q-ugTrBh7^Y|*I>1h(pg9f55+
z;YHwSoe*LZOsm*&{zS8PF1K6TiL0fdxlLgD6>WfR;7_&6ZQ#!|$Kp6-{VHb<<|rm|
zsizcpt5YayT6WQ{Y4*nPGvyn{Yp|!d8TA%5dt-QF*ftsej52J at S}A8>OC~(P3I3!o
zOwxqxoz<O6cRsfp$Q}%1%M~-lor<wrfv;z5iG)jgw-1GF4(zZvu#Pyeoi|0o190Hs
zux*`wp0F%9k1Y$%(<lymAz at gjzl+KoP?GzV(fbuw?tqf&b|T$M>W~vTq@?yak$sBj
z6XKKY0th^v8g>ich{KwXYrT|aM((0&={HwUjGbC`mlktnck0<)Isi<z=yOELXODPu
z^z-%8{`3(qzRr2$h(bY_^$5ct=49LgIg0HhzN#xsxb4<|5x$2I9HlSRQN_qB8qHCR
zV~TbwB_30f!$%Ky<&G(o;uJ_<kq~`WX`JnmFkeKhmt(0sp~)*oAI-2{*MgV|KSwFg
zDMq(qBB^n%ib>`45<%t-2r{Xh`I{i<Af+5sj6)R!&0vDY6Fprwpr?z9b^W{1v#+A|
znOyr%NG9(kMkVH{uEf1k^SwQ=&|GCU?$KRlcCQX&`o at 7$L34O|uimeOsU0pBk at AG<
z;yu!%GzUBi;ht4i#~~%Ls9zn^!=GD6c?nU+p;8?t)nTHJ*=2R?yS^RIettXlUDu9%
zr8>H(jxOFq<2v^8qT=2jW3Lj1y`!TFb}*7JD2*>DmUTj!5x>PV;^%Y;{+dbB7^X*Q
z>?wnJ+kqKIFkK3K%_k2ljfcx%PC76nL|y(;U8aaxSi3~bDt}b5Usjt=s7v_;W+5e!
z2>k;!Z!a}(uR_w%K+-|HI8fe0{~6rNKCidf2JT)UnZzB#;pyjflW*5eVxvD(B9hr4
zn0cV0!*&*n_C35wW#)nAge{x3F&8)qvy&9UeUhpq5!Xvi$Sc-+F>}Q3p4d-UYj5&F
zW=j}ekq`4#n0xu9I-C&qDdXs4+NT)R*|~%8`Y0vFU9L|FZIIx^-plf8CKjs_)7BTd
z9qt?<;)RlE6bhDT6dVyRD^k!7m1JCTWSlfj18Eu-Rx>f*sUXD_kbK{;0^>OazGAPd
z2Y09`$pNM&^257+H59akrSYIR<AD at S11Xxkwv~(Qt7!F9ChA%J--jqj_dy%Hk~RiE
zG*BD%Rr2&_1C6(gw?+GtYekx<aF70kdz8b}rFrdcMs%Qp-FKj6B&?A30tB>BDWC;M
zKr2{yfW>Mqe@%z*cWS_)gN<;8!6)7sLU1Azw!Jp()62{wug5eajm`0azU_}QDovbR
zUa5iGL at 9R#UYMQ;yM12Y4=vwBW$uWETkeSV>m_$YAvP2K49Ziw at v_o6N|<IS2zNOP
z!}g)-0jBK-^l!`tQ1%iu+M<C-TilPdr4DJWOxizRPg>d{t*eYQ>LKG*h3`1Q(-EPe
zY}jv9ZC^-sQp>0ch!$~|zXHT+)jZLvHm6kwORd_7R=t8&wR5W)%IEO&wfK at yZoZa!
zT#K&=<sR2k3$*yMP;LRH^&R2s4y;e`K|mM>)_C$grgUC?LK!^<$JI-jhI+W3EFD*G
z0u5tuLJ%InN9gh}+;x^_v at 19sWqWgdHOAYDZ~&>8={|N;OgMagEI=uzmUFTlYPX!P
zX&uFDvz0V^6XoyORpTm^Z`{R~&O1xlvnsO1o%B_u?0FU0^Ei7o*Zvh`@2SY9ST|h#
zd6~#H+=ij$M4FAK6^Sj~y-pLy*TKoPjO;dIhj2ev>5~pc6 at h%6>Po#$3;efHYF*gp
z_xW?g;tcN=XS|~`-sTKeP3$lAEj~`o_=Km_ve<k(X1q|t7R4x){jD0WE5Z;lCA_YH
zP73tZ5Wh1%9C(C1L?&*K&$k at wB~K|tR?L;ytV)fi6!hAL at byktH_|NM=NGg5O`MOl
z at F`*im9ZLRoKe_4`w4&cP^huH%9ZS`Y3yZQZw}i&TMs)L<oon*%x3o4`Wl$=6tl3O
zL~WtEXeH at L)K-qOr`CH;*GQJTx`O>ij^j1i{aPn0+D}N)e!_<*VK{hw3rn?o9<OmF
zKU5k&R9x8V?5+`(Z5)S%2m2><^-nk~62kXWTR&0Qqk4Bus*4ypq9 at l?V+N!g#Sg-p
zW%h`kJ6MxC%;BSY?l3>5B5*5@%UO9{C_|u(<}jl<SQGlp^|@ri<YcO>HY$41q5uy%
zK9_!Y_3J7T=hWI&Q>qa!Day$WH3+1ldd%lgb$3lns$<WnVk21^PgIoZW+Y|pw2>Sx
zAt55Vu19hhsBaI!f>a6tB7kbP5)hzjsGOC60AVMzRssTqBXv=+=)b6>E-4lnmz31I
zO6ojEyV3ab3K~yo=aketoNOZb9Zo){fZ#)dU>pE^%n*4!=I+RStgr(hN;*_yTvXaA
z0nkTE(3csyz|fZkG?HqJO9Xvcp`uCE_*jWaiDSByP$j}Z0F-vQEREpaXFNT6?tQM|
zeT7eXYT0q6peLQzQx_PjSI=Ews0;m}3VOPr)1XbhsdN*AiG%mKiLb=C`{4UF at unhU
zI3KNHlipN at t*d^dG&J_<9udFTFTN^b$MMc4?DhEri{0#8wQ+ig?K{0|ak?!rEiBz0
zR&bV0+&_<2at1Z at MQ$j8wzX1spwv05Bg#ur=e%Q;GRsPxLn-b!lh*Jr>FFanhb4rM
z>LQW4r(=AtNF?TWjPE11=iA|F=(19vUoS}oC1vC`BCS=317&5rZB%J1$pPh4-S3w5
z3&T*_xw15-8*M(PH2zw5lZrK-(V8zuhNoZF!IY&TepeLs$o>E<H{RNNYhPK9-o<>U
z?i}9>Jnt*%9yBKVif)Z#5y>9c8#>v83;{9zeEMRvtj{ex1)bVSAQzN$@0Y_<NMDMQ
zian`FBA$Fz7lG`ndiXY2uoN9j at D~-qX<{d_8G-ZYAa1tP(r3c5<PYFg;s8>0qMuZq
z=qFVa at 4iR)Hr)}HiDL!&5H<8R^cgSKG>`5v!+Rtbq9*236Wr+9<6-?rtTf70S&d-E
z5nY^zcGrv-db&)Xsd#&5BN1Q+YoN at A3*--%Bkw9#aTfBUR;ey3#k#dj&)LWyE+Ic$
z10^?{mJ;GQA>}^gv8woSfBNCi={-yBB;He`8#g1$kR@~_Xsb27oY&<ptE!?ksOket
zXC*$c3lG$&C_|Rem7uM*_2x@$d(5sd#2 at EUn)piZ49oPD*5T=f8wmx#9frZ*(E)$q
z6%Yj*;%EtCH%}0LWO=fM2*FcK>WVTvcSW4jiu8*&l}{NUik-ZiyP}8}hO;6l)If!B
zzaeaUVSlZB`tq8BzcEh<FYIRlxtAcTYbq{|u5*8Vl{>u-dr{AZ at x(4D79P7I4Y^&o
z==dC`;>3HQ%w}U0VK!!=Y?+N2W!#Z{8785g4_BBFej(h?gz!Emzlhz={b9 at 8bE-)5
z)S{BQN?f?A*cNO1o8~<b_K3Hr!<xU at Bh1k*l(jz)2Yide!be9>YN2fYz?CCX7s_l{
zNnyiEptjt!65_(RQt|;cR&0ELt=)Eo at i=*k#JeKHn(yiz$YO1?3X8ShB($%~gs54?
zE6vwsX<ScoqS`o7brD7r2(1=a%`&bkteFV at IiHJg=VPw)r7-@#5~kFAdX0~Mh&AbU
zAC+mKGPtl2_5^BbH$n$D`Pn|D at u1p#M~|63=`S6Fw$eu<`*xXC#@6wq5l;Kd>^9Oj
z#LS-Zmzis%uSs4Qmn;bTkW_s`dIzY;cKI^CR^wA8yUwjdnQ9Tq_}X9*pjjPGfT>w-
zz+Q+FY;G3pA0qm0G~;j0b>d5VC at fdk)IK7KTeL8G2-^D!{b+BJ3;l?1@)r72?<@4D
z9?u4ScukP;X7FggiaJ$TM<g<^T7fe*3YwWfTRv0OX8HU(%wl&N&(UF$Fy0#OEVD`|
zY+#zhc#2+<z9V70ApRv>?5f(&Xvj9J{Vfs`kLcg)dbU+dulF%C3qEGmQzEw6SK=@v
z(To-A at K&D%lH~{jiBq=ZG>@HRHcsQW`$xlg at IH(QDA`LErC=|a#F8k$^8sg+HRF1l
z8MYtXzVZ1FZnu;k+<pql%k$|=tXx+-p~a-!6IyDa7IWtoYN<t9%#&M$B|Lp0%FmjP
zIVUY|S|=@ArJ=dW{JLPEL!I8R+b4T}%Rbb3N$$?)o|d``xehmW1E#3m8E@`kK=#=c
z84sa#FNSSzNe`)J?jb<D6t=I;zh%|Ejp|O~F2q2)Eicm|mpz7co8nnn;ZMC(`=jhy
z%Gu|5n^7g{-<YSd$M6WUk8 at K-mUF00i=X!A+O$-w7C+_BwQ8w$Eq=zIYu8eXwfISY
zZZWv^Y9+T$INUmEQM{cfo{B17<0>k)QaZHw`cSSzOD)mj8$-DzT572l-(Q<s3e2xp
zVt&KHe9FT73}K!I%x at 0V4{uc#f7>a3+A6+-icbgR$#Chh!>O>_!)Lb1ZK^qXn<_PL
zQ+xA?XH;yGoOUvIQ|4~U+>OlroO!0QzOzn!XRP{mQhhC`@7zG-p63o#DDiRiK3DE>
zRiJq%3}5GIoJ6bn>{%UWcL?6+N}tuOG_&!XE*T3{W1(6bg?m&rwLr~}=*ulo3jt4V
zp^6()dF1*zH&01<f>+ps07VyofD2)`XxYHlT|GSnO%TCW7n>!mN-j`G^kx^Rd;0Q)
z^a3^D3An8a*|s4OLQx{6WrP;OhsBO(&+9Q)r?#V5bdnP9=q{=NhQvMxEgoIn!cF~L
z#M_HS+-`X{EC*!oQAs at ag10S#8rO$S`*BTjXcZjIJgyd~oNe4g#2Cxk at L1s!9<RKr
zl5MJRTxfx0yr8*Fb;E~Xc^WFQqcN%Rg6__b!n3Io>iTuXVqs5T=r%kzU!c|vg1bBw
z&O52ar1E_kKN{^1_z0?yk-5?AgtHL+vtlui%MhR2DGR~9h3al_Z=v8GLnuzCEbPa-
zh1Yk=!s|NahG@$=<?|3*o$`KI_RHP_qElpa3in4}sPhZDBgNez58NH{0No*1c8BbA
zhn$fsyJN3M^u|Kb8`RP!FPaLkaTy<4>kD}IdJ1-H1ETBf?)ZQQ>CHSEh08S>PBEII
zVZ_CXVjz9UK-HLJf@^DWcZ9p~yXeK=?K6#IG?&Ba#WBrH9Mhz1k4DLbJUobvG7Uu-
zxm3)ABIRK-W0aZ4C8CRtMtRrLD7#3b?8o=*5?2{7SFN2IsfbQ3wNi^!r&nsJ722@$
z3N5u-gPn)f(61kd;g;%`nBjM7*_X8RQk4RH;lWs;X(QnCTuV+27%Mfn9HG*bEX-xB
z(S&Do4dyZ+vQ`kQmDL)rR<QB1T1y_iDRJ~B7gcDQlry3?y+q9i-08Jo)MXZs{|ByQ
zXhtWfSSL<N%$RGnc%?!l2|qg`e_XFgB6KT>M)&<LN-AXE)4wlaCs#&aE~Swr`f{n=
zm-+fU^<K<{0}iMCOfXxs`Gh~aaHY9cGpT&zS`G8(D@@!!3F3SWy+r-^zKRxE^iaj)
zNOye8p at _7DO_EP|RBcF~Q8K>9r&J1O&nWP8KD;;M-P1(sBIdg3c_OcJJJ&WF at o5+y
zU6<pvQKxFGQFER6ESP-fG;c^7dFyqVIy|>brK!eBl|J?>RGMmRQ1L`mE`K5_$BH!7
z$Ga1ngv`gfGUF}J_i{c=_H0$Ze%hb$cI39wRK=HDMgRMA>s8#f!xS&I6q3GFO|Db1
z#m>E->26%bT>H$q1hNTJnyXH93!>NfpcXTnEi}W~0vRasHIX1Mtf;1ZdOcE`BQ{_s
z0d^wkR}lb?;R6)x%8wo+HIL~@ZdS34wwXS~q+asr6N<f)Zmd^_!2(foy_#=auSy{{
zMMvTH>03!naN(7^kujVOpAf-;R5$Msk+SL=);tDUYfO{3p(nLOrT)*+|I1bT7;m-u
zi|}GN5Y~*fYTNkU)F%3pZc>S&yr8EqPo%B0%=@fXTiEKdVA}8=*cvd}RgJ#P+ at Qxr
zgPOcVKh5 at W{k5I?wO!@h1tOP3tst71k-3eltTwJv3yrIsHWnH`(52LBwIR1!g(999
z33$D}Mf?$w;CYSRP~upk4!Z{%)KSzue1<Z=#)Mz!Woo$5<$~phUSoxt{ZO}#=16r`
z(K0JZokHoPcHh&fwD`5+ZRn0pRZhRBi(|G!(44qAVU<d%R3t$wN|hq?YZo9oABcE~
z&aZWkEX3R$!iZjWR+y%;9k&PD+7s);QcP-X&*M4CqzL>Cf0YD_hGj2xPo6p_wN}lW
zZMn57wS73X9T%x0cyoLw!7W$A^yx}%B(7{!lcyD`mSnUI=Qbpb#DEqONWM0{Q8hMF
zY$M7~j^OMKg1DRtE=STsoP?KS14+>ot}xC8hEoBe2@*mz5nY6r*YJC4aPno*g3DPE
z`_%WN@>Ad4n4M?vSS?bTpgtObH at -Ttv9Uu<?o!RfE>+6y0HUc8dquGW<82zlPLrVG
zW${&cnmR$AoOoKrmqy(PPj<<RIt3>uF6t7y$4p$(;hM|kil40?6}lVuqrDr$by$AE
zQt=0MocD3vC|r6l4PiYxxt$P8lM~w+vBxqtZen`@)+BZkl{+a5C|$1U5jb>x50_si
z^$nZU<fA`-T<XOsFxwp=efm8K$H3l1b5xqt7n%pji=V4+?G42w1kWR=bMPGm6%JlN
z(8IxZ5xmUB-b3&m4!)1z8#vpK=fkz%p|5+)mH1efVxh$RLDD45&0eAfAupKY9}1hy
zAJr3e`S`_pTA9-#y>(JAZrtVz2+So6O at a8O`b=Q357U-V7QC^eQs}QJdfAS;v9lEa
z#EyDGL_qv}#EQzemJ`2X=X&8ZA^xcy_2K?E9$CixAvgXH1cv;6vFN{Wt at z2cqFgMh
z#p2*%@$1Fn$YPN)Fcr<n_1mr$iMo6%{fBWgBZB3`54uOjSrK41SCtpe@?fMR{+ia>
zn}<vlvX^zp6*ZDRq3D?UW5r^;StC>v`9;^vh_BikSm(h7+g|n%<bg+=VUytdW?1vY
zo8afhgcqH-#EyL?-2|UAiAgs}$n>yZm``*_TU>^1Vxk8C6G+kIh^+f1QXgNLWO>qI
zUo}LNsN`>Dqjn>1FT?gF9M^~@*p6e|Xb0*<m_(la+>pq}SJkyr<4~U4);j6$+;_+x
zZDz3;kOQ7j4--M+=L2#7?TY@(2~B?Euj0}VB$CMA$Axp6wcj$LDKMg`>gMF9dg4<e
z{<Hc{%Ug$)aJ8Nv(_$8q38XLULjzTTz#V=c?k{1skK65N<xlKZ-ePg<OSHphv8=K=
zl9gk3n%%HPqG9oC^}x^?FG2`>pXn~y<GQN5+_LMM?($5$$yL-{UfI<=*yW?huLip$
zk84)Mo^DPUET)@#Xu7!#YG!tsK6;FG%&kHnJ+CHTpq23pq>m{0oZ9%D>PqcVlh3M&
zXH{2j4+_t5bkrW`s1`1dZQOmT at w}SoR&gl1Pc;MBcb&_*|4c+kqb2$t^;k%aeJVDS
zUskglv^p9N=BUu0<KBo>6Z>(z5o9T4i^jgq1t2Up5&`iEQ2?A!S{w89MO`Ug&&`X#
z733*?<j|Y+jP_u)bX^UbZCbWqh2tb|)9U6>HL}2)kR?LVzvy<Y?yntE%)Hf(^u)n8
ztmF%tF|nc<R^kH#B~GeH{A1DJ`ONqaakX`yIt-WK0Qz8*VMbzMwpUH;Rb8X1k_Xhp
z0R#jV`X#{06*!-CS at idS+^03u(v?4_bV}H2B}lmYBN%2{`trYsgmqSeC-gm$u*pi0
zF|$CzdMm*TW4B1yXeC^)H>Dvd(wjdl7HLs;U**4)X#4_4^dGQ9e=mvtZoX?(Ci+iA
zuyVLrh<*=ERD0A^7nXxvYVxSscvQs{eqjVYz(4e|<cQCmoNOB1<Z5o}N%pFZz0_qM
zHy&^@Ytq-eCJk52@&t;|W;=7U$Sjs;&a*SOip*xMEc5@`nHxmr#PZCPow-G1zE+<3
zeLHiz$Xr!dmKmeW_(M^OCMeq4|94Vvp5_R3gE2SYo&tv9W#utj$gA-w(Y%n3WAwd_
zKYT-c4&J^3O*$OB>ltsu^>`nN76jgZ0^Ub&Oef8zX*%K{+{g%rl_3lYgj1s#SzsIi
z%V$T_#1R#}7aD at -A=NmnCJw1^*~AVB4y*BL(N3P{y{IN$6rd1F%8=@WE08>oki%+g
ze0o%%KFR=1Uh4ad*BTzP>HA-_qY?}QQU6*|cW69CC)!aD&pTeTqcYDsR at GTiFV8z3
zids=0&pRHrqkf)uJZeV+Jny(<*IVU`pK2aI)dBC2nqsl~FRvE={%UdB)nez>;{L0}
zx33o6*NT6Bt+?`9 at w02i8nFemDB>mIe^BO$9+nWc<eOrc6US*HV)MI$_z5n3TwnLF
z<g!zD^2F^DCT{<WXLd896uh5<A0ze09K4KRBL_c0 at P}fW7@^>IICurA-{jz at 2;Ktm
zki^1f1Qc4IYKcaoPnFoQ5_Qu|?k03m0f9+<Sk=Vj`XjWgG34ZH;Q~z^UkkevlLlk1
z6gun at bO9Lg9d^H7D)lQmaz at nY*YRS;X!k2Ra(2||*S{+7Dw#Xd=_)UG<m8akuOrI4
z+0Pw0v)<`fyCbW(Bde$*N##|oxK`YFt+?}A at xZm>v1`Q>*NSJa6)#>Zx>zHM7Z_-{
z-A(ABOZB)}X^Xqm*`odMT2Tmiwcy)h{H3sp at WLGOus8zi0R;p4{70)ueO3s<I!h45
z*r^L*COVCJ*(zQdW15A14r2#+OSEo8e+o<RVGDk)_-<KN+p2B^j$7eCx>c)7fQGHw
z7t-*h at EygaIh$MaNICp1upcd9NBaC|=XDz7hKMa17JNAxl4_n-+T;6ZrB}c*&$6|j
zJfjtO3ka(nv%q}>tdElhjXxn26F!Hn5wGx^ojR-<J!-N`9nq7e|8`@?rArOC0}_^L
zxYcG&+uC at Jhu2c3+Gr9v2i3-d^dn-pR?E|ii<n+eYiC63PP?1|-$t!rLxE+?IUngS
za3`o)R)JL|*w7!lgbsP#UpLG_Y1L6vs^e>7r at buSk=%uXr&~z&{{o0hx_XhNtG~-*
zx`$BO6B+u3P>uF1#vW&G9%sazA=`^Z_wN*onPPD}Ul8wzV83=~_ek+b!RoUD_gR7Z
z>?}hq;rYdH<B4Ftbguhpy%Qv^*ug9H*dkuaB_b%%5?yD#vxqN_uA#hT5zGI%nRsxp
zizMX`t;xlA3vWa7 at ix0eKHknHmPcg5hSSGaXmQ_#z90RH>Y+993TJ{e*_t3dOB19Q
zFhP2<Y=X3stF-nieoYgkU#qE?)O_wG0Cqa-fL~)BuqtAoehNTb8+IUG0>l~z;w6G$
z9BU)?`RGFy9nTRRO}OtH!5Lc<yd!I|V(uv|wS`tzxh-1iX&n4Mt)({O;CHi at +KPkU
zty*dWtU_(jQroqdFSlJwZPH@?+$JrxUW)~C>$TKIEmoD=sHL`PvFhA5EwxUI)#TP;
zBYl0O;^c3G!<;D=QO^@mFN5BVk&-#QO%ZC1?<?ZIZR)r`eniO~_ot2%e~zoE6KWxM
z0!21Q>@C#eV8T;Q^aP??BKEVyhX<EEOMHRvucP?)B7f;}xg?j{HTI9j|9ss4{P~}y
zf0q95_y7Da{^1}0_WrSB at Bh2Z{XZSsG;ZA3?~faI|38cyJMMpH$Nt?f$Bz4(|M9bN
lW1G0d*dL4^_m86R*x$MHjyvw8zu*0~>kkR<{|DEGyCRFq9{d0R

literal 0
HcmV?d00001

-- 
1.5.5.1



From xxqonline at hotmail.com  Wed Oct 15 15:16:21 2008
From: xxqonline at hotmail.com (xxqonline at hotmail.com)
Date: Wed, 15 Oct 2008 23:16:21 +0800
Subject: [Ovirt-devel] How do I provision a redhat ISO
In-Reply-To: <1223995747-12847-1-git-send-email-pmyers@redhat.com>
	<BAY124-DS59D8DBD2D3C851B51144CB1300@phx.gbl>
	<48F5D9A3.9040507@redhat.com>
References: <1223995747-12847-1-git-send-email-pmyers@redhat.com>
	<BAY124-DS59D8DBD2D3C851B51144CB1300@phx.gbl>
	<48F5D9A3.9040507@redhat.com>
Message-ID: <BAY124-DS283D8428FC71E316D0BE9B1300@phx.gbl>

Can ovirt talk with the managed host which has redhat5 by using libvirt.
When can we get the ovirt 0.94?


Thanks,
Qiang
--------------------------------------------------
From: "Darryl Pierce" <dpierce at redhat.com>
Sent: Wednesday, October 15, 2008 7:53 PM
To: <xxqonline at hotmail.com>
Cc: <ovirt-devel at redhat.com>
Subject: Re: [Ovirt-devel] How do I provision a redhat ISO

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> xxqonline at hotmail.com wrote:
>> Hello folks:
>>      I have to provision a redhat to the managed host. Is it possible?
>>      Is there doc for me to follow?
> 
> With our upcoming release of oVirt (0.94) ISO provisioning via Cobbler
> will be supported. To provision from an ISO file you'll simply:
> 
> 1. copy the ISO file to an NFS exported file system,
> 2. create an Image record within the Cobbler server and point it at the
> ISO file
> 3. within the oVirt server, create a new VM
> 4. when setting the OS for this VM you'll see, and select, the Image
> created in step 2 above
> 5. attach an additional writable file system
> 6. boot the VM
> 
> This will start up a virtual machine with that ISO mounted as a CDROM
> and boot from it. That will allow you to provision from ISO.
> 
> HTH. :)
> 
> - --
> Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.9 (GNU/Linux)
> Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org
> 
> iEYEARECAAYFAkj12aAACgkQjaT4DmxOfxtDbQCfYybsehyYl9sZ7Et+l6G6glTR
> zlMAniUw4eWW8IFWacrR8ofnAu5GaNvW
> =HWWa
> -----END PGP SIGNATURE-----
> 



From dpierce at redhat.com  Wed Oct 15 16:38:23 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Wed, 15 Oct 2008 12:38:23 -0400
Subject: [Ovirt-devel] How do I provision a redhat ISO
In-Reply-To: <BAY124-DS283D8428FC71E316D0BE9B1300@phx.gbl>
References: <1223995747-12847-1-git-send-email-pmyers@redhat.com>
	<BAY124-DS59D8DBD2D3C851B51144CB1300@phx.gbl>
	<48F5D9A3.9040507@redhat.com>
	<BAY124-DS283D8428FC71E316D0BE9B1300@phx.gbl>
Message-ID: <48F61C7F.1070404@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

xxqonline at hotmail.com wrote:
> Can ovirt talk with the managed host which has redhat5 by using libvirt.

Can you tell me what you mean by "the managed node which has redhat5"?
Do you mean a node which is built from the installation instructions[1]
but which is uses RHEL5 and not Fedora 9 as the foundation? Or do you
mean a virtual machine provisioned with RHEL5 as in your previous question?

> When can we get the ovirt 0.94?

We're working on that now. I'll leave it to someone with a better idea
to answer when it'll be available.

[1] - http://www.ovirt.org/install-instructions.html

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkj2HHoACgkQjaT4DmxOfxusyACg4LW+90FYYIsJIw9fzraxxGKr
A7QAnRtcqJB6LDOa/gelaej/QuX5FGvh
=jGmW
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 333 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081015/f792cf88/attachment.vcf>

From mmorsi at redhat.com  Wed Oct 15 17:53:01 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Wed, 15 Oct 2008 13:53:01 -0400
Subject: [Ovirt-devel] Network configuration wiki page created...
In-Reply-To: <48F60DCC.4000606@redhat.com>
References: <48F60DCC.4000606@redhat.com>
Message-ID: <48F62DFD.5020409@redhat.com>

Darryl Pierce wrote:
> http://www.ovirt.org/page/VM_Network_Configuration
>
> Please take a few minutes to review this list and provide feedback. The
> network configuration page is the only part missing now since the
> backend support and processing code is out for review.
>
Hey Darryl,
   I was looking into this and the only question I had was about the
dropdown that should appear when 'enslaved to bonding' is checked.
According to your interface requirements and the 'enslave a nic to
bonding interface' this should be a single select drop down box which a
user can select one bonding to associated with the nic, but this
association is stored in the bondings_nics bridge table and the
relationship itself is a many to many one. Should this be a
multiple-select box, in which a user can select more than one bonding to
be associated with the nic?

   -Mo




From dpierce at redhat.com  Wed Oct 15 17:59:13 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Wed, 15 Oct 2008 13:59:13 -0400
Subject: [Ovirt-devel] Network configuration wiki page created...
In-Reply-To: <48F62DFD.5020409@redhat.com>
References: <48F60DCC.4000606@redhat.com> <48F62DFD.5020409@redhat.com>
Message-ID: <48F62F71.6070107@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Mohammed Morsi wrote:
> Darryl Pierce wrote:
>> http://www.ovirt.org/page/VM_Network_Configuration
>>
>> Please take a few minutes to review this list and provide feedback. The
>> network configuration page is the only part missing now since the
>> backend support and processing code is out for review.
>>
> Hey Darryl,
>    I was looking into this and the only question I had was about the
> dropdown that should appear when 'enslaved to bonding' is checked.
> According to your interface requirements and the 'enslave a nic to
> bonding interface' this should be a single select drop down box which a
> user can select one bonding to associated with the nic, but this
> association is stored in the bondings_nics bridge table and the
> relationship itself is a many to many one. Should this be a
> multiple-select box, in which a user can select more than one bonding to
> be associated with the nic?

No. A NIC can only be enslaved to one bonded interface. The
bondings_nics table has a uniqueness constraint for the pair
(bonding_id, nic_id).

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkj2L2kACgkQjaT4DmxOfxsErwCfco0MEaoX3u87wsaFwWKEn5jh
BJAAoL37SOr6/PRtcmRCP2i8w6S2vpaN
=/u5g
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081015/78c59abc/attachment.vcf>

From dpierce at redhat.com  Wed Oct 15 20:45:17 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Wed, 15 Oct 2008 16:45:17 -0400
Subject: [Ovirt-devel] [PATCH server] This patch hardcodes support for
	ovirtbr0 bridge.
Message-ID: <1224103517-5003-1-git-send-email-dpierce@redhat.com>

Currently the node configuration has no explicit way of configuring a
bridged interface. This patch provides a hardcoded bridge and associates
each nic with it

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 src/host-browser/host-browser.rb                   |    2 +-
 src/lib/managed_node_configuration.rb              |   22 ++++++++++++--
 .../functional/managed_node_configuration_test.rb  |   30 ++++++++++++++++++++
 3 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/src/host-browser/host-browser.rb b/src/host-browser/host-browser.rb
index 79d34e8..d228a59 100755
--- a/src/host-browser/host-browser.rb
+++ b/src/host-browser/host-browser.rb
@@ -302,7 +302,7 @@ class HostBrowser
         end
 
         # iterate over any nics left and create new records for them.
-        boot_type = BootType.find_by_proto('dhcp')
+        boot_type = BootType.find_by_proto('static')
 
         nic_info.collect do |nic|
             puts "Creating a new nic..."
diff --git a/src/lib/managed_node_configuration.rb b/src/lib/managed_node_configuration.rb
index 4ade235..93f8448 100644
--- a/src/lib/managed_node_configuration.rb
+++ b/src/lib/managed_node_configuration.rb
@@ -59,10 +59,19 @@ class ManagedNodeConfiguration
       end
     end
 
+    has_bridge = false
     host.nics.each do |nic|
       # only process this nic if it doesn't have a bonding
+      # TODO remove the hack to force a bridge into the picture
       if nic.bonding.empty?
-        process_nic result, nic, macs
+        process_nic result, nic, macs, nil, false, true
+
+	# TODO remove this when bridges are properly supported
+	unless has_bridge
+	  macs[nic.mac] = "ovirtbr0"
+	  process_nic result, nic, macs, nil, true, false
+	  has_bridge = true
+	end
       end
     end
 
@@ -74,7 +83,7 @@ class ManagedNodeConfiguration
 
   private
 
-  def self.process_nic(result, nic, macs, bonding = nil)
+  def self.process_nic(result, nic, macs, bonding = nil, is_bridge = false, bridged = true)
     iface_name = macs[nic.mac]
 
     if iface_name
@@ -92,9 +101,16 @@ class ManagedNodeConfiguration
           result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/NETMASK #{nic.netmask}"
           result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BROADCAST #{nic.broadcast}"
         end
+
+	if bridged
+	  result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BRIDGE ovirtbr0"
+	elsif is_bridge
+	  result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/TYPE bridge"
+	  result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/PEERNTP yes"
+	  result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/DELAY 0"
+	end
       end
 
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BRIDGE #{nic.bridge}"     if nic.bridge
       result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/ONBOOT yes"
     end
   end
diff --git a/src/test/functional/managed_node_configuration_test.rb b/src/test/functional/managed_node_configuration_test.rb
index b5a7ec5..d0d8aa3 100644
--- a/src/test/functional/managed_node_configuration_test.rb
+++ b/src/test/functional/managed_node_configuration_test.rb
@@ -50,7 +50,15 @@ cat <<\EOF > /var/tmp/node-augtool
 rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
 set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
 set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BOOTPROTO #{nic.boot_type.proto}
+set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BRIDGE ovirtbr0
 set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
+rm /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DEVICE ovirtbr0
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BOOTPROTO #{nic.boot_type.proto}
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/TYPE bridge
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/PEERNTP yes
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DELAY 0
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/ONBOOT yes
 save
 EOF
     HERE
@@ -80,6 +88,16 @@ set /files/etc/sysconfig/network-scripts/ifcfg-eth0/NETMASK #{nic.netmask}
 set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BROADCAST #{nic.broadcast}
 set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BRIDGE ovirtbr0
 set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
+rm /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DEVICE ovirtbr0
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BOOTPROTO #{nic.boot_type.proto}
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/IPADDR #{nic.ip_addr}
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/NETMASK #{nic.netmask}
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BROADCAST #{nic.broadcast}
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/TYPE bridge
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/PEERNTP yes
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DELAY 0
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/ONBOOT yes
 save
 EOF
     HERE
@@ -108,10 +126,22 @@ set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BOOTPROTO #{nic1.boot_type.p
 set /files/etc/sysconfig/network-scripts/ifcfg-eth0/IPADDR #{nic1.ip_addr}
 set /files/etc/sysconfig/network-scripts/ifcfg-eth0/NETMASK #{nic1.netmask}
 set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BROADCAST #{nic1.broadcast}
+set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BRIDGE ovirtbr0
 set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
+rm /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DEVICE ovirtbr0
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BOOTPROTO #{nic1.boot_type.proto}
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/IPADDR #{nic1.ip_addr}
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/NETMASK #{nic1.netmask}
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BROADCAST #{nic1.broadcast}
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/TYPE bridge
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/PEERNTP yes
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DELAY 0
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/ONBOOT yes
 rm /files/etc/sysconfig/network-scripts/ifcfg-eth1
 set /files/etc/sysconfig/network-scripts/ifcfg-eth1/DEVICE eth1
 set /files/etc/sysconfig/network-scripts/ifcfg-eth1/BOOTPROTO #{nic2.boot_type.proto}
+set /files/etc/sysconfig/network-scripts/ifcfg-eth1/BRIDGE ovirtbr0
 set /files/etc/sysconfig/network-scripts/ifcfg-eth1/ONBOOT yes
 save
 EOF
-- 
1.5.5.1



From xxqonline at hotmail.com  Thu Oct 16 02:27:16 2008
From: xxqonline at hotmail.com (xxqonline at hotmail.com)
Date: Thu, 16 Oct 2008 10:27:16 +0800
Subject: [Ovirt-devel] How do I provision a redhat ISO
In-Reply-To: <1223995747-12847-1-git-send-email-pmyers@redhat.com>
	<BAY124-DS59D8DBD2D3C851B51144CB1300@phx.gbl>
	<48F5D9A3.9040507@redhat.com>
	<BAY124-DS283D8428FC71E316D0BE9B1300@phx.gbl>
	<48F61C7F.1070404@redhat.com>
References: <1223995747-12847-1-git-send-email-pmyers@redhat.com>
	<BAY124-DS59D8DBD2D3C851B51144CB1300@phx.gbl>
	<48F5D9A3.9040507@redhat.com>
	<BAY124-DS283D8428FC71E316D0BE9B1300@phx.gbl>
	<48F61C7F.1070404@redhat.com>
Message-ID: <BAY124-DS3EC94253ED1395C306934B1330@phx.gbl>

Hello Darryl:
      I mean a admin ovirt appliance talk with a physical redhat host, that 
redhat host is pre-installed.
  We use libvert to talk with the kvm on the redhat to create VM. Is it 
possible?

Thanks,
Qiang



--------------------------------------------------
From: "Darryl Pierce" <dpierce at redhat.com>
Sent: Thursday, October 16, 2008 12:38 AM
To: <xxqonline at hotmail.com>
Cc: <ovirt-devel at redhat.com>
Subject: Re: [Ovirt-devel] How do I provision a redhat ISO

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> xxqonline at hotmail.com wrote:
>> Can ovirt talk with the managed host which has redhat5 by using libvirt.
>
> Can you tell me what you mean by "the managed node which has redhat5"?
> Do you mean a node which is built from the installation instructions[1]
> but which is uses RHEL5 and not Fedora 9 as the foundation? Or do you
> mean a virtual machine provisioned with RHEL5 as in your previous 
> question?
>
>> When can we get the ovirt 0.94?
>
> We're working on that now. I'll leave it to someone with a better idea
> to answer when it'll be available.
>
> [1] - http://www.ovirt.org/install-instructions.html
>
> - --
> Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.9 (GNU/Linux)
> Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org
>
> iEYEARECAAYFAkj2HHoACgkQjaT4DmxOfxusyACg4LW+90FYYIsJIw9fzraxxGKr
> A7QAnRtcqJB6LDOa/gelaej/QuX5FGvh
> =jGmW
> -----END PGP SIGNATURE-----
> 



From xxqonline at hotmail.com  Thu Oct 16 02:37:51 2008
From: xxqonline at hotmail.com (xxqonline at hotmail.com)
Date: Thu, 16 Oct 2008 10:37:51 +0800
Subject: [Ovirt-devel] How do I provision a redhat ISO
In-Reply-To: <1223995747-12847-1-git-send-email-pmyers@redhat.com>
	<BAY124-DS59D8DBD2D3C851B51144CB1300@phx.gbl>
	<48F5D9A3.9040507@redhat.com>
	<BAY124-DS283D8428FC71E316D0BE9B1300@phx.gbl>
	<48F61C7F.1070404@redhat.com>
References: <1223995747-12847-1-git-send-email-pmyers@redhat.com>
	<BAY124-DS59D8DBD2D3C851B51144CB1300@phx.gbl>
	<48F5D9A3.9040507@redhat.com>
	<BAY124-DS283D8428FC71E316D0BE9B1300@phx.gbl>
	<48F61C7F.1070404@redhat.com>
Message-ID: <BAY124-DS66A68E6C0B09F75C0D5C4B1330@phx.gbl>

Yes, a node which is built from the installation instructions[1]
> but which is uses RHEL5 and not Fedora 9 as the foundation.

--------------------------------------------------
From: "Darryl Pierce" <dpierce at redhat.com>
Sent: Thursday, October 16, 2008 12:38 AM
To: <xxqonline at hotmail.com>
Cc: <ovirt-devel at redhat.com>
Subject: Re: [Ovirt-devel] How do I provision a redhat ISO

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> xxqonline at hotmail.com wrote:
>> Can ovirt talk with the managed host which has redhat5 by using libvirt.
>
> Can you tell me what you mean by "the managed node which has redhat5"?
> Do you mean a node which is built from the installation instructions[1]
> but which is uses RHEL5 and not Fedora 9 as the foundation? Or do you
> mean a virtual machine provisioned with RHEL5 as in your previous 
> question?
>
>> When can we get the ovirt 0.94?
>
> We're working on that now. I'll leave it to someone with a better idea
> to answer when it'll be available.
>
> [1] - http://www.ovirt.org/install-instructions.html
>
> - --
> Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.9 (GNU/Linux)
> Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org
>
> iEYEARECAAYFAkj2HHoACgkQjaT4DmxOfxusyACg4LW+90FYYIsJIw9fzraxxGKr
> A7QAnRtcqJB6LDOa/gelaej/QuX5FGvh
> =jGmW
> -----END PGP SIGNATURE-----
> 



From pmyers at redhat.com  Thu Oct 16 02:47:07 2008
From: pmyers at redhat.com (Perry Myers)
Date: Wed, 15 Oct 2008 22:47:07 -0400
Subject: [Ovirt-devel] [PATCH appliance] create real ovirtbr0 bridge for -e
	<eth bridge>
Message-ID: <1224125227-14209-1-git-send-email-pmyers@redhat.com>

From: Alan Pevec <apevec at redhat.com>

NOTE: distro specific networking scripts are used

Signed-off-by: Alan Pevec <apevec at redhat.com>
Signed-off-by: Perry Myers <pmyers at redhat.com>
---
 create-ovirt-appliance  |  119 +++++++++++++++++++++++++++-------------------
 ovirt-appliance.spec.in |    1 +
 2 files changed, 71 insertions(+), 49 deletions(-)

diff --git a/create-ovirt-appliance b/create-ovirt-appliance
index 88d0188..9454377 100755
--- a/create-ovirt-appliance
+++ b/create-ovirt-appliance
@@ -13,6 +13,7 @@ IMGDIR_DEFAULT=/var/lib/libvirt/images
 NAME_DEFAULT=ovirt-appliance
 NET_SCRIPTS=/etc/sysconfig/network-scripts
 BRIDGENAME=ovirtbr0
+NET_TYPE=network
 
 NODE_DISK_SIZE=128M
 NODE_DISK_FMT=raw
@@ -84,9 +85,9 @@ gen_fake_managed_node() {
       <source file='$disk'/>
       <target dev='hda'/>
     </disk>
-    <interface type='network'>
+    <interface type='$NET_TYPE'>
       <mac address='00:16:3e:12:34:$last_mac'/>
-      <source network='$BRIDGENAME'/>
+      <source $NET_TYPE='$BRIDGENAME'/>
     </interface>
     <serial type='pty'>
       <target port='0'/>
@@ -130,8 +131,8 @@ gen_app() {
       <source network='default'/>
       <model type='virtio'/>
     </interface>
-    <interface type='network'>
-      <source network='$BRIDGENAME'/>
+    <interface type='$NET_TYPE'>
+      <source $NET_TYPE='$BRIDGENAME'/>
       <model type='virtio'/>
     </interface>
     <serial type='pty'>
@@ -147,6 +148,18 @@ gen_app() {
 EOF
 }
 
+net_debug() {
+    # Some output for debugging problems
+    echo "Currently active bridges:"
+    echo "-------------------------"
+    brctl show
+    echo
+    echo "Currently defined libvirt networks:"
+    echo "-----------------------------------"
+    virsh net-list --all
+    echo
+}
+
 # first, check to see we are root
 if [ $( id -u ) -ne 0 ]; then
     die "Must run as root"
@@ -193,33 +206,33 @@ chkconfig libvirtd on
     sed -i "/# ovirtbr$/d" /etc/rc.d/rc.local
 } > /dev/null 2>&1
 
-# Some output for debugging problems
-brctl show
-virsh net-list
+net_debug
 
 # If we're bridging to a physical network, run some checks to make sure the
 # choice of physical eth device is sane
 if [ -n "$bridge" ]; then
+    NET_TYPE=bridge
     # Check to see if the physical device is present
     ifconfig $bridge > /dev/null 2>&1 ; bridge_dev_present=$?
     test $bridge_dev_present != 0 \
         && die "$bridge device not present, aborting!"
 
-    # Check to make sure that the system is not already using the interface
-    test -f $NET_SCRIPTS/ifcfg-$bridge \
-        && die "$bridge defined in $NET_SCRIPTS, aborting!"
-
     # Check to see if the eth device is already tied to a non oVirt bridge
     attached_bridge=$(brctl show \
         | awk -v BRIDGE=$bridge '$4~BRIDGE {print $1}')
     test -n "$attached_bridge" -a "$attached_bridge" != "$BRIDGENAME" \
         && die "$bridge already attached to other bridge $attached_bridge"
 
-    # Check to see if the eth device does not have an active inet address
-    ip address show dev $bridge \
-        | grep "inet.*$bridge" > /dev/null 2>&1 ; bridge_dev_active=$?
-    test $bridge_dev_active == 0 \
-        && die "$bridge device active with ip address, aborting!"
+    # Check to make sure that the system is not already using the interface
+    if test -f $NET_SCRIPTS/ifcfg-$bridge ; then
+        echo "$NET_SCRIPTS/ifcfg-$bridge is present, are you sure you wish to"
+        echo "overwrite this file? [y/N]? "
+        read yesno
+
+        if [ "$yesno" != "y" -a "$yesno" != "Y" ]; then
+            exit 2
+        fi
+    fi
 fi
 
 mkdir -p $imgdir
@@ -238,16 +251,6 @@ for i in `seq 3 5` ; do
     rm $TMPXML
 done
 
-virsh net-dumpxml $BRIDGENAME >& /dev/null
-RETVAL=$?
-if [ $( brctl show | grep -c $BRIDGENAME ) -ne 0 -a $RETVAL -ne 0 ]; then
-    # in this case, the bridge exists, but isn't managed by libvirt
-    # abort, since the user will have to clean up themselves
-    echo "Bridge $BRIDGENAME already exists.  Please make sure you"
-    echo "unconfigure $BRIDGENAME, and then try the command again"
-    exit 1
-fi
-
 # Remove old bridge device if it exists
 sed -i "/# $BRIDGENAME/d" /etc/rc.d/rc.local
 old_bridge=$(brctl show \
@@ -256,36 +259,54 @@ if [ -n "$old_bridge" ]; then
     echo "Removing old bridge $old_bridge"
     ifconfig $old_bridge down
     brctl delif $BRIDGENAME $old_bridge
+    rm -f $NET_SCRIPTS/ifcfg-$old_bridge
 fi
 
-virsh net-destroy $BRIDGENAME > /dev/null 2>&1
-virsh net-undefine $BRIDGENAME > /dev/null 2>&1
-TMPXML=$(mktemp) || exit 1
-gen_bridge $BRIDGENAME > $TMPXML
-virsh net-define $TMPXML
-rm $TMPXML
-virsh net-start $BRIDGENAME
-virsh net-autostart $BRIDGENAME
+{
+echo "Removing $BRIDGENAME"
+virsh net-destroy $BRIDGENAME
+virsh net-undefine $BRIDGENAME
+ifconfig $BRIDGENAME down
+brctl delbr $BRIDGENAME
+rm -fv $NET_SCRIPTS/ifcfg-$BRIDGENAME
+echo "Done Removing $BRIDGENAME"
+} 2> /dev/null
 
 if [ -n "$bridge" ]; then
-    # FIXME: unfortunately, these two can't be done by libvirt at the
-    # moment, so we do them by hand here and persist the config by
-    # by adding to rc.local
-    echo "Adding new bridge $bridge"
-    TMPBRCTL=$(mktemp) || exit 1
-    cat > $TMPBRCTL << EOF
-brctl setfd $BRIDGENAME 0 # $BRIDGENAME
-brctl addif $BRIDGENAME $bridge # $BRIDGENAME
-ifconfig $bridge up # $BRIDGENAME
+    # real external bridge, use distro networking scripts
+    ifconfig $bridge down 2> /dev/null
+    TMPAUG=$(mktemp) || exit 1
+    cat > $TMPAUG <<EOF
+rm /files$NET_SCRIPTS/ifcfg-$bridge
+set /files$NET_SCRIPTS/ifcfg-$bridge/DEVICE $bridge
+set /files$NET_SCRIPTS/ifcfg-$bridge/ONBOOT yes
+set /files$NET_SCRIPTS/ifcfg-$bridge/BRIDGE $BRIDGENAME
+rm /files$NET_SCRIPTS/ifcfg-$BRIDGENAME
+set /files$NET_SCRIPTS/ifcfg-$BRIDGENAME/DEVICE $BRIDGENAME
+set /files$NET_SCRIPTS/ifcfg-$BRIDGENAME/BOOTPROTO static
+set /files$NET_SCRIPTS/ifcfg-$BRIDGENAME/ONBOOT y
+set /files$NET_SCRIPTS/ifcfg-$BRIDGENAME/TYPE Bridge
+set /files$NET_SCRIPTS/ifcfg-$BRIDGENAME/PEERNTP yes
+set /files$NET_SCRIPTS/ifcfg-$BRIDGENAME/IPADDR 192.168.50.1
+set /files$NET_SCRIPTS/ifcfg-$BRIDGENAME/NETMASK 255.255.255.0
+set /files$NET_SCRIPTS/ifcfg-$BRIDGENAME/DELAY 0
+save
 EOF
-    chmod a+x $TMPBRCTL /etc/rc.d/rc.local
-
-    cat $TMPBRCTL >> /etc/rc.d/rc.local
-
-    $TMPBRCTL
-    rm $TMPBRCTL
+    augtool < $TMPAUG
+    ifup $BRIDGENAME
+    ifup $bridge
+else
+    # internal bridge only, use libvirt networking
+    TMPXML=$(mktemp) || exit 1
+    gen_bridge $BRIDGENAME > $TMPXML
+    virsh net-define $TMPXML
+    rm $TMPXML
+    virsh net-start $BRIDGENAME
+    virsh net-autostart $BRIDGENAME
 fi
 
+net_debug
+
 # Cleanup to handle older version of script that used these domain names
 {
     virsh destroy developer
diff --git a/ovirt-appliance.spec.in b/ovirt-appliance.spec.in
index d96e7bf..91cc562 100644
--- a/ovirt-appliance.spec.in
+++ b/ovirt-appliance.spec.in
@@ -27,6 +27,7 @@ BuildRequires: wget
 Requires: libvirt >= 0.4.4-2ovirt2
 Requires: kvm >= 72-3ovirt3
 Requires: /usr/bin/qemu-img
+Requires: augtool
 
 %define app_root %{_datadir}/%{name}
 
-- 
1.5.5.1



From pmyers at redhat.com  Thu Oct 16 02:53:32 2008
From: pmyers at redhat.com (Perry Myers)
Date: Wed, 15 Oct 2008 22:53:32 -0400
Subject: [Ovirt-devel] How do I provision a redhat ISO
In-Reply-To: <BAY124-DS3EC94253ED1395C306934B1330@phx.gbl>
References: <1223995747-12847-1-git-send-email-pmyers@redhat.com>	<BAY124-DS59D8DBD2D3C851B51144CB1300@phx.gbl>	<48F5D9A3.9040507@redhat.com>	<BAY124-DS283D8428FC71E316D0BE9B1300@phx.gbl>	<48F61C7F.1070404@redhat.com>
	<BAY124-DS3EC94253ED1395C306934B1330@phx.gbl>
Message-ID: <48F6ACAC.80809@redhat.com>

xxqonline at hotmail.com wrote:
> Hello Darryl:
>      I mean a admin ovirt appliance talk with a physical redhat host, 
> that redhat host is pre-installed.
>  We use libvert to talk with the kvm on the redhat to create VM. Is it 
> possible?

Please see this earlier response:
https://www.redhat.com/archives/ovirt-devel/2008-October/msg00235.html

The short answer is that presently you cannot manage a RHEL5 host with the 
oVirt Server.  We will eventually support managing RHEL5 hosts via the 
oVirt Server but there are a few development steps that need to happen 
first.  The above email outlines the steps that need to happen.

Thanks,

Perry



From xxqonline at hotmail.com  Thu Oct 16 03:34:14 2008
From: xxqonline at hotmail.com (xxqonline at hotmail.com)
Date: Thu, 16 Oct 2008 11:34:14 +0800
Subject: [Ovirt-devel] How do I provision a redhat ISO
In-Reply-To: <1223995747-12847-1-git-send-email-pmyers@redhat.com>	<BAY124-DS59D8DBD2D3C851B51144CB1300@phx.gbl>	<48F5D9A3.9040507@redhat.com>	<BAY124-DS283D8428FC71E316D0BE9B1300@phx.gbl>	<48F61C7F.1070404@redhat.com>
	<BAY124-DS3EC94253ED1395C306934B1330@phx.gbl>
	<48F6ACAC.80809@redhat.com>
References: <1223995747-12847-1-git-send-email-pmyers@redhat.com>	<BAY124-DS59D8DBD2D3C851B51144CB1300@phx.gbl>	<48F5D9A3.9040507@redhat.com>	<BAY124-DS283D8428FC71E316D0BE9B1300@phx.gbl>	<48F61C7F.1070404@redhat.com>
	<BAY124-DS3EC94253ED1395C306934B1330@phx.gbl>
	<48F6ACAC.80809@redhat.com>
Message-ID: <BAY124-DS25659FEDA9B8DFEE697ADB1330@phx.gbl>

Thanks, Perry:
        I have downloaded the src package, it has a lot of the rpm package.
        Which one shall I read firstly?

Regards,
Qiang

--------------------------------------------------
From: "Perry Myers" <pmyers at redhat.com>
Sent: Thursday, October 16, 2008 10:53 AM
To: <xxqonline at hotmail.com>
Cc: "Darryl Pierce" <dpierce at redhat.com>; <ovirt-devel at redhat.com>
Subject: Re: [Ovirt-devel] How do I provision a redhat ISO

> xxqonline at hotmail.com wrote:
>> Hello Darryl:
>>      I mean a admin ovirt appliance talk with a physical redhat host, 
>> that redhat host is pre-installed.
>>  We use libvert to talk with the kvm on the redhat to create VM. Is it 
>> possible?
>
> Please see this earlier response:
> https://www.redhat.com/archives/ovirt-devel/2008-October/msg00235.html
>
> The short answer is that presently you cannot manage a RHEL5 host with the 
> oVirt Server.  We will eventually support managing RHEL5 hosts via the 
> oVirt Server but there are a few development steps that need to happen 
> first.  The above email outlines the steps that need to happen.
>
> Thanks,
>
> Perry
> 



From pmyers at redhat.com  Thu Oct 16 03:38:12 2008
From: pmyers at redhat.com (Perry Myers)
Date: Wed, 15 Oct 2008 23:38:12 -0400
Subject: [Ovirt-devel] How do I provision a redhat ISO
In-Reply-To: <BAY124-DS25659FEDA9B8DFEE697ADB1330@phx.gbl>
References: <1223995747-12847-1-git-send-email-pmyers@redhat.com>	<BAY124-DS59D8DBD2D3C851B51144CB1300@phx.gbl>	<48F5D9A3.9040507@redhat.com>	<BAY124-DS283D8428FC71E316D0BE9B1300@phx.gbl>	<48F61C7F.1070404@redhat.com>
	<BAY124-DS3EC94253ED1395C306934B1330@phx.gbl>
	<48F6ACAC.80809@redhat.com>
	<BAY124-DS25659FEDA9B8DFEE697ADB1330@phx.gbl>
Message-ID: <48F6B724.6080403@redhat.com>

xxqonline at hotmail.com wrote:
> Thanks, Perry:
>        I have downloaded the src package, it has a lot of the rpm package.
>        Which one shall I read firstly?

It would be better to work from the source git repositories instead of 
from the SRPMS.  Instructions for accessing the git repositories is 
located at:
http://ovirt.org/build-instructions.html

Once you've followed these instructions, the places to look for adding in 
support for Xen dom0 hosts would be in the ovirt-server and ovirt-node 
repositories.

Perry



From pmyers at redhat.com  Thu Oct 16 04:25:44 2008
From: pmyers at redhat.com (Perry Myers)
Date: Thu, 16 Oct 2008 00:25:44 -0400
Subject: [Ovirt-devel] [PATCH appliance] create real ovirtbr0 bridge for -e
	<eth bridge>
Message-ID: <1224131144-15539-1-git-send-email-pmyers@redhat.com>

From: Alan Pevec <apevec at redhat.com>

NOTE: distro specific networking scripts are used

Signed-off-by: Alan Pevec <apevec at redhat.com>
Signed-off-by: Perry Myers <pmyers at redhat.com>
---
 create-ovirt-appliance  |  119 +++++++++++++++++++++++++++-------------------
 ovirt-appliance.spec.in |    1 +
 2 files changed, 71 insertions(+), 49 deletions(-)

diff --git a/create-ovirt-appliance b/create-ovirt-appliance
index 88d0188..9454377 100755
--- a/create-ovirt-appliance
+++ b/create-ovirt-appliance
@@ -13,6 +13,7 @@ IMGDIR_DEFAULT=/var/lib/libvirt/images
 NAME_DEFAULT=ovirt-appliance
 NET_SCRIPTS=/etc/sysconfig/network-scripts
 BRIDGENAME=ovirtbr0
+NET_TYPE=network
 
 NODE_DISK_SIZE=128M
 NODE_DISK_FMT=raw
@@ -84,9 +85,9 @@ gen_fake_managed_node() {
       <source file='$disk'/>
       <target dev='hda'/>
     </disk>
-    <interface type='network'>
+    <interface type='$NET_TYPE'>
       <mac address='00:16:3e:12:34:$last_mac'/>
-      <source network='$BRIDGENAME'/>
+      <source $NET_TYPE='$BRIDGENAME'/>
     </interface>
     <serial type='pty'>
       <target port='0'/>
@@ -130,8 +131,8 @@ gen_app() {
       <source network='default'/>
       <model type='virtio'/>
     </interface>
-    <interface type='network'>
-      <source network='$BRIDGENAME'/>
+    <interface type='$NET_TYPE'>
+      <source $NET_TYPE='$BRIDGENAME'/>
       <model type='virtio'/>
     </interface>
     <serial type='pty'>
@@ -147,6 +148,18 @@ gen_app() {
 EOF
 }
 
+net_debug() {
+    # Some output for debugging problems
+    echo "Currently active bridges:"
+    echo "-------------------------"
+    brctl show
+    echo
+    echo "Currently defined libvirt networks:"
+    echo "-----------------------------------"
+    virsh net-list --all
+    echo
+}
+
 # first, check to see we are root
 if [ $( id -u ) -ne 0 ]; then
     die "Must run as root"
@@ -193,33 +206,33 @@ chkconfig libvirtd on
     sed -i "/# ovirtbr$/d" /etc/rc.d/rc.local
 } > /dev/null 2>&1
 
-# Some output for debugging problems
-brctl show
-virsh net-list
+net_debug
 
 # If we're bridging to a physical network, run some checks to make sure the
 # choice of physical eth device is sane
 if [ -n "$bridge" ]; then
+    NET_TYPE=bridge
     # Check to see if the physical device is present
     ifconfig $bridge > /dev/null 2>&1 ; bridge_dev_present=$?
     test $bridge_dev_present != 0 \
         && die "$bridge device not present, aborting!"
 
-    # Check to make sure that the system is not already using the interface
-    test -f $NET_SCRIPTS/ifcfg-$bridge \
-        && die "$bridge defined in $NET_SCRIPTS, aborting!"
-
     # Check to see if the eth device is already tied to a non oVirt bridge
     attached_bridge=$(brctl show \
         | awk -v BRIDGE=$bridge '$4~BRIDGE {print $1}')
     test -n "$attached_bridge" -a "$attached_bridge" != "$BRIDGENAME" \
         && die "$bridge already attached to other bridge $attached_bridge"
 
-    # Check to see if the eth device does not have an active inet address
-    ip address show dev $bridge \
-        | grep "inet.*$bridge" > /dev/null 2>&1 ; bridge_dev_active=$?
-    test $bridge_dev_active == 0 \
-        && die "$bridge device active with ip address, aborting!"
+    # Check to make sure that the system is not already using the interface
+    if test -f $NET_SCRIPTS/ifcfg-$bridge ; then
+        echo "$NET_SCRIPTS/ifcfg-$bridge is present, are you sure you wish to"
+        echo "overwrite this file? [y/N]? "
+        read yesno
+
+        if [ "$yesno" != "y" -a "$yesno" != "Y" ]; then
+            exit 2
+        fi
+    fi
 fi
 
 mkdir -p $imgdir
@@ -238,16 +251,6 @@ for i in `seq 3 5` ; do
     rm $TMPXML
 done
 
-virsh net-dumpxml $BRIDGENAME >& /dev/null
-RETVAL=$?
-if [ $( brctl show | grep -c $BRIDGENAME ) -ne 0 -a $RETVAL -ne 0 ]; then
-    # in this case, the bridge exists, but isn't managed by libvirt
-    # abort, since the user will have to clean up themselves
-    echo "Bridge $BRIDGENAME already exists.  Please make sure you"
-    echo "unconfigure $BRIDGENAME, and then try the command again"
-    exit 1
-fi
-
 # Remove old bridge device if it exists
 sed -i "/# $BRIDGENAME/d" /etc/rc.d/rc.local
 old_bridge=$(brctl show \
@@ -256,36 +259,54 @@ if [ -n "$old_bridge" ]; then
     echo "Removing old bridge $old_bridge"
     ifconfig $old_bridge down
     brctl delif $BRIDGENAME $old_bridge
+    rm -f $NET_SCRIPTS/ifcfg-$old_bridge
 fi
 
-virsh net-destroy $BRIDGENAME > /dev/null 2>&1
-virsh net-undefine $BRIDGENAME > /dev/null 2>&1
-TMPXML=$(mktemp) || exit 1
-gen_bridge $BRIDGENAME > $TMPXML
-virsh net-define $TMPXML
-rm $TMPXML
-virsh net-start $BRIDGENAME
-virsh net-autostart $BRIDGENAME
+{
+echo "Removing $BRIDGENAME"
+virsh net-destroy $BRIDGENAME
+virsh net-undefine $BRIDGENAME
+ifconfig $BRIDGENAME down
+brctl delbr $BRIDGENAME
+rm -fv $NET_SCRIPTS/ifcfg-$BRIDGENAME
+echo "Done Removing $BRIDGENAME"
+} 2> /dev/null
 
 if [ -n "$bridge" ]; then
-    # FIXME: unfortunately, these two can't be done by libvirt at the
-    # moment, so we do them by hand here and persist the config by
-    # by adding to rc.local
-    echo "Adding new bridge $bridge"
-    TMPBRCTL=$(mktemp) || exit 1
-    cat > $TMPBRCTL << EOF
-brctl setfd $BRIDGENAME 0 # $BRIDGENAME
-brctl addif $BRIDGENAME $bridge # $BRIDGENAME
-ifconfig $bridge up # $BRIDGENAME
+    # real external bridge, use distro networking scripts
+    ifconfig $bridge down 2> /dev/null
+    TMPAUG=$(mktemp) || exit 1
+    cat > $TMPAUG <<EOF
+rm /files$NET_SCRIPTS/ifcfg-$bridge
+set /files$NET_SCRIPTS/ifcfg-$bridge/DEVICE $bridge
+set /files$NET_SCRIPTS/ifcfg-$bridge/ONBOOT yes
+set /files$NET_SCRIPTS/ifcfg-$bridge/BRIDGE $BRIDGENAME
+rm /files$NET_SCRIPTS/ifcfg-$BRIDGENAME
+set /files$NET_SCRIPTS/ifcfg-$BRIDGENAME/DEVICE $BRIDGENAME
+set /files$NET_SCRIPTS/ifcfg-$BRIDGENAME/BOOTPROTO static
+set /files$NET_SCRIPTS/ifcfg-$BRIDGENAME/ONBOOT y
+set /files$NET_SCRIPTS/ifcfg-$BRIDGENAME/TYPE Bridge
+set /files$NET_SCRIPTS/ifcfg-$BRIDGENAME/PEERNTP yes
+set /files$NET_SCRIPTS/ifcfg-$BRIDGENAME/IPADDR 192.168.50.1
+set /files$NET_SCRIPTS/ifcfg-$BRIDGENAME/NETMASK 255.255.255.0
+set /files$NET_SCRIPTS/ifcfg-$BRIDGENAME/DELAY 0
+save
 EOF
-    chmod a+x $TMPBRCTL /etc/rc.d/rc.local
-
-    cat $TMPBRCTL >> /etc/rc.d/rc.local
-
-    $TMPBRCTL
-    rm $TMPBRCTL
+    augtool < $TMPAUG
+    ifup $BRIDGENAME
+    ifup $bridge
+else
+    # internal bridge only, use libvirt networking
+    TMPXML=$(mktemp) || exit 1
+    gen_bridge $BRIDGENAME > $TMPXML
+    virsh net-define $TMPXML
+    rm $TMPXML
+    virsh net-start $BRIDGENAME
+    virsh net-autostart $BRIDGENAME
 fi
 
+net_debug
+
 # Cleanup to handle older version of script that used these domain names
 {
     virsh destroy developer
diff --git a/ovirt-appliance.spec.in b/ovirt-appliance.spec.in
index d96e7bf..f42982d 100644
--- a/ovirt-appliance.spec.in
+++ b/ovirt-appliance.spec.in
@@ -27,6 +27,7 @@ BuildRequires: wget
 Requires: libvirt >= 0.4.4-2ovirt2
 Requires: kvm >= 72-3ovirt3
 Requires: /usr/bin/qemu-img
+Requires: augeas
 
 %define app_root %{_datadir}/%{name}
 
-- 
1.5.5.1



From clalance at redhat.com  Thu Oct 16 08:11:24 2008
From: clalance at redhat.com (Chris Lalancette)
Date: Thu, 16 Oct 2008 10:11:24 +0200
Subject: [Ovirt-devel] [PATCH] initial model work for lvm storage (revised)
In-Reply-To: <1224080493-29248-1-git-send-email-sseago@redhat.com>
References: <1224080493-29248-1-git-send-email-sseago@redhat.com>
Message-ID: <48F6F72C.8010301@redhat.com>

Scott Seago wrote:
> This includes the model classes w/ migrations for the lvm storage pools and
> volumes, and some changes required to support Storage Volume tasks. This
> patch does not include all of the necessary model API methods to support lvm,
> but it's a starting point -- some changes to clalance's taskomatic bits will
> be required to support this, and we will need additional model enhancements
> when the UI work is done, and when the taskomatic back end is finalized.
> 
> revised to fix a couple controller bugs and to increment the migration
> version #

Well, this version is better, but still not working.  I downloaded this patch,
applied it with git-am (thanks Jim), then rebuilt an RPM with it.  Then I did
"rpm -Uvh ovirt-server", followed by "cd /usr/share/ovirt-server ; rake
db:migrate".  Then I shut down all of the services (including mongrel-rails),
and restarted them.  Now, I was able to successfully add the iSCSI storage pool,
but taskomatic barfed when trying to do the scanning.  In particular, the error
I got in the database was:

Couldn't find StoragePool without an ID

And a more complete stack trace from /var/log/ovirt-server/taskomatic.log is:

refresh_pool
Task action processing failed: ActiveRecord::RecordNotFound: Couldn't find
StoragePool without an ID
/usr/lib/ruby/gems/1.8/gems/activerecord-2.1.1/lib/active_record/base.rb:1364:in
`find_from_ids'
/usr/lib/ruby/gems/1.8/gems/activerecord-2.1.1/lib/active_record/base.rb:541:in
`find'
/usr/share/ovirt-server/task-omatic/./task_storage.rb:26:in `refresh_pool'
/usr/share/ovirt-server/task-omatic/taskomatic.rb:106
/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

Any ideas?

-- 
Chris Lalancette



From apevec at redhat.com  Thu Oct 16 10:33:00 2008
From: apevec at redhat.com (Alan Pevec)
Date: Thu, 16 Oct 2008 12:33:00 +0200
Subject: [Ovirt-devel] Re: [PATCH server] This patch hardcodes support for
	ovirtbr0 bridge.
In-Reply-To: <1224101338-2773-1-git-send-email-dpierce@redhat.com>
References: <1224101338-2773-1-git-send-email-dpierce@redhat.com>
Message-ID: <48F7185C.6000700@redhat.com>

Darryl L. Pierce wrote:
> --- a/src/host-browser/host-browser.rb
> +++ b/src/host-browser/host-browser.rb
>          # iterate over any nics left and create new records for them.
> -        boot_type = BootType.find_by_proto('dhcp')
> +        boot_type = BootType.find_by_proto('static')

I'll revert that, since this breaks default network config: DHCP on ovirtbr0 and eth0 bridged to it.
Any objections?



From apevec at redhat.com  Thu Oct 16 11:03:23 2008
From: apevec at redhat.com (Alan Pevec)
Date: Thu, 16 Oct 2008 13:03:23 +0200
Subject: [Ovirt-devel] [PATCH] revert part of
	98b63b405a3803295e517690c6572ca66b24e052
In-Reply-To: <48F7185C.6000700@redhat.com>
References: <48F7185C.6000700@redhat.com>
Message-ID: <1224155003-28928-1-git-send-email-apevec@redhat.com>

restores default Node network config: DHCP on ovirtbr0 and eth0 bridged to it

Signed-off-by: Alan Pevec <apevec at redhat.com>
---
 src/host-browser/host-browser.rb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/host-browser/host-browser.rb b/src/host-browser/host-browser.rb
index d228a59..79d34e8 100755
--- a/src/host-browser/host-browser.rb
+++ b/src/host-browser/host-browser.rb
@@ -302,7 +302,7 @@ class HostBrowser
         end
 
         # iterate over any nics left and create new records for them.
-        boot_type = BootType.find_by_proto('static')
+        boot_type = BootType.find_by_proto('dhcp')
 
         nic_info.collect do |nic|
             puts "Creating a new nic..."
-- 
1.5.5.1



From dpierce at redhat.com  Thu Oct 16 11:47:55 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Thu, 16 Oct 2008 07:47:55 -0400
Subject: [Ovirt-devel] [PATCH] revert part
	of	98b63b405a3803295e517690c6572ca66b24e052
In-Reply-To: <1224155003-28928-1-git-send-email-apevec@redhat.com>
References: <48F7185C.6000700@redhat.com>
	<1224155003-28928-1-git-send-email-apevec@redhat.com>
Message-ID: <48F729EB.10300@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Alan Pevec wrote:
> restores default Node network config: DHCP on ovirtbr0 and eth0 bridged to it
> 
> Signed-off-by: Alan Pevec <apevec at redhat.com>
> ---
>  src/host-browser/host-browser.rb |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/src/host-browser/host-browser.rb b/src/host-browser/host-browser.rb
> index d228a59..79d34e8 100755
> --- a/src/host-browser/host-browser.rb
> +++ b/src/host-browser/host-browser.rb
> @@ -302,7 +302,7 @@ class HostBrowser
>          end
>  
>          # iterate over any nics left and create new records for them.
> -        boot_type = BootType.find_by_proto('static')
> +        boot_type = BootType.find_by_proto('dhcp')
>  
>          nic_info.collect do |nic|
>              puts "Creating a new nic..."

ACK.

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkj3KeYACgkQjaT4DmxOfxs1PQCg6LfUjhnC0biqQI8gqDbDbLGE
DeYAoLHP6C9OrT3MvOyIHMq7L2bCcPpj
=LoAK
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081016/1245fac3/attachment.vcf>

From dpierce at redhat.com  Thu Oct 16 14:58:02 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Thu, 16 Oct 2008 10:58:02 -0400
Subject: [Ovirt-devel] Network configuration wiki page created...
In-Reply-To: <48F60DCC.4000606@redhat.com>
References: <48F60DCC.4000606@redhat.com>
Message-ID: <48F7567A.40107@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Darryl Pierce wrote:
> http://www.ovirt.org/page/VM_Network_Configuration
> 
> Please take a few minutes to review this list and provide feedback. The
> network configuration page is the only part missing now since the
> backend support and processing code is out for review.

I've posted a screenshot for what the interface could look like. It
captures all of the needed elements for configuring network interfaces
and also bonded interfaces.

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkj3VnUACgkQjaT4DmxOfxuicACg79uAaYCy6qO4Yu2/7+R56Op0
tBgAn3+qM213y4LDkaNkhGuk77bCFM89
=rhDd
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081016/5bb3458d/attachment.vcf>

From pmyers at redhat.com  Thu Oct 16 15:01:58 2008
From: pmyers at redhat.com (Perry Myers)
Date: Thu, 16 Oct 2008 11:01:58 -0400
Subject: [Ovirt-devel] [PATCH node] Fix install script to start ntp and
	iptables in case they are not already
Message-ID: <1224169318-20108-1-git-send-email-pmyers@redhat.com>

time sync is necessary or kerberos won't work correctly
iptables needs to be started so that the lokkit -t ovirtbr0 command
is persisted across reboots

Signed-off-by: Perry Myers <pmyers at redhat.com>
---
 ovirt-listen-awake/ovirt-install-node |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/ovirt-listen-awake/ovirt-install-node b/ovirt-listen-awake/ovirt-install-node
index 95ba4de..2ca4cf7 100644
--- a/ovirt-listen-awake/ovirt-install-node
+++ b/ovirt-listen-awake/ovirt-install-node
@@ -128,6 +128,9 @@ elif [ "$1" = "stateful" ]; then
     chkconfig ovirt-listen-awake on
     chkconfig collectd on
     chkconfig libvirt-qpid on
+    chkconfig iptables on
+    chkconfig ntpdate on
+    chkconfig ntpd on
 
     backup_file /etc/sysconfig/libvirtd
     backup_file /etc/libvirt/qemu.conf
@@ -144,6 +147,8 @@ elif [ "$1" = "stateful" ]; then
     # 49152-49216:tcp (libvirt migration)
     lokkit -t ovirtbr0
 
+    service iptables restart
+
     # Check if any domains are active before restarting libvirtd, since it will
     # kill them.  Header information from virsh list is 2 lines, and 1 line for
     # footer.  So > 3 lines means domains are running
@@ -159,6 +164,7 @@ elif [ "$1" = "stateful" ]; then
     service collectd restart
     service ovirt-listen-awake restart
     service libvirt-qpid restart
+    service ntpd restart
 else
     usage
     exit 1
-- 
1.5.5.1



From berrange at redhat.com  Thu Oct 16 15:16:49 2008
From: berrange at redhat.com (Daniel P. Berrange)
Date: Thu, 16 Oct 2008 16:16:49 +0100
Subject: [Ovirt-devel] Network configuration wiki page created...
In-Reply-To: <48F7567A.40107@redhat.com>
References: <48F60DCC.4000606@redhat.com> <48F7567A.40107@redhat.com>
Message-ID: <20081016151649.GD1821@redhat.com>

On Thu, Oct 16, 2008 at 10:58:02AM -0400, Darryl Pierce wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Darryl Pierce wrote:
> > http://www.ovirt.org/page/VM_Network_Configuration
> > 
> > Please take a few minutes to review this list and provide feedback. The
> > network configuration page is the only part missing now since the
> > backend support and processing code is out for review.
> 
> I've posted a screenshot for what the interface could look like. It
> captures all of the needed elements for configuring network interfaces
> and also bonded interfaces.

It feels like there's a bit of disconnect here between the concept
your trying to present & the way you're making users configure it.

eg, you're talking in terms of defining networks for virtual machines,
but making the user work in terms of individual interfaces. I particularly
don't like the duplicated forms for IP / DHCP config, and the way you
end up picking interfaces to go with your bonding device, or the fact 
that you're asking user's to name it.

An approach that maps more closely to the conceptual model would be
to have a single form, with three parts.

 - First define the IP address configuration.
 - Select one or more physical devices to associate
   with the network.
 - Optionally specify bonding mode
 - Optionally specify a VLAN number

If they pick only one physical device, then simply put that straight
into a bridge. 

If they pick two or more physical devices, then ask whether they want
'bandwidth aggregation' or 'failover' mode and automatically put the 
devices into a bond device. No need to tell them your creating bond 
devices - that's not what they care about - only care about whether 
the network being define is aggregating bandwidth or providing 
failover. Use of bonding is a mere implementation detail. Automatically
create the name for the bond device starting with bond0, and incrementing,
then put this bond in the bridge.

If they enter a VLAN, then instead of putting the bond device / physical
device in the bridge, then configure a VLAN device ontop of them, and
put the VLAN device in the bridge. Again you're not asking them for
naming of the VLAN device - just whether there's a VLAN number they
want to use

Note that whatever they choose for physical device, bonding, vlan
configure has no impact on the IP address configuration part - IP
details are logically associated with the network as a whole, only
being assigned to physical device behind the scenes. Or to put it 
anther way - there's no need to ask the user whether they want to
put the IP address on the bond device vs the physical device - that
choice is implicitly driven from the configuration they choose for
devices.

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 apevec at redhat.com  Thu Oct 16 15:31:11 2008
From: apevec at redhat.com (Alan Pevec)
Date: Thu, 16 Oct 2008 17:31:11 +0200
Subject: [Ovirt-devel] [PATCH] masquerade all protocols
Message-ID: <1224171071-11884-1-git-send-email-apevec@redhat.com>

not just default tcp
---
 appliances/ovirt/ovirt.pp.in |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/appliances/ovirt/ovirt.pp.in b/appliances/ovirt/ovirt.pp.in
index da98f2d..eb0776d 100644
--- a/appliances/ovirt/ovirt.pp.in
+++ b/appliances/ovirt/ovirt.pp.in
@@ -100,7 +100,8 @@ firewall_rule {"ovirt_nat":
     table => "nat",
     chain => "POSTROUTING",
     out_interface => "eth0",
-    action => "MASQUERADE"
+    action => "MASQUERADE",
+    protocol => ''
 }
 
 firewall_rule {"ssh": destination_port => '22'}
-- 
1.5.5.1



From dpierce at redhat.com  Thu Oct 16 16:00:26 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Thu, 16 Oct 2008 12:00:26 -0400
Subject: [Ovirt-devel] Network configuration wiki page created...
In-Reply-To: <20081016151649.GD1821@redhat.com>
References: <48F60DCC.4000606@redhat.com> <48F7567A.40107@redhat.com>
	<20081016151649.GD1821@redhat.com>
Message-ID: <48F7651A.7010507@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Daniel P. Berrange wrote:
> It feels like there's a bit of disconnect here between the concept
> your trying to present & the way you're making users configure it.
> 
> eg, you're talking in terms of defining networks for virtual machines,
> but making the user work in terms of individual interfaces. I particularly
> don't like the duplicated forms for IP / DHCP config, and the way you
> end up picking interfaces to go with your bonding device, or the fact 
> that you're asking user's to name it.
> 
> An approach that maps more closely to the conceptual model would be
> to have a single form, with three parts.
> 
>  - First define the IP address configuration.
>  - Select one or more physical devices to associate
>    with the network.
>  - Optionally specify bonding mode
>  - Optionally specify a VLAN number
> 
> If they pick only one physical device, then simply put that straight
> into a bridge. 
> 
> If they pick two or more physical devices, then ask whether they want
> 'bandwidth aggregation' or 'failover' mode and automatically put the 
> devices into a bond device. No need to tell them your creating bond 
> devices - that's not what they care about - only care about whether 
> the network being define is aggregating bandwidth or providing 
> failover. Use of bonding is a mere implementation detail. Automatically
> create the name for the bond device starting with bond0, and incrementing,
> then put this bond in the bridge.
> 
> If they enter a VLAN, then instead of putting the bond device / physical
> device in the bridge, then configure a VLAN device ontop of them, and
> put the VLAN device in the bridge. Again you're not asking them for
> naming of the VLAN device - just whether there's a VLAN number they
> want to use
> 
> Note that whatever they choose for physical device, bonding, vlan
> configure has no impact on the IP address configuration part - IP
> details are logically associated with the network as a whole, only
> being assigned to physical device behind the scenes. Or to put it 
> anther way - there's no need to ask the user whether they want to
> put the IP address on the bond device vs the physical device - that
> choice is implicitly driven from the configuration they choose for
> devices.

Thank you for the feedback. I've redone the mockup using the input
you've provided. Can you take a look and tell me if this is closer to
what you're thinking?

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkj3ZRUACgkQjaT4DmxOfxtKKQCg8ZDWPc9nfekxzhBMVv87aE0D
msgAniIcli+p5olGkh0J7Nzkkq91oFIU
=3NT0
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081016/77161900/attachment.vcf>

From berrange at redhat.com  Thu Oct 16 16:10:43 2008
From: berrange at redhat.com (Daniel P. Berrange)
Date: Thu, 16 Oct 2008 17:10:43 +0100
Subject: [Ovirt-devel] Network configuration wiki page created...
In-Reply-To: <48F7651A.7010507@redhat.com>
References: <48F60DCC.4000606@redhat.com> <48F7567A.40107@redhat.com>
	<20081016151649.GD1821@redhat.com> <48F7651A.7010507@redhat.com>
Message-ID: <20081016161043.GI1821@redhat.com>

On Thu, Oct 16, 2008 at 12:00:26PM -0400, Darryl Pierce wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Daniel P. Berrange wrote:
> > It feels like there's a bit of disconnect here between the concept
> > your trying to present & the way you're making users configure it.
> > 
> > eg, you're talking in terms of defining networks for virtual machines,
> > but making the user work in terms of individual interfaces. I particularly
> > don't like the duplicated forms for IP / DHCP config, and the way you
> > end up picking interfaces to go with your bonding device, or the fact 
> > that you're asking user's to name it.
> > 
> > An approach that maps more closely to the conceptual model would be
> > to have a single form, with three parts.
> > 
> >  - First define the IP address configuration.
> >  - Select one or more physical devices to associate
> >    with the network.
> >  - Optionally specify bonding mode
> >  - Optionally specify a VLAN number
> 
> Thank you for the feedback. I've redone the mockup using the input
> you've provided. Can you take a look and tell me if this is closer to
> what you're thinking?

Yes, this does more closely align, though I see this approach actualy
introduces a slightly different problem - the VLANs don't actually
work very well in this context. If you want to create lots of VLANs,
its forcing you to re-specify the pair of bonded devices each time
which isn't very nice. I can't think of a good answer for this yet

Also, your heading 'For network device bond0' isn't applicable - we're
trying to model this as configuring a network,rather than configuring
a network device.  Which reminds me that we'd want to have a way to
provide a name for the network eg  'Super secure guest network', 
'web server network', or some such. We also want to be able to indicate
whether the network is to be used for guests, storage, or management

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 dpierce at redhat.com  Thu Oct 16 16:45:02 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Thu, 16 Oct 2008 12:45:02 -0400
Subject: [Ovirt-devel] Network configuration wiki page created...
In-Reply-To: <20081016161043.GI1821@redhat.com>
References: <48F60DCC.4000606@redhat.com> <48F7567A.40107@redhat.com>
	<20081016151649.GD1821@redhat.com> <48F7651A.7010507@redhat.com>
	<20081016161043.GI1821@redhat.com>
Message-ID: <48F76F8E.7080906@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Daniel P. Berrange wrote:
> Yes, this does more closely align, though I see this approach actualy
> introduces a slightly different problem - the VLANs don't actually
> work very well in this context. If you want to create lots of VLANs,
> its forcing you to re-specify the pair of bonded devices each time
> which isn't very nice. I can't think of a good answer for this yet

Another thing is if we're going to have multiple networks defined on a
node, we'll need a dropdown for that as well; i.e., select an existing
network to edit.

Regarding the vlans, I'm not experienced enough with them to come up
with a good design. I'll do some research, but if you can point me to a
site that can give a great high level explanation, I can try using that
to tweak the design.

> Also, your heading 'For network device bond0' isn't applicable - we're
> trying to model this as configuring a network,rather than configuring
> a network device.  Which reminds me that we'd want to have a way to
> provide a name for the network eg  'Super secure guest network', 
> 'web server network', or some such. We also want to be able to indicate
> whether the network is to be used for guests, storage, or management

I've dropped that static text and replaced it with a text field for
entering a description. That will get used in the dropdown list.

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkj3b4oACgkQjaT4DmxOfxt5bACeMI5/K8cFiEQmplUpKJGp48wK
HSgAn0EN1zhuFOtNFAAJOYB7+lD6aHaC
=DnfQ
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081016/9f2991b1/attachment.vcf>

From sseago at redhat.com  Thu Oct 16 19:14:30 2008
From: sseago at redhat.com (Scott Seago)
Date: Thu, 16 Oct 2008 19:14:30 +0000
Subject: [Ovirt-devel] [PATCH] initial model work for lvm storage (revised2)
Message-ID: <1224184470-7912-1-git-send-email-sseago@redhat.com>

This includes the model classes w/ migrations for the lvm storage pools and volumes, and some changes required to support Storage Volume tasks. This patch does not include all of the necessary model API methods to support lvm, but it's a starting point -- some changes to clalance's taskomatic bits will be required to support this, and we will need additional model enhancements when the UI work is done, and when the taskomatic back end is finalized.

revised to fix a couple controller bugs and to increment the migration version #
and to fix some additional model problems in taskomatic and host-status

Signed-off-by: Scott Seago <sseago at redhat.com>
---
 src/app/controllers/host_controller.rb             |    8 +-
 src/app/controllers/storage_controller.rb          |   35 ++-----
 src/app/controllers/vm_controller.rb               |   34 +++---
 src/app/models/host.rb                             |    2 +-
 src/app/models/host_task.rb                        |   11 ++-
 src/app/models/iscsi_storage_pool.rb               |    2 +-
 .../models/{host_task.rb => lvm_storage_pool.rb}   |   30 ++++--
 .../{nfs_storage_pool.rb => lvm_storage_volume.rb} |   12 +--
 src/app/models/nfs_storage_pool.rb                 |    2 +-
 src/app/models/storage_pool.rb                     |   12 ++-
 src/app/models/storage_task.rb                     |   11 ++-
 src/app/models/storage_volume.rb                   |   15 +++-
 .../{host_task.rb => storage_volume_task.rb}       |   22 +++-
 src/app/models/task.rb                             |   15 ++-
 src/app/models/vm.rb                               |   12 +-
 src/app/models/vm_task.rb                          |   15 ++-
 src/db/migrate/025_add_lvm_storage.rb              |  106 ++++++++++++++++++++
 src/dutils/active_record_env.rb                    |    2 +
 src/host-status/host-status.rb                     |    5 +-
 src/task-omatic/task_host.rb                       |    2 +-
 src/task-omatic/task_storage.rb                    |    4 +-
 src/task-omatic/task_vm.rb                         |   48 +++------
 src/test/fixtures/tasks.yml                        |   32 ++++--
 23 files changed, 296 insertions(+), 141 deletions(-)
 copy src/app/models/{host_task.rb => lvm_storage_pool.rb} (62%)
 copy src/app/models/{nfs_storage_pool.rb => lvm_storage_volume.rb} (82%)
 copy src/app/models/{host_task.rb => storage_volume_task.rb} (69%)
 create mode 100644 src/db/migrate/025_add_lvm_storage.rb

diff --git a/src/app/controllers/host_controller.rb b/src/app/controllers/host_controller.rb
index 417d11f..a40d297 100644
--- a/src/app/controllers/host_controller.rb
+++ b/src/app/controllers/host_controller.rb
@@ -139,10 +139,10 @@ class HostController < ApplicationController
   def clear_vms
     begin
       Host.transaction do
-        task = HostTask.new({ :user    => get_login_user,
-                              :host_id   => @host.id,
-                              :action  => HostTask::ACTION_CLEAR_VMS,
-                              :state   => Task::STATE_QUEUED})
+        task = HostTask.new({ :user        => get_login_user,
+                              :task_target => @host,
+                              :action      => HostTask::ACTION_CLEAR_VMS,
+                              :state       => Task::STATE_QUEUED})
         task.save!
         @host.is_disabled = true
         @host.save!
diff --git a/src/app/controllers/storage_controller.rb b/src/app/controllers/storage_controller.rb
index bbd7840..fe524f3 100644
--- a/src/app/controllers/storage_controller.rb
+++ b/src/app/controllers/storage_controller.rb
@@ -111,10 +111,10 @@ class StorageController < ApplicationController
   end
 
   def insert_refresh_task
-    @task = StorageTask.new({ :user            => @user,
-                              :storage_pool_id => @storage_pool.id,
-                              :action          => StorageTask::ACTION_REFRESH_POOL,
-                              :state           => Task::STATE_QUEUED})
+    @task = StorageTask.new({ :user        => @user,
+                              :task_target => @storage_pool,
+                              :action      => StorageTask::ACTION_REFRESH_POOL,
+                              :state       => Task::STATE_QUEUED})
     @task.save!
   end
 
@@ -144,12 +144,14 @@ class StorageController < ApplicationController
             :location => storage_pool_url(@storage_pool)
         }
       end
-    rescue
+    rescue => ex
       # FIXME: need to distinguish pool vs. task save errors (but should mostly be pool)
       respond_to do |format|
         format.json {
-          render :json => { :object => "storage_pool", :success => false,
-            :errors => @storage_pool.errors.localize_error_messages.to_a  } }
+          json_hash = { :object => "storage_pool", :success => false,
+            :errors => @storage_pool.errors.localize_error_messages.to_a  }
+          json_hash[:message] = ex.message if json_hash[:errors].empty?
+          render :json => json_hash }
         format.xml { render :xml => @storage_pool.errors,
           :status => :unprocessable_entity }
       end
@@ -181,7 +183,7 @@ class StorageController < ApplicationController
     @redir_controller = @perm_obj.get_controller
     authorize_admin
     @storage_pools = @hardware_pool.storage_volumes
-    @storage_types = StoragePool::STORAGE_TYPES.keys
+    @storage_types = StoragePool::STORAGE_TYPE_PICKLIST
   end
 
   def addstorage
@@ -226,23 +228,6 @@ class StorageController < ApplicationController
     end
   end
 
-  def vm_action
-    if @vm.get_action_list.include?(params[:vm_action])
-      @task = VmTask.new({ :user    => get_login_user,
-                         :vm_id   => params[:id],
-                         :action  => params[:vm_action],
-                         :state   => Task::STATE_QUEUED})
-      if @task.save
-        flash[:notice] = "#{params[:vm_action]} was successfully queued."
-      else
-        flash[:notice] = "Error in inserting task for #{params[:vm_action]}."
-      end
-    else
-      flash[:notice] = "#{params[:vm_action]} is an invalid action."
-    end
-    redirect_to :controller => 'vm', :action => 'show', :id => params[:id]
-  end
-
   def destroy
     pool = @storage_pool.hardware_pool
     if @storage_pool.destroy
diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb
index a9ac9a5..585e524 100644
--- a/src/app/controllers/vm_controller.rb
+++ b/src/app/controllers/vm_controller.rb
@@ -49,19 +49,19 @@ class VmController < ApplicationController
       Vm.transaction do
         @vm.save!
         _setup_vm_provision(params)
-        @task = VmTask.new({ :user    => @user,
-                             :vm_id   => @vm.id,
-                             :action  => VmTask::ACTION_CREATE_VM,
-                             :state   => Task::STATE_QUEUED})
+        @task = VmTask.new({ :user        => @user,
+                             :task_target => @vm,
+                             :action      => VmTask::ACTION_CREATE_VM,
+                             :state       => Task::STATE_QUEUED})
         @task.save!
       end
       start_now = params[:start_now]
       if (start_now)
         if @vm.get_action_list.include?(VmTask::ACTION_START_VM)
-          @task = VmTask.new({ :user    => @user,
-                               :vm_id   => @vm.id,
-                               :action  => VmTask::ACTION_START_VM,
-                               :state   => Task::STATE_QUEUED})
+          @task = VmTask.new({ :user        => @user,
+                               :task_target => @vm,
+                               :action      => VmTask::ACTION_START_VM,
+                               :state       => Task::STATE_QUEUED})
           @task.save!
           alert = "VM was successfully created. VM Start action queued."
         else
@@ -105,19 +105,19 @@ class VmController < ApplicationController
       _setup_vm_provision(params)
 
       if (params[:start_now] and @vm.get_action_list.include?(VmTask::ACTION_START_VM) )
-        @task = VmTask.new({ :user    => @user,
-                             :vm_id   => @vm.id,
-                             :action  => VmTask::ACTION_START_VM,
-                             :state   => Task::STATE_QUEUED})
+        @task = VmTask.new({ :user        => @user,
+                             :task_target => @vm,
+                             :action      => VmTask::ACTION_START_VM,
+                             :state       => Task::STATE_QUEUED})
         @task.save!
       elsif ( params[:restart_now] and @vm.get_action_list.include?(VmTask::ACTION_SHUTDOWN_VM) )
-        @task = VmTask.new({ :user    => @user,
-                             :vm_id   => @vm.id,
-                             :action  => VmTask::ACTION_SHUTDOWN_VM,
-                             :state   => Task::STATE_QUEUED})
+        @task = VmTask.new({ :user        => @user,
+                             :task_target => @vm,
+                             :action      => VmTask::ACTION_SHUTDOWN_VM,
+                             :state       => Task::STATE_QUEUED})
         @task.save!
         @task = VmTask.new({ :user    => @user,
-                             :vm_id   => @vm.id,
+                             :task_target => @vm,
                              :action  => VmTask::ACTION_START_VM,
                              :state   => Task::STATE_QUEUED})
         @task.save!
diff --git a/src/app/models/host.rb b/src/app/models/host.rb
index de5c5ee..546da19 100644
--- a/src/app/models/host.rb
+++ b/src/app/models/host.rb
@@ -31,7 +31,7 @@ class Host < ActiveRecord::Base
     def consuming_resources
       find(:all, :conditions=>{:state=>Vm::RUNNING_STATES})
     end
-  has_many :tasks, :class_name => "HostTask", :dependent => :destroy, :order => "id DESC" do
+  has_many :tasks, :as => :task_target, :dependent => :destroy, :order => "id ASC" do
     def queued
       find(:all, :conditions=>{:state=>Task::STATE_QUEUED})
     end
diff --git a/src/app/models/host_task.rb b/src/app/models/host_task.rb
index 0aea41b..82298db 100644
--- a/src/app/models/host_task.rb
+++ b/src/app/models/host_task.rb
@@ -22,11 +22,20 @@ class HostTask < Task
   ACTION_CLEAR_VMS = "clear_vms"
 
   def after_initialize
-    self.hardware_pool = host.hardware_pool if self.host
+    self.hardware_pool = task_target.hardware_pool if self.task_target_type=="Host"
   end
 
   def task_obj
     "Host;;;#{self.host.id};;;#{self.host.hostname}"
   end
 
+  def vm
+    nil
+  end
+  def storage_volume
+    nil
+  end
+  def storage_pool
+    nil
+  end
 end
diff --git a/src/app/models/iscsi_storage_pool.rb b/src/app/models/iscsi_storage_pool.rb
index 1280834..7802a90 100644
--- a/src/app/models/iscsi_storage_pool.rb
+++ b/src/app/models/iscsi_storage_pool.rb
@@ -19,7 +19,7 @@
 
 class IscsiStoragePool < StoragePool
   
-  validates_presence_of :port, :target
+  validates_presence_of :ip_addr, :port, :target
   validates_uniqueness_of :ip_addr, :scope => [:port, :target]
   
   def label_components
diff --git a/src/app/models/host_task.rb b/src/app/models/lvm_storage_pool.rb
similarity index 62%
copy from src/app/models/host_task.rb
copy to src/app/models/lvm_storage_pool.rb
index 0aea41b..08b8938 100644
--- a/src/app/models/host_task.rb
+++ b/src/app/models/lvm_storage_pool.rb
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 Red Hat, Inc.
 # Written by Scott Seago <sseago at redhat.com>
 #
@@ -17,16 +17,32 @@
 # MA  02110-1301, USA.  A copy of the GNU General Public License is
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
-class HostTask < Task
+require 'util/ovirt'
+
+class LvmStoragePool < StoragePool
+
+  has_many :source_volumes, :class_name => "StorageVolume",
+                            :foreign_key => "lvm_pool_id",
+                            :dependent => :nullify do
+    def total_size
+      find(:all).inject(0){ |sum, sv| sum + sv.size }
+    end
+  end
 
-  ACTION_CLEAR_VMS = "clear_vms"
+  validates_presence_of :vg_name
+  validates_uniqueness_of :vg_name
 
-  def after_initialize
-    self.hardware_pool = host.hardware_pool if self.host
+  def display_name
+    "#{get_type_label}: #{vg_name}"
   end
 
-  def task_obj
-    "Host;;;#{self.host.id};;;#{self.host.hostname}"
+  def size
+    source_volums.total_size
   end
 
+  def size_in_gb
+    kb_to_gb(size)
+  end
+
+
 end
diff --git a/src/app/models/nfs_storage_pool.rb b/src/app/models/lvm_storage_volume.rb
similarity index 82%
copy from src/app/models/nfs_storage_pool.rb
copy to src/app/models/lvm_storage_volume.rb
index 2d05305..7dde2d1 100644
--- a/src/app/models/nfs_storage_pool.rb
+++ b/src/app/models/lvm_storage_volume.rb
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 Red Hat, Inc.
 # Written by Scott Seago <sseago at redhat.com>
 #
@@ -17,12 +17,8 @@
 # MA  02110-1301, USA.  A copy of the GNU General Public License is
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
-class NfsStoragePool < StoragePool
-
-  validates_presence_of :export_path
-  validates_uniqueness_of :ip_addr, :scope => :export_path
-
-  def label_components
-    "#{export_path}"
+class LvmStorageVolume < StorageVolume
+  def display_name
+    "#{get_type_label}: #{storage_pool.vg_name}:#{lv_name}"
   end
 end
diff --git a/src/app/models/nfs_storage_pool.rb b/src/app/models/nfs_storage_pool.rb
index 2d05305..a27944b 100644
--- a/src/app/models/nfs_storage_pool.rb
+++ b/src/app/models/nfs_storage_pool.rb
@@ -19,7 +19,7 @@
 
 class NfsStoragePool < StoragePool
 
-  validates_presence_of :export_path
+  validates_presence_of :ip_addr, :export_path
   validates_uniqueness_of :ip_addr, :scope => :export_path
 
   def label_components
diff --git a/src/app/models/storage_pool.rb b/src/app/models/storage_pool.rb
index bc98f8e..7a6f8f0 100644
--- a/src/app/models/storage_pool.rb
+++ b/src/app/models/storage_pool.rb
@@ -19,7 +19,7 @@
 
 class StoragePool < ActiveRecord::Base
   belongs_to              :hardware_pool
-  has_many :tasks, :class_name => "StorageTask", :dependent => :destroy, :order => "id DESC" do
+  has_many :tasks, :as => :task_target, :dependent => :destroy, :order => "id ASC" do
     def queued
       find(:all, :conditions=>{:state=>Task::STATE_QUEUED})
     end
@@ -33,14 +33,18 @@ class StoragePool < ActiveRecord::Base
   has_many :smart_pool_tags, :as => :tagged, :dependent => :destroy
   has_many :smart_pools, :through => :smart_pool_tags
 
-  validates_presence_of :ip_addr, :hardware_pool_id
+
+  validates_presence_of :hardware_pool_id
 
   acts_as_xapian :texts => [ :ip_addr, :target, :export_path, :type ],
                  :terms => [ [ :search_users, 'U', "search_users" ] ]
   ISCSI = "iSCSI"
   NFS   = "NFS"
+  LVM   = "LVM"
   STORAGE_TYPES = { ISCSI => "Iscsi",
-                    NFS   => "Nfs" }
+                    NFS   => "Nfs",
+                    LVM   => "Lvm" }
+  STORAGE_TYPE_PICKLIST = STORAGE_TYPES.keys - [LVM]
 
   def self.factory(type, params = nil)
     case type
@@ -48,6 +52,8 @@ class StoragePool < ActiveRecord::Base
       return IscsiStoragePool.new(params)
     when NFS
       return NfsStoragePool.new(params)
+    when LVM
+      return LvmStoragePool.new(params)
     else
       return nil
     end
diff --git a/src/app/models/storage_task.rb b/src/app/models/storage_task.rb
index db604d5..785f0ea 100644
--- a/src/app/models/storage_task.rb
+++ b/src/app/models/storage_task.rb
@@ -22,10 +22,19 @@ class StorageTask < Task
   ACTION_REFRESH_POOL = "refresh_pool"
 
   def after_initialize
-    self.hardware_pool = storage_pool.hardware_pool if self.storage_pool
+    self.hardware_pool = task_target.hardware_pool if self.task_target_type=="StoragePool"
   end
 
   def task_obj
     "StoragePool;;;#{self.storage_pool.id};;;#{self.storage_pool.display_name}"
   end
+  def host
+    nil
+  end
+  def vm
+    nil
+  end
+  def storage_volume
+    nil
+  end
 end
diff --git a/src/app/models/storage_volume.rb b/src/app/models/storage_volume.rb
index ef9cd6e..378b58f 100644
--- a/src/app/models/storage_volume.rb
+++ b/src/app/models/storage_volume.rb
@@ -23,12 +23,23 @@ class StorageVolume < ActiveRecord::Base
   belongs_to              :storage_pool
   has_and_belongs_to_many :vms
 
+  belongs_to :lvm_storage_pool, :class_name => "LvmStoragePool",
+                            :foreign_key => "lvm_pool_id"
+
+  has_many :tasks, :as => :task_target, :dependent => :destroy, :order => "id ASC" do
+    def queued
+      find(:all, :conditions=>{:state=>Task::STATE_QUEUED})
+    end
+  end
+
   def self.factory(type, params = nil)
     case type
-    when "iSCSI"
+    when StoragePool::ISCSI
       return IscsiStorageVolume.new(params)
-    when "NFS"
+    when StoragePool::NFS
       return NfsStorageVolume.new(params)
+    when StoragePool::LVM
+      return LvmStorageVolume.new(params)
     else
       return nil
     end
diff --git a/src/app/models/host_task.rb b/src/app/models/storage_volume_task.rb
similarity index 69%
copy from src/app/models/host_task.rb
copy to src/app/models/storage_volume_task.rb
index 0aea41b..78f2895 100644
--- a/src/app/models/host_task.rb
+++ b/src/app/models/storage_volume_task.rb
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 Red Hat, Inc.
 # Written by Scott Seago <sseago at redhat.com>
 #
@@ -17,16 +17,26 @@
 # MA  02110-1301, USA.  A copy of the GNU General Public License is
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
-class HostTask < Task
+class StorageVolumeTask < Task
 
-  ACTION_CLEAR_VMS = "clear_vms"
+  ACTION_CREATE_VOLUME = "create_volume"
+  ACTION_EDIT_VOLUME = "edit_volume"
 
   def after_initialize
-    self.hardware_pool = host.hardware_pool if self.host
+    self.hardware_pool = task_target.storage_pool.hardware_pool if self.task_target_type=="StorageVolume"
   end
 
   def task_obj
-    "Host;;;#{self.host.id};;;#{self.host.hostname}"
+    "StorageVolume;;;#{self.storage_volume.id};;;#{self.storage_volume.display_name}"
+  end
+  end
+  def host
+    nil
+  end
+  def vm
+    nil
+  end
+  def storage_pool
+    nil
   end
-
 end
diff --git a/src/app/models/task.rb b/src/app/models/task.rb
index efbed64..f231c18 100644
--- a/src/app/models/task.rb
+++ b/src/app/models/task.rb
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 Red Hat, Inc.
 # Written by Scott Seago <sseago at redhat.com>
 #
@@ -20,13 +20,20 @@
 class Task < ActiveRecord::Base
   belongs_to :hardware_pool
   belongs_to :vm_resource_pool
+  belongs_to :task_target,       :polymorphic => true
   # moved associations here so that nested set :include directives work
   # StorageTask association
-  belongs_to :storage_pool
+  belongs_to :storage_pool,   :class_name => "StoragePool",
+                              :foreign_key => "task_target_id"
+  # StorageVolumeTask association
+  belongs_to :storage_volume, :class_name => "StorageVolume",
+                              :foreign_key => "task_target_id"
   # HostTask association
-  belongs_to :host
+  belongs_to :host,           :class_name => "Host",
+                              :foreign_key => "task_target_id"
   # VmTask association
-  belongs_to :vm
+  belongs_to :vm,             :class_name => "Vm",
+                              :foreign_key => "task_target_id"
 
   STATE_QUEUED       = "queued"
   STATE_RUNNING      = "running"
diff --git a/src/app/models/vm.rb b/src/app/models/vm.rb
index 6853157..2eff87a 100644
--- a/src/app/models/vm.rb
+++ b/src/app/models/vm.rb
@@ -22,7 +22,7 @@ require 'util/ovirt'
 class Vm < ActiveRecord::Base
   belongs_to :vm_resource_pool
   belongs_to :host
-  has_many :tasks, :class_name => "VmTask", :dependent => :destroy, :order => "id ASC" do
+  has_many :tasks, :as => :task_target, :dependent => :destroy, :order => "id ASC" do
     def queued
       find(:all, :conditions=>{:state=>Task::STATE_QUEUED})
     end
@@ -231,11 +231,11 @@ class Vm < ActiveRecord::Base
 
   def queue_action(user, action, data = nil)
     return false unless get_action_list.include?(action)
-    task = VmTask.new({ :user    => user,
-                        :vm_id   => id,
-                        :action  => action,
-                        :args    => data,
-                        :state   => Task::STATE_QUEUED})
+    task = VmTask.new({ :user        => user,
+                        :task_target => self,
+                        :action      => action,
+                        :args        => data,
+                        :state       => Task::STATE_QUEUED})
     task.save!
     return true
   end
diff --git a/src/app/models/vm_task.rb b/src/app/models/vm_task.rb
index 6251919..d1966dc 100644
--- a/src/app/models/vm_task.rb
+++ b/src/app/models/vm_task.rb
@@ -107,9 +107,9 @@ class VmTask < Task
                                       :popup_action => 'migrate'} }
 
   def after_initialize
-    if self.vm
-      self.vm_resource_pool = vm.vm_resource_pool
-      self.hardware_pool = vm.get_hardware_pool
+    if self.task_target_type=="Vm"
+      self.vm_resource_pool = task_target.vm_resource_pool
+      self.hardware_pool = task_target.get_hardware_pool
     end
   end
 
@@ -141,4 +141,13 @@ class VmTask < Task
   def self.label_and_action(action)
     return [action_label(action), action, action_icon(action)]
   end
+  def host
+    nil
+  end
+  def storage_volume
+    nil
+  end
+  def storage_pool
+    nil
+  end
 end
diff --git a/src/db/migrate/025_add_lvm_storage.rb b/src/db/migrate/025_add_lvm_storage.rb
new file mode 100644
index 0000000..697df4d
--- /dev/null
+++ b/src/db/migrate/025_add_lvm_storage.rb
@@ -0,0 +1,106 @@
+#
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Scott Seago <sseago at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+class AddLvmStorage < ActiveRecord::Migration
+  def self.up
+    #LVM pool does not use ip_addr
+
+    # VG Name
+    add_column :storage_pools, :vg_name, :string
+
+    # LV name
+    add_column :storage_volumes, :lv_name, :string
+    # LV capacity==existing size attr
+
+    # LV <target><permissions>
+    # FIXME: do we want to make these user-determined, or should
+    # these be defined by the model itself?
+    add_column :storage_volumes, :lv_owner_perms, :string
+    add_column :storage_volumes, :lv_group_perms, :string
+    add_column :storage_volumes, :lv_mode_perms, :string
+
+    # VG pool ID
+    add_column :storage_volumes, :lvm_pool_id, :integer
+    execute "alter table storage_volumes add constraint fk_storage_volumes_lvm_pools
+             foreign key (lvm_pool_id) references storage_pools(id)"
+
+    # use polymorphic tasks association
+    add_column :tasks, :task_target_id, :integer
+    add_column :tasks, :task_target_type, :string
+    begin
+      Task.transaction do
+        HostTask.find(:all).each do |task|
+          task.task_target_type = 'Host'
+          task.task_target_id = task.host_id
+          task.save!
+        end
+        StorageTask.find(:all).each do |task|
+          task.task_target_type = 'StoragePool'
+          task.task_target_id = task.storage_pool_id
+          task.save!
+        end
+        VmTask.find(:all).each do |task|
+          task.task_target_type = 'Vm'
+          task.task_target_id = task.vm_id
+          task.save!
+        end
+      end
+      remove_column :tasks, :vm_id
+      remove_column :tasks, :storage_pool_id
+      remove_column :tasks, :host_id
+    rescue
+      puts "could not update tasks..."
+    end
+
+  end
+
+  def self.down
+    remove_column :storage_pools, :vg_name
+
+    remove_column :storage_volumes, :lv_name
+    remove_column :storage_volumes, :lv_owner_perms
+    remove_column :storage_volumes, :lv_group_perms
+    remove_column :storage_volumes, :lv_mode_perms
+    remove_column :storage_volumes, :lvm_pool_id
+
+    add_column :tasks, :vm_id, :integer
+    add_column :tasks, :storage_pool_id, :integer
+    add_column :tasks, :host_id, :integer
+    begin
+      Task.transaction do
+        HostTask.find(:all).each do |task|
+          task.host_id = task.task_target_id
+          task.save!
+        end
+        StorageTask.find(:all).each do |task|
+          task.storage_pool_id = task.task_target_id
+          task.save!
+        end
+        VmTask.find(:all).each do |task|
+          task.vm_id = task.task_target_id
+          task.save!
+        end
+      end
+      remove_column :tasks, :task_target_id
+      remove_column :tasks, :task_target_type
+    rescue
+      puts "could not update tasks..."
+    end
+  end
+end
diff --git a/src/dutils/active_record_env.rb b/src/dutils/active_record_env.rb
index 3903c87..26caac2 100644
--- a/src/dutils/active_record_env.rb
+++ b/src/dutils/active_record_env.rb
@@ -80,10 +80,12 @@ require 'models/vm_task.rb'
 require 'models/storage_pool.rb'
 require 'models/iscsi_storage_pool.rb'
 require 'models/nfs_storage_pool.rb'
+require 'models/lvm_storage_pool.rb'
 
 require 'models/storage_volume.rb'
 require 'models/iscsi_storage_volume.rb'
 require 'models/nfs_storage_volume.rb'
+require 'models/lvm_storage_volume.rb'
 require 'models/smart_pool.rb'
 require 'models/smart_pool_tag.rb'
 
diff --git a/src/host-status/host-status.rb b/src/host-status/host-status.rb
index 6330d5c..291369e 100755
--- a/src/host-status/host-status.rb
+++ b/src/host-status/host-status.rb
@@ -92,11 +92,10 @@ def kick_taskomatic(msg, vm, host_id = nil)
   task.user = "host-status"
   task.action = VmTask::ACTION_UPDATE_STATE_VM
   task.state = Task::STATE_QUEUED
-  task.args = msg
-  task.host_id = host_id
+  task.args = host_id ? [msg,host_id].join(',') : msg
   task.created_at = Time.now
   task.time_started = Time.now
-  task.vm_id = vm.id
+  task.task_target = vm
   task.save
 end
 
diff --git a/src/task-omatic/task_host.rb b/src/task-omatic/task_host.rb
index 5f42da3..3d039fb 100644
--- a/src/task-omatic/task_host.rb
+++ b/src/task-omatic/task_host.rb
@@ -25,7 +25,7 @@ require 'task_vm'
 def clear_vms_host(task)
   puts "clear_vms_host"
 
-  src_host = findHost(task.host_id)
+  src_host = task.host
 
   src_host.vms.each do |vm|
     migrate(vm)
diff --git a/src/task-omatic/task_storage.rb b/src/task-omatic/task_storage.rb
index ff9271e..5cddf2b 100644
--- a/src/task-omatic/task_storage.rb
+++ b/src/task-omatic/task_storage.rb
@@ -23,14 +23,14 @@ require 'libvirt'
 def refresh_pool(task)
   puts "refresh_pool"
 
-  pool = StoragePool.find(task[:storage_pool_id])
+  pool = task.storage_pool
 
   if pool == nil
     raise "Could not find storage pool"
   end
 
   if pool[:type] == "IscsiStoragePool"
-    storage = Iscsi.new(pool.ip_addr, pool.target)
+    storage = Iscsi.new(pool.ip_addr, pool[:target])
   elsif pool[:type] == "NfsStoragePool"
     storage = NFS.new(pool.ip_addr, pool.export_path)
   else
diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb
index 02e41af..b5f888d 100644
--- a/src/task-omatic/task_vm.rb
+++ b/src/task-omatic/task_vm.rb
@@ -118,10 +118,10 @@ end
 
 def findVM(task, fail_on_nil_host_id = true)
   # find the matching VM in the vms table
-  vm = Vm.find(:first, :conditions => [ "id = ?", task.vm_id ])
+  vm = task.vm
 
   if vm == nil
-    raise "VM id " + task.vm_id + "not found"
+    raise "VM not found for task " + task.id
   end
 
   if vm.host_id == nil && fail_on_nil_host_id
@@ -135,7 +135,7 @@ def findVM(task, fail_on_nil_host_id = true)
     # can mark it either as off (if we didn't find it), or mark the correct
     # vm.host_id if we did.  However, if you have a large number of hosts
     # out there, this could take a while.
-    raise "No host_id for VM " + task.vm_id.to_s
+    raise "No host_id for VM " + vm.id.to_s
   end
 
   return vm
@@ -196,10 +196,7 @@ def shutdown_vm(task)
   setVmState(vm, Vm::STATE_STOPPING)
 
   begin
-    # OK, now that we found the VM, go looking in the hosts table
-    host = findHost(vm.host_id)
-
-    conn = Libvirt::open("qemu+tcp://" + host.hostname + "/system")
+    conn = Libvirt::open("qemu+tcp://" + vm.host.hostname + "/system")
     dom = conn.lookup_domain_by_uuid(vm.uuid)
     # FIXME: crappy.  Right now we destroy the domain to make sure it
     # really went away.  We really want to shutdown the domain to make
@@ -357,10 +354,7 @@ def save_vm(task)
   setVmState(vm, Vm::STATE_SAVING)
 
   begin
-    # OK, now that we found the VM, go looking in the hosts table
-    host = findHost(vm.host_id)
-
-    conn = Libvirt::open("qemu+tcp://" + host.hostname + "/system")
+    conn = Libvirt::open("qemu+tcp://" + vm.host.hostname + "/system")
     dom = conn.lookup_domain_by_uuid(vm.uuid)
     dom.save("/tmp/" + vm.uuid + ".save")
     conn.close
@@ -400,13 +394,10 @@ def restore_vm(task)
   setVmState(vm, Vm::STATE_RESTORING)
 
   begin
-    # OK, now that we found the VM, go looking in the hosts table
-    host = findHost(vm.host_id)
-
     # FIXME: we should probably go out to the host and check what it thinks
     # the state is
 
-    conn = Libvirt::open("qemu+tcp://" + host.hostname + "/system")
+    conn = Libvirt::open("qemu+tcp://" + vm.host.hostname + "/system")
     dom = conn.lookup_domain_by_uuid(vm.uuid)
     dom.restore
 
@@ -442,10 +433,7 @@ def suspend_vm(task)
   setVmState(vm, Vm::STATE_SUSPENDING)
 
   begin
-    # OK, now that we found the VM, go looking in the hosts table
-    host = findHost(vm.host_id)
-
-    conn = Libvirt::open("qemu+tcp://" + host.hostname + "/system")
+    conn = Libvirt::open("qemu+tcp://" + vm.host.hostname + "/system")
     dom = conn.lookup_domain_by_uuid(vm.uuid)
     dom.suspend
     conn.close
@@ -482,10 +470,7 @@ def resume_vm(task)
   setVmState(vm, Vm::STATE_RESUMING)
 
   begin
-    # OK, now that we found the VM, go looking in the hosts table
-    host = findHost(vm.host_id)
-
-    conn = Libvirt::open("qemu+tcp://" + host.hostname + "/system")
+    conn = Libvirt::open("qemu+tcp://" + vm.host.hostname + "/system")
     dom = conn.lookup_domain_by_uuid(vm.uuid)
     dom.resume
     conn.close
@@ -507,27 +492,24 @@ def update_state_vm(task)
   #
   # Actually for migration it is necessary that it be able to update
   # the host and state of the VM once it is migrated.
-  vm = findVM(task, fail_on_nil_host_id = false)
-  if vm == nil
-    raise "VM id " + task.vm_id + "not found"
-  end
-
-  if vm.host_id == nil
-    vm.host_id = task.host_id
+  vm = findVM(task, false)
+  new_vm_state, host_id_str = task.args.split(",")
+  if (vm.host_id == nil) and host_id_str
+    vm.host_id = host_id_str.to_i
   end
 
 
   vm_effective_state = Vm::EFFECTIVE_STATE[vm.state]
-  task_effective_state = Vm::EFFECTIVE_STATE[task.args]
+  task_effective_state = Vm::EFFECTIVE_STATE[new_vm_state]
 
   if vm_effective_state != task_effective_state
-    vm.state = task.args
+    vm.state = new_vm_state
 
     if task_effective_state == Vm::STATE_STOPPED
       setVmShutdown(vm)
     end
     vm.save
-    puts "Updated state to " + task.args
+    puts "Updated state to " + new_vm_state
   end
 end
 
diff --git a/src/test/fixtures/tasks.yml b/src/test/fixtures/tasks.yml
index 73daaef..404543c 100644
--- a/src/test/fixtures/tasks.yml
+++ b/src/test/fixtures/tasks.yml
@@ -9,9 +9,8 @@ one:
   time_ended:
   message:
   type: 'VmTask'
-  vm_id: 5
-  storage_pool_id: 
-  host_id:
+  task_target_type: 'Vm'
+  task_target_id: 5
 two:
   id: 2
   user: 'admin'
@@ -19,7 +18,8 @@ two:
   state: 'queued'
   created_at: '2008-01-13 15:40:13.417883'
   type: 'StorageTask'
-  storage_pool_id: 1
+  task_target_type: 'StoragePool'
+  task_target_id: 1
 three:
   id: 3
   user: 'luser'
@@ -30,7 +30,8 @@ three:
   time_ended: '2002-12-14 05:12:23.417885'
   message: 'finished!'
   type: 'VmTask'
-  vm_id: 7
+  task_target_type: 'Vm'
+  task_target_id: 7
 four:
   id: 4
   user: 'buser'
@@ -39,7 +40,8 @@ four:
   created_at: '2015-11-23 15:12:43.417883'
   time_started: '2015-11-23 15:12:43.417885'
   type: 'VmTask'
-  vm_id: 2
+  task_target_type: 'Vm'
+  task_target_id: 2
 five:
   id: 5
   user: 'admin'
@@ -48,7 +50,8 @@ five:
   created_at: '2015-11-23 15:12:43.417883'
   time_started: '2015-11-23 15:12:43.417885'
   type: 'VmTask'
-  vm_id: 3
+  task_target_type: 'Vm'
+  task_target_id: 3
 six:
   id: 6
   user: 'buser'
@@ -59,7 +62,8 @@ six:
   time_ended: '2001-01-03 01:05:19.417885'
   message: 'task cancelled'
   type: 'HostTask'
-  host_id: 9
+  task_target_type: 'Host'
+  task_target_id: 9
 seven:
   id: 7
   user: 'yuser'
@@ -70,7 +74,8 @@ seven:
   time_ended: '2001-01-10 13:49:15.417885'
   message: 'task failed, insufficient permissions'
   type: 'StorageTask'
-  storage_pool_id: 4
+  task_target_type: 'StoragePool'
+  task_target_id: 4
 eight:
   id: 8
   user: 'yuser'
@@ -81,7 +86,8 @@ eight:
   time_ended: '2001-01-10 14:04:15.417885'
   message: 'completed'
   type: 'StorageTask'
-  storage_pool_id: 4
+  task_target_type: 'StoragePool'
+  task_target_id: 4
 nine:
   id: 9
   user: 'kadmin'
@@ -91,7 +97,8 @@ nine:
   time_started: '2008-04-20 20:00:00.417885'
   message: 'paused'
   type: 'VmTask'
-  vm_id: 12
+  task_target_type: 'Vm'
+  task_target_id: 12
 ten:
   id: 10
   user: 'kadmin'
@@ -99,4 +106,5 @@ ten:
   state: 'queued'
   created_at: '2008-04-20 20:05:30.417883'
   type: 'VmTask'
-  vm_id: 12
+  task_target_type: 'Vm'
+  task_target_id: 12
-- 
1.5.5.1



From berrange at redhat.com  Thu Oct 16 19:42:24 2008
From: berrange at redhat.com (Daniel P. Berrange)
Date: Thu, 16 Oct 2008 20:42:24 +0100
Subject: [Ovirt-devel] Network configuration wiki page created...
In-Reply-To: <48F76F8E.7080906@redhat.com>
References: <48F60DCC.4000606@redhat.com> <48F7567A.40107@redhat.com>
	<20081016151649.GD1821@redhat.com> <48F7651A.7010507@redhat.com>
	<20081016161043.GI1821@redhat.com> <48F76F8E.7080906@redhat.com>
Message-ID: <20081016194224.GB6745@redhat.com>

On Thu, Oct 16, 2008 at 12:45:02PM -0400, Darryl Pierce wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Daniel P. Berrange wrote:
> > Yes, this does more closely align, though I see this approach actualy
> > introduces a slightly different problem - the VLANs don't actually
> > work very well in this context. If you want to create lots of VLANs,
> > its forcing you to re-specify the pair of bonded devices each time
> > which isn't very nice. I can't think of a good answer for this yet
> 
> Another thing is if we're going to have multiple networks defined on a
> node, we'll need a dropdown for that as well; i.e., select an existing
> network to edit.
> 
> Regarding the vlans, I'm not experienced enough with them to come up
> with a good design. I'll do some research, but if you can point me to a
> site that can give a great high level explanation, I can try using that
> to tweak the design.

Thinking about it some more, I wasn't far off - we just need some 
dynamic handling of the devices list depending on what you select.

Basic properties

     Name: free text name for the network

IPv4 properties

       Mode: DHCP | Static | None
    Address: <if static>
    Netmask: <if static>
  Broadcast: <if static>
    Gateway: <if static>

IPv6 properties

       Mode: DHCP | Static | Autoconfig | None
    Address: <if static>
     Prefix: <if static>
    Gateway: <if static>

Physical devices

  Shared: yes | no
    Mode: raw | failover | aggregation | vlan
    VLAN: <number>
 Devices: eth0: 00:11:22:33:44:55:66 (or name of network if its used)
          eth1: 00:11:22:33:44:55:66 (or name of network if its used)
          eth2: 00:11:22:33:44:55:66 (or name of network if its used)
          bond0: <name of network owning the bond>
          bond1: <name of network owning the bond>

So, to explain this last section

 - If you select shared = 'yes', then the resulting device (either ethX
   or bondX) will be attached to a bridge. This enables its use for a
   guest. If not shared, then its a storage or mgmt network where the
   device is used directly.

 - If mode is 'raw'
      - Devices list is filtered to only show unused ethXXX devices
      - Allows picking of one device
      - Configures the ethXXX device or the bridge if its shared

 - If mode is 'failover' or 'aggregation'
      - Devices list is filtered to only show unused ethXXX devices
      - Allows picking of multiple devices based on mac addr
      - We put them all in a bondXXX device
      - Configures the bondXXX device or the bridge if its shared

 - If mode is 'vlan'
      - Devices list shows all ethXXX, all bondXXX devices in networks
        which are not shared
      - Allows picking of one device based on network name
      - Creates a VLAN device ethXXX.YYY or bondXXX.YYY against 
        this device, where YYY is VLAN number
      - Configures the ethXXX.YYY/bondXXX.YY device or the bridge
        if its shared


Some examples

 1. Want device eth0 for mgmt traffic

     - Create network with
          * device mode = raw
          * pick eth0 based on mac addr
          * Configure IPv4/6 
          * Shared = no
        Results in eth0

 2. Want devices eth0 and eth1 bonded for guest traffic

     - Create network with
          * device mode = failover
          * pick eth0 & eth1 based on mac addr
          * Optional IPv4/6 config if desired
          * Shared = yes
        Results in bond0 + br0


 3. Want devices eth0 and eth1, bonded, with two VLANs available for
    guest traffic

     - Create network with
          * device mode = failover
          * pick eth0 & eth1 based on mac addr
          * IPv4/6 address = none
          * Shared = no
        Results in bond0

     - Create network with
          * device mode = vlan
          * pick bond0 based on network name
          * Optional IPv4/6 config if desired
          * Shared = yes
          * VLAN = 123
        Results in bond0.123 + br0.123

     - Create network with
          * device mode = vlan
          * pick bond0 based on network name
          * Optional IPv4/6 config if desired
          * Shared = yes
          * VLAN = 125
        Results in bond0.125 + br0.125


 4. Want device eth0 with one VLAN for guest traffic and one VLAN for
    mgmt traffic

      - Create network with
          * device mode = raw
          * pick eth0 based on mac addr
          * IPv4/6 config = none
          * shared = no
        Results in eth0

      - Create network with
          * device mode = vlan
          * pick eth0 based on network name
          * shared = yes
          * VLAN = 123
        Results in eth0.123 + br0.123

      - Create network with
          * device mode = vlan
          * pick eth0 based on network name
          * shared = no
          * VLAN = 125
         Results in eth0.125


So for bridging, bonding & raw devices everything can be done in one
step by defining a network & picking devices. 

Additional networks need only be defined if we wish to make use of
multiple VLANs on a raw device or bond.

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 dpierce at redhat.com  Thu Oct 16 19:50:10 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Thu, 16 Oct 2008 15:50:10 -0400
Subject: [Ovirt-devel] Network configuration wiki page created...
In-Reply-To: <20081016194224.GB6745@redhat.com>
References: <48F60DCC.4000606@redhat.com> <48F7567A.40107@redhat.com>
	<20081016151649.GD1821@redhat.com> <48F7651A.7010507@redhat.com>
	<20081016161043.GI1821@redhat.com> <48F76F8E.7080906@redhat.com>
	<20081016194224.GB6745@redhat.com>
Message-ID: <48F79AF2.7010000@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Daniel P. Berrange wrote:
> Thinking about it some more, I wasn't far off - we just need some 
> dynamic handling of the devices list depending on what you select.

Excellent! That's exactly the kind of usage detail I needed. I'll have
an updated screenshot shortly.

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkj3mu4ACgkQjaT4DmxOfxvUXQCfQebkTZMmy1XpiJFNMZ8WEgUP
XIQAn3mrJlyuQceqyQMGTrIBo+NnoOvq
=G4+h
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081016/5ce46aaa/attachment.vcf>

From dpierce at redhat.com  Thu Oct 16 20:08:59 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Thu, 16 Oct 2008 16:08:59 -0400
Subject: [Ovirt-devel] Network configuration wiki page created...
In-Reply-To: <20081016194224.GB6745@redhat.com>
References: <48F60DCC.4000606@redhat.com> <48F7567A.40107@redhat.com>
	<20081016151649.GD1821@redhat.com> <48F7651A.7010507@redhat.com>
	<20081016161043.GI1821@redhat.com> <48F76F8E.7080906@redhat.com>
	<20081016194224.GB6745@redhat.com>
Message-ID: <48F79F5B.8020809@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Daniel P. Berrange wrote:
> Thinking about it some more, I wasn't far off - we just need some 
> dynamic handling of the devices list depending on what you select.
> 
> Basic properties
> 
>      Name: free text name for the network

Okay, I have an updated screenshot. Pretty rough, but captures the
fields described below. Is that getting closer?

Question: What does a mode of "None" mean for addressing? Or should that
be an implicit addressing selected if the device is enslaved to a bonded
interface?

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkj3n1cACgkQjaT4DmxOfxvhJwCgmzXza/+jMPSWLqab7H9jkWA2
p4gAn3hCTNYsoGdnAnol93B8RJlnIcfv
=QEBC
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081016/4a8d0416/attachment.vcf>

From imain at redhat.com  Thu Oct 16 21:36:02 2008
From: imain at redhat.com (Ian Main)
Date: Thu, 16 Oct 2008 14:36:02 -0700
Subject: [Ovirt-devel] [PATCH server] Fix bug in host-status.
Message-ID: <1224192962-4349-1-git-send-email-imain@redhat.com>

This patch fixes a bug in host-status where the connection was being closed
at the end of the loop instead of after so consequent calls were failing
making it think the vm was off.

There's also a little extra debugging prints here and another small fix
to return if we can't get a domain list.

Signed-off-by: Ian Main <imain at redhat.com>
---
 src/host-status/host-status.rb |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/host-status/host-status.rb b/src/host-status/host-status.rb
index 6330d5c..3b07720 100755
--- a/src/host-status/host-status.rb
+++ b/src/host-status/host-status.rb
@@ -59,7 +59,7 @@ end
 require 'dutils'
 
 def check_state(vm, dom_info, host)
-  puts 'checking state of vm', vm.description
+  puts 'checking state of vm ' + vm.description
 
   case dom_info.state
 
@@ -149,9 +149,10 @@ def check_status(host)
   rescue
     puts "Failed to request domain list on host " + host.hostname
     conn.close
-    next
+    return
   end
 
+  puts "** Host alive, checking vms by id **"
   # Here we're going through every vm listed through libvirt.  This
   # really only lets us find ones that are started that shouldn't be.
   vm_ids.each do |vm_id|
@@ -159,7 +160,7 @@ def check_status(host)
     begin
       dom = conn.lookup_domain_by_id(vm_id)
     rescue
-      puts "Failed to find domain " + vm.description
+      puts "Failed to find domain " + vm.description + " with vm_id ", vm_id
       next
     end
 
@@ -178,25 +179,26 @@ def check_status(host)
     check_state(vm, info, host)
   end
 
+  puts "** Checking all vms as appear in the database **"
   # Now we get a list of all vms that should be on this system and see if
   # they are all running.
   Vm.find(:all, :conditions => [ "host_id = ?", host.id ]).each do |vm|
 
     begin
+      puts "Looking up domain by uuid #{vm.uuid}"
       dom = conn.lookup_domain_by_uuid(vm.uuid)
     rescue
       # OK.  We couldn't find the UUID that we thought was there.  The only
       # explanation is that the domain is dead.
-      puts "Failed to find domain " + vm.description
+      puts "Failed to find domain " + vm.description + ", marking as dead"
       kick_taskomatic(Vm::STATE_STOPPED, vm)
       next
     end
     info = dom.info
     check_state(vm, info, host)
-
-    conn.close
-
   end
+
+  conn.close
 end
 
 get_credentials
-- 
1.5.5.1



From imain at redhat.com  Thu Oct 16 23:39:38 2008
From: imain at redhat.com (Ian Main)
Date: Thu, 16 Oct 2008 16:39:38 -0700
Subject: [Ovirt-devel] Re: [PATCH server] Fix bug in host-status.
In-Reply-To: <1224192962-4349-1-git-send-email-imain@redhat.com>
References: <1224192962-4349-1-git-send-email-imain@redhat.com>
Message-ID: <20081016163938.3f8ef34f@tp.mains.net>


Pushed.


On Thu, 16 Oct 2008 14:36:02 -0700
Ian Main <imain at redhat.com> wrote:

> This patch fixes a bug in host-status where the connection was being closed
> at the end of the loop instead of after so consequent calls were failing
> making it think the vm was off.
> 
> There's also a little extra debugging prints here and another small fix
> to return if we can't get a domain list.
> 
> Signed-off-by: Ian Main <imain at redhat.com>
> ---
>  src/host-status/host-status.rb |   16 +++++++++-------
>  1 files changed, 9 insertions(+), 7 deletions(-)
> 
> diff --git a/src/host-status/host-status.rb b/src/host-status/host-status.rb
> index 6330d5c..3b07720 100755
> --- a/src/host-status/host-status.rb
> +++ b/src/host-status/host-status.rb
> @@ -59,7 +59,7 @@ end
>  require 'dutils'
>  
>  def check_state(vm, dom_info, host)
> -  puts 'checking state of vm', vm.description
> +  puts 'checking state of vm ' + vm.description
>  
>    case dom_info.state
>  
> @@ -149,9 +149,10 @@ def check_status(host)
>    rescue
>      puts "Failed to request domain list on host " + host.hostname
>      conn.close
> -    next
> +    return
>    end
>  
> +  puts "** Host alive, checking vms by id **"
>    # Here we're going through every vm listed through libvirt.  This
>    # really only lets us find ones that are started that shouldn't be.
>    vm_ids.each do |vm_id|
> @@ -159,7 +160,7 @@ def check_status(host)
>      begin
>        dom = conn.lookup_domain_by_id(vm_id)
>      rescue
> -      puts "Failed to find domain " + vm.description
> +      puts "Failed to find domain " + vm.description + " with vm_id ", vm_id
>        next
>      end
>  
> @@ -178,25 +179,26 @@ def check_status(host)
>      check_state(vm, info, host)
>    end
>  
> +  puts "** Checking all vms as appear in the database **"
>    # Now we get a list of all vms that should be on this system and see if
>    # they are all running.
>    Vm.find(:all, :conditions => [ "host_id = ?", host.id ]).each do |vm|
>  
>      begin
> +      puts "Looking up domain by uuid #{vm.uuid}"
>        dom = conn.lookup_domain_by_uuid(vm.uuid)
>      rescue
>        # OK.  We couldn't find the UUID that we thought was there.  The only
>        # explanation is that the domain is dead.
> -      puts "Failed to find domain " + vm.description
> +      puts "Failed to find domain " + vm.description + ", marking as dead"
>        kick_taskomatic(Vm::STATE_STOPPED, vm)
>        next
>      end
>      info = dom.info
>      check_state(vm, info, host)
> -
> -    conn.close
> -
>    end
> +
> +  conn.close
>  end
>  
>  get_credentials
> -- 
> 1.5.5.1
> 



From pmyers at redhat.com  Fri Oct 17 12:50:17 2008
From: pmyers at redhat.com (Perry Myers)
Date: Fri, 17 Oct 2008 08:50:17 -0400
Subject: [Ovirt-devel] Re: A pity thing to tell you
In-Reply-To: <48F870EF.1060800@redhat.com>
References: <48F870EF.1060800@redhat.com>
Message-ID: <48F88A09.7030907@redhat.com>

vbian wrote:
>     By the way,here is the other more question: a vm which could run 
> successfully turned to be an unreachable one. Why does it happen? How to 
> avoid it? :-)

There is a bug in version 0.93 that is fixed in the new version (0.94) 
that causes this.  So when you get to test 0.94 this should be fixed.  If 
it is not, please let us know.

Thanks,

Perry



From apevec at redhat.com  Fri Oct 17 18:44:02 2008
From: apevec at redhat.com (Alan Pevec)
Date: Fri, 17 Oct 2008 20:44:02 +0200
Subject: [Ovirt-devel] [PATCH appliance] provisioning: add empty YUM repo to
	F9 minimal install tree
Message-ID: <1224269042-5271-1-git-send-email-apevec@redhat.com>

and point anaconda to download stage2.img we already have in the appliance

Signed-off-by: Alan Pevec <apevec at redhat.com>
---
 gettree.sh         |    2 ++
 ovirt-appliance.ks |    3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gettree.sh b/gettree.sh
index f6ae46a..2bd78fe 100755
--- a/gettree.sh
+++ b/gettree.sh
@@ -25,6 +25,8 @@ pushd $dest
 printf "Downloading minimal Fedora install tree from $url"
 set -e
 download $url/.treeinfo
+download $url/media.repo
+createrepo .
 mkdir -p images/pxeboot
 cd images
 download $url/images/stage2.img
diff --git a/ovirt-appliance.ks b/ovirt-appliance.ks
index b344e47..67449b1 100644
--- a/ovirt-appliance.ks
+++ b/ovirt-appliance.ks
@@ -113,8 +113,7 @@ cobbler repo add --name=f9-$arch --arch=$arch --mirror-locally=0 \
   --mirror=$url/releases/9/Everything/$arch/os
 cobbler repo add --name=f9-$arch-updates --arch=$arch --mirror-locally=0 \
   --mirror=$url/updates/9/$arch
-sed -e 's#^url .*#url --url=$url/releases/$ver/$os/$arch/os#' \
-    -e 's#^reboot.*#poweroff#' /etc/cobbler/sample_end.ks \
+sed -e 's#^reboot.*#poweroff#' /etc/cobbler/sample_end.ks \
     > /etc/cobbler/sample-$os-$ver-$arch.ks
 cobbler profile edit --name=$os-$ver-$arch \
   --repos="f9-$arch f9-$arch-updates" \
-- 
1.5.5.1



From dpierce at redhat.com  Fri Oct 17 21:11:04 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Fri, 17 Oct 2008 17:11:04 -0400
Subject: [Ovirt-devel] [PATCH server] Introduces a new IP address model.
	Moves IP addressing to a separate
Message-ID: <1224277864-13419-1-git-send-email-dpierce@redhat.com>

You will need to run a migration after this patch to create the
ip_addresses table and massage the bondings and nics tables to
reference it.

NEW CLASSES:

IpAddress:   base class for addresses
IpV4Address: represents an IPv4 address
IpV6Address: represents an IPv6 address

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 src/app/models/bonding.rb                          |    1 +
 src/app/models/ip_address.rb                       |   25 +++++
 src/app/models/ip_v4_address.rb                    |   46 +++++++++
 src/app/models/ip_v6_address.rb                    |   40 ++++++++
 src/app/models/nic.rb                              |    2 +
 src/db/migrate/025_create_ip_addresses.rb          |   46 +++++++++
 ...026_move_nic_addresses_to_ip_addresses_table.rb |   56 +++++++++++
 ...7_move_bonding_address_to_ip_addresses_table.rb |   54 +++++++++++
 src/host-browser/host-browser.rb                   |   17 ++--
 src/lib/managed_node_configuration.rb              |    8 +-
 src/test/fixtures/bondings.yml                     |    4 +-
 src/test/fixtures/ip_addresses.yml                 |   55 +++++++++++
 src/test/fixtures/nics.yml                         |   82 ++++++++--------
 .../functional/managed_node_configuration_test.rb  |   26 +++---
 src/test/unit/ip_address_test.rb                   |    8 ++
 src/test/unit/ip_v4_address_test.rb                |   99 ++++++++++++++++++++
 src/test/unit/ip_v6_address_test.rb                |   82 ++++++++++++++++
 src/test/unit/nic_test.rb                          |    1 +
 18 files changed, 584 insertions(+), 68 deletions(-)
 create mode 100644 src/app/models/ip_address.rb
 create mode 100644 src/app/models/ip_v4_address.rb
 create mode 100644 src/app/models/ip_v6_address.rb
 create mode 100644 src/db/migrate/025_create_ip_addresses.rb
 create mode 100644 src/db/migrate/026_move_nic_addresses_to_ip_addresses_table.rb
 create mode 100644 src/db/migrate/027_move_bonding_address_to_ip_addresses_table.rb
 create mode 100644 src/test/fixtures/ip_addresses.yml
 create mode 100644 src/test/unit/ip_address_test.rb
 create mode 100644 src/test/unit/ip_v4_address_test.rb
 create mode 100644 src/test/unit/ip_v6_address_test.rb

diff --git a/src/app/models/bonding.rb b/src/app/models/bonding.rb
index 006c261..2fa4aa8 100644
--- a/src/app/models/bonding.rb
+++ b/src/app/models/bonding.rb
@@ -51,6 +51,7 @@ class Bonding < ActiveRecord::Base
   belongs_to :host
   belongs_to :bonding_type
   belongs_to :boot_type
+  belongs_to :ip_address
 
   has_and_belongs_to_many :nics,
     :join_table  => 'bondings_nics',
diff --git a/src/app/models/ip_address.rb b/src/app/models/ip_address.rb
new file mode 100644
index 0000000..f48cd4e
--- /dev/null
+++ b/src/app/models/ip_address.rb
@@ -0,0 +1,25 @@
+#
+# ip_address.rb
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+# +IpAddress+ is the base class for all address related classes.
+#
+class IpAddress < ActiveRecord::Base
+
+end
diff --git a/src/app/models/ip_v4_address.rb b/src/app/models/ip_v4_address.rb
new file mode 100644
index 0000000..4495a13
--- /dev/null
+++ b/src/app/models/ip_v4_address.rb
@@ -0,0 +1,46 @@
+# ip_v4_address.rb
+#
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+# +IpV4Address+ represents a single IPv4 address.
+#
+class IpV4Address < IpAddress
+  ADDRESS_TEST = %r{^(\d{1,3}\.){3}\d{1,3}$}
+
+  validates_presence_of :address,
+    :message => 'An address must be supplied.'
+  validates_format_of :address,
+    :with => ADDRESS_TEST
+
+  validates_presence_of :netmask,
+    :message => 'A netmask must be supplied.'
+  validates_format_of :netmask,
+    :with => ADDRESS_TEST
+
+  validates_presence_of :gateway,
+    :message => 'A gateway address must be supplied.'
+  validates_format_of :gateway,
+    :with => ADDRESS_TEST
+
+  validates_presence_of :broadcast,
+    :message => 'A broadcast address must be supplied.'
+  validates_format_of :broadcast,
+    :with => ADDRESS_TEST
+
+end
diff --git a/src/app/models/ip_v6_address.rb b/src/app/models/ip_v6_address.rb
new file mode 100644
index 0000000..1395886
--- /dev/null
+++ b/src/app/models/ip_v6_address.rb
@@ -0,0 +1,40 @@
+# ip_v6_address.rb
+#
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+# +IpV6Address+ represents a single IPv6 address.
+#
+class IpV6Address < IpAddress
+  ADDRESS_TEST = %r{^([0-9a-fA-F]{0,4}|0)(\:([0-9a-fA-F]{0,4}|0)){7}$}
+
+  validates_presence_of :address,
+    :message => 'An address must be provided.'
+  validates_format_of :address,
+    :with => ADDRESS_TEST
+
+  validates_presence_of :gateway,
+    :message => 'A gateway address must be provided.'
+  validates_format_of :gateway,
+    :with => ADDRESS_TEST
+
+  validates_presence_of :prefix,
+    :message => 'A prefix must be provided.'
+  validates_format_of :prefix,
+    :with => ADDRESS_TEST
+end
diff --git a/src/app/models/nic.rb b/src/app/models/nic.rb
index baf7095..69568a9 100644
--- a/src/app/models/nic.rb
+++ b/src/app/models/nic.rb
@@ -22,4 +22,6 @@ class Nic < ActiveRecord::Base
   belongs_to :boot_type
 
   has_and_belongs_to_many :bonding, :join_table => 'bondings_nics'
+
+  belongs_to :ip_address
 end
diff --git a/src/db/migrate/025_create_ip_addresses.rb b/src/db/migrate/025_create_ip_addresses.rb
new file mode 100644
index 0000000..0f528f4
--- /dev/null
+++ b/src/db/migrate/025_create_ip_addresses.rb
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+# Creates a single-inheritance table for both IPv4 and IPv6
+# addresses.
+#
+class CreateIpAddresses < ActiveRecord::Migration
+  def self.up
+    create_table :ip_addresses do |t|
+      t.string :type
+
+      # common attributes
+      t.string :address,   :limit => 39
+      t.string :gateway,   :limit => 39
+
+      # attributes for IPv4 (type=IpV4Address)
+      t.string :netmask,   :limit => 15
+      t.string :broadcast, :limit => 15
+
+      # attributes for IPv6 (type=IpV6Address)
+      t.string :prefix,    :limit => 39
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :ip_addresses
+  end
+end
diff --git a/src/db/migrate/026_move_nic_addresses_to_ip_addresses_table.rb b/src/db/migrate/026_move_nic_addresses_to_ip_addresses_table.rb
new file mode 100644
index 0000000..b873e4d
--- /dev/null
+++ b/src/db/migrate/026_move_nic_addresses_to_ip_addresses_table.rb
@@ -0,0 +1,56 @@
+#
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+class MoveNicAddressesToIpAddressesTable < ActiveRecord::Migration
+  def self.up
+    add_column :nics, :ip_address_id, :integer, :null => true
+
+    execute 'alter table nics add constraint fk_nic_ip_address
+             foreign key (ip_address_id) references ip_addresses(id)'
+
+    Nic.find(:all).each do |nic|
+      address = IpV4Address.new(:address   => nic.ip_addr,
+				:netmask   => nic.netmask,
+				:broadcast => nic.broadcast,
+				:gateway   => nic.ip_addr)
+      nic.ip_address = address
+
+      nic.save!
+      address.save!
+    end
+
+    remove_column :nics, :ip_addr
+    remove_column :nics, :netmask
+    remove_column :nics, :broadcast
+  end
+
+  def self.down
+    add_column :nics, :ip_addr,   :string, :limit => 16
+    add_column :nics, :netmask,   :string, :limit => 16
+    add_column :nics, :broadcast, :string, :limit => 16
+
+    Nic.find(:all).each do |nic|
+      nic.ip_addr   = nic.ip_address.address
+      nic.netmask   = nic.ip_address.netmask
+      nic.broadcast = nic.ip_address.broadcast
+    end
+
+    remove_column :nics, :ip_address_id
+  end
+end
diff --git a/src/db/migrate/027_move_bonding_address_to_ip_addresses_table.rb b/src/db/migrate/027_move_bonding_address_to_ip_addresses_table.rb
new file mode 100644
index 0000000..53f7058
--- /dev/null
+++ b/src/db/migrate/027_move_bonding_address_to_ip_addresses_table.rb
@@ -0,0 +1,54 @@
+#
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+class MoveBondingAddressToIpAddressesTable < ActiveRecord::Migration
+  def self.up
+    add_column :bondings, :ip_address_id, :integer, :null => true
+
+    execute 'alter table bondings add constraint fk_bonding_ip_address
+             foreign key (ip_address_id) references ip_addresses(id)'
+
+    Bonding.find(:all).each do |bonding|
+      ip_address = IpV4Address.new(:address   => bonding.ip_addr,
+				   :netmask   => bonding.netmask,
+				   :broadcast => bonding.broadcast,
+				   :gateway   => bonding.ip_addr)
+    end
+
+    remove_column :bondings, :ip_addr
+    remove_column :bondings, :netmask
+    remove_column :bondings, :broadcast
+  end
+
+  def self.down
+    t.string  :ip_addr,         :null => true, :limit => 15
+    t.string  :netmask,         :null => true, :limit => 15
+    t.string  :broadcast,       :null => true, :limit => 15
+    
+    Bonding.each do |bonding|
+      bonding.ip_addr   = bonding.ip_address.address
+      bonding.netmask   = bonding.ip_address.netmask
+      bonding.broadcast = bonding.ip_address.broadcast
+
+      bonding.save!
+    end
+
+    remove_column :bondings, :ip_address_id
+  end
+end
diff --git a/src/host-browser/host-browser.rb b/src/host-browser/host-browser.rb
index 79d34e8..bbfbf3b 100755
--- a/src/host-browser/host-browser.rb
+++ b/src/host-browser/host-browser.rb
@@ -283,10 +283,10 @@ class HostBrowser
 
                     updated_nic = Nic.find_by_id(nic.id)
 
-                    updated_nic.bandwidth = detail['BANDWIDTH']
-                    updated_nic.ip_addr   = detail['IP_ADDRESS']
-                    updated_nic.netmask   = detail['NETMASK']
-                    updated_nic.broadcast = detail['BROADCAST']
+                    updated_nic.bandwidth            = detail['BANDWIDTH']
+                    updated_nic.ip_address.address   = detail['IP_ADDRESS']
+                    updated_nic.ip_address.netmask   = detail['NETMASK']
+                    updated_nic.ip_address.broadcast = detail['BROADCAST']
 
                     updated_nic.save!
                     found=true
@@ -310,11 +310,14 @@ class HostBrowser
                 'mac'          => nic['MAC'].upcase,
                 'bandwidth'    => nic['BANDWIDTH'],
                 'usage_type'   => 1,
-                'ip_addr'      => nic['IP_ADDRESS'],
-                'netmask'      => nic['NETMASK'],
-                'broadcast'    => nic['BROADCAST'],
                 'boot_type_id' => boot_type.id)
 
+	    ip_address = IpV4Address.new('address'   => nic['IP_ADDRESS'],
+					 'netmask'   => nic['NETMASK'],
+					 'broadcast' => nic['BROADCAST'],
+					 'gateway'   => nic['GATEWAY'])
+	    detail.ip_address = ip_address
+
             host.nics << detail
         end
 
diff --git a/src/lib/managed_node_configuration.rb b/src/lib/managed_node_configuration.rb
index 93f8448..fff7914 100644
--- a/src/lib/managed_node_configuration.rb
+++ b/src/lib/managed_node_configuration.rb
@@ -51,7 +51,7 @@ class ManagedNodeConfiguration
     host.bondings.each do |bonding|
       result.puts "rm #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}"
       result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/DEVICE #{bonding.interface_name}"
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/IPADDR #{bonding.ip_addr}" if bonding.ip_addr
+      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/IPADDR #{bonding.ip_address.address}" if bonding.ip_address
       result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/ONBOOT yes"
 
       bonding.nics.each do |nic|
@@ -97,9 +97,9 @@ class ManagedNodeConfiguration
         result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BOOTPROTO #{nic.boot_type.proto}"
 
         if nic.boot_type.proto == 'static'
-          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/IPADDR #{nic.ip_addr}"
-          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/NETMASK #{nic.netmask}"
-          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BROADCAST #{nic.broadcast}"
+          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/IPADDR #{nic.ip_address.address}"
+          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/NETMASK #{nic.ip_address.netmask}"
+          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BROADCAST #{nic.ip_address.broadcast}"
         end
 
 	if bridged
diff --git a/src/test/fixtures/bondings.yml b/src/test/fixtures/bondings.yml
index 29473c7..1a74f42 100644
--- a/src/test/fixtures/bondings.yml
+++ b/src/test/fixtures/bondings.yml
@@ -4,8 +4,6 @@ mailservers_managed_node_bonding:
     bonding_type_id: <%= Fixtures.identify(:link_aggregation_bonding_type) %>
     host_id: <%= Fixtures.identify(:mailservers_managed_node) %>
     boot_type_id: <%= Fixtures.identify(:boot_type_static) %>
-    ip_addr: 172.31.0.15
-    netmask: 255.255.255.
-    broadcast: 172.31.0.255
+    ip_address_id: <%= Fixtures.identify(:ip_v4_mailservers_managed_node_bonding) %>
     arp_ping_address: 172.31.0.100
     arp_interval: 0
diff --git a/src/test/fixtures/ip_addresses.yml b/src/test/fixtures/ip_addresses.yml
new file mode 100644
index 0000000..0472669
--- /dev/null
+++ b/src/test/fixtures/ip_addresses.yml
@@ -0,0 +1,55 @@
+ip_v4_one:
+  type: IpV4Address
+  address: 1.2.3.4
+  netmask: 255.255.255.0
+  gateway: 1.2.3.1
+  broadcast: 1.2.3.255
+
+ip_v4_two:
+  type: IpV4Address
+  address: 2.3.4.5
+  netmask: 255.255.255.0
+  gateway: 1.2.3.1
+  broadcast: 2.3.4.255
+
+ip_v4_three:
+  type: IpV4Address
+  address: 3.4.5.6
+  netmask: 255.255.255.0
+  gateway: 3.4.5.1
+  broadcast: 3.4.5.255
+
+ip_v4_four:
+  type: IpV4Address
+  address: 3.4.5.6
+  netmask: 255.255.255.0
+  gateway: 3.4.5.1
+  broadcast: 3.4.5.255
+
+ip_v4_mailserver_nic_one:
+  type: IpV4Address
+  address: 172.31.0.15
+  netmask: 255.255.255.0
+  gateway: 172.31.0.1
+  broadcast: 172.31.0.255
+
+ip_v4_ldapserver_nic_one:
+  type: IpV4Address
+  address: 172.31.0.25
+  netmask: 255.255.255.0
+  gateway: 172.31.0.1
+  broadcast: 172.31.0.255
+
+ip_v4_buildserver_nic_two:
+  type: IpV4Address
+  address: 172.31.0.31
+  netmask: 255.255.255.0
+  gateway: 172.31.0.1
+  broadcast: 172.31.0.255
+
+ip_v4_mailservers_managed_node_bonding:
+  type: IpV4Address
+  address: 192.168.50.100
+  netmask: 255.255.255.0
+  gateway: 192.168.50.1
+  broadcast: 192.168.50.255
diff --git a/src/test/fixtures/nics.yml b/src/test/fixtures/nics.yml
index ccf71d2..dbbc511 100644
--- a/src/test/fixtures/nics.yml
+++ b/src/test/fixtures/nics.yml
@@ -1,80 +1,80 @@
 one:
   id: 1
   mac: '00:11:22:33:44:55'
-  ip_addr: '1.2.3.4'
-  usage_type: '1'
+  ip_address_id: <%= Fixtures.identify(:ip_v4_one) %>
   bandwidth: 100
   host_id: 10
   boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
+
 two:
   id: 2
   mac: 'AA:BB:CC:DD:EE:FF'
-  ip_addr: '2.3.4.5'
+  ip_address_id: <%= Fixtures.identify(:ip_v4_two) %>
   usage_type: '2'
   bandwidth: 1000
   host_id: 10
   boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
+
 three:
   id: 3
   mac: '00:FF:11:EE:22:DD'
-  ip_addr: '3.4.5.6'
+  ip_address_id: <%= Fixtures.identify(:ip_v4_three) %>
   usage_type: '1'
   bandwidth: 10
   host_id: 10
   boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
+
 four:
   id: 4
   mac: '00:FF:11:EE:22:DD'
-  ip_addr: '3.4.5.6'
+  ip_address: <%= Fixtures.identify(:ip_v4_four) %>
   usage_type: '1'
   bandwidth: 10
   host_id: 10
   boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
 
 mailserver_nic_one:
-    mac: '00:11:22:33:44:55'
-    usage_type: '1'
-    bandwidth: 100
-    ip_addr: '172.31.0.15'
-    host_id: <%= Fixtures.identify(:mailservers_managed_node) %>
-    boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
+  mac: '00:11:22:33:44:55'
+  ip_address: <%= Fixtures.identify(:ip_v4_mailserver_nic_one) %>
+  usage_type: '1'
+  bandwidth: 100
+  host_id: <%= Fixtures.identify(:mailservers_managed_node) %>
+  boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
 
 mailserver_nic_two:
-    mac: '22:11:33:66:44:55'
-    usage_type: '1'
-    bandwidth: 100
-    host_id: <%= Fixtures.identify(:mailservers_managed_node) %>
-    boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
+  mac: '22:11:33:66:44:55'
+  usage_type: '1'
+  bandwidth: 100
+  host_id: <%= Fixtures.identify(:mailservers_managed_node) %>
+  boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
 
 fileserver_nic_one:
-    mac: '00:99:00:99:13:07'
-    usage_type: '1'
-    bandwidth: 100
-    host_id: <%= Fixtures.identify(:fileserver_managed_node) %>
-    boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
+  mac: '00:99:00:99:13:07'
+  usage_type: '1'
+  bandwidth: 100
+  host_id: <%= Fixtures.identify(:fileserver_managed_node) %>
+  boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
 
 ldapserver_nic_one:
-    mac: '00:03:02:00:09:06'
-    usage_type: '1'
-    bandwidth: 100
-    bridge: 'ovirtbr0'
-    ip_addr: '172.31.0.25'
-    host_id: <%= Fixtures.identify(:ldapserver_managed_node) %>
-    boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
+  mac: '00:03:02:00:09:06'
+  usage_type: '1'
+  bandwidth: 100
+  bridge: 'ovirtbr0'
+  ip_address_id: <%= Fixtures.identify(:ip_v4_ldapserver_nic_one) %>
+  host_id: <%= Fixtures.identify(:ldapserver_managed_node) %>
+  boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
 
 buildserver_nic_one:
-    mac: '07:17:19:65:03:38'
-    usage_type: '1'
-    bandwidth: 100
-    host_id: <%= Fixtures.identify(:buildserver_managed_node) %>
-    boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
+  mac: '07:17:19:65:03:38'
+  usage_type: '1'
+  bandwidth: 100
+  host_id: <%= Fixtures.identify(:buildserver_managed_node) %>
+  boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
 
 buildserver_nic_two:
-    mac: '07:17:19:65:03:39'
-    usage_type: '1'
-    bandwidth: 100
-    ip_addr: '172.31.0.31'
-    netmask: '255.255.255.0'
-    broadcast: '172.31.0.255'
-    host_id: <%= Fixtures.identify(:buildserver_managed_node) %>
-    boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
+  mac: '07:17:19:65:03:39'
+  usage_type: '1'
+  bandwidth: 100
+  ip_address_id: <%= Fixtures.identify(:ip_v4_buildserver_nic_two) %>
+  host_id: <%= Fixtures.identify(:buildserver_managed_node) %>
+  boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
diff --git a/src/test/functional/managed_node_configuration_test.rb b/src/test/functional/managed_node_configuration_test.rb
index d0d8aa3..2158c8d 100644
--- a/src/test/functional/managed_node_configuration_test.rb
+++ b/src/test/functional/managed_node_configuration_test.rb
@@ -83,17 +83,17 @@ cat <<\EOF > /var/tmp/node-augtool
 rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
 set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
 set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BOOTPROTO #{nic.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/IPADDR #{nic.ip_addr}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/NETMASK #{nic.netmask}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BROADCAST #{nic.broadcast}
+set /files/etc/sysconfig/network-scripts/ifcfg-eth0/IPADDR #{nic.ip_address.address}
+set /files/etc/sysconfig/network-scripts/ifcfg-eth0/NETMASK #{nic.ip_address.netmask}
+set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BROADCAST #{nic.ip_address.broadcast}
 set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BRIDGE ovirtbr0
 set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
 rm /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0
 set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DEVICE ovirtbr0
 set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BOOTPROTO #{nic.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/IPADDR #{nic.ip_addr}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/NETMASK #{nic.netmask}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BROADCAST #{nic.broadcast}
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/IPADDR #{nic.ip_address.address}
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/NETMASK #{nic.ip_address.netmask}
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BROADCAST #{nic.ip_address.broadcast}
 set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/TYPE bridge
 set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/PEERNTP yes
 set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DELAY 0
@@ -123,17 +123,17 @@ cat <<\EOF > /var/tmp/node-augtool
 rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
 set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
 set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BOOTPROTO #{nic1.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/IPADDR #{nic1.ip_addr}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/NETMASK #{nic1.netmask}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BROADCAST #{nic1.broadcast}
+set /files/etc/sysconfig/network-scripts/ifcfg-eth0/IPADDR #{nic1.ip_address.address}
+set /files/etc/sysconfig/network-scripts/ifcfg-eth0/NETMASK #{nic1.ip_address.netmask}
+set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BROADCAST #{nic1.ip_address.broadcast}
 set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BRIDGE ovirtbr0
 set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
 rm /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0
 set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DEVICE ovirtbr0
 set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BOOTPROTO #{nic1.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/IPADDR #{nic1.ip_addr}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/NETMASK #{nic1.netmask}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BROADCAST #{nic1.broadcast}
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/IPADDR #{nic1.ip_address.address}
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/NETMASK #{nic1.ip_address.netmask}
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BROADCAST #{nic1.ip_address.broadcast}
 set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/TYPE bridge
 set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/PEERNTP yes
 set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DELAY 0
@@ -177,7 +177,7 @@ EOF
 cat <<\EOF > /var/tmp/node-augtool
 rm /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}
 set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/DEVICE #{bonding.interface_name}
-set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/IPADDR 172.31.0.15
+set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/IPADDR #{bonding.ip_address.address}
 set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/ONBOOT yes
 rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
 set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
diff --git a/src/test/unit/ip_address_test.rb b/src/test/unit/ip_address_test.rb
new file mode 100644
index 0000000..152578e
--- /dev/null
+++ b/src/test/unit/ip_address_test.rb
@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class IpAddressTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end
diff --git a/src/test/unit/ip_v4_address_test.rb b/src/test/unit/ip_v4_address_test.rb
new file mode 100644
index 0000000..14f0175
--- /dev/null
+++ b/src/test/unit/ip_v4_address_test.rb
@@ -0,0 +1,99 @@
+#
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+require File.dirname(__FILE__) + '/../test_helper'
+
+class IpV4AddressTest < ActiveSupport::TestCase
+  def setup
+    @address = IpV4Address.new(:address   => '192.168.50.2',
+			       :netmask   => '255.255.255.0',
+			       :gateway   => '192.168.50.1',
+			       :broadcast => '192.168.50.255')
+  end
+
+  # Ensures that an address must be supplied.
+  #
+  def test_valid_fails_without_address
+    @address.address = nil
+
+    flunk "An address must be present." if @address.valid?
+  end
+
+  # Ensures that an address has to be in the correct format.
+  #
+  def test_valid_fails_with_bad_address
+    @address.address = '192.168'
+
+    flunk "An address must be in the format ##.##.##.##." if @address.valid?
+  end
+
+  # Ensures that a netmask must be supplied.
+  #
+  def test_valid_fails_without_netmask
+    @address.netmask = nil
+
+    flunk "An address must have a netmask." if @address.valid?
+  end
+
+  # Ensures that a netmask must have the correct format.
+  #
+  def test_valid_fails_with_bad_netmask
+    @address.netmask = 'farkle'
+
+    flunk "A netmask must be in the format ##.##.##.##." if @address.valid?
+  end
+
+  # Ensures that a gateway must be supplied.
+  #
+  def test_valid_fails_without_gateway
+    @address.gateway = nil
+
+    flunk "A gateway address must be supplied." if @address.valid?
+  end
+
+  # Ensures that a gateway must be in the correct format.
+  #
+  def test_valid_fails_with_bad_gateway
+    @address.gateway = '-3.a2.0.8'
+
+    flunk "The gateway address must be in the format ##.##.##.##." if @address.valid?
+  end
+
+  # Ensures that a broadcast must be supplied.
+  #
+  def test_valid_fails_without_broadcast
+    @address.broadcast = nil
+
+    flunk "A broadcast addres must be supplied." if @address.valid?
+  end
+
+  # Ensures that a broadcast must be in the correct format.
+  #
+  def test_valid_fails_with_bad_broadcast
+    @address.broadcast = '-3.2.0.8'
+
+    flunk "The broadcast address must be in the format ##.##.##.##." if @address.valid?
+  end
+
+  # Ensures that a well-formed address is valid.
+  #
+  def test_valid
+    flunk "There is an error with validation." unless @address.valid?
+  end
+end
diff --git a/src/test/unit/ip_v6_address_test.rb b/src/test/unit/ip_v6_address_test.rb
new file mode 100644
index 0000000..a2be85f
--- /dev/null
+++ b/src/test/unit/ip_v6_address_test.rb
@@ -0,0 +1,82 @@
+#
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+require File.dirname(__FILE__) + '/../test_helper'
+
+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')
+  end
+
+  # Ensures that the address must be provided.
+  #
+  def test_valid_fails_without_address
+    @address.address = nil
+
+    flunk "An address must be provided." if @address.valid?
+  end
+
+  # Ensures that the address must be in the correct format.
+  #
+  def test_valid_fails_with_bad_address
+    @address.address = "farkle"
+
+    flunk "The address must be in the correct format." if @address.valid?
+  end
+
+  # Ensures that the gateway must be provided.
+  #
+  def test_valid_fails_without_gateway
+    @address.gateway = nil
+
+    flunk "The gateway address must be provided." if @address.valid?
+  end
+
+  # Ensures that the gateway address is in the correct format.
+  #
+  def test_valid_fails_with_bad_gateway
+    @address.gateway = '0-:::::::717'
+
+    flunk "The gateway address must be in the correct format." if @address.valid?
+  end
+
+  # Ensures that the prefix must be provided.
+  #
+  def test_valid_fails_without_prefix
+    @address.prefix = nil
+
+    flunk "The prefix must be provided." if @address.valid?
+  end
+
+  # Ensures that the prefix is in the correct format.
+  #
+  def test_valid_fails_with_invalid_prefix
+    @address.prefix = 'whoops'
+
+    flunk "The prefix must be in the correct format." if @address.valid?
+  end
+
+  # Ensures that a well-formed address is considered valid.
+  #
+  def test_valid
+    flunk "There is an problem with address validation." unless @address.valid?
+  end
+end
diff --git a/src/test/unit/nic_test.rb b/src/test/unit/nic_test.rb
index a0776a2..1de1e00 100644
--- a/src/test/unit/nic_test.rb
+++ b/src/test/unit/nic_test.rb
@@ -20,6 +20,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class NicTest < Test::Unit::TestCase
+  fixtures :ip_addresses
   fixtures :nics
 
   # Replace this with your real tests.
-- 
1.5.5.1



From imain at redhat.com  Fri Oct 17 21:52:33 2008
From: imain at redhat.com (Ian Main)
Date: Fri, 17 Oct 2008 14:52:33 -0700
Subject: [Ovirt-devel] Issue with ISO provisioning
In-Reply-To: <48F55135.2050100@redhat.com>
References: <48F55135.2050100@redhat.com>
Message-ID: <20081017145233.40451ed2@tp.mains.net>

On Tue, 14 Oct 2008 22:11:01 -0400
Perry Myers <pmyers at redhat.com> wrote:

[snip]

> Second problem...
> 
> I tried to provision a second guest using the same ISO image off of the 
> same NFS share.  This failed with the following error in taskomatic:
> > libvir: Storage error : no storage vol with matching name
> > start_vm
> > Task action processing failed: Libvirt::RetrieveError: Call to function virStorageVolLookupByName failed
> > /usr/share/ovirt-server/task-omatic/./utils.rb:124:in `lookup_volume_by_name'
> > /usr/share/ovirt-server/task-omatic/./utils.rb:124:in `connect_storage_pools'
> > /usr/share/ovirt-server/task-omatic/./utils.rb:81:in `each'
> > /usr/share/ovirt-server/task-omatic/./utils.rb:81:in `connect_storage_pools'
> > /usr/share/ovirt-server/task-omatic/./task_vm.rb:314:in `start_vm'
> > /usr/share/ovirt-server/task-omatic/taskomatic.rb:99
> > /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
> 
> Seems that if the NFS share is previously mounted as a storage pool in 
> libvirt, it causes taskomatic to fail.  If I manually destroy the storage 
> pool for the NFS mount on the host and undefine it and then try again, the 
> start_vm succeeds and recreates the storage pool.

I've been trying to reproduce this but it seems fine.  I even have a cobbler image
and a disk image both being used on the same nfs share by the same vm while other
vms are using that iso image too.  All worked.. ?

	Ian



From dpierce at redhat.com  Mon Oct 20 14:44:49 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Mon, 20 Oct 2008 10:44:49 -0400
Subject: [Ovirt-devel] Re: [PATCH server] Introduces a new IP address model.
 Moves IP addressing to a separate
In-Reply-To: <1224277864-13419-1-git-send-email-dpierce@redhat.com>
References: <1224277864-13419-1-git-send-email-dpierce@redhat.com>
Message-ID: <48FC9961.80507@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Darryl L. Pierce wrote:
> You will need to run a migration after this patch to create the
> ip_addresses table and massage the bondings and nics tables to
> reference it.
> 
> NEW CLASSES:
> 
> IpAddress:   base class for addresses
> IpV4Address: represents an IPv4 address
> IpV6Address: represents an IPv6 address
> 
> Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
> ---

Mo, can you review this patch and give ms feedkbac?

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkj8mV0ACgkQjaT4DmxOfxs7PACg2ZqxdS1eJLzvqK0vzC+6DMWL
79gAnApw0RXsM6UEDaVGLbPT37NHcbMJ
=r04J
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081020/e866e435/attachment.vcf>

From danken at redhat.com  Mon Oct 20 15:22:35 2008
From: danken at redhat.com (Dan Kenigsberg)
Date: Mon, 20 Oct 2008 17:22:35 +0200
Subject: [Ovirt-devel] make ovirt-node-image.iso w/o its rpm
Message-ID: <20081020152233.GA10200@csdan>

Hi,

I would like to create ovirt-node-image.iso and mount it; wrapping it
within an rpm is unhelpful for our needs.

Also, moving logic from .spec to Makefile is generally a good thing that
shortens dev cycles.

Please review the following patch and consider applying something on
these lines. I hope this is the place for such requests.

Regrads,
Dan.

commit 5f1ada4cde747eb09714d38067d3f9d20eaaf607
Author: Dan Kenigsberg <danken at qumranet.com>
Date:   Mon Oct 20 16:40:55 2008 +0200

    Move iso-making code from spec to Makefile
    
    Signed-off-by: Dan Kenigsberg <danken at rehat.com>

diff --git a/Makefile.am b/Makefile.am
index 17b26c0..13421af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,6 +47,59 @@ RPM_FLAGS	+= $(if $(FEDORA_URL),--define "fedora_url $(FEDORA_URL)")
 # OVIRT_URL env var can be set to the root of an ovirt.org mirror
 RPM_FLAGS	+= $(if $(OVIRT_URL),--define "ovirt_url $(OVIRT_URL)")
 
+FEDORA=$(shell rpm --eval '%{fedora}')
+ARCH=$(shell rpm --eval '%{_arch}')
+FEDORA_MIRROR=http://mirrors.fedoraproject.org/mirrorlist
+CUR_RAWHIDE=10
+OVIRT_URL=http://ovirt.org/repos/ovirt
+
+repos.ks:
+	( \
+	    if [ 0$(FEDORA) == 0$(CUR_RAWHIDE) ]; then \
+		FEDORA_REPO=rawhide ;\
+		FEDORA_REPO_LOC="$(if $(FEDORA_URL),--baseurl=$(FEDORA_URL)/development/$(ARCH)/os,--mirrorlist=$(FEDORA_MIRROR)?repo=rawhide&arch=$(ARCH))" ;\
+		OVIRT_DISTRO=development ;\
+	    else \
+		FEDORA_REPO=f$(FEDORA) ;\
+		FEDORA_REPO_LOC="$(if $(FEDORA_URL),--baseurl=$(FEDORA_URL)/releases/$(FEDORA)/Everything/${ARCH}/os,--mirrorlist=$(FEDORA_MIRROR)?repo=fedora-$(FEDORA)&arch=$(ARCH))" ;\
+		OVIRT_DISTRO=$(FEDORA) ;\
+		UPDATE_REPO_LINE="repo --name=$${FEDORA_REPO}-updates-newkey $(if $(FEDORA_URL),--baseurl=$(FEDORA_URL)/updates/$(FEDORA)/${ARCH}.newkey,--mirrorlist=$(FEDORA_MIRROR)?repo=updates-released-f$(FEDORA)&arch=$(ARCH))" ;\
+	    fi ;\
+	    echo "repo --name=$${FEDORA_REPO} $${FEDORA_REPO_LOC}" > $@ ;\
+	    echo "repo --name=ovirt-org --baseurl=$(OVIRT_URL)/$${OVIRT_DISTRO}/$(ARCH)" >> $@ ;\
+	    echo "$${UPDATE_REPO_LINE}" >> $@ ;\
+	    echo "repo --name=ovirt-local --baseurl=file://$(OVIRT_CACHE_DIR)/ovirt" >> $@ \
+	)
+
+SELINUX_ENFORCING=$(shell getenforce)
+iso: repos.ks
+	mkdir -p $(OVIRT_CACHE_DIR)/node-image-tmp
+	mkdir -p $(OVIRT_CACHE_DIR)/yum
+	( \
+	    case $(SELINUX_ENFORCING) in \
+		Enforcing) setenforce Permissive ;; \
+		Permissive) ;; \
+		 *) if ksflatten ovirt-image-node.ks 2>/dev/null \
+		      | grep -q '^selinux --disabled'; then \
+		      echo WARNING: SELinux disabled in kickstart ;\
+		    else \
+		      echo ERROR: SELinux enabled in kickstart, \
+			   but disabled on the build machine ;\
+		      exit 1 ;\
+		    fi ;; \
+	    esac ;\
+	)
+	sudo livecd-creator --skip-minimize -c ovirt-node-image.ks \
+	       -f ovirt-node-image \
+	       --tmpdir='$(OVIRT_CACHE_DIR)/node-image-tmp' \
+	       --cache='$(OVIRT_CACHE_DIR)/yum'
+	sudo chown $${USER} ovirt-node-image.iso
+	( \
+	    if [ $(SELINUX_ENFORCING) = Enforcing ]; then \
+	      setenforce Enforcing || exit 1 ;\
+	    fi \
+	)
+
 rpms: dist
 	rpmbuild $(RPM_FLAGS) -ta $(distdir).tar.gz
 
diff --git a/ovirt-node-image.spec.in b/ovirt-node-image.spec.in
index 6f9ddac..7184c77 100644
--- a/ovirt-node-image.spec.in
+++ b/ovirt-node-image.spec.in
@@ -1,8 +1,3 @@
-%{!?ovirt_cache_dir: %define ovirt_cache_dir /var/tmp/ovirt-cache}
-%{!?ovirt_local_repo: %define ovirt_local_repo file://%{ovirt_cache_dir}/ovirt}
-%{!?ovirt_url: %define ovirt_url http://ovirt.org/repos/ovirt}
-%define fedora_mirror http://mirrors.fedoraproject.org/mirrorlist
-
 Summary: oVirt Node ISO image
 Name: ovirt-node-image
 Version: @VERSION@
@@ -35,66 +30,10 @@ The PXE boot image for oVirt Node network boot from oVirt Server.
 
 %prep
 %setup -q
+./configure
 
 %build
-%if 0%{?fedora} == 010
- # XXX current rawhide
- %if "%{?fedora_url}" == ""
-cat > repos.ks << EOF
-repo --name=rawhide --mirrorlist=%{fedora_mirror}?repo=rawhide&arch=%{_arch}
-EOF
- %else
-cat > repos.ks << EOF
-repo --name=rawhide --baseurl=%{fedora_url}/development/%{_arch}/os
-EOF
- %endif
-cat >> repos.ks << EOF
-repo --name=ovirt-org --baseurl=%{ovirt_url}/development/%{_arch}
-EOF
-%else
- %if "%{?fedora_url}" == ""
-cat > repos.ks << EOF
-repo --name=f%{fedora} --mirrorlist=%{fedora_mirror}?repo=fedora-%{fedora}&arch=%{_arch}
-repo --name=f%{fedora}-updates-newkey --mirrorlist=%{fedora_mirror}?repo=updates-released-f%{fedora}.newkey&arch=%{_arch}
-EOF
- %else
-cat > repos.ks << EOF
-repo --name=f%{fedora} --baseurl=%{fedora_url}/releases/%{fedora}/Everything/%{_arch}/os
-repo --name=f%{fedora}-updates-newkey --baseurl=%{fedora_url}/updates/%{fedora}/%{_arch}.newkey
-EOF
- %endif
-cat >> repos.ks << EOF
-repo --name=ovirt-org --baseurl=%{ovirt_url}/%{fedora}/%{_arch}
-EOF
-%endif
-
-cat >> repos.ks << EOF
-repo --name=ovirt-local --baseurl=%{ovirt_local_repo}
-EOF
-
-mkdir -p %{ovirt_cache_dir}/node-image-tmp
-mkdir -p %{ovirt_cache_dir}/yum
-
-sudo su - -c "cd $(pwd) &&
-              enforcing=\$(getenforce)
-              case \$enforcing in
-                  Enforcing) setenforce Permissive ;;
-                  Permissive) ;;
-                   *) if ksflatten %{name}.ks 2>/dev/null \
-                        | grep -q '^selinux --disabled$'; then
-                        echo WARNING: SELinux disabled in kickstart
-                      else
-                        echo ERROR: SELinux enabled in kickstart, \
-                             but disabled on the build machine
-                        exit 1
-                      fi ;;
-              esac
-              livecd-creator --skip-minimize -c %{name}.ks -f %{name} \
-               --tmpdir='%{ovirt_cache_dir}/node-image-tmp' \
-               --cache='%{ovirt_cache_dir}/yum'
-              if [ \$enforcing = Enforcing ]; then
-                setenforce Enforcing || exit 1
-              fi"
+make iso
 sudo su - -c "cd $(pwd) && ./ovirt-pxe %{name}.iso"
 sudo su - -c "cd $(pwd) && chown -R $USER ."
 



From dpierce at redhat.com  Mon Oct 20 17:26:29 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Mon, 20 Oct 2008 13:26:29 -0400
Subject: [Ovirt-devel] [PATCH server] Changed the database configuration to
	use a different database for development
Message-ID: <1224523589-10262-1-git-send-email-dpierce@redhat.com>


Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 src/config/database.yml |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/config/database.yml b/src/config/database.yml
index c60ee8f..497eb26 100644
--- a/src/config/database.yml
+++ b/src/config/database.yml
@@ -5,16 +5,29 @@
 #   sudo /sbin/service postgresql initdb
 #   sudo /sbin/service postgresql start
 #   sudo su - postgres
-#   $   createdb ovirt
 #   $   psql ovirt
 #   $-# CREATE USER ovirt WITH PASSWORD 'v23zj59an';
-#   $-# CREATE DATABASE ovirt;
-#   $-# GRANT ALL PRIVILEGES ON DATABASE ovirt to ovirt;
+#   $-# CREATE DATABASE ovirt_development;
+#   $-# GRANT ALL PRIVILEGES ON DATABASE ovirt_development to ovirt;
 #   $-# CREATE DATABASE ovirt_test;
 #   $-# GRANT ALL PRIVILEGES ON DATABASE ovirt_test to ovirt;
+#   $-# CREATE DATABASE ovirt;
+#   $-# GRANT ALL PRIVILEGES ON DATABASE ovirt to ovirt;
 #   $-# \q
 #   $   exit
 #
+# To start off a new environment, use the following commands:
+#
+#   rake db:drop:all
+#   rake db:create:all
+#   rake db:migrate
+#   rake db:tests:prepare
+#
+# And when there are changes to the database, simple run:
+#
+#   rake db:migrate
+#   rake db:test:prepare
+#
 #   On a local system you may need to edit this file to have only the following
 #   /var/lib/pgsql/data/pg_hba.conf
 #   local all all trust
@@ -23,7 +36,7 @@
 
 development:
   adapter: postgresql
-  database: ovirt
+  database: ovirt_development
   username: ovirt
   password: v23zj59an
   host: localhost
-- 
1.5.5.1



From dpierce at redhat.com  Mon Oct 20 18:05:48 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Mon, 20 Oct 2008 14:05:48 -0400
Subject: [Ovirt-devel] [PATCH server] Replaced the config scripts with
	configuration encoding.
Message-ID: <1224525948-12473-1-git-send-email-dpierce@redhat.com>

Rather than sending the node a series of scripts that load
kernel modules, or are tightly coupled to tools like augeas,
this patch introduces an encoding scheme for data.

A line that begins with "kmod" describes a kernel module that
needs to be loaded. It will containing the module's name, an
optional alias for the module, and then the module options
if such are required.

A line that begins with "ifcfg" describes an network
interface. It will contain the mac address and interface name,
followed by all needed configuration values to bring the
interface up.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 src/db/migrate/024_add_boot_type_to_bonding.rb     |    2 +-
 .../migrate/025_allow_nic_boot_type_to_be_null.rb  |   28 +++++
 src/lib/managed_node_configuration.rb              |   81 +++++++------
 src/test/fixtures/bondings.yml                     |   10 ++-
 src/test/fixtures/bondings_nics.yml                |    8 ++
 src/test/fixtures/hosts.yml                        |   10 ++
 src/test/fixtures/nics.yml                         |   14 ++
 .../functional/managed_node_configuration_test.rb  |  127 ++++++--------------
 8 files changed, 152 insertions(+), 128 deletions(-)
 create mode 100644 src/db/migrate/025_allow_nic_boot_type_to_be_null.rb

diff --git a/src/db/migrate/024_add_boot_type_to_bonding.rb b/src/db/migrate/024_add_boot_type_to_bonding.rb
index e2cf1c6..17e085f 100644
--- a/src/db/migrate/024_add_boot_type_to_bonding.rb
+++ b/src/db/migrate/024_add_boot_type_to_bonding.rb
@@ -19,7 +19,7 @@
 
 class AddBootTypeToBonding < ActiveRecord::Migration
   def self.up
-    add_column :bondings, :boot_type_id, :integer, :null => false
+    add_column :bondings, :boot_type_id, :integer, :null => true
 
     execute 'alter table bondings add constraint fk_bondings_boot_type
              foreign key (boot_type_id) references boot_types(id)'
diff --git a/src/db/migrate/025_allow_nic_boot_type_to_be_null.rb b/src/db/migrate/025_allow_nic_boot_type_to_be_null.rb
new file mode 100644
index 0000000..b09ada1
--- /dev/null
+++ b/src/db/migrate/025_allow_nic_boot_type_to_be_null.rb
@@ -0,0 +1,28 @@
+#
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+class AllowNicBootTypeToBeNull < ActiveRecord::Migration
+  def self.up
+    change_column :nics, :boot_type_id, :integer, :null => true
+  end
+
+  def self.down
+    change_column :nics, :boot_type_id, :integer, :null => false
+  end
+end
diff --git a/src/lib/managed_node_configuration.rb b/src/lib/managed_node_configuration.rb
index 93f8448..101be9f 100644
--- a/src/lib/managed_node_configuration.rb
+++ b/src/lib/managed_node_configuration.rb
@@ -23,36 +23,57 @@
 
 require 'stringio'
 
+# +ManagedNodeConfiguration+ generates a configuration file for an oVirt node
+# based on information about the hardware submitted by the node and the
+# configuration details held in the database.
+#
+# The configuration is returned as a series of encoded lines.
+#
+# For a kernel module, the formation of the line is as follows:
+#
+# bonding=[bonding alias]
+#
+# An example would be for loading the +bonding+ kernel module to setup a bonded
+# interface for load balancing. In this example, the bonded interface would be
+# named +failover0+ on the node:
+#
+# bonding=failover0
+#
+# For a network interface (including a bonded interface) an example would be:
+#
+# ifcfg=00:11:22:33:44|eth0|BOOTPROTO=dhcp|bridge=ovirtbr0|ONBOOT=yes
+#
+# In this line, the network interface +eth0+ has a hardware MAC address of
+# +00:11:22:33:44+. It will use DHCP for retrieving it's IP address details,
+# and will use the +ovirtbr0+ interface as a bridge.
+#
 class ManagedNodeConfiguration
   NIC_ENTRY_PREFIX='/files/etc/sysconfig/network-scripts'
 
   def self.generate(host, macs)
     result = StringIO.new
 
-    result.puts "#!/bin/bash"
     result.puts "# THIS FILE IS GENERATED!"
 
     # first process any bondings that're defined
     unless host.bondings.empty?
-      result.puts "cat <<\EOF > /var/tmp/pre-config-script"
-      result.puts "#!/bin/bash"
-      result.puts "# THIS FILE IS GENERATED!"
-
       host.bondings.each do |bonding|
-        result.puts "/sbin/modprobe bonding mode=#{bonding.bonding_type.mode}"
+        result.puts "bonding=#{bonding.interface_name}"
       end
-
-      result.puts "EOF"
     end
 
     # now process the network interfaces  and bondings
-    result.puts "cat <<\EOF > /var/tmp/node-augtool"
 
     host.bondings.each do |bonding|
-      result.puts "rm #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}"
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/DEVICE #{bonding.interface_name}"
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/IPADDR #{bonding.ip_addr}" if bonding.ip_addr
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/ONBOOT yes"
+      entry = "ifcfg=none|#{bonding.interface_name}|BONDING_OPTS=\"mode=#{bonding.bonding_type.mode} miimon=100\""
+
+      if bonding.ip_addr == nil || bonding.ip_addr.empty?
+        entry += "|BOOTPROTO=dhcp"
+      else
+        entry += "|BOOTPROTO=static|IPADDR=#{bonding.ip_addr}|NETMASK=#{bonding.netmask}|BROADCAST=#{bonding.broadcast}"
+      end
+
+      result.puts "#{entry}|ONBOOT=yes"
 
       bonding.nics.each do |nic|
         process_nic result, nic, macs, bonding
@@ -75,9 +96,6 @@ class ManagedNodeConfiguration
       end
     end
 
-    result.puts "save"
-    result.puts "EOF"
-
     result.string
   end
 
@@ -87,31 +105,20 @@ class ManagedNodeConfiguration
     iface_name = macs[nic.mac]
 
     if iface_name
-      result.puts "rm #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}"
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/DEVICE #{iface_name}"
+      entry = "ifcfg=#{nic.mac}|#{iface_name}"
 
       if bonding
-        result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/MASTER #{bonding.interface_name}"
-        result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/SLAVE yes"
+        entry += "|MASTER=#{bonding.interface_name}|SLAVE=yes"
       else
-        result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BOOTPROTO #{nic.boot_type.proto}"
-
-        if nic.boot_type.proto == 'static'
-          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/IPADDR #{nic.ip_addr}"
-          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/NETMASK #{nic.netmask}"
-          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BROADCAST #{nic.broadcast}"
-        end
-
-	if bridged
-	  result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BRIDGE ovirtbr0"
-	elsif is_bridge
-	  result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/TYPE bridge"
-	  result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/PEERNTP yes"
-	  result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/DELAY 0"
-	end
+        entry += "|BOOTPROTO=#{nic.boot_type.proto}"
+        entry += "|IPADDR=#{nic.ip_addr}|NETMASK=#{nic.netmask}|BROADCAST=#{nic.broadcast}" if nic.boot_type.proto == 'static'
+        entry += "|BRIDGE=#{nic.bridge}" if nic.bridge && !is_bridge
+        entry += "|BRIDGE=ovirtbr0" if !nic.bridge && !is_bridge
+        entry += "|TYPE=bridge" if is_bridge
       end
-
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/ONBOOT yes"
+      entry += "|ONBOOT=yes"
     end
+
+    result.puts entry if defined? entry
   end
 end
diff --git a/src/test/fixtures/bondings.yml b/src/test/fixtures/bondings.yml
index 29473c7..227b92b 100644
--- a/src/test/fixtures/bondings.yml
+++ b/src/test/fixtures/bondings.yml
@@ -1,11 +1,17 @@
 mailservers_managed_node_bonding:
     name: Production Network
-    interface_name: bond0
+    interface_name: mailbonding0
     bonding_type_id: <%= Fixtures.identify(:link_aggregation_bonding_type) %>
     host_id: <%= Fixtures.identify(:mailservers_managed_node) %>
-    boot_type_id: <%= Fixtures.identify(:boot_type_static) %>
+    boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
     ip_addr: 172.31.0.15
     netmask: 255.255.255.
     broadcast: 172.31.0.255
     arp_ping_address: 172.31.0.100
     arp_interval: 0
+
+mediaserver_managed_node_bonding:
+    name: Fileserver Network
+    interface_name: mediabonding0
+    bonding_type_id: <%= Fixtures.identify(:link_aggregation_bonding_type) %>
+    host_id: <%= Fixtures.identify(:mediaserver_managed_node) %>
diff --git a/src/test/fixtures/bondings_nics.yml b/src/test/fixtures/bondings_nics.yml
index 11a3d1a..607ff8b 100644
--- a/src/test/fixtures/bondings_nics.yml
+++ b/src/test/fixtures/bondings_nics.yml
@@ -5,3 +5,11 @@ mailservers_managed_node_bonding_nic_1:
 mailservers_managed_node_bonding_nic_2:
     bonding_id: <%= Fixtures.identify(:mailservers_managed_node_bonding) %>
     nic_id: <%= Fixtures.identify(:mailserver_nic_two) %>
+
+mediaservers_managed_node_bonding_nic_1:
+    bonding_id: <%= Fixtures.identify(:mediaserver_managed_node_bonding) %>
+    nic_id: <%= Fixtures.identify(:mediaserver_nic_one) %>
+
+mediaservers_managed_node_bonding_nic_2:
+    bonding_id: <%= Fixtures.identify(:mediaserver_managed_node_bonding) %>
+    nic_id: <%= Fixtures.identify(:mediaserver_nic_two) %>
diff --git a/src/test/fixtures/hosts.yml b/src/test/fixtures/hosts.yml
index 5b8af15..28282c2 100644
--- a/src/test/fixtures/hosts.yml
+++ b/src/test/fixtures/hosts.yml
@@ -125,3 +125,13 @@ buildserver_managed_node:
     is_disabled: 0
     hypervisor_type: 'kvm'
     hardware_pool_id: <%= Fixtures.identify(:prodops_pool) %>
+
+mediaserver_managed_node:
+    uuid: '6293acd9-2784-11dc-9387-001558c41534'
+    hostname: 'build.mynetwork.com'
+    arch: 'x86_64'
+    memory: 65536
+    is_disabled: 0
+    hypervisor_type: 'kvm'
+    hardware_pool_id: <%= Fixtures.identify(:prodops_pool) %>
+
diff --git a/src/test/fixtures/nics.yml b/src/test/fixtures/nics.yml
index ccf71d2..5b2cecc 100644
--- a/src/test/fixtures/nics.yml
+++ b/src/test/fixtures/nics.yml
@@ -78,3 +78,17 @@ buildserver_nic_two:
     broadcast: '172.31.0.255'
     host_id: <%= Fixtures.identify(:buildserver_managed_node) %>
     boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
+
+mediaserver_nic_one:
+    mac: '07:17:19:65:03:32'
+    usage_type: '1'
+    bandwidth: 100
+    host_id: <%= Fixtures.identify(:mediaserver_managed_node) %>
+    boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
+
+mediaserver_nic_two:
+    mac: '07:17:19:65:03:31'
+    usage_type: '1'
+    bandwidth: 100
+    host_id: <%= Fixtures.identify(:mediaserver_managed_node) %>
+    boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
diff --git a/src/test/functional/managed_node_configuration_test.rb b/src/test/functional/managed_node_configuration_test.rb
index d0d8aa3..14c9736 100644
--- a/src/test/functional/managed_node_configuration_test.rb
+++ b/src/test/functional/managed_node_configuration_test.rb
@@ -36,6 +36,7 @@ class ManagedNodeConfigurationTest < Test::Unit::TestCase
     @host_with_ip_address = hosts(:ldapserver_managed_node)
     @host_with_multiple_nics = hosts(:buildserver_managed_node)
     @host_with_bondings = hosts(:mailservers_managed_node)
+    @host_with_dhcp_bondings = hosts(:mediaserver_managed_node)
   end
 
   # Ensures that network interfaces uses DHCP when no IP address is specified.
@@ -44,23 +45,9 @@ class ManagedNodeConfigurationTest < Test::Unit::TestCase
     nic = @host_with_dhcp_card.nics.first
 
     expected = <<-HERE
-#!/bin/bash
 # THIS FILE IS GENERATED!
-cat <<\EOF > /var/tmp/node-augtool
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BOOTPROTO #{nic.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BRIDGE ovirtbr0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
-rm /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DEVICE ovirtbr0
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BOOTPROTO #{nic.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/TYPE bridge
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/PEERNTP yes
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DELAY 0
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/ONBOOT yes
-save
-EOF
+ifcfg=#{nic.mac}|eth0|BOOTPROTO=dhcp|BRIDGE=ovirtbr0|ONBOOT=yes
+ifcfg=#{nic.mac}|ovirtbr0|BOOTPROTO=dhcp|TYPE=bridge|ONBOOT=yes
     HERE
 
     result = ManagedNodeConfiguration.generate(
@@ -77,29 +64,9 @@ EOF
     nic = @host_with_ip_address.nics.first
 
     expected = <<-HERE
-#!/bin/bash
 # THIS FILE IS GENERATED!
-cat <<\EOF > /var/tmp/node-augtool
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BOOTPROTO #{nic.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/IPADDR #{nic.ip_addr}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/NETMASK #{nic.netmask}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BROADCAST #{nic.broadcast}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BRIDGE ovirtbr0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
-rm /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DEVICE ovirtbr0
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BOOTPROTO #{nic.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/IPADDR #{nic.ip_addr}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/NETMASK #{nic.netmask}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BROADCAST #{nic.broadcast}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/TYPE bridge
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/PEERNTP yes
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DELAY 0
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/ONBOOT yes
-save
-EOF
+ifcfg=#{nic.mac}|eth0|BOOTPROTO=#{nic.boot_type.proto}|IPADDR=#{nic.ip_addr}|NETMASK=#{nic.netmask}|BROADCAST=#{nic.broadcast}|BRIDGE=#{nic.bridge}|ONBOOT=yes
+ifcfg=#{nic.mac}|ovirtbr0|BOOTPROTO=#{nic.boot_type.proto}|IPADDR=#{nic.ip_addr}|NETMASK=|BROADCAST=#{nic.netmask}|TYPE=bridge|ONBOOT=yes
     HERE
 
     result = ManagedNodeConfiguration.generate(
@@ -117,34 +84,10 @@ EOF
     nic2 = @host_with_multiple_nics.nics[1]
 
     expected = <<-HERE
-#!/bin/bash
 # THIS FILE IS GENERATED!
-cat <<\EOF > /var/tmp/node-augtool
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BOOTPROTO #{nic1.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/IPADDR #{nic1.ip_addr}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/NETMASK #{nic1.netmask}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BROADCAST #{nic1.broadcast}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BRIDGE ovirtbr0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
-rm /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DEVICE ovirtbr0
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BOOTPROTO #{nic1.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/IPADDR #{nic1.ip_addr}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/NETMASK #{nic1.netmask}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BROADCAST #{nic1.broadcast}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/TYPE bridge
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/PEERNTP yes
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DELAY 0
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/ONBOOT yes
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth1
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/DEVICE eth1
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/BOOTPROTO #{nic2.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/BRIDGE ovirtbr0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/ONBOOT yes
-save
-EOF
+ifcfg=#{nic1.mac}|eth0|BOOTPROTO=#{nic1.boot_type.proto}|IPADDR=#{nic1.ip_addr}|NETMASK=#{nic1.netmask}|BROADCAST=#{nic1.broadcast}|BRIDGE=ovirtbr0|ONBOOT=yes
+ifcfg=#{nic1.mac}|ovirtbr0|BOOTPROTO=#{nic1.boot_type.proto}|IPADDR=#{nic1.ip_addr}|NETMASK=#{nic1.netmask}|BROADCAST=#{nic1.broadcast}|TYPE=bridge|ONBOOT=yes
+ifcfg=#{nic2.mac}|eth1|BOOTPROTO=#{nic2.boot_type.proto}|BRIDGE=ovirtbr0|ONBOOT=yes
     HERE
 
     result = ManagedNodeConfiguration.generate(
@@ -167,30 +110,11 @@ EOF
     nic2 = bonding.nics[1]
 
     expected = <<-HERE
-#!/bin/bash
 # THIS FILE IS GENERATED!
-cat <<\EOF > /var/tmp/pre-config-script
-#!/bin/bash
-# THIS FILE IS GENERATED!
-/sbin/modprobe bonding mode=#{bonding.bonding_type.mode}
-EOF
-cat <<\EOF > /var/tmp/node-augtool
-rm /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}
-set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/DEVICE #{bonding.interface_name}
-set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/IPADDR 172.31.0.15
-set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/ONBOOT yes
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/MASTER #{bonding.interface_name}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/SLAVE yes
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth1
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/DEVICE eth1
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/MASTER #{bonding.interface_name}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/SLAVE yes
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/ONBOOT yes
-save
-EOF
+bonding=#{bonding.interface_name}
+ifcfg=none|#{bonding.interface_name}|BONDING_OPTS="mode=#{bonding.bonding_type.mode} miimon=100"|BOOTPROTO=static|IPADDR=#{bonding.ip_addr}|NETMASK=#{bonding.netmask}|BROADCAST=#{bonding.broadcast}|ONBOOT=yes
+ifcfg=#{nic1.mac}|eth0|MASTER=#{bonding.interface_name}|SLAVE=yes|ONBOOT=yes
+ifcfg=#{nic2.mac}|eth1|MASTER=#{bonding.interface_name}|SLAVE=yes|ONBOOT=yes
 HERE
 
     result = ManagedNodeConfiguration.generate(
@@ -203,4 +127,31 @@ HERE
     assert_equal expected, result
   end
 
+  # Ensures that the generated bonding supports DHCP boot protocol.
+  #
+  def test_generate_with_dhcp_bonding
+    bonding = @host_with_dhcp_bondings.bondings.first
+
+    bonding.ip_addr=nil
+    nic1 = bonding.nics[0]
+    nic2 = bonding.nics[1]
+
+    expected = <<-HERE
+# THIS FILE IS GENERATED!
+bonding=#{bonding.interface_name}
+ifcfg=none|#{bonding.interface_name}|BONDING_OPTS="mode=#{bonding.bonding_type.mode} miimon=100"|BOOTPROTO=dhcp|ONBOOT=yes
+ifcfg=#{nic1.mac}|eth0|MASTER=#{bonding.interface_name}|SLAVE=yes|ONBOOT=yes
+ifcfg=#{nic2.mac}|eth1|MASTER=#{bonding.interface_name}|SLAVE=yes|ONBOOT=yes
+HERE
+
+    result = ManagedNodeConfiguration.generate(
+      @host_with_dhcp_bondings,
+      {
+        "#{nic1.mac}" => 'eth0',
+        "#{nic2.mac}" => 'eth1'
+      })
+
+    assert_equal expected, result
+  end
+
 end
-- 
1.5.5.1



From dpierce at redhat.com  Mon Oct 20 18:10:14 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Mon, 20 Oct 2008 14:10:14 -0400
Subject: [Ovirt-devel] [PATCH node] Updated the configuration processing to
	remove the need for scripts.
Message-ID: <1224526214-12727-1-git-send-email-dpierce@redhat.com>

The system now takes an encoded configuration descriptor from the server. It
then parses from that a set of aliases for bondings if such exist. It then
also extracts configuration details for the various network interfaces on the
node. Afterward, it reloads module dependencies and then restarts the
networking service.

This patch also includes updated rdocs for the configuration generator.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 Makefile.am                  |    1 +
 ovirt-node.spec.in           |    2 +
 scripts/ovirt-early          |   14 +++-----
 scripts/ovirt-process-config |   68 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 76 insertions(+), 9 deletions(-)
 create mode 100755 scripts/ovirt-process-config

diff --git a/Makefile.am b/Makefile.am
index 1d63310..c55db13 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,6 +30,7 @@ EXTRA_DIST =			\
   scripts/ovirt-early		\
   scripts/ovirt-functions	\
   scripts/ovirt-post		\
+  scripts/ovirt-process-config  \
   logrotate/ovirt-logrotate	\
   logrotate/ovirt-logrotate.conf
 
diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index c5c836b..912192e 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -87,6 +87,7 @@ cd -
 %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/logrotate.d
 
 %{__install} -p -m0755 scripts/ovirt-awake %{buildroot}%{_sbindir}
+%{__install} -p -m0755 scripts/ovirt-process-config %{buildroot}%{_sbindir}
 %{__install} -p -m0755 ovirt-identify-node/ovirt-identify-node %{buildroot}%{_sbindir}
 %{__install} -p -m0755 ovirt-listen-awake/ovirt-listen-awake %{buildroot}%{_sbindir}
 %{__install} -Dp -m0755 ovirt-listen-awake/ovirt-listen-awake.init %{buildroot}%{_initrddir}/ovirt-listen-awake
@@ -158,6 +159,7 @@ fi
 %files
 %defattr(-,root,root,0755)
 %{_sbindir}/ovirt-awake
+%{_sbindir}/ovirt-process-config
 %{_sbindir}/ovirt-identify-node
 %{_sbindir}/ovirt-listen-awake
 %{_sbindir}/ovirt-install-node
diff --git a/scripts/ovirt-early b/scripts/ovirt-early
index 4723426..3c8c494 100755
--- a/scripts/ovirt-early
+++ b/scripts/ovirt-early
@@ -12,6 +12,8 @@
 
 # size of the oVirt partition in megabytes
 OVIRT_SIZE=64
+BONDING_MODCONF_FILE=/etc/modprobe.d/bonding
+AUGTOOL_CONFIG=/var/tmp/augtool-config
 
 get_mac_addresses() {
     macs=$(ifconfig | awk '/HWaddr/ { print $5"="$1 }' \
@@ -43,16 +45,10 @@ configure_from_network() {
                       "http://$SRV_HOST:$SRV_PORT/ovirt/managed_node/config?host=$(hostname)&macs=$macs"
                     if [ $? -eq 0 ]; then
                         echo "Remote configuration bundle retrieved to $cfgdb"
-                        bash $cfgdb
-                        if [ -f /var/tmp/pre-config-script ]; then
-                            echo "Loading kernel modules"
-                            bash /var/tmp/pre-config-script \
-                                && echo "Kernel modules loaded" \
-                                || echo "Failed loading kernel modules"
-                        fi
-                        if [ -f /var/tmp/node-augtool ]; then
+                        ovirt-process-config $cfgdb $BONDING_MODCONF_FILE $AUGTOOL_CONFIG
+                        if [ -f $AUGTOOL_CONFIG ]; then
                             echo "Loading remote config"
-                            augtool < /var/tmp/node-augtool \
+                            augtool < $AUGTOOL_CONFIG \
                                 && echo "Remote config applied" \
                                 || echo "Failed applying remote config"
                         fi
diff --git a/scripts/ovirt-process-config b/scripts/ovirt-process-config
new file mode 100755
index 0000000..9af0822
--- /dev/null
+++ b/scripts/ovirt-process-config
@@ -0,0 +1,68 @@
+#!/bin/bash
+
+ME=$(basename "$0")
+warn() { printf "$ME: $@\n" >&2; }
+try_h() { printf "Try \`$ME -h' for more information.\n" >&2; exit 1;}
+try_help() { printf "Usage: \`$ME [config] [module output] [config output]\n" >&2; exit 1;}
+
+case $# in
+  0|1|2) warn "too few arguments"; try_help;;
+  3) ;;
+  *) warn "too many arguments"; try_help;;
+esac
+
+CONFIG=$1
+OVIRT_KERNEL_MODULE_FILE=$2
+OVIRT_CONFIG_OUTPUT_FILE=$3
+
+modconf=$(awk '/bonding=/ {
+        match($0, "^[ \t]*bonding=(.*)", data)
+        split(data[1], mod, "|")
+
+        if (match("[^[:alnum:]=_ at -]", mod[1]) >= 0) {
+            printf "invalid bonding alias: \"%s\"\n", mod[1];
+            exit 1;
+        }
+
+        alias=mod[1]
+
+        printf("install %s bonding", alias)
+    }' $CONFIG)
+
+echo "$modconf" > $OVIRT_KERNEL_MODULE_FILE
+
+# now build the list of module aliases to load and load them
+modules=$(awk '/bonding=/ {
+        match($0, "^[ \t]*bonding=(.*)", data)
+        split(data[1], mod, "|")
+
+        printf("%s ", mod[1])
+    }' $CONFIG)
+
+networking=$(awk '/ifcfg=/ {
+    match($0, "^[ \t]*ifcfg=(.*)", data)
+    split(data[1], ifcfg, "|")
+
+    mac = ifcfg[1]
+    iface = ifcfg[2]
+    ifcfg_dir = "/files/etc/sysconfig/network-scripts"
+
+    printf("rm %s/ifcfg-%s\n", ifcfg_dir, iface)
+    printf("set %s/ifcfg-%s/DEVICE %s\n", ifcfg_dir, iface, iface)
+
+    for (line in ifcfg) {
+        if(line > 2) {
+            match(ifcfg[line], "(^[^=]+)=(.*)", values)
+            field=values[1]
+            value=values[2]
+
+            printf("set %s/ifcfg-%s/%s %s\n", ifcfg_dir, iface, field, value)
+        }
+    }
+
+
+    printf("save\n")
+
+}' $CONFIG)
+
+echo "$networking" > $OVIRT_CONFIG_OUTPUT_FILE
-- 
1.5.5.1



From sseago at redhat.com  Mon Oct 20 18:17:28 2008
From: sseago at redhat.com (Scott Seago)
Date: Mon, 20 Oct 2008 14:17:28 -0400
Subject: [Ovirt-devel] Re: [PATCH] initial model work for lvm storage
	(revised2)
In-Reply-To: <1224184470-7912-1-git-send-email-sseago@redhat.com>
References: <1224184470-7912-1-git-send-email-sseago@redhat.com>
Message-ID: <48FCCB38.5080400@redhat.com>

Scott Seago wrote:
> This includes the model classes w/ migrations for the lvm storage pools and volumes, and some changes required to support Storage Volume tasks. This patch does not include all of the necessary model API methods to support lvm, but it's a starting point -- some changes to clalance's taskomatic bits will be required to support this, and we will need additional model enhancements when the UI work is done, and when the taskomatic back end is finalized.
>
> revised to fix a couple controller bugs and to increment the migration version #
> and to fix some additional model problems in taskomatic and host-status
>
> Signed-off-by: Scott Seago <sseago at redhat.com>
> ---
>  src/app/controllers/host_controller.rb             |    8 +-
>  src/app/controllers/storage_controller.rb          |   35 ++-----
>  src/app/controllers/vm_controller.rb               |   34 +++---
>  src/app/models/host.rb                             |    2 +-
>  src/app/models/host_task.rb                        |   11 ++-
>  src/app/models/iscsi_storage_pool.rb               |    2 +-
>  .../models/{host_task.rb => lvm_storage_pool.rb}   |   30 ++++--
>  .../{nfs_storage_pool.rb => lvm_storage_volume.rb} |   12 +--
>  src/app/models/nfs_storage_pool.rb                 |    2 +-
>  src/app/models/storage_pool.rb                     |   12 ++-
>  src/app/models/storage_task.rb                     |   11 ++-
>  src/app/models/storage_volume.rb                   |   15 +++-
>  .../{host_task.rb => storage_volume_task.rb}       |   22 +++-
>  src/app/models/task.rb                             |   15 ++-
>  src/app/models/vm.rb                               |   12 +-
>  src/app/models/vm_task.rb                          |   15 ++-
>  src/db/migrate/025_add_lvm_storage.rb              |  106 ++++++++++++++++++++
>  src/dutils/active_record_env.rb                    |    2 +
>  src/host-status/host-status.rb                     |    5 +-
>  src/task-omatic/task_host.rb                       |    2 +-
>  src/task-omatic/task_storage.rb                    |    4 +-
>  src/task-omatic/task_vm.rb                         |   48 +++------
>  src/test/fixtures/tasks.yml                        |   32 ++++--
>  23 files changed, 296 insertions(+), 141 deletions(-)
>  copy src/app/models/{host_task.rb => lvm_storage_pool.rb} (62%)
>  copy src/app/models/{nfs_storage_pool.rb => lvm_storage_volume.rb} (82%)
>  copy src/app/models/{host_task.rb => storage_volume_task.rb} (69%)
>  create mode 100644 src/db/migrate/025_add_lvm_storage.rb
>   

I pushed this today. The only thing lacking for the ACK from clalance 
was further testing after I fixed the problems found earlier. I fixed 
these and tested creating storage pools as well as 
creating/stopping/starting VMs.

Scott



From dpierce at redhat.com  Mon Oct 20 18:25:21 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Mon, 20 Oct 2008 14:25:21 -0400
Subject: [Ovirt-devel] [PATCH server] Replaced the config scripts with
	configuration encoding.
Message-ID: <1224527121-13802-1-git-send-email-dpierce@redhat.com>

Rather than sending the node a series of scripts that load
kernel modules, or are tightly coupled to tools like augeas,
this patch introduces an encoding scheme for data.

A line that begins with "bonding" describes a bonded interface.
>From it the configuration processor generates a simple bonding
file that includes an alias for the bonding kernel module

A line that begins with "ifcfg" describes an network
interface. It will contain the mac address and interface name,
followed by all needed configuration values to bring the
interface up.

THIS PATCH FIXES THE ABOVE CHECKIN MESSAGE.
---
 src/db/migrate/024_add_boot_type_to_bonding.rb     |    2 +-
 .../migrate/025_allow_nic_boot_type_to_be_null.rb  |   28 +++++
 src/lib/managed_node_configuration.rb              |   81 +++++++------
 src/test/fixtures/bondings.yml                     |   10 ++-
 src/test/fixtures/bondings_nics.yml                |    8 ++
 src/test/fixtures/hosts.yml                        |   10 ++
 src/test/fixtures/nics.yml                         |   14 ++
 .../functional/managed_node_configuration_test.rb  |  127 ++++++--------------
 8 files changed, 152 insertions(+), 128 deletions(-)
 create mode 100644 src/db/migrate/025_allow_nic_boot_type_to_be_null.rb

diff --git a/src/db/migrate/024_add_boot_type_to_bonding.rb b/src/db/migrate/024_add_boot_type_to_bonding.rb
index e2cf1c6..17e085f 100644
--- a/src/db/migrate/024_add_boot_type_to_bonding.rb
+++ b/src/db/migrate/024_add_boot_type_to_bonding.rb
@@ -19,7 +19,7 @@
 
 class AddBootTypeToBonding < ActiveRecord::Migration
   def self.up
-    add_column :bondings, :boot_type_id, :integer, :null => false
+    add_column :bondings, :boot_type_id, :integer, :null => true
 
     execute 'alter table bondings add constraint fk_bondings_boot_type
              foreign key (boot_type_id) references boot_types(id)'
diff --git a/src/db/migrate/025_allow_nic_boot_type_to_be_null.rb b/src/db/migrate/025_allow_nic_boot_type_to_be_null.rb
new file mode 100644
index 0000000..b09ada1
--- /dev/null
+++ b/src/db/migrate/025_allow_nic_boot_type_to_be_null.rb
@@ -0,0 +1,28 @@
+#
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+class AllowNicBootTypeToBeNull < ActiveRecord::Migration
+  def self.up
+    change_column :nics, :boot_type_id, :integer, :null => true
+  end
+
+  def self.down
+    change_column :nics, :boot_type_id, :integer, :null => false
+  end
+end
diff --git a/src/lib/managed_node_configuration.rb b/src/lib/managed_node_configuration.rb
index 93f8448..101be9f 100644
--- a/src/lib/managed_node_configuration.rb
+++ b/src/lib/managed_node_configuration.rb
@@ -23,36 +23,57 @@
 
 require 'stringio'
 
+# +ManagedNodeConfiguration+ generates a configuration file for an oVirt node
+# based on information about the hardware submitted by the node and the
+# configuration details held in the database.
+#
+# The configuration is returned as a series of encoded lines.
+#
+# For a kernel module, the formation of the line is as follows:
+#
+# bonding=[bonding alias]
+#
+# An example would be for loading the +bonding+ kernel module to setup a bonded
+# interface for load balancing. In this example, the bonded interface would be
+# named +failover0+ on the node:
+#
+# bonding=failover0
+#
+# For a network interface (including a bonded interface) an example would be:
+#
+# ifcfg=00:11:22:33:44|eth0|BOOTPROTO=dhcp|bridge=ovirtbr0|ONBOOT=yes
+#
+# In this line, the network interface +eth0+ has a hardware MAC address of
+# +00:11:22:33:44+. It will use DHCP for retrieving it's IP address details,
+# and will use the +ovirtbr0+ interface as a bridge.
+#
 class ManagedNodeConfiguration
   NIC_ENTRY_PREFIX='/files/etc/sysconfig/network-scripts'
 
   def self.generate(host, macs)
     result = StringIO.new
 
-    result.puts "#!/bin/bash"
     result.puts "# THIS FILE IS GENERATED!"
 
     # first process any bondings that're defined
     unless host.bondings.empty?
-      result.puts "cat <<\EOF > /var/tmp/pre-config-script"
-      result.puts "#!/bin/bash"
-      result.puts "# THIS FILE IS GENERATED!"
-
       host.bondings.each do |bonding|
-        result.puts "/sbin/modprobe bonding mode=#{bonding.bonding_type.mode}"
+        result.puts "bonding=#{bonding.interface_name}"
       end
-
-      result.puts "EOF"
     end
 
     # now process the network interfaces  and bondings
-    result.puts "cat <<\EOF > /var/tmp/node-augtool"
 
     host.bondings.each do |bonding|
-      result.puts "rm #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}"
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/DEVICE #{bonding.interface_name}"
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/IPADDR #{bonding.ip_addr}" if bonding.ip_addr
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/ONBOOT yes"
+      entry = "ifcfg=none|#{bonding.interface_name}|BONDING_OPTS=\"mode=#{bonding.bonding_type.mode} miimon=100\""
+
+      if bonding.ip_addr == nil || bonding.ip_addr.empty?
+        entry += "|BOOTPROTO=dhcp"
+      else
+        entry += "|BOOTPROTO=static|IPADDR=#{bonding.ip_addr}|NETMASK=#{bonding.netmask}|BROADCAST=#{bonding.broadcast}"
+      end
+
+      result.puts "#{entry}|ONBOOT=yes"
 
       bonding.nics.each do |nic|
         process_nic result, nic, macs, bonding
@@ -75,9 +96,6 @@ class ManagedNodeConfiguration
       end
     end
 
-    result.puts "save"
-    result.puts "EOF"
-
     result.string
   end
 
@@ -87,31 +105,20 @@ class ManagedNodeConfiguration
     iface_name = macs[nic.mac]
 
     if iface_name
-      result.puts "rm #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}"
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/DEVICE #{iface_name}"
+      entry = "ifcfg=#{nic.mac}|#{iface_name}"
 
       if bonding
-        result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/MASTER #{bonding.interface_name}"
-        result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/SLAVE yes"
+        entry += "|MASTER=#{bonding.interface_name}|SLAVE=yes"
       else
-        result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BOOTPROTO #{nic.boot_type.proto}"
-
-        if nic.boot_type.proto == 'static'
-          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/IPADDR #{nic.ip_addr}"
-          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/NETMASK #{nic.netmask}"
-          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BROADCAST #{nic.broadcast}"
-        end
-
-	if bridged
-	  result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BRIDGE ovirtbr0"
-	elsif is_bridge
-	  result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/TYPE bridge"
-	  result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/PEERNTP yes"
-	  result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/DELAY 0"
-	end
+        entry += "|BOOTPROTO=#{nic.boot_type.proto}"
+        entry += "|IPADDR=#{nic.ip_addr}|NETMASK=#{nic.netmask}|BROADCAST=#{nic.broadcast}" if nic.boot_type.proto == 'static'
+        entry += "|BRIDGE=#{nic.bridge}" if nic.bridge && !is_bridge
+        entry += "|BRIDGE=ovirtbr0" if !nic.bridge && !is_bridge
+        entry += "|TYPE=bridge" if is_bridge
       end
-
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/ONBOOT yes"
+      entry += "|ONBOOT=yes"
     end
+
+    result.puts entry if defined? entry
   end
 end
diff --git a/src/test/fixtures/bondings.yml b/src/test/fixtures/bondings.yml
index 29473c7..227b92b 100644
--- a/src/test/fixtures/bondings.yml
+++ b/src/test/fixtures/bondings.yml
@@ -1,11 +1,17 @@
 mailservers_managed_node_bonding:
     name: Production Network
-    interface_name: bond0
+    interface_name: mailbonding0
     bonding_type_id: <%= Fixtures.identify(:link_aggregation_bonding_type) %>
     host_id: <%= Fixtures.identify(:mailservers_managed_node) %>
-    boot_type_id: <%= Fixtures.identify(:boot_type_static) %>
+    boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
     ip_addr: 172.31.0.15
     netmask: 255.255.255.
     broadcast: 172.31.0.255
     arp_ping_address: 172.31.0.100
     arp_interval: 0
+
+mediaserver_managed_node_bonding:
+    name: Fileserver Network
+    interface_name: mediabonding0
+    bonding_type_id: <%= Fixtures.identify(:link_aggregation_bonding_type) %>
+    host_id: <%= Fixtures.identify(:mediaserver_managed_node) %>
diff --git a/src/test/fixtures/bondings_nics.yml b/src/test/fixtures/bondings_nics.yml
index 11a3d1a..607ff8b 100644
--- a/src/test/fixtures/bondings_nics.yml
+++ b/src/test/fixtures/bondings_nics.yml
@@ -5,3 +5,11 @@ mailservers_managed_node_bonding_nic_1:
 mailservers_managed_node_bonding_nic_2:
     bonding_id: <%= Fixtures.identify(:mailservers_managed_node_bonding) %>
     nic_id: <%= Fixtures.identify(:mailserver_nic_two) %>
+
+mediaservers_managed_node_bonding_nic_1:
+    bonding_id: <%= Fixtures.identify(:mediaserver_managed_node_bonding) %>
+    nic_id: <%= Fixtures.identify(:mediaserver_nic_one) %>
+
+mediaservers_managed_node_bonding_nic_2:
+    bonding_id: <%= Fixtures.identify(:mediaserver_managed_node_bonding) %>
+    nic_id: <%= Fixtures.identify(:mediaserver_nic_two) %>
diff --git a/src/test/fixtures/hosts.yml b/src/test/fixtures/hosts.yml
index 5b8af15..28282c2 100644
--- a/src/test/fixtures/hosts.yml
+++ b/src/test/fixtures/hosts.yml
@@ -125,3 +125,13 @@ buildserver_managed_node:
     is_disabled: 0
     hypervisor_type: 'kvm'
     hardware_pool_id: <%= Fixtures.identify(:prodops_pool) %>
+
+mediaserver_managed_node:
+    uuid: '6293acd9-2784-11dc-9387-001558c41534'
+    hostname: 'build.mynetwork.com'
+    arch: 'x86_64'
+    memory: 65536
+    is_disabled: 0
+    hypervisor_type: 'kvm'
+    hardware_pool_id: <%= Fixtures.identify(:prodops_pool) %>
+
diff --git a/src/test/fixtures/nics.yml b/src/test/fixtures/nics.yml
index ccf71d2..5b2cecc 100644
--- a/src/test/fixtures/nics.yml
+++ b/src/test/fixtures/nics.yml
@@ -78,3 +78,17 @@ buildserver_nic_two:
     broadcast: '172.31.0.255'
     host_id: <%= Fixtures.identify(:buildserver_managed_node) %>
     boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
+
+mediaserver_nic_one:
+    mac: '07:17:19:65:03:32'
+    usage_type: '1'
+    bandwidth: 100
+    host_id: <%= Fixtures.identify(:mediaserver_managed_node) %>
+    boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
+
+mediaserver_nic_two:
+    mac: '07:17:19:65:03:31'
+    usage_type: '1'
+    bandwidth: 100
+    host_id: <%= Fixtures.identify(:mediaserver_managed_node) %>
+    boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
diff --git a/src/test/functional/managed_node_configuration_test.rb b/src/test/functional/managed_node_configuration_test.rb
index d0d8aa3..14c9736 100644
--- a/src/test/functional/managed_node_configuration_test.rb
+++ b/src/test/functional/managed_node_configuration_test.rb
@@ -36,6 +36,7 @@ class ManagedNodeConfigurationTest < Test::Unit::TestCase
     @host_with_ip_address = hosts(:ldapserver_managed_node)
     @host_with_multiple_nics = hosts(:buildserver_managed_node)
     @host_with_bondings = hosts(:mailservers_managed_node)
+    @host_with_dhcp_bondings = hosts(:mediaserver_managed_node)
   end
 
   # Ensures that network interfaces uses DHCP when no IP address is specified.
@@ -44,23 +45,9 @@ class ManagedNodeConfigurationTest < Test::Unit::TestCase
     nic = @host_with_dhcp_card.nics.first
 
     expected = <<-HERE
-#!/bin/bash
 # THIS FILE IS GENERATED!
-cat <<\EOF > /var/tmp/node-augtool
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BOOTPROTO #{nic.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BRIDGE ovirtbr0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
-rm /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DEVICE ovirtbr0
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BOOTPROTO #{nic.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/TYPE bridge
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/PEERNTP yes
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DELAY 0
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/ONBOOT yes
-save
-EOF
+ifcfg=#{nic.mac}|eth0|BOOTPROTO=dhcp|BRIDGE=ovirtbr0|ONBOOT=yes
+ifcfg=#{nic.mac}|ovirtbr0|BOOTPROTO=dhcp|TYPE=bridge|ONBOOT=yes
     HERE
 
     result = ManagedNodeConfiguration.generate(
@@ -77,29 +64,9 @@ EOF
     nic = @host_with_ip_address.nics.first
 
     expected = <<-HERE
-#!/bin/bash
 # THIS FILE IS GENERATED!
-cat <<\EOF > /var/tmp/node-augtool
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BOOTPROTO #{nic.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/IPADDR #{nic.ip_addr}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/NETMASK #{nic.netmask}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BROADCAST #{nic.broadcast}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BRIDGE ovirtbr0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
-rm /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DEVICE ovirtbr0
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BOOTPROTO #{nic.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/IPADDR #{nic.ip_addr}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/NETMASK #{nic.netmask}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BROADCAST #{nic.broadcast}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/TYPE bridge
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/PEERNTP yes
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DELAY 0
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/ONBOOT yes
-save
-EOF
+ifcfg=#{nic.mac}|eth0|BOOTPROTO=#{nic.boot_type.proto}|IPADDR=#{nic.ip_addr}|NETMASK=#{nic.netmask}|BROADCAST=#{nic.broadcast}|BRIDGE=#{nic.bridge}|ONBOOT=yes
+ifcfg=#{nic.mac}|ovirtbr0|BOOTPROTO=#{nic.boot_type.proto}|IPADDR=#{nic.ip_addr}|NETMASK=|BROADCAST=#{nic.netmask}|TYPE=bridge|ONBOOT=yes
     HERE
 
     result = ManagedNodeConfiguration.generate(
@@ -117,34 +84,10 @@ EOF
     nic2 = @host_with_multiple_nics.nics[1]
 
     expected = <<-HERE
-#!/bin/bash
 # THIS FILE IS GENERATED!
-cat <<\EOF > /var/tmp/node-augtool
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BOOTPROTO #{nic1.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/IPADDR #{nic1.ip_addr}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/NETMASK #{nic1.netmask}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BROADCAST #{nic1.broadcast}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BRIDGE ovirtbr0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
-rm /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DEVICE ovirtbr0
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BOOTPROTO #{nic1.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/IPADDR #{nic1.ip_addr}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/NETMASK #{nic1.netmask}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BROADCAST #{nic1.broadcast}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/TYPE bridge
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/PEERNTP yes
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DELAY 0
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/ONBOOT yes
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth1
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/DEVICE eth1
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/BOOTPROTO #{nic2.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/BRIDGE ovirtbr0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/ONBOOT yes
-save
-EOF
+ifcfg=#{nic1.mac}|eth0|BOOTPROTO=#{nic1.boot_type.proto}|IPADDR=#{nic1.ip_addr}|NETMASK=#{nic1.netmask}|BROADCAST=#{nic1.broadcast}|BRIDGE=ovirtbr0|ONBOOT=yes
+ifcfg=#{nic1.mac}|ovirtbr0|BOOTPROTO=#{nic1.boot_type.proto}|IPADDR=#{nic1.ip_addr}|NETMASK=#{nic1.netmask}|BROADCAST=#{nic1.broadcast}|TYPE=bridge|ONBOOT=yes
+ifcfg=#{nic2.mac}|eth1|BOOTPROTO=#{nic2.boot_type.proto}|BRIDGE=ovirtbr0|ONBOOT=yes
     HERE
 
     result = ManagedNodeConfiguration.generate(
@@ -167,30 +110,11 @@ EOF
     nic2 = bonding.nics[1]
 
     expected = <<-HERE
-#!/bin/bash
 # THIS FILE IS GENERATED!
-cat <<\EOF > /var/tmp/pre-config-script
-#!/bin/bash
-# THIS FILE IS GENERATED!
-/sbin/modprobe bonding mode=#{bonding.bonding_type.mode}
-EOF
-cat <<\EOF > /var/tmp/node-augtool
-rm /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}
-set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/DEVICE #{bonding.interface_name}
-set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/IPADDR 172.31.0.15
-set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/ONBOOT yes
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/MASTER #{bonding.interface_name}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/SLAVE yes
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
-rm /files/etc/sysconfig/network-scripts/ifcfg-eth1
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/DEVICE eth1
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/MASTER #{bonding.interface_name}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/SLAVE yes
-set /files/etc/sysconfig/network-scripts/ifcfg-eth1/ONBOOT yes
-save
-EOF
+bonding=#{bonding.interface_name}
+ifcfg=none|#{bonding.interface_name}|BONDING_OPTS="mode=#{bonding.bonding_type.mode} miimon=100"|BOOTPROTO=static|IPADDR=#{bonding.ip_addr}|NETMASK=#{bonding.netmask}|BROADCAST=#{bonding.broadcast}|ONBOOT=yes
+ifcfg=#{nic1.mac}|eth0|MASTER=#{bonding.interface_name}|SLAVE=yes|ONBOOT=yes
+ifcfg=#{nic2.mac}|eth1|MASTER=#{bonding.interface_name}|SLAVE=yes|ONBOOT=yes
 HERE
 
     result = ManagedNodeConfiguration.generate(
@@ -203,4 +127,31 @@ HERE
     assert_equal expected, result
   end
 
+  # Ensures that the generated bonding supports DHCP boot protocol.
+  #
+  def test_generate_with_dhcp_bonding
+    bonding = @host_with_dhcp_bondings.bondings.first
+
+    bonding.ip_addr=nil
+    nic1 = bonding.nics[0]
+    nic2 = bonding.nics[1]
+
+    expected = <<-HERE
+# THIS FILE IS GENERATED!
+bonding=#{bonding.interface_name}
+ifcfg=none|#{bonding.interface_name}|BONDING_OPTS="mode=#{bonding.bonding_type.mode} miimon=100"|BOOTPROTO=dhcp|ONBOOT=yes
+ifcfg=#{nic1.mac}|eth0|MASTER=#{bonding.interface_name}|SLAVE=yes|ONBOOT=yes
+ifcfg=#{nic2.mac}|eth1|MASTER=#{bonding.interface_name}|SLAVE=yes|ONBOOT=yes
+HERE
+
+    result = ManagedNodeConfiguration.generate(
+      @host_with_dhcp_bondings,
+      {
+        "#{nic1.mac}" => 'eth0',
+        "#{nic2.mac}" => 'eth1'
+      })
+
+    assert_equal expected, result
+  end
+
 end
-- 
1.5.5.1



From dpierce at redhat.com  Mon Oct 20 18:26:10 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Mon, 20 Oct 2008 14:26:10 -0400
Subject: [Ovirt-devel] [PATCH node] Updated the configuration processing to
	remove the need for scripts.
Message-ID: <1224527170-13867-1-git-send-email-dpierce@redhat.com>

The system now takes an encoded configuration descriptor from the server. It
then parses from that a set of aliases for bondings if such exist. It then
also extracts configuration details for the various network interfaces on the
node. Afterward, it reloads module dependencies and then restarts the
networking service.

This patch also includes updated rdocs for the configuration generator.
---
 Makefile.am                  |    1 +
 ovirt-node.spec.in           |    2 +
 scripts/ovirt-early          |   14 +++------
 scripts/ovirt-process-config |   59 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 67 insertions(+), 9 deletions(-)
 create mode 100755 scripts/ovirt-process-config

diff --git a/Makefile.am b/Makefile.am
index 1d63310..c55db13 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,6 +30,7 @@ EXTRA_DIST =			\
   scripts/ovirt-early		\
   scripts/ovirt-functions	\
   scripts/ovirt-post		\
+  scripts/ovirt-process-config  \
   logrotate/ovirt-logrotate	\
   logrotate/ovirt-logrotate.conf
 
diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index c5c836b..912192e 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -87,6 +87,7 @@ cd -
 %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/logrotate.d
 
 %{__install} -p -m0755 scripts/ovirt-awake %{buildroot}%{_sbindir}
+%{__install} -p -m0755 scripts/ovirt-process-config %{buildroot}%{_sbindir}
 %{__install} -p -m0755 ovirt-identify-node/ovirt-identify-node %{buildroot}%{_sbindir}
 %{__install} -p -m0755 ovirt-listen-awake/ovirt-listen-awake %{buildroot}%{_sbindir}
 %{__install} -Dp -m0755 ovirt-listen-awake/ovirt-listen-awake.init %{buildroot}%{_initrddir}/ovirt-listen-awake
@@ -158,6 +159,7 @@ fi
 %files
 %defattr(-,root,root,0755)
 %{_sbindir}/ovirt-awake
+%{_sbindir}/ovirt-process-config
 %{_sbindir}/ovirt-identify-node
 %{_sbindir}/ovirt-listen-awake
 %{_sbindir}/ovirt-install-node
diff --git a/scripts/ovirt-early b/scripts/ovirt-early
index 4723426..3c8c494 100755
--- a/scripts/ovirt-early
+++ b/scripts/ovirt-early
@@ -12,6 +12,8 @@
 
 # size of the oVirt partition in megabytes
 OVIRT_SIZE=64
+BONDING_MODCONF_FILE=/etc/modprobe.d/bonding
+AUGTOOL_CONFIG=/var/tmp/augtool-config
 
 get_mac_addresses() {
     macs=$(ifconfig | awk '/HWaddr/ { print $5"="$1 }' \
@@ -43,16 +45,10 @@ configure_from_network() {
                       "http://$SRV_HOST:$SRV_PORT/ovirt/managed_node/config?host=$(hostname)&macs=$macs"
                     if [ $? -eq 0 ]; then
                         echo "Remote configuration bundle retrieved to $cfgdb"
-                        bash $cfgdb
-                        if [ -f /var/tmp/pre-config-script ]; then
-                            echo "Loading kernel modules"
-                            bash /var/tmp/pre-config-script \
-                                && echo "Kernel modules loaded" \
-                                || echo "Failed loading kernel modules"
-                        fi
-                        if [ -f /var/tmp/node-augtool ]; then
+                        ovirt-process-config $cfgdb $BONDING_MODCONF_FILE $AUGTOOL_CONFIG
+                        if [ -f $AUGTOOL_CONFIG ]; then
                             echo "Loading remote config"
-                            augtool < /var/tmp/node-augtool \
+                            augtool < $AUGTOOL_CONFIG \
                                 && echo "Remote config applied" \
                                 || echo "Failed applying remote config"
                         fi
diff --git a/scripts/ovirt-process-config b/scripts/ovirt-process-config
new file mode 100755
index 0000000..83a3eb3
--- /dev/null
+++ b/scripts/ovirt-process-config
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+ME=$(basename "$0")
+warn() { printf "$ME: $@\n" >&2; }
+try_h() { printf "Try \`$ME -h' for more information.\n" >&2; exit 1;}
+try_help() { printf "Usage: \`$ME [config] [module output] [config output]\n" >&2; exit 1;}
+
+case $# in
+  0|1|2) warn "too few arguments"; try_help;;
+  3) ;;
+  *) warn "too many arguments"; try_help;;
+esac
+
+CONFIG=$1
+OVIRT_KERNEL_MODULE_FILE=$2
+OVIRT_CONFIG_OUTPUT_FILE=$3
+
+modconf=$(awk '/bonding=/ {
+        match($0, "^[ \t]*bonding=(.*)", data)
+
+        if (match("[^[:alnum:]=_ at -]", data[1]) >= 0) {
+            printf "invalid bonding alias: \"%s\"\n", data[1];
+            exit 1;
+        }
+
+        alias=data[1]
+
+        printf("install %s bonding", alias)
+    }' $CONFIG)
+
+echo "$modconf" > $OVIRT_KERNEL_MODULE_FILE
+
+networking=$(awk '/ifcfg=/ {
+    match($0, "^[ \t]*ifcfg=(.*)", data)
+    split(data[1], ifcfg, "|")
+
+    mac = ifcfg[1]
+    iface = ifcfg[2]
+    ifcfg_dir = "/files/etc/sysconfig/network-scripts"
+
+    printf("rm %s/ifcfg-%s\n", ifcfg_dir, iface)
+    printf("set %s/ifcfg-%s/DEVICE %s\n", ifcfg_dir, iface, iface)
+
+    for (line in ifcfg) {
+        if(line > 2) {
+            match(ifcfg[line], "(^[^=]+)=(.*)", values)
+            field=values[1]
+            value=values[2]
+
+            printf("set %s/ifcfg-%s/%s %s\n", ifcfg_dir, iface, field, value)
+        }
+    }
+
+
+    printf("save\n")
+
+}' $CONFIG)
+
+echo "$networking" > $OVIRT_CONFIG_OUTPUT_FILE
-- 
1.5.5.1



From dpierce at redhat.com  Mon Oct 20 19:09:59 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Mon, 20 Oct 2008 15:09:59 -0400
Subject: [Ovirt-devel] [PATCH server] Changed the database configuration to
	use a different database for development
Message-ID: <1224529799-16294-1-git-send-email-dpierce@redhat.com>


Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 scripts/ovirt-server-install |    2 +-
 src/config/database.yml      |   21 +++++++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/scripts/ovirt-server-install b/scripts/ovirt-server-install
index cd921f7..055ff4c 100755
--- a/scripts/ovirt-server-install
+++ b/scripts/ovirt-server-install
@@ -186,7 +186,7 @@ touch $EXISTS_FILE
 
 cd ${OVIRT_DIR}
 mkdir -p log
-rake db:migrate
+export RAILS_ENV="production" && rake db:migrate
 cd -
 
 ${OVIRT_DIR}/script/grant_admin_privileges ovirtadmin
diff --git a/src/config/database.yml b/src/config/database.yml
index c60ee8f..497eb26 100644
--- a/src/config/database.yml
+++ b/src/config/database.yml
@@ -5,16 +5,29 @@
 #   sudo /sbin/service postgresql initdb
 #   sudo /sbin/service postgresql start
 #   sudo su - postgres
-#   $   createdb ovirt
 #   $   psql ovirt
 #   $-# CREATE USER ovirt WITH PASSWORD 'v23zj59an';
-#   $-# CREATE DATABASE ovirt;
-#   $-# GRANT ALL PRIVILEGES ON DATABASE ovirt to ovirt;
+#   $-# CREATE DATABASE ovirt_development;
+#   $-# GRANT ALL PRIVILEGES ON DATABASE ovirt_development to ovirt;
 #   $-# CREATE DATABASE ovirt_test;
 #   $-# GRANT ALL PRIVILEGES ON DATABASE ovirt_test to ovirt;
+#   $-# CREATE DATABASE ovirt;
+#   $-# GRANT ALL PRIVILEGES ON DATABASE ovirt to ovirt;
 #   $-# \q
 #   $   exit
 #
+# To start off a new environment, use the following commands:
+#
+#   rake db:drop:all
+#   rake db:create:all
+#   rake db:migrate
+#   rake db:tests:prepare
+#
+# And when there are changes to the database, simple run:
+#
+#   rake db:migrate
+#   rake db:test:prepare
+#
 #   On a local system you may need to edit this file to have only the following
 #   /var/lib/pgsql/data/pg_hba.conf
 #   local all all trust
@@ -23,7 +36,7 @@
 
 development:
   adapter: postgresql
-  database: ovirt
+  database: ovirt_development
   username: ovirt
   password: v23zj59an
   host: localhost
-- 
1.5.5.1



From dpierce at redhat.com  Mon Oct 20 19:11:21 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Mon, 20 Oct 2008 15:11:21 -0400
Subject: [Ovirt-devel] Re: [PATCH server] Changed the database configuration
 to use a different database for development
In-Reply-To: <1224529799-16294-1-git-send-email-dpierce@redhat.com>
References: <1224529799-16294-1-git-send-email-dpierce@redhat.com>
Message-ID: <48FCD7D9.6070501@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Darryl L. Pierce wrote:
> Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
> ---

This script has been tested on the appliance and worked.
- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkj819UACgkQjaT4DmxOfxs70gCgtNgjp0CRDz6mIBZ6ebFrYfSw
nbYAn3pHmT9aqpdT0eKMcXS1wCVoTzYn
=SD0g
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081020/f4147624/attachment.vcf>

From jguiditt at redhat.com  Mon Oct 20 19:17:48 2008
From: jguiditt at redhat.com (Jason Guiditta)
Date: Mon, 20 Oct 2008 15:17:48 -0400
Subject: [Ovirt-devel] [PATCH] model apis for the storage tree view for
	the new VM form.
In-Reply-To: <1224083229-29533-1-git-send-email-sseago@redhat.com>
References: <1224083229-29533-1-git-send-email-sseago@redhat.com>
Message-ID: <1224530268.30551.1.camel@localhost.localdomain>

On Wed, 2008-10-15 at 15:07 +0000, Scott Seago wrote:
> HardwarePool.storage_tree returns a list of storage pools in the HW pool. For each pool, the :children hash element has a list of storage volumes, filtered to include only available volumes (and ones attached to the current VM for edit operations). For each storage volume, if it supports LVM, then it has a :children element with LVM volumes defined on it.
> 
> The hash includes fields showing which are available for use (:available) and which support creating new child volumes (currently iSCSI volumes, with NFS Pools soon to be added)
> 
> Signed-off-by: Scott Seago <sseago at redhat.com>
> ---
>  src/app/models/hardware_pool.rb        |    6 +++++
>  src/app/models/iscsi_storage_volume.rb |    6 +++++
>  src/app/models/storage_pool.rb         |   27 +++++++++++++++++++++++++
>  src/app/models/storage_volume.rb       |   34 ++++++++++++++++++++++++++++++++
>  4 files changed, 73 insertions(+), 0 deletions(-)
> 
> diff --git a/src/app/models/hardware_pool.rb b/src/app/models/hardware_pool.rb
> index 160f663..6780329 100644
> --- a/src/app/models/hardware_pool.rb
> +++ b/src/app/models/hardware_pool.rb
> @@ -101,4 +101,10 @@ class HardwarePool < Pool
>      return {:total => total, :labels => labels}
>    end
>  
> +  def storage_tree(vm_to_include=nil)
> +    storage_pools.find(:all,
> +                    :conditions => "type != 'LvmStoragePool'").collect do |pool|
> +      pool.storage_tree_element(vm_to_include)
> +    end
> +  end
>  end
> diff --git a/src/app/models/iscsi_storage_volume.rb b/src/app/models/iscsi_storage_volume.rb
> index b254cd8..00d7db2 100644
> --- a/src/app/models/iscsi_storage_volume.rb
> +++ b/src/app/models/iscsi_storage_volume.rb
> @@ -21,4 +21,10 @@ class IscsiStorageVolume < StorageVolume
>    def label_components
>      "#{storage_pool[:target]}:#{lun}"
>    end
> +
> +  #FIXME: should also take available free space into account
> +  def supports_lvm_subdivision
> +    return true
> +  end
> +
>  end
> diff --git a/src/app/models/storage_pool.rb b/src/app/models/storage_pool.rb
> index 7a6f8f0..aed2902 100644
> --- a/src/app/models/storage_pool.rb
> +++ b/src/app/models/storage_pool.rb
> @@ -28,6 +28,9 @@ class StoragePool < ActiveRecord::Base
>      def total_size_in_gb
>        find(:all).inject(0){ |sum, sv| sum + sv.size_in_gb }
>      end
> +    def full_vm_list
> +      find(:all).inject([]){ |list, sv| list + sv.vms }
> +    end
>    end
>  
>    has_many :smart_pool_tags, :as => :tagged, :dependent => :destroy
> @@ -73,4 +76,28 @@ class StoragePool < ActiveRecord::Base
>    def search_users
>      hardware_pool.search_users
>    end
> +
> +  def user_subdividable
> +    false
> +  end
> +
> +  def storage_tree_element(vm_to_include=nil)
> +    return_hash = { :id => id,
> +      :type => self[:type],
> +      :text => display_name,
> +      :name => display_name,
> +      :available => false,
> +      :create_volume => user_subdividable,
> +      :selected => false}
> +    condition = "vms.id is null"
> +    if (vm_to_include and vm_to_include.id)
> +      condition +=" or vms.id=#{vm_to_include.id}"
> +    end
> +    return_hash[:children] = storage_volumes.find(:all,
> +                               :include => :vms,
> +                               :conditions => condition).collect do |volume|
> +      volume.storage_tree_element(vm_to_include)
> +    end
> +    return_hash
> +  end
>  end
> diff --git a/src/app/models/storage_volume.rb b/src/app/models/storage_volume.rb
> index 378b58f..3bd5da0 100644
> --- a/src/app/models/storage_volume.rb
> +++ b/src/app/models/storage_volume.rb
> @@ -70,4 +70,38 @@ class StorageVolume < ActiveRecord::Base
>        return []
>      end
>    end
> +
> +  def supports_lvm_subdivision
> +    return false
> +  end
> +
> +  def storage_tree_element(vm_to_include=nil)
> +    vm_ids = vms.collect {|vm| vm.id}
> +    return_hash = { :id => id,
> +      :type => self[:type],
> +      :text => display_name,
> +      :name => display_name,
> +      :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,
> +      :selected => (!vm_ids.empty? and vm_to_include and vm_to_include.id and
> +                   (vm_ids.include?(vm_to_include.id)))}
> +    if lvm_storage_pool
> +      if return_hash[:available]
> +        return_hash[:available] = lvm_storage_pool.storage_volumes.full_vm_list.empty?
> +      end
> +      condition = "vms.id is null"
> +      if (vm_to_include and vm_to_include.id)
> +        condition +=" or vms.id=#{vm_to_include.id}"
> +      end
> +      return_hash[:children] = lvm_storage_pool.storage_volumes.find(:all,
> +                               :include => :vms,
> +                               :conditions => condition).collect do |volume|
> +        volume.storage_tree_element(vm_to_include)
> +      end
> +    end
> +    return_hash
> +  end
> +
>  end

ACK.  I have tested this out by manually creating some objects and
associations in the rails console.  calling storage_tree returns
expected results.  We can probably drop the :text attribute of the hash
(unneeded), but that can be altered at any time as we are tweaking the
json.

-j



From apevec at redhat.com  Mon Oct 20 20:05:11 2008
From: apevec at redhat.com (Alan Pevec)
Date: Mon, 20 Oct 2008 22:05:11 +0200
Subject: [Ovirt-devel] make ovirt-node-image.iso w/o its rpm
In-Reply-To: <20081020152233.GA10200@csdan>
References: <20081020152233.GA10200@csdan>
Message-ID: <48FCE477.3030002@redhat.com>

Dan Kenigsberg wrote:
> Also, moving logic from .spec to Makefile is generally a good thing that
> shortens dev cycles.
> Please review the following patch and consider applying something on
> these lines. I hope this is the place for such requests.

yes, that was on our TechnicalDebt TODO, thanks for doing it :)
> +SELINUX_ENFORCING=$(shell getenforce)
since we run build as non-root account, we need full path /usr/sbin/getenforce

> +iso: repos.ks
  +ovirt-node-image.iso: repos.ks

since we have known file output, it's better to use real target
otherwise, iso should be listed in .PHONY

> +		Enforcing) setenforce Permissive ;; \
need sudo /usr/sbin/setenforce Permissive

I'll git-send-email your patch now with those changes.



From apevec at redhat.com  Mon Oct 20 20:05:53 2008
From: apevec at redhat.com (Alan Pevec)
Date: Mon, 20 Oct 2008 22:05:53 +0200
Subject: [Ovirt-devel] [PATCH ovirt-node-image] Move iso-making code from
	spec to Makefile
In-Reply-To: <20081020152233.GA10200@csdan>
References: <20081020152233.GA10200@csdan>
Message-ID: <1224533153-18218-1-git-send-email-apevec@redhat.com>

From: Dan Kenigsberg <danken at qumranet.com>

Signed-off-by: Dan Kenigsberg <danken at redhat.com>
---
 Makefile.am              |   53 +++++++++++++++++++++++++++++++++++++
 ovirt-node-image.spec.in |   65 +--------------------------------------------
 2 files changed, 55 insertions(+), 63 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 17b26c0..37e52c6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,6 +47,59 @@ RPM_FLAGS	+= $(if $(FEDORA_URL),--define "fedora_url $(FEDORA_URL)")
 # OVIRT_URL env var can be set to the root of an ovirt.org mirror
 RPM_FLAGS	+= $(if $(OVIRT_URL),--define "ovirt_url $(OVIRT_URL)")
 
+FEDORA=$(shell rpm --eval '%{fedora}')
+ARCH=$(shell rpm --eval '%{_arch}')
+FEDORA_MIRROR=http://mirrors.fedoraproject.org/mirrorlist
+CUR_RAWHIDE=10
+OVIRT_URL=http://ovirt.org/repos/ovirt
+
+repos.ks:
+	( \
+	    if [ 0$(FEDORA) == 0$(CUR_RAWHIDE) ]; then \
+		FEDORA_REPO=rawhide ;\
+		FEDORA_REPO_LOC="$(if $(FEDORA_URL),--baseurl=$(FEDORA_URL)/development/$(ARCH)/os,--mirrorlist=$(FEDORA_MIRROR)?repo=rawhide&arch=$(ARCH))" ;\
+		OVIRT_DISTRO=development ;\
+	    else \
+		FEDORA_REPO=f$(FEDORA) ;\
+		FEDORA_REPO_LOC="$(if $(FEDORA_URL),--baseurl=$(FEDORA_URL)/releases/$(FEDORA)/Everything/${ARCH}/os,--mirrorlist=$(FEDORA_MIRROR)?repo=fedora-$(FEDORA)&arch=$(ARCH))" ;\
+		OVIRT_DISTRO=$(FEDORA) ;\
+		UPDATE_REPO_LINE="repo --name=$${FEDORA_REPO}-updates-newkey $(if $(FEDORA_URL),--baseurl=$(FEDORA_URL)/updates/$(FEDORA)/${ARCH}.newkey,--mirrorlist=$(FEDORA_MIRROR)?repo=updates-released-f$(FEDORA)&arch=$(ARCH))" ;\
+	    fi ;\
+	    echo "repo --name=$${FEDORA_REPO} $${FEDORA_REPO_LOC}" > $@ ;\
+	    echo "repo --name=ovirt-org --baseurl=$(OVIRT_URL)/$${OVIRT_DISTRO}/$(ARCH)" >> $@ ;\
+	    echo "$${UPDATE_REPO_LINE}" >> $@ ;\
+	    echo "repo --name=ovirt-local --baseurl=file://$(OVIRT_CACHE_DIR)/ovirt" >> $@ \
+	)
+
+SELINUX_ENFORCING=$(shell /usr/sbin/getenforce)
+ovirt-node-image.iso: repos.ks
+	mkdir -p $(OVIRT_CACHE_DIR)/node-image-tmp
+	mkdir -p $(OVIRT_CACHE_DIR)/yum
+	( \
+	    case $(SELINUX_ENFORCING) in \
+		Enforcing) sudo /usr/sbin/setenforce Permissive ;; \
+		Permissive) ;; \
+		 *) if ksflatten ovirt-image-node.ks 2>/dev/null \
+		      | grep -q '^selinux --disabled'; then \
+		      echo WARNING: SELinux disabled in kickstart ;\
+		    else \
+		      echo ERROR: SELinux enabled in kickstart, \
+			   but disabled on the build machine ;\
+		      exit 1 ;\
+		    fi ;; \
+	    esac ;\
+	)
+	sudo livecd-creator --skip-minimize -c ovirt-node-image.ks \
+	       -f ovirt-node-image \
+	       --tmpdir='$(OVIRT_CACHE_DIR)/node-image-tmp' \
+	       --cache='$(OVIRT_CACHE_DIR)/yum'
+	sudo chown $${USER} ovirt-node-image.iso
+	( \
+	    if [ $(SELINUX_ENFORCING) = Enforcing ]; then \
+	      sudo /usr/sbin/setenforce Enforcing || exit 1 ;\
+	    fi \
+	)
+
 rpms: dist
 	rpmbuild $(RPM_FLAGS) -ta $(distdir).tar.gz
 
diff --git a/ovirt-node-image.spec.in b/ovirt-node-image.spec.in
index 6f9ddac..6fb968f 100644
--- a/ovirt-node-image.spec.in
+++ b/ovirt-node-image.spec.in
@@ -1,8 +1,3 @@
-%{!?ovirt_cache_dir: %define ovirt_cache_dir /var/tmp/ovirt-cache}
-%{!?ovirt_local_repo: %define ovirt_local_repo file://%{ovirt_cache_dir}/ovirt}
-%{!?ovirt_url: %define ovirt_url http://ovirt.org/repos/ovirt}
-%define fedora_mirror http://mirrors.fedoraproject.org/mirrorlist
-
 Summary: oVirt Node ISO image
 Name: ovirt-node-image
 Version: @VERSION@
@@ -35,66 +30,10 @@ The PXE boot image for oVirt Node network boot from oVirt Server.
 
 %prep
 %setup -q
+./configure
 
 %build
-%if 0%{?fedora} == 010
- # XXX current rawhide
- %if "%{?fedora_url}" == ""
-cat > repos.ks << EOF
-repo --name=rawhide --mirrorlist=%{fedora_mirror}?repo=rawhide&arch=%{_arch}
-EOF
- %else
-cat > repos.ks << EOF
-repo --name=rawhide --baseurl=%{fedora_url}/development/%{_arch}/os
-EOF
- %endif
-cat >> repos.ks << EOF
-repo --name=ovirt-org --baseurl=%{ovirt_url}/development/%{_arch}
-EOF
-%else
- %if "%{?fedora_url}" == ""
-cat > repos.ks << EOF
-repo --name=f%{fedora} --mirrorlist=%{fedora_mirror}?repo=fedora-%{fedora}&arch=%{_arch}
-repo --name=f%{fedora}-updates-newkey --mirrorlist=%{fedora_mirror}?repo=updates-released-f%{fedora}.newkey&arch=%{_arch}
-EOF
- %else
-cat > repos.ks << EOF
-repo --name=f%{fedora} --baseurl=%{fedora_url}/releases/%{fedora}/Everything/%{_arch}/os
-repo --name=f%{fedora}-updates-newkey --baseurl=%{fedora_url}/updates/%{fedora}/%{_arch}.newkey
-EOF
- %endif
-cat >> repos.ks << EOF
-repo --name=ovirt-org --baseurl=%{ovirt_url}/%{fedora}/%{_arch}
-EOF
-%endif
-
-cat >> repos.ks << EOF
-repo --name=ovirt-local --baseurl=%{ovirt_local_repo}
-EOF
-
-mkdir -p %{ovirt_cache_dir}/node-image-tmp
-mkdir -p %{ovirt_cache_dir}/yum
-
-sudo su - -c "cd $(pwd) &&
-              enforcing=\$(getenforce)
-              case \$enforcing in
-                  Enforcing) setenforce Permissive ;;
-                  Permissive) ;;
-                   *) if ksflatten %{name}.ks 2>/dev/null \
-                        | grep -q '^selinux --disabled$'; then
-                        echo WARNING: SELinux disabled in kickstart
-                      else
-                        echo ERROR: SELinux enabled in kickstart, \
-                             but disabled on the build machine
-                        exit 1
-                      fi ;;
-              esac
-              livecd-creator --skip-minimize -c %{name}.ks -f %{name} \
-               --tmpdir='%{ovirt_cache_dir}/node-image-tmp' \
-               --cache='%{ovirt_cache_dir}/yum'
-              if [ \$enforcing = Enforcing ]; then
-                setenforce Enforcing || exit 1
-              fi"
+make ovirt-node-image.iso
 sudo su - -c "cd $(pwd) && ./ovirt-pxe %{name}.iso"
 sudo su - -c "cd $(pwd) && chown -R $USER ."
 
-- 
1.5.5.1



From vbian at redhat.com  Tue Oct 21 01:23:13 2008
From: vbian at redhat.com (Xuewei Bian)
Date: Tue, 21 Oct 2008 09:23:13 +0800
Subject: [Ovirt-devel] Ask for further help of the iscsi
Message-ID: <48FD2F01.3030801@redhat.com>


      What should I do to configure the iscsi server on the real box? 
Yesterday , we make the iscsi server configured successfully on the same 
box of the ovirt-appliance.So I want to know ,how to configure it on the 
other machine.Please provision more detail for me.Thanks a lot. :-)

      Vivian Bian



From arshad at binaryvm.com  Tue Oct 21 09:36:33 2008
From: arshad at binaryvm.com (arshad)
Date: Tue, 21 Oct 2008 15:06:33 +0530
Subject: [Ovirt-devel] unable to add hosts in web admin tool
In-Reply-To: <BAY124-DS4E897CE834376C4F5B74EB1360@phx.gbl>
References: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl><48F2F6C7.4020300@redfish-group.com>	<48F2FEEB.10705@redhat.com><48F3128A.7090800@redfish-group.com><BAY124-DS161312F67DDBCC590EC82B1360@phx.gbl><48F31680.1090807@redfish-group.com><BAY124-DS27D2BE7E3391FF9AFA4ABB1360@phx.gbl><48F31976.8090407@redfish-group.com>	<BAY124-DS5F85F366E0B6BCCB9A6EFB1360@phx.gbl>
	<BAY124-DS4E897CE834376C4F5B74EB1360@phx.gbl>
Message-ID: <48FDA2A1.2040305@binaryvm.com>

Hi,

developer-appliance download leads me to 0.91 release. Is there
any way i can download version 0.94 or maybe 0.93 for developer-appliance.

Secondly, while working with 0.91 ( developer-appliance ) ,
create-wui-appliance.sh -v successfully defines "developer". But
when i attempt to "ssh -Y root at 192.168.50.2 firefox", it throws
no route error.

Is there something i am missing.

Thanks.


xxqonline at hotmail.com wrote:
> Hello Justin:
> 
>      Why not have a try
> http://ovirt.org/download/ovirt-developer-appliance-0.91-1-x86_64.tar
> http://ovirt.org/download/ovirt-developer-appliance-0.91-1-i386.tar
> http://ovirt.org/download.html
> 
> Not the admin url is not 192.168.50.2, it is the eth0 ip of the admin vm.
> I said there are a lot of the error in their doc.
> 
> 
> 
> Regards,
> Qiang
> 
> --------------------------------------------------
> From: <xxqonline at hotmail.com>
> Sent: Monday, October 13, 2008 5:50 PM
> To: "Justin Clacherty" <justin at redfish-group.com>
> Cc: <ovirt-devel at redhat.com>
> Subject: Re: [Ovirt-devel] unable to add hosts in web admin tool
> 
>> The problem is I think the ovirt-appliance .img did not use the second 
>> nic.
>> But the developer.img used. I am not the red hat guy, I really think 
>> they need to improve doc.
>>
>> --------------------------------------------------
>> From: "Justin Clacherty" <justin at redfish-group.com>
>> Sent: Monday, October 13, 2008 5:48 PM
>> To: <xxqonline at hotmail.com>
>> Cc: "Alan Pevec" <apevec at redhat.com>; <ovirt-devel at redhat.com>
>> Subject: Re: [Ovirt-devel] unable to add hosts in web admin tool
>>
>>> xxqonline at hotmail.com wrote:
>>>> I think you may download a developer.img, it is in download page
>>>
>>> Wasn't the developer image just there to allow you to run nodes on 
>>> the management server instead of needing seperate hardware?
>>>
>>>>
>>>> BTW, I did not run ovirt-appliance successful.
>>>
>>> bummer.
>>>
>>>
>>
>> _______________________________________________
>> Ovirt-devel mailing list
>> Ovirt-devel at redhat.com
>> https://www.redhat.com/mailman/listinfo/ovirt-devel
>>
> 
> _______________________________________________
> Ovirt-devel mailing list
> Ovirt-devel at redhat.com
> https://www.redhat.com/mailman/listinfo/ovirt-devel
> 



From apevec at redhat.com  Tue Oct 21 09:49:57 2008
From: apevec at redhat.com (Alan Pevec)
Date: Tue, 21 Oct 2008 11:49:57 +0200
Subject: [Ovirt-devel] Re: Ask for further help of the iscsi
In-Reply-To: <48FD2F01.3030801@redhat.com>
References: <48FD2F01.3030801@redhat.com>
Message-ID: <48FDA5C5.6020001@redhat.com>

Xuewei Bian wrote:
> 
>      What should I do to configure the iscsi server on the real box? 
> Yesterday , we make the iscsi server configured successfully on the same 
> box of the ovirt-appliance.So I want to know ,how to configure it on the 
> other machine.Please provision more detail for me.Thanks a lot. :-)
> 
>      Vivian Bian

I've been trying to reproduce your issue and I think you've hit the issue with hardcoded SCSI serial# in tgtd: it's hardcoded to beaf+ID+LUN
see http://git.kernel.org/?p=linux/kernel/git/tomo/tgt.git;a=blob;f=usr/spc.c;h=ac5c3deacd14e94e15d9b0fcf136bd85b9362ed7;hb=HEAD#l1033

This makes udev create the same /dev/disk/by-id/scsi-S_beaf11 path so your iscsi target conflicts with iscsi provided by the appliance.

Workaround is to set tgtadm --tid value to something different, I'll also move iscsi target defined in the appliance to the max id available, to reduce the possibility of collision.



From jdong at redhat.com  Tue Oct 21 09:50:04 2008
From: jdong at redhat.com (Jia Dong)
Date: Tue, 21 Oct 2008 17:50:04 +0800
Subject: [Ovirt-devel] unable to add hosts in web admin tool
In-Reply-To: <48FDA2A1.2040305@binaryvm.com>
References: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl><48F2F6C7.4020300@redfish-group.com>	<48F2FEEB.10705@redhat.com><48F3128A.7090800@redfish-group.com><BAY124-DS161312F67DDBCC590EC82B1360@phx.gbl><48F31680.1090807@redfish-group.com><BAY124-DS27D2BE7E3391FF9AFA4ABB1360@phx.gbl><48F31976.8090407@redfish-group.com>	<BAY124-DS5F85F366E0B6BCCB9A6EFB1360@phx.gbl>	<BAY124-DS4E897CE834376C4F5B74EB1360@phx.gbl>
	<48FDA2A1.2040305@binaryvm.com>
Message-ID: <48FDA5CC.4090104@redhat.com>

arshad wrote:
> Hi,
>
> developer-appliance download leads me to 0.91 release. Is there
> any way i can download version 0.94 or maybe 0.93 for 
> developer-appliance.
>
> Secondly, while working with 0.91 ( developer-appliance ) ,
> create-wui-appliance.sh -v successfully defines "developer". But
> when i attempt to "ssh -Y root at 192.168.50.2 firefox", it throws
> no route error.
>
> Is there something i am missing.
>
> Thanks.
>
Hi arshad,
  Ovirt-appliance is a merged appliance. It is merged from developer and 
bundle.
  FYI: https://www.redhat.com/archives/ovirt-devel/2008-July/msg00024.html
  Some bug  exists in lower version.You can get latest ovirt-appliance 
from ovirt.org.For further more help,you can wait for some instructions 
from authority who is a member of ovirt team.
  Just for your information.
  Hope this helps. :-)

Nikki



From arshad at binaryvm.com  Tue Oct 21 10:02:28 2008
From: arshad at binaryvm.com (arshad)
Date: Tue, 21 Oct 2008 15:32:28 +0530
Subject: [Ovirt-devel] unable to add hosts in web admin tool
In-Reply-To: <48FDA5CC.4090104@redhat.com>
References: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl><48F2F6C7.4020300@redfish-group.com>	<48F2FEEB.10705@redhat.com><48F3128A.7090800@redfish-group.com><BAY124-DS161312F67DDBCC590EC82B1360@phx.gbl><48F31680.1090807@redfish-group.com><BAY124-DS27D2BE7E3391FF9AFA4ABB1360@phx.gbl><48F31976.8090407@redfish-group.com>	<BAY124-DS5F85F366E0B6BCCB9A6EFB1360@phx.gbl>	<BAY124-DS4E897CE834376C4F5B74EB1360@phx.gbl>
	<48FDA2A1.2040305@binaryvm.com> <48FDA5CC.4090104@redhat.com>
Message-ID: <48FDA8B4.40407@binaryvm.com>

Thanks very much for a quick reply.

Arshad.

Jia Dong wrote:
> arshad wrote:
>> Hi,
>>
>> developer-appliance download leads me to 0.91 release. Is there
>> any way i can download version 0.94 or maybe 0.93 for 
>> developer-appliance.
>>
>> Secondly, while working with 0.91 ( developer-appliance ) ,
>> create-wui-appliance.sh -v successfully defines "developer". But
>> when i attempt to "ssh -Y root at 192.168.50.2 firefox", it throws
>> no route error.
>>
>> Is there something i am missing.
>>
>> Thanks.
>>
> Hi arshad,
>  Ovirt-appliance is a merged appliance. It is merged from developer and 
> bundle.
>  FYI: https://www.redhat.com/archives/ovirt-devel/2008-July/msg00024.html
>  Some bug  exists in lower version.You can get latest ovirt-appliance 
> from ovirt.org.For further more help,you can wait for some instructions 
> from authority who is a member of ovirt team.
>  Just for your information.
>  Hope this helps. :-)
> 
> Nikki
> 



From apevec at redhat.com  Tue Oct 21 13:34:04 2008
From: apevec at redhat.com (Alan Pevec)
Date: Tue, 21 Oct 2008 15:34:04 +0200
Subject: [Ovirt-devel] [PATCH] change iscsi target id to something else than
	1
Message-ID: <1224596044-22306-1-git-send-email-apevec@redhat.com>

to avoid serial# collision, see
http://git.kernel.org/?p=linux/kernel/git/tomo/tgt.git;a=blob;f=usr/spc.c;h=ac5c3deacd14e94e15d9b0fcf136bd85b9362ed7;hb=HEAD#l1033

Signed-off-by: Alan Pevec <apevec at redhat.com>
---
 appliances/ovirt/files/ovirt-server-appliance |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/appliances/ovirt/files/ovirt-server-appliance b/appliances/ovirt/files/ovirt-server-appliance
index 778d0ce..e7ba7bd 100644
--- a/appliances/ovirt/files/ovirt-server-appliance
+++ b/appliances/ovirt/files/ovirt-server-appliance
@@ -8,6 +8,7 @@
 
 # Source functions library
 . /etc/init.d/functions
+TARGET_ID=32101
 
 start() {
     echo -n "Starting ovirt-server-appliance: "
@@ -27,23 +28,23 @@ start() {
         -R --local /priv.ovirt.org/ --server 192.168.122.1
 
     # Set up the fake iscsi target
-    tgtadm --lld iscsi --op new --mode target --tid 1 \
+    tgtadm --lld iscsi --op new --mode target --tid $TARGET_ID \
         -T ovirtpriv:storage
 
     #
     # Now associate them to the LVs
     #
-    tgtadm --lld iscsi --op new --mode logicalunit --tid 1 \
+    tgtadm --lld iscsi --op new --mode logicalunit --tid $TARGET_ID \
         --lun 1 -b /ovirtiscsi/iSCSI3
-    tgtadm --lld iscsi --op new --mode logicalunit --tid 1 \
+    tgtadm --lld iscsi --op new --mode logicalunit --tid $TARGET_ID \
         --lun 2 -b /ovirtiscsi/iSCSI4
-    tgtadm --lld iscsi --op new --mode logicalunit --tid 1 \
+    tgtadm --lld iscsi --op new --mode logicalunit --tid $TARGET_ID \
         --lun 3 -b /ovirtiscsi/iSCSI5
 
     #
     # Now make them available
     #
-    tgtadm --lld iscsi --op bind --mode target --tid 1 -I ALL
+    tgtadm --lld iscsi --op bind --mode target --tid $TARGET_ID -I ALL
 
     echo_success
     echo
@@ -53,15 +54,15 @@ stop() {
     echo -n "Stopping ovirt-server-appliance: "
 
     # stop access to the iscsi target
-    tgtadm --lld iscsi --op unbind --mode target --tid 1 -I ALL
+    tgtadm --lld iscsi --op unbind --mode target --tid $TARGET_ID -I ALL
 
     # unbind the LUNs
-    tgtadm --lld iscsi --op delete --mode logicalunit --tid 1 --lun 3
-    tgtadm --lld iscsi --op delete --mode logicalunit --tid 1 --lun 2
-    tgtadm --lld iscsi --op delete --mode logicalunit --tid 1 --lun 1
+    tgtadm --lld iscsi --op delete --mode logicalunit --tid $TARGET_ID --lun 3
+    tgtadm --lld iscsi --op delete --mode logicalunit --tid $TARGET_ID --lun 2
+    tgtadm --lld iscsi --op delete --mode logicalunit --tid $TARGET_ID --lun 1
 
     # shutdown the target
-    tgtadm --lld iscsi --op delete --mode target --tid 1
+    tgtadm --lld iscsi --op delete --mode target --tid $TARGET_ID
 
     kill $(cat /var/run/dnsmasq.pid)
 
-- 
1.5.5.1



From clalance at redhat.com  Tue Oct 21 14:01:03 2008
From: clalance at redhat.com (Chris Lalancette)
Date: Tue, 21 Oct 2008 16:01:03 +0200
Subject: [Ovirt-devel] [PATCH] change iscsi target id to something else
	than	1
In-Reply-To: <1224596044-22306-1-git-send-email-apevec@redhat.com>
References: <1224596044-22306-1-git-send-email-apevec@redhat.com>
Message-ID: <48FDE09F.4040908@redhat.com>

Alan Pevec wrote:
> to avoid serial# collision, see 
> http://git.kernel.org/?p=linux/kernel/git/tomo/tgt.git;a=blob;f=usr/spc.c;h=ac5c3deacd14e94e15d9b0fcf136bd85b9362ed7;hb=HEAD#l1033

I could have sworn tgtd use to do something sane here, but I could be wrong.  In
any case, this should eliminate a common collision where people use TID 1, and
collide with us.  If people use two external tgtd target's with TID 1, there's
nothing we can do at the moment; they are going to collide.  But at least this
is a little bit better.

ACK

Chris Lalancette



From dpierce at redhat.com  Tue Oct 21 14:09:31 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Tue, 21 Oct 2008 10:09:31 -0400
Subject: [Ovirt-devel] Re: [PATCH node] Updated the configuration processing
 to remove the need for scripts.
In-Reply-To: <1224527170-13867-1-git-send-email-dpierce@redhat.com>
References: <1224527170-13867-1-git-send-email-dpierce@redhat.com>
Message-ID: <48FDE29B.7000205@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Darryl L. Pierce wrote:
> The system now takes an encoded configuration descriptor from the server. It
> then parses from that a set of aliases for bondings if such exist. It then
> also extracts configuration details for the various network interfaces on the
> node. Afterward, it reloads module dependencies and then restarts the
> networking service.
> 
> This patch also includes updated rdocs for the configuration generator.

Can I get an ACK or feedback on this and the related server patch?

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkj94pcACgkQjaT4DmxOfxvv2ACgou1IYldUAq46W27OeRcC4OUx
UpMAoPWBDBRsCRGpkGNbA1eaLjSW/PMs
=nbOH
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081021/81bacee2/attachment.vcf>

From dpierce at redhat.com  Tue Oct 21 14:10:35 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Tue, 21 Oct 2008 10:10:35 -0400
Subject: [Ovirt-devel] Re: [PATCH server] Replaced the config scripts with
 configuration encoding.
In-Reply-To: <1224527121-13802-1-git-send-email-dpierce@redhat.com>
References: <1224527121-13802-1-git-send-email-dpierce@redhat.com>
Message-ID: <48FDE2DB.3000605@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Darryl L. Pierce wrote:
> Rather than sending the node a series of scripts that load
> kernel modules, or are tightly coupled to tools like augeas,
> this patch introduces an encoding scheme for data.
> 
> A line that begins with "bonding" describes a bonded interface.
> From it the configuration processor generates a simple bonding
> file that includes an alias for the bonding kernel module
> 
> A line that begins with "ifcfg" describes an network
> interface. It will contain the mac address and interface name,
> followed by all needed configuration values to bring the
> interface up.

Jim/DanP: Can you review and ACK or give feedback on this and the node
patch?

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkj94tQACgkQjaT4DmxOfxvstQCfXkk582N4rpFT6LGeFJ1Fm6rf
dXcAoN1CFeEdHpO+Lq/twrPb46KbjxDf
=SiRD
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081021/133c6677/attachment.vcf>

From dpierce at redhat.com  Tue Oct 21 17:22:46 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Tue, 21 Oct 2008 13:22:46 -0400
Subject: [Ovirt-devel] [PATCH node] Updated the configuration processing to
	remove the need for scripts.
Message-ID: <1224609766-24650-1-git-send-email-dpierce@redhat.com>

The system now takes an encoded configuration descriptor from the server. It
then parses from that a set of aliases for bondings if such exist. It then
also extracts configuration details for the various network interfaces on the
node. Afterward, it reloads module dependencies and then restarts the
networking service.

This patch also includes updated rdocs for the configuration generator.
---
 Makefile.am                  |    1 +
 ovirt-node.spec.in           |    2 +
 scripts/ovirt-early          |   14 +++------
 scripts/ovirt-process-config |   59 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 67 insertions(+), 9 deletions(-)
 create mode 100755 scripts/ovirt-process-config

diff --git a/Makefile.am b/Makefile.am
index 1d63310..c55db13 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,6 +30,7 @@ EXTRA_DIST =			\
   scripts/ovirt-early		\
   scripts/ovirt-functions	\
   scripts/ovirt-post		\
+  scripts/ovirt-process-config  \
   logrotate/ovirt-logrotate	\
   logrotate/ovirt-logrotate.conf
 
diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index c5c836b..912192e 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -87,6 +87,7 @@ cd -
 %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/logrotate.d
 
 %{__install} -p -m0755 scripts/ovirt-awake %{buildroot}%{_sbindir}
+%{__install} -p -m0755 scripts/ovirt-process-config %{buildroot}%{_sbindir}
 %{__install} -p -m0755 ovirt-identify-node/ovirt-identify-node %{buildroot}%{_sbindir}
 %{__install} -p -m0755 ovirt-listen-awake/ovirt-listen-awake %{buildroot}%{_sbindir}
 %{__install} -Dp -m0755 ovirt-listen-awake/ovirt-listen-awake.init %{buildroot}%{_initrddir}/ovirt-listen-awake
@@ -158,6 +159,7 @@ fi
 %files
 %defattr(-,root,root,0755)
 %{_sbindir}/ovirt-awake
+%{_sbindir}/ovirt-process-config
 %{_sbindir}/ovirt-identify-node
 %{_sbindir}/ovirt-listen-awake
 %{_sbindir}/ovirt-install-node
diff --git a/scripts/ovirt-early b/scripts/ovirt-early
index 4723426..3c8c494 100755
--- a/scripts/ovirt-early
+++ b/scripts/ovirt-early
@@ -12,6 +12,8 @@
 
 # size of the oVirt partition in megabytes
 OVIRT_SIZE=64
+BONDING_MODCONF_FILE=/etc/modprobe.d/bonding
+AUGTOOL_CONFIG=/var/tmp/augtool-config
 
 get_mac_addresses() {
     macs=$(ifconfig | awk '/HWaddr/ { print $5"="$1 }' \
@@ -43,16 +45,10 @@ configure_from_network() {
                       "http://$SRV_HOST:$SRV_PORT/ovirt/managed_node/config?host=$(hostname)&macs=$macs"
                     if [ $? -eq 0 ]; then
                         echo "Remote configuration bundle retrieved to $cfgdb"
-                        bash $cfgdb
-                        if [ -f /var/tmp/pre-config-script ]; then
-                            echo "Loading kernel modules"
-                            bash /var/tmp/pre-config-script \
-                                && echo "Kernel modules loaded" \
-                                || echo "Failed loading kernel modules"
-                        fi
-                        if [ -f /var/tmp/node-augtool ]; then
+                        ovirt-process-config $cfgdb $BONDING_MODCONF_FILE $AUGTOOL_CONFIG
+                        if [ -f $AUGTOOL_CONFIG ]; then
                             echo "Loading remote config"
-                            augtool < /var/tmp/node-augtool \
+                            augtool < $AUGTOOL_CONFIG \
                                 && echo "Remote config applied" \
                                 || echo "Failed applying remote config"
                         fi
diff --git a/scripts/ovirt-process-config b/scripts/ovirt-process-config
new file mode 100755
index 0000000..5698100
--- /dev/null
+++ b/scripts/ovirt-process-config
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+ME=$(basename "$0")
+warn() { printf '%s: %s\n' "$ME" "$*" >&2; }
+try_h() { printf "Try \`$ME -h' for more information.\n" >&2; exit 1;}
+try_help() { printf "Usage: \`$ME [config] [module output] [config output]\n" >&2; exit 1;}
+
+case $# in
+  0|1|2) warn "too few arguments"; try_help;;
+  3) ;;
+  *) warn "too many arguments"; try_help;;
+esac
+
+CONFIG=$1
+OVIRT_KERNEL_MODULE_FILE=$2
+OVIRT_CONFIG_OUTPUT_FILE=$3
+
+modconf=$(awk '/bonding=/ {
+        match($0, "^[ \t]*bonding=(.*)", data)
+
+        if (match("[^[:alnum:]=_ at -]", data[1]) >= 0) {
+            printf "invalid bonding alias: \"%s\"\n", data[1];
+            exit 1;
+        }
+
+        alias=data[1]
+
+        printf("install %s bonding", alias)
+    }' $CONFIG)
+
+echo "$modconf" > $OVIRT_KERNEL_MODULE_FILE
+
+networking=$(awk '/ifcfg=/ {
+    match($0, "^[ \t]*ifcfg=(.*)", data)
+    split(data[1], ifcfg, "|")
+
+    mac = ifcfg[1]
+    iface = ifcfg[2]
+    ifcfg_dir = "/files/etc/sysconfig/network-scripts"
+
+    printf("rm %s/ifcfg-%s\n", ifcfg_dir, iface)
+    printf("set %s/ifcfg-%s/DEVICE %s\n", ifcfg_dir, iface, iface)
+
+    for (line in ifcfg) {
+        if(line > 2) {
+            match(ifcfg[line], "(^[^=]+)=(.*)", values)
+            field=values[1]
+            value=values[2]
+
+            printf("set %s/ifcfg-%s/%s %s\n", ifcfg_dir, iface, field, value)
+        }
+    }
+
+
+    printf("save\n")
+
+}' $CONFIG)
+
+echo "$networking" > $OVIRT_CONFIG_OUTPUT_FILE
-- 
1.5.5.1



From pmyers at redhat.com  Tue Oct 21 17:46:36 2008
From: pmyers at redhat.com (Perry Myers)
Date: Tue, 21 Oct 2008 13:46:36 -0400
Subject: [Ovirt-devel] Re: Something puzzled about the ovirt
In-Reply-To: <48F5C628.4060909@redhat.com>
References: <48F5C628.4060909@redhat.com>
Message-ID: <48FE157C.3030405@redhat.com>

vbian wrote:
> Hi,Pmyers:
> In the reply of the bug #466220,you wrote,that we should do the test 
> ,"using the real nodes(ovirt node running on physical hardware) or VMs 
> running directly on the Appliance Host."
> But the node 3-5  are the fake nodes.
> =>So:
> 1.How can we get the ovirt node? Maybe how to create the node exactly.

Physical nodes are created by PXE booting real hardware on the same LAN as 
the oVirt Appliance.  If you are running the appliance on a physical 
machine it needs to have a network card bridged to a network with only 
oVirt machines on it.  You would use the create-ovirt-appliance script 
like this:

create-ovirt-appliance -e eth1

(Assuming that eth1 is the network interface that you want to bridge)

Then you just boot the other hosts on that network after configuring them 
to PXE and you're set.

> 2.And at the same time, the VMs running directly on the Appliance Host 
> are the Virtual Machines created in the ovirt UI? In that case, I can't 
> make a vm run successfully by now.What should I do?

On the physical host running the appliance, did you run the following command:
ovirt-install-node stateful

This sets up the physical host to be an ovirt-node that you can create 
virtual machines on.  This works in version 0.93 and above.

If this is done correctly you should see a host named:
physical.priv.ovirt.org
in the hosts tab in the default hardware pool.

If you don't see this Node there, send me more details (logs preferably) 
that I can take a look at.

> 3.About the nfs: by now, I can get the only nfs service in the Appliance 
> Host,and I wonder what is the function of the disk1-3.dsk files. What's 
> more ,the configuration of the nfs in ovirt-appliance is not the same as 
> the configuration in real physical host.
>    =>How could I configure another nfs in ovirt?

Just run a Fedora box on the oVirt network that you've bridged over eth1 
(or whatever interface your bridge is) and configure an NFS export on that 
host.  You'll need to create empty disk images in the new NFS share using 
the qemu-img command line tool.

You can also run an NFS server on the physical host running the appliance. 
  Just make sure that the firewall is configured to allow NFS through it, 
or make sure that ovirtbr0 is a trusted interface using the following command:
lokkit -t ovirtbr0 (0.94 release should do this by default)

In this case, the NFS server IP address would be 192.168.50.1 and the 
share name is whatever you put into /etc/exports.

> 4.I want to get the further information about the ovirtbr0 
> (192.168.50.1) and the virbr0 (192.168.122.1).Whether the ovirtbr0 is 
> the bridge between the VM host and the physical host,but the VMs 
> couldn't access the outside world via the ovirtbr0,and they access the 
> outside world via the virbr0?

Yes, VMs can access the outside world via virbr0.  That is why the default 
gateway on the oVirt network is 192.168.50.2.  This way the appliance acts 
like a router passing all external traffic through virbr0 to the outside 
world.

ovirtbr0 does not have NAT or routing set up for it, so it does not route 
to the outside world.  (This could be changed by adding some iptables 
rules to the host though)

> 5.Today,you brought us a good news that the Windows could be installed 
> in the ovirt VM, I wonder how can you accomplish that?

I used the .94 version which was just released and did the following:
1. Installed the appliance and ovirt-node RPMs on the physical host
2. # ovirt-install-node stateful
3. # create-ovirt-appliance
4. Boot the appliance.  This allows the physical host node to get a
    kerberos keytab.
5. Shut down the appliance and virsh destroy it
6. # service libvirtd restart (so libvirt loads the keytab from step 4)
7. Boot the appliance
8. Set up an NFS share on the physical host like this:
    a. # mkdir -p /ovirtisos
    b. added this to /etc/exports
       /ovirtisos		*(rw,no_root_squash,sync)
    c. # chkconfig nfsd on ; service nfsd restart
9. Copy a Windows XP install ISO to /ovirtisos/winxp.iso
10. In the oVirt WUI, added a new storage pool with the following info:
     ip address: 192.168.50.1
     path: /ovirtisos
11. Create a cobbler profile for the ISO image on the appliance:
     # cobbler image add --name=WinXP \
	--file=management.priv.ovirt.org:/ovirtisos/winxp.iso
12. Create a new vm pool and then in the vm pool create a new vm and
     select WinXP as the provisioning type.

That should work, if you run into any problems, let me know.

Thanks,

Perry



From jim at meyering.net  Tue Oct 21 18:05:29 2008
From: jim at meyering.net (Jim Meyering)
Date: Tue, 21 Oct 2008 20:05:29 +0200
Subject: [Ovirt-devel] [PATCH node] Updated the configuration processing
	to remove the need for scripts.
In-Reply-To: <1224527170-13867-1-git-send-email-dpierce@redhat.com> (Darryl
	L. Pierce's message of "Mon, 20 Oct 2008 14:26:10 -0400")
References: <1224527170-13867-1-git-send-email-dpierce@redhat.com>
Message-ID: <87r669x1qu.fsf@rho.meyering.net>

"Darryl L. Pierce" <dpierce at redhat.com> wrote:
...

Hi Darryl,

Here's a nit about warn, and a fix for one more problem.
Sorry I didn't spot the latter sooner.

> diff --git a/scripts/ovirt-process-config b/scripts/ovirt-process-config
> new file mode 100755
> index 0000000..83a3eb3
> --- /dev/null
> +++ b/scripts/ovirt-process-config
> @@ -0,0 +1,59 @@
> +#!/bin/bash
> +
> +ME=$(basename "$0")
> +warn() { printf "$ME: $@\n" >&2; }

That definition of warn in obsolete and slightly buggy.
Please use this one instead:

  warn() { printf '%s: %s\n' "$ME" "$*" >&2; }

Yes, we *will* factor these out, if only to avoid
having to review them over and over again.

> +try_h() { printf "Try \`$ME -h' for more information.\n" >&2; exit 1;}
> +try_help() { printf "Usage: \`$ME [config] [module output] [config output]\n" >&2; exit 1;}
> +
> +case $# in
> +  0|1|2) warn "too few arguments"; try_help;;
> +  3) ;;
> +  *) warn "too many arguments"; try_help;;
> +esac
> +
> +CONFIG=$1
> +OVIRT_KERNEL_MODULE_FILE=$2
> +OVIRT_CONFIG_OUTPUT_FILE=$3
> +
> +modconf=$(awk '/bonding=/ {
> +        match($0, "^[ \t]*bonding=(.*)", data)

Please match the same regexp in those two cases.
Otherwise, a commented out (or something like foobonding=...) line
will cause this script to emit invalid output.

   modconf=$(awk '/^[ \t]*bonding=.+/ {
           match($0, "^[ \t]*bonding=(.+)", data)

Also, note that I changed the "*" to a "+", so that an
empty RHS will not match.

> +
> +        if (match("[^[:alnum:]=_ at -]", data[1]) >= 0) {
> +            printf "invalid bonding alias: \"%s\"\n", data[1];
> +            exit 1;
> +        }
> +
> +        alias=data[1]
> +
> +        printf("install %s bonding", alias)
> +    }' $CONFIG)
> +
> +echo "$modconf" > $OVIRT_KERNEL_MODULE_FILE
> +
> +networking=$(awk '/ifcfg=/ {
> +    match($0, "^[ \t]*ifcfg=(.*)", data)

Please do the same here.

> +    split(data[1], ifcfg, "|")
> +
> +    mac = ifcfg[1]
> +    iface = ifcfg[2]
> +    ifcfg_dir = "/files/etc/sysconfig/network-scripts"
> +
> +    printf("rm %s/ifcfg-%s\n", ifcfg_dir, iface)
> +    printf("set %s/ifcfg-%s/DEVICE %s\n", ifcfg_dir, iface, iface)
> +
> +    for (line in ifcfg) {
> +        if(line > 2) {
> +            match(ifcfg[line], "(^[^=]+)=(.*)", values)
> +            field=values[1]
> +            value=values[2]
> +
> +            printf("set %s/ifcfg-%s/%s %s\n", ifcfg_dir, iface, field, value)
> +        }
> +    }
> +
> +
> +    printf("save\n")
> +
> +}' $CONFIG)
> +
> +echo "$networking" > $OVIRT_CONFIG_OUTPUT_FILE



From jguiditt at redhat.com  Tue Oct 21 18:29:43 2008
From: jguiditt at redhat.com (Jason Guiditta)
Date: Tue, 21 Oct 2008 14:29:43 -0400
Subject: [Ovirt-devel] localization in rails
Message-ID: <1224613783.30551.10.camel@localhost.localdomain>

I just came across this article about native i18n support coming in
rails 2.2, so this should make it easier for us to add i18n in future
releases.  The included gem will be the 'Simple' backend, but you can
use/write others via (for example) I18n.backend =
I18n::Backend::Gettext.  Default setup looks pretty easy, similar to
property file bundles in the java world, but in hash format.

http://almosteffortless.com/2008/07/21/simple-localization-in-rails-22/



From bkahn at redhat.com  Tue Oct 21 18:43:36 2008
From: bkahn at redhat.com (Benjamin Kahn)
Date: Tue, 21 Oct 2008 14:43:36 -0400
Subject: [Ovirt-devel] localization in rails
In-Reply-To: <1224613783.30551.10.camel@localhost.localdomain>
References: <1224613783.30551.10.camel@localhost.localdomain>
Message-ID: <1224614616.10225.14.camel@localhost.localdomain>

On Tue, 2008-10-21 at 14:29 -0400, Jason Guiditta wrote:
> I just came across this article about native i18n support coming in
> rails 2.2, so this should make it easier for us to add i18n in future
> releases.  The included gem will be the 'Simple' backend, but you can
> use/write others via (for example) I18n.backend =
> I18n::Backend::Gettext.  Default setup looks pretty easy, similar to
> property file bundles in the java world, but in hash format.

> http://almosteffortless.com/2008/07/21/simple-localization-in-rails-22/

I'd be interested in knowing what the i18n team thinks about this.  Why
not use gettext?

http://manuals.rubyonrails.com/read/chapter/105 

or, because that site appears to be down:
http://74.125.95.104/search?q=cache:d1wHw7KeJq8J:manuals.rubyonrails.com/read/chapter/105+rails+gettext
-- 
Benjamin Kahn <xkahn at redhat.com> 
Program Manager (978) 392 - 3176



From jguiditt at redhat.com  Tue Oct 21 20:05:46 2008
From: jguiditt at redhat.com (Jason Guiditta)
Date: Tue, 21 Oct 2008 16:05:46 -0400
Subject: [Ovirt-devel] localization in rails
In-Reply-To: <1224614616.10225.14.camel@localhost.localdomain>
References: <1224613783.30551.10.camel@localhost.localdomain>
	<1224614616.10225.14.camel@localhost.localdomain>
Message-ID: <1224619546.30551.14.camel@localhost.localdomain>

On Tue, 2008-10-21 at 14:43 -0400, Benjamin Kahn wrote:
> On Tue, 2008-10-21 at 14:29 -0400, Jason Guiditta wrote:
> > I just came across this article about native i18n support coming in
> > rails 2.2, so this should make it easier for us to add i18n in future
> > releases.  The included gem will be the 'Simple' backend, but you can
> > use/write others via (for example) I18n.backend =
> > I18n::Backend::Gettext.  Default setup looks pretty easy, similar to
> > property file bundles in the java world, but in hash format.
> 
> > http://almosteffortless.com/2008/07/21/simple-localization-in-rails-22/
> 
> I'd be interested in knowing what the i18n team thinks about this.  Why
> not use gettext?
> 
> http://manuals.rubyonrails.com/read/chapter/105 
> 
> or, because that site appears to be down:
> http://74.125.95.104/search?q=cache:d1wHw7KeJq8J:manuals.rubyonrails.com/read/chapter/105+rails+gettext

As I mentioned, you can use gettext or whatever else you want to plug in
as the backend.  They are shipping a default one to get people started,
but the main point of what they are trying to do is provide easier
access to i18n solutions from rails, which has always been a weak spot.
Basically they are providing a core api to allow you to call multiple
backends as needed, described here:
http://www.artweb-design.de/2008/7/18/finally-ruby-on-rails-gets-internationalized



From mmorsi at redhat.com  Tue Oct 21 20:54:30 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Tue, 21 Oct 2008 16:54:30 -0400
Subject: [Ovirt-devel] [PATCH server] Introduces a new IP address model.
	Moves IP addressing to a separate
In-Reply-To: <1224277864-13419-1-git-send-email-dpierce@redhat.com>
References: <1224277864-13419-1-git-send-email-dpierce@redhat.com>
Message-ID: <48FE4186.3080407@redhat.com>

NACK. Applies nicely (albeit with whitespace complaints) and everything
seems to work with a few caveats as described below / inline.

Darryl L. Pierce wrote:
> You will need to run a migration after this patch to create the
> ip_addresses table and massage the bondings and nics tables to
> reference it.
>
> NEW CLASSES:
>
> IpAddress:   base class for addresses
> IpV4Address: represents an IPv4 address
> IpV6Address: represents an IPv6 address
>
> Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
> ---
>  src/app/models/bonding.rb                          |    1 +
>  src/app/models/ip_address.rb                       |   25 +++++
>  src/app/models/ip_v4_address.rb                    |   46 +++++++++
>  src/app/models/ip_v6_address.rb                    |   40 ++++++++
>  src/app/models/nic.rb                              |    2 +
>  src/db/migrate/025_create_ip_addresses.rb          |   46 +++++++++
>   
It seems since you've sent this out, migration 025 has been committed,
so you'll need to start at 026

>  ...026_move_nic_addresses_to_ip_addresses_table.rb |   56 +++++++++++
>  ...7_move_bonding_address_to_ip_addresses_table.rb |   54 +++++++++++
>  src/host-browser/host-browser.rb                   |   17 ++--
>  src/lib/managed_node_configuration.rb              |    8 +-
>  src/test/fixtures/bondings.yml                     |    4 +-
>  src/test/fixtures/ip_addresses.yml                 |   55 +++++++++++
>  src/test/fixtures/nics.yml                         |   82 ++++++++--------
>  .../functional/managed_node_configuration_test.rb  |   26 +++---
>  src/test/unit/ip_address_test.rb                   |    8 ++
>  src/test/unit/ip_v4_address_test.rb                |   99 ++++++++++++++++++++
>  src/test/unit/ip_v6_address_test.rb                |   82 ++++++++++++++++
>  src/test/unit/nic_test.rb                          |    1 +
>  18 files changed, 584 insertions(+), 68 deletions(-)
>  create mode 100644 src/app/models/ip_address.rb
>  create mode 100644 src/app/models/ip_v4_address.rb
>  create mode 100644 src/app/models/ip_v6_address.rb
>  create mode 100644 src/db/migrate/025_create_ip_addresses.rb
>  create mode 100644 src/db/migrate/026_move_nic_addresses_to_ip_addresses_table.rb
>  create mode 100644 src/db/migrate/027_move_bonding_address_to_ip_addresses_table.rb
>  create mode 100644 src/test/fixtures/ip_addresses.yml
>  create mode 100644 src/test/unit/ip_address_test.rb
>  create mode 100644 src/test/unit/ip_v4_address_test.rb
>  create mode 100644 src/test/unit/ip_v6_address_test.rb
>
> diff --git a/src/app/models/bonding.rb b/src/app/models/bonding.rb
> index 006c261..2fa4aa8 100644
> --- a/src/app/models/bonding.rb
> +++ b/src/app/models/bonding.rb
> @@ -51,6 +51,7 @@ class Bonding < ActiveRecord::Base
>    belongs_to :host
>    belongs_to :bonding_type
>    belongs_to :boot_type
> +  belongs_to :ip_address
>  
>    has_and_belongs_to_many :nics,
>      :join_table  => 'bondings_nics',
> diff --git a/src/app/models/ip_address.rb b/src/app/models/ip_address.rb
> new file mode 100644
> index 0000000..f48cd4e
> --- /dev/null
> +++ b/src/app/models/ip_address.rb
> @@ -0,0 +1,25 @@
> +#
> +# ip_address.rb
> +# Copyright (C) 2008 Red Hat, Inc.
> +# Written by Darryl L. Pierce <dpierce at redhat.com>
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; version 2 of the License.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write to the Free Software
> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> +# MA  02110-1301, USA.  A copy of the GNU General Public License is
> +# also available at http://www.gnu.org/copyleft/gpl.html.
> +
> +# +IpAddress+ is the base class for all address related classes.
> +#
> +class IpAddress < ActiveRecord::Base
> +
> +end
>   
Why isn't there a "has_many :nics" and a "has_many :bonding"
relationship in the IpAddress table. We wont be able to lookup nics /
bondings from an ip address otherwise.


> diff --git a/src/app/models/ip_v4_address.rb b/src/app/models/ip_v4_address.rb
> new file mode 100644
> index 0000000..4495a13
> --- /dev/null
> +++ b/src/app/models/ip_v4_address.rb
> @@ -0,0 +1,46 @@
> +# ip_v4_address.rb
> +#
> +# Copyright (C) 2008 Red Hat, Inc.
> +# Written by Darryl L. Pierce <dpierce at redhat.com>
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; version 2 of the License.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write to the Free Software
> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> +# MA  02110-1301, USA.  A copy of the GNU General Public License is
> +# also available at http://www.gnu.org/copyleft/gpl.html.
> +
> +# +IpV4Address+ represents a single IPv4 address.
> +#
> +class IpV4Address < IpAddress
> +  ADDRESS_TEST = %r{^(\d{1,3}\.){3}\d{1,3}$}
> +
> +  validates_presence_of :address,
> +    :message => 'An address must be supplied.'
> +  validates_format_of :address,
> +    :with => ADDRESS_TEST
> +
> +  validates_presence_of :netmask,
> +    :message => 'A netmask must be supplied.'
> +  validates_format_of :netmask,
> +    :with => ADDRESS_TEST
> +
> +  validates_presence_of :gateway,
> +    :message => 'A gateway address must be supplied.'
> +  validates_format_of :gateway,
> +    :with => ADDRESS_TEST
> +
> +  validates_presence_of :broadcast,
> +    :message => 'A broadcast address must be supplied.'
> +  validates_format_of :broadcast,
> +    :with => ADDRESS_TEST
> +
> +end
> diff --git a/src/app/models/ip_v6_address.rb b/src/app/models/ip_v6_address.rb
> new file mode 100644
> index 0000000..1395886
> --- /dev/null
> +++ b/src/app/models/ip_v6_address.rb
> @@ -0,0 +1,40 @@
> +# ip_v6_address.rb
> +#
> +# Copyright (C) 2008 Red Hat, Inc.
> +# Written by Darryl L. Pierce <dpierce at redhat.com>
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; version 2 of the License.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write to the Free Software
> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> +# MA  02110-1301, USA.  A copy of the GNU General Public License is
> +# also available at http://www.gnu.org/copyleft/gpl.html.
> +
> +# +IpV6Address+ represents a single IPv6 address.
> +#
> +class IpV6Address < IpAddress
> +  ADDRESS_TEST = %r{^([0-9a-fA-F]{0,4}|0)(\:([0-9a-fA-F]{0,4}|0)){7}$}
> +
> +  validates_presence_of :address,
> +    :message => 'An address must be provided.'
> +  validates_format_of :address,
> +    :with => ADDRESS_TEST
> +
> +  validates_presence_of :gateway,
> +    :message => 'A gateway address must be provided.'
> +  validates_format_of :gateway,
> +    :with => ADDRESS_TEST
> +
> +  validates_presence_of :prefix,
> +    :message => 'A prefix must be provided.'
> +  validates_format_of :prefix,
> +    :with => ADDRESS_TEST
> +end
> diff --git a/src/app/models/nic.rb b/src/app/models/nic.rb
> index baf7095..69568a9 100644
> --- a/src/app/models/nic.rb
> +++ b/src/app/models/nic.rb
> @@ -22,4 +22,6 @@ class Nic < ActiveRecord::Base
>    belongs_to :boot_type
>  
>    has_and_belongs_to_many :bonding, :join_table => 'bondings_nics'
> +
> +  belongs_to :ip_address
>  end
> diff --git a/src/db/migrate/025_create_ip_addresses.rb b/src/db/migrate/025_create_ip_addresses.rb
> new file mode 100644
> index 0000000..0f528f4
> --- /dev/null
> +++ b/src/db/migrate/025_create_ip_addresses.rb
> @@ -0,0 +1,46 @@
> +#
> +# Copyright (C) 2008 Red Hat, Inc.
> +# Written by Darryl L. Pierce <dpierce at redhat.com>
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; version 2 of the License.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write to the Free Software
> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> +# MA  02110-1301, USA.  A copy of the GNU General Public License is
> +# also available at http://www.gnu.org/copyleft/gpl.html.
> +
> +# Creates a single-inheritance table for both IPv4 and IPv6
> +# addresses.
> +#
> +class CreateIpAddresses < ActiveRecord::Migration
> +  def self.up
> +    create_table :ip_addresses do |t|
> +      t.string :type
> +
> +      # common attributes
> +      t.string :address,   :limit => 39
> +      t.string :gateway,   :limit => 39
> +
> +      # attributes for IPv4 (type=IpV4Address)
> +      t.string :netmask,   :limit => 15
> +      t.string :broadcast, :limit => 15
> +
> +      # attributes for IPv6 (type=IpV6Address)
> +      t.string :prefix,    :limit => 39
> +
> +      t.timestamps
> +    end
> +  end
> +
> +  def self.down
> +    drop_table :ip_addresses
> +  end
> +end
> diff --git a/src/db/migrate/026_move_nic_addresses_to_ip_addresses_table.rb b/src/db/migrate/026_move_nic_addresses_to_ip_addresses_table.rb
> new file mode 100644
> index 0000000..b873e4d
> --- /dev/null
> +++ b/src/db/migrate/026_move_nic_addresses_to_ip_addresses_table.rb
> @@ -0,0 +1,56 @@
> +#
> +# Copyright (C) 2008 Red Hat, Inc.
> +# Written by Darryl L. Pierce <dpierce at redhat.com>
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; version 2 of the License.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write to the Free Software
> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> +# MA  02110-1301, USA.  A copy of the GNU General Public License is
> +# also available at http://www.gnu.org/copyleft/gpl.html.
> +
> +class MoveNicAddressesToIpAddressesTable < ActiveRecord::Migration
> +  def self.up
> +    add_column :nics, :ip_address_id, :integer, :null => true
> +
> +    execute 'alter table nics add constraint fk_nic_ip_address
> +             foreign key (ip_address_id) references ip_addresses(id)'
> +
> +    Nic.find(:all).each do |nic|
> +      address = IpV4Address.new(:address   => nic.ip_addr,
> +				:netmask   => nic.netmask,
> +				:broadcast => nic.broadcast,
> +				:gateway   => nic.ip_addr)
> +      nic.ip_address = address
> +
> +      nic.save!
> +      address.save!
> +    end
> +
> +    remove_column :nics, :ip_addr
> +    remove_column :nics, :netmask
> +    remove_column :nics, :broadcast
> +  end
> +
> +  def self.down
> +    add_column :nics, :ip_addr,   :string, :limit => 16
> +    add_column :nics, :netmask,   :string, :limit => 16
> +    add_column :nics, :broadcast, :string, :limit => 16
> +
> +    Nic.find(:all).each do |nic|
> +      nic.ip_addr   = nic.ip_address.address
> +      nic.netmask   = nic.ip_address.netmask
> +      nic.broadcast = nic.ip_address.broadcast
> +    end
> +
> +    remove_column :nics, :ip_address_id
> +  end
> +end
> diff --git a/src/db/migrate/027_move_bonding_address_to_ip_addresses_table.rb b/src/db/migrate/027_move_bonding_address_to_ip_addresses_table.rb
> new file mode 100644
> index 0000000..53f7058
> --- /dev/null
> +++ b/src/db/migrate/027_move_bonding_address_to_ip_addresses_table.rb
> @@ -0,0 +1,54 @@
> +#
> +# Copyright (C) 2008 Red Hat, Inc.
> +# Written by Darryl L. Pierce <dpierce at redhat.com>
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; version 2 of the License.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write to the Free Software
> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> +# MA  02110-1301, USA.  A copy of the GNU General Public License is
> +# also available at http://www.gnu.org/copyleft/gpl.html.
> +
> +class MoveBondingAddressToIpAddressesTable < ActiveRecord::Migration
> +  def self.up
> +    add_column :bondings, :ip_address_id, :integer, :null => true
> +
> +    execute 'alter table bondings add constraint fk_bonding_ip_address
> +             foreign key (ip_address_id) references ip_addresses(id)'
> +
> +    Bonding.find(:all).each do |bonding|
> +      ip_address = IpV4Address.new(:address   => bonding.ip_addr,
> +				   :netmask   => bonding.netmask,
> +				   :broadcast => bonding.broadcast,
> +				   :gateway   => bonding.ip_addr)
> +    end
> +
> +    remove_column :bondings, :ip_addr
> +    remove_column :bondings, :netmask
> +    remove_column :bondings, :broadcast
> +  end
> +
> +  def self.down
> +    t.string  :ip_addr,         :null => true, :limit => 15
> +    t.string  :netmask,         :null => true, :limit => 15
> +    t.string  :broadcast,       :null => true, :limit => 15
> +    
> +    Bonding.each do |bonding|
> +      bonding.ip_addr   = bonding.ip_address.address
> +      bonding.netmask   = bonding.ip_address.netmask
> +      bonding.broadcast = bonding.ip_address.broadcast
> +
> +      bonding.save!
> +    end
> +
> +    remove_column :bondings, :ip_address_id
> +  end
> +end
> diff --git a/src/host-browser/host-browser.rb b/src/host-browser/host-browser.rb
> index 79d34e8..bbfbf3b 100755
> --- a/src/host-browser/host-browser.rb
> +++ b/src/host-browser/host-browser.rb
> @@ -283,10 +283,10 @@ class HostBrowser
>  
>                      updated_nic = Nic.find_by_id(nic.id)
>  
> -                    updated_nic.bandwidth = detail['BANDWIDTH']
>   
Did you really mean to remove bandwidth here? I still see it in the db
table after the migrations and this seems to be the only place that a
change to it occurs.

> -                    updated_nic.ip_addr   = detail['IP_ADDRESS']
> -                    updated_nic.netmask   = detail['NETMASK']
> -                    updated_nic.broadcast = detail['BROADCAST']
> +                    updated_nic.bandwidth            = detail['BANDWIDTH']
> +                    updated_nic.ip_address.address   = detail['IP_ADDRESS']
> +                    updated_nic.ip_address.netmask   = detail['NETMASK']
> +                    updated_nic.ip_address.broadcast = detail['BROADCAST']
>  
>                      updated_nic.save!
>                      found=true
> @@ -310,11 +310,14 @@ class HostBrowser
>                  'mac'          => nic['MAC'].upcase,
>                  'bandwidth'    => nic['BANDWIDTH'],
>                  'usage_type'   => 1,
> -                'ip_addr'      => nic['IP_ADDRESS'],
> -                'netmask'      => nic['NETMASK'],
> -                'broadcast'    => nic['BROADCAST'],
>                  'boot_type_id' => boot_type.id)
>  
> +	    ip_address = IpV4Address.new('address'   => nic['IP_ADDRESS'],
> +					 'netmask'   => nic['NETMASK'],
> +					 'broadcast' => nic['BROADCAST'],
> +					 'gateway'   => nic['GATEWAY'])
> +	    detail.ip_address = ip_address
> +
>              host.nics << detail
>          end
>  
> diff --git a/src/lib/managed_node_configuration.rb b/src/lib/managed_node_configuration.rb
> index 93f8448..fff7914 100644
> --- a/src/lib/managed_node_configuration.rb
> +++ b/src/lib/managed_node_configuration.rb
> @@ -51,7 +51,7 @@ class ManagedNodeConfiguration
>      host.bondings.each do |bonding|
>        result.puts "rm #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}"
>        result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/DEVICE #{bonding.interface_name}"
> -      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/IPADDR #{bonding.ip_addr}" if bonding.ip_addr
> +      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/IPADDR #{bonding.ip_address.address}" if bonding.ip_address
>        result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/ONBOOT yes"
>  
>        bonding.nics.each do |nic|
> @@ -97,9 +97,9 @@ class ManagedNodeConfiguration
>          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BOOTPROTO #{nic.boot_type.proto}"
>  
>          if nic.boot_type.proto == 'static'
> -          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/IPADDR #{nic.ip_addr}"
> -          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/NETMASK #{nic.netmask}"
> -          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BROADCAST #{nic.broadcast}"
> +          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/IPADDR #{nic.ip_address.address}"
> +          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/NETMASK #{nic.ip_address.netmask}"
> +          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BROADCAST #{nic.ip_address.broadcast}"
>          end
>  
>  	if bridged
>   
The host-browser and managed_node_configuration are the bits I'm least
familiar with. That being said, after applying your patch and rebooting,
everything seems to work. I also went through the changes above and
everything looks good (besides the aformentioned note on bandwidth).


> diff --git a/src/test/fixtures/bondings.yml b/src/test/fixtures/bondings.yml
> index 29473c7..1a74f42 100644
> --- a/src/test/fixtures/bondings.yml
> +++ b/src/test/fixtures/bondings.yml
> @@ -4,8 +4,6 @@ mailservers_managed_node_bonding:
>      bonding_type_id: <%= Fixtures.identify(:link_aggregation_bonding_type) %>
>      host_id: <%= Fixtures.identify(:mailservers_managed_node) %>
>      boot_type_id: <%= Fixtures.identify(:boot_type_static) %>
> -    ip_addr: 172.31.0.15
> -    netmask: 255.255.255.
> -    broadcast: 172.31.0.255
> +    ip_address_id: <%= Fixtures.identify(:ip_v4_mailservers_managed_node_bonding) %>
>      arp_ping_address: 172.31.0.100
>      arp_interval: 0
> diff --git a/src/test/fixtures/ip_addresses.yml b/src/test/fixtures/ip_addresses.yml
> new file mode 100644
> index 0000000..0472669
> --- /dev/null
> +++ b/src/test/fixtures/ip_addresses.yml
> @@ -0,0 +1,55 @@
> +ip_v4_one:
> +  type: IpV4Address
> +  address: 1.2.3.4
> +  netmask: 255.255.255.0
> +  gateway: 1.2.3.1
> +  broadcast: 1.2.3.255
> +
> +ip_v4_two:
> +  type: IpV4Address
> +  address: 2.3.4.5
> +  netmask: 255.255.255.0
> +  gateway: 1.2.3.1
> +  broadcast: 2.3.4.255
> +
> +ip_v4_three:
> +  type: IpV4Address
> +  address: 3.4.5.6
> +  netmask: 255.255.255.0
> +  gateway: 3.4.5.1
> +  broadcast: 3.4.5.255
> +
> +ip_v4_four:
> +  type: IpV4Address
> +  address: 3.4.5.6
> +  netmask: 255.255.255.0
> +  gateway: 3.4.5.1
> +  broadcast: 3.4.5.255
> +
> +ip_v4_mailserver_nic_one:
> +  type: IpV4Address
> +  address: 172.31.0.15
> +  netmask: 255.255.255.0
> +  gateway: 172.31.0.1
> +  broadcast: 172.31.0.255
> +
> +ip_v4_ldapserver_nic_one:
> +  type: IpV4Address
> +  address: 172.31.0.25
> +  netmask: 255.255.255.0
> +  gateway: 172.31.0.1
> +  broadcast: 172.31.0.255
> +
> +ip_v4_buildserver_nic_two:
> +  type: IpV4Address
> +  address: 172.31.0.31
> +  netmask: 255.255.255.0
> +  gateway: 172.31.0.1
> +  broadcast: 172.31.0.255
> +
> +ip_v4_mailservers_managed_node_bonding:
> +  type: IpV4Address
> +  address: 192.168.50.100
> +  netmask: 255.255.255.0
> +  gateway: 192.168.50.1
> +  broadcast: 192.168.50.255
> diff --git a/src/test/fixtures/nics.yml b/src/test/fixtures/nics.yml
> index ccf71d2..dbbc511 100644
> --- a/src/test/fixtures/nics.yml
> +++ b/src/test/fixtures/nics.yml
> @@ -1,80 +1,80 @@
>  one:
>    id: 1
>    mac: '00:11:22:33:44:55'
> -  ip_addr: '1.2.3.4'
> -  usage_type: '1'
> +  ip_address_id: <%= Fixtures.identify(:ip_v4_one) %>
>    bandwidth: 100
>    host_id: 10
>    boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
> +
>  two:
>    id: 2
>    mac: 'AA:BB:CC:DD:EE:FF'
> -  ip_addr: '2.3.4.5'
> +  ip_address_id: <%= Fixtures.identify(:ip_v4_two) %>
>    usage_type: '2'
>    bandwidth: 1000
>    host_id: 10
>    boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
> +
>  three:
>    id: 3
>    mac: '00:FF:11:EE:22:DD'
> -  ip_addr: '3.4.5.6'
> +  ip_address_id: <%= Fixtures.identify(:ip_v4_three) %>
>    usage_type: '1'
>    bandwidth: 10
>    host_id: 10
>    boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
> +
>  four:
>    id: 4
>    mac: '00:FF:11:EE:22:DD'
> -  ip_addr: '3.4.5.6'
> +  ip_address: <%= Fixtures.identify(:ip_v4_four) %>
>    usage_type: '1'
>    bandwidth: 10
>    host_id: 10
>    boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
>  
>  mailserver_nic_one:
> -    mac: '00:11:22:33:44:55'
> -    usage_type: '1'
> -    bandwidth: 100
> -    ip_addr: '172.31.0.15'
> -    host_id: <%= Fixtures.identify(:mailservers_managed_node) %>
> -    boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
> +  mac: '00:11:22:33:44:55'
> +  ip_address: <%= Fixtures.identify(:ip_v4_mailserver_nic_one) %>
> +  usage_type: '1'
> +  bandwidth: 100
> +  host_id: <%= Fixtures.identify(:mailservers_managed_node) %>
> +  boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
>  
>  mailserver_nic_two:
> -    mac: '22:11:33:66:44:55'
> -    usage_type: '1'
> -    bandwidth: 100
> -    host_id: <%= Fixtures.identify(:mailservers_managed_node) %>
> -    boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
> +  mac: '22:11:33:66:44:55'
> +  usage_type: '1'
> +  bandwidth: 100
> +  host_id: <%= Fixtures.identify(:mailservers_managed_node) %>
> +  boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
>  
>  fileserver_nic_one:
> -    mac: '00:99:00:99:13:07'
> -    usage_type: '1'
> -    bandwidth: 100
> -    host_id: <%= Fixtures.identify(:fileserver_managed_node) %>
> -    boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
> +  mac: '00:99:00:99:13:07'
> +  usage_type: '1'
> +  bandwidth: 100
> +  host_id: <%= Fixtures.identify(:fileserver_managed_node) %>
> +  boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
>  
>  ldapserver_nic_one:
> -    mac: '00:03:02:00:09:06'
> -    usage_type: '1'
> -    bandwidth: 100
> -    bridge: 'ovirtbr0'
> -    ip_addr: '172.31.0.25'
> -    host_id: <%= Fixtures.identify(:ldapserver_managed_node) %>
> -    boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
> +  mac: '00:03:02:00:09:06'
> +  usage_type: '1'
> +  bandwidth: 100
> +  bridge: 'ovirtbr0'
> +  ip_address_id: <%= Fixtures.identify(:ip_v4_ldapserver_nic_one) %>
> +  host_id: <%= Fixtures.identify(:ldapserver_managed_node) %>
> +  boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
>  
>  buildserver_nic_one:
> -    mac: '07:17:19:65:03:38'
> -    usage_type: '1'
> -    bandwidth: 100
> -    host_id: <%= Fixtures.identify(:buildserver_managed_node) %>
> -    boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
> +  mac: '07:17:19:65:03:38'
> +  usage_type: '1'
> +  bandwidth: 100
> +  host_id: <%= Fixtures.identify(:buildserver_managed_node) %>
> +  boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
>  
>  buildserver_nic_two:
> -    mac: '07:17:19:65:03:39'
> -    usage_type: '1'
> -    bandwidth: 100
> -    ip_addr: '172.31.0.31'
> -    netmask: '255.255.255.0'
> -    broadcast: '172.31.0.255'
> -    host_id: <%= Fixtures.identify(:buildserver_managed_node) %>
> -    boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
> +  mac: '07:17:19:65:03:39'
> +  usage_type: '1'
> +  bandwidth: 100
> +  ip_address_id: <%= Fixtures.identify(:ip_v4_buildserver_nic_two) %>
> +  host_id: <%= Fixtures.identify(:buildserver_managed_node) %>
> +  boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
> diff --git a/src/test/functional/managed_node_configuration_test.rb b/src/test/functional/managed_node_configuration_test.rb
> index d0d8aa3..2158c8d 100644
> --- a/src/test/functional/managed_node_configuration_test.rb
> +++ b/src/test/functional/managed_node_configuration_test.rb
> @@ -83,17 +83,17 @@ cat <<\EOF > /var/tmp/node-augtool
>  rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
>  set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
>  set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BOOTPROTO #{nic.boot_type.proto}
> -set /files/etc/sysconfig/network-scripts/ifcfg-eth0/IPADDR #{nic.ip_addr}
> -set /files/etc/sysconfig/network-scripts/ifcfg-eth0/NETMASK #{nic.netmask}
> -set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BROADCAST #{nic.broadcast}
> +set /files/etc/sysconfig/network-scripts/ifcfg-eth0/IPADDR #{nic.ip_address.address}
> +set /files/etc/sysconfig/network-scripts/ifcfg-eth0/NETMASK #{nic.ip_address.netmask}
> +set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BROADCAST #{nic.ip_address.broadcast}
>  set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BRIDGE ovirtbr0
>  set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
>  rm /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0
>  set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DEVICE ovirtbr0
>  set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BOOTPROTO #{nic.boot_type.proto}
> -set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/IPADDR #{nic.ip_addr}
> -set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/NETMASK #{nic.netmask}
> -set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BROADCAST #{nic.broadcast}
> +set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/IPADDR #{nic.ip_address.address}
> +set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/NETMASK #{nic.ip_address.netmask}
> +set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BROADCAST #{nic.ip_address.broadcast}
>  set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/TYPE bridge
>  set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/PEERNTP yes
>  set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DELAY 0
> @@ -123,17 +123,17 @@ cat <<\EOF > /var/tmp/node-augtool
>  rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
>  set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
>  set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BOOTPROTO #{nic1.boot_type.proto}
> -set /files/etc/sysconfig/network-scripts/ifcfg-eth0/IPADDR #{nic1.ip_addr}
> -set /files/etc/sysconfig/network-scripts/ifcfg-eth0/NETMASK #{nic1.netmask}
> -set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BROADCAST #{nic1.broadcast}
> +set /files/etc/sysconfig/network-scripts/ifcfg-eth0/IPADDR #{nic1.ip_address.address}
> +set /files/etc/sysconfig/network-scripts/ifcfg-eth0/NETMASK #{nic1.ip_address.netmask}
> +set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BROADCAST #{nic1.ip_address.broadcast}
>  set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BRIDGE ovirtbr0
>  set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
>  rm /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0
>  set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DEVICE ovirtbr0
>  set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BOOTPROTO #{nic1.boot_type.proto}
> -set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/IPADDR #{nic1.ip_addr}
> -set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/NETMASK #{nic1.netmask}
> -set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BROADCAST #{nic1.broadcast}
> +set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/IPADDR #{nic1.ip_address.address}
> +set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/NETMASK #{nic1.ip_address.netmask}
> +set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BROADCAST #{nic1.ip_address.broadcast}
>  set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/TYPE bridge
>  set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/PEERNTP yes
>  set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DELAY 0
> @@ -177,7 +177,7 @@ EOF
>  cat <<\EOF > /var/tmp/node-augtool
>  rm /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}
>  set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/DEVICE #{bonding.interface_name}
> -set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/IPADDR 172.31.0.15
> +set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/IPADDR #{bonding.ip_address.address}
>  set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/ONBOOT yes
>  rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
>  set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
> diff --git a/src/test/unit/ip_address_test.rb b/src/test/unit/ip_address_test.rb
> new file mode 100644
> index 0000000..152578e
> --- /dev/null
> +++ b/src/test/unit/ip_address_test.rb
> @@ -0,0 +1,8 @@
> +require 'test_helper'
> +
> +class IpAddressTest < ActiveSupport::TestCase
> +  # Replace this with your real tests.
> +  def test_truth
> +    assert true
> +  end
> +end
> diff --git a/src/test/unit/ip_v4_address_test.rb b/src/test/unit/ip_v4_address_test.rb
> new file mode 100644
> index 0000000..14f0175
> --- /dev/null
> +++ b/src/test/unit/ip_v4_address_test.rb
> @@ -0,0 +1,99 @@
> +#
> +# Copyright (C) 2008 Red Hat, Inc.
> +# Written by Darryl L. Pierce <dpierce at redhat.com>
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; version 2 of the License.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write to the Free Software
> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> +# MA  02110-1301, USA.  A copy of the GNU General Public License is
> +# also available at http://www.gnu.org/copyleft/gpl.html.
> +
> +require File.dirname(__FILE__) + '/../test_helper'
> +
> +class IpV4AddressTest < ActiveSupport::TestCase
> +  def setup
> +    @address = IpV4Address.new(:address   => '192.168.50.2',
> +			       :netmask   => '255.255.255.0',
> +			       :gateway   => '192.168.50.1',
> +			       :broadcast => '192.168.50.255')
> +  end
> +
> +  # Ensures that an address must be supplied.
> +  #
> +  def test_valid_fails_without_address
> +    @address.address = nil
> +
> +    flunk "An address must be present." if @address.valid?
> +  end
> +
> +  # Ensures that an address has to be in the correct format.
> +  #
> +  def test_valid_fails_with_bad_address
> +    @address.address = '192.168'
> +
> +    flunk "An address must be in the format ##.##.##.##." if @address.valid?
> +  end
> +
> +  # Ensures that a netmask must be supplied.
> +  #
> +  def test_valid_fails_without_netmask
> +    @address.netmask = nil
> +
> +    flunk "An address must have a netmask." if @address.valid?
> +  end
> +
> +  # Ensures that a netmask must have the correct format.
> +  #
> +  def test_valid_fails_with_bad_netmask
> +    @address.netmask = 'farkle'
> +
> +    flunk "A netmask must be in the format ##.##.##.##." if @address.valid?
> +  end
> +
> +  # Ensures that a gateway must be supplied.
> +  #
> +  def test_valid_fails_without_gateway
> +    @address.gateway = nil
> +
> +    flunk "A gateway address must be supplied." if @address.valid?
> +  end
> +
> +  # Ensures that a gateway must be in the correct format.
> +  #
> +  def test_valid_fails_with_bad_gateway
> +    @address.gateway = '-3.a2.0.8'
> +
> +    flunk "The gateway address must be in the format ##.##.##.##." if @address.valid?
> +  end
> +
> +  # Ensures that a broadcast must be supplied.
> +  #
> +  def test_valid_fails_without_broadcast
> +    @address.broadcast = nil
> +
> +    flunk "A broadcast addres must be supplied." if @address.valid?
> +  end
> +
> +  # Ensures that a broadcast must be in the correct format.
> +  #
> +  def test_valid_fails_with_bad_broadcast
> +    @address.broadcast = '-3.2.0.8'
> +
> +    flunk "The broadcast address must be in the format ##.##.##.##." if @address.valid?
> +  end
> +
> +  # Ensures that a well-formed address is valid.
> +  #
> +  def test_valid
> +    flunk "There is an error with validation." unless @address.valid?
> +  end
> +end
> diff --git a/src/test/unit/ip_v6_address_test.rb b/src/test/unit/ip_v6_address_test.rb
> new file mode 100644
> index 0000000..a2be85f
> --- /dev/null
> +++ b/src/test/unit/ip_v6_address_test.rb
> @@ -0,0 +1,82 @@
> +#
> +# Copyright (C) 2008 Red Hat, Inc.
> +# Written by Darryl L. Pierce <dpierce at redhat.com>
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; version 2 of the License.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write to the Free Software
> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> +# MA  02110-1301, USA.  A copy of the GNU General Public License is
> +# also available at http://www.gnu.org/copyleft/gpl.html.
> +
> +require File.dirname(__FILE__) + '/../test_helper'
> +
> +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')
> +  end
> +
> +  # Ensures that the address must be provided.
> +  #
> +  def test_valid_fails_without_address
> +    @address.address = nil
> +
> +    flunk "An address must be provided." if @address.valid?
> +  end
> +
> +  # Ensures that the address must be in the correct format.
> +  #
> +  def test_valid_fails_with_bad_address
> +    @address.address = "farkle"
> +
> +    flunk "The address must be in the correct format." if @address.valid?
> +  end
> +
> +  # Ensures that the gateway must be provided.
> +  #
> +  def test_valid_fails_without_gateway
> +    @address.gateway = nil
> +
> +    flunk "The gateway address must be provided." if @address.valid?
> +  end
> +
> +  # Ensures that the gateway address is in the correct format.
> +  #
> +  def test_valid_fails_with_bad_gateway
> +    @address.gateway = '0-:::::::717'
> +
> +    flunk "The gateway address must be in the correct format." if @address.valid?
> +  end
> +
> +  # Ensures that the prefix must be provided.
> +  #
> +  def test_valid_fails_without_prefix
> +    @address.prefix = nil
> +
> +    flunk "The prefix must be provided." if @address.valid?
> +  end
> +
> +  # Ensures that the prefix is in the correct format.
> +  #
> +  def test_valid_fails_with_invalid_prefix
> +    @address.prefix = 'whoops'
> +
> +    flunk "The prefix must be in the correct format." if @address.valid?
> +  end
> +
> +  # Ensures that a well-formed address is considered valid.
> +  #
> +  def test_valid
> +    flunk "There is an problem with address validation." unless @address.valid?
> +  end
> +end
> diff --git a/src/test/unit/nic_test.rb b/src/test/unit/nic_test.rb
> index a0776a2..1de1e00 100644
> --- a/src/test/unit/nic_test.rb
> +++ b/src/test/unit/nic_test.rb
> @@ -20,6 +20,7 @@
>  require File.dirname(__FILE__) + '/../test_helper'
>  
>  class NicTest < Test::Unit::TestCase
> +  fixtures :ip_addresses
>    fixtures :nics
>  
>    # Replace this with your real tests.
>   
I ran these tests and everything succeeded flawlessly. For the most
part, besides the mentioned items, everything seemed to come together
and work nicely. Good job.

    -Mo




From justin at redfish-group.com  Wed Oct 22 09:39:26 2008
From: justin at redfish-group.com (Justin Clacherty)
Date: Wed, 22 Oct 2008 19:39:26 +1000
Subject: [Ovirt-devel] unable to add hosts in web admin tool
In-Reply-To: <48F35A21.6070101@redhat.com>
References: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl>
	<48F2F6C7.4020300@redfish-group.com> <48F2FEEB.10705@redhat.com>
	<48F3128A.7090800@redfish-group.com> <48F35A21.6070101@redhat.com>
Message-ID: <48FEF4CE.2090002@redfish-group.com>

Alan Pevec wrote:
> Justin Clacherty wrote:
>> Alan Pevec wrote:
>>> Please check the logs /var/log/ovirt* to find out what's going on
>>
>> Can't see anything much in the logs on the management server.  I had 
>> a look at ovirt.log on the managed host and it looks as though it is 
>> having problems talking to the management node, not sure what to do 
>> about it though.  Here's the relevant part of the log:
>>
>> Resolving management.priv.ovirt.org.... 192.168.50.2
>> Connecting to management.priv.ovirt.org.|192.168.50.2|:80... connected.
>> HTTP request sent, awaiting response... 500 Internal Server Error
>> 2008-10-13 16:52:33 ERROR 500: Internal Server Error.
>
> Seems that ovirt-appliance firstboot failed and left appliance in bad 
> state, check the mongrel log.
> You can also reinstall ovirt-appliance image and try 
> http://ovirt.org/page/TroubleShooting#Debugging_oVirt_Appliance_firstboot

I waited for 0.94.  Just tried it and the same thing is occuring.  Is 
there a trick to reinstalling the ovirt-appliance?  Do I just run 
"create-ovirt-appliance -e eth0" again?  I don't see any console output 
on the terminal when I run "virsh start ovirt-appliance; virsh console 
ovirt-appliance", just the output of the start command "Domain 
ovirt-appliance started".

Justin.



From imain at redhat.com  Wed Oct 22 17:36:38 2008
From: imain at redhat.com (Ian Main)
Date: Wed, 22 Oct 2008 10:36:38 -0700
Subject: [Ovirt-devel] Re: Ovirt-qpid API
In-Reply-To: <20081008211933.089ac7a8@tp.mains.net>
References: <20081008211933.089ac7a8@tp.mains.net>
Message-ID: <20081022103638.7b86fac4@tp.mains.net>


OK, here's another go around at this.  This has all the bells and whistles for network config.  Please take a moment to go through it and make sure I've done this properly.

BTW, the UUID from hal is in there so that we can map this host to the host in libvirt.  Hopefully they will always be the same.  Xen doesn't mess with this does it in dom0?

Thanks!

	Ian


<schema package="com.redhat.OvirtNode">

  <class name="OvirtNode">
    <property name="uuid" type="sstr" access="RC" desc="hostname UUID as gathered from HAL."/>
    <property name="hostname" type="sstr" access="RC" desc="host name"/>

    <property name="defaultGateway" type="sstr" desc="Default gateway."/>
    <property name="default6Gateway" type="sstr" desc="Default IPv6 gateway."/>

    <property name="beeping" type="bool" desc="true/false to invoke beeping of machine (for identifying system)"/>

    <method name="hardwareShutdown" desc="Bring down host and halt machine."/>
    <method name="hardwareRestart" desc="Bring down host and restart."/>

    <method name="createBondingInterface"/>
      <arg name="interfaceName" dir="I" type="sstr" desc="Name of new interface"/>
      <arg name="interface" dir="O" type="objId" desc="New bonding interface"/>
    </method>

    <method name="createBridgingInterface"/>
      <arg name="interfaceName" dir="I" type="sstr" desc="Name of new interface."/>
      <arg name="interface" dir="O" type="objId" desc="New bridging interface."/>
    </method>
    
    <method name="createVLANInterface"/>
      <arg name="interfaceName" dir="I" type="sstr" desc="Name of raw device interface."/>
      <arg name="vlanId" dir="I" type="uint64" desc="VLAN ID."/>
      <arg name="interface" dir="O" type="objId" desc="New VLAN interface"/>
    </method>

    <method name="reloadNetwork" desc="Reload network config to let changes take effect."/>

  </class>

  <class name="IpAddress">
    <property name="ip" type="sstr" desc="IP address."/>
    <property name="prefix" type="uint32" desc="Prefix/netmask."/>
    <property name="broadcast" type="sstr" desc="Broadcast."/>
    <property name="interface" type="objId" desc="Interface to which this address belongs"/>
  </class>

  <class name="Ip6Address">
    <property name="ip" type="sstr" desc="IPv6 address."/>
    <property name="prefix" type="uint32" desc="Prefix."/>
    <property name="interface" type="objId" desc="Interface to which this address belongs"/>
  </class>

  <class name="NetworkInterface">
    <property name="OvirtNode" type="objId" references="ovirtNode" access="RC" index="y" parentRef="y" desc="Keep track of hardware node these interfaces belong to."/>
    <property name="interfaceName" type="sstr" access="RC" desc="Network interface name."/>
    <property name="dhcp" type="bool" desc="true/false - use DHCP for interface.  If false properties will be saved and restored for static IP."/>
    <property name="enableIPv6" type="bool" desc="true/false - enable IPv6 on interface."/>
    <property name="dhcp6" type="bool" desc="true/false - use DHCP for IPv6 on interface."/>
    <property name="speed" type="uint32" desc="link speed."/>
    <property name="mac" type="uint64" desc="MAC address."/>
    <property name="master" type="objId" desc="Master device interface for bonding or bridging."/>
    <property name="blink" type="bool" desc="True/false to invoke blinking of ethernet light (for identifying interface)"/>
    
    <method name="restart" desc="Restart the interface to allow changes to properties to take effect."/>
  </class>
  
  <class name="BondInterface">
    <property name="OvirtNode" type="objId" references="ovirtNode" access="RC" index="y" parentRef="y" desc="Keep track of hardware node these interfaces belong to."/>
    <property name="interfaceName" type="sstr" access="RC" desc="Network interface name."/>
    <property name="bondingMode" type="uint32" desc="Bonding mode"/>
    <property name="dhcp" type="bool" desc="true/false - use DHCP for interface.  If false properties will be saved and restored for static IP."/>
    <property name="enableIPv6" type="bool" desc="true/false - enable IPv6 on interface."/>
    <property name="dhcp6" type="bool" desc="true/false - use DHCP for IPv6 on interface."/>
    <property name="mac" type="uint64" desc="MAC address."/>
    <property name="master" type="objId" desc="Master device interface name."/>
    <method name="restart" desc="Restart the interface to allow changes to properties to take effect."/>
  </class>

  <class name="BridgeInterface">
    <property name="OvirtNode" type="objId" references="ovirtNode" access="RC" index="y" parentRef="y" desc="Keep track of hardware node these interfaces belong to."/>
    <property name="interfaceName" type="sstr" access="RC" desc="Network interface name."/>
    <property name="dhcp" type="bool" desc="true/false - use DHCP for interface.  If false properties will be saved and restored for static IP."/>
    <property name="enableIPv6" type="bool" desc="true/false - enable IPv6 on interface."/>
    <property name="dhcp6" type="bool" desc="true/false - use DHCP for IPv6 on interface."/>
    <property name="mac" type="uint64" desc="MAC address."/>
    <property name="master" type="objId" desc="Master device interface name."/>
    <method name="restart" desc="Restart the interface to allow changes to properties to take effect."/>
  </class>
  
  <class name="VLANInterface">
    <property name="OvirtNode" type="objId" references="ovirtNode" access="RC" index="y" parentRef="y" desc="Keep track of hardware node these interfaces belong to."/>
    <property name="interfaceName" type="sstr" access="RC" desc="Network interface name."/>
    <property name="vlanId" type="uint64" access="RC" desc="VLAN ID"/>
    <property name="dhcp" type="bool" desc="true/false - use DHCP for interface.  If false properties will be saved and restored for static IP."/>
    <property name="enableIPv6" type="bool" desc="true/false - enable IPv6 on interface."/>
    <property name="dhcp6" type="bool" desc="true/false - use DHCP for IPv6 on interface."/>
    <property name="mac" type="uint64" desc="MAC address."/>
    <property name="master" type="objId" desc="Master device interface name."/>
    <method name="restart" desc="Restart the interface to allow changes to properties to take effect."/>
  </class>
</schema>
    



From clalance at redhat.com  Wed Oct 22 18:32:58 2008
From: clalance at redhat.com (Chris Lalancette)
Date: Wed, 22 Oct 2008 20:32:58 +0200
Subject: [Ovirt-devel] Re: Ovirt-qpid API
In-Reply-To: <20081022103638.7b86fac4@tp.mains.net>
References: <20081008211933.089ac7a8@tp.mains.net>
	<20081022103638.7b86fac4@tp.mains.net>
Message-ID: <48FF71DA.4090001@redhat.com>

Ian Main wrote:
> OK, here's another go around at this.  This has all the bells and whistles
> for network config.  Please take a moment to go through it and make sure I've
> done this properly.
> 
> BTW, the UUID from hal is in there so that we can map this host to the host
> in libvirt.  Hopefully they will always be the same.  Xen doesn't mess with
> this does it in dom0?

No, but it's completely unreliable in general.  Don't rely on it for anything.

Chris Lalancette



From jim at meyering.net  Wed Oct 22 19:22:29 2008
From: jim at meyering.net (Jim Meyering)
Date: Wed, 22 Oct 2008 21:22:29 +0200
Subject: [Ovirt-devel] [PATCH server] Replaced the config scripts with
	configuration encoding.
In-Reply-To: <1224527121-13802-1-git-send-email-dpierce@redhat.com> (Darryl
	L. Pierce's message of "Mon, 20 Oct 2008 14:25:21 -0400")
References: <1224527121-13802-1-git-send-email-dpierce@redhat.com>
Message-ID: <8763nksadm.fsf@rho.meyering.net>

"Darryl L. Pierce" <dpierce at redhat.com> wrote:
> Rather than sending the node a series of scripts that load
> kernel modules, or are tightly coupled to tools like augeas,
> this patch introduces an encoding scheme for data.
>
> A line that begins with "bonding" describes a bonded interface.
>>From it the configuration processor generates a simple bonding
> file that includes an alias for the bonding kernel module

Looks good to me.
ACK.

> A line that begins with "ifcfg" describes an network

s/an /a /

> interface. It will contain the mac address and interface name,
> followed by all needed configuration values to bring the
> interface up.



From berrange at redhat.com  Wed Oct 22 20:17:58 2008
From: berrange at redhat.com (Daniel P. Berrange)
Date: Wed, 22 Oct 2008 21:17:58 +0100
Subject: [Ovirt-devel] [PATCH server] Replaced the config scripts with
	configuration encoding.
In-Reply-To: <1224527121-13802-1-git-send-email-dpierce@redhat.com>
References: <1224527121-13802-1-git-send-email-dpierce@redhat.com>
Message-ID: <20081022201758.GA1148@redhat.com>

On Mon, Oct 20, 2008 at 02:25:21PM -0400, Darryl L. Pierce wrote:
> Rather than sending the node a series of scripts that load
> kernel modules, or are tightly coupled to tools like augeas,
> this patch introduces an encoding scheme for data.
> 
> A line that begins with "bonding" describes a bonded interface.
> >From it the configuration processor generates a simple bonding
> file that includes an alias for the bonding kernel module
> 
> A line that begins with "ifcfg" describes an network
> interface. It will contain the mac address and interface name,
> followed by all needed configuration values to bring the
> interface up.

ACK, i think this looks good now. THough should we add some kind of version
number field in the data file. A simple "version=1.0" line would just be
sufficient to let us indicate changes in the future

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 Oct 22 20:18:28 2008
From: berrange at redhat.com (Daniel P. Berrange)
Date: Wed, 22 Oct 2008 21:18:28 +0100
Subject: [Ovirt-devel] [PATCH node] Updated the configuration processing
	to remove the need for scripts.
In-Reply-To: <1224527170-13867-1-git-send-email-dpierce@redhat.com>
References: <1224527170-13867-1-git-send-email-dpierce@redhat.com>
Message-ID: <20081022201828.GB1148@redhat.com>

On Mon, Oct 20, 2008 at 02:26:10PM -0400, Darryl L. Pierce wrote:
> The system now takes an encoded configuration descriptor from the server. It
> then parses from that a set of aliases for bondings if such exist. It then
> also extracts configuration details for the various network interfaces on the
> node. Afterward, it reloads module dependencies and then restarts the
> networking service.

ACK, this looks good now.

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 Oct 22 20:44:48 2008
From: berrange at redhat.com (Daniel P. Berrange)
Date: Wed, 22 Oct 2008 21:44:48 +0100
Subject: [Ovirt-devel] Re: Ovirt-qpid API
In-Reply-To: <48FF71DA.4090001@redhat.com>
References: <20081008211933.089ac7a8@tp.mains.net>
	<20081022103638.7b86fac4@tp.mains.net>
	<48FF71DA.4090001@redhat.com>
Message-ID: <20081022204448.GD1148@redhat.com>

On Wed, Oct 22, 2008 at 08:32:58PM +0200, Chris Lalancette wrote:
> Ian Main wrote:
> > OK, here's another go around at this.  This has all the bells and whistles
> > for network config.  Please take a moment to go through it and make sure I've
> > done this properly.
> > 
> > BTW, the UUID from hal is in there so that we can map this host to the host
> > in libvirt.  Hopefully they will always be the same.  Xen doesn't mess with
> > this does it in dom0?
> 
> No, but it's completely unreliable in general.  Don't rely on it for anything.

There are really two UUIDs you need to consider

 - the hardware identity
 - the operating system identity.

The hardware identity is the UUID. For real hardware, the it is usually,
but not always, unique / usable. For virtual hardware it should be 
guarenteed unique unless the virt mgmt app screws up.

We do need to include the UUID from hal in the info because ultimately
you could be running the qpid agent in the guest for nested virt and
want to correlate host & guest views of the world. 

The operating system identity is the security token (ie kerberos principle,
or x509 cert) is what is guarenteed to provide a unique identity for an OS
instance.

So the OS identity is the key piece of info. The oVirt node bootstrap 
process will take care of assigning identity. The hardware identity is 
really only useful for asset tracking / inventory metadata, and to 
provide a heuristic for data correlation, if you don't have access to 
the true OS identity at that point.


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 Oct 22 20:49:17 2008
From: sseago at redhat.com (Scott Seago)
Date: Wed, 22 Oct 2008 16:49:17 -0400
Subject: [Ovirt-devel] [PATCH server] Changed the database configuration
	to	use a different database for development
In-Reply-To: <1224529799-16294-1-git-send-email-dpierce@redhat.com>
References: <1224529799-16294-1-git-send-email-dpierce@redhat.com>
Message-ID: <48FF91CD.4070803@redhat.com>

Darryl L. Pierce wrote:
> Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
> ---
>  scripts/ovirt-server-install |    2 +-
>  src/config/database.yml      |   21 +++++++++++++++++----
>  2 files changed, 18 insertions(+), 5 deletions(-)
>
>
>   
OK, now that I finally got my appliance up and running,

ACK -- seems to work fine with this change.

Scott



From sseago at redhat.com  Wed Oct 22 22:16:46 2008
From: sseago at redhat.com (Scott Seago)
Date: Wed, 22 Oct 2008 22:16:46 +0000
Subject: [Ovirt-devel] [PATCH] added smart pool UI bits to search results
	and other flexigrids
Message-ID: <1224713806-2128-1-git-send-email-sseago@redhat.com>

Search results now show what smart pools the items belong to. There's also a pulldown selection to add selected results to a smart pool.

'Add to smart pool' pulldown is also available for the single-type tab pages for hosts, storage, vm pools, and vms.

Signed-off-by: Scott Seago <sseago at redhat.com>
---
 src/app/controllers/pool_controller.rb        |    4 ++-
 src/app/controllers/search_controller.rb      |    6 +++-
 src/app/controllers/smart_pools_controller.rb |   24 ++++++++++++++-
 src/app/models/host.rb                        |    3 +-
 src/app/models/pool.rb                        |    3 +-
 src/app/models/smart_pool.rb                  |   32 +++++++++++++++++++-
 src/app/models/storage_pool.rb                |    3 +-
 src/app/models/vm.rb                          |    3 +-
 src/app/views/hardware/show_hosts.rhtml       |   29 +++++++++++++++++++
 src/app/views/hardware/show_storage.rhtml     |   29 +++++++++++++++++++
 src/app/views/hardware/show_vms.rhtml         |   29 +++++++++++++++++++
 src/app/views/resources/show_vms.rhtml        |   29 +++++++++++++++++++
 src/app/views/search/_grid.rhtml              |    3 +-
 src/app/views/search/results.rhtml            |   38 +++++++++++++++++++++++-
 src/app/views/vm/_grid.rhtml                  |    2 +-
 15 files changed, 223 insertions(+), 14 deletions(-)

diff --git a/src/app/controllers/pool_controller.rb b/src/app/controllers/pool_controller.rb
index 063cc43..03d1316 100644
--- a/src/app/controllers/pool_controller.rb
+++ b/src/app/controllers/pool_controller.rb
@@ -110,7 +110,9 @@ class PoolController < ApplicationController
     attr_list = [:id, :description, :uuid,
                  :num_vcpus_allocated, :memory_allocated_in_mb,
                  :vnic_mac_addr, :state, :id]
-    attr_list.insert(3, [:host, :hostname]) if @pool.get_hardware_pool.can_view(@user)
+    if (@pool.is_a? VmResourcePool) and @pool.get_hardware_pool.can_view(@user)
+      attr_list.insert(3, [:host, :hostname])
+    end
     json_list(args[:full_items], attr_list, [:all], args[:find_opts])
   end
 
diff --git a/src/app/controllers/search_controller.rb b/src/app/controllers/search_controller.rb
index cc7e527..3789309 100644
--- a/src/app/controllers/search_controller.rb
+++ b/src/app/controllers/search_controller.rb
@@ -96,7 +96,9 @@ class SearchController < ApplicationController
       item_hash = {}
       item = result[:model]
       item_hash[:id] = item.class.name+"_"+item.id.to_s
-      item_hash[:cell] = ["display_name", "display_class"].collect do |attr|
+      item_hash[:cell] = []
+      item_hash[:cell] << item_hash[:id] if params[:checkboxes]
+      item_hash[:cell] += ["display_name", "display_class"].collect do |attr|
         if attr.is_a? Array
           value = item
           attr.each { |attr_item| value = value.send(attr_item)}
@@ -106,6 +108,8 @@ class SearchController < ApplicationController
         end
       end
       item_hash[:cell] << result[:percent]
+      item_hash[:cell] << item.smart_pools.collect {|pool| pool.name}.join(', ')
+
       item_hash
     end
     render :json => json_hash.to_json
diff --git a/src/app/controllers/smart_pools_controller.rb b/src/app/controllers/smart_pools_controller.rb
index 6bfe367..90b1419 100644
--- a/src/app/controllers/smart_pools_controller.rb
+++ b/src/app/controllers/smart_pools_controller.rb
@@ -23,7 +23,8 @@ class SmartPoolsController < PoolController
   before_filter :pre_modify, :only => [:add_hosts, :remove_hosts,
                                        :add_storage, :remove_storage,
                                        :add_vms, :remove_vms,
-                                       :add_pools, :remove_pools]
+                                       :add_pools, :remove_pools,
+                                       :add_items]
   def show_vms
     show
   end
@@ -106,7 +107,7 @@ class SmartPoolsController < PoolController
       end
       find_opts = {:conditions => conditions}
     end
-    { :full_items => full_items, :find_opts => find_opts, :include_pool => :true}
+    { :full_items => full_items, :find_opts => find_opts, :include_pool => false}
   end
 
   def add_hosts
@@ -154,6 +155,25 @@ class SmartPoolsController < PoolController
     end
   end
 
+  def add_items
+    class_and_ids_str = params[:class_and_ids]
+    class_and_ids = class_and_ids_str.split(",").collect {|x| x.split("_")}
+
+    begin
+      @pool.transaction do
+        class_and_ids.each do |class_and_id|
+          @pool.add_item(class_and_id[0].constantize.find(class_and_id[1].to_i))
+        end
+      end
+      render :json => { :success => true,
+        :alert => "Add items to smart pool successful." }
+    rescue => ex
+      render :json => { :success => false,
+          :alert => "Add items to smart pool failed: " + ex.message }
+    end
+
+  end
+
   def destroy
     if @pool.destroy
       alert="Smart Pool was successfully deleted."
diff --git a/src/app/models/host.rb b/src/app/models/host.rb
index 546da19..429f0c0 100644
--- a/src/app/models/host.rb
+++ b/src/app/models/host.rb
@@ -48,7 +48,8 @@ class Host < ActiveRecord::Base
                  :values => [ [ :created_at, 0, "created_at", :date ],
                               [ :updated_at, 1, "updated_at", :date ] ],
                  :terms => [ [ :hostname, 'H', "hostname" ],
-                             [ :search_users, 'U', "search_users" ] ]
+                             [ :search_users, 'U', "search_users" ] ],
+                 :eager_load => :smart_pools
 
 
   KVM_HYPERVISOR_TYPE = "KVM"
diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb
index d189649..b25fa55 100644
--- a/src/app/models/pool.rb
+++ b/src/app/models/pool.rb
@@ -89,7 +89,8 @@ class Pool < ActiveRecord::Base
   end
 
   acts_as_xapian :texts => [ :name ],
-                 :terms => [ [ :search_users, 'U', "search_users" ] ]
+                 :terms => [ [ :search_users, 'U', "search_users" ] ],
+                 :eager_load => :smart_pools
 
   # this method lists pools with direct permission grants, but by default does
   #  not include implied permissions (i.e. subtrees)
diff --git a/src/app/models/smart_pool.rb b/src/app/models/smart_pool.rb
index 9104ee5..0ecbe05 100644
--- a/src/app/models/smart_pool.rb
+++ b/src/app/models/smart_pool.rb
@@ -39,8 +39,13 @@ class SmartPool < Pool
   end
 
   def add_item(item)
-    tag = SmartPoolTag.new(:smart_pool => self, :tagged => item)
-    tag.save!
+    begin
+      tag = SmartPoolTag.new(:smart_pool => self, :tagged => item)
+      tag.save!
+    rescue ActiveRecord::RecordInvalid
+      # this is thrown if the tagged item already belongs to the smart pool
+      # this operation should be a no-op rather than an error
+    end
   end
   def remove_item(item)
     smart_pool_tags.find(:first, :conditions=> {
@@ -67,4 +72,27 @@ class SmartPool < Pool
       end
   end
 
+  def self.smart_pools_for_user(user)
+    nested_pools = DirectoryPool.get_smart_root.full_set_nested(
+                       :privilege => Permission::PRIV_MODIFY, :user => user,
+                       :smart_pool_set => true)
+    user_pools = []
+    other_pools = []
+    nested_pools.each do |pool_element|
+      pool = pool_element[:obj]
+      if pool.name == user
+        pool_element[:children].each do |child_element|
+          child_pool = child_element[:obj]
+          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]
+        end
+      end
+    end
+    user_pools[-1] << "break"
+    user_pools + other_pools
+  end
 end
diff --git a/src/app/models/storage_pool.rb b/src/app/models/storage_pool.rb
index aed2902..9c550b8 100644
--- a/src/app/models/storage_pool.rb
+++ b/src/app/models/storage_pool.rb
@@ -40,7 +40,8 @@ class StoragePool < ActiveRecord::Base
   validates_presence_of :hardware_pool_id
 
   acts_as_xapian :texts => [ :ip_addr, :target, :export_path, :type ],
-                 :terms => [ [ :search_users, 'U', "search_users" ] ]
+                 :terms => [ [ :search_users, 'U', "search_users" ] ],
+                 :eager_load => :smart_pools
   ISCSI = "iSCSI"
   NFS   = "NFS"
   LVM   = "LVM"
diff --git a/src/app/models/vm.rb b/src/app/models/vm.rb
index 2eff87a..61c407c 100644
--- a/src/app/models/vm.rb
+++ b/src/app/models/vm.rb
@@ -37,7 +37,8 @@ class Vm < ActiveRecord::Base
                         :memory_allocated, :vnic_mac_addr
 
   acts_as_xapian :texts => [ :uuid, :description, :vnic_mac_addr, :state ],
-                 :terms => [ [ :search_users, 'U', "search_users" ] ]
+                 :terms => [ [ :search_users, 'U', "search_users" ] ],
+                 :eager_load => :smart_pools
 
   BOOT_DEV_HD            = "hd"
   BOOT_DEV_NETWORK       = "network"
diff --git a/src/app/views/hardware/show_hosts.rhtml b/src/app/views/hardware/show_hosts.rhtml
index d33c920..2fd29bc 100644
--- a/src/app/views/hardware/show_hosts.rhtml
+++ b/src/app/views/hardware/show_hosts.rhtml
@@ -5,6 +5,21 @@
       <a id="move_link" href="#" onClick="return validate_for_move();"><%= image_tag "icon_move.png", :style=>"vertical-align:middle;" %>&nbsp;&nbsp;Move</a>
       <a id="move_link_hidden" href="<%= url_for :controller => 'hardware', :action => 'move', :id => @pool, :resource_type=>'hosts' %>" rel="facebox[.bolder]" style="display:none" ></a>
     </li>
+    <li>
+       <%= image_tag "icon_smartpool.png", :style => "vertical-align:middle;" %>&nbsp;&nbsp;Add to Smart Pool &nbsp;&nbsp;&nbsp;<%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %>
+       <ul>
+        <% smart_pools = SmartPool.smart_pools_for_user(@user) %>
+        <% smart_pools.each_index { |index| %>
+            <li onClick="add_hosts_to_smart_pool(<%=smart_pools[index][1]%>)"
+            <% if (index == smart_pools.length - 1) or smart_pools[index].length == 3 %>
+                style="border-bottom: 1px solid #CCCCCC;"
+            <% end %>
+               >
+                 <%=smart_pools[index][0]%>
+            </li>
+        <% } %>
+       </ul>
+    </li>
     <% if @pool.id != HardwarePool.get_default_pool.id %>
       <li><a href="#" onClick="remove_hosts()"><%= image_tag "icon_remove.png" %>&nbsp;&nbsp;Remove</a></li>
     <% end %>
@@ -22,6 +37,20 @@
       $('#move_link_hidden').click();
     }
   }
+  function add_hosts_to_smart_pool(smart_pool)
+  {
+    var hosts = get_selected_hosts();
+    if (validate_selected(hosts, "host")) {
+      $.post('<%= url_for :controller => "smart_pools", :action => "add_hosts" %>',
+             { resource_ids: hosts.toString(), id: smart_pool },
+             function(data,status){
+               $('#hosts_grid').flexReload();
+               if (data.alert) {
+                 $.jGrowl(data.alert);
+               }
+             }, 'json');
+    }
+  }
   function remove_hosts()
   {
     var hosts = get_selected_hosts();
diff --git a/src/app/views/hardware/show_storage.rhtml b/src/app/views/hardware/show_storage.rhtml
index 6466f9b..5ade456 100644
--- a/src/app/views/hardware/show_storage.rhtml
+++ b/src/app/views/hardware/show_storage.rhtml
@@ -6,6 +6,21 @@
       <a id="move_link_hidden" href="<%= url_for :controller => 'hardware', :action => 'move', :id => @pool, :resource_type=>'storage' %>" rel="facebox[.bolder]"  style="display:none" ></a>
     </li>
     <li>
+       <%= image_tag "icon_smartpool.png", :style => "vertical-align:middle;" %>&nbsp;&nbsp;Add to Smart Pool &nbsp;&nbsp;&nbsp;<%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %>
+       <ul>
+        <% smart_pools = SmartPool.smart_pools_for_user(@user) %>
+        <% smart_pools.each_index { |index| %>
+            <li onClick="add_storage_to_smart_pool(<%=smart_pools[index][1]%>)"
+            <% if (index == smart_pools.length - 1) or smart_pools[index].length == 3 %>
+                style="border-bottom: 1px solid #CCCCCC;"
+            <% end %>
+               >
+                 <%=smart_pools[index][0]%>
+            </li>
+        <% } %>
+       </ul>
+    </li>
+    <li>
       <a href="#" onClick="return validate_storage_for_remove();" ><%= image_tag "icon_remove.png", :style=>"vertical-align:middle;" %>&nbsp;&nbsp;Remove</a>
       <a id="remove_link_hidden" href="<%= url_for :controller => 'hardware', :action => 'removestorage', :id => @pool %>" rel="facebox[.bolder]"  style="display:none" ></a>
     </li>
@@ -13,6 +28,20 @@
 </div>
 
 <script type="text/javascript">
+  function add_storage_to_smart_pool(smart_pool)
+  {
+    var storage = get_selected_storage();
+    if (validate_selected(storage, "storage pool")) {
+      $.post('<%= url_for :controller => "smart_pools", :action => "add_storage" %>',
+             { resource_ids: storage.toString(), id: smart_pool },
+             function(data,status){
+               $('#storage_grid').flexReload();
+               if (data.alert) {
+                 $.jGrowl(data.alert);
+               }
+             }, 'json');
+    }
+  }
   function remove_storage()
   {
     var storage = get_selected_storage();
diff --git a/src/app/views/hardware/show_vms.rhtml b/src/app/views/hardware/show_vms.rhtml
index ee14758..6a8ded5 100644
--- a/src/app/views/hardware/show_vms.rhtml
+++ b/src/app/views/hardware/show_vms.rhtml
@@ -1,6 +1,21 @@
 <div id="toolbar_nav">
  <ul>
     <li><a href="<%= url_for :controller => 'resources', :action => 'new', :parent_id => @pool %>" rel="facebox[.bolder]"><%= image_tag "icon_add_vmpool.png", :style => "vertical-align:middle;" %>&nbsp;&nbsp;New Virtual Machine Pool</a></li>
+    <li>
+       <%= image_tag "icon_smartpool.png", :style => "vertical-align:middle;" %>&nbsp;&nbsp;Add to Smart Pool &nbsp;&nbsp;&nbsp;<%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %>
+       <ul>
+        <% smart_pools = SmartPool.smart_pools_for_user(@user) %>
+        <% smart_pools.each_index { |index| %>
+            <li onClick="add_vm_pools_to_smart_pool(<%=smart_pools[index][1]%>)"
+            <% if (index == smart_pools.length - 1) or smart_pools[index].length == 3 %>
+                style="border-bottom: 1px solid #CCCCCC;"
+            <% end %>
+               >
+                 <%=smart_pools[index][0]%>
+            </li>
+        <% } %>
+       </ul>
+    </li>
     <li><a href="#" onClick="delete_vm_pools()"><%= image_tag "icon_delete_white.png", :style => "vertical-align:middle;" %>&nbsp;&nbsp;Delete</a></li>
  </ul>
 </div>
@@ -9,6 +24,20 @@
   {
     return get_selected_checkboxes("vmpools_grid_form");
   }
+  function add_vm_pools_to_smart_pool(smart_pool)
+  {
+    var vm_pools = get_selected_vm_pools();
+    if (validate_selected(vm_pools, "vm pool")) {
+      $.post('<%= url_for :controller => "smart_pools", :action => "add_pools" %>',
+             { resource_ids: vm_pools.toString(), id: smart_pool },
+             function(data,status){
+               $('#vmpools_grid').flexReload();
+               if (data.alert) {
+                 $.jGrowl(data.alert);
+               }
+             }, 'json');
+    }
+  }
   function delete_vm_pools()
   {
     var vm_pools = get_selected_vm_pools();
diff --git a/src/app/views/resources/show_vms.rhtml b/src/app/views/resources/show_vms.rhtml
index beca048..6f757f9 100644
--- a/src/app/views/resources/show_vms.rhtml
+++ b/src/app/views/resources/show_vms.rhtml
@@ -16,6 +16,21 @@
         <% } %>
        </ul>
     </li>
+    <li>
+       <%= image_tag "icon_smartpool.png", :style => "vertical-align:middle;" %>&nbsp;&nbsp;Add to Smart Pool &nbsp;&nbsp;&nbsp;<%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %>
+       <ul>
+        <% smart_pools = SmartPool.smart_pools_for_user(@user) %>
+        <% smart_pools.each_index { |index| %>
+            <li onClick="add_vms_to_smart_pool(<%=smart_pools[index][1]%>)"
+            <% if (index == smart_pools.length - 1) or smart_pools[index].length == 3 %>
+                style="border-bottom: 1px solid #CCCCCC;"
+            <% end %>
+               >
+                 <%=smart_pools[index][0]%>
+            </li>
+        <% } %>
+       </ul>
+    </li>
     <li><a href="#" onClick="delete_vms()"><%= image_tag "icon_delete_white.png", :style => "vertical-align:middle;" %>&nbsp;&nbsp;Delete</a></li>
 </ul>
 </div>
@@ -24,6 +39,20 @@
   {
     return get_selected_checkboxes("vms_grid_form");
   }
+  function add_vms_to_smart_pool(smart_pool)
+  {
+    var vms = get_selected_vms();
+    if (validate_selected(vms, "vm")) {
+      $.post('<%= url_for :controller => "smart_pools", :action => "add_vms" %>',
+             { resource_ids: vms.toString(), id: smart_pool },
+             function(data,status){
+               $('#vms_grid').flexReload();
+               if (data.alert) {
+                 $.jGrowl(data.alert);
+               }
+             }, 'json');
+    }
+  }
   function delete_vms()
   {
     var vms = get_selected_vms();
diff --git a/src/app/views/search/_grid.rhtml b/src/app/views/search/_grid.rhtml
index 2e60646..fca1ba0 100644
--- a/src/app/views/search/_grid.rhtml
+++ b/src/app/views/search/_grid.rhtml
@@ -18,7 +18,8 @@
         <%= "{display: '', width : 20, align: 'left', process: #{table_id}checkbox}," if checkboxes %>
         {display: 'Name', width : 200, align: 'left'},
         {display: 'Type', width : 120, align: 'left'},
-        {display: '% Match', width : 60, align: 'left'}
+        {display: '% Match', width : 60, align: 'left'},
+        {display: 'Smart Pools', width : 200, align: 'left'}
 	],
     //sortname: "hostname",
     //sortorder: "asc",
diff --git a/src/app/views/search/results.rhtml b/src/app/views/search/results.rhtml
index a7641b7..1989054 100644
--- a/src/app/views/search/results.rhtml
+++ b/src/app/views/search/results.rhtml
@@ -5,9 +5,25 @@
       <input id="searchform-field" name="terms" value="<%=@terms%>" onkeypress="" type="text">
       <input id="searchform-button" src="<%= image_path "icon_search.png"%>" title="Search" type="image">
       <input id="searchform-model" type="hidden" name="model" value="<%=@model_param%>">
+      Search
     </li>
     <li>
-       <%= image_tag "icon_move.png", :style => "vertical-align:middle;" %>&nbsp;&nbsp;Actions &nbsp;&nbsp;&nbsp;<%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %>
+       <%= image_tag "icon_smartpool.png", :style => "vertical-align:middle;" %>&nbsp;&nbsp;Add to Smart Pool &nbsp;&nbsp;&nbsp;<%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %>
+       <ul>
+        <% smart_pools = SmartPool.smart_pools_for_user(@user) %>
+        <% smart_pools.each_index { |index| %>
+            <li onClick="add_results_to_smart_pool(<%=smart_pools[index][1]%>)"
+            <% if (index == smart_pools.length - 1) or smart_pools[index].length == 3 %>
+                style="border-bottom: 1px solid #CCCCCC;"
+            <% end %>
+               >
+                 <%=smart_pools[index][0]%>
+            </li>
+        <% } %>
+       </ul>
+    </li>
+    <li>
+       &nbsp;&nbsp;Show All &nbsp;&nbsp;&nbsp;<%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %>
        <ul>
         <% @types.each_index { |index| %>
 <!-- for each button we need to submit current form with "model" set to @types[index][1] --!>
@@ -40,6 +56,24 @@
                 { class_and_id: selected_ids[0].substring(3)})
     }
   }
+  function get_selected_results()
+  {
+    return get_selected_checkboxes("search_grid_form")
+  }
+  function add_results_to_smart_pool(smart_pool)
+  {
+    var results = get_selected_results();
+    if (validate_selected(results, "search result")) {
+      $.post('<%= url_for :controller => "smart_pools", :action => "add_items" %>',
+             { class_and_ids: results.toString(), id: smart_pool },
+             function(data,status){
+               $('#search_grid').flexReload();
+               if (data.alert) {
+                 $.jGrowl(data.alert);
+               }
+             }, 'json');
+    }
+  }
 </script>
 
 <div class="panel_header"></div>
@@ -48,7 +82,7 @@
       <%= render :partial => "/search/grid", :locals => { :table_id => "search_grid",
                                                         :terms => @terms,
                                                         :model => @model_param,
-                                                        :checkboxes => false,
+                                                        :checkboxes => true,
                                                         :on_select => "results_select" } %>
    </div>
    <div class="selection_detail" id="results_selection">
diff --git a/src/app/views/vm/_grid.rhtml b/src/app/views/vm/_grid.rhtml
index 85bf094..b137de6 100644
--- a/src/app/views/vm/_grid.rhtml
+++ b/src/app/views/vm/_grid.rhtml
@@ -29,7 +29,7 @@
         {display: '', name : 'id', width : 20, sortable : false, align: 'left', process: <%= table_id %>checkbox},
         {display: 'Description', name : 'description', width : 180, sortable : true, align: 'left'},
         {display: 'UUID', name : 'uuid', width : 180, sortable : true, align: 'left'},
-        <% if @pool.get_hardware_pool.can_view(@user) %>
+        <% if (pool.is_a? VmResourcePool) and pool.get_hardware_pool.can_view(@user) %>
             {display: 'Host', name : 'host', width: 180, sortable : true, align: 'left' },
         <% end %>
         {display: 'CPUs', name : 'num_vcpus_allocated', width : 40, sortable : true, align: 'left'},
-- 
1.5.5.1



From dpierce at redhat.com  Thu Oct 23 11:46:44 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Thu, 23 Oct 2008 07:46:44 -0400
Subject: [Ovirt-devel] [PATCH server] Changed the database configuration
	to	use a different database for development
In-Reply-To: <48FF91CD.4070803@redhat.com>
References: <1224529799-16294-1-git-send-email-dpierce@redhat.com>
	<48FF91CD.4070803@redhat.com>
Message-ID: <49006424.3000306@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Scott Seago wrote:
> Darryl L. Pierce wrote:
>> Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
>> ---
>>  scripts/ovirt-server-install |    2 +-
>>  src/config/database.yml      |   21 +++++++++++++++++----
>>  2 files changed, 18 insertions(+), 5 deletions(-)
>>
>>
>>   
> OK, now that I finally got my appliance up and running,
> 
> ACK -- seems to work fine with this change.

Pushed now into the repo.

Everybody, please take a moment on your next pull to create the
"ovirt_development" database in Postgres according to the steps in
config/database.yml.

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEUEARECAAYFAkkAZCEACgkQjaT4DmxOfxs6HwCfVh8c9sZpRGoB940qHTr6KO6/
lt4Al0+OHgtKqQXSnqaZMLIl4pWJPV0=
=A93R
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081023/b80696a5/attachment.vcf>

From dpierce at redhat.com  Thu Oct 23 11:56:24 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Thu, 23 Oct 2008 07:56:24 -0400
Subject: [Ovirt-devel] [PATCH server] Introduces a new IP address model.
	Moves IP addressing to a separate
In-Reply-To: <48FE4186.3080407@redhat.com>
References: <1224277864-13419-1-git-send-email-dpierce@redhat.com>
	<48FE4186.3080407@redhat.com>
Message-ID: <49006668.2090708@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Mohammed Morsi wrote:
> NACK. Applies nicely (albeit with whitespace complaints) and everything
> seems to work with a few caveats as described below / inline.
<snip>
>>  src/db/migrate/025_create_ip_addresses.rb          |   46 +++++++++
>>   
> It seems since you've sent this out, migration 025 has been committed,
> so you'll need to start at 026

Fixed.

<snip>
>> +# +IpAddress+ is the base class for all address related classes.
>> +#
>> +class IpAddress < ActiveRecord::Base
>> +
>> +end
>>   
> Why isn't there a "has_many :nics" and a "has_many :bonding"
> relationship in the IpAddress table. We wont be able to lookup nics /
> bondings from an ip address otherwise.

An IpAddress will only belong to either one Nic or one Bonding, so a
has_many didn't seem logical here. And I didn't know of a scenario where
there would be a search on IP address that couldn't be done from the nic
or bonding level; i.e., "find all nics where ip_address_id in (find id
from ip_addresses where ...)" So to keep the IpAddress clean I left it out.

Since it doesn't require a DB change to do, if we do find a needed
reason for modeling on the IpAddress side, we can introduce it then.

<snip>

>> diff --git a/src/host-browser/host-browser.rb b/src/host-browser/host-browser.rb
>> index 79d34e8..bbfbf3b 100755
>> --- a/src/host-browser/host-browser.rb
>> +++ b/src/host-browser/host-browser.rb
>> @@ -283,10 +283,10 @@ class HostBrowser
>>  
>>                      updated_nic = Nic.find_by_id(nic.id)
>>  
>> -                    updated_nic.bandwidth = detail['BANDWIDTH']
>>   
> Did you really mean to remove bandwidth here? I still see it in the db
> table after the migrations and this seems to be the only place that a
> change to it occurs.

Weird, but the above's not missing. I didn't remove it intentionally,
and it's not removed from the code in my repo. I'll send out an updated
patch to make sure something didn't get munged.

<snip>

> I ran these tests and everything succeeded flawlessly. For the most
> part, besides the mentioned items, everything seemed to come together
> and work nicely. Good job.

I'm sending an updated patch. Please review it as soon as you can.

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkkAZmIACgkQjaT4DmxOfxuCvgCdF71JAbGLhmp0giKyVI9LhhMv
SjEAnRnLx70haGOa0vBlEgClkBVo3UfF
=1lxu
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081023/1631d238/attachment.vcf>

From dpierce at redhat.com  Thu Oct 23 11:57:47 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Thu, 23 Oct 2008 07:57:47 -0400
Subject: [Ovirt-devel] [PATCH server] Replaced the config scripts with
	configuration encoding.
In-Reply-To: <20081022201758.GA1148@redhat.com>
References: <1224527121-13802-1-git-send-email-dpierce@redhat.com>
	<20081022201758.GA1148@redhat.com>
Message-ID: <490066BB.1040407@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Daniel P. Berrange wrote:
> On Mon, Oct 20, 2008 at 02:25:21PM -0400, Darryl L. Pierce wrote:
>> Rather than sending the node a series of scripts that load
>> kernel modules, or are tightly coupled to tools like augeas,
>> this patch introduces an encoding scheme for data.
>>
>> A line that begins with "bonding" describes a bonded interface.
>> >From it the configuration processor generates a simple bonding
>> file that includes an alias for the bonding kernel module
>>
>> A line that begins with "ifcfg" describes an network
>> interface. It will contain the mac address and interface name,
>> followed by all needed configuration values to bring the
>> interface up.
> 
> ACK, i think this looks good now. THough should we add some kind of version
> number field in the data file. A simple "version=1.0" line would just be
> sufficient to let us indicate changes in the future

That's not a bad idea. I can add it as an incremental change during the
UI implementation.

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkkAZrgACgkQjaT4DmxOfxsdjgCfWOk061XkSByeQj+ca7Ubhr3H
h1wAoPMwakIRyivM+PD/0Qt8n16yENBi
=qczI
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081023/2daa28da/attachment.vcf>

From dpierce at redhat.com  Thu Oct 23 11:59:53 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Thu, 23 Oct 2008 07:59:53 -0400
Subject: [Ovirt-devel] [PATCH server] Introduces a new IP address model.
	Moves IP addressing to a separate
Message-ID: <1224763193-5697-1-git-send-email-dpierce@redhat.com>

(NOTE: I checked and I believe the BANDWIDTH line that Mo saw previously is just showing where
that line and those around it were reformatted to keep the code readable)

You will need to run a migration after this patch to create the
ip_addresses table and massage the bondings and nics tables to
reference it.

NEW CLASSES:

IpAddress:   base class for addresses
IpV4Address: represents an IPv4 address
IpV6Address: represents an IPv6 address

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 src/app/models/bonding.rb                          |    1 +
 src/app/models/ip_address.rb                       |   25 +++++
 src/app/models/ip_v4_address.rb                    |   46 +++++++++
 src/app/models/ip_v6_address.rb                    |   40 ++++++++
 src/app/models/nic.rb                              |    2 +
 src/db/migrate/026_create_ip_addresses.rb          |   46 +++++++++
 ...027_move_nic_addresses_to_ip_addresses_table.rb |   56 +++++++++++
 ...8_move_bonding_address_to_ip_addresses_table.rb |   54 +++++++++++
 src/host-browser/host-browser.rb                   |   17 ++--
 src/lib/managed_node_configuration.rb              |    8 +-
 src/test/fixtures/bondings.yml                     |    4 +-
 src/test/fixtures/ip_addresses.yml                 |   55 +++++++++++
 src/test/fixtures/nics.yml                         |   82 ++++++++--------
 .../functional/managed_node_configuration_test.rb  |   26 +++---
 src/test/unit/ip_address_test.rb                   |    8 ++
 src/test/unit/ip_v4_address_test.rb                |   99 ++++++++++++++++++++
 src/test/unit/ip_v6_address_test.rb                |   82 ++++++++++++++++
 src/test/unit/nic_test.rb                          |    1 +
 18 files changed, 584 insertions(+), 68 deletions(-)
 create mode 100644 src/app/models/ip_address.rb
 create mode 100644 src/app/models/ip_v4_address.rb
 create mode 100644 src/app/models/ip_v6_address.rb
 create mode 100644 src/db/migrate/026_create_ip_addresses.rb
 create mode 100644 src/db/migrate/027_move_nic_addresses_to_ip_addresses_table.rb
 create mode 100644 src/db/migrate/028_move_bonding_address_to_ip_addresses_table.rb
 create mode 100644 src/test/fixtures/ip_addresses.yml
 create mode 100644 src/test/unit/ip_address_test.rb
 create mode 100644 src/test/unit/ip_v4_address_test.rb
 create mode 100644 src/test/unit/ip_v6_address_test.rb

diff --git a/src/app/models/bonding.rb b/src/app/models/bonding.rb
index 006c261..2fa4aa8 100644
--- a/src/app/models/bonding.rb
+++ b/src/app/models/bonding.rb
@@ -51,6 +51,7 @@ class Bonding < ActiveRecord::Base
   belongs_to :host
   belongs_to :bonding_type
   belongs_to :boot_type
+  belongs_to :ip_address
 
   has_and_belongs_to_many :nics,
     :join_table  => 'bondings_nics',
diff --git a/src/app/models/ip_address.rb b/src/app/models/ip_address.rb
new file mode 100644
index 0000000..f48cd4e
--- /dev/null
+++ b/src/app/models/ip_address.rb
@@ -0,0 +1,25 @@
+#
+# ip_address.rb
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+# +IpAddress+ is the base class for all address related classes.
+#
+class IpAddress < ActiveRecord::Base
+
+end
diff --git a/src/app/models/ip_v4_address.rb b/src/app/models/ip_v4_address.rb
new file mode 100644
index 0000000..4495a13
--- /dev/null
+++ b/src/app/models/ip_v4_address.rb
@@ -0,0 +1,46 @@
+# ip_v4_address.rb
+#
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+# +IpV4Address+ represents a single IPv4 address.
+#
+class IpV4Address < IpAddress
+  ADDRESS_TEST = %r{^(\d{1,3}\.){3}\d{1,3}$}
+
+  validates_presence_of :address,
+    :message => 'An address must be supplied.'
+  validates_format_of :address,
+    :with => ADDRESS_TEST
+
+  validates_presence_of :netmask,
+    :message => 'A netmask must be supplied.'
+  validates_format_of :netmask,
+    :with => ADDRESS_TEST
+
+  validates_presence_of :gateway,
+    :message => 'A gateway address must be supplied.'
+  validates_format_of :gateway,
+    :with => ADDRESS_TEST
+
+  validates_presence_of :broadcast,
+    :message => 'A broadcast address must be supplied.'
+  validates_format_of :broadcast,
+    :with => ADDRESS_TEST
+
+end
diff --git a/src/app/models/ip_v6_address.rb b/src/app/models/ip_v6_address.rb
new file mode 100644
index 0000000..1395886
--- /dev/null
+++ b/src/app/models/ip_v6_address.rb
@@ -0,0 +1,40 @@
+# ip_v6_address.rb
+#
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+# +IpV6Address+ represents a single IPv6 address.
+#
+class IpV6Address < IpAddress
+  ADDRESS_TEST = %r{^([0-9a-fA-F]{0,4}|0)(\:([0-9a-fA-F]{0,4}|0)){7}$}
+
+  validates_presence_of :address,
+    :message => 'An address must be provided.'
+  validates_format_of :address,
+    :with => ADDRESS_TEST
+
+  validates_presence_of :gateway,
+    :message => 'A gateway address must be provided.'
+  validates_format_of :gateway,
+    :with => ADDRESS_TEST
+
+  validates_presence_of :prefix,
+    :message => 'A prefix must be provided.'
+  validates_format_of :prefix,
+    :with => ADDRESS_TEST
+end
diff --git a/src/app/models/nic.rb b/src/app/models/nic.rb
index baf7095..69568a9 100644
--- a/src/app/models/nic.rb
+++ b/src/app/models/nic.rb
@@ -22,4 +22,6 @@ class Nic < ActiveRecord::Base
   belongs_to :boot_type
 
   has_and_belongs_to_many :bonding, :join_table => 'bondings_nics'
+
+  belongs_to :ip_address
 end
diff --git a/src/db/migrate/026_create_ip_addresses.rb b/src/db/migrate/026_create_ip_addresses.rb
new file mode 100644
index 0000000..0f528f4
--- /dev/null
+++ b/src/db/migrate/026_create_ip_addresses.rb
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+# Creates a single-inheritance table for both IPv4 and IPv6
+# addresses.
+#
+class CreateIpAddresses < ActiveRecord::Migration
+  def self.up
+    create_table :ip_addresses do |t|
+      t.string :type
+
+      # common attributes
+      t.string :address,   :limit => 39
+      t.string :gateway,   :limit => 39
+
+      # attributes for IPv4 (type=IpV4Address)
+      t.string :netmask,   :limit => 15
+      t.string :broadcast, :limit => 15
+
+      # attributes for IPv6 (type=IpV6Address)
+      t.string :prefix,    :limit => 39
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :ip_addresses
+  end
+end
diff --git a/src/db/migrate/027_move_nic_addresses_to_ip_addresses_table.rb b/src/db/migrate/027_move_nic_addresses_to_ip_addresses_table.rb
new file mode 100644
index 0000000..b873e4d
--- /dev/null
+++ b/src/db/migrate/027_move_nic_addresses_to_ip_addresses_table.rb
@@ -0,0 +1,56 @@
+#
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+class MoveNicAddressesToIpAddressesTable < ActiveRecord::Migration
+  def self.up
+    add_column :nics, :ip_address_id, :integer, :null => true
+
+    execute 'alter table nics add constraint fk_nic_ip_address
+             foreign key (ip_address_id) references ip_addresses(id)'
+
+    Nic.find(:all).each do |nic|
+      address = IpV4Address.new(:address   => nic.ip_addr,
+				:netmask   => nic.netmask,
+				:broadcast => nic.broadcast,
+				:gateway   => nic.ip_addr)
+      nic.ip_address = address
+
+      nic.save!
+      address.save!
+    end
+
+    remove_column :nics, :ip_addr
+    remove_column :nics, :netmask
+    remove_column :nics, :broadcast
+  end
+
+  def self.down
+    add_column :nics, :ip_addr,   :string, :limit => 16
+    add_column :nics, :netmask,   :string, :limit => 16
+    add_column :nics, :broadcast, :string, :limit => 16
+
+    Nic.find(:all).each do |nic|
+      nic.ip_addr   = nic.ip_address.address
+      nic.netmask   = nic.ip_address.netmask
+      nic.broadcast = nic.ip_address.broadcast
+    end
+
+    remove_column :nics, :ip_address_id
+  end
+end
diff --git a/src/db/migrate/028_move_bonding_address_to_ip_addresses_table.rb b/src/db/migrate/028_move_bonding_address_to_ip_addresses_table.rb
new file mode 100644
index 0000000..b0fed99
--- /dev/null
+++ b/src/db/migrate/028_move_bonding_address_to_ip_addresses_table.rb
@@ -0,0 +1,54 @@
+#
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+class MoveBondingAddressToIpAddressesTable < ActiveRecord::Migration
+  def self.up
+    add_column :bondings, :ip_address_id, :integer, :null => true
+
+    execute 'alter table bondings add constraint fk_bonding_ip_address
+             foreign key (ip_address_id) references ip_addresses(id)'
+
+    Bonding.find(:all).each do |bonding|
+      ip_address = IpV4Address.new(:address   => bonding.ip_addr,
+				   :netmask   => bonding.netmask,
+				   :broadcast => bonding.broadcast,
+				   :gateway   => bonding.ip_addr)
+    end
+
+    remove_column :bondings, :ip_addr
+    remove_column :bondings, :netmask
+    remove_column :bondings, :broadcast
+  end
+
+  def self.down
+    t.string  :ip_addr,         :null => true, :limit => 15
+    t.string  :netmask,         :null => true, :limit => 15
+    t.string  :broadcast,       :null => true, :limit => 15
+
+    Bonding.each do |bonding|
+      bonding.ip_addr   = bonding.ip_address.address
+      bonding.netmask   = bonding.ip_address.netmask
+      bonding.broadcast = bonding.ip_address.broadcast
+
+      bonding.save!
+    end
+
+    remove_column :bondings, :ip_address_id
+  end
+end
diff --git a/src/host-browser/host-browser.rb b/src/host-browser/host-browser.rb
index 79d34e8..bbfbf3b 100755
--- a/src/host-browser/host-browser.rb
+++ b/src/host-browser/host-browser.rb
@@ -283,10 +283,10 @@ class HostBrowser
 
                     updated_nic = Nic.find_by_id(nic.id)
 
-                    updated_nic.bandwidth = detail['BANDWIDTH']
-                    updated_nic.ip_addr   = detail['IP_ADDRESS']
-                    updated_nic.netmask   = detail['NETMASK']
-                    updated_nic.broadcast = detail['BROADCAST']
+                    updated_nic.bandwidth            = detail['BANDWIDTH']
+                    updated_nic.ip_address.address   = detail['IP_ADDRESS']
+                    updated_nic.ip_address.netmask   = detail['NETMASK']
+                    updated_nic.ip_address.broadcast = detail['BROADCAST']
 
                     updated_nic.save!
                     found=true
@@ -310,11 +310,14 @@ class HostBrowser
                 'mac'          => nic['MAC'].upcase,
                 'bandwidth'    => nic['BANDWIDTH'],
                 'usage_type'   => 1,
-                'ip_addr'      => nic['IP_ADDRESS'],
-                'netmask'      => nic['NETMASK'],
-                'broadcast'    => nic['BROADCAST'],
                 'boot_type_id' => boot_type.id)
 
+	    ip_address = IpV4Address.new('address'   => nic['IP_ADDRESS'],
+					 'netmask'   => nic['NETMASK'],
+					 'broadcast' => nic['BROADCAST'],
+					 'gateway'   => nic['GATEWAY'])
+	    detail.ip_address = ip_address
+
             host.nics << detail
         end
 
diff --git a/src/lib/managed_node_configuration.rb b/src/lib/managed_node_configuration.rb
index 93f8448..fff7914 100644
--- a/src/lib/managed_node_configuration.rb
+++ b/src/lib/managed_node_configuration.rb
@@ -51,7 +51,7 @@ class ManagedNodeConfiguration
     host.bondings.each do |bonding|
       result.puts "rm #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}"
       result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/DEVICE #{bonding.interface_name}"
-      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/IPADDR #{bonding.ip_addr}" if bonding.ip_addr
+      result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/IPADDR #{bonding.ip_address.address}" if bonding.ip_address
       result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{bonding.interface_name}/ONBOOT yes"
 
       bonding.nics.each do |nic|
@@ -97,9 +97,9 @@ class ManagedNodeConfiguration
         result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BOOTPROTO #{nic.boot_type.proto}"
 
         if nic.boot_type.proto == 'static'
-          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/IPADDR #{nic.ip_addr}"
-          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/NETMASK #{nic.netmask}"
-          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BROADCAST #{nic.broadcast}"
+          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/IPADDR #{nic.ip_address.address}"
+          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/NETMASK #{nic.ip_address.netmask}"
+          result.puts "set #{NIC_ENTRY_PREFIX}/ifcfg-#{iface_name}/BROADCAST #{nic.ip_address.broadcast}"
         end
 
 	if bridged
diff --git a/src/test/fixtures/bondings.yml b/src/test/fixtures/bondings.yml
index 29473c7..1a74f42 100644
--- a/src/test/fixtures/bondings.yml
+++ b/src/test/fixtures/bondings.yml
@@ -4,8 +4,6 @@ mailservers_managed_node_bonding:
     bonding_type_id: <%= Fixtures.identify(:link_aggregation_bonding_type) %>
     host_id: <%= Fixtures.identify(:mailservers_managed_node) %>
     boot_type_id: <%= Fixtures.identify(:boot_type_static) %>
-    ip_addr: 172.31.0.15
-    netmask: 255.255.255.
-    broadcast: 172.31.0.255
+    ip_address_id: <%= Fixtures.identify(:ip_v4_mailservers_managed_node_bonding) %>
     arp_ping_address: 172.31.0.100
     arp_interval: 0
diff --git a/src/test/fixtures/ip_addresses.yml b/src/test/fixtures/ip_addresses.yml
new file mode 100644
index 0000000..0472669
--- /dev/null
+++ b/src/test/fixtures/ip_addresses.yml
@@ -0,0 +1,55 @@
+ip_v4_one:
+  type: IpV4Address
+  address: 1.2.3.4
+  netmask: 255.255.255.0
+  gateway: 1.2.3.1
+  broadcast: 1.2.3.255
+
+ip_v4_two:
+  type: IpV4Address
+  address: 2.3.4.5
+  netmask: 255.255.255.0
+  gateway: 1.2.3.1
+  broadcast: 2.3.4.255
+
+ip_v4_three:
+  type: IpV4Address
+  address: 3.4.5.6
+  netmask: 255.255.255.0
+  gateway: 3.4.5.1
+  broadcast: 3.4.5.255
+
+ip_v4_four:
+  type: IpV4Address
+  address: 3.4.5.6
+  netmask: 255.255.255.0
+  gateway: 3.4.5.1
+  broadcast: 3.4.5.255
+
+ip_v4_mailserver_nic_one:
+  type: IpV4Address
+  address: 172.31.0.15
+  netmask: 255.255.255.0
+  gateway: 172.31.0.1
+  broadcast: 172.31.0.255
+
+ip_v4_ldapserver_nic_one:
+  type: IpV4Address
+  address: 172.31.0.25
+  netmask: 255.255.255.0
+  gateway: 172.31.0.1
+  broadcast: 172.31.0.255
+
+ip_v4_buildserver_nic_two:
+  type: IpV4Address
+  address: 172.31.0.31
+  netmask: 255.255.255.0
+  gateway: 172.31.0.1
+  broadcast: 172.31.0.255
+
+ip_v4_mailservers_managed_node_bonding:
+  type: IpV4Address
+  address: 192.168.50.100
+  netmask: 255.255.255.0
+  gateway: 192.168.50.1
+  broadcast: 192.168.50.255
diff --git a/src/test/fixtures/nics.yml b/src/test/fixtures/nics.yml
index ccf71d2..dbbc511 100644
--- a/src/test/fixtures/nics.yml
+++ b/src/test/fixtures/nics.yml
@@ -1,80 +1,80 @@
 one:
   id: 1
   mac: '00:11:22:33:44:55'
-  ip_addr: '1.2.3.4'
-  usage_type: '1'
+  ip_address_id: <%= Fixtures.identify(:ip_v4_one) %>
   bandwidth: 100
   host_id: 10
   boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
+
 two:
   id: 2
   mac: 'AA:BB:CC:DD:EE:FF'
-  ip_addr: '2.3.4.5'
+  ip_address_id: <%= Fixtures.identify(:ip_v4_two) %>
   usage_type: '2'
   bandwidth: 1000
   host_id: 10
   boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
+
 three:
   id: 3
   mac: '00:FF:11:EE:22:DD'
-  ip_addr: '3.4.5.6'
+  ip_address_id: <%= Fixtures.identify(:ip_v4_three) %>
   usage_type: '1'
   bandwidth: 10
   host_id: 10
   boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
+
 four:
   id: 4
   mac: '00:FF:11:EE:22:DD'
-  ip_addr: '3.4.5.6'
+  ip_address: <%= Fixtures.identify(:ip_v4_four) %>
   usage_type: '1'
   bandwidth: 10
   host_id: 10
   boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
 
 mailserver_nic_one:
-    mac: '00:11:22:33:44:55'
-    usage_type: '1'
-    bandwidth: 100
-    ip_addr: '172.31.0.15'
-    host_id: <%= Fixtures.identify(:mailservers_managed_node) %>
-    boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
+  mac: '00:11:22:33:44:55'
+  ip_address: <%= Fixtures.identify(:ip_v4_mailserver_nic_one) %>
+  usage_type: '1'
+  bandwidth: 100
+  host_id: <%= Fixtures.identify(:mailservers_managed_node) %>
+  boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
 
 mailserver_nic_two:
-    mac: '22:11:33:66:44:55'
-    usage_type: '1'
-    bandwidth: 100
-    host_id: <%= Fixtures.identify(:mailservers_managed_node) %>
-    boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
+  mac: '22:11:33:66:44:55'
+  usage_type: '1'
+  bandwidth: 100
+  host_id: <%= Fixtures.identify(:mailservers_managed_node) %>
+  boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
 
 fileserver_nic_one:
-    mac: '00:99:00:99:13:07'
-    usage_type: '1'
-    bandwidth: 100
-    host_id: <%= Fixtures.identify(:fileserver_managed_node) %>
-    boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
+  mac: '00:99:00:99:13:07'
+  usage_type: '1'
+  bandwidth: 100
+  host_id: <%= Fixtures.identify(:fileserver_managed_node) %>
+  boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
 
 ldapserver_nic_one:
-    mac: '00:03:02:00:09:06'
-    usage_type: '1'
-    bandwidth: 100
-    bridge: 'ovirtbr0'
-    ip_addr: '172.31.0.25'
-    host_id: <%= Fixtures.identify(:ldapserver_managed_node) %>
-    boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
+  mac: '00:03:02:00:09:06'
+  usage_type: '1'
+  bandwidth: 100
+  bridge: 'ovirtbr0'
+  ip_address_id: <%= Fixtures.identify(:ip_v4_ldapserver_nic_one) %>
+  host_id: <%= Fixtures.identify(:ldapserver_managed_node) %>
+  boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
 
 buildserver_nic_one:
-    mac: '07:17:19:65:03:38'
-    usage_type: '1'
-    bandwidth: 100
-    host_id: <%= Fixtures.identify(:buildserver_managed_node) %>
-    boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
+  mac: '07:17:19:65:03:38'
+  usage_type: '1'
+  bandwidth: 100
+  host_id: <%= Fixtures.identify(:buildserver_managed_node) %>
+  boot_type_id: <%= Fixtures.identify(:boot_type_dhcp) %>
 
 buildserver_nic_two:
-    mac: '07:17:19:65:03:39'
-    usage_type: '1'
-    bandwidth: 100
-    ip_addr: '172.31.0.31'
-    netmask: '255.255.255.0'
-    broadcast: '172.31.0.255'
-    host_id: <%= Fixtures.identify(:buildserver_managed_node) %>
-    boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
+  mac: '07:17:19:65:03:39'
+  usage_type: '1'
+  bandwidth: 100
+  ip_address_id: <%= Fixtures.identify(:ip_v4_buildserver_nic_two) %>
+  host_id: <%= Fixtures.identify(:buildserver_managed_node) %>
+  boot_type_id: <%= Fixtures.identify(:boot_type_static_ip) %>
diff --git a/src/test/functional/managed_node_configuration_test.rb b/src/test/functional/managed_node_configuration_test.rb
index d0d8aa3..2158c8d 100644
--- a/src/test/functional/managed_node_configuration_test.rb
+++ b/src/test/functional/managed_node_configuration_test.rb
@@ -83,17 +83,17 @@ cat <<\EOF > /var/tmp/node-augtool
 rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
 set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
 set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BOOTPROTO #{nic.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/IPADDR #{nic.ip_addr}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/NETMASK #{nic.netmask}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BROADCAST #{nic.broadcast}
+set /files/etc/sysconfig/network-scripts/ifcfg-eth0/IPADDR #{nic.ip_address.address}
+set /files/etc/sysconfig/network-scripts/ifcfg-eth0/NETMASK #{nic.ip_address.netmask}
+set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BROADCAST #{nic.ip_address.broadcast}
 set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BRIDGE ovirtbr0
 set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
 rm /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0
 set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DEVICE ovirtbr0
 set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BOOTPROTO #{nic.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/IPADDR #{nic.ip_addr}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/NETMASK #{nic.netmask}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BROADCAST #{nic.broadcast}
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/IPADDR #{nic.ip_address.address}
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/NETMASK #{nic.ip_address.netmask}
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BROADCAST #{nic.ip_address.broadcast}
 set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/TYPE bridge
 set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/PEERNTP yes
 set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DELAY 0
@@ -123,17 +123,17 @@ cat <<\EOF > /var/tmp/node-augtool
 rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
 set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
 set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BOOTPROTO #{nic1.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/IPADDR #{nic1.ip_addr}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/NETMASK #{nic1.netmask}
-set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BROADCAST #{nic1.broadcast}
+set /files/etc/sysconfig/network-scripts/ifcfg-eth0/IPADDR #{nic1.ip_address.address}
+set /files/etc/sysconfig/network-scripts/ifcfg-eth0/NETMASK #{nic1.ip_address.netmask}
+set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BROADCAST #{nic1.ip_address.broadcast}
 set /files/etc/sysconfig/network-scripts/ifcfg-eth0/BRIDGE ovirtbr0
 set /files/etc/sysconfig/network-scripts/ifcfg-eth0/ONBOOT yes
 rm /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0
 set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DEVICE ovirtbr0
 set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BOOTPROTO #{nic1.boot_type.proto}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/IPADDR #{nic1.ip_addr}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/NETMASK #{nic1.netmask}
-set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BROADCAST #{nic1.broadcast}
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/IPADDR #{nic1.ip_address.address}
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/NETMASK #{nic1.ip_address.netmask}
+set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/BROADCAST #{nic1.ip_address.broadcast}
 set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/TYPE bridge
 set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/PEERNTP yes
 set /files/etc/sysconfig/network-scripts/ifcfg-ovirtbr0/DELAY 0
@@ -177,7 +177,7 @@ EOF
 cat <<\EOF > /var/tmp/node-augtool
 rm /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}
 set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/DEVICE #{bonding.interface_name}
-set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/IPADDR 172.31.0.15
+set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/IPADDR #{bonding.ip_address.address}
 set /files/etc/sysconfig/network-scripts/ifcfg-#{bonding.interface_name}/ONBOOT yes
 rm /files/etc/sysconfig/network-scripts/ifcfg-eth0
 set /files/etc/sysconfig/network-scripts/ifcfg-eth0/DEVICE eth0
diff --git a/src/test/unit/ip_address_test.rb b/src/test/unit/ip_address_test.rb
new file mode 100644
index 0000000..152578e
--- /dev/null
+++ b/src/test/unit/ip_address_test.rb
@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class IpAddressTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end
diff --git a/src/test/unit/ip_v4_address_test.rb b/src/test/unit/ip_v4_address_test.rb
new file mode 100644
index 0000000..14f0175
--- /dev/null
+++ b/src/test/unit/ip_v4_address_test.rb
@@ -0,0 +1,99 @@
+#
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+require File.dirname(__FILE__) + '/../test_helper'
+
+class IpV4AddressTest < ActiveSupport::TestCase
+  def setup
+    @address = IpV4Address.new(:address   => '192.168.50.2',
+			       :netmask   => '255.255.255.0',
+			       :gateway   => '192.168.50.1',
+			       :broadcast => '192.168.50.255')
+  end
+
+  # Ensures that an address must be supplied.
+  #
+  def test_valid_fails_without_address
+    @address.address = nil
+
+    flunk "An address must be present." if @address.valid?
+  end
+
+  # Ensures that an address has to be in the correct format.
+  #
+  def test_valid_fails_with_bad_address
+    @address.address = '192.168'
+
+    flunk "An address must be in the format ##.##.##.##." if @address.valid?
+  end
+
+  # Ensures that a netmask must be supplied.
+  #
+  def test_valid_fails_without_netmask
+    @address.netmask = nil
+
+    flunk "An address must have a netmask." if @address.valid?
+  end
+
+  # Ensures that a netmask must have the correct format.
+  #
+  def test_valid_fails_with_bad_netmask
+    @address.netmask = 'farkle'
+
+    flunk "A netmask must be in the format ##.##.##.##." if @address.valid?
+  end
+
+  # Ensures that a gateway must be supplied.
+  #
+  def test_valid_fails_without_gateway
+    @address.gateway = nil
+
+    flunk "A gateway address must be supplied." if @address.valid?
+  end
+
+  # Ensures that a gateway must be in the correct format.
+  #
+  def test_valid_fails_with_bad_gateway
+    @address.gateway = '-3.a2.0.8'
+
+    flunk "The gateway address must be in the format ##.##.##.##." if @address.valid?
+  end
+
+  # Ensures that a broadcast must be supplied.
+  #
+  def test_valid_fails_without_broadcast
+    @address.broadcast = nil
+
+    flunk "A broadcast addres must be supplied." if @address.valid?
+  end
+
+  # Ensures that a broadcast must be in the correct format.
+  #
+  def test_valid_fails_with_bad_broadcast
+    @address.broadcast = '-3.2.0.8'
+
+    flunk "The broadcast address must be in the format ##.##.##.##." if @address.valid?
+  end
+
+  # Ensures that a well-formed address is valid.
+  #
+  def test_valid
+    flunk "There is an error with validation." unless @address.valid?
+  end
+end
diff --git a/src/test/unit/ip_v6_address_test.rb b/src/test/unit/ip_v6_address_test.rb
new file mode 100644
index 0000000..a2be85f
--- /dev/null
+++ b/src/test/unit/ip_v6_address_test.rb
@@ -0,0 +1,82 @@
+#
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+require File.dirname(__FILE__) + '/../test_helper'
+
+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')
+  end
+
+  # Ensures that the address must be provided.
+  #
+  def test_valid_fails_without_address
+    @address.address = nil
+
+    flunk "An address must be provided." if @address.valid?
+  end
+
+  # Ensures that the address must be in the correct format.
+  #
+  def test_valid_fails_with_bad_address
+    @address.address = "farkle"
+
+    flunk "The address must be in the correct format." if @address.valid?
+  end
+
+  # Ensures that the gateway must be provided.
+  #
+  def test_valid_fails_without_gateway
+    @address.gateway = nil
+
+    flunk "The gateway address must be provided." if @address.valid?
+  end
+
+  # Ensures that the gateway address is in the correct format.
+  #
+  def test_valid_fails_with_bad_gateway
+    @address.gateway = '0-:::::::717'
+
+    flunk "The gateway address must be in the correct format." if @address.valid?
+  end
+
+  # Ensures that the prefix must be provided.
+  #
+  def test_valid_fails_without_prefix
+    @address.prefix = nil
+
+    flunk "The prefix must be provided." if @address.valid?
+  end
+
+  # Ensures that the prefix is in the correct format.
+  #
+  def test_valid_fails_with_invalid_prefix
+    @address.prefix = 'whoops'
+
+    flunk "The prefix must be in the correct format." if @address.valid?
+  end
+
+  # Ensures that a well-formed address is considered valid.
+  #
+  def test_valid
+    flunk "There is an problem with address validation." unless @address.valid?
+  end
+end
diff --git a/src/test/unit/nic_test.rb b/src/test/unit/nic_test.rb
index a0776a2..1de1e00 100644
--- a/src/test/unit/nic_test.rb
+++ b/src/test/unit/nic_test.rb
@@ -20,6 +20,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class NicTest < Test::Unit::TestCase
+  fixtures :ip_addresses
   fixtures :nics
 
   # Replace this with your real tests.
-- 
1.5.5.1



From dpierce at redhat.com  Thu Oct 23 12:01:59 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Thu, 23 Oct 2008 08:01:59 -0400
Subject: [Ovirt-devel] [PATCH server] Replaced the config scripts with
	configuration encoding.
In-Reply-To: <20081022201758.GA1148@redhat.com>
References: <1224527121-13802-1-git-send-email-dpierce@redhat.com>
	<20081022201758.GA1148@redhat.com>
Message-ID: <490067B7.3070001@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Daniel P. Berrange wrote:
> On Mon, Oct 20, 2008 at 02:25:21PM -0400, Darryl L. Pierce wrote:
>> Rather than sending the node a series of scripts that load
>> kernel modules, or are tightly coupled to tools like augeas,
>> this patch introduces an encoding scheme for data.
>>
>> A line that begins with "bonding" describes a bonded interface.
>> >From it the configuration processor generates a simple bonding
>> file that includes an alias for the bonding kernel module
>>
>> A line that begins with "ifcfg" describes an network
>> interface. It will contain the mac address and interface name,
>> followed by all needed configuration values to bring the
>> interface up.
> 
> ACK, i think this looks good now. THough should we add some kind of version
> number field in the data file. A simple "version=1.0" line would just be
> sufficient to let us indicate changes in the future

Pushed. Thanks. :)

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkkAZ7QACgkQjaT4DmxOfxsWgwCghlDSP5jjLaBtA1v3XD2WrzcE
rRkAn141Xx02b8rKC0UjazEnuccsfE8u
=yq6U
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081023/c5a4217d/attachment.vcf>

From dpierce at redhat.com  Thu Oct 23 12:02:26 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Thu, 23 Oct 2008 08:02:26 -0400
Subject: [Ovirt-devel] [PATCH node] Updated the configuration processing
	to remove the need for scripts.
In-Reply-To: <20081022201828.GB1148@redhat.com>
References: <1224527170-13867-1-git-send-email-dpierce@redhat.com>
	<20081022201828.GB1148@redhat.com>
Message-ID: <490067D2.6000101@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Daniel P. Berrange wrote:
> On Mon, Oct 20, 2008 at 02:26:10PM -0400, Darryl L. Pierce wrote:
>> The system now takes an encoded configuration descriptor from the server. It
>> then parses from that a set of aliases for bondings if such exist. It then
>> also extracts configuration details for the various network interfaces on the
>> node. Afterward, it reloads module dependencies and then restarts the
>> networking service.
> 
> ACK, this looks good now.

Pushed. Thanks. :)

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkkAZ84ACgkQjaT4DmxOfxvUlgCfXiop3GwjY0gEjt/Ue2Taexg9
RWEAn2QgI61mYj0b7XUgH+vxnV6+Li6N
=ZBP3
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081023/27c35893/attachment.vcf>

From dpierce at redhat.com  Thu Oct 23 12:20:51 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Thu, 23 Oct 2008 08:20:51 -0400
Subject: [Ovirt-devel] [PATCH server] BUG#467099: Fixes a uniqueness
	constraint bug in bondings_nics.
Message-ID: <1224764451-7447-1-git-send-email-dpierce@redhat.com>

It moves the uniqueness constraint from being on the pair (bonding_id, nic_id)
to being only on nic_id. The goal is just to ensure that a nic is only mapped
once to any bonding.

You will need to run a migration with this patch.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 ...ll.rb => 026_allow_nic_boot_type_to_be_null.rb} |    0 
 ..._fix_uniqueness_constraints_in_bondings_nics.rb |   11 +++++++++++
 2 files changed, 11 insertions(+), 0 deletions(-)
 rename src/db/migrate/{025_allow_nic_boot_type_to_be_null.rb => 026_allow_nic_boot_type_to_be_null.rb} (100%)
 create mode 100644 src/db/migrate/027_fix_uniqueness_constraints_in_bondings_nics.rb

diff --git a/src/db/migrate/025_allow_nic_boot_type_to_be_null.rb b/src/db/migrate/026_allow_nic_boot_type_to_be_null.rb
similarity index 100%
rename from src/db/migrate/025_allow_nic_boot_type_to_be_null.rb
rename to src/db/migrate/026_allow_nic_boot_type_to_be_null.rb
diff --git a/src/db/migrate/027_fix_uniqueness_constraints_in_bondings_nics.rb b/src/db/migrate/027_fix_uniqueness_constraints_in_bondings_nics.rb
new file mode 100644
index 0000000..0daa210
--- /dev/null
+++ b/src/db/migrate/027_fix_uniqueness_constraints_in_bondings_nics.rb
@@ -0,0 +1,11 @@
+class FixUniquenessConstraintsInBondingsNics < ActiveRecord::Migration
+  def self.up
+    remove_index :bondings_nics, [:bonding_id, :nic_id]
+    add_index :bondings_nics, :nic_id, :unique => true
+  end
+
+  def self.down
+    remove_index :bondings_nics, :nic_id
+    add_index :bondings_nics, [:bonding_id, :nic_id], :unique => true
+  end
+end
-- 
1.5.5.1



From dpierce at redhat.com  Thu Oct 23 13:14:05 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Thu, 23 Oct 2008 09:14:05 -0400
Subject: [Ovirt-devel] Re: Ovirt-qpid API
In-Reply-To: <20081022103638.7b86fac4@tp.mains.net>
References: <20081008211933.089ac7a8@tp.mains.net>
	<20081022103638.7b86fac4@tp.mains.net>
Message-ID: <4900789D.5040207@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Ian Main wrote:

<snip>

>   <class name="BondInterface">
>     <property name="OvirtNode" type="objId" references="ovirtNode" access="RC" index="y" parentRef="y" desc="Keep track of hardware node these interfaces belong to."/>
>     <property name="interfaceName" type="sstr" access="RC" desc="Network interface name."/>
>     <property name="bondingMode" type="uint32" desc="Bonding mode"/>
>     <property name="dhcp" type="bool" desc="true/false - use DHCP for interface.  If false properties will be saved and restored for static IP."/>
>     <property name="enableIPv6" type="bool" desc="true/false - enable IPv6 on interface."/>
>     <property name="dhcp6" type="bool" desc="true/false - use DHCP for IPv6 on interface."/>
>     <property name="mac" type="uint64" desc="MAC address."/>
>     <property name="master" type="objId" desc="Master device interface name."/>
>     <method name="restart" desc="Restart the interface to allow changes to properties to take effect."/>
>   </class>

We would also need a way to send option arguments for the bonding kernel
module, such as miimon value, arp-interval and targets, etc. Can we add
a flexible field for passing such arguments, or else select a subset
that's needed and surface them as fields in the above?


- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkkAeJoACgkQjaT4DmxOfxv75ACgrqmuzFZVpAsYGFEebnylrtHH
kvEAn1YOs7fP+tG3KsK4NuLK1g3Q9jt2
=Z8z+
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081023/b506b17d/attachment.vcf>

From jguiditt at redhat.com  Thu Oct 23 16:01:58 2008
From: jguiditt at redhat.com (Jason Guiditta)
Date: Thu, 23 Oct 2008 12:01:58 -0400
Subject: [Ovirt-devel] How to handle 3rd party code?
Message-ID: <1224777718.4805.33.camel@localhost.localdomain>

I have been meaning to send an email to the list about this for weeks.
I am looking to assemble a consensus on how to handle version control
for some 3rd party code we are using in the server suite.  These are,
for the moment at least, rails plugins (not necessarily available as
gems or rpms) and javascript libraries/plugins.  There are a couple of
issues we need to solve here:
1) Keeping up to date on these bits of code, which may or may not be
available in git (a lot of the javascript is hosted in svn, some no
version control at all)
2) We may have our own patches that we need to carry, though of course
we will try to push them upstream.
3) Many of these items do no follow our practices- specifically
whitespace and ^Ms.  This makes it difficult to drop in the updated code
and compare it to our (cleaned-up) version in git, especially if we have
made any changes/customizations.

The only idea I have heard/read about that seems to be a possible good
solution is sub-modules, but there seems to be a fair amount of
maintenance involved in keeping them in synch with our main repo
whenever we do an update or patch to one of the modules.  From what I
have seen, you have to have a reference in the main repo pointing to the
sub-module, including correct version.  This would mean every update to
the sub-module would also require an update to the server repo, which is
easy enough, but feels like something that would easily be missed. Maybe
this is easier than I think, perhaps someone else can clear that up for
me.  Also, if there are issues I did not outline above, please speak up
so we can consider those as well.

-j



From dpierce at redhat.com  Thu Oct 23 16:05:43 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Thu, 23 Oct 2008 12:05:43 -0400
Subject: [Ovirt-devel] How to handle 3rd party code?
In-Reply-To: <1224777718.4805.33.camel@localhost.localdomain>
References: <1224777718.4805.33.camel@localhost.localdomain>
Message-ID: <4900A0D7.6010704@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Jason Guiditta wrote:
> I have been meaning to send an email to the list about this for weeks.
> I am looking to assemble a consensus on how to handle version control
> for some 3rd party code we are using in the server suite.  These are,
> for the moment at least, rails plugins (not necessarily available as
> gems or rpms) and javascript libraries/plugins.  There are a couple of
> issues we need to solve here:
> 1) Keeping up to date on these bits of code, which may or may not be
> available in git (a lot of the javascript is hosted in svn, some no
> version control at all)
> 2) We may have our own patches that we need to carry, though of course
> we will try to push them upstream.
> 3) Many of these items do no follow our practices- specifically
> whitespace and ^Ms.  This makes it difficult to drop in the updated code
> and compare it to our (cleaned-up) version in git, especially if we have
> made any changes/customizations.
> 
> The only idea I have heard/read about that seems to be a possible good
> solution is sub-modules, but there seems to be a fair amount of
> maintenance involved in keeping them in synch with our main repo
> whenever we do an update or patch to one of the modules.  From what I
> have seen, you have to have a reference in the main repo pointing to the
> sub-module, including correct version.  This would mean every update to
> the sub-module would also require an update to the server repo, which is
> easy enough, but feels like something that would easily be missed. Maybe
> this is easier than I think, perhaps someone else can clear that up for
> me.  Also, if there are issues I did not outline above, please speak up
> so we can consider those as well.

I think the best solution would be to keep their code out of our
repository and instead package them as separate RPMs and then depend on
them from ours. As an example, look at how we require rubygem-cobbler
and rubygem-activeldap. Neither is kept in our repository.

How many dependencies do we have?

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkkAoNMACgkQjaT4DmxOfxvvLQCg82f4No1ZWZ7ZPticVZyz6zI0
YMAAnjENKEVDWcAJlXT+s7mPKnIltesX
=fMUb
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081023/e53d35b1/attachment.vcf>

From sseago at redhat.com  Thu Oct 23 16:17:19 2008
From: sseago at redhat.com (Scott Seago)
Date: Thu, 23 Oct 2008 12:17:19 -0400
Subject: [Ovirt-devel] How to handle 3rd party code?
In-Reply-To: <4900A0D7.6010704@redhat.com>
References: <1224777718.4805.33.camel@localhost.localdomain>
	<4900A0D7.6010704@redhat.com>
Message-ID: <4900A38F.9030805@redhat.com>

Darryl Pierce wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Jason Guiditta wrote:
>   
>> I have been meaning to send an email to the list about this for weeks.
>> I am looking to assemble a consensus on how to handle version control
>> for some 3rd party code we are using in the server suite.  These are,
>> for the moment at least, rails plugins (not necessarily available as
>> gems or rpms) and javascript libraries/plugins.  There are a couple of
>> issues we need to solve here:
>> 1) Keeping up to date on these bits of code, which may or may not be
>> available in git (a lot of the javascript is hosted in svn, some no
>> version control at all)
>> 2) We may have our own patches that we need to carry, though of course
>> we will try to push them upstream.
>> 3) Many of these items do no follow our practices- specifically
>> whitespace and ^Ms.  This makes it difficult to drop in the updated code
>> and compare it to our (cleaned-up) version in git, especially if we have
>> made any changes/customizations.
>>
>> The only idea I have heard/read about that seems to be a possible good
>> solution is sub-modules, but there seems to be a fair amount of
>> maintenance involved in keeping them in synch with our main repo
>> whenever we do an update or patch to one of the modules.  From what I
>> have seen, you have to have a reference in the main repo pointing to the
>> sub-module, including correct version.  This would mean every update to
>> the sub-module would also require an update to the server repo, which is
>> easy enough, but feels like something that would easily be missed. Maybe
>> this is easier than I think, perhaps someone else can clear that up for
>> me.  Also, if there are issues I did not outline above, please speak up
>> so we can consider those as well.
>>     
>
> I think the best solution would be to keep their code out of our
> repository and instead package them as separate RPMs and then depend on
> them from ours. As an example, look at how we require rubygem-cobbler
> and rubygem-activeldap. Neither is kept in our repository.
>
> How many dependencies do we have?
>
>   
The difficulty here is that we're not talking about the sort of reusable 
components that just need to be installed in a standard location and 
added to the right search path (as is the case with rubygem-cobbler). 
We've got javascript files that need to be included in 
/usr/share/ovirt-server/public/javascript and the plugin code that needs 
to be installed under /usr/share/ovirt-server/vendor/plugins.

We _could_ package them as separate RPMs but the dependencies would be 
messy -- since they must live under the app root they would depend on 
ovirt-server, but since ovirt-server needs them, then the dependency 
needs to go the other way.

So what we have here is a collection of code from different sources that 
actually forms part of our app. On top of that we have some 
ovirt-specific customizations to the javascript libraries which does 
need to live in our repo.

Scott



From dpierce at redhat.com  Thu Oct 23 16:24:44 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Thu, 23 Oct 2008 12:24:44 -0400
Subject: [Ovirt-devel] How to handle 3rd party code?
In-Reply-To: <4900A38F.9030805@redhat.com>
References: <1224777718.4805.33.camel@localhost.localdomain>
	<4900A0D7.6010704@redhat.com> <4900A38F.9030805@redhat.com>
Message-ID: <4900A54C.3030006@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Scott Seago wrote:
>> I think the best solution would be to keep their code out of our
>> repository and instead package them as separate RPMs and then depend on
>> them from ours. As an example, look at how we require rubygem-cobbler
>> and rubygem-activeldap. Neither is kept in our repository.
>>
>> How many dependencies do we have?
>>
>>   
> The difficulty here is that we're not talking about the sort of reusable
> components that just need to be installed in a standard location and
> added to the right search path (as is the case with rubygem-cobbler).
> We've got javascript files that need to be included in
> /usr/share/ovirt-server/public/javascript and the plugin code that needs
> to be installed under /usr/share/ovirt-server/vendor/plugins.
> 
> We _could_ package them as separate RPMs but the dependencies would be
> messy -- since they must live under the app root they would depend on
> ovirt-server, but since ovirt-server needs them, then the dependency
> needs to go the other way.
> 
> So what we have here is a collection of code from different sources that
> actually forms part of our app. On top of that we have some
> ovirt-specific customizations to the javascript libraries which does
> need to live in our repo.

So, in that case, isn't the solution still a separate RPM but one that's
specific to our product? IOW, if there's a javascript package called
"foo", then we would potentially have a foo.rpm and a foo-ovirt.rpm that
would apply any patches we have to customize it to our need?

I guess what I'm getting at is more about keeping third party code out
of our repo as much as possible. Unless we're freezing on a specific
snapshot of their code, we should avoid having to version their code. We
had done that in a previous project and it was just a bear to deal with.

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkkApUgACgkQjaT4DmxOfxtQeQCgqACjjaGo+VOcKsQry25pv9jv
BYoAn27b66oIYrhG6Tx05hsgMHqsMI9u
=KyBi
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081023/98460b9a/attachment.vcf>

From dpierce at redhat.com  Thu Oct 23 16:26:37 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Thu, 23 Oct 2008 12:26:37 -0400
Subject: [Ovirt-devel] How to handle 3rd party code?
In-Reply-To: <4900A54C.3030006@redhat.com>
References: <1224777718.4805.33.camel@localhost.localdomain>	<4900A0D7.6010704@redhat.com>
	<4900A38F.9030805@redhat.com> <4900A54C.3030006@redhat.com>
Message-ID: <4900A5BD.2090702@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Darryl Pierce wrote:
>> So what we have here is a collection of code from different sources that
>> actually forms part of our app. On top of that we have some
>> ovirt-specific customizations to the javascript libraries which does
>> need to live in our repo.
> 
> So, in that case, isn't the solution still a separate RPM but one that's
> specific to our product? IOW, if there's a javascript package called
> "foo", then we would potentially have a foo.rpm and a foo-ovirt.rpm that
> would apply any patches we have to customize it to our need?

Sorry, in this case, I meant to include that a dependant rpm that would
bridge the javascript code to our code; i.e., one that would create or
update the necessary symlinks to bring the code into
/usr/share/ovirt-server as needed.

That way the third party code wouldn't need to packaged more than once
for any project to use it.

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkkApbgACgkQjaT4DmxOfxvQcACgtH0dlpoYIiF72iDu/z5g50fO
CcIAnRZKh5eWJ+CTAVvF1/+yLrloOY6s
=xKcC
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081023/dfc70d07/attachment.vcf>

From jguiditt at redhat.com  Thu Oct 23 16:37:03 2008
From: jguiditt at redhat.com (Jason Guiditta)
Date: Thu, 23 Oct 2008 12:37:03 -0400
Subject: [Ovirt-devel] How to handle 3rd party code?
In-Reply-To: <4900A5BD.2090702@redhat.com>
References: <1224777718.4805.33.camel@localhost.localdomain>
	<4900A0D7.6010704@redhat.com> <4900A38F.9030805@redhat.com>
	<4900A54C.3030006@redhat.com>  <4900A5BD.2090702@redhat.com>
Message-ID: <1224779823.4805.41.camel@localhost.localdomain>

On Thu, 2008-10-23 at 12:26 -0400, Darryl Pierce wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Darryl Pierce wrote:
> >> So what we have here is a collection of code from different sources that
> >> actually forms part of our app. On top of that we have some
> >> ovirt-specific customizations to the javascript libraries which does
> >> need to live in our repo.
> > 
> > So, in that case, isn't the solution still a separate RPM but one that's
> > specific to our product? IOW, if there's a javascript package called
> > "foo", then we would potentially have a foo.rpm and a foo-ovirt.rpm that
> > would apply any patches we have to customize it to our need?
> 
> Sorry, in this case, I meant to include that a dependant rpm that would
> bridge the javascript code to our code; i.e., one that would create or
> update the necessary symlinks to bring the code into
> /usr/share/ovirt-server as needed.
> 
> That way the third party code wouldn't need to packaged more than once
> for any project to use it.

Again, the issue here is we still need to version our changes.  I could
see this possibly working for plugins since we only have a few (though
we did have some customizations there at one point as well) and they are
more likely to be available as gems.  Also, for the javascript, there
are tons of little components/plugins, so splintering them all into
separate rpms would be a really large number of dependencies, not to
mention rpm seems like an odd way to handle javascript files.  I agree
with not keeping the code in our main repo, that is already getting
annoying.  This is why I brought up sub-modules, which I believe Alan
and/or Jim had mentioned as a solution we should consider.

-j



From agx at sigxcpu.org  Thu Oct 23 16:44:44 2008
From: agx at sigxcpu.org (Guido =?iso-8859-1?Q?G=FCnther?=)
Date: Thu, 23 Oct 2008 18:44:44 +0200
Subject: [Ovirt-devel] How to handle 3rd party code?
In-Reply-To: <4900A54C.3030006@redhat.com>
References: <1224777718.4805.33.camel@localhost.localdomain>
	<4900A0D7.6010704@redhat.com> <4900A38F.9030805@redhat.com>
	<4900A54C.3030006@redhat.com>
Message-ID: <20081023164444.GA13710@bogon.ms20.nix>

On Thu, Oct 23, 2008 at 12:24:44PM -0400, Darryl Pierce wrote:
[..snip..] 
> > We _could_ package them as separate RPMs but the dependencies would be
> > messy -- since they must live under the app root they would depend on
> > ovirt-server, but since ovirt-server needs them, then the dependency
> > needs to go the other way.
> > 
> > So what we have here is a collection of code from different sources that
> > actually forms part of our app. On top of that we have some
> > ovirt-specific customizations to the javascript libraries which does
> > need to live in our repo.
> 
> So, in that case, isn't the solution still a separate RPM but one that's
> specific to our product? IOW, if there's a javascript package called
> "foo", then we would potentially have a foo.rpm and a foo-ovirt.rpm that
> would apply any patches we have to customize it to our need?
If these are generic java script libraries, packaging them and putting
them in e.g. /usr/share/<jslib> and simply symlinking this directory
into oVirt could also be a solution. The benefit is that other packages
can use the libs too.

> I guess what I'm getting at is more about keeping third party code out
> of our repo as much as possible. Unless we're freezing on a specific
> snapshot of their code, we should avoid having to version their code. We
> had done that in a previous project and it was just a bear to deal with.
Having the code outside of the oVirt repo would also considerably help
packaging oVirt for Debian (which we started recently).
Cheers,
 -- Guido



From berrange at redhat.com  Thu Oct 23 18:01:43 2008
From: berrange at redhat.com (Daniel P. Berrange)
Date: Thu, 23 Oct 2008 19:01:43 +0100
Subject: [Ovirt-devel] Explicit global network modelling
Message-ID: <20081023180143.GB6753@redhat.com>

The network configuration UI discussions have all focused around
the idea of configuring NICs on machines. I've been thinking that
this is really not the right model. You have some kind of physical
topology which is known, and has certain properties like network
address and prefix, and vlan.  A host has one or more NICs, each
of which is connected to a network.

So if we can model a network as a global entity in its own right,
we can simplify configuration of host interfaces, so simply a 
matter of association, and optionally defining an address.


* Network
    - addr config      eg, none, static vs dhcp
    - network address  eg, 192.168.122.0
    - prefix           eg,  /24
    - usage            eg, storage, management, guest
    - vlan number      eg, 43
    - vlan network     eg, name of host network

* Interface
    - name              eg eth1
    - mac               eg 00:11:22:33:44:55
    - addr config       eg, static vs dhcp vs none

With the association being:

           1     n           n    1
  Network  <-----> Interface <----> Node


So if you have say

   * Network: 
      - 'admin lan'
      - 192.168.122.0/24
      - dhcp
      - usage: management
   * Network
      - 'guest lan'
      - dhcp
      - usage: guest


Now, you come to configure a new host with two NICs 'eth0' and 'eth1.
In this particular scenario all the admin would need todo is pick off
the 'admin lan' network for 'eth0', and 'guest lan' for eth1. Job done.
No need to specify any addressing, because the network properties already
tell us it is a DHCP based LAN. Also, since eth1 is associated with a 
guest traffic only lan, there is no need for IP config on eth1 in the 
host. All we need do is put eth1 in a bridge. 

Also note we don't need to ask the admin whether eth1 should be bridged
or not. We know for a fact that it must be bridged, because it is a guest
traffic network. Likewise we know that a admin network does not need a
bridge. If a network was designated for both mgmt and guest usage, then
we would need a bridge and IP address config.

Now an alternate example with VLANs...

   * Network:
      - 'office lan'
      -	none addr config
      - usage: none

   * Network:
      - 'admin lan'
      - 192.168.122.0/24
      -	dhcp
      - usage: management
      - vlan: 43
      - vlan host: office lan
 
   * Network
      -	'guest	lan'
      - dhcp
      -	usage: guest
      - vlan: 72
      - vlan host: office lan

Now, come to configure a host with two devices eth0 and eth1. The admin
tells us that both eth0 and eth1 are connected to 'office lan'. With this,
we know that eth0 and eth1 should be bonded since they're on same lan, 
so we merely need ask what kind of bonding is desired.  Since we see
that there are two VLAN networks associated with 'office lan', we also
know that we have to create two VLAN devices on the host, and that one
of those VLAN devices must be put in a bridge. Again no need to ask the
admin about VLAN creation on the host

So this kind of modelling can make our UI for setting up host networking
much clearer / simpler, avoiding lots of redundant questions. Also, by
having an explicit   'network <-> interface <-> host' assoication, we
can trivally determine whether it is possible to migrate between two 
hosts from a network topology POV - its merely checking one DB relation

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 lutter at redhat.com  Thu Oct 23 18:40:06 2008
From: lutter at redhat.com (David Lutterkort)
Date: Thu, 23 Oct 2008 11:40:06 -0700
Subject: [Ovirt-devel] How to handle 3rd party code?
In-Reply-To: <1224777718.4805.33.camel@localhost.localdomain>
References: <1224777718.4805.33.camel@localhost.localdomain>
Message-ID: <1224787206.15846.25.camel@localhost.localdomain>

On Thu, 2008-10-23 at 12:01 -0400, Jason Guiditta wrote:
> I have been meaning to send an email to the list about this for weeks.
> I am looking to assemble a consensus on how to handle version control
> for some 3rd party code we are using in the server suite.  These are,
> for the moment at least, rails plugins (not necessarily available as
> gems or rpms) and javascript libraries/plugins.  There are a couple of
> issues we need to solve here:
> 1) Keeping up to date on these bits of code, which may or may not be
> available in git (a lot of the javascript is hosted in svn, some no
> version control at all)
> 2) We may have our own patches that we need to carry, though of course
> we will try to push them upstream.
> 3) Many of these items do no follow our practices- specifically
> whitespace and ^Ms.  This makes it difficult to drop in the updated code
> and compare it to our (cleaned-up) version in git, especially if we have
> made any changes/customizations.
> 
> The only idea I have heard/read about that seems to be a possible good
> solution is sub-modules, but there seems to be a fair amount of
> maintenance involved in keeping them in synch with our main repo
> whenever we do an update or patch to one of the modules.

The overriding concern is that we don't want to maintain forks of all
these upstream projects; the best solution would be to approach each
upstream and ask them to take our patches, and go to a release model
that is more amenable to reuse (though if they do not do properly
versioned releases, it's fine to use e.g. svn revision numbers as a
substitute)

The question of how to package all that is secondary to that concern.
Ideally, we would have a separate RPM for each upstream, but if that's
not feasible in some cases (e.g. JS libraries, Fedora doesn't even have
JS packaging guidelines) it would be ok to pull the sources into a
ovirt-specific RPM as long as those sources do not diverge from
upstream.

As long as we follow a process of 'use pristine upstream + temporary
patches', it should be fairly easy to script the import/update of newer
upstream versions. I would put those things into a separate
'ovirt-js-modules' or similar and keep them out of the main ovirt-server
git, with the assumption that developers will install/update that RPM
separately.

To avoid problems with the directories into which those files go, we
should see if either Rails or Mongrel lets use reconfigure the location
of JS libs - Rails plugins should be less problematic, since we can
always futz with LOAD_PATH.

David




From sseago at redhat.com  Thu Oct 23 20:13:24 2008
From: sseago at redhat.com (Scott Seago)
Date: Thu, 23 Oct 2008 16:13:24 -0400
Subject: [Ovirt-devel] How to handle 3rd party code?
In-Reply-To: <1224787206.15846.25.camel@localhost.localdomain>
References: <1224777718.4805.33.camel@localhost.localdomain>
	<1224787206.15846.25.camel@localhost.localdomain>
Message-ID: <4900DAE4.9000303@redhat.com>

David Lutterkort wrote:
>
> As long as we follow a process of 'use pristine upstream + temporary
> patches', it should be fairly easy to script the import/update of newer
> upstream versions. I would put those things into a separate
> 'ovirt-js-modules' or similar and keep them out of the main ovirt-server
> git, with the assumption that developers will install/update that RPM
> separately.
>
>   
So if, for example we need to modify the css for a javascript library 
component you're suggesting we should only keep the patch in our repo 
instead of the modified file? Most of our local changes are 
ovirt-specific styling tweaks that wouldn't be appropriate for upstream 
inclusion.  Of course if these modules RPMs depend on the main 
ovirt-server RPM then we'd have to remember to install them separately.
> To avoid problems with the directories into which those files go, we
> should see if either Rails or Mongrel lets use reconfigure the location
> of JS libs - Rails plugins should be less problematic, since we can
> always futz with LOAD_PATH.
>
>   
Off the top of my head I"m not sure if LOAD_PATH changes are sufficient 
to find plugins but there's probably something we can do in the config 
here. For the javascript stuff though it either needs to be in the 
standard location or symlinked there since  the rails expectation is 
that all CSS/javascript files are located in the same dir -- and we've 
got ovirt-specific files that we control that need to be in those dirs too.

Scott



From mmorsi at redhat.com  Thu Oct 23 20:34:47 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Thu, 23 Oct 2008 16:34:47 -0400
Subject: [Ovirt-devel] Explicit global network modelling
In-Reply-To: <20081023180143.GB6753@redhat.com>
References: <20081023180143.GB6753@redhat.com>
Message-ID: <4900DFE7.50808@redhat.com>

Daniel P. Berrange wrote:
> The network configuration UI discussions have all focused around
> the idea of configuring NICs on machines. I've been thinking that
> this is really not the right model. You have some kind of physical
> topology which is known, and has certain properties like network
> address and prefix, and vlan.  A host has one or more NICs, each
> of which is connected to a network.
>
> So if we can model a network as a global entity in its own right,
> we can simplify configuration of host interfaces, so simply a 
> matter of association, and optionally defining an address.
>
>
> * Network
>     - addr config      eg, none, static vs dhcp
>     - network address  eg, 192.168.122.0
>     - prefix           eg,  /24
>     - usage            eg, storage, management, guest
>     - vlan number      eg, 43
>     - vlan network     eg, name of host network
>
> * Interface
>     - name              eg eth1
>     - mac               eg 00:11:22:33:44:55
>     - addr config       eg, static vs dhcp vs none
>
> With the association being:
>
>            1     n           n    1
>   Network  <-----> Interface <----> Node
>
>
>   
Based on our discussion today the following things are needed for this


1. Add new networks table, subclassed into virtual and physical
networks, and associated with ip_addresses table
2. Unassociate nics and bondings with ip addresses, associate with networks
3. Change any backend components that depend on the model changes
4. Add tab to dashboard if user is able to edit default pool for
networks, allowing user to view, create, edit, delete networks. Should
come with FIXME to change permissions to something more robust, either
by subclassing Network table from Pool (breaking necessary bits into any
additional tables) or the most rebust way, to refactoring the permission
model to accommodate permissions assigned to any object
5. Update nics / bonding interface to associate w/ a network as opposed
to an ip address.


I can take care of the interface bits (eg 4,5) if Darryl or someone else
takes care of the first three.


One additional thing that comes to mind as I read over the proposed
changes is that this network model fits nicely with DHCP assigned nics /
interfaces as the nic is associated with the network which it is to
receive that information from, but for static assignments it doesn't fit
so nicely. This is because the nic / interface will still need to be
associated with an ip address directly and not just a network. If so
we'd still need the associations between those tables, and might require
some validation to make sure the assigned ip is valid for the selected
network (or would no network be selected in that case?).

   -Mo



From dpierce at redhat.com  Thu Oct 23 20:40:17 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Thu, 23 Oct 2008 16:40:17 -0400
Subject: [Ovirt-devel] Explicit global network modelling
In-Reply-To: <4900DFE7.50808@redhat.com>
References: <20081023180143.GB6753@redhat.com> <4900DFE7.50808@redhat.com>
Message-ID: <4900E131.206@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Mohammed Morse wrote:
> Based on our discussion today the following things are needed for this
> 
> 
> 1. Add new networks table, subclassed into virtual and physical
> networks, and associated with ip_addresses table
> 2. Unassociate nics and bondings with ip addresses, associate with networks
> 3. Change any backend components that depend on the model changes
> 4. Add tab to dashboard if user is able to edit default pool for
> networks, allowing user to view, create, edit, delete networks. Should
> come with FIXME to change permissions to something more robust, either
> by subclassing Network table from Pool (breaking necessary bits into any
> additional tables) or the most rebust way, to refactoring the permission
> model to accommodate permissions assigned to any object
> 5. Update nics / bonding interface to associate w/ a network as opposed
> to an ip address.
> 
> 
> I can take care of the interface bits (eg 4,5) if Darryl or someone else
> takes care of the first three.

I can do the first three.

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkkA4S8ACgkQjaT4DmxOfxsj8ACfR4xhv4jZDe0OjmSM50Klq1+P
4UgAoKS1O+lidAZ2iDWvD+FvlV8wq+Z3
=IIDf
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081023/fb967392/attachment.vcf>

From berrange at redhat.com  Thu Oct 23 21:06:12 2008
From: berrange at redhat.com (Daniel P. Berrange)
Date: Thu, 23 Oct 2008 22:06:12 +0100
Subject: [Ovirt-devel] Explicit global network modelling
In-Reply-To: <4900DFE7.50808@redhat.com>
References: <20081023180143.GB6753@redhat.com> <4900DFE7.50808@redhat.com>
Message-ID: <20081023210612.GA11694@redhat.com>

On Thu, Oct 23, 2008 at 04:34:47PM -0400, Mohammed Morsi wrote:
> Daniel P. Berrange wrote:
> > The network configuration UI discussions have all focused around
> > the idea of configuring NICs on machines. I've been thinking that
> > this is really not the right model. You have some kind of physical
> > topology which is known, and has certain properties like network
> > address and prefix, and vlan.  A host has one or more NICs, each
> > of which is connected to a network.
> >
> > So if we can model a network as a global entity in its own right,
> > we can simplify configuration of host interfaces, so simply a 
> > matter of association, and optionally defining an address.
> >
> >
> > * Network
> >     - addr config      eg, none, static vs dhcp
> >     - network address  eg, 192.168.122.0
> >     - prefix           eg,  /24
> >     - usage            eg, storage, management, guest
> >     - vlan number      eg, 43
> >     - vlan network     eg, name of host network
> >
> > * Interface
> >     - name              eg eth1
> >     - mac               eg 00:11:22:33:44:55
> >     - addr config       eg, static vs dhcp vs none
> >
> > With the association being:
> >
> >            1     n           n    1
> >   Network  <-----> Interface <----> Node
> >
> >
> >   
> Based on our discussion today the following things are needed for this
> 
> 
> 1. Add new networks table, subclassed into virtual and physical
> networks, and associated with ip_addresses table

Where does this virtual vs physical network distinction come from ?

> One additional thing that comes to mind as I read over the proposed
> changes is that this network model fits nicely with DHCP assigned nics /
> interfaces as the nic is associated with the network which it is to
> receive that information from, but for static assignments it doesn't fit
> so nicely. This is because the nic / interface will still need to be
> associated with an ip address directly and not just a network. If so
> we'd still need the associations between those tables, and might require
> some validation to make sure the assigned ip is valid for the selected
> network (or would no network be selected in that case?).

Static ip info is no trouble at all. You can still associate an IP address
with with the interface directly. In fact you could even suggest a suitable
static addres by looking at the netmask of the Network, and what static
addresses are already known, and pick an unused one. In addition, even if
the network is configured for DHCP, you may still wish to give certain
hosts static ip addrs, so you need to maintain the IP address against the
interface anyway.

With both the network, and interface you need to cope with multiple
addresses - both IPv4 and v6


            1     n           n    1
   Network  <-----> Interface <----> Node
     ^ 1                 ^ 1
     |                   |
     V n                 V n
  NetAddress          Address

In the NetAddress you store the network address (192.168.122.0) and
the network prefix (/24). In the 'Address'  you merely store the
address '192.168.122.0'. You can't directly enforce validity constraint
of network address + prefix matching the NIC address, because SQL just
isn't that expressive.

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 lutter at redhat.com  Thu Oct 23 21:20:10 2008
From: lutter at redhat.com (David Lutterkort)
Date: Thu, 23 Oct 2008 14:20:10 -0700
Subject: [Ovirt-devel] How to handle 3rd party code?
In-Reply-To: <4900DAE4.9000303@redhat.com>
References: <1224777718.4805.33.camel@localhost.localdomain>
	<1224787206.15846.25.camel@localhost.localdomain>
	<4900DAE4.9000303@redhat.com>
Message-ID: <1224796810.15846.33.camel@localhost.localdomain>

On Thu, 2008-10-23 at 16:13 -0400, Scott Seago wrote:
> David Lutterkort wrote:
> >
> > As long as we follow a process of 'use pristine upstream + temporary
> > patches', it should be fairly easy to script the import/update of newer
> > upstream versions. I would put those things into a separate
> > 'ovirt-js-modules' or similar and keep them out of the main ovirt-server
> > git, with the assumption that developers will install/update that RPM
> > separately.
> >
> >   
> So if, for example we need to modify the css for a javascript library 
> component you're suggesting we should only keep the patch in our repo 
> instead of the modified file? Most of our local changes are 
> ovirt-specific styling tweaks that wouldn't be appropriate for upstream 
> inclusion.

Yeah, CSS is icky in this context, and it doesn't have the same problems
as keeping actual code pristine; not sure what the best way for handling
that is, but there's nothing wrong with replacing style files whole hog.
I was more concerned with bug fixes/enhancements to actual code that
would need to be tracked and forward ported if we're not careful.

> Of course if these modules RPMs depend on the main 
> ovirt-server RPM then we'd have to remember to install them separately.

I think this makes only sense if the deps are the other way, i.e. if
ovirt-server requires those extra libraries, and if things can be setup
so that a developer can install the RPM's for those extra libs and then
easily run a dev server out of the source checkout.

> > To avoid problems with the directories into which those files go, we
> > should see if either Rails or Mongrel lets use reconfigure the location
> > of JS libs - Rails plugins should be less problematic, since we can
> > always futz with LOAD_PATH.
> >
> >   
> Off the top of my head I"m not sure if LOAD_PATH changes are sufficient 
> to find plugins but there's probably something we can do in the config 
> here. For the javascript stuff though it either needs to be in the 
> standard location or symlinked there since  the rails expectation is 
> that all CSS/javascript files are located in the same dir -- and we've 
> got ovirt-specific files that we control that need to be in those dirs too.

Yeah, you'd probably need to put more of what's currently in
server/src/public/javascripts into subdirs so that you can symlink a
whole directory in.

David




From jguiditt at redhat.com  Thu Oct 23 21:24:35 2008
From: jguiditt at redhat.com (Jason Guiditta)
Date: Thu, 23 Oct 2008 17:24:35 -0400
Subject: [Ovirt-devel] [PATCH server] Stage of one of tree conversions to
	pluggable widget.
Message-ID: <1224797075-12493-1-git-send-email-jguiditt@redhat.com>

This patch includes the new pluggable tree widget code and
conversion of Move popups for Hardware pools (hosts and
storage).  Simplified call to move so it returns an object
which is used to build the tree (no extra ajax call anymore).
The json_tree_internal method will be going away next patch,
can't get rid of it yet because some Smart Pool stuff depends
on it.

Fixed minor bug in Pool.full_set_nested causing 'selected'
never to be set. Also added to this method a 'type' option
to filter results by pool type.

Signed-off-by: Jason Guiditta <jguiditt at redhat.com>
---
 src/app/controllers/hardware_controller.rb |    4 ++
 src/app/models/pool.rb                     |    7 +++-
 src/app/views/hardware/move.rhtml          |   60 +++++++++++++++-----------
 src/app/views/layouts/_tree.rhtml          |    9 +---
 src/app/views/layouts/redux.rhtml          |    3 +
 src/public/javascripts/ovirt.tree.js       |   64 +++++++++++++++++++++++++++-
 src/public/stylesheets/ovirt-tree/tree.css |    7 +++-
 7 files changed, 119 insertions(+), 35 deletions(-)

diff --git a/src/app/controllers/hardware_controller.rb b/src/app/controllers/hardware_controller.rb
index 9c04210..4f24cb3 100644
--- a/src/app/controllers/hardware_controller.rb
+++ b/src/app/controllers/hardware_controller.rb
@@ -184,6 +184,10 @@ class HardwareController < PoolController
   def move
     pre_modify
     @resource_type = params[:resource_type]
+    @id = params[:id]
+    @pools = HardwarePool.get_default_pool.full_set_nested(:method => :json_hash_element,
+                       :privilege => Permission::PRIV_MODIFY, :user => get_login_user, :current_id => @id,
+                       :type => :select_hardware_pools).to_json
     render :layout => 'popup'
   end
 
diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb
index d189649..a8b1589 100644
--- a/src/app/models/pool.rb
+++ b/src/app/models/pool.rb
@@ -230,6 +230,7 @@ class Pool < ActiveRecord::Base
     method = opts.delete(:method) {:hash_element}
     privilege = opts.delete(:privilege)
     user = opts.delete(:user)
+    type = opts.delete(:type)
     smart_pool_set = opts.delete(:smart_pool_set)
     if privilege and user
       opts[:include] = "permissions"
@@ -241,6 +242,7 @@ class Pool < ActiveRecord::Base
     opts.delete(:order)
     subtree_list = full_set(opts)
     subtree_list -= [self] if smart_pool_set
+    subtree_list = Pool.send(type, subtree_list) if type
     return_tree_list = []
     ref_hash = {}
     subtree_list.each do |pool|
@@ -264,7 +266,10 @@ class Pool < ActiveRecord::Base
         end
       end
     end
-    ref_hash[current_id][:selected] = true if current_id
+#   FIXME: right now, we have inserted the pool id into the hash as an
+#   integer (database value type.  Rather than converting the current_id
+#   param to an integer, we may want to use a symbol for both identifiers
+    ref_hash[current_id.to_i][:selected] = true if current_id
     return_tree_list
   end
 
diff --git a/src/app/views/hardware/move.rhtml b/src/app/views/hardware/move.rhtml
index 968e2ca..9688c39 100644
--- a/src/app/views/hardware/move.rhtml
+++ b/src/app/views/hardware/move.rhtml
@@ -6,21 +6,15 @@
 <%- end -%>
 
 <script type="text/javascript">
-      $(document).ready(function(){         
-        $("#move_tree").asynch_treeview({
-            //animated: "normal",
-            current_pool_id:  <%=@current_pool_id%>,
-            url: "<%=  url_for :controller =>'/hardware', :action => 'json_move_tree' %>",
-            current: "disabled",
-            hardware_url: "#",
-            resource_url: "#",
-            onclick: "move_<%= @resource_type %>",
-            action_type: "javascript"
-	    })
-	}); 
-  function move_<%= @resource_type %>(target_pool_id)
-  {
-    $.post('<%= url_for :controller => "hardware", :action => "move_#{@resource_type}", :id => @pool %>',
+      $(document).ready(function(){
+        $('#move_tree').tree({
+          content: {"pools" : <%=  @pools %>},
+          clickHandler: move_<%= @resource_type %>
+        });
+      });
+  function move_<%= @resource_type %>(e, elem) {
+    var target_pool_id = elem.id.substring(elem.id.indexOf('-') +1);
+    $.post('<%= url_for :controller => "hardware", :action => "move_#{@resource_type}", :id => @id %>',
            { resource_ids: get_selected_<%= @resource_type %>().toString(), 
 	     target_pool_id: target_pool_id },
             function(data,status){
@@ -37,24 +31,38 @@
 $('#move_to_new_pool').click(function(){
 		$('#window').fadeOut('fast'); 
         $("#window").empty().load("<%= url_for :controller => 'hardware', :action => 'new' %>",
-	{ parent_id: <%=@pool.id%>, 
+	{ parent_id: <%=@id%>,
 	  resource_ids: get_selected_<%= @resource_type %>().toString(),
           resource_type: '<%=@resource_type%>'});
 		$('#window').fadeIn('fast'); 
 });
 </script>
+<ul id="move_tree" class="ovirt-tree"></ul>
 
+<textarea id="tree_template" style="display:none;">
+{macro htmlList(list, optionalListType)}
+  {var listType = optionalListType != null ? optionalListType : "ul"}
+  <${listType} style="display:none;">
+    {for item in list}
+      <li>
+        <span class="hitarea {if item.children} expandable{/if}">&nbsp;</span><div id="move-${item.id}" class="${item.type} {if item.selected} unclickable{/if}">${item.name}</div>
+        {if item.children}
+          ${htmlList(item.children)}
+        {/if}
+      </li>
+    {/for}
+  </${listType}>
+{/macro}
 
-
-<div class="dialog_tree">
-  <ul id="move_tree" class="filetree treeview-famfamfam treeview"></ul>
-
-  <!--  <div style="clear:both;"></div>
-  <div style=" float:left; padding:0 0 0 5px;"><%= image_tag "icon_unassignedhost.gif" %></div>
-  <div style=" float:left; padding:5px 0 0 5px;">Unassigned Hosts</div>-->
-</div>
-
-
+{for item in pools}
+  <li>
+    <span class="hitarea {if item.children} expandable{/if}">&nbsp;</span><div id="move-${item.id}" class="${item.type} {if item.selected} unclickable{/if}">${item.name}</div>
+    {if item.children}
+      ${htmlList(item.children)}
+    {/if}
+  </li>
+{/for}
+</textarea>
 
 <div class="facebox_timfooter">
         <div class="button">
diff --git a/src/app/views/layouts/_tree.rhtml b/src/app/views/layouts/_tree.rhtml
index a6bde14..fefd642 100644
--- a/src/app/views/layouts/_tree.rhtml
+++ b/src/app/views/layouts/_tree.rhtml
@@ -1,6 +1,3 @@
-<%= javascript_include_tag "trimpath-template-1.0.38.js" %>
-<%= javascript_include_tag "ovirt.tree.js" %>
-<%= stylesheet_link_tag 'ovirt-tree/tree' %>
 <script type="text/javascript">
     var treeTimer, urlObj;
     var processRecursive = true;
@@ -17,12 +14,12 @@
       tree_url = "<%=  url_for :controller =>"/tree", :action => "return_filtered_list" %>";
       processTree();
       treeTimer = setInterval(processTree,15000);
-      $('ul.ovirt-tree li').livequery(
+      $('#nav_tree_form ul.ovirt-tree li').livequery(
         function(){
           $(this)
           .children('div')
           .bind('click',function(){
-            $('ul.ovirt-tree li div').removeClass('current');
+            $('#nav_tree_form ul.ovirt-tree li div').removeClass('current');
             var thisHref = (urlObj[$(this).attr('class')] !=null) ? urlObj[$(this).attr('class')] + '/' + this.id :null;
             $(this).toggleClass('current');
             currentNode = this.id;
@@ -50,7 +47,7 @@
           .unbind('click');
         }
       );
-      $('ul.ovirt-tree li:has(ul)').livequery(
+      $('#nav_tree_form ul.ovirt-tree li:has(ul)').livequery(
         function(){
           $(this)
             .children('span.hitarea')
diff --git a/src/app/views/layouts/redux.rhtml b/src/app/views/layouts/redux.rhtml
index 0918dce..fdb0691 100644
--- a/src/app/views/layouts/redux.rhtml
+++ b/src/app/views/layouts/redux.rhtml
@@ -16,6 +16,7 @@
   <%= stylesheet_link_tag 'flexigrid/flexigrid.css' %>
   <%= stylesheet_link_tag 'facebox' %>
   <%= stylesheet_link_tag 'jquery.jgrowl.css' %>
+  <%= stylesheet_link_tag 'ovirt-tree/tree' %>
 
   <%= javascript_include_tag "jquery-1.2.6.min.js" -%>
   <%= javascript_include_tag "jquery-treeview/jquery.treeview.js" -%>
@@ -33,6 +34,8 @@
 
   <%= javascript_include_tag "jquery.ui-1.5.2/ui/packed/ui.core.packed.js" -%>
   <%= javascript_include_tag "jquery.ui-1.5.2/ui/packed/ui.tabs.packed.js" -%>
+  <%= javascript_include_tag "trimpath-template-1.0.38.js" %>
+  <%= javascript_include_tag "ovirt.tree.js" %>
 
   <!-- ovirt-specific functions defined here -->
   <%= javascript_include_tag "ovirt.js" -%>
diff --git a/src/public/javascripts/ovirt.tree.js b/src/public/javascripts/ovirt.tree.js
index 1d8e26f..42719a1 100644
--- a/src/public/javascripts/ovirt.tree.js
+++ b/src/public/javascripts/ovirt.tree.js
@@ -82,4 +82,66 @@ function processChildren(list, templateObj){
       }
     }
   });
-}
\ No newline at end of file
+}
+
+(function($){
+	// widget prototype. Everything here is public
+	var Tree  = {
+                getTemplate: function () { return this.getData('template'); },
+		setTemplate: function (x) {
+                    this.setData('template', TrimPath.parseDOMTemplate(this.getData('template')));
+		},
+		init: function() {
+                    this.setTemplate(this.getTemplate());
+                    this.element.html(this.getTemplate().process(this.getData('content')));
+                    var self = this;
+                    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'));
+                              }
+                          }
+                      }
+                    });
+                    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'));
+                          }
+                      }
+                    });
+                },
+                toggle: function(e, elem) {
+                    $(elem)
+                      .toggleClass('expanded')
+                      .toggleClass('expandable')
+                      .siblings('ul').slideToggle("normal");
+                },
+                clickHandler: function(e,elem) {
+                    alert('e: ' + e + ', elem: ' + elem);
+                    var fred = 'fred';
+                },
+		off: function() {
+			this.element.css({background: 'none'});
+			this.destroy(); // use the predefined function
+		}
+	};
+	$.yi = $.yi || {}; // create the namespace
+	$.widget("yi.tree", Tree);
+	$.yi.tree.defaults = {
+            template: 'tree_template',
+            toggle: 'toggle',
+            clickHandler: 'clickHandler'
+	};
+})(jQuery);
\ 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 5fefb90..bc5cca5 100644
--- a/src/public/stylesheets/ovirt-tree/tree.css
+++ b/src/public/stylesheets/ovirt-tree/tree.css
@@ -21,7 +21,12 @@
     background-repeat: no-repeat;
     background-position: left;
     padding: 4px 0 4px 28px;
-    cursor: pointer;
+    cursor: pointer; /* maybe move this into a clickable class? */
+}
+
+.unclickable {
+    color: grey;
+    cursor: default !important;
 }
 
 .HardwarePool {
-- 
1.5.5.1



From apevec at redhat.com  Thu Oct 23 23:43:17 2008
From: apevec at redhat.com (Alan Pevec)
Date: Fri, 24 Oct 2008 01:43:17 +0200
Subject: [Ovirt-devel] [PATCH ovirt-node-image] get back semantics of
	ovirt_* RPM macros
Message-ID: <1224805397-10106-1-git-send-email-apevec@redhat.com>

previous commit removed ovirt_cache_dir, ovirt_local_repo and
ovirt_url RPM macros, which broke autobuild: ovirt_local_repo was used
to point to a local repository produced by autobuild

FIXME ideally this would be a configure option e.g.
 ./configure --with-local-repo=XXXX

Signed-off-by: Alan Pevec <apevec at redhat.com>
---
 Makefile.am              |    7 ++-----
 ovirt-node-image.spec.in |    5 ++++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 37e52c6..5b5bc3a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,6 +16,8 @@
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
 OVIRT_CACHE_DIR	?= $(HOME)/ovirt-cache
+OVIRT_LOCAL_REPO	?= $(OVIRT_CACHE_DIR)/ovirt
+OVIRT_URL		?= http://ovirt.org/repos/ovirt
 
 EXTRA_DIST =				\
   .gitignore				\
@@ -42,16 +44,11 @@ GIT_RELEASE	= $$(date --utc +%Y%m%d%H%M%S)git$(git_head)
 RPMDIR		= $$(rpm --eval '%{_rpmdir}')
 RPM_FLAGS	= --define "ovirt_cache_dir $(OVIRT_CACHE_DIR)"
 RPM_FLAGS	+= $(if $(_ovirt_dev),--define "extra_release .$(GIT_RELEASE)")
-# FEDORA_URL env var can be set to the root of a fedora mirror
-RPM_FLAGS	+= $(if $(FEDORA_URL),--define "fedora_url $(FEDORA_URL)")
-# OVIRT_URL env var can be set to the root of an ovirt.org mirror
-RPM_FLAGS	+= $(if $(OVIRT_URL),--define "ovirt_url $(OVIRT_URL)")
 
 FEDORA=$(shell rpm --eval '%{fedora}')
 ARCH=$(shell rpm --eval '%{_arch}')
 FEDORA_MIRROR=http://mirrors.fedoraproject.org/mirrorlist
 CUR_RAWHIDE=10
-OVIRT_URL=http://ovirt.org/repos/ovirt
 
 repos.ks:
 	( \
diff --git a/ovirt-node-image.spec.in b/ovirt-node-image.spec.in
index 6fb968f..79ce2c3 100644
--- a/ovirt-node-image.spec.in
+++ b/ovirt-node-image.spec.in
@@ -33,7 +33,10 @@ The PXE boot image for oVirt Node network boot from oVirt Server.
 ./configure
 
 %build
-make ovirt-node-image.iso
+make %{?ovirt_cache_dir: OVIRT_CACHE_DIR=%{ovirt_cache_dir}} \
+     %{?ovirt_local_repo: OVIRT_LOCAL_REPO=%{ovirt_local_repo}} \
+     %{?ovirt_url: OVIRT_URL=%{ovirt_url}} \
+     ovirt-node-image.iso
 sudo su - -c "cd $(pwd) && ./ovirt-pxe %{name}.iso"
 sudo su - -c "cd $(pwd) && chown -R $USER ."
 
-- 
1.5.5.1



From dpierce at redhat.com  Fri Oct 24 12:47:59 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Fri, 24 Oct 2008 08:47:59 -0400
Subject: [Ovirt-devel] Re: [PATCH server] BUG#467099: Fixes a uniqueness
 constraint bug in bondings_nics.
In-Reply-To: <1224764451-7447-1-git-send-email-dpierce@redhat.com>
References: <1224764451-7447-1-git-send-email-dpierce@redhat.com>
Message-ID: <4901C3FF.3050007@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Darryl L. Pierce wrote:
> It moves the uniqueness constraint from being on the pair (bonding_id, nic_id)
> to being only on nic_id. The goal is just to ensure that a nic is only mapped
> once to any bonding.
> 
> You will need to run a migration with this patch.
> 
> Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
> ---
>  ...ll.rb => 026_allow_nic_boot_type_to_be_null.rb} |    0 
>  ..._fix_uniqueness_constraints_in_bondings_nics.rb |   11 +++++++++++
>  2 files changed, 11 insertions(+), 0 deletions(-)
>  rename src/db/migrate/{025_allow_nic_boot_type_to_be_null.rb => 026_allow_nic_boot_type_to_be_null.rb} (100%)
>  create mode 100644 src/db/migrate/027_fix_uniqueness_constraints_in_bondings_nics.rb
> 
> diff --git a/src/db/migrate/025_allow_nic_boot_type_to_be_null.rb b/src/db/migrate/026_allow_nic_boot_type_to_be_null.rb
> similarity index 100%
> rename from src/db/migrate/025_allow_nic_boot_type_to_be_null.rb
> rename to src/db/migrate/026_allow_nic_boot_type_to_be_null.rb
> diff --git a/src/db/migrate/027_fix_uniqueness_constraints_in_bondings_nics.rb b/src/db/migrate/027_fix_uniqueness_constraints_in_bondings_nics.rb
> new file mode 100644
> index 0000000..0daa210
> --- /dev/null
> +++ b/src/db/migrate/027_fix_uniqueness_constraints_in_bondings_nics.rb
> @@ -0,0 +1,11 @@
> +class FixUniquenessConstraintsInBondingsNics < ActiveRecord::Migration
> +  def self.up
> +    remove_index :bondings_nics, [:bonding_id, :nic_id]
> +    add_index :bondings_nics, :nic_id, :unique => true
> +  end
> +
> +  def self.down
> +    remove_index :bondings_nics, :nic_id
> +    add_index :bondings_nics, [:bonding_id, :nic_id], :unique => true
> +  end
> +end

It's a small patch, can someone review it and give feedback or an ACK?


- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkkBw/0ACgkQjaT4DmxOfxsfGQCgqmbIHJljjUxroCDFh17dgGiY
lT8An3maXvHYlPHa+8a58Kr4ear9JSpx
=8TxV
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081024/c31746ab/attachment.vcf>

From dpierce at redhat.com  Fri Oct 24 13:48:44 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Fri, 24 Oct 2008 09:48:44 -0400
Subject: [Ovirt-devel] [PATCH server] BUG#460147 - Deleting a VM based on a
	Cobbler system does not delete
Message-ID: <1224856124-26172-1-git-send-email-dpierce@redhat.com>

This patch addresses this issue, first calling Cobbler and deleting the
system prior to deleting the VM. It also changes ovirt-server's dependence
to since this is new functionality in the rubygem-cobbler package.

Also, since there were several lines with trailing white spaces, this
patch strips those out of the vm_controller.rb file.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 ovirt-server.spec.in                 |    2 +-
 src/app/controllers/vm_controller.rb |   31 ++++++++++++++++++-------------
 src/app/models/vm.rb                 |    6 ++++++
 src/test/unit/vm_test.rb             |   14 +++++++++++++-
 4 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/ovirt-server.spec.in b/ovirt-server.spec.in
index 123e280..e2620d1 100644
--- a/ovirt-server.spec.in
+++ b/ovirt-server.spec.in
@@ -17,7 +17,7 @@ Requires: rubygem(activeldap) >= 0.10.0
 Requires: rubygem(rails) >= 2.1.1
 Requires: rubygem(mongrel) >= 1.0.1
 Requires: rubygem(krb5-auth) >= 0.6
-Requires: rubygem(cobbler) >= 0.0.2
+Requires: rubygem(cobbler) >= 0.1.2
 Requires: rubygem(gettext)
 Requires: ruby-flexmock
 Requires: postgresql-server
diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb
index 585e524..5ab80f5 100644
--- a/src/app/controllers/vm_controller.rb
+++ b/src/app/controllers/vm_controller.rb
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 Red Hat, Inc.
 # Written by Scott Seago <sseago at redhat.com>
 #
@@ -32,7 +32,7 @@ class VmController < ApplicationController
       flash[:notice] = 'You do not have permission to view this vm: redirecting to top level'
       redirect_to :controller => 'resources', :controller => 'dashboard'
     end
-    render :layout => 'selection'    
+    render :layout => 'selection'
   end
 
   def add_to_smart_pool
@@ -41,7 +41,7 @@ class VmController < ApplicationController
   end
 
   def new
-    render :layout => 'popup'    
+    render :layout => 'popup'
   end
 
   def create
@@ -73,14 +73,14 @@ class VmController < ApplicationController
       render :json => { :object => "vm", :success => true, :alert => alert  }
     rescue Exception => error
       # FIXME: need to distinguish vm vs. task save errors (but should mostly be vm)
-      render :json => { :object => "vm", :success => false, 
+      render :json => { :object => "vm", :success => false,
                         :errors => @vm.errors.localize_error_messages.to_a }
     end
 
   end
 
   def edit
-    render :layout => 'popup'    
+    render :layout => 'popup'
   end
 
   def update
@@ -124,16 +124,16 @@ class VmController < ApplicationController
       end
 
 
-      render :json => { :object => "vm", :success => true, 
+      render :json => { :object => "vm", :success => true,
                         :alert => 'Vm was successfully updated.'  }
     rescue
       # FIXME: need to distinguish vm vs. task save errors (but should mostly be vm)
-      render :json => { :object => "vm", :success => false, 
+      render :json => { :object => "vm", :success => false,
                         :errors => @vm.errors.localize_error_messages.to_a }
     end
   end
 
-  #FIXME: we need permissions checks. user must have permission. Also state checks 
+  #FIXME: we need permissions checks. user must have permission. Also state checks
   def delete
     vm_ids_str = params[:vm_ids]
     vm_ids = vm_ids_str.split(",").collect {|x| x.to_i}
@@ -144,6 +144,11 @@ class VmController < ApplicationController
         vms = Vm.find(:all, :conditions => "id in (#{vm_ids.join(', ')})")
         vms.each do |vm|
           if vm.is_destroyable?
+            # Destroy the Cobbler system first if it's defined
+            if vm.uses_cobbler?
+              system = Cobbler::System.find_one(vm.cobbler_system_name)
+              system.remove if system
+            end
             vm.destroy
           else
             failure_list << vm.description
@@ -167,10 +172,10 @@ class VmController < ApplicationController
     vm_resource_pool = @vm.vm_resource_pool_id
     if (@vm.is_destroyable?)
       @vm.destroy
-      render :json => { :object => "vm", :success => true, 
+      render :json => { :object => "vm", :success => true,
         :alert => "Virtual Machine was successfully deleted." }
     else
-      render :json => { :object => "vm", :success => false, 
+      render :json => { :object => "vm", :success => false,
         :alert => "Vm must be stopped to delete it." }
     end
   end
@@ -180,7 +185,7 @@ class VmController < ApplicationController
     vm_pool_id = params[:vm_pool_id]
     @vm = id ? Vm.find(id) : nil
     @vm_pool = vm_pool_id ? VmResourcePool.find(vm_pool_id) : nil
-      
+
     json_list(StorageVolume.find_for_vm(@vm, @vm_pool),
               [:id, :display_name, :size_in_gb, :get_type_label])
   end
@@ -302,9 +307,9 @@ class VmController < ApplicationController
     # random MAC
     mac = [ 0x00, 0x16, 0x3e, rand(0x7f), rand(0xff), rand(0xff) ]
     # random uuid
-    uuid = ["%02x" * 4, "%02x" * 2, "%02x" * 2, "%02x" * 2, "%02x" * 6].join("-") % 
+    uuid = ["%02x" * 4, "%02x" * 2, "%02x" * 2, "%02x" * 2, "%02x" * 6].join("-") %
       Array.new(16) {|x| rand(0xff) }
-    newargs = { 
+    newargs = {
       :vm_resource_pool_id => params[:vm_resource_pool_id],
       :vnic_mac_addr => mac.collect {|x| "%02x" % x}.join(":"),
       :uuid => uuid
diff --git a/src/app/models/vm.rb b/src/app/models/vm.rb
index 2eff87a..19c2912 100644
--- a/src/app/models/vm.rb
+++ b/src/app/models/vm.rb
@@ -276,6 +276,12 @@ class Vm < ActiveRecord::Base
       self.provisioning[/^.*@.*:(.*)/,1]
     end
   end
+  
+  # Returns the system name in Cobbler for this VM.
+  #
+  def cobbler_system_name
+    self.uuid
+  end
 
   # whether this VM may be validly deleted. running VMs should not be
   # allowed to be deleted. Currently we restrict deletion to VMs that
diff --git a/src/test/unit/vm_test.rb b/src/test/unit/vm_test.rb
index 22164e8..a9ed9dc 100644
--- a/src/test/unit/vm_test.rb
+++ b/src/test/unit/vm_test.rb
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 Red Hat, Inc.
 # Written by Scott Seago <sseago at redhat.com>
 #
@@ -76,4 +76,16 @@ class VmTest < Test::Unit::TestCase
       vm.cobbler_name,
       "Wrong name reported."
   end
+
+  # Ensures that the right value is used when requesting the cobbler system
+  # name for a VM backed by Cobbler.
+  #
+  def test_cobbler_system_name
+    @vm = Vm.new
+    @vm.provisioning_and_boot_settings = @cobbler_profile_provisioning
+    @vm.uuid = "oicu812"
+
+    assert_equal @vm.cobbler_system_name, @vm.uuid,
+      "VMs should be using the UUID as their Cobbler system name."
+  end
 end
-- 
1.5.5.1



From pmyers at redhat.com  Fri Oct 24 14:00:13 2008
From: pmyers at redhat.com (Perry Myers)
Date: Fri, 24 Oct 2008 10:00:13 -0400
Subject: [Ovirt-devel] Network configuration wiki page created...
In-Reply-To: <20081016194224.GB6745@redhat.com>
References: <48F60DCC.4000606@redhat.com>
	<48F7567A.40107@redhat.com>	<20081016151649.GD1821@redhat.com>
	<48F7651A.7010507@redhat.com>	<20081016161043.GI1821@redhat.com>
	<48F76F8E.7080906@redhat.com> <20081016194224.GB6745@redhat.com>
Message-ID: <4901D4ED.2020702@redhat.com>

Daniel P. Berrange wrote:
> On Thu, Oct 16, 2008 at 12:45:02PM -0400, Darryl Pierce wrote:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> Daniel P. Berrange wrote:
>>> Yes, this does more closely align, though I see this approach actualy
>>> introduces a slightly different problem - the VLANs don't actually
>>> work very well in this context. If you want to create lots of VLANs,
>>> its forcing you to re-specify the pair of bonded devices each time
>>> which isn't very nice. I can't think of a good answer for this yet
>> Another thing is if we're going to have multiple networks defined on a
>> node, we'll need a dropdown for that as well; i.e., select an existing
>> network to edit.
>>
>> Regarding the vlans, I'm not experienced enough with them to come up
>> with a good design. I'll do some research, but if you can point me to a
>> site that can give a great high level explanation, I can try using that
>> to tweak the design.
> 
> Thinking about it some more, I wasn't far off - we just need some 
> dynamic handling of the devices list depending on what you select.
> 
> Basic properties
> 
>      Name: free text name for the network
> 
> IPv4 properties
> 
>        Mode: DHCP | Static | None
>     Address: <if static>
>     Netmask: <if static>
>   Broadcast: <if static>
>     Gateway: <if static>
> 
> IPv6 properties
> 
>        Mode: DHCP | Static | Autoconfig | None
>     Address: <if static>
>      Prefix: <if static>
>     Gateway: <if static>
> 
> Physical devices
> 
>   Shared: yes | no
>     Mode: raw | failover | aggregation | vlan
>     VLAN: <number>
>  Devices: eth0: 00:11:22:33:44:55:66 (or name of network if its used)
>           eth1: 00:11:22:33:44:55:66 (or name of network if its used)
>           eth2: 00:11:22:33:44:55:66 (or name of network if its used)
>           bond0: <name of network owning the bond>
>           bond1: <name of network owning the bond>
> 
> So, to explain this last section
> 
>  - If you select shared = 'yes', then the resulting device (either ethX
>    or bondX) will be attached to a bridge. This enables its use for a
>    guest. If not shared, then its a storage or mgmt network where the
>    device is used directly.

Should we have a drop down to flag to label specific networks as 
management, storage, guest (or combinations of all three)?  This would 
just be to make the admin's life easier (no functional purpose really)

Also, when you select shared to create the bridge, we should use 
consistent bridge names to make troubleshooting easier.  i.e. All networks 
with the same label "Super Secure Guest Network" would all be ovirtbr0 
regardless of which Node they are created on.  "Super Secure Guest Network 
#2" would be ovirtbr1 and so on.

>  - If mode is 'raw'
>       - Devices list is filtered to only show unused ethXXX devices
>       - Allows picking of one device
>       - Configures the ethXXX device or the bridge if its shared
> 
>  - If mode is 'failover' or 'aggregation'
>       - Devices list is filtered to only show unused ethXXX devices
>       - Allows picking of multiple devices based on mac addr
>       - We put them all in a bondXXX device
>       - Configures the bondXXX device or the bridge if its shared
> 
>  - If mode is 'vlan'
>       - Devices list shows all ethXXX, all bondXXX devices in networks
>         which are not shared
>       - Allows picking of one device based on network name
>       - Creates a VLAN device ethXXX.YYY or bondXXX.YYY against 
>         this device, where YYY is VLAN number
>       - Configures the ethXXX.YYY/bondXXX.YY device or the bridge
>         if its shared
> 
> 
> Some examples
> 
>  1. Want device eth0 for mgmt traffic
> 
>      - Create network with
>           * device mode = raw
>           * pick eth0 based on mac addr
>           * Configure IPv4/6 
>           * Shared = no
>         Results in eth0
> 
>  2. Want devices eth0 and eth1 bonded for guest traffic
> 
>      - Create network with
>           * device mode = failover
>           * pick eth0 & eth1 based on mac addr
>           * Optional IPv4/6 config if desired
>           * Shared = yes
>         Results in bond0 + br0
> 
> 
>  3. Want devices eth0 and eth1, bonded, with two VLANs available for
>     guest traffic
> 
>      - Create network with
>           * device mode = failover
>           * pick eth0 & eth1 based on mac addr
>           * IPv4/6 address = none
>           * Shared = no
>         Results in bond0
> 
>      - Create network with
>           * device mode = vlan
>           * pick bond0 based on network name
>           * Optional IPv4/6 config if desired
>           * Shared = yes
>           * VLAN = 123
>         Results in bond0.123 + br0.123
> 
>      - Create network with
>           * device mode = vlan
>           * pick bond0 based on network name
>           * Optional IPv4/6 config if desired
>           * Shared = yes
>           * VLAN = 125
>         Results in bond0.125 + br0.125
> 
> 
>  4. Want device eth0 with one VLAN for guest traffic and one VLAN for
>     mgmt traffic
> 
>       - Create network with
>           * device mode = raw
>           * pick eth0 based on mac addr
>           * IPv4/6 config = none
>           * shared = no
>         Results in eth0
> 
>       - Create network with
>           * device mode = vlan
>           * pick eth0 based on network name
>           * shared = yes
>           * VLAN = 123
>         Results in eth0.123 + br0.123
> 
>       - Create network with
>           * device mode = vlan
>           * pick eth0 based on network name
>           * shared = no
>           * VLAN = 125
>          Results in eth0.125
> 
> 
> So for bridging, bonding & raw devices everything can be done in one
> step by defining a network & picking devices. 
> 
> Additional networks need only be defined if we wish to make use of
> multiple VLANs on a raw device or bond.

This all looks good from a ui perspective... I think later you wrote an 
email talking about the data modeling for this... :)

/me goes to read

Perry



From berrange at redhat.com  Fri Oct 24 14:04:23 2008
From: berrange at redhat.com (Daniel P. Berrange)
Date: Fri, 24 Oct 2008 15:04:23 +0100
Subject: [Ovirt-devel] Network configuration wiki page created...
In-Reply-To: <4901D4ED.2020702@redhat.com>
References: <48F60DCC.4000606@redhat.com> <48F7567A.40107@redhat.com>
	<20081016151649.GD1821@redhat.com> <48F7651A.7010507@redhat.com>
	<20081016161043.GI1821@redhat.com> <48F76F8E.7080906@redhat.com>
	<20081016194224.GB6745@redhat.com> <4901D4ED.2020702@redhat.com>
Message-ID: <20081024140423.GJ1093@redhat.com>

On Fri, Oct 24, 2008 at 10:00:13AM -0400, Perry Myers wrote:
> Daniel P. Berrange wrote:

[snip]

> This all looks good from a ui perspective... I think later you wrote an 
> email talking about the data modeling for this... :)

The email I sent last night basically invalidates all the UI design
ideas in this thread from the host config POV. 

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 pmyers at redhat.com  Fri Oct 24 14:16:38 2008
From: pmyers at redhat.com (Perry Myers)
Date: Fri, 24 Oct 2008 10:16:38 -0400
Subject: [Ovirt-devel] make ovirt-node-image.iso w/o its rpm
In-Reply-To: <48FCE477.3030002@redhat.com>
References: <20081020152233.GA10200@csdan> <48FCE477.3030002@redhat.com>
Message-ID: <4901D8C6.1020006@redhat.com>

Alan Pevec wrote:
> Dan Kenigsberg wrote:
>> Also, moving logic from .spec to Makefile is generally a good thing that
>> shortens dev cycles.
>> Please review the following patch and consider applying something on
>> these lines. I hope this is the place for such requests.
> 
> yes, that was on our TechnicalDebt TODO, thanks for doing it :)
>> +SELINUX_ENFORCING=$(shell getenforce)
> since we run build as non-root account, we need full path 
> /usr/sbin/getenforce
> 
>> +iso: repos.ks
>  +ovirt-node-image.iso: repos.ks
> 
> since we have known file output, it's better to use real target
> otherwise, iso should be listed in .PHONY
> 
>> +        Enforcing) setenforce Permissive ;; \
> need sudo /usr/sbin/setenforce Permissive
> 
> I'll git-send-email your patch now with those changes.

Alan or Dan, we should make these same changes in the spec/makefile.am for 
the ovirt-appliance.

Perry



From pmyers at redhat.com  Fri Oct 24 14:21:56 2008
From: pmyers at redhat.com (Perry Myers)
Date: Fri, 24 Oct 2008 10:21:56 -0400
Subject: [Ovirt-devel] unable to add hosts in web admin tool
In-Reply-To: <48FEF4CE.2090002@redfish-group.com>
References: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl>	<48F2F6C7.4020300@redfish-group.com>
	<48F2FEEB.10705@redhat.com>	<48F3128A.7090800@redfish-group.com>
	<48F35A21.6070101@redhat.com> <48FEF4CE.2090002@redfish-group.com>
Message-ID: <4901DA04.40808@redhat.com>

Justin Clacherty wrote:
> Alan Pevec wrote:
>> Justin Clacherty wrote:
>>> Alan Pevec wrote:
>>>> Please check the logs /var/log/ovirt* to find out what's going on
>>>
>>> Can't see anything much in the logs on the management server.  I had 
>>> a look at ovirt.log on the managed host and it looks as though it is 
>>> having problems talking to the management node, not sure what to do 
>>> about it though.  Here's the relevant part of the log:
>>>
>>> Resolving management.priv.ovirt.org.... 192.168.50.2
>>> Connecting to management.priv.ovirt.org.|192.168.50.2|:80... connected.
>>> HTTP request sent, awaiting response... 500 Internal Server Error
>>> 2008-10-13 16:52:33 ERROR 500: Internal Server Error.
>>
>> Seems that ovirt-appliance firstboot failed and left appliance in bad 
>> state, check the mongrel log.
>> You can also reinstall ovirt-appliance image and try 
>> http://ovirt.org/page/TroubleShooting#Debugging_oVirt_Appliance_firstboot
> 
> I waited for 0.94.  Just tried it and the same thing is occuring.  Is 
> there a trick to reinstalling the ovirt-appliance?  Do I just run 
> "create-ovirt-appliance -e eth0" again?  I don't see any console output 
> on the terminal when I run "virsh start ovirt-appliance; virsh console 
> ovirt-appliance", just the output of the start command "Domain 
> ovirt-appliance started".

I don't think the appliance is set up to use a serial console by 
default...  This is something the Thincrust folks might want to change to 
their default appliance creation scripts.  (cc'd thincrust-devel for this)

Reinstalling the appliance should be the following:
1. First make sure your appliance is dead: virsh destroy ovirt-appliance
2. Reinstall the ovirt-appliance RPM (if it's already installed you
    may need to rpm -Uvh --force it to overwrite the old RPM files)
3. Run create-ovirt-appliance
4. virsh start ovirt-appliance
5. virt-viewer ovirt-appliance

Do this, and if there are still failures, please send (or post on 
ovirt.pastebin.com) the log output for files on the appliance in:
/var/log/ace
/var/log/ovirt-server
/var/log/ovirt-*

Thanks,

Perry



From pmyers at redhat.com  Fri Oct 24 14:30:58 2008
From: pmyers at redhat.com (Perry Myers)
Date: Fri, 24 Oct 2008 10:30:58 -0400
Subject: [Ovirt-devel] Explicit global network modelling
In-Reply-To: <20081023180143.GB6753@redhat.com>
References: <20081023180143.GB6753@redhat.com>
Message-ID: <4901DC22.1000503@redhat.com>

Daniel P. Berrange wrote:
> The network configuration UI discussions have all focused around
> the idea of configuring NICs on machines. I've been thinking that
> this is really not the right model. You have some kind of physical
> topology which is known, and has certain properties like network
> address and prefix, and vlan.  A host has one or more NICs, each
> of which is connected to a network.
> 
> So if we can model a network as a global entity in its own right,
> we can simplify configuration of host interfaces, so simply a 
> matter of association, and optionally defining an address.
> 
> 
> * Network
>     - addr config      eg, none, static vs dhcp
>     - network address  eg, 192.168.122.0
>     - prefix           eg,  /24
>     - usage            eg, storage, management, guest
>     - vlan number      eg, 43
>     - vlan network     eg, name of host network
> 
> * Interface
>     - name              eg eth1
>     - mac               eg 00:11:22:33:44:55
>     - addr config       eg, static vs dhcp vs none
> 
> With the association being:
> 
>            1     n           n    1
>   Network  <-----> Interface <----> Node
> 
> 
> So if you have say
> 
>    * Network: 
>       - 'admin lan'
>       - 192.168.122.0/24
>       - dhcp
>       - usage: management
>    * Network
>       - 'guest lan'
>       - dhcp
>       - usage: guest
> 
> 
> Now, you come to configure a new host with two NICs 'eth0' and 'eth1.
> In this particular scenario all the admin would need todo is pick off
> the 'admin lan' network for 'eth0', and 'guest lan' for eth1. Job done.
> No need to specify any addressing, because the network properties already
> tell us it is a DHCP based LAN. Also, since eth1 is associated with a 
> guest traffic only lan, there is no need for IP config on eth1 in the 
> host. All we need do is put eth1 in a bridge. 
> 
> Also note we don't need to ask the admin whether eth1 should be bridged
> or not. We know for a fact that it must be bridged, because it is a guest
> traffic network. Likewise we know that a admin network does not need a
> bridge. If a network was designated for both mgmt and guest usage, then
> we would need a bridge and IP address config.
> 
> Now an alternate example with VLANs...
> 
>    * Network:
>       - 'office lan'
>       -	none addr config
>       - usage: none
> 
>    * Network:
>       - 'admin lan'
>       - 192.168.122.0/24
>       -	dhcp
>       - usage: management
>       - vlan: 43
>       - vlan host: office lan
>  
>    * Network
>       -	'guest	lan'
>       - dhcp
>       -	usage: guest
>       - vlan: 72
>       - vlan host: office lan
> 
> Now, come to configure a host with two devices eth0 and eth1. The admin
> tells us that both eth0 and eth1 are connected to 'office lan'. With this,
> we know that eth0 and eth1 should be bonded since they're on same lan, 
> so we merely need ask what kind of bonding is desired.  Since we see
> that there are two VLAN networks associated with 'office lan', we also
> know that we have to create two VLAN devices on the host, and that one
> of those VLAN devices must be put in a bridge. Again no need to ask the
> admin about VLAN creation on the host
> 
> So this kind of modelling can make our UI for setting up host networking
> much clearer / simpler, avoiding lots of redundant questions. Also, by
> having an explicit   'network <-> interface <-> host' assoication, we
> can trivally determine whether it is possible to migrate between two 
> hosts from a network topology POV - its merely checking one DB relation

I like this approach, just a small comment.  We need to be able to support 
  defining networks that are some combination of Managment, Guest, 
Storage. So usage can't be a single selection, it needs to be 
multi-selection.  And if guest is one of the selected usages, then the 
bridge is created.

The other question that comes up is: how do we define these networks, 
interfaces in the absence of the oVirt server for when the Node is in 
standalone mode?  We should mirror this type of dialog in a text 
configuration utility that can be put directly on the Node for admins to 
use in standalone operations.  The output of the utility would be a 
configuration file that can be fed to the existing scripts for setting up 
network interfaces via augeas.

Perry



From berrange at redhat.com  Fri Oct 24 14:38:09 2008
From: berrange at redhat.com (Daniel P. Berrange)
Date: Fri, 24 Oct 2008 15:38:09 +0100
Subject: [Ovirt-devel] Explicit global network modelling
In-Reply-To: <4901DC22.1000503@redhat.com>
References: <20081023180143.GB6753@redhat.com> <4901DC22.1000503@redhat.com>
Message-ID: <20081024143809.GK1093@redhat.com>

On Fri, Oct 24, 2008 at 10:30:58AM -0400, Perry Myers wrote:
> Daniel P. Berrange wrote:

> >Also note we don't need to ask the admin whether eth1 should be bridged
> >or not. We know for a fact that it must be bridged, because it is a guest
> >traffic network. Likewise we know that a admin network does not need a
> >bridge. If a network was designated for both mgmt and guest usage, then
> >we would need a bridge and IP address config.
> 
> I like this approach, just a small comment.  We need to be able to support 
>  defining networks that are some combination of Managment, Guest, 
> Storage. So usage can't be a single selection, it needs to be 
> multi-selection.  And if guest is one of the selected usages, then the 
> bridge is created.

Yes, that is no problem - the 'usage' field is just a set of possible
options. If you have a network that is both a guest network, and a mgmt
network, then you'd both create the bridge device, and configure IP
details on the host. 

> The other question that comes up is: how do we define these networks, 
> interfaces in the absence of the oVirt server for when the Node is in 
> standalone mode?  We should mirror this type of dialog in a text 
> configuration utility that can be put directly on the Node for admins to 
> use in standalone operations.  The output of the utility would be a 
> configuration file that can be fed to the existing scripts for setting up 
> network interfaces via augeas.

Well in the standalone mode you really just want a simple UI for setting
up individual NICs. In non-standalone mode, taskomatic will be translating
from the oVirt WUI model, into a serious of NIC config settings. So in
standalone mode, we just need to have UI to replicate the NIC config
settings that taskomatic would be sending.

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 pmyers at redhat.com  Fri Oct 24 14:40:41 2008
From: pmyers at redhat.com (Perry Myers)
Date: Fri, 24 Oct 2008 10:40:41 -0400
Subject: [Ovirt-devel] Explicit global network modelling
In-Reply-To: <20081024143809.GK1093@redhat.com>
References: <20081023180143.GB6753@redhat.com> <4901DC22.1000503@redhat.com>
	<20081024143809.GK1093@redhat.com>
Message-ID: <4901DE69.308@redhat.com>

Daniel P. Berrange wrote:
> On Fri, Oct 24, 2008 at 10:30:58AM -0400, Perry Myers wrote:
>> Daniel P. Berrange wrote:
> 
>>> Also note we don't need to ask the admin whether eth1 should be bridged
>>> or not. We know for a fact that it must be bridged, because it is a guest
>>> traffic network. Likewise we know that a admin network does not need a
>>> bridge. If a network was designated for both mgmt and guest usage, then
>>> we would need a bridge and IP address config.
>> I like this approach, just a small comment.  We need to be able to support 
>>  defining networks that are some combination of Managment, Guest, 
>> Storage. So usage can't be a single selection, it needs to be 
>> multi-selection.  And if guest is one of the selected usages, then the 
>> bridge is created.
> 
> Yes, that is no problem - the 'usage' field is just a set of possible
> options. If you have a network that is both a guest network, and a mgmt
> network, then you'd both create the bridge device, and configure IP
> details on the host. 
> 
>> The other question that comes up is: how do we define these networks, 
>> interfaces in the absence of the oVirt server for when the Node is in 
>> standalone mode?  We should mirror this type of dialog in a text 
>> configuration utility that can be put directly on the Node for admins to 
>> use in standalone operations.  The output of the utility would be a 
>> configuration file that can be fed to the existing scripts for setting up 
>> network interfaces via augeas.
> 
> Well in the standalone mode you really just want a simple UI for setting
> up individual NICs. In non-standalone mode, taskomatic will be translating
> from the oVirt WUI model, into a serious of NIC config settings. So in
> standalone mode, we just need to have UI to replicate the NIC config
> settings that taskomatic would be sending.

Yes, I think that's what I meant to say :)  Sorry if I wasn't clear...

/me goes to get more coffee

Perry



From pmyers at redhat.com  Fri Oct 24 14:43:49 2008
From: pmyers at redhat.com (Perry Myers)
Date: Fri, 24 Oct 2008 10:43:49 -0400
Subject: [Ovirt-devel] [PATCH server] BUG#460147 - Deleting a VM based
	on a	Cobbler system does not delete
In-Reply-To: <1224856124-26172-1-git-send-email-dpierce@redhat.com>
References: <1224856124-26172-1-git-send-email-dpierce@redhat.com>
Message-ID: <4901DF25.5040106@redhat.com>

Darryl L. Pierce wrote:
> This patch addresses this issue, first calling Cobbler and deleting the
> system prior to deleting the VM. It also changes ovirt-server's dependence
> to since this is new functionality in the rubygem-cobbler package.
> 
> Also, since there were several lines with trailing white spaces, this
> patch strips those out of the vm_controller.rb file.

Can you separate this into a whitespace patch and a functional patch?  The 
whitespace patch you can just go ahead and push without any acks (since 
it'll be nonfunctional changes).  Then post the functional portion of the 
patch for review.

Thanks!

Perry



From apevec at redhat.com  Fri Oct 24 14:53:04 2008
From: apevec at redhat.com (Alan Pevec)
Date: Fri, 24 Oct 2008 16:53:04 +0200
Subject: [Ovirt-devel] unable to add hosts in web admin tool
In-Reply-To: <4901DA04.40808@redhat.com>
References: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl>	<48F2F6C7.4020300@redfish-group.com>
	<48F2FEEB.10705@redhat.com>	<48F3128A.7090800@redfish-group.com>
	<48F35A21.6070101@redhat.com> <48FEF4CE.2090002@redfish-group.com>
	<4901DA04.40808@redhat.com>
Message-ID: <4901E150.2020700@redhat.com>

>>> You can also reinstall ovirt-appliance image and try 
>>> http://ovirt.org/page/TroubleShooting#Debugging_oVirt_Appliance_firstboot 

> I don't think the appliance is set up to use a serial console by 
> default...  This is something the Thincrust folks might want to change 
> to their default appliance creation scripts.  (cc'd thincrust-devel for 
> this)

Right, default console is tty, not serial, but at the above URL I gave instructions how to change that in the image _before_ running it for the first time. After that virsh console ovirt-appliance should show boot messages - have you done that procedure and still don't see anything on serial console?



From dpierce at redhat.com  Fri Oct 24 15:00:19 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Fri, 24 Oct 2008 11:00:19 -0400
Subject: [Ovirt-devel] [PATCH server] BUG#460147 - Deleting a VM based
	on a	Cobbler system does not delete
In-Reply-To: <4901DF25.5040106@redhat.com>
References: <1224856124-26172-1-git-send-email-dpierce@redhat.com>
	<4901DF25.5040106@redhat.com>
Message-ID: <4901E303.3050708@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Perry Myers wrote:
> Darryl L. Pierce wrote:
>> This patch addresses this issue, first calling Cobbler and deleting the
>> system prior to deleting the VM. It also changes ovirt-server's
>> dependence
>> to since this is new functionality in the rubygem-cobbler package.
>>
>> Also, since there were several lines with trailing white spaces, this
>> patch strips those out of the vm_controller.rb file.
> 
> Can you separate this into a whitespace patch and a functional patch? 
> The whitespace patch you can just go ahead and push without any acks
> (since it'll be nonfunctional changes).  Then post the functional
> portion of the patch for review.

NP. I'll send out an update now.

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkkB4v4ACgkQjaT4DmxOfxvMrgCgzN4Wie8ev8Kg4OidheyyMka6
VrIAoJ0pt04SNAHko3A4R3tre+lyfPNQ
=axg/
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 333 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081024/3de30ec2/attachment.vcf>

From dpierce at redhat.com  Fri Oct 24 15:09:25 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Fri, 24 Oct 2008 11:09:25 -0400
Subject: [Ovirt-devel] [PATCH server] BUG#460147 - Deleting a VM based on a
	Cobbler system does not delete
Message-ID: <1224860965-31630-1-git-send-email-dpierce@redhat.com>

This patch addresses this issue, first calling Cobbler and deleting the
system prior to deleting the VM. It also changes ovirt-server's dependence
to since this is new functionality in the rubygem-cobbler package.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 ovirt-server.spec.in                 |    2 +-
 src/app/controllers/vm_controller.rb |    7 ++++++-
 src/app/models/vm.rb                 |    6 ++++++
 src/test/unit/vm_test.rb             |   12 ++++++++++++
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/ovirt-server.spec.in b/ovirt-server.spec.in
index 123e280..e2620d1 100644
--- a/ovirt-server.spec.in
+++ b/ovirt-server.spec.in
@@ -17,7 +17,7 @@ Requires: rubygem(activeldap) >= 0.10.0
 Requires: rubygem(rails) >= 2.1.1
 Requires: rubygem(mongrel) >= 1.0.1
 Requires: rubygem(krb5-auth) >= 0.6
-Requires: rubygem(cobbler) >= 0.0.2
+Requires: rubygem(cobbler) >= 0.1.2
 Requires: rubygem(gettext)
 Requires: ruby-flexmock
 Requires: postgresql-server
diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb
index 585e524..c7772b5 100644
--- a/src/app/controllers/vm_controller.rb
+++ b/src/app/controllers/vm_controller.rb
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 Red Hat, Inc.
 # Written by Scott Seago <sseago at redhat.com>
 #
@@ -144,6 +144,11 @@ class VmController < ApplicationController
         vms = Vm.find(:all, :conditions => "id in (#{vm_ids.join(', ')})")
         vms.each do |vm|
           if vm.is_destroyable?
+            # Destroy the Cobbler system first if it's defined
+            if vm.uses_cobbler?
+              system = Cobbler::System.find_one(vm.cobbler_system_name)
+              system.remove if system
+            end
             vm.destroy
           else
             failure_list << vm.description
diff --git a/src/app/models/vm.rb b/src/app/models/vm.rb
index 2eff87a..8f335c9 100644
--- a/src/app/models/vm.rb
+++ b/src/app/models/vm.rb
@@ -277,6 +277,12 @@ class Vm < ActiveRecord::Base
     end
   end
 
+  # Returns the system name in Cobbler for this VM.
+  #
+  def cobbler_system_name
+    self.uuid
+  end
+
   # whether this VM may be validly deleted. running VMs should not be
   # allowed to be deleted. Currently we restrict deletion to VMs that
   # are currently stopped, pending (new without any create_vm tasks having
diff --git a/src/test/unit/vm_test.rb b/src/test/unit/vm_test.rb
index 22164e8..d583286 100644
--- a/src/test/unit/vm_test.rb
+++ b/src/test/unit/vm_test.rb
@@ -76,4 +76,16 @@ class VmTest < Test::Unit::TestCase
       vm.cobbler_name,
       "Wrong name reported."
   end
+
+  # Ensures that the right value is used when requesting the cobbler system
+  # name for a VM backed by Cobbler.
+  #
+  def test_cobbler_system_name
+    @vm = Vm.new
+    @vm.provisioning_and_boot_settings = @cobbler_profile_provisioning
+    @vm.uuid = "oicu812"
+
+    assert_equal @vm.cobbler_system_name, @vm.uuid,
+      "VMs should be using the UUID as their Cobbler system name."
+  end
 end
-- 
1.5.6.5



From sseago at redhat.com  Fri Oct 24 16:28:38 2008
From: sseago at redhat.com (Scott Seago)
Date: Fri, 24 Oct 2008 12:28:38 -0400
Subject: [Ovirt-devel] [PATCH server] BUG#460147 - Deleting a VM based
	on a	Cobbler system does not delete
In-Reply-To: <1224856124-26172-1-git-send-email-dpierce@redhat.com>
References: <1224856124-26172-1-git-send-email-dpierce@redhat.com>
Message-ID: <4901F7B6.4020404@redhat.com>

Darryl L. Pierce wrote:
> This patch addresses this issue, first calling Cobbler and deleting the
> system prior to deleting the VM. It also changes ovirt-server's dependence
> to since this is new functionality in the rubygem-cobbler package.
>
> Also, since there were several lines with trailing white spaces, this
> patch strips those out of the vm_controller.rb file.
>   
NACK. This works for the multi-VM deletion code path, but for the single 
VM deletion action (delete link on the details pane) the cobbler profile 
remains.

> diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb
> index 585e524..5ab80f5 100644
> --- a/src/app/controllers/vm_controller.rb
> +++ b/src/app/controllers/vm_controller.rb
> @@ -144,6 +144,11 @@ class VmController < ApplicationController
>          vms = Vm.find(:all, :conditions => "id in (#{vm_ids.join(', ')})")
>          vms.each do |vm|
>            if vm.is_destroyable?
> +            # Destroy the Cobbler system first if it's defined
> +            if vm.uses_cobbler?
> +              system = Cobbler::System.find_one(vm.cobbler_system_name)
> +              system.remove if system
> +            end
>              vm.destroy
>            else
>              failure_list << vm.description
>   
This code also needs to be added into the vm_controller.destroy, since 
that's the action used for deleting a single VM. Once that's done it 
should all work properly.

Scott



From mmorsi at redhat.com  Fri Oct 24 16:53:57 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Fri, 24 Oct 2008 12:53:57 -0400
Subject: [Ovirt-devel] Explicit global network modelling
In-Reply-To: <20081023210612.GA11694@redhat.com>
References: <20081023180143.GB6753@redhat.com> <4900DFE7.50808@redhat.com>
	<20081023210612.GA11694@redhat.com>
Message-ID: <4901FDA5.7020101@redhat.com>

Daniel P. Berrange wrote:
> On Thu, Oct 23, 2008 at 04:34:47PM -0400, Mohammed Morsi wrote:
>   
>> Daniel P. Berrange wrote:
>>     
>>> The network configuration UI discussions have all focused around
>>> the idea of configuring NICs on machines. I've been thinking that
>>> this is really not the right model. You have some kind of physical
>>> topology which is known, and has certain properties like network
>>> address and prefix, and vlan.  A host has one or more NICs, each
>>> of which is connected to a network.
>>>
>>> So if we can model a network as a global entity in its own right,
>>> we can simplify configuration of host interfaces, so simply a 
>>> matter of association, and optionally defining an address.
>>>
>>>
>>> * Network
>>>     - addr config      eg, none, static vs dhcp
>>>     - network address  eg, 192.168.122.0
>>>     - prefix           eg,  /24
>>>     - usage            eg, storage, management, guest
>>>     - vlan number      eg, 43
>>>     - vlan network     eg, name of host network
>>>
>>> * Interface
>>>     - name              eg eth1
>>>     - mac               eg 00:11:22:33:44:55
>>>     - addr config       eg, static vs dhcp vs none
>>>
>>> With the association being:
>>>
>>>            1     n           n    1
>>>   Network  <-----> Interface <----> Node
>>>
>>>
>>>   
>>>       
>> Based on our discussion today the following things are needed for this
>>
>>
>> 1. Add new networks table, subclassed into virtual and physical
>> networks, and associated with ip_addresses table
>>     
>
> Where does this virtual vs physical network distinction come from ?
>   
Both will simply be subclasses of the network table, which will need to
have a 'type' column in it. Thus each can validate the fields it needs
separately, for example virtual networks would validate the vlan number
and network fields are present before allowing creation, update
operations, etc.


>   
>> One additional thing that comes to mind as I read over the proposed
>> changes is that this network model fits nicely with DHCP assigned nics /
>> interfaces as the nic is associated with the network which it is to
>> receive that information from, but for static assignments it doesn't fit
>> so nicely. This is because the nic / interface will still need to be
>> associated with an ip address directly and not just a network. If so
>> we'd still need the associations between those tables, and might require
>> some validation to make sure the assigned ip is valid for the selected
>> network (or would no network be selected in that case?).
>>     
>
> Static ip info is no trouble at all. You can still associate an IP address
> with with the interface directly. In fact you could even suggest a suitable
> static addres by looking at the netmask of the Network, and what static
> addresses are already known, and pick an unused one. In addition, even if
> the network is configured for DHCP, you may still wish to give certain
> hosts static ip addrs, so you need to maintain the IP address against the
> interface anyway.
>
> With both the network, and interface you need to cope with multiple
> addresses - both IPv4 and v6
>
>
>             1     n           n    1
>    Network  <-----> Interface <----> Node
>      ^ 1                 ^ 1
>      |                   |
>      V n                 V n
>   NetAddress          Address
>
> In the NetAddress you store the network address (192.168.122.0) and
> the network prefix (/24). In the 'Address'  you merely store the
> address '192.168.122.0'. You can't directly enforce validity constraint
> of network address + prefix matching the NIC address, because SQL just
> isn't that expressive.
>
> Daniel
>   
Just to assist in starting all this, I came up with a quick uml class
diagram for the new network changes incorporating the new classes and
relationships,  and accommodating for things like static ip addresses
and the network usage relationship. It can be accessed here
http://www.ovirt.org/page/Redesigned_Network_Configuration If anything
looks off, feel free to point it out.

    -Mo
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081024/198d2090/attachment.htm>

From dpierce at redhat.com  Fri Oct 24 17:12:37 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Fri, 24 Oct 2008 13:12:37 -0400
Subject: [Ovirt-devel] [PATCH server] BUG#460147 - Deleting a VM based on a
	Cobbler system does not delete
Message-ID: <1224868357-8265-1-git-send-email-dpierce@redhat.com>

This patch addresses this issue, first calling Cobbler and deleting the
system prior to deleting the VM. It also changes ovirt-server's dependence
to since this is new functionality in the rubygem-cobbler package.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 ovirt-server.spec.in                 |    2 +-
 src/app/controllers/vm_controller.rb |   12 ++++++++++++
 src/app/models/vm.rb                 |    6 ++++++
 src/test/unit/vm_test.rb             |   12 ++++++++++++
 4 files changed, 31 insertions(+), 1 deletions(-)

diff --git a/ovirt-server.spec.in b/ovirt-server.spec.in
index 123e280..e2620d1 100644
--- a/ovirt-server.spec.in
+++ b/ovirt-server.spec.in
@@ -17,7 +17,7 @@ Requires: rubygem(activeldap) >= 0.10.0
 Requires: rubygem(rails) >= 2.1.1
 Requires: rubygem(mongrel) >= 1.0.1
 Requires: rubygem(krb5-auth) >= 0.6
-Requires: rubygem(cobbler) >= 0.0.2
+Requires: rubygem(cobbler) >= 0.1.2
 Requires: rubygem(gettext)
 Requires: ruby-flexmock
 Requires: postgresql-server
diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb
index a0fcfbc..fc992b3 100644
--- a/src/app/controllers/vm_controller.rb
+++ b/src/app/controllers/vm_controller.rb
@@ -144,6 +144,7 @@ class VmController < ApplicationController
         vms = Vm.find(:all, :conditions => "id in (#{vm_ids.join(', ')})")
         vms.each do |vm|
           if vm.is_destroyable?
+            destroy_cobbler_system(vm)
             vm.destroy
           else
             failure_list << vm.description
@@ -166,6 +167,7 @@ class VmController < ApplicationController
   def destroy
     vm_resource_pool = @vm.vm_resource_pool_id
     if (@vm.is_destroyable?)
+      destroy_cobbler_system(@vm)
       @vm.destroy
       render :json => { :object => "vm", :success => true,
         :alert => "Virtual Machine was successfully deleted." }
@@ -349,4 +351,14 @@ class VmController < ApplicationController
     pre_edit
     authorize_user
   end
+
+  private
+
+  def destroy_cobbler_system(vm)
+    # Destroy the Cobbler system first if it's defined
+    if vm.uses_cobbler?
+      system = Cobbler::System.find_one(vm.cobbler_system_name)
+      system.remove if system
+    end
+  end
 end
diff --git a/src/app/models/vm.rb b/src/app/models/vm.rb
index 05073f0..ae157f7 100644
--- a/src/app/models/vm.rb
+++ b/src/app/models/vm.rb
@@ -277,6 +277,12 @@ class Vm < ActiveRecord::Base
     end
   end
 
+  # Returns the system name in Cobbler for this VM.
+  #
+  def cobbler_system_name
+    self.uuid
+  end
+
   # whether this VM may be validly deleted. running VMs should not be
   # allowed to be deleted. Currently we restrict deletion to VMs that
   # are currently stopped, pending (new without any create_vm tasks having
diff --git a/src/test/unit/vm_test.rb b/src/test/unit/vm_test.rb
index 2291e9d..a9ed9dc 100644
--- a/src/test/unit/vm_test.rb
+++ b/src/test/unit/vm_test.rb
@@ -76,4 +76,16 @@ class VmTest < Test::Unit::TestCase
       vm.cobbler_name,
       "Wrong name reported."
   end
+
+  # Ensures that the right value is used when requesting the cobbler system
+  # name for a VM backed by Cobbler.
+  #
+  def test_cobbler_system_name
+    @vm = Vm.new
+    @vm.provisioning_and_boot_settings = @cobbler_profile_provisioning
+    @vm.uuid = "oicu812"
+
+    assert_equal @vm.cobbler_system_name, @vm.uuid,
+      "VMs should be using the UUID as their Cobbler system name."
+  end
 end
-- 
1.5.6.5



From dpierce at redhat.com  Fri Oct 24 17:18:45 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Fri, 24 Oct 2008 13:18:45 -0400
Subject: [Ovirt-devel] Re: [PATCH server] BUG#460147 - Deleting a VM based
 on a Cobbler system does not delete
In-Reply-To: <1224868357-8265-1-git-send-email-dpierce@redhat.com>
References: <1224868357-8265-1-git-send-email-dpierce@redhat.com>
Message-ID: <49020375.1030004@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Darryl L. Pierce wrote:
> This patch addresses this issue, first calling Cobbler and deleting the
> system prior to deleting the VM. It also changes ovirt-server's dependence
> to since this is new functionality in the rubygem-cobbler package.

<snip>

In this patch I refactored the Cobbler system delete call out into a
separate, private method and then call it from both delete and destroy.

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkkCA3IACgkQjaT4DmxOfxvjPQCg30nsNYj4trpnA0iBARjev17J
kJsAoIGCRjqe9ovv1e6LT6st2Os88TAh
=VS6g
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081024/7ab96b71/attachment.vcf>

From dpierce at redhat.com  Fri Oct 24 17:21:05 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Fri, 24 Oct 2008 13:21:05 -0400
Subject: [Ovirt-devel] Explicit global network modelling
In-Reply-To: <4900E131.206@redhat.com>
References: <20081023180143.GB6753@redhat.com> <4900DFE7.50808@redhat.com>
	<4900E131.206@redhat.com>
Message-ID: <49020401.3000306@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Darryl Pierce wrote:
>> I can take care of the interface bits (eg 4,5) if Darryl or someone else
>> takes care of the first three.
> 
> I can do the first three.

Correction, I can do it but it'll have to wait till after the standalone
node stuff is completed.

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkkCA/4ACgkQjaT4DmxOfxuyDQCcD12KQ+g858SNH900HLrN6FCX
9VsAnj6lArdDhDPCyIHuksO+dYmGS53U
=PM7g
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081024/c5d25004/attachment.vcf>

From sseago at redhat.com  Fri Oct 24 17:50:19 2008
From: sseago at redhat.com (Scott Seago)
Date: Fri, 24 Oct 2008 13:50:19 -0400
Subject: [Ovirt-devel] [PATCH server] BUG#460147 - Deleting a VM based
	on a	Cobbler system does not delete
In-Reply-To: <1224868357-8265-1-git-send-email-dpierce@redhat.com>
References: <1224868357-8265-1-git-send-email-dpierce@redhat.com>
Message-ID: <49020ADB.8060205@redhat.com>

Darryl L. Pierce wrote:
> This patch addresses this issue, first calling Cobbler and deleting the
> system prior to deleting the VM. It also changes ovirt-server's dependence
> to since this is new functionality in the rubygem-cobbler package.
>
> Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
> ---
>  ovirt-server.spec.in                 |    2 +-
>  src/app/controllers/vm_controller.rb |   12 ++++++++++++
>  src/app/models/vm.rb                 |    6 ++++++
>  src/test/unit/vm_test.rb             |   12 ++++++++++++
>  4 files changed, 31 insertions(+), 1 deletions(-)
>
>   
ACK,

Works for me now.

Scott



From dpierce at redhat.com  Fri Oct 24 17:53:59 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Fri, 24 Oct 2008 13:53:59 -0400
Subject: [Ovirt-devel] [PATCH server] BUG#460147 - Deleting a VM based
	on a	Cobbler system does not delete
In-Reply-To: <49020ADB.8060205@redhat.com>
References: <1224868357-8265-1-git-send-email-dpierce@redhat.com>
	<49020ADB.8060205@redhat.com>
Message-ID: <49020BB7.60007@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Scott Seago wrote:
> Darryl L. Pierce wrote:
>> This patch addresses this issue, first calling Cobbler and deleting the
>> system prior to deleting the VM. It also changes ovirt-server's
>> dependence
>> to since this is new functionality in the rubygem-cobbler package.
>>
>> Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
>> ---
>>  ovirt-server.spec.in                 |    2 +-
>>  src/app/controllers/vm_controller.rb |   12 ++++++++++++
>>  src/app/models/vm.rb                 |    6 ++++++
>>  src/test/unit/vm_test.rb             |   12 ++++++++++++
>>  4 files changed, 31 insertions(+), 1 deletions(-)
>>
>>   
> ACK,
> 
> Works for me now.

Pushed in the repo and ticket's now closed.

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkkCC7EACgkQjaT4DmxOfxt+3gCg66suL1g67b4Jnn2gu8uXe0VR
wjEAoI0V9cPwqLuZzPo7xgmaCF+J7SJu
=ML6G
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081024/9a234661/attachment.vcf>

From berrange at redhat.com  Fri Oct 24 18:43:58 2008
From: berrange at redhat.com (Daniel P. Berrange)
Date: Fri, 24 Oct 2008 19:43:58 +0100
Subject: [Ovirt-devel] Explicit global network modelling
In-Reply-To: <4901FDA5.7020101@redhat.com>
References: <20081023180143.GB6753@redhat.com> <4900DFE7.50808@redhat.com>
	<20081023210612.GA11694@redhat.com> <4901FDA5.7020101@redhat.com>
Message-ID: <20081024184358.GA28277@redhat.com>

On Fri, Oct 24, 2008 at 12:53:57PM -0400, Mohammed Morsi wrote:
> Just to assist in starting all this, I came up with a quick uml class
> diagram for the new network changes incorporating the new classes and
> relationships,  and accommodating for things like static ip addresses
> and the network usage relationship. It can be accessed here
> http://www.ovirt.org/page/Redesigned_Network_Configuration If anything
> looks off, feel free to point it out.

Some points

 - Network <-> Usage   is  0/1-to-n since you can have zero or
   more usages for each network
 - Having separate tables for 'bonding type' and 'boot type' seems
   like overkill to me - I would have just have a single byte field
   with a CHECK constraint on it.
 - NIC <-> IPAddress is  0/1-to-n  since you can have zero or more
   addresses for each NIC
 - Sub-tables for IPv4 vs IPv6 seems like overkill since they're
   not going to be any different in the info they store
 - Don't use the word 'virtual' in association with network - stick to
   using VLAN instead. 'virtual' already has a defined meaning in libvirt
   application terminology.
 - A physical NIC should associate to a physical network, to enforce 
   that a NIC is a physical connection
 - Bond shouldn't associate with network at all, since that's duplicating
   info already encoded in the NIC -> physical network association
 - A physical NIC & bond should also assciate to VLAN-network, n-to-n to 
   represent the idea that you can enable zero or more VLAN interfaces. 
   In fact this suggests you should have a base class NIC, and sub-classes
   for physical, bond & vlan interfaces.

Regards,
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 imain at redhat.com  Fri Oct 24 19:55:47 2008
From: imain at redhat.com (Ian Main)
Date: Fri, 24 Oct 2008 12:55:47 -0700
Subject: [Ovirt-devel] Explicit global network modelling
In-Reply-To: <20081024184358.GA28277@redhat.com>
References: <20081023180143.GB6753@redhat.com> <4900DFE7.50808@redhat.com>
	<20081023210612.GA11694@redhat.com> <4901FDA5.7020101@redhat.com>
	<20081024184358.GA28277@redhat.com>
Message-ID: <20081024125547.4a9821e0@tp.mains.net>

On Fri, 24 Oct 2008 19:43:58 +0100
"Daniel P. Berrange" <berrange at redhat.com> wrote:

> On Fri, Oct 24, 2008 at 12:53:57PM -0400, Mohammed Morsi wrote:
> > Just to assist in starting all this, I came up with a quick uml class
> > diagram for the new network changes incorporating the new classes and
> > relationships,  and accommodating for things like static ip addresses
> > and the network usage relationship. It can be accessed here
> > http://www.ovirt.org/page/Redesigned_Network_Configuration If anything
> > looks off, feel free to point it out.
> 
> Some points
> 
>  - Network <-> Usage   is  0/1-to-n since you can have zero or
>    more usages for each network
>  - Having separate tables for 'bonding type' and 'boot type' seems
>    like overkill to me - I would have just have a single byte field
>    with a CHECK constraint on it.
>  - NIC <-> IPAddress is  0/1-to-n  since you can have zero or more
>    addresses for each NIC
>  - Sub-tables for IPv4 vs IPv6 seems like overkill since they're
>    not going to be any different in the info they store
>  - Don't use the word 'virtual' in association with network - stick to
>    using VLAN instead. 'virtual' already has a defined meaning in libvirt
>    application terminology.
>  - A physical NIC should associate to a physical network, to enforce 
>    that a NIC is a physical connection
>  - Bond shouldn't associate with network at all, since that's duplicating
>    info already encoded in the NIC -> physical network association
>  - A physical NIC & bond should also assciate to VLAN-network, n-to-n to 
>    represent the idea that you can enable zero or more VLAN interfaces. 
>    In fact this suggests you should have a base class NIC, and sub-classes
>    for physical, bond & vlan interfaces.

Yes, all good points.  I'd just like to put a plug in here too for you to take
a look at the model I am working on for the node side because afaict it is pretty
much identical to what you are working with here.  You'll also end up using it 
to do the actual node configuration so we need to stay in sync.

	Ian



From mmorsi at redhat.com  Fri Oct 24 22:13:32 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Fri, 24 Oct 2008 18:13:32 -0400
Subject: [Ovirt-devel] Explicit global network modelling
In-Reply-To: <20081024184358.GA28277@redhat.com>
References: <20081023180143.GB6753@redhat.com> <4900DFE7.50808@redhat.com>
	<20081023210612.GA11694@redhat.com> <4901FDA5.7020101@redhat.com>
	<20081024184358.GA28277@redhat.com>
Message-ID: <4902488C.6070607@redhat.com>

Daniel P. Berrange wrote:
> On Fri, Oct 24, 2008 at 12:53:57PM -0400, Mohammed Morsi wrote:
>   
>> Just to assist in starting all this, I came up with a quick uml class
>> diagram for the new network changes incorporating the new classes and
>> relationships,  and accommodating for things like static ip addresses
>> and the network usage relationship. It can be accessed here
>> http://www.ovirt.org/page/Redesigned_Network_Configuration If anything
>> looks off, feel free to point it out.
>>     
>
> Some points
>
>  - Network <-> Usage   is  0/1-to-n since you can have zero or
>    more usages for each network
>  - Having separate tables for 'bonding type' and 'boot type' seems
>    like overkill to me - I would have just have a single byte field
>    with a CHECK constraint on it.
>  - NIC <-> IPAddress is  0/1-to-n  since you can have zero or more
>    addresses for each NIC
>  - Sub-tables for IPv4 vs IPv6 seems like overkill since they're
>    not going to be any different in the info they store
>   
>  - Don't use the word 'virtual' in association with network - stick to
>    using VLAN instead. 'virtual' already has a defined meaning in libvirt
>    application terminology.
>  - A physical NIC should associate to a physical network, to enforce 
>    that a NIC is a physical connection
>  - Bond shouldn't associate with network at all, since that's duplicating
>    info already encoded in the NIC -> physical network association
>  - A physical NIC & bond should also assciate to VLAN-network, n-to-n to 
>    represent the idea that you can enable zero or more VLAN interfaces. 
>    In fact this suggests you should have a base class NIC, and sub-classes
>    for physical, bond & vlan interfaces.
>
> Regards,
> Daniel
>   

I updated the diagram. As far as the ipv4/ ipv6 distinction, once again
this is a validation issue, not only do the addresses need to be
validated to be in the correct format, but certain fields of the
ip_addresses table only apply to IPv4/IPv6. I'm still a little unclear
about the nic / bonding and physical / vlan network associations, so the
diagram might be off.

   -Mo
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081024/2a7cfca0/attachment.htm>

From justin at redfish-group.com  Fri Oct 24 23:50:59 2008
From: justin at redfish-group.com (Justin Clacherty)
Date: Sat, 25 Oct 2008 09:50:59 +1000
Subject: [Ovirt-devel] unable to add hosts in web admin tool
In-Reply-To: <4901E150.2020700@redhat.com>
References: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl>	<48F2F6C7.4020300@redfish-group.com>
	<48F2FEEB.10705@redhat.com>	<48F3128A.7090800@redfish-group.com>
	<48F35A21.6070101@redhat.com> <48FEF4CE.2090002@redfish-group.com>
	<4901DA04.40808@redhat.com> <4901E150.2020700@redhat.com>
Message-ID: <49025F63.7050609@redfish-group.com>

Alan Pevec wrote:
> Right, default console is tty, not serial, but at the above URL I gave 
> instructions how to change that in the image _before_ running it for 
> the first time. After that virsh console ovirt-appliance should show 
> boot messages - have you done that procedure and still don't see 
> anything on serial console?

I thought I had, but might have missed something, will give it another go.

Justin.




From zhoupeng.hust at 163.com  Mon Oct 27 03:03:13 2008
From: zhoupeng.hust at 163.com (=?gb2312?B?1tzF9A==?=)
Date: Mon, 27 Oct 2008 11:03:13 +0800 (CST)
Subject: [Ovirt-devel] How can i contribute for ovirt?
In-Reply-To: <20081025160053.75E7961B130@hormel.redhat.com>
References: <20081025160053.75E7961B130@hormel.redhat.com>
Message-ID: <49052F71.000031.28914@bj163app4.163.com>

hi, 
    This is will.zhou from NJ, i investigate ovirt and kvm for a long time. I go through almost all the code of ovirt WUI and the backend process such as host-status.rb, taskomatic.rb and others. Also i have set up a enviroment in my home to run ovrit manager and nodes (with local storage)
    I am thinking what can i do to contribute this project, for example international it?
    Since i did not get information from www.ovirt.org web page, i have to write mails you, sorry if i disturb you guys, thanks.

    will.zhou
    regards
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081027/7304cd02/attachment.htm>

From apevec at redhat.com  Mon Oct 27 09:08:32 2008
From: apevec at redhat.com (Alan Pevec)
Date: Mon, 27 Oct 2008 10:08:32 +0100
Subject: [Ovirt-devel] How can i contribute for ovirt?
In-Reply-To: <49052F71.000031.28914@bj163app4.163.com>
References: <20081025160053.75E7961B130@hormel.redhat.com>
	<49052F71.000031.28914@bj163app4.163.com>
Message-ID: <49058510.60609@redhat.com>

?? wrote:
> I go through almost all the code of ovirt WUI and the backend process 
> such as host-status.rb, taskomatic.rb and others. Also i have set up a 
> enviroment in my home to run ovrit manager and nodes (with local storage)
> I am thinking what can i do to contribute this project, for example 
> international it?

Excellent, as it is usual saying in open-source projects: patches welcome :)
For general does and donts, please see Rich Jones' nice writeup http://et.redhat.com/~rjones/how-to-supply-code-to-open-source-projects/

> Since i did not get information from www.ovirt.org web page, i have to 

We have http://ovirt.org/contribute.html
but it could be made clearer. But basically, follow http://ovirt.org/build-instructions.html and checkout 'next' branch from git repositories and send patches to the ovirt-devel list.
Create your local git branch and rebase it to 'next' before sending patches with git-send-email.
For Git Crash Courses see http://git.or.cz/



From dpierce at redhat.com  Mon Oct 27 12:54:26 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Mon, 27 Oct 2008 08:54:26 -0400
Subject: [Ovirt-devel] Explicit global network modelling
In-Reply-To: <4902488C.6070607@redhat.com>
References: <20081023180143.GB6753@redhat.com> <4900DFE7.50808@redhat.com>
	<20081023210612.GA11694@redhat.com> <4901FDA5.7020101@redhat.com>
	<20081024184358.GA28277@redhat.com> <4902488C.6070607@redhat.com>
Message-ID: <4905BA02.9050301@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Mohammed Morsi wrote:
> I updated the diagram. As far as the ipv4/ ipv6 distinction, once again
> this is a validation issue, not only do the addresses need to be
> validated to be in the correct format, but certain fields of the
> ip_addresses table only apply to IPv4/IPv6.

Take a look at the original patch I proffered for ip address modeling.
It uses inheritence and Rails validations to do the above.

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkkFuf4ACgkQjaT4DmxOfxsaUACgmqRoUaZcCYnrwLX91huexyt9
cO4AoOrbvwfvvDdYEFvfRgJTs67vuK2q
=lFvo
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081027/bf23a484/attachment.vcf>

From bkearney at redhat.com  Mon Oct 27 13:19:15 2008
From: bkearney at redhat.com (Bryan Kearney)
Date: Mon, 27 Oct 2008 09:19:15 -0400
Subject: [Thincrust-devel] Re: [Ovirt-devel] unable to add hosts in web
	admin tool
In-Reply-To: <4901E150.2020700@redhat.com>
References: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl>	<48F2F6C7.4020300@redfish-group.com>	<48F2FEEB.10705@redhat.com>	<48F3128A.7090800@redfish-group.com>	<48F35A21.6070101@redhat.com>
	<48FEF4CE.2090002@redfish-group.com>	<4901DA04.40808@redhat.com>
	<4901E150.2020700@redhat.com>
Message-ID: <4905BFD3.5090906@redhat.com>

Alan Pevec wrote:
>>>> You can also reinstall ovirt-appliance image and try 
>>>> http://ovirt.org/page/TroubleShooting#Debugging_oVirt_Appliance_firstboot 
> 
> 
>> I don't think the appliance is set up to use a serial console by 
>> default...  This is something the Thincrust folks might want to change 
>> to their default appliance creation scripts.  (cc'd thincrust-devel 
>> for this)
> 
> Right, default console is tty, not serial, but at the above URL I gave 
> instructions how to change that in the image _before_ running it for the 
> first time. After that virsh console ovirt-appliance should show boot 
> messages - have you done that procedure and still don't see anything on 
> serial console
Alan:

This is the url.. yes?

http://ovirt.org/page/TroubleShooting#Debugging_oVirt_Appliance_firstboot

You appear to be modifying the host, not the guest is that correct?

-- bk



From apevec at redhat.com  Mon Oct 27 14:00:14 2008
From: apevec at redhat.com (Alan Pevec)
Date: Mon, 27 Oct 2008 15:00:14 +0100
Subject: [Thincrust-devel] Re: [Ovirt-devel] unable to add hosts in web
	admin tool
In-Reply-To: <4905BFD3.5090906@redhat.com>
References: <48F2EED5.6030908@redfish-group.com>	<BAY124-DS52A7EA200879521B94307B1360@phx.gbl>	<48F2F6C7.4020300@redfish-group.com>	<48F2FEEB.10705@redhat.com>	<48F3128A.7090800@redfish-group.com>	<48F35A21.6070101@redhat.com>	<48FEF4CE.2090002@redfish-group.com>	<4901DA04.40808@redhat.com>	<4901E150.2020700@redhat.com>
	<4905BFD3.5090906@redhat.com>
Message-ID: <4905C96E.5080407@redhat.com>

Bryan Kearney wrote:
> http://ovirt.org/page/TroubleShooting#Debugging_oVirt_Appliance_firstboot
> 
> You appear to be modifying the host, not the guest is that correct?

guest image modified, it is mounted at /mnt using qemu-nbd (network block device)



From dpierce at redhat.com  Mon Oct 27 15:50:25 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Mon, 27 Oct 2008 11:50:25 -0400
Subject: [Ovirt-devel] Re: [PATCH server] BUG#467099: Fixes a uniqueness
	constraint bug in bondings_nics.
In-Reply-To: <4901C3FF.3050007@redhat.com>
References: <1224764451-7447-1-git-send-email-dpierce@redhat.com>
	<4901C3FF.3050007@redhat.com>
Message-ID: <4905E341.1010305@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Darryl Pierce wrote:
> Darryl L. Pierce wrote:
>> It moves the uniqueness constraint from being on the pair (bonding_id, nic_id)
>> to being only on nic_id. The goal is just to ensure that a nic is only mapped
>> once to any bonding.
> 
>> You will need to run a migration with this patch.
> 
>> Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
>> ---
>>  ...ll.rb => 026_allow_nic_boot_type_to_be_null.rb} |    0 
>>  ..._fix_uniqueness_constraints_in_bondings_nics.rb |   11 +++++++++++
>>  2 files changed, 11 insertions(+), 0 deletions(-)
>>  rename src/db/migrate/{025_allow_nic_boot_type_to_be_null.rb => 026_allow_nic_boot_type_to_be_null.rb} (100%)
>>  create mode 100644 src/db/migrate/027_fix_uniqueness_constraints_in_bondings_nics.rb
> 
>> diff --git a/src/db/migrate/025_allow_nic_boot_type_to_be_null.rb b/src/db/migrate/026_allow_nic_boot_type_to_be_null.rb
>> similarity index 100%
>> rename from src/db/migrate/025_allow_nic_boot_type_to_be_null.rb
>> rename to src/db/migrate/026_allow_nic_boot_type_to_be_null.rb
>> diff --git a/src/db/migrate/027_fix_uniqueness_constraints_in_bondings_nics.rb b/src/db/migrate/027_fix_uniqueness_constraints_in_bondings_nics.rb
>> new file mode 100644
>> index 0000000..0daa210
>> --- /dev/null
>> +++ b/src/db/migrate/027_fix_uniqueness_constraints_in_bondings_nics.rb
>> @@ -0,0 +1,11 @@
>> +class FixUniquenessConstraintsInBondingsNics < ActiveRecord::Migration
>> +  def self.up
>> +    remove_index :bondings_nics, [:bonding_id, :nic_id]
>> +    add_index :bondings_nics, :nic_id, :unique => true
>> +  end
>> +
>> +  def self.down
>> +    remove_index :bondings_nics, :nic_id
>> +    add_index :bondings_nics, [:bonding_id, :nic_id], :unique => true
>> +  end
>> +end
> 
> It's a small patch, can someone review it and give feedback or an ACK?

I'm pushing this patch today.

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkkF4z0ACgkQjaT4DmxOfxskQQCgmy8GtZFZ6brj+upSASx2CL5k
BmMAnj6DAzmaxprQ6EIEeMVky6UKRuwA
=Igmc
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081027/73235b0f/attachment.vcf>

From sseago at redhat.com  Mon Oct 27 18:50:25 2008
From: sseago at redhat.com (Scott Seago)
Date: Mon, 27 Oct 2008 14:50:25 -0400
Subject: [Ovirt-devel] [PATCH server] Stage of one of tree conversions
	to	pluggable widget.
In-Reply-To: <1224797075-12493-1-git-send-email-jguiditt@redhat.com>
References: <1224797075-12493-1-git-send-email-jguiditt@redhat.com>
Message-ID: <49060D71.70604@redhat.com>

Jason Guiditta wrote:
> This patch includes the new pluggable tree widget code and
> conversion of Move popups for Hardware pools (hosts and
> storage).  Simplified call to move so it returns an object
> which is used to build the tree (no extra ajax call anymore).
> The json_tree_internal method will be going away next patch,
> can't get rid of it yet because some Smart Pool stuff depends
> on it.
>
> Fixed minor bug in Pool.full_set_nested causing 'selected'
> never to be set. Also added to this method a 'type' option
> to filter results by pool type.
>
> Signed-off-by: Jason Guiditta <jguiditt at redhat.com>
> ---
>  src/app/controllers/hardware_controller.rb |    4 ++
>  src/app/models/pool.rb                     |    7 +++-
>  src/app/views/hardware/move.rhtml          |   60 +++++++++++++++-----------
>  src/app/views/layouts/_tree.rhtml          |    9 +---
>  src/app/views/layouts/redux.rhtml          |    3 +
>  src/public/javascripts/ovirt.tree.js       |   64 +++++++++++++++++++++++++++-
>  src/public/stylesheets/ovirt-tree/tree.css |    7 +++-
>  7 files changed, 119 insertions(+), 35 deletions(-)
>   
ACK

Works for me

Scott



From mmorsi at redhat.com  Mon Oct 27 22:55:34 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Mon, 27 Oct 2008 18:55:34 -0400
Subject: [Ovirt-devel] Explicit global network modelling
In-Reply-To: <49020401.3000306@redhat.com>
References: <20081023180143.GB6753@redhat.com> <4900DFE7.50808@redhat.com>
	<4900E131.206@redhat.com> <49020401.3000306@redhat.com>
Message-ID: <490646E6.5000806@redhat.com>

Darryl Pierce wrote:
> Darryl Pierce wrote:
> >> I can take care of the interface bits (eg 4,5) if Darryl or someone
> else
> >> takes care of the first three.
> > I can do the first three.
>
> Correction, I can do it but it'll have to wait till after the standalone
> node stuff is completed.
>
I started implementing the new design today. Will pull as much as I can
from your ip_addresses patch in addition to the controller / interface
stuff I did last week.

   -Mo



From clalance at redhat.com  Tue Oct 28 15:51:28 2008
From: clalance at redhat.com (Chris Lalancette)
Date: Tue, 28 Oct 2008 16:51:28 +0100
Subject: [Ovirt-devel] FYI about the current ovirt-node
Message-ID: <49073500.2010801@redhat.com>

Perry asked me to point this out on the list, since I was doing some testing
today.  Currently, if you run a RHEL-3, RHEL-4, or RHEL-5 x86_64 guest on an F-9
based oVirt node on AMD hardware, they will very likely fail to boot with a
panic in setup_k7_watchdog (or thereabouts).  This arises because of a bug in
kvm in 2.6.26, which is the current version of the kernel in F-9.  The good news
is that the patch I submitted to fix this is already in 2.6.27 (and hence
rawhide), and this issue only affects AMD hardware at present.  Once F-9 rebases
to 2.6.27, we'll also automatically pick up the fix, but until then, just be
aware that this issue could affect you.

-- 
Chris Lalancette



From dpierce at redhat.com  Tue Oct 28 16:40:14 2008
From: dpierce at redhat.com (Darryl L. Pierce)
Date: Tue, 28 Oct 2008 12:40:14 -0400
Subject: [Ovirt-devel] [PATCH node] Creates a standalone mode entry point
	script.
Message-ID: <1225212014-24062-1-git-send-email-dpierce@redhat.com>

NOTE: I'm looking for feedback on this initial design. It only has
networking support at the moment.

The script will execute only when the node is booted without the support of
a server suite. If it determines that the node is running in standalone mode,
it will then kick over to a node setup script.

This iteration defines the general flow for the standalone mode's firstboot
use case. When the node boots and determines it's in standalone mode, it
goes through the following steps:

1. Prompt for an administrator password
2. Prompt the user to configure disk storage
3. Prompt the user to configure networking
4. Prompt the user to configure logging

The node then continues to boot normally.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 Makefile.am                     |   34 +++++++++------
 ovirt-node.spec.in              |   15 ++++++-
 scripts/ovirt-config-logging    |    1 +
 scripts/ovirt-config-networking |   90 +++++++++++++++++++++++++++++++++++++++
 scripts/ovirt-config-password   |    1 +
 scripts/ovirt-config-setup      |   43 ++++++++++++++++++
 scripts/ovirt-config-storage    |    1 +
 scripts/ovirt-functions         |    5 ++
 scripts/ovirt-standalone-mode   |   38 ++++++++++++++++
 9 files changed, 213 insertions(+), 15 deletions(-)
 create mode 100755 scripts/ovirt-config-logging
 create mode 100755 scripts/ovirt-config-networking
 create mode 100755 scripts/ovirt-config-password
 create mode 100755 scripts/ovirt-config-setup
 create mode 100755 scripts/ovirt-config-storage
 create mode 100755 scripts/ovirt-standalone-mode

diff --git a/Makefile.am b/Makefile.am
index c55db13..3d824db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,20 +18,26 @@
 OVIRT_CACHE_DIR	?= $(HOME)/ovirt-cache
 SUBDIRS = ovirt-identify-node ovirt-listen-awake
 
-EXTRA_DIST =			\
-  .gitignore			\
-  ovirt-node.spec		\
-  ovirt-node.spec.in		\
-  ovirt-node-selinux.te		\
-  scripts/collectd		\
-  scripts/collectd.conf.in	\
-  scripts/ovirt			\
-  scripts/ovirt-awake		\
-  scripts/ovirt-early		\
-  scripts/ovirt-functions	\
-  scripts/ovirt-post		\
-  scripts/ovirt-process-config  \
-  logrotate/ovirt-logrotate	\
+EXTRA_DIST =			  \
+  .gitignore			  \
+  ovirt-node.spec		  \
+  ovirt-node.spec.in		  \
+  ovirt-node-selinux.te		  \
+  scripts/collectd		  \
+  scripts/collectd.conf.in	  \
+  scripts/ovirt			  \
+  scripts/ovirt-awake		  \
+  scripts/ovirt-config-logging    \
+  scripts/ovirt-config-networking \
+  scripts/ovirt-config-password   \
+  scripts/ovirt-config-setup      \
+  scripts/ovirt-config-storage    \
+  scripts/ovirt-early		  \
+  scripts/ovirt-functions	  \
+  scripts/ovirt-post		  \
+  scripts/ovirt-process-config    \
+  scripts/ovirt-standalone-mode   \
+  logrotate/ovirt-logrotate	  \
   logrotate/ovirt-logrotate.conf
 
 # For Release: 0..., set _ovirt_dev=1 so that we get extra_release.GIT-
diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index 912192e..02f8f0f 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -88,17 +88,22 @@ cd -
 
 %{__install} -p -m0755 scripts/ovirt-awake %{buildroot}%{_sbindir}
 %{__install} -p -m0755 scripts/ovirt-process-config %{buildroot}%{_sbindir}
+%{__install} -p -m0755 scripts/ovirt-config-logging %{buildroot}%{_sbindir}
+%{__install} -p -m0755 scripts/ovirt-config-networking %{buildroot}%{_sbindir}
+%{__install} -p -m0755 scripts/ovirt-config-password %{buildroot}%{_sbindir}
+%{__install} -p -m0755 scripts/ovirt-config-setup %{buildroot}%{_sbindir}
+%{__install} -p -m0755 scripts/ovirt-config-storage %{buildroot}%{_sbindir}
 %{__install} -p -m0755 ovirt-identify-node/ovirt-identify-node %{buildroot}%{_sbindir}
 %{__install} -p -m0755 ovirt-listen-awake/ovirt-listen-awake %{buildroot}%{_sbindir}
 %{__install} -Dp -m0755 ovirt-listen-awake/ovirt-listen-awake.init %{buildroot}%{_initrddir}/ovirt-listen-awake
 %{__install} -Dp -m0755 ovirt-listen-awake/ovirt-install-node %{buildroot}%{_sbindir}
 %{__install} -Dp -m0755 ovirt-listen-awake/ovirt-uninstall-node %{buildroot}%{_sbindir}
 
-
 %{__install} -p -m0644 scripts/ovirt-functions %{buildroot}%{_initrddir}
 %{__install} -p -m0755 scripts/ovirt-early %{buildroot}%{_initrddir}
 %{__install} -p -m0755 scripts/ovirt %{buildroot}%{_initrddir}
 %{__install} -p -m0755 scripts/ovirt-post %{buildroot}%{_initrddir}
+%{__install} -p -m0755 scripts/ovirt-standalone-mode %{buildroot}%{_initrddir}
 
 %{__install} -p -m0644 scripts/collectd %{buildroot}%{_sysconfdir}/chkconfig.d
 %{__install} -p -m0644 scripts/collectd.conf.in %{buildroot}%{_sysconfdir}
@@ -125,6 +130,7 @@ cd -
 /sbin/chkconfig --add ovirt-early
 /sbin/chkconfig --add ovirt
 /sbin/chkconfig --add ovirt-post
+/sbin/chkconfig --add ovirt-standalone-mode
 # this is ugly; we need collectd to start *after* libvirtd, so we own the
 # /etc/chkconfig.d/collectd file, and then have to re-define collectd here
 /sbin/chkconfig --add collectd
@@ -136,6 +142,7 @@ if [ "$1" = 0 ] ; then
   /sbin/chkconfig --del ovirt
   /sbin/chkconfig --del ovirt-post
   /sbin/chkconfig --del ovirt-listen-awake
+  /sbin/chkconfig --del ovirt-standalone-mode
 fi
 
 %post selinux
@@ -159,6 +166,11 @@ fi
 %files
 %defattr(-,root,root,0755)
 %{_sbindir}/ovirt-awake
+%{_sbindir}/ovirt-config-logging
+%{_sbindir}/ovirt-config-networking
+%{_sbindir}/ovirt-config-password
+%{_sbindir}/ovirt-config-setup
+%{_sbindir}/ovirt-config-storage
 %{_sbindir}/ovirt-process-config
 %{_sbindir}/ovirt-identify-node
 %{_sbindir}/ovirt-listen-awake
@@ -168,6 +180,7 @@ fi
 %{_initrddir}/ovirt
 %{_initrddir}/ovirt-post
 %{_initrddir}/ovirt-listen-awake
+%{_initrddir}/ovirt-standalone-mode
 %config %{_sysconfdir}/logrotate.d/ovirt-logrotate.conf
 %config %{_sysconfdir}/cron.hourly/ovirt-logrotate
 %defattr(-,root,root,0644)
diff --git a/scripts/ovirt-config-logging b/scripts/ovirt-config-logging
new file mode 100755
index 0000000..8b13789
--- /dev/null
+++ b/scripts/ovirt-config-logging
@@ -0,0 +1 @@
+
diff --git a/scripts/ovirt-config-networking b/scripts/ovirt-config-networking
new file mode 100755
index 0000000..4d72bae
--- /dev/null
+++ b/scripts/ovirt-config-networking
@@ -0,0 +1,90 @@
+#!/bin/bash
+#
+# Iterates over the list of network devices on the node and prompts the user
+# to configure each.
+
+CONFIG_FILE_ROOT="/file/etc/sysconfig/network-scripts/ifcfg"
+
+function configure_interface
+{
+    NIC=$1
+    FILENAME="/var/tmp/augtool-$NIC"
+
+    printf "\nCONFIGURE INTERFACE: $NIC\n\n"
+
+    THIS_ROOT="$CONFIG_FILE_ROOT-$NIC"
+    CONFIG="rm $THIS_ROOT\nset $THIS_ROOT/DEVICE $NIC"
+
+    # Is this NIC shared?
+    while true; do
+        printf "Is $NIC a shared interface? (Y/N) "
+        read
+        case $REPLY in
+            Y|y) CONFIG="$CONFIG\nset $THIS_ROOT/TYPE bridge"; break ;;
+            N|n) bridge="N"; break ;;
+        esac
+    done
+
+    # how do you want to configure this device? (dhcp, static IP)
+    while true; do
+        printf "Does $NIC use dynamic addressing? (Y/N) "
+        read
+        case $REPLY in
+            Y|y) CONFIG="$CONFIG\nset $THIS_ROOT/BOOTPROTO dhcp"; break ;;
+            N|n)
+                printf "\tIP Address: "; read; IPADDR=$REPLY
+                printf "\t   Netmask: "; read; NETMASK=$REPLY
+                printf "\t Broadcast: "; read; BROADCAST=$REPLY
+                printf "\t   Gateway: "; read; GATEWAY=$REPLY
+
+                printf "\nIP Address: $IPADDR\nNetmask: $NETMASK\nBroadcast: $BROADCAST\nGateway: $GATEWAY\n"
+                printf "Is this correct? (Y/N) "
+                read
+                case $REPLY in
+                    Y|y)
+                        CONFIG="$CONFIG\nset $THIS_ROOT/IPADDR $IPADDR"
+                        CONFIG="$CONFIG\nset $THIS_ROOT/BROADCAST $BROADCAST"
+                        CONFIG="$CONFIG\nset $THIS_ROOT/NETMASK $NETMASK"
+                        break
+                        ;;
+                esac
+                ;;
+        esac
+    done
+
+    if [ "$bridge" == "N" ]; then
+        printf "Is $NIC bridged? (Y/N) "
+        read
+        case $REPLY in
+            Y|y) 
+                printf "What is the bridge name? "
+                read 
+                CONFIG="$CONFIG\n set $THIS_ROOT/BRIDGE $REPLY"
+                ;;
+        esac
+    fi
+
+    CONFIG="$CONFIG\nset $THIS_ROOT/ONBOOT yes"
+    printf "$CONFIG\n" > $FILENAME
+}
+
+# get the list of network cards on this machine
+NICS=$(hal-device | awk '/net.interface/ {
+    match($0, "= '"'"'(.*)'"'"' ", nic); printf("%s ", nic[1]); }')
+
+# Append a quit option
+NICS="$NICS Quit"
+
+PS3="Please select a network interface to configure:"
+select NIC in $NICS
+do
+    case "$NIC" in
+        "Quit")
+            exit 0
+            ;;
+
+        *)
+            configure_interface $NIC
+            ;;
+    esac
+done
diff --git a/scripts/ovirt-config-password b/scripts/ovirt-config-password
new file mode 100755
index 0000000..8b13789
--- /dev/null
+++ b/scripts/ovirt-config-password
@@ -0,0 +1 @@
+
diff --git a/scripts/ovirt-config-setup b/scripts/ovirt-config-setup
new file mode 100755
index 0000000..6db49db
--- /dev/null
+++ b/scripts/ovirt-config-setup
@@ -0,0 +1,43 @@
+#!/bin/bash
+# 
+# Entry point for configuring an oVirt node when running in standalone mode.
+
+PS3="Please select an option: "
+
+# TODO should we make this optional, based on whether the password was already set?
+PASSWORD_OPTION="Password"
+
+LIST="Networking Storage Logging ${PASSWORD_OPTION} Quit"
+
+select OPT in $LIST
+do
+    printf "\n"
+
+    case "$OPT" in
+        "Networking")
+            ovirt-config-networking
+            ;;
+
+        "Storage")
+            ovirt-config-storage
+            ;;
+
+        "Logging")
+            ovirt-config-logging
+            ;;
+
+        "Password")
+            # TODO only do this if we allow it
+            ovirt-config-password
+            ;;
+
+        "Quit")
+            printf "Finished.\n"
+            exit 0
+            ;;
+
+        "*")
+            printf "Invalid option \"${OPT}\".\n"
+            ;;
+    esac
+done
diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage
new file mode 100755
index 0000000..8b13789
--- /dev/null
+++ b/scripts/ovirt-config-storage
@@ -0,0 +1 @@
+
diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions
index e251eac..53e9f62 100644
--- a/scripts/ovirt-functions
+++ b/scripts/ovirt-functions
@@ -7,6 +7,11 @@ OVIRT_LABEL=OVIRT
 
 OVIRT_BACKUP_DIR=/var/lib/ovirt-backup
 
+is_standalone()
+{
+    return 0
+}
+
 find_srv()
 {
     local dnsreply
diff --git a/scripts/ovirt-standalone-mode b/scripts/ovirt-standalone-mode
new file mode 100755
index 0000000..869b77c
--- /dev/null
+++ b/scripts/ovirt-standalone-mode
@@ -0,0 +1,38 @@
+#!/bin/bash
+#
+# ovirt-standalone-mode Starts the node in standalone mode.
+#
+# chkconfig: - 01 99
+# description: ovirt-standalone-mode services
+#
+
+# Source functions library
+. /etc/init.d/functions
+. /etc/init.d/ovirt-functions
+
+start ()
+{
+    ovirt-config-setup
+}
+
+case "$1" in
+    start)
+        #is_standalone
+        #if [ $? -ne 0 ]; then
+        #    exit 0
+        #fi
+
+        printf "Starting ovirt-standalong-mode: "
+
+        {
+            start
+        } >> $OVIRT_LOGFILE 2>&1
+
+        test $? == 0 && success || failure
+        echo
+        ;;
+
+    *)
+        echo "Usage: ovirt-early {start}"
+        exit 2
+esac
-- 
1.5.6.5



From jguiditt at redhat.com  Tue Oct 28 16:58:44 2008
From: jguiditt at redhat.com (Jason Guiditta)
Date: Tue, 28 Oct 2008 12:58:44 -0400
Subject: [Ovirt-devel] [PATCH] added smart pool UI bits to search
	results and other flexigrids
In-Reply-To: <1224713806-2128-1-git-send-email-sseago@redhat.com>
References: <1224713806-2128-1-git-send-email-sseago@redhat.com>
Message-ID: <1225213124.3341.2.camel@localhost.localdomain>

On Wed, 2008-10-22 at 22:16 +0000, Scott Seago wrote: 
> Search results now show what smart pools the items belong to. There's also a pulldown selection to add selected results to a smart pool.
> 
> 'Add to smart pool' pulldown is also available for the single-type tab pages for hosts, storage, vm pools, and vms.
> 
> Signed-off-by: Scott Seago <sseago at redhat.com>
> ---
>  src/app/controllers/pool_controller.rb        |    4 ++-
>  src/app/controllers/search_controller.rb      |    6 +++-
>  src/app/controllers/smart_pools_controller.rb |   24 ++++++++++++++-
>  src/app/models/host.rb                        |    3 +-
>  src/app/models/pool.rb                        |    3 +-
>  src/app/models/smart_pool.rb                  |   32 +++++++++++++++++++-
>  src/app/models/storage_pool.rb                |    3 +-
>  src/app/models/vm.rb                          |    3 +-
>  src/app/views/hardware/show_hosts.rhtml       |   29 +++++++++++++++++++
>  src/app/views/hardware/show_storage.rhtml     |   29 +++++++++++++++++++
>  src/app/views/hardware/show_vms.rhtml         |   29 +++++++++++++++++++
>  src/app/views/resources/show_vms.rhtml        |   29 +++++++++++++++++++
>  src/app/views/search/_grid.rhtml              |    3 +-
>  src/app/views/search/results.rhtml            |   38 +++++++++++++++++++++++-
>  src/app/views/vm/_grid.rhtml                  |    2 +-
>  15 files changed, 223 insertions(+), 14 deletions(-)
> 
> diff --git a/src/app/controllers/pool_controller.rb b/src/app/controllers/pool_controller.rb
> index 063cc43..03d1316 100644
> --- a/src/app/controllers/pool_controller.rb
> +++ b/src/app/controllers/pool_controller.rb
> @@ -110,7 +110,9 @@ class PoolController < ApplicationController
>      attr_list = [:id, :description, :uuid,
>                   :num_vcpus_allocated, :memory_allocated_in_mb,
>                   :vnic_mac_addr, :state, :id]
> -    attr_list.insert(3, [:host, :hostname]) if @pool.get_hardware_pool.can_view(@user)
> +    if (@pool.is_a? VmResourcePool) and @pool.get_hardware_pool.can_view(@user)
> +      attr_list.insert(3, [:host, :hostname])
> +    end
>      json_list(args[:full_items], attr_list, [:all], args[:find_opts])
>    end
>  
> diff --git a/src/app/controllers/search_controller.rb b/src/app/controllers/search_controller.rb
> index cc7e527..3789309 100644
> --- a/src/app/controllers/search_controller.rb
> +++ b/src/app/controllers/search_controller.rb
> @@ -96,7 +96,9 @@ class SearchController < ApplicationController
>        item_hash = {}
>        item = result[:model]
>        item_hash[:id] = item.class.name+"_"+item.id.to_s
> -      item_hash[:cell] = ["display_name", "display_class"].collect do |attr|
> +      item_hash[:cell] = []
> +      item_hash[:cell] << item_hash[:id] if params[:checkboxes]
> +      item_hash[:cell] += ["display_name", "display_class"].collect do |attr|
>          if attr.is_a? Array
>            value = item
>            attr.each { |attr_item| value = value.send(attr_item)}
> @@ -106,6 +108,8 @@ class SearchController < ApplicationController
>          end
>        end
>        item_hash[:cell] << result[:percent]
> +      item_hash[:cell] << item.smart_pools.collect {|pool| pool.name}.join(', ')
> +
>        item_hash
>      end
>      render :json => json_hash.to_json
> diff --git a/src/app/controllers/smart_pools_controller.rb b/src/app/controllers/smart_pools_controller.rb
> index 6bfe367..90b1419 100644
> --- a/src/app/controllers/smart_pools_controller.rb
> +++ b/src/app/controllers/smart_pools_controller.rb

As discussed in irc, line 101 needs to be changed to:
pool_items = SmartPool.find(id).send(item_assoc).collect {|x| x.id}

> @@ -23,7 +23,8 @@ class SmartPoolsController < PoolController
>    before_filter :pre_modify, :only => [:add_hosts, :remove_hosts,
>                                         :add_storage, :remove_storage,
>                                         :add_vms, :remove_vms,
> -                                       :add_pools, :remove_pools]
> +                                       :add_pools, :remove_pools,
> +                                       :add_items]
>    def show_vms
>      show
>    end
> @@ -106,7 +107,7 @@ class SmartPoolsController < PoolController
>        end
>        find_opts = {:conditions => conditions}
>      end
> -    { :full_items => full_items, :find_opts => find_opts, :include_pool => :true}
> +    { :full_items => full_items, :find_opts => find_opts, :include_pool => false}
>    end
>  
>    def add_hosts
> @@ -154,6 +155,25 @@ class SmartPoolsController < PoolController
>      end
>    end
>  
> +  def add_items
> +    class_and_ids_str = params[:class_and_ids]
> +    class_and_ids = class_and_ids_str.split(",").collect {|x| x.split("_")}
> +
> +    begin
> +      @pool.transaction do
> +        class_and_ids.each do |class_and_id|
> +          @pool.add_item(class_and_id[0].constantize.find(class_and_id[1].to_i))
> +        end
> +      end
> +      render :json => { :success => true,
> +        :alert => "Add items to smart pool successful." }
> +    rescue => ex
> +      render :json => { :success => false,
> +          :alert => "Add items to smart pool failed: " + ex.message }
> +    end
> +
> +  end
> +
>    def destroy
>      if @pool.destroy
>        alert="Smart Pool was successfully deleted."
> diff --git a/src/app/models/host.rb b/src/app/models/host.rb
> index 546da19..429f0c0 100644
> --- a/src/app/models/host.rb
> +++ b/src/app/models/host.rb
> @@ -48,7 +48,8 @@ class Host < ActiveRecord::Base
>                   :values => [ [ :created_at, 0, "created_at", :date ],
>                                [ :updated_at, 1, "updated_at", :date ] ],
>                   :terms => [ [ :hostname, 'H', "hostname" ],
> -                             [ :search_users, 'U', "search_users" ] ]
> +                             [ :search_users, 'U', "search_users" ] ],
> +                 :eager_load => :smart_pools
>  
> 
>    KVM_HYPERVISOR_TYPE = "KVM"
> diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb
> index d189649..b25fa55 100644
> --- a/src/app/models/pool.rb
> +++ b/src/app/models/pool.rb
> @@ -89,7 +89,8 @@ class Pool < ActiveRecord::Base
>    end
>  
>    acts_as_xapian :texts => [ :name ],
> -                 :terms => [ [ :search_users, 'U', "search_users" ] ]
> +                 :terms => [ [ :search_users, 'U', "search_users" ] ],
> +                 :eager_load => :smart_pools
>  
>    # this method lists pools with direct permission grants, but by default does
>    #  not include implied permissions (i.e. subtrees)
> diff --git a/src/app/models/smart_pool.rb b/src/app/models/smart_pool.rb
> index 9104ee5..0ecbe05 100644
> --- a/src/app/models/smart_pool.rb
> +++ b/src/app/models/smart_pool.rb
> @@ -39,8 +39,13 @@ class SmartPool < Pool
>    end
>  
>    def add_item(item)
> -    tag = SmartPoolTag.new(:smart_pool => self, :tagged => item)
> -    tag.save!
> +    begin
> +      tag = SmartPoolTag.new(:smart_pool => self, :tagged => item)
> +      tag.save!
> +    rescue ActiveRecord::RecordInvalid
> +      # this is thrown if the tagged item already belongs to the smart pool
> +      # this operation should be a no-op rather than an error
> +    end
>    end
>    def remove_item(item)
>      smart_pool_tags.find(:first, :conditions=> {
> @@ -67,4 +72,27 @@ class SmartPool < Pool
>        end
>    end
>  
> +  def self.smart_pools_for_user(user)
> +    nested_pools = DirectoryPool.get_smart_root.full_set_nested(
> +                       :privilege => Permission::PRIV_MODIFY, :user => user,
> +                       :smart_pool_set => true)
> +    user_pools = []
> +    other_pools = []
> +    nested_pools.each do |pool_element|
> +      pool = pool_element[:obj]
> +      if pool.name == user
> +        pool_element[:children].each do |child_element|
> +          child_pool = child_element[:obj]
> +          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]
> +        end
> +      end
> +    end
> +    user_pools[-1] << "break"
> +    user_pools + other_pools
> +  end
>  end
> diff --git a/src/app/models/storage_pool.rb b/src/app/models/storage_pool.rb
> index aed2902..9c550b8 100644
> --- a/src/app/models/storage_pool.rb
> +++ b/src/app/models/storage_pool.rb
> @@ -40,7 +40,8 @@ class StoragePool < ActiveRecord::Base
>    validates_presence_of :hardware_pool_id
>  
>    acts_as_xapian :texts => [ :ip_addr, :target, :export_path, :type ],
> -                 :terms => [ [ :search_users, 'U', "search_users" ] ]
> +                 :terms => [ [ :search_users, 'U', "search_users" ] ],
> +                 :eager_load => :smart_pools
>    ISCSI = "iSCSI"
>    NFS   = "NFS"
>    LVM   = "LVM"
> diff --git a/src/app/models/vm.rb b/src/app/models/vm.rb
> index 2eff87a..61c407c 100644
> --- a/src/app/models/vm.rb
> +++ b/src/app/models/vm.rb
> @@ -37,7 +37,8 @@ class Vm < ActiveRecord::Base
>                          :memory_allocated, :vnic_mac_addr
>  
>    acts_as_xapian :texts => [ :uuid, :description, :vnic_mac_addr, :state ],
> -                 :terms => [ [ :search_users, 'U', "search_users" ] ]
> +                 :terms => [ [ :search_users, 'U', "search_users" ] ],
> +                 :eager_load => :smart_pools
>  
>    BOOT_DEV_HD            = "hd"
>    BOOT_DEV_NETWORK       = "network"
> diff --git a/src/app/views/hardware/show_hosts.rhtml b/src/app/views/hardware/show_hosts.rhtml
> index d33c920..2fd29bc 100644
> --- a/src/app/views/hardware/show_hosts.rhtml
> +++ b/src/app/views/hardware/show_hosts.rhtml
> @@ -5,6 +5,21 @@
>        <a id="move_link" href="#" onClick="return validate_for_move();"><%= image_tag "icon_move.png", :style=>"vertical-align:middle;" %>&nbsp;&nbsp;Move</a>
>        <a id="move_link_hidden" href="<%= url_for :controller => 'hardware', :action => 'move', :id => @pool, :resource_type=>'hosts' %>" rel="facebox[.bolder]" style="display:none" ></a>
>      </li>
> +    <li>
> +       <%= image_tag "icon_smartpool.png", :style => "vertical-align:middle;" %>&nbsp;&nbsp;Add to Smart Pool &nbsp;&nbsp;&nbsp;<%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %>
> +       <ul>
> +        <% smart_pools = SmartPool.smart_pools_for_user(@user) %>
> +        <% smart_pools.each_index { |index| %>
> +            <li onClick="add_hosts_to_smart_pool(<%=smart_pools[index][1]%>)"
> +            <% if (index == smart_pools.length - 1) or smart_pools[index].length == 3 %>
> +                style="border-bottom: 1px solid #CCCCCC;"
> +            <% end %>
> +               >
> +                 <%=smart_pools[index][0]%>
> +            </li>
> +        <% } %>
> +       </ul>
> +    </li>
>      <% if @pool.id != HardwarePool.get_default_pool.id %>
>        <li><a href="#" onClick="remove_hosts()"><%= image_tag "icon_remove.png" %>&nbsp;&nbsp;Remove</a></li>
>      <% end %>
> @@ -22,6 +37,20 @@
>        $('#move_link_hidden').click();
>      }
>    }
> +  function add_hosts_to_smart_pool(smart_pool)
> +  {
> +    var hosts = get_selected_hosts();
> +    if (validate_selected(hosts, "host")) {
> +      $.post('<%= url_for :controller => "smart_pools", :action => "add_hosts" %>',
> +             { resource_ids: hosts.toString(), id: smart_pool },
> +             function(data,status){
> +               $('#hosts_grid').flexReload();
> +               if (data.alert) {
> +                 $.jGrowl(data.alert);
> +               }
> +             }, 'json');
> +    }
> +  }
>    function remove_hosts()
>    {
>      var hosts = get_selected_hosts();
> diff --git a/src/app/views/hardware/show_storage.rhtml b/src/app/views/hardware/show_storage.rhtml
> index 6466f9b..5ade456 100644
> --- a/src/app/views/hardware/show_storage.rhtml
> +++ b/src/app/views/hardware/show_storage.rhtml
> @@ -6,6 +6,21 @@
>        <a id="move_link_hidden" href="<%= url_for :controller => 'hardware', :action => 'move', :id => @pool, :resource_type=>'storage' %>" rel="facebox[.bolder]"  style="display:none" ></a>
>      </li>
>      <li>
> +       <%= image_tag "icon_smartpool.png", :style => "vertical-align:middle;" %>&nbsp;&nbsp;Add to Smart Pool &nbsp;&nbsp;&nbsp;<%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %>
> +       <ul>
> +        <% smart_pools = SmartPool.smart_pools_for_user(@user) %>
> +        <% smart_pools.each_index { |index| %>
> +            <li onClick="add_storage_to_smart_pool(<%=smart_pools[index][1]%>)"
> +            <% if (index == smart_pools.length - 1) or smart_pools[index].length == 3 %>
> +                style="border-bottom: 1px solid #CCCCCC;"
> +            <% end %>
> +               >
> +                 <%=smart_pools[index][0]%>
> +            </li>
> +        <% } %>
> +       </ul>
> +    </li>
> +    <li>
>        <a href="#" onClick="return validate_storage_for_remove();" ><%= image_tag "icon_remove.png", :style=>"vertical-align:middle;" %>&nbsp;&nbsp;Remove</a>
>        <a id="remove_link_hidden" href="<%= url_for :controller => 'hardware', :action => 'removestorage', :id => @pool %>" rel="facebox[.bolder]"  style="display:none" ></a>
>      </li>
> @@ -13,6 +28,20 @@
>  </div>
>  
>  <script type="text/javascript">
> +  function add_storage_to_smart_pool(smart_pool)
> +  {
> +    var storage = get_selected_storage();
> +    if (validate_selected(storage, "storage pool")) {
> +      $.post('<%= url_for :controller => "smart_pools", :action => "add_storage" %>',
> +             { resource_ids: storage.toString(), id: smart_pool },
> +             function(data,status){
> +               $('#storage_grid').flexReload();
> +               if (data.alert) {
> +                 $.jGrowl(data.alert);
> +               }
> +             }, 'json');
> +    }
> +  }
>    function remove_storage()
>    {
>      var storage = get_selected_storage();
> diff --git a/src/app/views/hardware/show_vms.rhtml b/src/app/views/hardware/show_vms.rhtml
> index ee14758..6a8ded5 100644
> --- a/src/app/views/hardware/show_vms.rhtml
> +++ b/src/app/views/hardware/show_vms.rhtml
> @@ -1,6 +1,21 @@
>  <div id="toolbar_nav">
>   <ul>
>      <li><a href="<%= url_for :controller => 'resources', :action => 'new', :parent_id => @pool %>" rel="facebox[.bolder]"><%= image_tag "icon_add_vmpool.png", :style => "vertical-align:middle;" %>&nbsp;&nbsp;New Virtual Machine Pool</a></li>
> +    <li>
> +       <%= image_tag "icon_smartpool.png", :style => "vertical-align:middle;" %>&nbsp;&nbsp;Add to Smart Pool &nbsp;&nbsp;&nbsp;<%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %>
> +       <ul>
> +        <% smart_pools = SmartPool.smart_pools_for_user(@user) %>
> +        <% smart_pools.each_index { |index| %>
> +            <li onClick="add_vm_pools_to_smart_pool(<%=smart_pools[index][1]%>)"
> +            <% if (index == smart_pools.length - 1) or smart_pools[index].length == 3 %>
> +                style="border-bottom: 1px solid #CCCCCC;"
> +            <% end %>
> +               >
> +                 <%=smart_pools[index][0]%>
> +            </li>
> +        <% } %>
> +       </ul>
> +    </li>
>      <li><a href="#" onClick="delete_vm_pools()"><%= image_tag "icon_delete_white.png", :style => "vertical-align:middle;" %>&nbsp;&nbsp;Delete</a></li>
>   </ul>
>  </div>
> @@ -9,6 +24,20 @@
>    {
>      return get_selected_checkboxes("vmpools_grid_form");
>    }
> +  function add_vm_pools_to_smart_pool(smart_pool)
> +  {
> +    var vm_pools = get_selected_vm_pools();
> +    if (validate_selected(vm_pools, "vm pool")) {
> +      $.post('<%= url_for :controller => "smart_pools", :action => "add_pools" %>',
> +             { resource_ids: vm_pools.toString(), id: smart_pool },
> +             function(data,status){
> +               $('#vmpools_grid').flexReload();
> +               if (data.alert) {
> +                 $.jGrowl(data.alert);
> +               }
> +             }, 'json');
> +    }
> +  }
>    function delete_vm_pools()
>    {
>      var vm_pools = get_selected_vm_pools();
> diff --git a/src/app/views/resources/show_vms.rhtml b/src/app/views/resources/show_vms.rhtml
> index beca048..6f757f9 100644
> --- a/src/app/views/resources/show_vms.rhtml
> +++ b/src/app/views/resources/show_vms.rhtml
> @@ -16,6 +16,21 @@
>          <% } %>
>         </ul>
>      </li>
> +    <li>
> +       <%= image_tag "icon_smartpool.png", :style => "vertical-align:middle;" %>&nbsp;&nbsp;Add to Smart Pool &nbsp;&nbsp;&nbsp;<%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %>
> +       <ul>
> +        <% smart_pools = SmartPool.smart_pools_for_user(@user) %>
> +        <% smart_pools.each_index { |index| %>
> +            <li onClick="add_vms_to_smart_pool(<%=smart_pools[index][1]%>)"
> +            <% if (index == smart_pools.length - 1) or smart_pools[index].length == 3 %>
> +                style="border-bottom: 1px solid #CCCCCC;"
> +            <% end %>
> +               >
> +                 <%=smart_pools[index][0]%>
> +            </li>
> +        <% } %>
> +       </ul>
> +    </li>
>      <li><a href="#" onClick="delete_vms()"><%= image_tag "icon_delete_white.png", :style => "vertical-align:middle;" %>&nbsp;&nbsp;Delete</a></li>
>  </ul>
>  </div>
> @@ -24,6 +39,20 @@
>    {
>      return get_selected_checkboxes("vms_grid_form");
>    }
> +  function add_vms_to_smart_pool(smart_pool)
> +  {
> +    var vms = get_selected_vms();
> +    if (validate_selected(vms, "vm")) {
> +      $.post('<%= url_for :controller => "smart_pools", :action => "add_vms" %>',
> +             { resource_ids: vms.toString(), id: smart_pool },
> +             function(data,status){
> +               $('#vms_grid').flexReload();
> +               if (data.alert) {
> +                 $.jGrowl(data.alert);
> +               }
> +             }, 'json');
> +    }
> +  }
>    function delete_vms()
>    {
>      var vms = get_selected_vms();
> diff --git a/src/app/views/search/_grid.rhtml b/src/app/views/search/_grid.rhtml
> index 2e60646..fca1ba0 100644
> --- a/src/app/views/search/_grid.rhtml
> +++ b/src/app/views/search/_grid.rhtml
> @@ -18,7 +18,8 @@
>          <%= "{display: '', width : 20, align: 'left', process: #{table_id}checkbox}," if checkboxes %>
>          {display: 'Name', width : 200, align: 'left'},
>          {display: 'Type', width : 120, align: 'left'},
> -        {display: '% Match', width : 60, align: 'left'}
> +        {display: '% Match', width : 60, align: 'left'},
> +        {display: 'Smart Pools', width : 200, align: 'left'}
>  	],
>      //sortname: "hostname",
>      //sortorder: "asc",
> diff --git a/src/app/views/search/results.rhtml b/src/app/views/search/results.rhtml
> index a7641b7..1989054 100644
> --- a/src/app/views/search/results.rhtml
> +++ b/src/app/views/search/results.rhtml
> @@ -5,9 +5,25 @@
>        <input id="searchform-field" name="terms" value="<%=@terms%>" onkeypress="" type="text">
>        <input id="searchform-button" src="<%= image_path "icon_search.png"%>" title="Search" type="image">
>        <input id="searchform-model" type="hidden" name="model" value="<%=@model_param%>">
> +      Search
>      </li>
>      <li>
> -       <%= image_tag "icon_move.png", :style => "vertical-align:middle;" %>&nbsp;&nbsp;Actions &nbsp;&nbsp;&nbsp;<%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %>
> +       <%= image_tag "icon_smartpool.png", :style => "vertical-align:middle;" %>&nbsp;&nbsp;Add to Smart Pool &nbsp;&nbsp;&nbsp;<%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %>
> +       <ul>
> +        <% smart_pools = SmartPool.smart_pools_for_user(@user) %>
> +        <% smart_pools.each_index { |index| %>
> +            <li onClick="add_results_to_smart_pool(<%=smart_pools[index][1]%>)"
> +            <% if (index == smart_pools.length - 1) or smart_pools[index].length == 3 %>
> +                style="border-bottom: 1px solid #CCCCCC;"
> +            <% end %>
> +               >
> +                 <%=smart_pools[index][0]%>
> +            </li>
> +        <% } %>
> +       </ul>
> +    </li>
> +    <li>
> +       &nbsp;&nbsp;Show All &nbsp;&nbsp;&nbsp;<%= image_tag "icon_toolbar_arrow.gif", :style => "vertical-align:middle;" %>
>         <ul>
>          <% @types.each_index { |index| %>
>  <!-- for each button we need to submit current form with "model" set to @types[index][1] --!>
> @@ -40,6 +56,24 @@
>                  { class_and_id: selected_ids[0].substring(3)})
>      }
>    }

Not for this patch, but I would like to see us consolidate all these
get_selected_* functions into one that takes the id, seems like we have
a lot of functions doing almost the same thing now.

/me puts that on his cleanup todo list.. 
> +  function get_selected_results()
> +  {
> +    return get_selected_checkboxes("search_grid_form")
> +  }
> +  function add_results_to_smart_pool(smart_pool)
> +  {
> +    var results = get_selected_results();
> +    if (validate_selected(results, "search result")) {
> +      $.post('<%= url_for :controller => "smart_pools", :action => "add_items" %>',
> +             { class_and_ids: results.toString(), id: smart_pool },
> +             function(data,status){
> +               $('#search_grid').flexReload();
> +               if (data.alert) {
> +                 $.jGrowl(data.alert);
> +               }
> +             }, 'json');
> +    }
> +  }
>  </script>
>  
>  <div class="panel_header"></div>
> @@ -48,7 +82,7 @@
>        <%= render :partial => "/search/grid", :locals => { :table_id => "search_grid",
>                                                          :terms => @terms,
>                                                          :model => @model_param,
> -                                                        :checkboxes => false,
> +                                                        :checkboxes => true,
>                                                          :on_select => "results_select" } %>
>     </div>
>     <div class="selection_detail" id="results_selection">
> diff --git a/src/app/views/vm/_grid.rhtml b/src/app/views/vm/_grid.rhtml
> index 85bf094..b137de6 100644
> --- a/src/app/views/vm/_grid.rhtml
> +++ b/src/app/views/vm/_grid.rhtml
> @@ -29,7 +29,7 @@
>          {display: '', name : 'id', width : 20, sortable : false, align: 'left', process: <%= table_id %>checkbox},
>          {display: 'Description', name : 'description', width : 180, sortable : true, align: 'left'},
>          {display: 'UUID', name : 'uuid', width : 180, sortable : true, align: 'left'},
> -        <% if @pool.get_hardware_pool.can_view(@user) %>
> +        <% if (pool.is_a? VmResourcePool) and pool.get_hardware_pool.can_view(@user) %>
>              {display: 'Host', name : 'host', width: 180, sortable : true, align: 'left' },
>          <% end %>
>          {display: 'CPUs', name : 'num_vcpus_allocated', width : 40, sortable : true, align: 'left'},
> 
ACK, pending the change mentioned above.  All functionality works for me.



From pmyers at redhat.com  Wed Oct 29 12:31:46 2008
From: pmyers at redhat.com (Perry Myers)
Date: Wed, 29 Oct 2008 08:31:46 -0400
Subject: [Ovirt-devel] Re: [virt-devel] oVirt and Virtualization Questions
In-Reply-To: <49080410.4070305@redhat.com>
References: <49080410.4070305@redhat.com>
Message-ID: <490857B2.305@redhat.com>

Christopher Curran wrote:
> [[ oVirt Node ]]
> Is ssh disabled on the Nodes?

No, and it will continue to be enabled for the product as it provides a 
way for administrators to get into the node for troubleshooting purposes.

However... The Node will come with the root account disabled in production 
(we don't want to set a default password since that is a huge security 
hole).  We will provide a way for the person setting up Nodes to configure 
the root password both in standalone mode (through a local configuration 
at first boot) or through the oVirt Server through the web interface. 
Until the root password is set properly SSH will not be usable.

In development we set the root password to 'ovirt' just for convenience.

Alan/Darryl are working on Node configuration and standalone mode so they 
should take note of the above.

> How can I change the cobbler server on the Appliance to boot the Node 
> from default?

On the appliance run:
cobbler system add --netboot-enabled=1 --profile=oVirt-Node-$arch \
   --name=<HOSTNAME> --mac=<MAC ADDRESS>

Just provide the hostname (i.e. Node10) and the MAC and you should be fine.

Presently only node3, 4 and 5 are preregistered this way.  All other IP 
addresses on the oVirt LAN are given the PXE boot screen on which you can 
choose whether to boot the host as a Node or another profile.  What we 
need to do is the following:

When a physical host boots for the first time it is presented with the PXE 
menu and the user can select Node as the option.
When a Node boots for the first time (the user having selected Node as the 
profile in PXE) the Server should register that MAC address as a system so 
that subsequent boots don't present the PXE menu and instead just boot the 
Node profile by default.

This is something that needs to be set up on the Server side.  Darryl can 
you get a patch out there to do this?

> are there any other cobbler examples out there?

See ovirt-appliance.ks in the ovirt-appliance repository for examples for 
setting up profiles and systems.

> The virtual machine pools display negative numbers, is this expected 
> behaviour?

This is because the vmpools are based on quotas and the CPUs remaining are 
calculated by doing CPUs allocated - CPUs used.  If you don't set a quota 
the calculation defaults to zero and then you have a negative number.

Scott/Jay, this needs to be fixed what should we show here for the cases 
of infinite quotas?

> Accessing the cobbler web interface is still not happening on my 
> appliance. Could someone write a howto for enabling it or integrate it 
> in code?

http://192.168.50.2/cobbler/web

The above URL works for me.  Default user/pass is cobbler/cobbler.

Perry



From slinabery at redhat.com  Wed Oct 29 20:39:23 2008
From: slinabery at redhat.com (Steve Linabery)
Date: Wed, 29 Oct 2008 15:39:23 -0500
Subject: [Ovirt-devel] [PATCH server] Add tooltips, y-axis labels,
	and first animation transition to flexchart.
Message-ID: <1225312763-31801-1-git-send-email-slinabery@redhat.com>

Also improve OO design with new classes and better organization thereof.
---
 src/app/controllers/graph_controller.rb            |    3 +-
 src/flexchart/README.txt                           |    2 +-
 src/flexchart/flexchart.mxml                       |   69 +++++++--
 src/flexchart/org/ovirt/ChartLoader.as             |   64 --------
 src/flexchart/org/ovirt/Constants.as               |   28 ++++
 src/flexchart/org/ovirt/DataSeries.as              |   42 -----
 src/flexchart/org/ovirt/DataSource.as              |   14 +-
 src/flexchart/org/ovirt/charts/BarChart.as         |  158 ++++++++++++++++++++
 src/flexchart/org/ovirt/charts/Chart.as            |   46 ++++++
 src/flexchart/org/ovirt/data/DataPoint.as          |   47 ++++++
 src/flexchart/org/ovirt/data/DataSeries.as         |   54 +++++++
 src/flexchart/org/ovirt/elements/SingleBar.as      |   67 ++++++++
 src/flexchart/org/ovirt/elements/TextLiberation.as |   46 ++++++
 src/flexchart/org/ovirt/elements/YAxisLabel.as     |   41 +++++
 14 files changed, 556 insertions(+), 125 deletions(-)
 delete mode 100644 src/flexchart/org/ovirt/ChartLoader.as
 create mode 100644 src/flexchart/org/ovirt/Constants.as
 delete mode 100644 src/flexchart/org/ovirt/DataSeries.as
 create mode 100644 src/flexchart/org/ovirt/charts/BarChart.as
 create mode 100644 src/flexchart/org/ovirt/charts/Chart.as
 create mode 100644 src/flexchart/org/ovirt/data/DataPoint.as
 create mode 100644 src/flexchart/org/ovirt/data/DataSeries.as
 create mode 100644 src/flexchart/org/ovirt/elements/SingleBar.as
 create mode 100644 src/flexchart/org/ovirt/elements/TextLiberation.as
 create mode 100644 src/flexchart/org/ovirt/elements/YAxisLabel.as

diff --git a/src/app/controllers/graph_controller.rb b/src/app/controllers/graph_controller.rb
index c1d27b5..0105ea6 100644
--- a/src/app/controllers/graph_controller.rb
+++ b/src/app/controllers/graph_controller.rb
@@ -15,7 +15,8 @@ class GraphController < ApplicationController
                    :values => graph_obj[:dataset][2][:values].last(40) }
     my_data = graph_data[:labels].zip(graph_data[:values])
     graph = { :vectors => my_data,
-              :max_value => graph_obj[:total_peak]
+              :max_value => graph_obj[:total_peak],
+              :description => params[:target]
             }
     render :json => graph
   end
diff --git a/src/flexchart/README.txt b/src/flexchart/README.txt
index 66eb183..3de7430 100644
--- a/src/flexchart/README.txt
+++ b/src/flexchart/README.txt
@@ -5,4 +5,4 @@ Once you have mxmlc on your system, run:
 
 mxmlc flexchart.mxml
 
-in this directory, and copy the resulting file flexchart.swf to /usr/share/ovirt-server/public on your appliance.
+in this directory, and copy the resulting file flexchart.swf to /usr/share/ovirt-server/public/swfs on your appliance.
diff --git a/src/flexchart/flexchart.mxml b/src/flexchart/flexchart.mxml
index 796329d..35fa9a6 100644
--- a/src/flexchart/flexchart.mxml
+++ b/src/flexchart/flexchart.mxml
@@ -1,20 +1,67 @@
 <?xml version="1.0"?>
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" applicationComplete="populate(flexChart)">
+<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" applicationComplete="myInit(); populate(mainChart);" styleName="plain" horizontalScrollPolicy="off" verticalScrollPolicy="off">
   <mx:Script>
     <![CDATA[
 
-      import mx.containers.Box;
-      import org.ovirt.*;
+    import mx.containers.VBox;
+    import mx.effects.Resize;
+    import org.ovirt.Constants;
+    import org.ovirt.charts.Chart;
+    import org.ovirt.charts.BarChart;
 
-      private function populate(chart:Box):void {
-        var chartLoader:ChartLoader = new ChartLoader(chart, parameters['flexchart_data']);
-        chartLoader.load();
-      }
+    private function populate(container:VBox):void {
+        var chart:Chart = new BarChart(container, parameters['flexchart_data']);
+        chart.load();
+    }
+
+    private var expandHistory:Resize = new Resize();
+    private var contractHistory:Resize = new Resize();
+
+    private var expandResources:Resize = new Resize();
+    private var contractResources:Resize = new Resize();
+
+    private function myInit():void {
+      mainChart.height = Constants.height;
+      mainChart.width = Constants.width;
+      hostsChart.width = Constants.width;
+
+      expandHistory.widthTo = Constants.width;
+      expandHistory.heightTo = Constants.height;
+      expandHistory.target = mainChart;
+
+      contractHistory.widthTo = Constants.width;
+      contractHistory.heightTo = Constants.height * .3333;
+      contractHistory.target = mainChart;
+
+      expandResources.widthTo = Constants.width;
+      expandResources.heightTo = Constants.height * .6666;
+      expandResources.target = hostsChart;
+      expandResources.duration = 500;
+
+      contractResources.widthTo = Constants.width;
+      contractResources.heightTo = 0;
+      contractResources.target = hostsChart;
+      contractResources.duration = 500;
+    }
+
+    private function zoomOutSeries(e:Event):void {
+      expandHistory.end(); expandHistory.play();
+      contractResources.end(); contractResources.play();
+      hostsChart.visible = false;
+    }
+
+    private function zoomIntoSeries(e:Event):void {
+      hostsChart.visible=true;
+      expandResources.end(); expandResources.play();
+      contractHistory.end(); contractHistory.play();
+    }
 
     ]]>
+
+
   </mx:Script>
-  <mx:Panel height="100%" width="100%" visible="true">
-    <mx:HBox id="flexChart"  height="100%" width="100%" visible="true" verticalAlign="bottom" opaqueBackground="0xFFFFFF" borderThickness="0">
-    </mx:HBox>
-  </mx:Panel>
+
+  <mx:VBox id="mainChart"  click="zoomIntoSeries(event)" />
+  <mx:VBox id="hostsChart" visible="false" opaqueBackground="0x00ff00" click="zoomOutSeries(event)"/>
+
 </mx:Application>
diff --git a/src/flexchart/org/ovirt/ChartLoader.as b/src/flexchart/org/ovirt/ChartLoader.as
deleted file mode 100644
index 4e493a4..0000000
--- a/src/flexchart/org/ovirt/ChartLoader.as
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- Copyright (C) 2008 Red Hat, Inc.
- Written by Steve Linabery <slinabery at redhat.com>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA  02110-1301, USA.  A copy of the GNU General Public License is
- also available at http://www.gnu.org/copyleft/gpl.html.
-*/
-
-package org.ovirt {
-
-  import mx.containers.Box;
-  import mx.containers.HBox;
-  import mx.controls.Text;
-
-  public class ChartLoader {
-
-    private var element:Box;
-    private var datasourceUrl:String;
-
-    public function ChartLoader(element:Box, datasourceUrl:String) {
-      this.element = element;
-      this.datasourceUrl = datasourceUrl;
-    }
-
-    public function addData(dataSeries:DataSeries):void {
-      var points:Array = dataSeries.getPoints();
-      var maxValue:Number = dataSeries.getMaxValue();
-      var scale:Number = maxValue;
-      if (scale == 0) { scale = 1; }
-      var size:int = points.length;
-      element.removeAllChildren();
-      element.setStyle("horizontalGap","2");
-      for (var i:int = 0; i < size; i++) {
-        var value:Number = (points[i] as Array)[1];
-        var bar:HBox = new HBox();
-        bar.percentHeight = ((value / scale) * 90);
-        bar.percentWidth = (100 / size);
-        bar.setStyle("backgroundColor","0x0000FF");
-        bar.setStyle("left","1");
-        bar.setStyle("right","1");
-        bar.visible = true;
-        bar.setVisible(true);
-        element.addChild(bar);
-      }
-    }
-
-    public function load():void {
-      var dataSource:DataSource = new DataSource(this);
-      dataSource.retrieveData(datasourceUrl);
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/flexchart/org/ovirt/Constants.as b/src/flexchart/org/ovirt/Constants.as
new file mode 100644
index 0000000..996a31e
--- /dev/null
+++ b/src/flexchart/org/ovirt/Constants.as
@@ -0,0 +1,28 @@
+/*
+ Copyright (C) 2008 Red Hat, Inc.
+ Written by Steve Linabery <slinabery at redhat.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA  02110-1301, USA.  A copy of the GNU General Public License is
+ also available at http://www.gnu.org/copyleft/gpl.html.
+*/
+
+package org.ovirt {
+  public class Constants {
+    public static var width:int = 722;
+    public static var height:int = 297;
+    public static var barSpacing:int = 2;
+    public static var labelHeight:int = 40;
+  }
+}
diff --git a/src/flexchart/org/ovirt/DataSeries.as b/src/flexchart/org/ovirt/DataSeries.as
deleted file mode 100644
index d63162a..0000000
--- a/src/flexchart/org/ovirt/DataSeries.as
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- Copyright (C) 2008 Red Hat, Inc.
- Written by Steve Linabery <slinabery at redhat.com>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA  02110-1301, USA.  A copy of the GNU General Public License is
- also available at http://www.gnu.org/copyleft/gpl.html.
-*/
-
-//class to encapsulate the json object representation of a data
-//series returned from stats package
-
-package org.ovirt {
-
-  public class DataSeries {
-
-    private var object:Object;
-
-    public function DataSeries (object:Object) {
-      this.object = object;
-    }
-
-    public function getPoints():Array {
-      return object["vectors"] as Array;
-    }
-
-    public function getMaxValue():Number {
-      return object["max_value"] as Number;
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/flexchart/org/ovirt/DataSource.as b/src/flexchart/org/ovirt/DataSource.as
index 1a64f03..44e482d 100644
--- a/src/flexchart/org/ovirt/DataSource.as
+++ b/src/flexchart/org/ovirt/DataSource.as
@@ -25,19 +25,21 @@ package org.ovirt {
   import com.adobe.serialization.json.JSON;
   import flash.events.Event;
   import flash.events.IOErrorEvent;
+  import org.ovirt.data.DataSeries;
+  import org.ovirt.charts.Chart;
 
   public class DataSource {
 
-    private var chartLoader:ChartLoader;
+    private var chart:Chart;
 
-    public function DataSource(chartLoader:ChartLoader) {
-      this.chartLoader = chartLoader;
+    public function DataSource(chart:Chart) {
+      this.chart = chart;
     }
 
     public function retrieveData(url:String):void {
       var loader:URLLoader = new URLLoader();
-      loader.addEventListener( IOErrorEvent.IO_ERROR, this.ioError );
-      loader.addEventListener( Event.COMPLETE, dataLoaded );
+      loader.addEventListener(IOErrorEvent.IO_ERROR, this.ioError);
+      loader.addEventListener(Event.COMPLETE, dataLoaded);
       var request:URLRequest = new URLRequest(url);
       loader.load(request);
     }
@@ -46,7 +48,7 @@ package org.ovirt {
       var loader:URLLoader = URLLoader(event.target);
       var object:Object = JSON.decode(loader.data);
       var series:DataSeries = new DataSeries(object);
-      chartLoader.addData(series);
+      chart.addData(series);
     }
 
     private function ioError( e:IOErrorEvent ):void {
diff --git a/src/flexchart/org/ovirt/charts/BarChart.as b/src/flexchart/org/ovirt/charts/BarChart.as
new file mode 100644
index 0000000..83cf0bb
--- /dev/null
+++ b/src/flexchart/org/ovirt/charts/BarChart.as
@@ -0,0 +1,158 @@
+/*
+ Copyright (C) 2008 Red Hat, Inc.
+ Written by Steve Linabery <slinabery at redhat.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA  02110-1301, USA.  A copy of the GNU General Public License is
+ also available at http://www.gnu.org/copyleft/gpl.html.
+*/
+
+package org.ovirt.charts {
+
+  import mx.containers.Box;
+  import mx.containers.HBox;
+  import mx.containers.VBox;
+  import mx.controls.Text;
+  import mx.containers.Canvas;
+  import org.ovirt.data.*;
+  import org.ovirt.elements.*;
+  import org.ovirt.Constants;
+
+  public class BarChart extends Chart {
+
+    private var chartArea:HBox;
+    private var labelArea:Canvas;
+
+    public function BarChart(container:Box,
+                             datasourceUrl:String) {
+      super(container,datasourceUrl);
+      chartArea = new HBox();
+      chartArea.setStyle("horizontalGap",Constants.barSpacing);
+      chartArea.setStyle("verticalAlign","bottom");
+      chartArea.percentHeight = 80;
+      chartArea.percentWidth = 100;
+      this.container.addChild(chartArea);
+
+      labelArea = new Canvas();
+      labelArea.height = Constants.labelHeight;
+      labelArea.minHeight = Constants.labelHeight;
+      labelArea.percentWidth = 100;
+      this.container.addChild(labelArea);
+    }
+
+    override public function addData(dataSeries:DataSeries):void {
+      try {
+        var dataPoints:Array = dataSeries.getDataPoints();
+        var maxValue:Number = dataSeries.getMaxValue();
+        var scale:Number = maxValue;
+        //avoid divide by zero
+        if (scale == 0) {
+          scale = 1;
+        }
+        var size:int = dataPoints.length;
+        if (size == 0) {
+          throw new Error("No data points in range");
+        }
+
+        //have to iterate through datapoint.timestamp strings,
+        //create a TextLiberation object with them, and add them to
+        //a parent container before we can tell how wide they are in pixels.
+        var labelWidth:Number = 0;
+        for (var i:int = 0; i < size; i++) {
+          var dataPoint:DataPoint = dataPoints[i] as DataPoint;
+          var textTemp:TextLiberation =
+            new TextLiberation(dataPoint.getTimestamp());
+          textTemp.setVisible(false);
+          chartArea.addChild(textTemp);
+          var tempLabelWidth:Number = textTemp.getTextWidth();
+          if (! isNaN(tempLabelWidth)) {
+            labelWidth = Math.max(labelWidth, tempLabelWidth);
+          }
+        }
+        //now we have to remove all the children we just added, since we don't
+        //really want them to be part of the chart.
+        chartArea.removeAllChildren();
+
+        //we always want an odd number of y-axis labels, and we'll
+        //determine this by using the labelWidth we just determined
+        var labelCount:int = Math.floor(Constants.width / labelWidth);
+        if (labelCount > 3 && labelCount % 2 == 1) {
+          labelCount--;
+        }
+
+        //the distance between left edges of adjacent bars
+        var gridWidth:Number = Constants.width / size;
+
+        //the width of each SingleBar (does not including padding between bars)
+        var barWidth:Number = gridWidth - Constants.barSpacing;
+
+        //use this to center y-axis labels on the bars
+        var labelOffset:Number = barWidth / 2;
+
+        //distance between first and last label
+        var labelSpace:Number = Constants.width - gridWidth;
+        var labelSpacing:Number = labelSpace / labelCount;
+
+        //add the bars & labels to the chart
+        var labelCounter:int = 0;
+        for (i = 0; i < size; i++) {
+          dataPoint = dataPoints[i] as DataPoint;
+          var value:Number = dataPoint.getValue();
+          var bar:SingleBar = new SingleBar(dataPoint);
+          bar.percentHeight = ((value / scale) * 80);
+          bar.width = barWidth;
+          bar.setVisible(true);
+          chartArea.addChild(bar);
+          var currentLabelPosition:int = labelCounter * labelSpacing +
+                                           labelOffset;
+
+          if (currentLabelPosition >= i * gridWidth &&
+                currentLabelPosition < (i + 1) * gridWidth) {
+            var label:YAxisLabel = new YAxisLabel(dataPoint.getTimestamp());
+            label.setVisible(false);
+            label.y = ((labelCounter + 1) % 2) * 13 + 4;
+            labelArea.addChild(label);
+            //make sure the label is fully within the chart width
+            label.x = Math.max(0,
+                               Math.min((i) * gridWidth -
+                                 (label.labelText.getTextWidth() / 2) +
+                                 labelOffset,
+                               Constants.width -
+                                 label.labelText.getTextWidth() - 6)
+                              );
+            label.setVisible(true);
+            labelCounter++;
+
+            //add a 'tick' in the center of the bar to which this label
+            //corresponds
+            var ind:Box = new Box();
+            ind.opaqueBackground = 0x000000;
+            ind.width=1;
+            ind.height=3;
+            ind.x =  (i) * gridWidth + labelOffset;
+            ind.y = 0;
+            ind.setVisible(true);
+            ind.setStyle("backgroundColor","0x000000");
+            labelArea.addChild(ind);
+          }
+        }
+      } catch (e:Error) {
+        var err:Text = new Text();
+        err.text = e.message;
+        err.setVisible(true);
+        chartArea.addChild(err);
+      }
+    }
+  }
+}
diff --git a/src/flexchart/org/ovirt/charts/Chart.as b/src/flexchart/org/ovirt/charts/Chart.as
new file mode 100644
index 0000000..26c8d02
--- /dev/null
+++ b/src/flexchart/org/ovirt/charts/Chart.as
@@ -0,0 +1,46 @@
+/*
+ Copyright (C) 2008 Red Hat, Inc.
+ Written by Steve Linabery <slinabery at redhat.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA  02110-1301, USA.  A copy of the GNU General Public License is
+ also available at http://www.gnu.org/copyleft/gpl.html.
+*/
+
+package org.ovirt.charts {
+
+  public class Chart {
+
+    import org.ovirt.DataSource;
+    import mx.containers.Box;
+    import org.ovirt.data.DataSeries;
+
+    protected var container:Box;
+    protected var datasourceUrl:String;
+
+    public function Chart(container:Box, datasourceUrl:String) {
+      this.container = container;
+      this.datasourceUrl = datasourceUrl;
+    }
+
+    public function addData(dataSeries:DataSeries):void {
+      //override me!
+    }
+
+    public function load():void {
+      var dataSource:DataSource = new DataSource(this);
+      dataSource.retrieveData(datasourceUrl);
+    }
+  }
+}
diff --git a/src/flexchart/org/ovirt/data/DataPoint.as b/src/flexchart/org/ovirt/data/DataPoint.as
new file mode 100644
index 0000000..00cd0a4
--- /dev/null
+++ b/src/flexchart/org/ovirt/data/DataPoint.as
@@ -0,0 +1,47 @@
+/*
+ Copyright (C) 2008 Red Hat, Inc.
+ Written by Steve Linabery <slinabery at redhat.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA  02110-1301, USA.  A copy of the GNU General Public License is
+ also available at http://www.gnu.org/copyleft/gpl.html.
+*/
+
+package org.ovirt.data {
+
+  public class DataPoint {
+
+    private var timestamp:String;
+    private var value:Number;
+    private var description:String;
+
+    public function DataPoint (timestamp:String, value:Number, description:String) {
+      this.timestamp = timestamp;
+      this.value = value;
+      this.description = description;
+    }
+
+    public function getTimestamp():String {
+      return timestamp;
+    }
+
+    public function getValue():Number {
+      return value;
+    }
+
+    public function getDescription():String {
+      return description;
+    }
+  }
+}
diff --git a/src/flexchart/org/ovirt/data/DataSeries.as b/src/flexchart/org/ovirt/data/DataSeries.as
new file mode 100644
index 0000000..764fd34
--- /dev/null
+++ b/src/flexchart/org/ovirt/data/DataSeries.as
@@ -0,0 +1,54 @@
+/*
+ Copyright (C) 2008 Red Hat, Inc.
+ Written by Steve Linabery <slinabery at redhat.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA  02110-1301, USA.  A copy of the GNU General Public License is
+ also available at http://www.gnu.org/copyleft/gpl.html.
+*/
+
+//class to encapsulate the json object representation of a data
+//series returned from stats package
+
+package org.ovirt.data {
+
+  public class DataSeries {
+
+    private var object:Object;
+    private var dataPoints:Array;
+    private var description:String;
+    private var maxValue:Number;
+
+    public function DataSeries (object:Object) {
+      this.object = object;
+      this.description = object["description"] as String;
+      dataPoints = new Array();
+      var inDataPoints:Array = object["vectors"] as Array;
+      for (var i:int = 0; i < inDataPoints.length; i++) {
+        dataPoints.push(new DataPoint((inDataPoints[i] as Array)[0] as String,
+                                  (inDataPoints[i] as Array)[1] as Number,
+                                  description));
+      }
+      maxValue = object["max_value"] as Number;
+    }
+
+    public function getDataPoints():Array {
+      return dataPoints;
+    }
+
+    public function getMaxValue():Number {
+      return maxValue;
+    }
+  }
+}
diff --git a/src/flexchart/org/ovirt/elements/SingleBar.as b/src/flexchart/org/ovirt/elements/SingleBar.as
new file mode 100644
index 0000000..6e09bff
--- /dev/null
+++ b/src/flexchart/org/ovirt/elements/SingleBar.as
@@ -0,0 +1,67 @@
+/*
+ Copyright (C) 2008 Red Hat, Inc.
+ Written by Steve Linabery <slinabery at redhat.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA  02110-1301, USA.  A copy of the GNU General Public License is
+ also available at http://www.gnu.org/copyleft/gpl.html.
+*/
+
+package org.ovirt.elements {
+
+  import mx.containers.Box;
+  import mx.controls.ToolTip;
+  import mx.managers.ToolTipManager;
+  import flash.events.Event;
+  import flash.events.MouseEvent;
+  import flash.geom.Rectangle;
+  import flash.display.DisplayObject;
+  import org.ovirt.data.DataPoint;
+
+  public class SingleBar extends Box {
+
+    private var tip:ToolTip;
+    private var dataPoint:DataPoint;
+
+    public function SingleBar(dataPoint:DataPoint) {
+      super();
+      this.dataPoint = dataPoint;
+      addEventListener(MouseEvent.MOUSE_OVER,showTip);
+      addEventListener(MouseEvent.MOUSE_OUT,destroyTip);
+      this.setStyle("backgroundColor","0x0000FF");
+      this.setStyle("left","1");
+      this.setStyle("right","1");
+    }
+
+    private function showTip(event:Event):void {
+      var w:Number = this.stage.width;
+      var target:DisplayObject = event.currentTarget as DisplayObject;
+      var pt:Rectangle = this.stage.getBounds(target);
+      var yPos:Number = pt.y * -1;
+      var xPos:Number = pt.x * -1;
+      tip = ToolTipManager.createToolTip(dataPoint.getDescription() + "\n" +
+                                           dataPoint.getTimestamp() + "\n" +
+                                           dataPoint.getValue(),
+                                         xPos,yPos) as ToolTip;
+      tip.x = Math.min(tip.x,
+                       w - tip.width);
+      tip.y = Math.max(0,
+                       tip.y - tip.height);
+    }
+
+    private function destroyTip(event:Event):void {
+      ToolTipManager.destroyToolTip(tip);
+    }
+  }
+}
diff --git a/src/flexchart/org/ovirt/elements/TextLiberation.as b/src/flexchart/org/ovirt/elements/TextLiberation.as
new file mode 100644
index 0000000..f0314a2
--- /dev/null
+++ b/src/flexchart/org/ovirt/elements/TextLiberation.as
@@ -0,0 +1,46 @@
+/*
+ Copyright (C) 2008 Red Hat, Inc.
+ Written by Steve Linabery <slinabery at redhat.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA  02110-1301, USA.  A copy of the GNU General Public License is
+ also available at http://www.gnu.org/copyleft/gpl.html.
+*/
+
+package org.ovirt.elements {
+
+  import mx.controls.Label;
+
+  public class TextLiberation extends Label {
+
+    //FIXME: this should point to a local asset somehow.
+    [Embed(source='/usr/share/fonts/liberation/LiberationSans-Regular.ttf',
+           fontName='liberation',
+           mimeType='application/x-font'
+          )]
+    //this variable exists so that the compiler will link in the font.
+    private var font1:Class;
+
+    public function TextLiberation(text:String) {
+      super();
+      this.text = text;
+      this.setStyle("fontFamily","liberation");
+    }
+
+    public function getTextWidth():Number {
+      this.validateNow();
+      return this.textWidth;
+    }
+  }
+}
diff --git a/src/flexchart/org/ovirt/elements/YAxisLabel.as b/src/flexchart/org/ovirt/elements/YAxisLabel.as
new file mode 100644
index 0000000..0e93b97
--- /dev/null
+++ b/src/flexchart/org/ovirt/elements/YAxisLabel.as
@@ -0,0 +1,41 @@
+/*
+ Copyright (C) 2008 Red Hat, Inc.
+ Written by Steve Linabery <slinabery at redhat.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA  02110-1301, USA.  A copy of the GNU General Public License is
+ also available at http://www.gnu.org/copyleft/gpl.html.
+*/
+
+package org.ovirt.elements {
+
+  import mx.containers.Box;
+  import mx.core.ScrollPolicy;
+
+  public class YAxisLabel extends Box {
+
+    public var labelText:TextLiberation;
+
+    public function YAxisLabel(text:String) {
+      super();
+      labelText = new TextLiberation(text);
+      labelText.setVisible(true);
+      this.addChild(labelText);
+      this.horizontalScrollPolicy = ScrollPolicy.OFF;
+      this.verticalScrollPolicy = ScrollPolicy.OFF;
+      this.setStyle("paddingLeft","0");
+      this.setStyle("paddingRight","0");
+    }
+  }
+}
-- 
1.5.6.5



From mburns at redhat.com  Thu Oct 30 15:39:53 2008
From: mburns at redhat.com (mburns at redhat.com)
Date: Thu, 30 Oct 2008 11:39:53 -0400
Subject: [Ovirt-devel] [PATCH node-image 1/1] Fixes Makefile.am to use the
	updates-released-f9.newkey repository when using a mirrorlist.
Message-ID: <1225381193-2292-1-git-send-email-mburns@redhat.com>

From: mburns <mburns at mburns-fedora.(none)>

---
 Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5b5bc3a..fce5131 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,7 +60,7 @@ repos.ks:
 		FEDORA_REPO=f$(FEDORA) ;\
 		FEDORA_REPO_LOC="$(if $(FEDORA_URL),--baseurl=$(FEDORA_URL)/releases/$(FEDORA)/Everything/${ARCH}/os,--mirrorlist=$(FEDORA_MIRROR)?repo=fedora-$(FEDORA)&arch=$(ARCH))" ;\
 		OVIRT_DISTRO=$(FEDORA) ;\
-		UPDATE_REPO_LINE="repo --name=$${FEDORA_REPO}-updates-newkey $(if $(FEDORA_URL),--baseurl=$(FEDORA_URL)/updates/$(FEDORA)/${ARCH}.newkey,--mirrorlist=$(FEDORA_MIRROR)?repo=updates-released-f$(FEDORA)&arch=$(ARCH))" ;\
+		UPDATE_REPO_LINE="repo --name=$${FEDORA_REPO}-updates-newkey $(if $(FEDORA_URL),--baseurl=$(FEDORA_URL)/updates/$(FEDORA)/${ARCH}.newkey,--mirrorlist=$(FEDORA_MIRROR)?repo=updates-released-f$(FEDORA).newkey&arch=$(ARCH))" ;\
 	    fi ;\
 	    echo "repo --name=$${FEDORA_REPO} $${FEDORA_REPO_LOC}" > $@ ;\
 	    echo "repo --name=ovirt-org --baseurl=$(OVIRT_URL)/$${OVIRT_DISTRO}/$(ARCH)" >> $@ ;\
-- 
1.5.6.5



From danken at redhat.com  Thu Oct 30 21:30:09 2008
From: danken at redhat.com (Dan Kenigsberg)
Date: Thu, 30 Oct 2008 23:30:09 +0200
Subject: [Ovirt-devel] [PATCH appliance] allow for on-filesystem FEDORA_URL
Message-ID: <1225402210-1630-1-git-send-email-danken@redhat.com>

---
 gettree.sh |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/gettree.sh b/gettree.sh
index 42f1d29..67f6cf9 100755
--- a/gettree.sh
+++ b/gettree.sh
@@ -7,7 +7,10 @@
 
 download() {
     local f=$1
-    wget --progress=dot:mega --continue $1
+    case "$f" in
+        file://*) cp ${f#file://} . ;;
+        *) wget --progress=dot:mega --continue $f ;;
+    esac
     printf "."
 }
 
-- 
1.5.6.5



From danken at redhat.com  Thu Oct 30 21:30:10 2008
From: danken at redhat.com (Dan Kenigsberg)
Date: Thu, 30 Oct 2008 23:30:10 +0200
Subject: [Ovirt-devel] [PATCH appliance] spell-out dependency
In-Reply-To: <1225402210-1630-1-git-send-email-danken@redhat.com>
References: <1225402210-1630-1-git-send-email-danken@redhat.com>
Message-ID: <1225402210-1630-2-git-send-email-danken@redhat.com>

---
 ovirt-appliance.spec.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ovirt-appliance.spec.in b/ovirt-appliance.spec.in
index f42982d..fdf942f 100644
--- a/ovirt-appliance.spec.in
+++ b/ovirt-appliance.spec.in
@@ -16,7 +16,7 @@ License: GPLv2+
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 URL: http://ovirt.org/
-BuildRequires: appliance-tools
+BuildRequires: appliance-tools appliance-os
 BuildRequires: livecd-tools >= 017
 BuildRequires: syslinux
 BuildRequires: qemu-img
-- 
1.5.6.5



From jguiditt at redhat.com  Thu Oct 30 21:49:03 2008
From: jguiditt at redhat.com (Jason Guiditta)
Date: Thu, 30 Oct 2008 17:49:03 -0400
Subject: [Ovirt-devel] [PATCH server] WIP - Rev 1 of Storage Tree UI for
	'Create VM'.
Message-ID: <1225403343-18309-1-git-send-email-jguiditt@redhat.com>

This probably needs some visual tweaks, but should work as
is.  Needs integration testing with scott's work to create
lvm volumes.

Signed-off-by: Jason Guiditta <jguiditt at redhat.com>
---
 src/app/controllers/vm_controller.rb       |    2 +
 src/app/models/storage_volume.rb           |    3 +
 src/app/views/vm/_form.rhtml               |   59 ++++++++++++++-------------
 src/public/javascripts/ovirt.tree.js       |    8 +++-
 src/public/stylesheets/ovirt-tree/tree.css |    5 ++-
 5 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb
index fc992b3..ee956da 100644
--- a/src/app/controllers/vm_controller.rb
+++ b/src/app/controllers/vm_controller.rb
@@ -41,6 +41,7 @@ class VmController < ApplicationController
   end
 
   def new
+    @storage_tree = VmResourcePool.find(params[:vm_resource_pool_id]).get_hardware_pool.storage_tree.to_json
     render :layout => 'popup'
   end
 
@@ -80,6 +81,7 @@ class VmController < ApplicationController
   end
 
   def edit
+    @storage_tree = @vm.vm_resource_pool.get_hardware_pool.storage_tree(@vm).to_json
     render :layout => 'popup'
   end
 
diff --git a/src/app/models/storage_volume.rb b/src/app/models/storage_volume.rb
index 3bd5da0..6f14c4d 100644
--- a/src/app/models/storage_volume.rb
+++ b/src/app/models/storage_volume.rb
@@ -81,6 +81,7 @@ class StorageVolume < ActiveRecord::Base
       :type => self[:type],
       :text => display_name,
       :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))),
@@ -100,6 +101,8 @@ class StorageVolume < ActiveRecord::Base
                                :conditions => condition).collect do |volume|
         volume.storage_tree_element(vm_to_include)
       end
+    else
+      return_hash[:children] = []
     end
     return_hash
   end
diff --git a/src/app/views/vm/_form.rhtml b/src/app/views/vm/_form.rhtml
index 3d4cd79..523e81e 100644
--- a/src/app/views/vm/_form.rhtml
+++ b/src/app/views/vm/_form.rhtml
@@ -29,7 +29,7 @@
     <div class="clear_row"></div>
     <div class="field_title">Storage: </div>
     <div style="height:150px; overflow:auto; border:#CCCCCC solid 1px;">
-      <table id="storage_volumes_grid" style="display:none"></table>
+      <ul id="storage_volumes_tree" class="ovirt-tree"></ul>
     </div>
 
     <!-- FIXME: fill in total here -->
@@ -55,35 +55,38 @@
    <%= check_box_tag_with_label "Restart VM Now? (pending current resource availability)", "restart_now", nil if @vm.state == Vm::STATE_RUNNING %>
 
 <!--[eoform:vm]-->
-<script type="text/javascript">
-	$("#storage_volumes_grid").flexigrid
-	(
-	{
-	url: '<%=  url_for :controller => "vm", 
-                           :action => "storage_volumes_for_vm_json", 
-                           :id => @vm, :vm_pool_id => @vm.vm_resource_pool %>',
-	dataType: 'json',
-        width: 700,
-	colModel : [
-		{display: '', name : 'id', width : 20, sortable : false, align: 'left', process: storage_volumes_grid_checkbox},
-		{display: 'Alias', name : 'display_name', width : 180, sortable : false, align: 'left'},
-	        {display: 'Size (Gb)', name : 'size', width : 80, sortable : true, align: 'left'},
-		{display: 'Type', name : 'type', width : 80, sortable : true, align: 'left'}
-		],
-	sortname: "size",
-	sortorder: "desc",
-	usepager: true,
-	useRp: true,
-	rp: 10,
-	showTableToggleBtn: true
-	}
-	);   
 
-	function storage_volumes_grid_checkbox(celDiv)
-	{
-	       $(celDiv).html('<input type="checkbox" name="vm[storage_volume_ids][]" value="'+$(celDiv).html()+'"/>');
-	} 
+<textarea id="tree_template" style="display:none;">
+{macro htmlList(list, isFullList)}
+  {if isFullList}
+  <ul style="display:none;">
+  {/if}
+    {for item in list}
+      <li>
+        <span class="hitarea {if item.children.length > 0} expandable{/if}">&nbsp;</span>
+        <div id="move-${item.id}" 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}
+        </div>
+        {if item.children.length > 0}
+          ${htmlList(item.children, true)}
+        {/if}
+      </li>
+    {/for}
+  {if isFullList}
+  </ul>
+  {/if}
+{/macro}
 
+${htmlList(pools)}
+</textarea>
+<script type="text/javascript">
+    $(document).ready(function(){
+      $('#storage_volumes_tree').tree({
+        content: {"pools" : <%=  @storage_tree%>}
+      });
+    });
 </script>
 
 
diff --git a/src/public/javascripts/ovirt.tree.js b/src/public/javascripts/ovirt.tree.js
index 42719a1..13720b2 100644
--- a/src/public/javascripts/ovirt.tree.js
+++ b/src/public/javascripts/ovirt.tree.js
@@ -121,6 +121,7 @@ function processChildren(list, templateObj){
                           }
                       }
                     });
+                    this.openToSelected(self);
                 },
                 toggle: function(e, elem) {
                     $(elem)
@@ -129,8 +130,11 @@ function processChildren(list, templateObj){
                       .siblings('ul').slideToggle("normal");
                 },
                 clickHandler: function(e,elem) {
-                    alert('e: ' + e + ', elem: ' + elem);
-                    var fred = 'fred';
+                    // make this a default impl if needed.
+                },
+                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.
                 },
 		off: function() {
 			this.element.css({background: 'none'});
diff --git a/src/public/stylesheets/ovirt-tree/tree.css b/src/public/stylesheets/ovirt-tree/tree.css
index bc5cca5..2c9456d 100644
--- a/src/public/stylesheets/ovirt-tree/tree.css
+++ b/src/public/stylesheets/ovirt-tree/tree.css
@@ -20,7 +20,7 @@
 .ovirt-tree div {
     background-repeat: no-repeat;
     background-position: left;
-    padding: 4px 0 4px 28px;
+    padding: 4px 0 4px 4px;
     cursor: pointer; /* maybe move this into a clickable class? */
 }
 
@@ -30,14 +30,17 @@
 }
 
 .HardwarePool {
+    padding: 4px 0 4px 28px !important;
     background-image: url('../../images/icon_hdwarepool.png');
 }
 
 .VmResourcePool {
+    padding: 4px 0 4px 28px !important;
     background-image: url('../../images/icon_vmpool.png');
 }
 
 .SmartPool {
+    padding: 4px 0 4px 28px !important;
     background-image: url('../../images/icon_smartpool.png');
 }
 
-- 
1.5.6.5



From sseago at redhat.com  Thu Oct 30 23:53:15 2008
From: sseago at redhat.com (Scott Seago)
Date: Thu, 30 Oct 2008 23:53:15 +0000
Subject: [Ovirt-devel] [PATCH] lvm storage volume HW pool admin tab.
Message-ID: <1225410795-2680-1-git-send-email-sseago@redhat.com>

Includes 'view storage volume' facebox popup and new/delete LVM volume functionality. Although lvm tasks are created, taskomatic doesn't yet know what to do with them.

Signed-off-by: Scott Seago <sseago at redhat.com>
---
 src/app/controllers/hardware_controller.rb   |    5 +-
 src/app/controllers/storage_controller.rb    |  180 +++++++++++++++++++++++++-
 src/app/controllers/task_controller.rb       |    2 +
 src/app/models/lvm_storage_pool.rb           |    5 +
 src/app/models/storage_volume_task.rb        |    3 +-
 src/app/views/storage/_lvm_volume_form.rhtml |   19 +++
 src/app/views/storage/new_lvm_volume.rhtml   |   42 ++++++
 src/app/views/storage/show.rhtml             |   63 +++++----
 src/app/views/storage/show_volume.rhtml      |  169 +++++++++++++++++-------
 9 files changed, 404 insertions(+), 84 deletions(-)
 create mode 100644 src/app/views/storage/_lvm_volume_form.rhtml
 create mode 100644 src/app/views/storage/new_lvm_volume.rhtml

diff --git a/src/app/controllers/hardware_controller.rb b/src/app/controllers/hardware_controller.rb
index 4f24cb3..8c26184 100644
--- a/src/app/controllers/hardware_controller.rb
+++ b/src/app/controllers/hardware_controller.rb
@@ -117,7 +117,8 @@ class HardwareController < PoolController
   def show_tasks
     @task_types = [["VM Task", "VmTask"],
                    ["Host Task", "HostTask"],
-                   ["Storage Task", "StorageTask", "break"],
+                   ["Storage Task", "StorageTask"],
+                   ["Storage Volume Task", "StorageVolumeTask", "break"],
                    ["Show All", ""]]
     super
   end
@@ -162,7 +163,7 @@ class HardwareController < PoolController
     if params[:id]
       pre_show
       storage_pools = @pool.storage_pools
-      find_opts = {}
+      find_opts = {:conditions => "type != 'LvmStoragePool'"}
       include_pool = false
     else
       # FIXME: no permissions or usage checks here yet
diff --git a/src/app/controllers/storage_controller.rb b/src/app/controllers/storage_controller.rb
index fe524f3..75058cd 100644
--- a/src/app/controllers/storage_controller.rb
+++ b/src/app/controllers/storage_controller.rb
@@ -25,6 +25,7 @@ class StorageController < ApplicationController
   before_filter :pre_pool_admin, :only => [:refresh]
   before_filter :pre_new2, :only => [:new2]
   before_filter :pre_json, :only => [:storage_volumes_json]
+  before_filter :pre_create_volume, :only => [:create_volume]
 
   def index
     list
@@ -90,15 +91,25 @@ class StorageController < ApplicationController
       flash[:notice] = 'You do not have permission to view this storage pool: redirecting to top level'
       redirect_to :controller => 'dashboard'
     end
-    json_list(@storage_pool.storage_volumes, 
-              [:display_name, :size_in_gb, :get_type_label])
+    attr_list = []
+    attr_list << :id if (@storage_pool.user_subdividable and @can_modify)
+    attr_list += [:display_name, :size_in_gb, :get_type_label]
+    json_list(@storage_pool.storage_volumes, attr_list)
   end
   def show_volume
     @storage_volume = StorageVolume.find(params[:id])
     set_perms(@storage_volume.storage_pool.hardware_pool)
     unless @can_view
       flash[:notice] = 'You do not have permission to view this storage volume: redirecting to top level'
-      redirect_to :controller => 'dashboard'
+      respond_to do |format|
+        format.html { redirect_to :controller => 'dashboard' }
+        format.xml { head :forbidden }
+      end
+    else
+      respond_to do |format|
+        format.html { render :layout => 'popup' }
+        format.xml { render :xml => @storage_volume.to_xml }
+      end
     end
   end
 
@@ -110,6 +121,70 @@ class StorageController < ApplicationController
     render :layout => false
   end
 
+  def new_volume
+    new_volume_internal(StoragePool.find(params[:storage_pool_id]),
+                        { :storage_pool_id => params[:storage_pool_id]})
+    render :layout => 'popup'
+  end
+
+  def new_lvm_volume
+    @source_volume = StorageVolume.find(params[:source_volume_id])
+    @return_facebox = params[:return_facebox]
+    unless @source_volume.supports_lvm_subdivision
+      #fixme: proper error page for popups
+      redirect_to :controller => 'dashboard'
+      return
+    end
+    lvm_pool = @source_volume.lvm_storage_pool
+    unless lvm_pool
+      # FIXME: what should we do about VG/LV names?
+      # for now auto-create VG name as ovirt_vg_#{@source_volume.id}
+      lvm_pool = LvmStoragePool.new(:vg_name => "ovirt_vg_#{@source_volume.id}",
+              :hardware_pool_id => @source_volume.storage_pool.hardware_pool_id)
+      lvm_pool.source_volumes << @source_volume
+      lvm_pool.save!
+    end
+    new_volume_internal(lvm_pool, { :storage_pool_id => lvm_pool.id})
+    @storage_volume.lv_owner_perms='0744'
+    @storage_volume.lv_group_perms='0744'
+    @storage_volume.lv_mode_perms='0744'
+    render :layout => 'popup'
+  end
+
+  def create_volume
+    begin
+      StorageVolume.transaction do
+        @storage_volume.save!
+        @task = StorageVolumeTask.new({ :user        => @user,
+                              :task_target => @storage_volume,
+                              :action      => StorageVolumeTask::ACTION_CREATE_VOLUME,
+                              :state       => Task::STATE_QUEUED})
+        @task.save!
+      end
+      respond_to do |format|
+        format.json { render :json => { :object => "storage_volume",
+            :success => true,
+            :alert => "Storage Volume was successfully created." } }
+        format.xml { render :xml => @storage_volume,
+            :status => :created,
+            # FIXME: create storage_volume_url method if relevant
+            :location => storage_pool_url(@storage_volume)
+        }
+      end
+    rescue => ex
+      # FIXME: need to distinguish volume vs. task save errors
+      respond_to do |format|
+        format.json {
+          json_hash = { :object => "storage_volume", :success => false,
+            :errors => @storage_volume.errors.localize_error_messages.to_a  }
+          json_hash[:message] = ex.message if json_hash[:errors].empty?
+          render :json => json_hash }
+        format.xml { render :xml => @storage_volume.errors,
+          :status => :unprocessable_entity }
+      end
+    end
+  end
+
   def insert_refresh_task
     @task = StorageTask.new({ :user        => @user,
                               :task_target => @storage_pool,
@@ -244,6 +319,67 @@ class StorageController < ApplicationController
     end
   end
 
+  def delete_volumes
+    storage_volume_ids_str = params[:storage_volume_ids]
+    storage_volume_ids = storage_volume_ids_str.split(",").collect {|x| x.to_i}
+    alerts = []
+    status = true
+    begin
+      StorageVolume.transaction do
+        storage = StorageVolume.find(:all, :conditions => "id in (#{storage_volume_ids.join(', ')})")
+        unless storage.empty?
+          set_perms(storage[0].storage_pool.hardware_pool)
+          unless @can_modify and storage[0].storage_pool.user_subdividable
+            respond_to do |format|
+              format.json { render :json => { :object => "storage_volume",
+                  :success => false,
+                  :alert => "You do not have permission to delete this storage volume." } }
+              format.xml { head :forbidden }
+            end
+          else
+            storage.each do |storage_volume|
+              alert, success = delete_volume_internal(storage_volume)
+              alerts << alert
+              status = false unless success
+            end
+            respond_to do |format|
+              format.json { render :json => { :object => "storage_volume",
+                  :success => status, :alert => alerts.join("\n") } }
+              format.xml { head(status ? :ok : :method_not_allowed) }
+            end
+          end
+        else
+          respond_to do |format|
+            format.json { render :json => { :object => "storage_volume",
+                :success => false, :alert => "no volumes selected" } }
+            format.xml { head(status ? :ok : :method_not_allowed) }
+          end
+        end
+      end
+    end
+  end
+
+  def delete_volume
+    @storage_volume = StorageVolume.find(params[:id])
+    set_perms(@storage_volume.storage_pool.hardware_pool)
+    unless @can_modify and @storage_volume.storage_pool.user_subdividable
+      respond_to do |format|
+        format.json { render :json => { :object => "storage_volume",
+            :success => false,
+            :alert => "You do not have permission to delete this storage volume." } }
+        format.xml { head :forbidden }
+      end
+    else
+      alert, success = delete_volume_internal(@storage_volume)
+      respond_to do |format|
+        format.json { render :json => { :object => "storage_volume",
+            :success => success, :alert => alert } }
+        format.xml { head(success ? :ok : :method_not_allowed) }
+      end
+    end
+
+  end
+
   def pre_new
     @hardware_pool = HardwarePool.find(params[:hardware_pool_id])
     @perm_obj = @hardware_pool
@@ -274,6 +410,16 @@ class StorageController < ApplicationController
     @perm_obj = @storage_pool.hardware_pool
     @redir_obj = @storage_pool
   end
+  def pre_create_volume
+    volume = params[:storage_volume]
+    unless type = params[:storage_type]
+      type = volume.delete(:storage_type)
+    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
     pre_show
   end
@@ -282,4 +428,32 @@ class StorageController < ApplicationController
     authorize_admin
   end
 
+  private
+  def new_volume_internal(storage_pool, new_params)
+    @storage_volume = StorageVolume.factory(storage_pool.get_type_label, new_params)
+    @perm_obj = @storage_volume.storage_pool.hardware_pool
+    authorize_admin
+  end
+
+  def delete_volume_internal(volume)
+    begin
+      name = volume.display_name
+      if !volume.vms.empty?
+        vm_list = volume.vms.collect {|vm| vm.description}.join(", ")
+        ["Storage Volume #{name} must be unattached from VMs (#{vm_list}) before deleting it.",
+         false]
+        #FIXME: create delete volume task. include metadata in task
+      else
+        #FIXME: need to set volume to 'unavailable' state once we have states
+        @task = StorageVolumeTask.new({ :user        => @user,
+                              :task_target => volume,
+                              :action      => StorageVolumeTask::ACTION_DELETE_VOLUME,
+                              :state       => Task::STATE_QUEUED})
+        @task.save!
+        ["Storage Volume #{name} deletion was successfully queued.", true]
+      end
+    rescue => ex
+      ["Failed to delete storage volume #{name} (#{ex.message}.",false]
+    end
+  end
 end
diff --git a/src/app/controllers/task_controller.rb b/src/app/controllers/task_controller.rb
index 73e5155..647d69c 100644
--- a/src/app/controllers/task_controller.rb
+++ b/src/app/controllers/task_controller.rb
@@ -24,6 +24,8 @@ class TaskController < ApplicationController
       set_perms(@task.vm.vm_resource_pool)
     elsif @task[:type] == StorageTask.name 
       set_perms(@task.storage_pool.hardware_pool)
+    elsif @task[:type] == StorageVolumeTask.name
+      set_perms(@task.storage_volume.storage_pool.hardware_pool)
     elsif @task[:type] == HostTask.name 
       set_perms(@task.host.hardware_pool)
     end
diff --git a/src/app/models/lvm_storage_pool.rb b/src/app/models/lvm_storage_pool.rb
index 08b8938..84fbb28 100644
--- a/src/app/models/lvm_storage_pool.rb
+++ b/src/app/models/lvm_storage_pool.rb
@@ -44,5 +44,10 @@ class LvmStoragePool < StoragePool
     kb_to_gb(size)
   end
 
+  # FIXME: needs to take free space into account here
+  def user_subdividable
+    true
+  end
+
 
 end
diff --git a/src/app/models/storage_volume_task.rb b/src/app/models/storage_volume_task.rb
index 78f2895..136f1ba 100644
--- a/src/app/models/storage_volume_task.rb
+++ b/src/app/models/storage_volume_task.rb
@@ -20,7 +20,7 @@
 class StorageVolumeTask < Task
 
   ACTION_CREATE_VOLUME = "create_volume"
-  ACTION_EDIT_VOLUME = "edit_volume"
+  ACTION_DELETE_VOLUME = "delete_volume"
 
   def after_initialize
     self.hardware_pool = task_target.storage_pool.hardware_pool if self.task_target_type=="StorageVolume"
@@ -29,7 +29,6 @@ class StorageVolumeTask < Task
   def task_obj
     "StorageVolume;;;#{self.storage_volume.id};;;#{self.storage_volume.display_name}"
   end
-  end
   def host
     nil
   end
diff --git a/src/app/views/storage/_lvm_volume_form.rhtml b/src/app/views/storage/_lvm_volume_form.rhtml
new file mode 100644
index 0000000..823158e
--- /dev/null
+++ b/src/app/views/storage/_lvm_volume_form.rhtml
@@ -0,0 +1,19 @@
+<%= error_messages_for 'storage_volume' %>
+
+<!--[form:storage_pool]-->
+<%= hidden_field 'storage_volume', 'storage_pool_id'  %>
+<%= hidden_field_tag 'storage_type', @storage_volume.get_type_label  %>
+
+<%= text_field_with_label "Size (GB):", 'storage_volume', 'size_in_gb'  %>
+
+<%= text_field_with_label "LV Name:", 'storage_volume', 'lv_name' %>
+
+<%= text_field_with_label "Owner permissions:", 'storage_volume', 'lv_owner_perms' %>
+
+<%= text_field_with_label "Group permissions:", 'storage_volume', 'lv_group_perms' %>
+
+<%= text_field_with_label "Mode permissions:", 'storage_volume', 'lv_mode_perms' %>
+
+
+<!--[eoform:storage_volume]-->
+
diff --git a/src/app/views/storage/new_lvm_volume.rhtml b/src/app/views/storage/new_lvm_volume.rhtml
new file mode 100644
index 0000000..ea51cc5
--- /dev/null
+++ b/src/app/views/storage/new_lvm_volume.rhtml
@@ -0,0 +1,42 @@
+<%- content_for :title do -%>
+  <%= _("Add New LVM Volume") %>
+<%- end -%>
+<%- content_for :description do -%>
+  Add a new LVM Storage Volume to <%= @source_volume.display_name %>.
+<%- end -%>
+<div class="panel_header"></div>
+<div class="dialog_form">
+<form method="POST" action="<%= url_for :action => 'create_volume' %>" id="lvm_volume_form" >
+  <div class="dialog_form">
+    <div id="new_storage_pool">
+      <%= render :partial => 'lvm_volume_form' %>
+    </div>
+  </div>
+  <!-- FIXME: need to pop up the details dialog again -->
+  <%= popup_footer("$('#lvm_volume_form').submit()", "New LVM Volume") %>
+</form>
+</div>
+<script type="text/javascript">
+function afterLvmVolume(response, status){
+    ajax_validation(response, status);
+    if (response.success) {
+    <% if @return_facebox %>
+      $('#window').fadeOut('fast');
+      $("#window").empty().load("<%= @return_facebox %>")
+      $('#window').fadeIn('fast');
+    <% else %>
+      $(document).trigger('close.facebox');
+    <% end %>
+    }
+}
+$(function() {
+    var lvmvolumeoptions = {
+        target:        '<%= url_for :action => 'create_volume' %>',   // target element to update
+	dataType:      'json',
+        success:       afterLvmVolume  // post-submit callback
+    };
+
+    // bind form using 'ajaxForm'
+    $('#lvm_volume_form').ajaxForm(lvmvolumeoptions);
+});
+</script>
diff --git a/src/app/views/storage/show.rhtml b/src/app/views/storage/show.rhtml
index 82c9dab..a84dc62 100644
--- a/src/app/views/storage/show.rhtml
+++ b/src/app/views/storage/show.rhtml
@@ -18,24 +18,24 @@
 
     <div id="storage_selection_id" style="display:none"><%= @storage_pool.id %></div>
     <div class="selection_key">
-        IP address: </br>
+        IP address:<br/>
         <% if @storage_pool[:type] == "IscsiStoragePool" %>
-          Port:       </br>
-          Target:     </br>
+          Port:<br/>
+          Target:<br/>
         <% elsif @storage_pool[:type] == "NfsStoragePool" %>
-          Export path:</br>
+          Export path:<br/>
         <% end %>
-        Type:       </br>
+        Type:<br/>
     </div>
     <div class="selection_value">
-        <%=h @storage_pool.ip_addr %></br>
+        <%=h @storage_pool.ip_addr %><br/>
         <% if @storage_pool[:type] == "IscsiStoragePool" %>
-          <%=h @storage_pool.port %></br>
-          <%=h @storage_pool.target %></br>
+          <%=h @storage_pool.port %><br/>
+          <%=h @storage_pool.target %><br/>
         <% elsif @storage_pool[:type] == "NfsStoragePool" %>
-          <%=h @storage_pool.export_path %></br>
+          <%=h @storage_pool.export_path %><br/>
         <% end %>
-        <%=h @storage_pool.get_type_label %></br>
+        <%=h @storage_pool.get_type_label %><br/>
     </div>
 <%- content_for :right do -%>
   <div class="selection_right_title">Volumes</div>
@@ -54,24 +54,33 @@
 
 <%= confirmation_dialog("confirm_delete_storage", "Are you sure?", "delete_storage_pool()") %>
 <script type="text/javascript">
-	$("#storage_volumes_grid").flexigrid
-	(
-	{
-	url: '<%=  url_for :action => "storage_volumes_json", :id => @storage_pool.id %>',
-	dataType: 'json',
-	colModel : [
-		{display: 'Alias', name : 'display_name', width : 180, sortable : false, align: 'left'},
-	        {display: 'Size (Gb)', name : 'size', width : 80, sortable : true, align: 'left'},
-		{display: 'Type', name : 'type', width : 80, sortable : true, align: 'left'}
-		],
-	sortname: "size",
-	sortorder: "desc",
-	usepager: false,
-	useRp: true,
-	rp: 40,
-	showTableToggleBtn: true,
-	}
+    $("#storage_volumes_grid").flexigrid
+    (
+    {
+    url: '<%=  url_for :action => "storage_volumes_json", :id => @storage_pool.id %>',
+    dataType: 'json',
+    colModel : [
+        <%= "{display: '', width : 20, align: 'left', process: storage_volumes_gridcheckbox}," if (@storage_pool.user_subdividable and @can_modify) %>
+        {display: 'Alias', width : 180, sortable : false, align: 'left', process: storage_volume_details_link},
+        {display: 'Size (Gb)', name : 'size', width : 80, sortable : true, align: 'left'},
+        {display: 'Type', name : 'type', width : 80, sortable : true, align: 'left'}
+        ],
+    sortname: "size",
+    sortorder: "desc",
+    usepager: false,
+    useRp: true,
+    rp: 40,
+    showTableToggleBtn: true,
+    }
 	);   
+    function storage_volumes_gridcheckbox(celDiv)
+    {
+        $(celDiv).html('<input class="grid_checkbox" type="checkbox" name="grid_checkbox'+$(celDiv).html()+'" value="'+$(celDiv).html()+'"/>');
+    }
+    function storage_volume_details_link(celDiv,pid)
+    {
+        $(celDiv).html('<a href="<%= url_for :controller => 'storage', :action => 'show_volume' %>/'+ pid +'" rel="facebox[.bolder]">' + $(celDiv).html() + '</a>');
+    }
 </script>
 <script type="text/javascript">
       
diff --git a/src/app/views/storage/show_volume.rhtml b/src/app/views/storage/show_volume.rhtml
index 9aeb808..e39c10e 100644
--- a/src/app/views/storage/show_volume.rhtml
+++ b/src/app/views/storage/show_volume.rhtml
@@ -1,54 +1,123 @@
-    <div id="data">
-      <div class="inside">
-
-          <div id="dataTableWrapper">
-
-          <div class="dataTable">
-              <div class="inside">
-
-                <div class="data-table-column">
+<%- content_for :title do -%>
+  <%=h @storage_volume.display_name %>
+<%- end -%>
+<%- content_for :description do -%>
+  Details for Storage Volume <%=h @storage_volume.display_name %>
+<%- end -%>
 
-                <p><b>IP address:</b> <%=h @storage_volume.storage_pool.ip_addr %></p>
-<% if @storage_volume.storage_pool[:type] == "IscsiStoragePool" %>
-                <p><b>Port:</b>       <%=h @storage_volume.storage_pool.port %></p>
-                <p><b>Target:</b>     <%=h @storage_volume.storage_pool[:target] %></p>
-<% elsif @storage_volume.storage_pool[:type] == "NfsStoragePool" %>
-                <p><b>Export path:</b> <%=h @storage_volume.storage_pool.export_path %></p>
-<% end %>
-                <p><b>Type:</b>       <%=h @storage_volume.storage_pool.get_type_label %></p>
-		<p></p>
-                <p><b>Path:</b>       <%=h @storage_volume.path %></p>
-<% if @storage_volume[:type] == "IscsiStorageVolume" %>
-                <p><b>LUN:</b>        <%=h @storage_volume.lun %></p>
-<% elsif @storage_volume[:type] == "NfsStorageVolume" %>
-                <p><b>Filename:</b>        <%=h @storage_volume.filename %></p>
+<% if @storage_volume.supports_lvm_subdivision %>
+  <div id="dialog-content-area">
+    <div id="toolbar_nav">
+      <ul>
+        <li><a href="#" id="new_lvm_volume_button"><%=image_tag "icon_addstorage.png", :style=>"vertical-align:middle;" %>Add</a></li>
+        <% if (@storage_volume.lvm_storage_pool and
+               !@storage_volume.lvm_storage_pool.storage_volumes.empty?) %>
+          <li><a href="#" onClick="return remove_lvm_volumes();"><%=image_tag "icon_remove.png" %>&nbsp;&nbsp;Remove</a></li>
+        <% end %>
+      </ul>
+     </div>
+   </div>
 <% end %>
-                <p><b>Size:</b>       <%=h @storage_volume.size_in_gb %> GB</p>
-
-                </div>
-
-              </div> <!-- end #data-table.inside -->
-            </div> <!-- end #dataTable -->
-
-          </div> <!-- end #dataTableWrapper -->
-
-      </div> <!-- end #data.inside -->
-      </div> <!-- end #data -->
-
-  </td>
-  <td id="right">
-    <div class="heading">&nbsp;</div>
-    <div id="tools">
-    <h3>Actions</h3>
-    <%if @can_modify -%>
-    <% end -%>
-    <div class="actions">
-      <%= link_to "Back to #{@storage_volume.storage_pool.ip_addr}: #{@storage_volume.storage_pool[:target]}", { :action => 'show', :id => @storage_volume.storage_pool.id }, { :class => "" } %>
-    </div>
+<div class="panel_header"></div>
+  <div class="selection_key">
+    IP address:<br/>
+    <% if @storage_volume.storage_pool[:type] == "IscsiStoragePool" %>
+      Port:<br/>
+      Target:<br/>
+    <% elsif @storage_volume.storage_pool[:type] == "NfsStoragePool" %>
+      Export path:<br/>
+    <% end %>
+    Type:<br/>
+    Path:<br/>
+    <% if @storage_volume[:type] == "IscsiStorageVolume" %>
+      LUN:<br/>
+    <% elsif @storage_volume[:type] == "NfsStorageVolume" %>
+      Filename:<br/>
+    <% end %>
+    Size:<br/>
   </div>
+  <div class="selection_value">
+    <%=h @storage_volume.storage_pool.ip_addr %><br/>
+    <% if @storage_volume.storage_pool[:type] == "IscsiStoragePool" %>
+      <%=h @storage_volume.storage_pool.port %><br/>
+      <%=h @storage_volume.storage_pool[:target] %><br/>
+    <% elsif @storage_volume.storage_pool[:type] == "NfsStoragePool" %>
+      <%=h @storage_volume.storage_pool.export_path %><br/>
+    <% end %>
+    <%=h @storage_volume.storage_pool.get_type_label %><br/>
+    <%=h @storage_volume.path %><br/>
+    <% if @storage_volume[:type] == "IscsiStorageVolume" %>
+      <%=h @storage_volume.lun %><br/>
+    <% elsif @storage_volume[:type] == "NfsStorageVolume" %>
+      <%=h @storage_volume.filename %><br/>
+    <% end %>
+    <%=h @storage_volume.size_in_gb %> GB<br/>
+  </div>
+<% if @storage_volume.supports_lvm_subdivision %>
+  <div class="dialog_form">
+    <div class="form_heading">LVM Volumes</div>
+    <% if @storage_volume.lvm_storage_pool %>
+      <form id="lvm_storage_volumes_grid_form">
+        <table id="lvm_storage_volumes_grid" style="display:none"></table>
+      </form>
+    <% end %>
+  </div>
+<% end %>
 
-  </td>
-
-<%- content_for :title do -%>
-<%= _("Storage Volume") %>
-<%- end -%>
+<div class="facebox_timfooter">
+        <div class="button">
+          <div class="button_left_grey"></div>
+          <div class="button_middle_grey"><a href="#" onclick="jQuery(document).trigger('close.facebox')">Close</a></div>
+          <div class="button_right_grey"></div>
+        </div>
+</div>
+<script type="text/javascript">
+    $("#lvm_storage_volumes_grid").flexigrid
+    (
+    {
+    url: '<%=  url_for :action => "storage_volumes_json", :id => @storage_volume.lvm_storage_pool.id %>',
+    dataType: 'json',
+    colModel : [
+        <%= "{display: '', width : 20, align: 'left', process: lvm_storage_volumes_gridcheckbox}," if @can_modify %>
+        {display: 'Alias', width : 180, sortable : false, align: 'left'},
+        {display: 'Size (Gb)', name : 'size', width : 80, sortable : true, align: 'left'},
+        {display: 'Type', name : 'type', width : 80, sortable : true, align: 'left'}
+        ],
+    sortname: "size",
+    sortorder: "desc",
+    usepager: false,
+    useRp: true,
+    rp: 40,
+    showTableToggleBtn: true,
+    }
+    );
+    function lvm_storage_volumes_gridcheckbox(celDiv)
+    {
+        $(celDiv).html('<input class="grid_checkbox" type="checkbox" name="grid_checkbox'+$(celDiv).html()+'" value="'+$(celDiv).html()+'"/>');
+    }
+  function get_selected_lvm_volumes()
+  {
+    return get_selected_checkboxes("lvm_storage_volumes_grid_form");
+  }
+  function remove_lvm_volumes()
+  {
+    var volumes = get_selected_lvm_volumes();
+    if (validate_selected(volumes, "storage volume")) {
+      $.post('<%= url_for :controller => "storage", :action => "delete_volumes" %>',
+             { storage_volume_ids: volumes.toString() },
+              function(data,status){
+                $("#lvm_storage_volumes_grid").flexReload();
+		if (data.alert) {
+		  $.jGrowl(data.alert);
+                }
+               }, 'json');
+    }
+  }
+$('#new_lvm_volume_button').click(function(){
+		$('#window').fadeOut('fast');
+        $("#window").empty().load("<%= url_for :controller => 'storage', :action => 'new_lvm_volume' %>",
+	{ source_volume_id: <%=@storage_volume.id%>,
+          return_facebox: '<%= url_for :controller => 'storage', :action => 'show_volume', :id => @storage_volume.id %>' });
+		$('#window').fadeIn('fast');
+});
+</script>
-- 
1.5.5.1



From mmorsi at redhat.com  Fri Oct 31 01:27:35 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Thu, 30 Oct 2008 21:27:35 -0400
Subject: [Ovirt-devel] [PATCH server] network integration into ovirt server
	db and wui
Message-ID: <1225416455-7607-1-git-send-email-mmorsi@redhat.com>

---
 src/app/controllers/host_controller.rb             |   12 +-
 src/app/controllers/network_controller.rb          |  427 ++++++++++++++++++++
 src/app/helpers/application_helper.rb              |   28 +-
 src/app/helpers/network_helper.rb                  |    2 +
 src/app/models/bonding.rb                          |   27 +-
 src/app/models/ip_address.rb                       |   27 ++
 src/app/models/ip_v4_address.rb                    |   48 +++
 src/app/models/ip_v6_address.rb                    |   44 ++
 src/app/models/network.rb                          |   37 ++
 src/app/models/nic.rb                              |   16 +-
 src/app/models/physical_network.rb                 |   27 ++
 src/app/models/usage.rb                            |   21 +
 src/app/models/vlan.rb                             |   30 ++
 src/app/views/dashboard/index.html.erb             |    7 +
 src/app/views/host/edit_network.rhtml              |   85 ++++
 src/app/views/host/show.rhtml                      |    4 +
 src/app/views/network/_bonding_form.rhtml          |   46 +++
 src/app/views/network/_form.rhtml                  |   31 ++
 src/app/views/network/_grid.rhtml                  |   37 ++
 src/app/views/network/_ip_address_form.rhtml       |   62 +++
 src/app/views/network/_ip_addresses_form.rhtml     |   50 +++
 src/app/views/network/_select.rhtml                |   32 ++
 src/app/views/network/edit.rhtml                   |   34 ++
 src/app/views/network/edit_bonding.rhtml           |   52 +++
 src/app/views/network/edit_ip_address.rhtml        |   66 +++
 .../views/network/edit_network_ip_addresses.rhtml  |   13 +
 src/app/views/network/edit_nic.rhtml               |   62 +++
 src/app/views/network/list.html.erb                |   72 ++++
 src/app/views/network/new.rhtml                    |   28 ++
 src/app/views/network/new_bonding.rhtml            |   32 ++
 src/app/views/network/new_ip_address.rhtml         |   33 ++
 src/app/views/network/show.rhtml                   |   30 ++
 src/app/views/nic/_list.rhtml                      |    2 -
 src/db/migrate/028_refactor_networking_model.rb    |  271 +++++++++++++
 src/public/javascripts/ovirt.js                    |   29 ++-
 src/public/stylesheets/components.css              |   50 +++-
 36 files changed, 1849 insertions(+), 25 deletions(-)
 create mode 100644 src/app/controllers/network_controller.rb
 create mode 100644 src/app/helpers/network_helper.rb
 create mode 100644 src/app/models/ip_address.rb
 create mode 100644 src/app/models/ip_v4_address.rb
 create mode 100644 src/app/models/ip_v6_address.rb
 create mode 100644 src/app/models/network.rb
 create mode 100644 src/app/models/physical_network.rb
 create mode 100644 src/app/models/usage.rb
 create mode 100644 src/app/models/vlan.rb
 create mode 100644 src/app/views/host/edit_network.rhtml
 create mode 100644 src/app/views/network/_bonding_form.rhtml
 create mode 100644 src/app/views/network/_form.rhtml
 create mode 100644 src/app/views/network/_grid.rhtml
 create mode 100644 src/app/views/network/_ip_address_form.rhtml
 create mode 100644 src/app/views/network/_ip_addresses_form.rhtml
 create mode 100644 src/app/views/network/_select.rhtml
 create mode 100644 src/app/views/network/edit.rhtml
 create mode 100644 src/app/views/network/edit_bonding.rhtml
 create mode 100644 src/app/views/network/edit_ip_address.rhtml
 create mode 100644 src/app/views/network/edit_network_ip_addresses.rhtml
 create mode 100644 src/app/views/network/edit_nic.rhtml
 create mode 100644 src/app/views/network/list.html.erb
 create mode 100644 src/app/views/network/new.rhtml
 create mode 100644 src/app/views/network/new_bonding.rhtml
 create mode 100644 src/app/views/network/new_ip_address.rhtml
 create mode 100644 src/app/views/network/show.rhtml
 create mode 100644 src/db/migrate/028_refactor_networking_model.rb

diff --git a/src/app/controllers/host_controller.rb b/src/app/controllers/host_controller.rb
index a40d297..120fe2a 100644
--- a/src/app/controllers/host_controller.rb
+++ b/src/app/controllers/host_controller.rb
@@ -30,7 +30,7 @@ class HostController < ApplicationController
     end
   end
 
-  before_filter :pre_action, :only => [:host_action, :enable, :disable, :clear_vms]
+  before_filter :pre_action, :only => [:host_action, :enable, :disable, :clear_vms, :edit_network]
 
   # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
   verify :method => [:post, :put], :only => [ :create, :update ],
@@ -156,6 +156,16 @@ class HostController < ApplicationController
     render :json => @json_hash
   end
 
+  def edit_network
+    render :layout => 'popup'
+  end
+
+  def bondings_json
+    bondings = Host.find(params[:id]).bondings
+    bondings_json = []
+    bondings.each{ |x| bondings_json.push({:id => x.id, :name => x.name}) }
+    render :json => bondings_json
+  end
 
   private
   #filter methods
diff --git a/src/app/controllers/network_controller.rb b/src/app/controllers/network_controller.rb
new file mode 100644
index 0000000..b7f8b6d
--- /dev/null
+++ b/src/app/controllers/network_controller.rb
@@ -0,0 +1,427 @@
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Mohammed Morsi <mmorsi at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+#
+
+class NetworkController < ApplicationController
+   ########################## Networks related actions
+
+   def network_permissions
+     # 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
+   end
+
+   def list
+      @networks = Network.find(:all)
+      network_permissions
+   end
+
+   def networks_json
+      json_list(Network.find(:all), [:id, :name, :type, [:boot_type, :label]])
+   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 }
+    end
+   end
+
+   def new
+    @boot_types = BootType.find(:all)
+    render :layout => 'popup'
+   end
+
+   def create
+    begin
+     @network = PhysicalNetwork.new(params[:network]) if params[:network][:type] == 'PhysicalNetwork'
+     @network = Vlan.new(params[:network]) if params[:network][:type] == 'Vlan'
+     @network.save!
+     alert = "Network was successfully created."
+     render :json => { :object => "network", :success => true,
+                       :alert => alert  }
+    rescue
+     render :json => { :object => "network", :success => false,
+                        :errors =>
+                        @network.errors.localize_error_messages.to_a }
+    end
+   end
+
+   def edit
+    @network = Network.find(params[:id])
+    @boot_types = BootType.find(:all)
+    render :layout => 'popup'
+   end
+
+   def update
+    begin
+     @network = Network.find(params[:id])
+
+     # special case if we are switching types
+     if @network.type != params[:network][:type]
+       if ! @network.conversion_valid?
+        render :json => { :object => "network", :success => false,
+                          :alert =>
+         'Can not change type of network with associated nics/bondings'}
+        return
+       end
+
+       if params[:network][:type] == 'PhysicalNetwork'
+          Vlan.destroy(params[:id])
+          @network = PhysicalNetwork.create(params[:network])
+       else
+          PhysicalNetwork.destroy(params[:id])
+          @network = Vlan.create(params[:network])
+       end
+     else
+       @network = PhysicalNetwork.find(params[:id]) if @network.type == 'PhysicalNetwork'
+       @network = Vlan.find(params[:id]) if @network.type == 'Vlan'
+       @network.update_attributes!(params[:network])
+     end
+
+     alert = "Network was successfully updated."
+     render :json => { :object => "network", :success => true,
+                       :alert => alert  }
+    rescue Exception => e
+     render :json => { :object => "network", :success => false,
+                        :errors =>
+                        @network.errors.localize_error_messages.to_a }
+    end
+   end
+
+   def delete
+     failed_networks = []
+     networks_ids_str = params[:network_ids]
+     network_ids = networks_ids_str.split(",").collect {|x| x.to_i}
+     network_ids.each{ |x|
+       network = Network.find(x)
+       if network.conversion_valid?
+         begin
+            Network.destroy(x)
+         rescue
+           failed_networks.push x
+         end
+       else
+         failed_networks.push x
+       end
+     }
+     if failed_networks.size == 0
+      render :json => { :object => "network",
+                        :success => true,
+                        :alert => "Successfully deleted networks" }
+     else
+      render :json => { :object => "network",
+                        :success => false,
+                        :alert => "Failed deleting " +
+                                  failed_networks.size.to_s +
+                             " networks due to existing bondings/nics" }
+     end
+   end
+
+   def edit_network_ip_addresses
+    @network = Network.find(params[:id])
+    render :layout => 'popup'
+   end
+
+
+   ########################## Ip Address related actions
+
+   def ip_addresses_json
+    @parent_type = params[:parent_type]
+    if @parent_type == 'network'
+      ip_addresses = Network.find(params[:id]).ip_addresses
+    elsif @parent_type == 'nic'
+      ip_addresses = Nic.find(params[:id]).ip_addresses
+    elsif @parent_type == 'bonding' and params[:id]
+      ip_addresses = Bonding.find(params[:id]).ip_addresses
+    else
+      ip_addresses = []
+    end
+
+    ip_addresses_json = []
+    ip_addresses.each{ |x|
+          ip_addresses_json.push({:id => x.id, :name => x.address}) }
+    render :json => ip_addresses_json
+   end
+
+   def new_ip_address
+    @parent_type = params[:parent_type]
+    @network = Network.find(params[:id]) if @parent_type == 'network'
+    @nic = Nic.find(params[:id]) if @parent_type == 'nic'
+    @bonding = Bonding.find(params[:id]) if @parent_type == 'bonding' and params[:id]
+
+    render :layout => false
+   end
+
+  def _create_ip_address
+    if params[:ip_address][:type] == "IpV4Address"
+      @ip_address = IpV4Address.new(params[:ip_address])
+    else
+      @ip_address = IpV6Address.new(params[:ip_address])
+    end
+    @ip_address.save!
+  end
+
+  def create_ip_address
+   begin
+    _create_ip_address
+    alert = "Ip Address was successfully created."
+    render :json => { :object => "ip_address", :success => true,
+                      :alert => alert  }
+   rescue
+    render :json => { :object => "ip_address", :success => false,
+                      :errors =>
+                        @ip_address.errors.localize_error_messages.to_a }
+    end
+   end
+
+   def edit_ip_address
+    @ip_address = IpAddress.find(params[:id])
+
+    @parent_type = params[:parent_type]
+    @network = @ip_address.network if @ip_address.network_id
+    @nic = @ip_address.nic if @ip_address.nic_id
+    @bonding = @ip_address.bonding if @ip_address.bonding_id
+
+    render :layout => false
+   end
+
+   def _update_ip_address(id)
+     @ip_address = IpAddress.find(id)
+
+     # special case if we are switching types
+     if @ip_address.type != params[:ip_address][:type]
+       if params[:ip_address][:type] == 'IpV4Address'
+          @ip_address = IpV4Address.new(params[:ip_address])
+          @ip_address.save!
+          IpV6Address.delete(id)
+       else
+          @ip_address = IpV6Address.new(params[:ip_address])
+          @ip_address.save!
+          IpV4Address.delete(id)
+       end
+     else
+       if @ip_address.type == 'IpV4Address'
+          @ip_address = IpV4Address.find(id)
+       else
+          @ip_address = IpV6Address.find(id)
+       end
+       @ip_address.update_attributes!(params[:ip_address])
+     end
+
+   end
+
+   def update_ip_address
+    begin
+     _update_ip_address(params[:id])
+     alert = "IpAddress was successfully updated."
+     render :json => { :object => "network", :success => true,
+                       :alert => alert  }
+    rescue
+     render :json => { :object => "ip_address", :success => false,
+                        :errors =>
+                        @ip_address.errors.localize_error_messages.to_a }
+    end
+   end
+
+   def destroy_ip_address
+    begin
+     IpAddress.delete(params[:id])
+     alert = "Ip Address was successfully deleted."
+     render :json => { :object => "ip_address", :success => true,
+                       :alert => alert  }
+    rescue
+     render :json => { :object => "ip_address", :success => false,
+                      :alert => 'Ip Address Deletion Failed' }
+     end
+   end
+
+
+   ########################## NICs related actions
+
+   def edit_nic
+     @nic = Nic.find(params[:id])
+     @network = @nic.physical_network
+
+     @networks = PhysicalNetwork.find(:all)
+     network_options
+
+     render :layout => false
+   end
+
+   def update_nic
+    begin
+     network_options
+     @network = Network.find(params[:nic][:physical_network_id])
+
+     if @network.boot_type.id == @static_boot_type.id
+       if params[:ip_address][:id] == "New"
+         _create_ip_address
+       elsif params[:ip_address][:id] != ""
+         _update_ip_address(params[:ip_address][:id])
+       end
+     end
+
+     @nic = Nic.find(params[:id])
+     @nic.update_attributes!(params[:nic])
+
+     alert = "Nic was successfully updated."
+     render :json => { :object => "nic", :success => true,
+                       :alert => alert  }
+    rescue Exception => e
+     if @ip_address and @ip_address.errors.size != 0
+        render :json => { :object => "ip_address", :success => false,
+                          :errors =>
+                            @ip_address.errors.localize_error_messages.to_a}
+     else
+        render :json => { :object => "nic", :success => false,
+                          :errors =>
+                          @nic.errors.localize_error_messages.to_a }
+     end
+    end
+   end
+
+   ########################## Bonding related actions
+
+   def new_bonding
+     unless params[:host_id]
+      flash[:notice] = "Host is required."
+      redirect_to :controller => 'dashboard'
+    end
+
+    @host = Host.find(params[:host_id])
+    @networks = Vlan.find(:all)
+    network_options
+
+    render :layout => false
+   end
+
+   def create_bonding
+    begin
+     network_options
+     @network = Network.find(params[:bonding][:vlan_id])
+
+     if @network.boot_type.id == @static_boot_type.id
+       if params[:ip_address][:id] == "New"
+         _create_ip_address
+       elsif params[:ip_address][:id] != ""
+         _update_ip_address(params[:ip_address][:id])
+       end
+     end
+
+    @bonding = Bonding.new(params[:bonding])
+    @bonding.save!
+
+    if @ip_address
+       @ip_address.bonding_id = @bonding.id
+       @ip_address.save!
+    end
+
+     alert = "Bonding was successfully created."
+     render :json => { :object => "bonding", :success => true,
+                       :alert => alert  }
+    rescue
+     if @ip_address and @ip_address.errors.size != 0
+        render :json => { :object => "ip_address", :success => false,
+                          :errors =>
+                            @ip_address.errors.localize_error_messages.to_a}
+     else
+        render :json => { :object => "bonding", :success => false,
+                          :errors =>
+                          @bonding.errors.localize_error_messages.to_a }
+     end
+    end
+   end
+
+   def edit_bonding
+     @bonding = Bonding.find(params[:id])
+     @network = @bonding.vlan
+
+     @host = @bonding.host
+     @networks = Vlan.find(:all)
+     network_options
+
+     render :layout => false
+   end
+
+   def update_bonding
+    begin
+     network_options
+     @network = Network.find(params[:bonding][:vlan_id])
+
+     if @network.boot_type.id == @static_boot_type.id
+       if params[:ip_address][:id] == "New"
+         _create_ip_address
+       elsif params[:ip_address][:id] != ""
+         _update_ip_address(params[:ip_address][:id])
+       end
+     end
+
+     @bonding = Bonding.find(params[:id])
+     @bonding.nics.each { |nic| @bonding.nics.delete(nic) }
+     @bonding.update_attributes!(params[:bonding])
+
+     alert = "Bonding was successfully updated."
+     render :json => { :object => "bonding", :success => true,
+                       :alert => alert  }
+    rescue
+     if @ip_address and @ip_address.errors.size != 0
+        render :json => { :object => "ip_address", :success => false,
+                          :errors =>
+                            @ip_address.errors.localize_error_messages.to_a}
+     else
+        render :json => { :object => "bonding", :success => false,
+                          :errors =>
+                          @bonding.errors.localize_error_messages.to_a }
+     end
+    end
+   end
+
+   def destroy_bonding
+    begin
+     Bonding.destroy(params[:id])
+     alert = "Bonding was successfully deleted."
+     render :json => { :object => "bonding", :success => true,
+                       :alert => alert  }
+    rescue
+     render :json => { :object => "bonding", :success => false,
+                      :alert => 'Bonding Deletion Failed' }
+     end
+
+   end
+
+
+   ########################## Misc methods
+
+  protected
+   def network_options
+    @bonding_types = BondingType.find(:all)
+    @static_boot_type = BootType.find(:first,
+                                 :conditions => { :proto => 'static' })
+   end
+
+end
diff --git a/src/app/helpers/application_helper.rb b/src/app/helpers/application_helper.rb
index d7b6628..0178ad0 100644
--- a/src/app/helpers/application_helper.rb
+++ b/src/app/helpers/application_helper.rb
@@ -84,21 +84,31 @@ module ApplicationHelper
      }
   end
 
-  def popup_footer(action, label)
-    %{ 
-      <div style="background: url(#{image_path "fb_footer.jpg"}) repeat-x; height: 37px; text-align:right; padding: 9px 9px 0 0;">
+  # expects hash of labels => actions
+  def multi_button_popup_footer(buttons = {})
+      buttons_html = ""
+      buttons.each{ |label, action|
+       buttons_html+="<div class=\"button\">" +
+                     " <div class=\"button_left_blue\"></div>" +
+                     " <div class=\"button_middle_blue\"><a href=\"#\" onclick=\"#{action}\">#{label}</a></div>" +
+                     " <div class=\"button_right_blue\"></div>" +
+                     "</div>"
+      }
+
+   %{
+      <div style="background: url(#{image_path "fb_footer.jpg"}) repeat-x; height: 37px; text-align:right; padding: 9px 9px 0 0; float: left; width: 97%;">
         <div class="button">
           <div class="button_left_grey"></div>
           <div class="button_middle_grey"><a href="#" onclick="$(document).trigger('close.facebox')">Cancel</a></div>
           <div class="button_right_grey"></div>
         </div>
-        <div class="button">
-          <div class="button_left_blue"></div>
-          <div class="button_middle_blue"><a href="#" onclick="#{action}">#{label}</a></div>
-          <div class="button_right_blue"></div>
-        </div> 
+        #{buttons_html}
       </div>
-     }
+    }
+  end
+
+  def popup_footer(action, label)
+    multi_button_popup_footer({label => action})
   end
 
   def ok_footer
diff --git a/src/app/helpers/network_helper.rb b/src/app/helpers/network_helper.rb
new file mode 100644
index 0000000..ebbce0b
--- /dev/null
+++ b/src/app/helpers/network_helper.rb
@@ -0,0 +1,2 @@
+module NetworkHelper
+end
diff --git a/src/app/models/bonding.rb b/src/app/models/bonding.rb
index 006c261..a3ad150 100644
--- a/src/app/models/bonding.rb
+++ b/src/app/models/bonding.rb
@@ -30,6 +30,16 @@
 # interface. They can be ignored if not used.
 #
 class Bonding < ActiveRecord::Base
+  belongs_to :host
+  belongs_to :bonding_type
+  belongs_to :vlan
+  has_many :ip_addresses, :dependent => :destroy
+
+  has_and_belongs_to_many :nics,
+    :join_table  => 'bondings_nics',
+    :foreign_key => :bonding_id
+
+
   validates_presence_of :name,
     :message => 'A name is required.'
 
@@ -42,18 +52,17 @@ class Bonding < ActiveRecord::Base
   validates_presence_of :interface_name,
     :message => 'An interface name is required.'
 
-  validates_presence_of :boot_type_id,
-    :message => 'A boot type must be specified.'
-
   validates_presence_of :bonding_type_id,
     :message => 'A bonding type must be specified.'
 
-  belongs_to :host
-  belongs_to :bonding_type
-  belongs_to :boot_type
+ protected
+  def validate
+    errors.add("name", "must be specified") unless name
+    errors.add("interface_name", "must be specified") unless interface_name
+    errors.add("bonding_type_id", "must be specified") unless bonding_type_id
+    errors.add("host_id", "must be specified") unless host_id
+    errors.add("vlan_id", "must be specified") unless vlan_id
+  end
 
-  has_and_belongs_to_many :nics,
-    :join_table  => 'bondings_nics',
-    :foreign_key => :bonding_id
 
 end
diff --git a/src/app/models/ip_address.rb b/src/app/models/ip_address.rb
new file mode 100644
index 0000000..5d2e6af
--- /dev/null
+++ b/src/app/models/ip_address.rb
@@ -0,0 +1,27 @@
+# ip_address.rb
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+# +IpAddress+ is the base class for all address related classes.
+#
+class IpAddress < ActiveRecord::Base
+   # one of these 3 will apply for each address
+   belongs_to :network
+   belongs_to :nic
+   belongs_to :bonding
+end
diff --git a/src/app/models/ip_v4_address.rb b/src/app/models/ip_v4_address.rb
new file mode 100644
index 0000000..40e8cf9
--- /dev/null
+++ b/src/app/models/ip_v4_address.rb
@@ -0,0 +1,48 @@
+# ip_v4_address.rb
+#
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>,
+#            Mohammed Morsi   <mmorsi at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+# +IpV4Address+ represents a single IPv4 address.
+#
+class IpV4Address < IpAddress
+  ADDRESS_TEST = %r{^(\d{1,3}\.){3}\d{1,3}$}
+
+  validates_presence_of :address,
+    :message => 'An address must be supplied.'
+  validates_format_of :address,
+    :with => ADDRESS_TEST
+
+  protected
+   def validate
+    unless address and address =~ ADDRESS_TEST
+      errors.add("address", "is of incorrect format")
+    end
+    unless !netmask or netmask == "" or netmask =~ ADDRESS_TEST
+      errors.add("netmask", "is of incorrect format")
+    end
+    unless !gateway or gateway == "" or gateway =~ ADDRESS_TEST
+      errors.add("gateway", "is of incorrect format")
+    end
+    unless !broadcast or broadcast == "" or broadcast =~ ADDRESS_TEST
+      errors.add("broadcast", "is of incorrect format")
+    end
+   end
+
+end
diff --git a/src/app/models/ip_v6_address.rb b/src/app/models/ip_v6_address.rb
new file mode 100644
index 0000000..9720179
--- /dev/null
+++ b/src/app/models/ip_v6_address.rb
@@ -0,0 +1,44 @@
+# ip_v6_address.rb
+#
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>,
+#            Mohammed Morsi   <mmorsi at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+# +IpV6Address+ represents a single IPv6 address.
+#
+class IpV6Address < IpAddress
+  ADDRESS_TEST = %r{^([0-9a-fA-F]{0,4}|0)(\:([0-9a-fA-F]{0,4}|0)){7}$}
+
+  validates_presence_of :address,
+    :message => 'An address must be provided.'
+  validates_format_of :address,
+    :with => ADDRESS_TEST
+
+  protected
+   def validate
+    unless address =~ ADDRESS_TEST
+      errors.add("address", "is of incorrect format")
+    end
+    unless !prefix or prefix == "" or prefix =~ ADDRESS_TEST
+      errors.add("prefix", "is of incorrect format")
+    end
+    unless !gateway or gateway == "" or gateway =~ ADDRESS_TEST
+      errors.add("gateway", "is of incorrect format")
+    end
+   end
+end
diff --git a/src/app/models/network.rb b/src/app/models/network.rb
new file mode 100644
index 0000000..99e1a94
--- /dev/null
+++ b/src/app/models/network.rb
@@ -0,0 +1,37 @@
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Mohammed Morsi <mmorsi at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+class Network < ActiveRecord::Base
+  belongs_to :boot_type
+  has_many :ip_addresses, :dependent => :destroy
+
+  has_and_belongs_to_many :usages, :join_table => 'networks_usages'
+
+  validates_presence_of :type
+  validates_presence_of :name
+  validates_presence_of :boot_type_id
+
+  def conversion_valid?
+    return false if type.to_s == 'Vlan' &&
+                     Vlan.find(id).bondings.size != 0 ||
+                    type.to_s == 'PhysicalNetwork' &&
+                     PhysicalNetwork.find(id).nics.size != 0
+    return true
+  end
+
+end
diff --git a/src/app/models/nic.rb b/src/app/models/nic.rb
index baf7095..25d3ac2 100644
--- a/src/app/models/nic.rb
+++ b/src/app/models/nic.rb
@@ -19,7 +19,19 @@
 
 class Nic < ActiveRecord::Base
   belongs_to :host
-  belongs_to :boot_type
+  belongs_to :physical_network
+  has_many :ip_addresses, :dependent => :destroy
 
-  has_and_belongs_to_many :bonding, :join_table => 'bondings_nics'
+  has_and_belongs_to_many :bondings, :join_table => 'bondings_nics'
+
+  protected
+   def validate
+     errors.add("host_id", "must be specified") unless host_id
+     errors.add("physical_network_id", "must be specified") unless physical_network_id
+     if physical_network.boot_type.id ==
+         BootType.find(:first, :conditions => { :proto => 'static' }).id and
+          ip_addresses.size == 0
+           errors.add("ip_address_id", "must be specified")
+     end
+   end
 end
diff --git a/src/app/models/physical_network.rb b/src/app/models/physical_network.rb
new file mode 100644
index 0000000..cba696a
--- /dev/null
+++ b/src/app/models/physical_network.rb
@@ -0,0 +1,27 @@
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Mohammed Morsi <mmorsi at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+class PhysicalNetwork < Network
+   has_many :nics
+
+ protected
+  def validate
+    errors.add("name", "must be specified") unless name
+    errors.add("boot_type_id", "must be specified") unless boot_type_id
+  end
+end
diff --git a/src/app/models/usage.rb b/src/app/models/usage.rb
new file mode 100644
index 0000000..353e8f4
--- /dev/null
+++ b/src/app/models/usage.rb
@@ -0,0 +1,21 @@
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Mohammed Morsi <mmorsi at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+class Usage < ActiveRecord::Base
+  has_and_belongs_to_many :networks, :join_table => 'networks_usages'
+end
diff --git a/src/app/models/vlan.rb b/src/app/models/vlan.rb
new file mode 100644
index 0000000..2b96502
--- /dev/null
+++ b/src/app/models/vlan.rb
@@ -0,0 +1,30 @@
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Mohammed Morsi <mmorsi at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+class Vlan < Network
+   has_many :bondings
+
+  validates_presence_of :number
+
+ protected
+  def validate
+    errors.add("name", "must be specified") unless name
+    errors.add("number", "must be specified") unless number
+    errors.add("boot_type_id", "must be specified") unless boot_type_id
+  end
+end
diff --git a/src/app/views/dashboard/index.html.erb b/src/app/views/dashboard/index.html.erb
index 92cb4da..8815ebc 100644
--- a/src/app/views/dashboard/index.html.erb
+++ b/src/app/views/dashboard/index.html.erb
@@ -13,6 +13,13 @@
             </table>
           </div>
 
+         <% if @can_modify %>
+          <h3>Networks</h3>
+          <a href="<%= url_for :controller => 'network', :action => 'list' %>">
+             View / Edit
+          </a>
+         <% end %>
+
           </div> <!-- end #tools -->
   </td>
 
diff --git a/src/app/views/host/edit_network.rhtml b/src/app/views/host/edit_network.rhtml
new file mode 100644
index 0000000..7ec3180
--- /dev/null
+++ b/src/app/views/host/edit_network.rhtml
@@ -0,0 +1,85 @@
+<%- content_for :title do -%>
+  Edit <%= @host.hostname %> Network Devices
+<%- end -%>
+
+<%- content_for :description do -%>
+  Select and edit nics and bonded interfaces on <%= @host.hostname %>
+<%- end -%>
+
+<div id="select-host-nic" class="popup-content-selection">
+<%= select_with_label "NICs", "nic", "id",
+        @host.nics.
+          collect{ |nic| [nic.mac, nic.id] }.
+          insert(0, "") %>
+</div>
+
+<div id="select-host-bonding" class="popup-content-selection">
+<%= select_with_label "Bonded Interfaces", "bonding", "id", [] %>
+</div>
+
+<div style="clear: both;"></div>
+
+<div id="selected_nic_bonding" class="selected_popup_content"></div>
+
+<div id="host_network_footer" class="popup-content-footer">
+  <%= ok_footer %>
+</div>
+
+<script type="text/javascript">
+function reset_nics_bonding_detail(){
+   var data='Select NIC or Bonded Interface<br/>';
+
+   $("#selected_nic_bonding").html(data);
+   $("#host_network_footer").show();
+};
+
+reset_nics_bonding_detail(); // run it once for inital content
+
+function reset_nics_select(){
+  $("#nic_id option:first").attr("selected", true);
+};
+
+function reset_bonding_select(){
+  // incase of new additions / deletions, repopulate select box
+  $.getJSON(
+     "<%= url_for :action => 'bondings_json', :id => @host.id %>",
+      {},
+      function(j){
+        var options = "<option value=''></option>" +
+                      "<option value='New'>New</option>";
+        for(var i = 0; i < j.length; i++){
+          options += '<option value="' + j[i].id + '">' + j[i].name +
+                     '</option>';
+        }
+        $("#bonding_id").html(options);
+      });
+
+  $("#bonding_id option:first").attr("selected", true);
+};
+
+reset_bonding_select(); // run it once for initial content
+
+$("#nic_id").change(function () {
+  reset_bonding_select();
+  if($('#nic_id').val() != ""){
+    $("#selected_nic_bonding").load("<%= url_for :controller => 'network',
+        :action => 'edit_nic'%>/" + $('#nic_id').val());
+    $("#host_network_footer").hide();
+  }else{
+     reset_nics_bonding_detail();
+  }
+});
+
+$("#bonding_id").change(function () {
+  reset_nics_select();
+  if($('#bonding_id').val() == "New"){
+      $("#selected_nic_bonding").load("<%= url_for :controller => 'network', :action => 'new_bonding', :host_id => @host.id %>");
+    $("#host_network_footer").hide();
+  }else if($('#bonding_id').val() != ""){
+      $("#selected_nic_bonding").load("<%= url_for :controller => 'network', :action => 'edit_bonding'%>/" + $('#bonding_id').val());
+    $("#host_network_footer").hide();
+  }else{
+     reset_nics_bonding_detail();
+  }
+});
+</script>
diff --git a/src/app/views/host/show.rhtml b/src/app/views/host/show.rhtml
index d1b05ad..bc39a62 100644
--- a/src/app/views/host/show.rhtml
+++ b/src/app/views/host/show.rhtml
@@ -17,6 +17,10 @@
         <%= image_tag "icon_x.png" %> Clear VMs
       </a> 
     <% end -%>
+    <%= link_to image_tag("icon_edit.png") +"Edit Network",
+                 {:controller => 'host',
+                  :action => 'edit_network', :id => @host.id},
+                 :rel=>"facebox[.bolder]", :class=>"selection_facebox" %>
   <%- end -%>
 <%- end -%>
 <script type="text/javascript">
diff --git a/src/app/views/network/_bonding_form.rhtml b/src/app/views/network/_bonding_form.rhtml
new file mode 100644
index 0000000..4ec0df1
--- /dev/null
+++ b/src/app/views/network/_bonding_form.rhtml
@@ -0,0 +1,46 @@
+ <%= error_messages_for 'bonding' %>
+ <%= error_messages_for 'ip_address' %>
+
+<div id="selected_popup_content_expanded" class="dialog_form">
+  <%= hidden_field_tag 'bonding[host_id]', @host.id %>
+
+  <div class="selected_popup_content_left">Name</div>
+  <div class="selected_popup_content_right">
+    <%= text_field_with_label "", "bonding", "name" %>
+  </div>
+
+  <div class="selected_popup_content_left">Interface Name</div>
+  <div class="selected_popup_content_right">
+    <%= text_field_with_label "", "bonding", "interface_name" %>
+  </div>
+
+  <div class="selected_popup_content_left">Bonding Type</div>
+  <div class="selected_popup_content_right">
+      <%= select "bonding", "bonding_type_id",
+             @bonding_types.collect { |bt| [bt.label, bt.id ] } %>
+  </div>
+
+  <% if @host.nics.size != 0 %>
+    <div class="selected_popup_content_left">NICs</div>
+    <div class="selected_popup_content_right">
+       <select id="bonding_nic_ids" name="bonding[nic_ids][]" multiple="true">
+        <%= options_from_collection_for_select @host.nics, "id", "mac",
+                    @bonding ? @bonding.nics.collect{ |x| x.nic_id.to_i } : [] %>
+       </select>
+    </div>
+  <% end %>
+
+  <%= render :partial => 'select', :locals => { :target => 'bonding' } %>
+
+<div id="static_ip_options"
+ style="<% unless ((@network && @network.boot_type_id == @static_boot_type.id) ||
+                   (!@network && @networks.size > 0 &&
+                     @networks[0].boot_type_id == @static_boot_type.id)) %>
+          display: none;<%end %>">
+  <%= render :partial => 'ip_addresses_form',
+             :locals => { :parent_type => 'bonding',
+                          :parent_id => @bonding ? @bonding.id : nil } %>
+</div>
+
+
+</div>
diff --git a/src/app/views/network/_form.rhtml b/src/app/views/network/_form.rhtml
new file mode 100644
index 0000000..3f393f7
--- /dev/null
+++ b/src/app/views/network/_form.rhtml
@@ -0,0 +1,31 @@
+<%= error_messages_for 'network' %>
+
+<!--[form:network]-->
+<%= hidden_field 'network', 'id' if @create %>
+
+<%= text_field_with_label "Name:", "network", "name",
+                          {:style=>"width:250px;"}  %>
+
+<%= select_with_label "Boot Type:", 'network', 'boot_type_id',
+                      @boot_types.collect{ |bt| [bt.label, bt.id] },
+                      :style=>"width:250px;" %>
+
+<%= select_with_label "Type", "network", "type",
+           [[ "Physical Network", "PhysicalNetwork" ],
+            [ "VLAN", "Vlan" ] ]  %>
+
+<div id="vlan_options" style="display: none;">
+<%= text_field_with_label "Number:", "network", "number",
+                          {:style=>"width:250px;"}  %>
+</div>
+
+
+<script type="text/javascript">
+$("#network_type").change(function () {
+  if($('#network_type').val() == "Vlan"){
+    $("#vlan_options").show();
+  }else{
+    $("#vlan_options").hide();
+  }
+}).trigger('change');
+</script>
diff --git a/src/app/views/network/_grid.rhtml b/src/app/views/network/_grid.rhtml
new file mode 100644
index 0000000..6af0c05
--- /dev/null
+++ b/src/app/views/network/_grid.rhtml
@@ -0,0 +1,37 @@
+<% networks_per_page = 40 unless (defined? networks_per_page) and !(networks_per_page.nil?) %>
+<% usepager = @networks.size > networks_per_page %>
+
+<div id="<%= table_id %>_div">
+<form id="<%= table_id %>_form">
+<table id="<%= table_id %>" style="display:none"></table>
+</form>
+</div>
+<script type="text/javascript">
+    $("#<%= table_id %>").flexigrid
+    (
+    {
+    url: '<%=  url_for :action => "networks_json" %>',
+    dataType: 'json',
+    colModel : [
+        {display: '', width : 20, align: 'left', process: <%= table_id %>checkbox},
+        {display: 'Name', name: 'name', width : 180, align: 'left'},
+        {display: 'Type', name: 'type', width : 180, align: 'left'},
+        {display: 'Boot Type', name: 'boot_type', width : 180, align: 'left'}
+    ],
+    sortname: "name",
+    sortorder: "asc",
+    usepager: <%= usepager %>,
+    useRp: <%= usepager %>,
+    rp: <%= networks_per_page %>,
+    showTableToggleBtn: true,
+    onSelect: <%= on_select %>
+    }
+    );
+    function <%= table_id %>checkbox(celDiv)
+    {
+        $(celDiv).html('<input type="checkbox" name="grid_checkbox'+$(celDiv).html()+'" class="grid_checkbox" value="'+$(celDiv).html()+'"/>');
+    }
+
+</script>
+
+
diff --git a/src/app/views/network/_ip_address_form.rhtml b/src/app/views/network/_ip_address_form.rhtml
new file mode 100644
index 0000000..b952807
--- /dev/null
+++ b/src/app/views/network/_ip_address_form.rhtml
@@ -0,0 +1,62 @@
+<%= error_messages_for 'ip_address' %>
+
+<div id="selected_popup_content_expanded" class="dialog_form">
+ <%= hidden_field_tag 'parent_type', @parent_type%>
+ <%= hidden_field_tag 'ip_address[id]', @ip_address.id if @ip_address%>
+ <%= hidden_field_tag 'ip_address[network_id]', @network.id if @network %>
+ <%= hidden_field_tag 'ip_address[nic_id]', @nic.id if @nic %>
+ <%= hidden_field_tag 'ip_address[bonding_id]', @bonding.id if @bonding %>
+
+   <div class="selected_nic_bonding_left">Type:</div>
+   <div class="selected_nic_bonding_right">
+       <%= select_with_label "", "ip_address", "type",
+                          [[ "ipv4", "IpV4Address" ], [ "ipv6", "IpV6Address" ] ]  %>
+   </div>
+
+
+   <div class="static_ip_common_options">
+     <div class="selected_nic_bonding_left">IP Address</div>
+     <div class="selected_nic_bonding_right">
+       <%= text_field_with_label "", "ip_address", "address" %>
+     </div>
+   </div>
+
+   <div id="static_ip_v4_options">
+     <div class="selected_nic_bonding_left">Netmask</div>
+     <div class="selected_nic_bonding_right">
+        <%= text_field_with_label "", "ip_address", "netmask" %>
+     </div>
+
+     <div class="selected_nic_bonding_left">Broadcast</div>
+     <div class="selected_nic_bonding_right">
+         <%= text_field_with_label "", "ip_address", "broadcast" %>
+     </div>
+  </div>
+
+  <div id="static_ip_v6_options" style="display: none;">
+     <div class="selected_nic_bonding_left">Prefix</div>
+     <div class="selected_nic_bonding_right">
+         <%= text_field_with_label "", "ip_address", "prefix" %>
+     </div>
+  </div>
+
+  <div class="static_ip_common_options">
+     <div class="selected_nic_bonding_left">Gateway</div>
+     <div class="selected_nic_bonding_right">
+         <%= text_field_with_label "", "ip_address", "gateway" %>
+     </div>
+  </div>
+
+</div>
+
+<script type="text/javascript">
+  $("#ip_address_type").change(function () {
+    if($("#ip_address_type").val() == 'IpV4Address'){
+        $("#static_ip_v4_options").show();
+        $("#static_ip_v6_options").hide();
+    }else{
+        $("#static_ip_v4_options").hide();
+        $("#static_ip_v6_options").show();
+    }
+  }).trigger('change');
+</script>
diff --git a/src/app/views/network/_ip_addresses_form.rhtml b/src/app/views/network/_ip_addresses_form.rhtml
new file mode 100644
index 0000000..f833b2a
--- /dev/null
+++ b/src/app/views/network/_ip_addresses_form.rhtml
@@ -0,0 +1,50 @@
+<div id="select_ip_address" class="popup-content-selection">
+<%= select_with_label "IP Addresses", "ip_address", "id", [] %>
+</div>
+
+<div id="selected_ip_address" class="selected_popup_content"></div>
+
+<script type="text/javascript">
+function reset_selected_ip_address(){
+   var data='Select IP Address<br/>';
+
+   $("#selected_ip_address").html(data);
+   $("#ip_addresses_footer").show();
+};
+
+reset_selected_ip_address(); // run it once for inital content
+
+function reset_ip_address_select(){
+  // incase of new additions / deletions, repopulate select box
+  $.getJSON(
+     "<%= url_for :action => 'ip_addresses_json', :id => parent_id, :parent_type => parent_type %>",
+      {},
+      function(j){
+        var options = "<option value=''></option>" +
+                      "<option value='New'>New</option>";
+        for(var i = 0; i < j.length; i++){
+          options += '<option value="' + j[i].id + '">' + j[i].name +
+                     '</option>';
+        }
+        $("#ip_address_id").html(options);
+      });
+
+  $("#ip_address_id option:first").attr("selected", true);
+};
+
+reset_ip_address_select(); // run it once for initial content
+
+$("#ip_address_id").change(function () {
+  if($('#ip_address_id').val() == "New"){
+    $("#selected_ip_address").load("<%= url_for :action => 'new_ip_address', :id => parent_id, :parent_type => parent_type %>");
+    $("#ip_addresses_footer").hide();
+  }else if($('#ip_address_id').val() != ""){
+    $("#selected_ip_address").load("<%= url_for :action => 'edit_ip_address'%>/" + $('#ip_address_id').val() + "?parent_type=<%= parent_type %>");
+    $("#ip_addresses_footer").hide();
+  }else{
+     reset_selected_ip_address();
+  }
+});
+
+</script>
+
diff --git a/src/app/views/network/_select.rhtml b/src/app/views/network/_select.rhtml
new file mode 100644
index 0000000..e69d9b0
--- /dev/null
+++ b/src/app/views/network/_select.rhtml
@@ -0,0 +1,32 @@
+<% target = 'nic' unless target
+   network_id = 'physical_network_id' if target == 'nic'
+   network_id = 'vlan_id' if target == 'bonding'
+
+ %>
+
+<div class="selected_popup_content_left">Network:</div>
+<div class="selected_popup_content_right">
+    <%= select_with_label "", target, network_id,
+    @networks.collect { |n| [n.name + ' - ' + n.boot_type.label, n.id ] } %>
+
+</div>
+
+<script type="text/javascript">
+  var static_network_ids=<%= static_network_ids = '['
+    @networks.each { |n|
+     static_network_ids += ',' if static_network_ids != '['
+     static_network_ids += n.id.to_s if n.boot_type_id == @static_boot_type.id
+    }
+    static_network_ids += ']'
+    static_network_ids %>;
+
+  $("#<%=target %>_<%= network_id %>").change(function () {
+    $("#static_ip_options").hide();
+    for(i=0; i<static_network_ids.length; ++i){
+     if($("#<%= target %>_<%= network_id %>").val() == static_network_ids[i]){
+          $("#static_ip_options").show();
+          break;
+     }
+    };
+  });
+</script>
diff --git a/src/app/views/network/edit.rhtml b/src/app/views/network/edit.rhtml
new file mode 100644
index 0000000..6360b3f
--- /dev/null
+++ b/src/app/views/network/edit.rhtml
@@ -0,0 +1,34 @@
+<%- content_for :title do -%>
+  Edit Network
+<%- end -%>
+<%- content_for :description do -%>
+<%- end -%>
+
+  <!-- DIALOG  BODY -->
+  <form method="POST" action="<%= url_for :action => 'update' %>" id="network_form" >
+  <div class="dialog_form">
+    <%= hidden_field_tag 'id', @network.id %>
+    <%= render :partial => 'form', :locals => { :create => false }  %>
+  </div>
+  <!-- DIALOG  FOOTER -->
+  <%= popup_footer("$('#network_form').submit()", "Edit Network") %>
+  </form>
+
+<script type="text/javascript">
+$(function() {
+    var networkoptions = {
+        target:        '<%= url_for :action => 'update' %>',
+	dataType:      'json',
+        success: function(response, status) {
+           afterNetwork(response, status);
+           refresh_summary_static('networks_selection',
+            '<div class="selection_left"><div>Select a network.</div></div>');
+        }
+    };
+
+    // bind form using 'ajaxForm'
+    $('#network_form').ajaxForm(networkoptions);
+});
+</script>
+
+
diff --git a/src/app/views/network/edit_bonding.rhtml b/src/app/views/network/edit_bonding.rhtml
new file mode 100644
index 0000000..645e469
--- /dev/null
+++ b/src/app/views/network/edit_bonding.rhtml
@@ -0,0 +1,52 @@
+<form method="POST"
+      action="<%= url_for :action => 'update_bonding' %>" id="edit_bonding_form" >
+  <div id="selected_popup_content_header">
+      Editing Bonded Interface
+  </div>
+
+  <%= hidden_field_tag('id', @bonding.id) %>
+  <%= render :partial => 'bonding_form' %>
+
+</form>
+
+<form method="POST" action="<%= url_for :action => 'destroy_bonding' %>" id="delete_bonding_form" >
+  <%= hidden_field_tag('id', @bonding.id) %>
+</form>
+
+<%= multi_button_popup_footer({"Edit Bonding" =>
+                                 "$('#edit_bonding_form').submit()",
+                               "Delete Bonding" =>
+                                 "$('#delete_bonding_form').submit()"}) %>
+
+<script type="text/javascript">
+$(function() {
+    var edit_bonding_options = {
+        target:        '<%= url_for :action => 'update_bonding' %>',
+        dataType:      'json',
+        success:       function(response, status) {
+          ajax_validation(response, status);
+          if (response.success) {
+            reset_bonding_select();
+            reset_nics_bonding_detail();
+          }
+        }
+    };
+
+    var delete_bonding_options = {
+        target:        '<%= url_for :action => 'destroy_bonding' %>',
+        dataType:      'json',
+        success:       function(response, status) {
+          ajax_validation(response, status);
+          if (response.success) {
+            reset_bonding_select();
+            reset_nics_bonding_detail();
+          }
+        }
+    };
+
+    // bind forms using 'ajaxForm'
+    $('#edit_bonding_form').ajaxForm(edit_bonding_options);
+    $('#delete_bonding_form').ajaxForm(delete_bonding_options);
+
+});
+</script>
diff --git a/src/app/views/network/edit_ip_address.rhtml b/src/app/views/network/edit_ip_address.rhtml
new file mode 100644
index 0000000..5a3cc18
--- /dev/null
+++ b/src/app/views/network/edit_ip_address.rhtml
@@ -0,0 +1,66 @@
+<% if @parent_type == 'network' %>
+<form method="POST"
+      action="<%= url_for :action => 'update_ip_address' %>"
+      id="edit_ip_address_form" >
+<% end %>
+
+  <div id="selected_popup_content_header">
+      Editing IP Address
+  </div>
+
+  <% if @parent_type != 'network' %>
+     <a href="#" onClick="$('#delete_ip_address_form').submit()" style="color: blue;">Delete</a>
+  <% end %>
+
+  <%= hidden_field_tag('id', @ip_address.id) %>
+  <%= render :partial => 'ip_address_form' %>
+
+<% if @parent_type == 'network' %>
+</form>
+<% end %>
+
+<form method="POST"
+      action="<%= url_for :action => 'destroy_ip_address' %>"
+      id="delete_ip_address_form" >
+  <%= hidden_field_tag('id', @ip_address.id) %>
+</form>
+
+<% if @parent_type == 'network' %>
+<%= multi_button_popup_footer({" Edit IP Address" =>
+                                 "$('#edit_ip_address_form').submit()",
+                               "Delete IP Address" =>
+                                 "$('#delete_ip_address_form').submit()"}) %>
+<% end %>
+
+<script type="text/javascript">
+$(function() {
+    var edit_ip_address_options = {
+        target:        '<%= url_for :action => 'update_ip_address' %>',   // target element to update
+        dataType:      'json',
+        success:       function(response, status) {
+          ajax_validation(response, status);
+          if (response.success) {
+            reset_selected_ip_address();
+            reset_ip_address_select();
+          }
+        }
+    };
+
+    var delete_ip_address_options = {
+        target:        '<%= url_for :action => 'delete_ip_address' %>',   // target element to update
+        dataType:      'json',
+        success:       function(response, status) {
+          ajax_validation(response, status);
+          if (response.success) {
+            reset_selected_ip_address();
+            reset_ip_address_select();
+          }
+        }
+    };
+
+    // bind forms using 'ajaxForm'
+    $('#edit_ip_address_form').ajaxForm(edit_ip_address_options);
+    $('#delete_ip_address_form').ajaxForm(delete_ip_address_options);
+
+});
+</script>
diff --git a/src/app/views/network/edit_network_ip_addresses.rhtml b/src/app/views/network/edit_network_ip_addresses.rhtml
new file mode 100644
index 0000000..7a1e4cb
--- /dev/null
+++ b/src/app/views/network/edit_network_ip_addresses.rhtml
@@ -0,0 +1,13 @@
+<%- content_for :title do -%>
+  Edit Network IP Addresses
+<%- end -%>
+<%- content_for :description do -%>
+<%- end -%>
+
+<%= render :partial => 'ip_addresses_form',
+           :locals  => { :parent_type => 'network',
+                         :parent_id   =>  @network.id } %>
+
+<div id="ip_addresses_footer" class="popup-content-footer">
+  <%= ok_footer %>
+</div>
diff --git a/src/app/views/network/edit_nic.rhtml b/src/app/views/network/edit_nic.rhtml
new file mode 100644
index 0000000..75af6fb
--- /dev/null
+++ b/src/app/views/network/edit_nic.rhtml
@@ -0,0 +1,62 @@
+<form method="POST"
+      action="<%= url_for :action => 'update_nic' %>" id="nic_form" >
+ <div id="selected_popup_content_header">
+      Editing NIC
+ </div>
+
+ <%= error_messages_for 'nic' %>
+
+ <div id="selected_popup_content_expanded" class="dialog_form">
+  <%= hidden_field_tag 'id', @nic.id %>
+  <%= hidden_field_tag 'nic_host_id', @nic.host.id %>
+  <%= hidden_field_tag 'nic_network_id', @nic.physical_network.id %>
+
+  <div class="selected_popup_content_left">MAC:</div>
+  <div class="selected_popup_content_right"><%= @nic.mac %></div>
+
+  <% if @nic.host.bondings.size != 0 %>
+    <div class="selected_popup_content_left">Bonded Interfaces</div>
+    <div class="selected_popup_content_right">
+       <select id="nic_bonding_ids" name="nic[bonding_ids][]">
+         <option value="" />
+         <%= options_from_collection_for_select @nic.host.bondings,
+                           "id", "name",
+                           @nic.bondings.size > 0 ? @nic.bondings[0].bonding_id.to_i : "" %>
+       </select>
+    </div>
+  <% end %>
+
+
+  <%= render :partial => 'select' %>
+
+  <div id="static_ip_options"
+    style="<% if @network.boot_type_id != @static_boot_type.id %>
+            display: none;<%end %>">
+    <%= render :partial => 'ip_addresses_form',
+               :locals => { :parent_type => 'nic',
+                            :parent_id => @nic.id } %>
+  </div>
+
+
+ </div>
+ <%= popup_footer("$('#nic_form').submit()", "Edit NIC") %>
+</form>
+
+<script type="text/javascript">
+$(function() {
+    var nicoptions = {
+        target:        '<%= url_for :action => 'update_nic' %>',
+        dataType:      'json',
+        success:       function(response, status) {
+          ajax_validation(response, status);
+          if (response.success) {
+            reset_nics_select();
+            reset_nics_bonding_detail();
+          }
+        }
+    };
+
+    // bind form using 'ajaxForm'
+    $('#nic_form').ajaxForm(nicoptions);
+});
+</script>
diff --git a/src/app/views/network/list.html.erb b/src/app/views/network/list.html.erb
new file mode 100644
index 0000000..9a304cf
--- /dev/null
+++ b/src/app/views/network/list.html.erb
@@ -0,0 +1,72 @@
+<div id="toolbar_nav">
+<ul>
+    <li><a href="<%= url_for :action => 'new' %>" rel="facebox[.bolder]"><%= image_tag "icon_addstorage.png", :style => "vertical-align:middle;" %>&nbsp;&nbsp;Add Network</a></li>
+    <li>
+      <a href="#" onClick="delete_networks();" >
+        <%= image_tag "icon_remove.png", :style=>"vertical-align:middle;" %>
+            &nbsp;&nbsp;Remove
+       </a>
+    </li>
+  </ul>
+</div>
+
+<script type="text/javascript">
+  function delete_networks(){
+    var networks = get_selected_networks();
+    if (validate_selected(get_selected_networks(), 'networks')) {
+      $.post('<%= url_for :action => 'delete' %>',
+             { network_ids: networks.toString() },
+             function(data,status){
+                if (data.alert) {
+                  $.jGrowl(data.alert);
+                }
+               grid = $("#networks_grid");
+               if (grid.size()>0 && grid != null) {
+                  grid.flexReload();
+               }
+               empty_summary('networks_selection', 'Network');
+             }, 'json');
+    }
+  }
+
+  function networks_select(selected_rows)
+  {
+    var selected_ids = new Array();
+    for(i=0; i<selected_rows.length; i++) {
+      selected_ids[i] = selected_rows[i].id;
+    }
+    if (selected_ids.length == 1)
+    {
+      $('#networks_selection').load('<%= url_for :action => "show" %>',
+                { id: parseInt(selected_ids[0].substring(3))});
+    }
+  }
+
+</script>
+
+<div class="panel_header"></div>
+<% if @networks.size != 0 %>
+  <div class="data_section">
+       <%= render :partial => "grid", :locals => { :table_id => "networks_grid",
+                                                   :networks => @networks,
+                                                   :on_select => "networks_select"} %>
+  </div>
+
+  <div class="selection_detail" id="networks_selection">
+    <div class="selection_left">
+      <div>Select a network.</div>
+    </div>
+  </div>
+<% else %>
+   <div class="data_section">
+       <div class="no-grid-items">
+          <%= image_tag 'no-grid-items.png', :style => 'float: left;' %>
+
+          <div class="no-grid-items-text">
+            No networks found. <br/><br/>
+            <%= image_tag "icon_addhost.png", :style=>"vertical-align:middle;" %>&nbsp;&nbsp;
+            <a href="<%= url_for :action => 'new' %>" rel="facebox[.bolder]">Add first network</a>
+          </div>
+       </div>
+   </div>
+<% end %>
diff --git a/src/app/views/network/new.rhtml b/src/app/views/network/new.rhtml
new file mode 100644
index 0000000..15b7304
--- /dev/null
+++ b/src/app/views/network/new.rhtml
@@ -0,0 +1,28 @@
+<%- content_for :title do -%>
+  Add Network
+<%- end -%>
+<%- content_for :description do -%>
+<%- end -%>
+
+  <!-- DIALOG  BODY -->
+  <form method="POST" action="<%= url_for :action => 'create' %>" id="network_form" >
+  <div class="dialog_form">
+    <%= render :partial => 'form', :locals => { :create => true }  %>
+  </div>
+  <!-- DIALOG  FOOTER -->
+  <%= popup_footer("$('#network_form').submit()", "Add Network") %>
+  </form>
+
+<script type="text/javascript">
+$(function() {
+    var networkoptions = {
+        target:        '<%= url_for :action => 'create' %>',
+	dataType:      'json',
+        success:       afterNetwork  // post-submit callback
+    };
+
+    // bind form using 'ajaxForm'
+    $('#network_form').ajaxForm(networkoptions);
+});
+</script>
+
diff --git a/src/app/views/network/new_bonding.rhtml b/src/app/views/network/new_bonding.rhtml
new file mode 100644
index 0000000..9ee6994
--- /dev/null
+++ b/src/app/views/network/new_bonding.rhtml
@@ -0,0 +1,32 @@
+<form method="POST"
+      action="<%= url_for :action => 'create_bonding' %>" id="bonding_form" >
+
+  <div id="selected_popup_content_header">
+      Create Bonded Interface
+  </div>
+
+  <%= render :partial => 'bonding_form' %>
+</form>
+
+<%= multi_button_popup_footer({"Create Bonding" =>
+                                 "$('#bonding_form').submit()"}) %>
+
+<script type="text/javascript">
+$(function() {
+    var bonding_options = {
+        target:        '<%= url_for :action => 'create_bonding' %>',
+        dataType:      'json',
+        success:       function(response, status) {
+          ajax_validation(response, status);
+          if (response.success) {
+            reset_bonding_select();
+            reset_nics_bonding_detail();
+          }
+        }
+    };
+
+    // bind forms using 'ajaxForm'
+    $('#bonding_form').ajaxForm(bonding_options);
+
+});
+</script>
diff --git a/src/app/views/network/new_ip_address.rhtml b/src/app/views/network/new_ip_address.rhtml
new file mode 100644
index 0000000..6167a76
--- /dev/null
+++ b/src/app/views/network/new_ip_address.rhtml
@@ -0,0 +1,33 @@
+<% if @parent_type == 'network' %>
+<form method="POST"
+      action="<%= url_for :action => 'create_ip_address' %>"
+      id="ip_address_form" >
+<% end %>
+
+  <div id="selected_popup_content_header">
+      Create Ip Address
+  </div>
+
+  <%= render :partial => 'ip_address_form' %>
+
+<% if @parent_type == 'network' %>
+</form>
+<% end %>
+
+<% if @parent_type == 'network' %>
+<%= multi_button_popup_footer({"Create IP Address" =>
+                                 "$('#ip_address_form').submit()"}) %>
+<% end %>
+
+<script type="text/javascript">
+$(function() {
+    var ip_address_options = {
+        target:        '<%= url_for :action => 'create_ip_address' %>',
+        dataType:      'json',
+        success:       afterIpAddress
+    };
+
+    // bind forms using 'ajaxForm'
+    $('#ip_address_form').ajaxForm(ip_address_options);
+});
+</script>
diff --git a/src/app/views/network/show.rhtml b/src/app/views/network/show.rhtml
new file mode 100644
index 0000000..a56c41d
--- /dev/null
+++ b/src/app/views/network/show.rhtml
@@ -0,0 +1,30 @@
+<%- content_for :title do -%>
+  <%=h @network.name %>
+<%- end -%>
+
+<%- content_for :action_links do -%>
+  <%= link_to image_tag("icon_edit.png") + "Edit",
+        {:action => 'edit', :id => @network.id },
+         :rel=>"facebox[.bolder]", :class=>"selection_facebox" %>
+
+  <%= link_to image_tag("icon_edit.png") + "Edit IP Addresses",
+        {:action => 'edit_network_ip_addresses', :id => @network.id },
+         :rel=>"facebox[.bolder]", :class=>"selection_facebox" %>
+<%- end -%>
+
+<div id="hosts_selection_id" style="display:none"><%= @host.id %></div>
+<div class="selection_key">
+    Name:<br/>
+    Type:<br/>
+    Boot Type:<br/>
+    IP Addresses:<br/>
+</div>
+<div class="selection_value">
+    <%=h @network.name %><br/>
+    <%=h @network.type %><br/>
+    <%=h @network.boot_type.label %><br/>
+    <%=h @network.ip_addresses.size %><br/>
+</div>
+
+<%- content_for :right do -%>
+<%- end -%>
diff --git a/src/app/views/nic/_list.rhtml b/src/app/views/nic/_list.rhtml
index 07f7e44..eb3a4a7 100644
--- a/src/app/views/nic/_list.rhtml
+++ b/src/app/views/nic/_list.rhtml
@@ -1,7 +1,6 @@
 <table class='listing'>
   <thead>
   <tr>
-    <th class="empty">IP</th>
     <th>MAC</th>
     <th>Bridge</th>
     <th>Usage Type</th>
@@ -11,7 +10,6 @@
   </thead>
 <% for nic in nics %>
   <tr class="<%= cycle('odd','even', :name => nics) %>">
-    <td><%= link_to nic.ip_addr, { :controller => "nic", :action => 'show', :id => nic }, { :class => "show" } %></td>
     <td><%= nic.mac %></td>
     <td><%= nic.bridge %></td>
     <td><%= nic.usage_type %></td>
diff --git a/src/db/migrate/028_refactor_networking_model.rb b/src/db/migrate/028_refactor_networking_model.rb
new file mode 100644
index 0000000..946b976
--- /dev/null
+++ b/src/db/migrate/028_refactor_networking_model.rb
@@ -0,0 +1,271 @@
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Mohammed Morsi <mmorsi at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+# introduce networks and ip_addresses tables, refactor relationships
+class RefactorNetworkingModel < ActiveRecord::Migration
+  def self.up
+
+    ####################################################
+    # bugfix, bridge tables shouldn't have their own ids
+    remove_column :bondings_nics, :id
+
+    ##################################################################
+    # add networks, usages tables and networks_usage_types bridge
+    create_table :networks do |t|
+      t.string  :type, :null => false
+      t.string  :name, :null => false
+      t.integer :boot_type_id, :null => false
+
+      # attributes for Vlan (type=Vlan)
+      t.integer :number
+    end
+
+    create_table :usages do |t|
+      t.string :label, :null => false
+      t.string :usage, :null => false
+    end
+
+    create_table :networks_usages, :id => false do |t|
+      t.integer :network_id, :null => false
+      t.integer :usage_id, :null => false
+    end
+
+    add_index :networks_usages, [:network_id, :usage_id], :unique => true
+
+    # create usages
+    Usage.create(:label => 'Guest', :usage => 'guest')
+    Usage.create(:label => 'Management', :usage => 'management')
+    Usage.create(:label => 'Storage', :usage => 'storage')
+
+    # referential integrity for networks tables
+    execute "alter table networks add constraint
+             fk_network_boot_types
+             foreign key (boot_type_id) references
+             boot_types(id)"
+    execute "alter table networks_usages add constraint
+             fk_networks_usages_network_id
+             foreign key (network_id) references
+             networks(id)"
+    execute "alter table networks_usages add constraint
+             fk_networks_usages_usage_id
+             foreign key (usage_id) references
+             usages(id)"
+
+    # add foreign keys to nics / bondings table
+    add_column :nics, :physical_network_id, :integer
+    add_column :bondings, :vlan_id, :integer
+
+    # referential integrity for nic/bondings network ids
+    execute "alter table nics add constraint
+             fk_nic_networks
+             foreign key (physical_network_id) references
+             networks(id)"
+    execute "alter table bondings add constraint
+             fk_bonding_networks
+             foreign key (vlan_id) references
+             networks(id)"
+
+    ####################################################
+    # create ip_addresses table
+    create_table :ip_addresses do |t|
+      t.string :type
+
+      # foreign keys to associated entities
+      t.integer :nic_id
+      t.integer :bonding_id
+      t.integer :network_id
+
+      # common attributes
+      t.string :address,   :limit => 39, :null => false
+      t.string :gateway,   :limit => 39
+
+      # attributes for IPv4 (type=IpV4Address)
+      t.string :netmask,   :limit => 15
+      t.string :broadcast, :limit => 15
+
+      # attributes for IPv6 (type=IpV6Address)
+      t.string :prefix,    :limit => 39
+      t.timestamps
+    end
+
+    # referential integrity for ip_addresses table
+    execute "alter table ip_addresses add constraint
+             fk_nic_ip_addresses
+             foreign key (nic_id) references nics(id)"
+    execute "alter table ip_addresses add constraint
+             fk_bonding_ip_addresses
+             foreign key (bonding_id) references bondings(id)"
+    execute "alter table ip_addresses add constraint
+             fk_network_ip_addresses
+             foreign key (network_id) references networks(id)"
+
+    ###################################################################
+    static_boot_type_id =
+      BootType.find(:first,
+           :conditions => {:proto => 'static'} ).id
+
+    # migrate nic ip_addresses to networks / ip_addresses table
+    i = 0
+    Nic.find(:all).each do |nic|
+      if nic.boot_type_id == static_boot_type_id
+        IpV4Address.new(:nic_id    => nic.id,
+                        :address   => nic.ip_addr).save!
+
+      end
+      network = PhysicalNetwork.new(
+                            :name => 'Physical Network ' + i.to_s,
+                            :boot_type_id => nic.boot_type_id)
+      network.save!
+
+      ip_address = IpV4Address.new(:address   => nic.ip_addr ? nic.ip_addr : '0.0.0.0',
+                                   :netmask   => nic.netmask,
+                                   :broadcast => nic.broadcast,
+                                   :gateway   => nic.ip_addr)
+      ip_address.network = network
+      ip_address.save!
+
+      nic.physical_network = network
+      nic.save!
+
+      i += 1
+    end
+
+    # migrate bonding ip_addresses to networks / ip_addresses table
+    i = 0
+    Bonding.find(:all).each do |bonding|
+      if bonding.boot_type_id == static_boot_type_id
+        IpV4Address.new(:bonding_id => bonding.id,
+                        :address    => bonding.ip_addr).save!
+      end
+      network = Vlan.new(
+                     :name => 'VLAN ' + i.to_s,
+                     :number => i,
+                     :boot_type_id => bonding.boot_type_id)
+      network.save!
+
+      ip_address = IpV4Address.new(:address   => bonding.ip_addr ? bonding.ip_addr : '0.0.0.0',
+                                   :netmask   => bonding.netmask,
+                                   :broadcast => bonding.broadcast,
+                                   :gateway   => bonding.ip_addr)
+      ip_address.network = network
+      ip_address.save!
+
+      bonding.vlan = network
+      bonding.save!
+
+      i += 1
+    end
+
+    ##############################################################
+    # remove nics / bonding ip address and network related columns
+    remove_column :nics,     :ip_addr
+    remove_column :nics,     :netmask
+    remove_column :nics,     :broadcast
+    remove_column :nics,     :boot_type_id
+    remove_column :bondings, :ip_addr
+    remove_column :bondings, :netmask
+    remove_column :bondings, :broadcast
+    remove_column :bondings, :boot_type_id
+
+
+  end
+
+  def self.down
+    ##############################################################
+    # readd nics / bonding ip address related columns
+    add_column :nics,     :ip_addr,   :string, :limit => 16
+    add_column :nics,     :netmask,   :string, :limit => 16
+    add_column :nics,     :broadcast, :string, :limit => 16
+    add_column :nics,     :boot_type_id, :integer
+    add_column :bondings, :ip_addr,   :string, :limit => 16
+    add_column :bondings, :netmask,   :string, :limit => 16
+    add_column :bondings, :broadcast, :string, :limit => 16
+    add_column :bondings, :boot_type_id, :integer
+
+    execute "alter table nics add constraint
+             fk_nic_boot_types
+             foreign key (boot_type_id) references
+             boot_types(id)"
+    execute "alter table bondings add constraint
+             fk_bonding_boot_types
+             foreign key (boot_type_id) references
+             boot_types(id)"
+
+    ##############################################################
+    # attempt to migrate ip information back into nics table.
+    #  because a nic can have multiple ips (if statically
+    #  assigned) as well as its network, just use the 1st
+    #  found
+    Nic.find(:all).each do |nic|
+      if nic.physical_network.ip_addresses.size > 0
+        # use the 1st configured network ip
+        nic.ip_addr   = nic.physical_network.ip_addresses[0].address
+        nic.netmask   = nic.physical_network.ip_addresses[0].netmask
+        nic.broadcast = nic.physical_network.ip_addresses[0].broadcast
+      end
+
+      if nic.ip_addresses.size > 0
+        # use the 1st assigned static ip
+        nic.ip_addr   = nic.ip_addresses[0].address
+      end
+
+      nic.boot_type_id = nic.physical_network.boot_type_id
+
+      nic.save!
+    end
+
+    # attempt to migrate ip information back into bondings table.
+    #  because a bonding can have multiple ips (if statically
+    #  assigned) as well as its network, just use the 1st
+    #  found
+    Bonding.find(:all).each do |bonding|
+      if bonding.vlan.ip_addresses.size > 0
+        # use the 1st configured network ip
+        bonding.ip_addr   = bonding.vlan.ip_addresses[0].address
+        bonding.netmask   = bonding.vlan.ip_addresses[0].netmask
+        bonding.broadcast = bonding.vlan.ip_addresses[0].broadcast
+      end
+
+      if bonding.ip_addresses.size > 0
+        # use the 1st assigned static ip
+        bonding.ip_addr   = bonding.ip_addresses[0].address
+      end
+
+      bonding.boot_type_id = bonding.vlan.boot_type_id
+
+      bonding.save!
+    end
+
+    ##############################################################
+    # drop ip_addresses table
+    drop_table :ip_addresses
+
+    # drop network ids from nics / bondings table
+    remove_column :nics, :physical_network_id
+    remove_column :bondings, :vlan_id
+
+    # drop networks tables
+    drop_table :networks_usages
+    drop_table :usages
+    drop_table :networks
+
+    ##############################################################
+    # undo bugfix above
+    add_column :bondings_nics, :id, :integer
+  end
+end
diff --git a/src/public/javascripts/ovirt.js b/src/public/javascripts/ovirt.js
index 4579c80..818b862 100644
--- a/src/public/javascripts/ovirt.js
+++ b/src/public/javascripts/ovirt.js
@@ -297,4 +297,31 @@ function delete_pool(delete_url, id)
               $.jGrowl(data.alert);
             }
            }, 'json');
-}
\ No newline at end of file
+}
+
+
+function get_selected_networks()
+{
+    return get_selected_checkboxes("networks_grid_form");
+}
+
+function afterNetwork(response, status){
+    ajax_validation(response, status);
+    if (response.success) {
+      $(document).trigger('close.facebox');
+      grid = $("#networks_grid");
+      if (grid.size()>0 && grid != null) {
+        grid.flexReload();
+      } else {
+        $tabs.tabs("load",$tabs.data('selected.tabs'));
+      }
+    }
+}
+
+function afterIpAddress(response, status){
+    ajax_validation(response, status);
+    if (response.success) {
+       reset_selected_ip_address();
+       reset_ip_address_select();
+    }
+}
diff --git a/src/public/stylesheets/components.css b/src/public/stylesheets/components.css
index 16eaf62..228ff7b 100644
--- a/src/public/stylesheets/components.css
+++ b/src/public/stylesheets/components.css
@@ -267,4 +267,52 @@
 .detail-pane-chart {
     height: 50px;
     width: 375px;
-};
+}
+
+
+/*************************
+ *    new popup components
+ *************************/
+.popup-content-selection {
+   float: left;
+   width: 45%;
+   padding-left: 20px;
+   padding-top: 10px;
+}
+
+.popup-content-selection select{
+   min-width: 200px;
+}
+
+.popup-content-footer{
+  width: 99%;
+  float: left;
+}
+
+.selected_popup_content {
+   padding-left: 20px;
+   min-height: 50px;
+   float: left;
+   width: 96%;
+}
+
+#selected_popup_content_header {
+  padding-bottom: 5px;
+  font-weight: bold;
+}
+
+#selected_popup_content_expanded{
+  padding-bottom: 50px;
+}
+
+.selected_popup_content_left {
+  float: left;
+  width: 40%;
+  padding-bottom: 15px;
+}
+
+.selected_popup_content_right {
+  float: left;
+  width: 40%;
+  padding-bottom: 15px;
+}
-- 
1.5.6.5



From dpierce at redhat.com  Fri Oct 31 14:06:56 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Fri, 31 Oct 2008 10:06:56 -0400
Subject: [Ovirt-devel] [PATCH server] network integration into ovirt server
	db and wui
In-Reply-To: <1225416455-7607-1-git-send-email-mmorsi@redhat.com>
References: <1225416455-7607-1-git-send-email-mmorsi@redhat.com>
Message-ID: <490B1100.5020401@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

NAK.

Some of the first things I've noticed is that, by removing columns from
the bondings and nics tables into the separate IP-related tables,
updates need to be made to the ManagedNodeConfiguration class. Since the
data itself is the same and just relocated, refactoring the
configuration class to get data from the appropriate objects should take
care of things initially.

Before this patch can be pushed, it needs to fix that class. The unit
test itself does not need changing since the data ought to still look
the same once encoded. There may be changes needed for vlans, but that
will be additional tests.

Comments are inline.

Mohammed Morsi wrote:
> ---
>  src/app/controllers/host_controller.rb             |   12 +-
>  src/app/controllers/network_controller.rb          |  427 ++++++++++++++++++++
>  src/app/helpers/application_helper.rb              |   28 +-
>  src/app/helpers/network_helper.rb                  |    2 +
>  src/app/models/bonding.rb                          |   27 +-
>  src/app/models/ip_address.rb                       |   27 ++
>  src/app/models/ip_v4_address.rb                    |   48 +++
>  src/app/models/ip_v6_address.rb                    |   44 ++
>  src/app/models/network.rb                          |   37 ++
>  src/app/models/nic.rb                              |   16 +-
>  src/app/models/physical_network.rb                 |   27 ++
>  src/app/models/usage.rb                            |   21 +
>  src/app/models/vlan.rb                             |   30 ++
>  src/app/views/dashboard/index.html.erb             |    7 +
>  src/app/views/host/edit_network.rhtml              |   85 ++++
>  src/app/views/host/show.rhtml                      |    4 +
>  src/app/views/network/_bonding_form.rhtml          |   46 +++
>  src/app/views/network/_form.rhtml                  |   31 ++
>  src/app/views/network/_grid.rhtml                  |   37 ++
>  src/app/views/network/_ip_address_form.rhtml       |   62 +++
>  src/app/views/network/_ip_addresses_form.rhtml     |   50 +++
>  src/app/views/network/_select.rhtml                |   32 ++
>  src/app/views/network/edit.rhtml                   |   34 ++
>  src/app/views/network/edit_bonding.rhtml           |   52 +++
>  src/app/views/network/edit_ip_address.rhtml        |   66 +++
>  .../views/network/edit_network_ip_addresses.rhtml  |   13 +
>  src/app/views/network/edit_nic.rhtml               |   62 +++
>  src/app/views/network/list.html.erb                |   72 ++++
>  src/app/views/network/new.rhtml                    |   28 ++
>  src/app/views/network/new_bonding.rhtml            |   32 ++
>  src/app/views/network/new_ip_address.rhtml         |   33 ++
>  src/app/views/network/show.rhtml                   |   30 ++
>  src/app/views/nic/_list.rhtml                      |    2 -
>  src/db/migrate/028_refactor_networking_model.rb    |  271 +++++++++++++
>  src/public/javascripts/ovirt.js                    |   29 ++-
>  src/public/stylesheets/components.css              |   50 +++-
>  36 files changed, 1849 insertions(+), 25 deletions(-)
>  create mode 100644 src/app/controllers/network_controller.rb
>  create mode 100644 src/app/helpers/network_helper.rb
>  create mode 100644 src/app/models/ip_address.rb
>  create mode 100644 src/app/models/ip_v4_address.rb
>  create mode 100644 src/app/models/ip_v6_address.rb
>  create mode 100644 src/app/models/network.rb
>  create mode 100644 src/app/models/physical_network.rb
>  create mode 100644 src/app/models/usage.rb
>  create mode 100644 src/app/models/vlan.rb
>  create mode 100644 src/app/views/host/edit_network.rhtml
>  create mode 100644 src/app/views/network/_bonding_form.rhtml
>  create mode 100644 src/app/views/network/_form.rhtml
>  create mode 100644 src/app/views/network/_grid.rhtml
>  create mode 100644 src/app/views/network/_ip_address_form.rhtml
>  create mode 100644 src/app/views/network/_ip_addresses_form.rhtml
>  create mode 100644 src/app/views/network/_select.rhtml
>  create mode 100644 src/app/views/network/edit.rhtml
>  create mode 100644 src/app/views/network/edit_bonding.rhtml
>  create mode 100644 src/app/views/network/edit_ip_address.rhtml
>  create mode 100644 src/app/views/network/edit_network_ip_addresses.rhtml
>  create mode 100644 src/app/views/network/edit_nic.rhtml
>  create mode 100644 src/app/views/network/list.html.erb
>  create mode 100644 src/app/views/network/new.rhtml
>  create mode 100644 src/app/views/network/new_bonding.rhtml
>  create mode 100644 src/app/views/network/new_ip_address.rhtml
>  create mode 100644 src/app/views/network/show.rhtml
>  create mode 100644 src/db/migrate/028_refactor_networking_model.rb
> 
> diff --git a/src/app/controllers/host_controller.rb b/src/app/controllers/host_controller.rb
> index a40d297..120fe2a 100644
> --- a/src/app/controllers/host_controller.rb
> +++ b/src/app/controllers/host_controller.rb
> @@ -30,7 +30,7 @@ class HostController < ApplicationController
>      end
>    end
>  
> -  before_filter :pre_action, :only => [:host_action, :enable, :disable, :clear_vms]
> +  before_filter :pre_action, :only => [:host_action, :enable, :disable, :clear_vms, :edit_network]
>  
>    # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
>    verify :method => [:post, :put], :only => [ :create, :update ],
> @@ -156,6 +156,16 @@ class HostController < ApplicationController
>      render :json => @json_hash
>    end
>  
> +  def edit_network
> +    render :layout => 'popup'
> +  end
> +
> +  def bondings_json
> +    bondings = Host.find(params[:id]).bondings
> +    bondings_json = []
> +    bondings.each{ |x| bondings_json.push({:id => x.id, :name => x.name}) }
> +    render :json => bondings_json
> +  end
>  
>    private
>    #filter methods
> diff --git a/src/app/controllers/network_controller.rb b/src/app/controllers/network_controller.rb
> new file mode 100644
> index 0000000..b7f8b6d
> --- /dev/null
> +++ b/src/app/controllers/network_controller.rb
> @@ -0,0 +1,427 @@
> +# Copyright (C) 2008 Red Hat, Inc.
> +# Written by Mohammed Morsi <mmorsi at redhat.com>
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; version 2 of the License.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write to the Free Software
> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> +# MA  02110-1301, USA.  A copy of the GNU General Public License is
> +# also available at http://www.gnu.org/copyleft/gpl.html.
> +#
> +
> +class NetworkController < ApplicationController
> +   ########################## Networks related actions
> +
> +   def network_permissions
> +     # 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
> +   end
> +
> +   def list
> +      @networks = Network.find(:all)
> +      network_permissions
> +   end
> +
> +   def networks_json
> +      json_list(Network.find(:all), [:id, :name, :type, [:boot_type, :label]])
> +   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 }
> +    end
> +   end
> +
> +   def new
> +    @boot_types = BootType.find(:all)
> +    render :layout => 'popup'
> +   end
> +
> +   def create
> +    begin
> +     @network = PhysicalNetwork.new(params[:network]) if params[:network][:type] == 'PhysicalNetwork'
> +     @network = Vlan.new(params[:network]) if params[:network][:type] == 'Vlan'
> +     @network.save!
> +     alert = "Network was successfully created."
> +     render :json => { :object => "network", :success => true,
> +                       :alert => alert  }
> +    rescue
> +     render :json => { :object => "network", :success => false,
> +                        :errors =>
> +                        @network.errors.localize_error_messages.to_a }
> +    end
> +   end
> +
> +   def edit
> +    @network = Network.find(params[:id])
> +    @boot_types = BootType.find(:all)
> +    render :layout => 'popup'
> +   end
> +
> +   def update
> +    begin
> +     @network = Network.find(params[:id])
> +
> +     # special case if we are switching types
> +     if @network.type != params[:network][:type]
> +       if ! @network.conversion_valid?
> +        render :json => { :object => "network", :success => false,
> +                          :alert =>
> +         'Can not change type of network with associated nics/bondings'}
> +        return
> +       end
> +
> +       if params[:network][:type] == 'PhysicalNetwork'
> +          Vlan.destroy(params[:id])
> +          @network = PhysicalNetwork.create(params[:network])
> +       else
> +          PhysicalNetwork.destroy(params[:id])
> +          @network = Vlan.create(params[:network])
> +       end
> +     else
> +       @network = PhysicalNetwork.find(params[:id]) if @network.type == 'PhysicalNetwork'
> +       @network = Vlan.find(params[:id]) if @network.type == 'Vlan'
> +       @network.update_attributes!(params[:network])
> +     end
> +
> +     alert = "Network was successfully updated."
> +     render :json => { :object => "network", :success => true,
> +                       :alert => alert  }
> +    rescue Exception => e
> +     render :json => { :object => "network", :success => false,
> +                        :errors =>
> +                        @network.errors.localize_error_messages.to_a }
> +    end
> +   end
> +
> +   def delete
> +     failed_networks = []
> +     networks_ids_str = params[:network_ids]
> +     network_ids = networks_ids_str.split(",").collect {|x| x.to_i}
> +     network_ids.each{ |x|
> +       network = Network.find(x)
> +       if network.conversion_valid?
> +         begin
> +            Network.destroy(x)
> +         rescue
> +           failed_networks.push x
> +         end
> +       else
> +         failed_networks.push x
> +       end
> +     }
> +     if failed_networks.size == 0
> +      render :json => { :object => "network",
> +                        :success => true,
> +                        :alert => "Successfully deleted networks" }
> +     else
> +      render :json => { :object => "network",
> +                        :success => false,
> +                        :alert => "Failed deleting " +
> +                                  failed_networks.size.to_s +
> +                             " networks due to existing bondings/nics" }
> +     end
> +   end
> +
> +   def edit_network_ip_addresses
> +    @network = Network.find(params[:id])
> +    render :layout => 'popup'
> +   end
> +
> +
> +   ########################## Ip Address related actions
> +
> +   def ip_addresses_json
> +    @parent_type = params[:parent_type]
> +    if @parent_type == 'network'
> +      ip_addresses = Network.find(params[:id]).ip_addresses
> +    elsif @parent_type == 'nic'
> +      ip_addresses = Nic.find(params[:id]).ip_addresses
> +    elsif @parent_type == 'bonding' and params[:id]
> +      ip_addresses = Bonding.find(params[:id]).ip_addresses
> +    else
> +      ip_addresses = []
> +    end
> +
> +    ip_addresses_json = []
> +    ip_addresses.each{ |x|
> +          ip_addresses_json.push({:id => x.id, :name => x.address}) }
> +    render :json => ip_addresses_json
> +   end
> +
> +   def new_ip_address
> +    @parent_type = params[:parent_type]
> +    @network = Network.find(params[:id]) if @parent_type == 'network'
> +    @nic = Nic.find(params[:id]) if @parent_type == 'nic'
> +    @bonding = Bonding.find(params[:id]) if @parent_type == 'bonding' and params[:id]
> +
> +    render :layout => false
> +   end
> +
> +  def _create_ip_address
> +    if params[:ip_address][:type] == "IpV4Address"
> +      @ip_address = IpV4Address.new(params[:ip_address])
> +    else
> +      @ip_address = IpV6Address.new(params[:ip_address])
> +    end
> +    @ip_address.save!
> +  end
> +
> +  def create_ip_address
> +   begin
> +    _create_ip_address
> +    alert = "Ip Address was successfully created."
> +    render :json => { :object => "ip_address", :success => true,
> +                      :alert => alert  }
> +   rescue
> +    render :json => { :object => "ip_address", :success => false,
> +                      :errors =>
> +                        @ip_address.errors.localize_error_messages.to_a }
> +    end
> +   end
> +
> +   def edit_ip_address
> +    @ip_address = IpAddress.find(params[:id])
> +
> +    @parent_type = params[:parent_type]
> +    @network = @ip_address.network if @ip_address.network_id
> +    @nic = @ip_address.nic if @ip_address.nic_id
> +    @bonding = @ip_address.bonding if @ip_address.bonding_id
> +
> +    render :layout => false
> +   end
> +
> +   def _update_ip_address(id)
> +     @ip_address = IpAddress.find(id)
> +
> +     # special case if we are switching types
> +     if @ip_address.type != params[:ip_address][:type]
> +       if params[:ip_address][:type] == 'IpV4Address'
> +          @ip_address = IpV4Address.new(params[:ip_address])
> +          @ip_address.save!
> +          IpV6Address.delete(id)
> +       else
> +          @ip_address = IpV6Address.new(params[:ip_address])
> +          @ip_address.save!
> +          IpV4Address.delete(id)
> +       end
> +     else
> +       if @ip_address.type == 'IpV4Address'
> +          @ip_address = IpV4Address.find(id)
> +       else
> +          @ip_address = IpV6Address.find(id)
> +       end
> +       @ip_address.update_attributes!(params[:ip_address])
> +     end
> +
> +   end
> +
> +   def update_ip_address
> +    begin
> +     _update_ip_address(params[:id])
> +     alert = "IpAddress was successfully updated."
> +     render :json => { :object => "network", :success => true,
> +                       :alert => alert  }
> +    rescue
> +     render :json => { :object => "ip_address", :success => false,
> +                        :errors =>
> +                        @ip_address.errors.localize_error_messages.to_a }
> +    end
> +   end
> +
> +   def destroy_ip_address
> +    begin
> +     IpAddress.delete(params[:id])
> +     alert = "Ip Address was successfully deleted."
> +     render :json => { :object => "ip_address", :success => true,
> +                       :alert => alert  }
> +    rescue
> +     render :json => { :object => "ip_address", :success => false,
> +                      :alert => 'Ip Address Deletion Failed' }
> +     end
> +   end
> +
> +
> +   ########################## NICs related actions
> +
> +   def edit_nic
> +     @nic = Nic.find(params[:id])
> +     @network = @nic.physical_network
> +
> +     @networks = PhysicalNetwork.find(:all)
> +     network_options
> +
> +     render :layout => false
> +   end
> +
> +   def update_nic
> +    begin
> +     network_options
> +     @network = Network.find(params[:nic][:physical_network_id])
> +
> +     if @network.boot_type.id == @static_boot_type.id
> +       if params[:ip_address][:id] == "New"
> +         _create_ip_address
> +       elsif params[:ip_address][:id] != ""
> +         _update_ip_address(params[:ip_address][:id])
> +       end
> +     end
> +
> +     @nic = Nic.find(params[:id])
> +     @nic.update_attributes!(params[:nic])
> +
> +     alert = "Nic was successfully updated."
> +     render :json => { :object => "nic", :success => true,
> +                       :alert => alert  }
> +    rescue Exception => e
> +     if @ip_address and @ip_address.errors.size != 0
> +        render :json => { :object => "ip_address", :success => false,
> +                          :errors =>
> +                            @ip_address.errors.localize_error_messages.to_a}
> +     else
> +        render :json => { :object => "nic", :success => false,
> +                          :errors =>
> +                          @nic.errors.localize_error_messages.to_a }
> +     end
> +    end
> +   end
> +
> +   ########################## Bonding related actions
> +
> +   def new_bonding
> +     unless params[:host_id]
> +      flash[:notice] = "Host is required."
> +      redirect_to :controller => 'dashboard'
> +    end
> +
> +    @host = Host.find(params[:host_id])
> +    @networks = Vlan.find(:all)
> +    network_options
> +
> +    render :layout => false
> +   end
> +
> +   def create_bonding
> +    begin
> +     network_options
> +     @network = Network.find(params[:bonding][:vlan_id])
> +
> +     if @network.boot_type.id == @static_boot_type.id
> +       if params[:ip_address][:id] == "New"
> +         _create_ip_address
> +       elsif params[:ip_address][:id] != ""
> +         _update_ip_address(params[:ip_address][:id])
> +       end
> +     end
> +
> +    @bonding = Bonding.new(params[:bonding])
> +    @bonding.save!
> +
> +    if @ip_address
> +       @ip_address.bonding_id = @bonding.id
> +       @ip_address.save!
> +    end
> +
> +     alert = "Bonding was successfully created."
> +     render :json => { :object => "bonding", :success => true,
> +                       :alert => alert  }
> +    rescue
> +     if @ip_address and @ip_address.errors.size != 0
> +        render :json => { :object => "ip_address", :success => false,
> +                          :errors =>
> +                            @ip_address.errors.localize_error_messages.to_a}
> +     else
> +        render :json => { :object => "bonding", :success => false,
> +                          :errors =>
> +                          @bonding.errors.localize_error_messages.to_a }
> +     end
> +    end
> +   end
> +
> +   def edit_bonding
> +     @bonding = Bonding.find(params[:id])
> +     @network = @bonding.vlan
> +
> +     @host = @bonding.host
> +     @networks = Vlan.find(:all)
> +     network_options
> +
> +     render :layout => false
> +   end
> +
> +   def update_bonding
> +    begin
> +     network_options
> +     @network = Network.find(params[:bonding][:vlan_id])
> +
> +     if @network.boot_type.id == @static_boot_type.id
> +       if params[:ip_address][:id] == "New"
> +         _create_ip_address
> +       elsif params[:ip_address][:id] != ""
> +         _update_ip_address(params[:ip_address][:id])
> +       end
> +     end
> +
> +     @bonding = Bonding.find(params[:id])
> +     @bonding.nics.each { |nic| @bonding.nics.delete(nic) }
> +     @bonding.update_attributes!(params[:bonding])
> +
> +     alert = "Bonding was successfully updated."
> +     render :json => { :object => "bonding", :success => true,
> +                       :alert => alert  }
> +    rescue
> +     if @ip_address and @ip_address.errors.size != 0
> +        render :json => { :object => "ip_address", :success => false,
> +                          :errors =>
> +                            @ip_address.errors.localize_error_messages.to_a}
> +     else
> +        render :json => { :object => "bonding", :success => false,
> +                          :errors =>
> +                          @bonding.errors.localize_error_messages.to_a }
> +     end
> +    end
> +   end
> +
> +   def destroy_bonding
> +    begin
> +     Bonding.destroy(params[:id])
> +     alert = "Bonding was successfully deleted."
> +     render :json => { :object => "bonding", :success => true,
> +                       :alert => alert  }
> +    rescue
> +     render :json => { :object => "bonding", :success => false,
> +                      :alert => 'Bonding Deletion Failed' }
> +     end
> +
> +   end
> +
> +
> +   ########################## Misc methods
> +
> +  protected
> +   def network_options
> +    @bonding_types = BondingType.find(:all)
> +    @static_boot_type = BootType.find(:first,
> +                                 :conditions => { :proto => 'static' })
> +   end
> +
> +end
> diff --git a/src/app/helpers/application_helper.rb b/src/app/helpers/application_helper.rb
> index d7b6628..0178ad0 100644
> --- a/src/app/helpers/application_helper.rb
> +++ b/src/app/helpers/application_helper.rb
> @@ -84,21 +84,31 @@ module ApplicationHelper
>       }
>    end
>  
> -  def popup_footer(action, label)
> -    %{ 
> -      <div style="background: url(#{image_path "fb_footer.jpg"}) repeat-x; height: 37px; text-align:right; padding: 9px 9px 0 0;">
> +  # expects hash of labels => actions
> +  def multi_button_popup_footer(buttons = {})
> +      buttons_html = ""
> +      buttons.each{ |label, action|
> +       buttons_html+="<div class=\"button\">" +
> +                     " <div class=\"button_left_blue\"></div>" +
> +                     " <div class=\"button_middle_blue\"><a href=\"#\" onclick=\"#{action}\">#{label}</a></div>" +
> +                     " <div class=\"button_right_blue\"></div>" +
> +                     "</div>"
> +      }
> +
> +   %{
> +      <div style="background: url(#{image_path "fb_footer.jpg"}) repeat-x; height: 37px; text-align:right; padding: 9px 9px 0 0; float: left; width: 97%;">
>          <div class="button">
>            <div class="button_left_grey"></div>
>            <div class="button_middle_grey"><a href="#" onclick="$(document).trigger('close.facebox')">Cancel</a></div>
>            <div class="button_right_grey"></div>
>          </div>
> -        <div class="button">
> -          <div class="button_left_blue"></div>
> -          <div class="button_middle_blue"><a href="#" onclick="#{action}">#{label}</a></div>
> -          <div class="button_right_blue"></div>
> -        </div> 
> +        #{buttons_html}
>        </div>
> -     }
> +    }
> +  end
> +
> +  def popup_footer(action, label)
> +    multi_button_popup_footer({label => action})
>    end
>  
>    def ok_footer
> diff --git a/src/app/helpers/network_helper.rb b/src/app/helpers/network_helper.rb
> new file mode 100644
> index 0000000..ebbce0b
> --- /dev/null
> +++ b/src/app/helpers/network_helper.rb
> @@ -0,0 +1,2 @@
> +module NetworkHelper
> +end
> diff --git a/src/app/models/bonding.rb b/src/app/models/bonding.rb
> index 006c261..a3ad150 100644
> --- a/src/app/models/bonding.rb
> +++ b/src/app/models/bonding.rb
> @@ -30,6 +30,16 @@
>  # interface. They can be ignored if not used.
>  #
>  class Bonding < ActiveRecord::Base
> +  belongs_to :host
> +  belongs_to :bonding_type
> +  belongs_to :vlan
> +  has_many :ip_addresses, :dependent => :destroy
> +
> +  has_and_belongs_to_many :nics,
> +    :join_table  => 'bondings_nics',
> +    :foreign_key => :bonding_id
> +
> +
>    validates_presence_of :name,
>      :message => 'A name is required.'
>  
> @@ -42,18 +52,17 @@ class Bonding < ActiveRecord::Base
>    validates_presence_of :interface_name,
>      :message => 'An interface name is required.'
>  
> -  validates_presence_of :boot_type_id,
> -    :message => 'A boot type must be specified.'
> -
>    validates_presence_of :bonding_type_id,
>      :message => 'A bonding type must be specified.'
>  
> -  belongs_to :host
> -  belongs_to :bonding_type
> -  belongs_to :boot_type
> + protected
> +  def validate
> +    errors.add("name", "must be specified") unless name
> +    errors.add("interface_name", "must be specified") unless interface_name
> +    errors.add("bonding_type_id", "must be specified") unless bonding_type_id

This is duplicating the above validation with the validates_presence_of
check.

> +    errors.add("host_id", "must be specified") unless host_id
> +    errors.add("vlan_id", "must be specified") unless vlan_id
> +  end
>  
> -  has_and_belongs_to_many :nics,
> -    :join_table  => 'bondings_nics',
> -    :foreign_key => :bonding_id
>  
>  end
> diff --git a/src/app/models/ip_address.rb b/src/app/models/ip_address.rb
> new file mode 100644
> index 0000000..5d2e6af
> --- /dev/null
> +++ b/src/app/models/ip_address.rb
> @@ -0,0 +1,27 @@
> +# ip_address.rb
> +# Copyright (C) 2008 Red Hat, Inc.
> +# Written by Darryl L. Pierce <dpierce at redhat.com>
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; version 2 of the License.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write to the Free Software
> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> +# MA  02110-1301, USA.  A copy of the GNU General Public License is
> +# also available at http://www.gnu.org/copyleft/gpl.html.
> +
> +# +IpAddress+ is the base class for all address related classes.
> +#
> +class IpAddress < ActiveRecord::Base
> +   # one of these 3 will apply for each address
> +   belongs_to :network
> +   belongs_to :nic
> +   belongs_to :bonding
> +end
> diff --git a/src/app/models/ip_v4_address.rb b/src/app/models/ip_v4_address.rb
> new file mode 100644
> index 0000000..40e8cf9
> --- /dev/null
> +++ b/src/app/models/ip_v4_address.rb
> @@ -0,0 +1,48 @@
> +# ip_v4_address.rb
> +#
> +# Copyright (C) 2008 Red Hat, Inc.
> +# Written by Darryl L. Pierce <dpierce at redhat.com>,
> +#            Mohammed Morsi   <mmorsi at redhat.com>
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; version 2 of the License.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write to the Free Software
> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> +# MA  02110-1301, USA.  A copy of the GNU General Public License is
> +# also available at http://www.gnu.org/copyleft/gpl.html.
> +
> +# +IpV4Address+ represents a single IPv4 address.
> +#
> +class IpV4Address < IpAddress
> +  ADDRESS_TEST = %r{^(\d{1,3}\.){3}\d{1,3}$}
> +
> +  validates_presence_of :address,
> +    :message => 'An address must be supplied.'
> +  validates_format_of :address,
> +    :with => ADDRESS_TEST
> +
> +  protected
> +   def validate
> +    unless address and address =~ ADDRESS_TEST
> +      errors.add("address", "is of incorrect format")
> +    end
> +    unless !netmask or netmask == "" or netmask =~ ADDRESS_TEST
> +      errors.add("netmask", "is of incorrect format")
> +    end
> +    unless !gateway or gateway == "" or gateway =~ ADDRESS_TEST
> +      errors.add("gateway", "is of incorrect format")
> +    end
> +    unless !broadcast or broadcast == "" or broadcast =~ ADDRESS_TEST
> +      errors.add("broadcast", "is of incorrect format")
> +    end

In the original patch I submitted each of these fields was tested using
validates_format_of.

> +   end
> +
> +end
> diff --git a/src/app/models/ip_v6_address.rb b/src/app/models/ip_v6_address.rb
> new file mode 100644
> index 0000000..9720179
> --- /dev/null
> +++ b/src/app/models/ip_v6_address.rb
> @@ -0,0 +1,44 @@
> +# ip_v6_address.rb
> +#
> +# Copyright (C) 2008 Red Hat, Inc.
> +# Written by Darryl L. Pierce <dpierce at redhat.com>,
> +#            Mohammed Morsi   <mmorsi at redhat.com>
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; version 2 of the License.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write to the Free Software
> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> +# MA  02110-1301, USA.  A copy of the GNU General Public License is
> +# also available at http://www.gnu.org/copyleft/gpl.html.
> +
> +# +IpV6Address+ represents a single IPv6 address.
> +#
> +class IpV6Address < IpAddress
> +  ADDRESS_TEST = %r{^([0-9a-fA-F]{0,4}|0)(\:([0-9a-fA-F]{0,4}|0)){7}$}
> +
> +  validates_presence_of :address,
> +    :message => 'An address must be provided.'
> +  validates_format_of :address,
> +    :with => ADDRESS_TEST
> +
> +  protected
> +   def validate
> +    unless address =~ ADDRESS_TEST
> +      errors.add("address", "is of incorrect format")
> +    end
> +    unless !prefix or prefix == "" or prefix =~ ADDRESS_TEST
> +      errors.add("prefix", "is of incorrect format")
> +    end
> +    unless !gateway or gateway == "" or gateway =~ ADDRESS_TEST
> +      errors.add("gateway", "is of incorrect format")
> +    end

See note in the IpV4Address regarding validations. The Rails pattern is
to use validates_format_of for checking content.

> +   end
> +end
> diff --git a/src/app/models/network.rb b/src/app/models/network.rb
> new file mode 100644
> index 0000000..99e1a94
> --- /dev/null
> +++ b/src/app/models/network.rb
> @@ -0,0 +1,37 @@
> +# Copyright (C) 2008 Red Hat, Inc.
> +# Written by Mohammed Morsi <mmorsi at redhat.com>
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; version 2 of the License.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write to the Free Software
> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> +# MA  02110-1301, USA.  A copy of the GNU General Public License is
> +# also available at http://www.gnu.org/copyleft/gpl.html.
> +
> +class Network < ActiveRecord::Base
> +  belongs_to :boot_type
> +  has_many :ip_addresses, :dependent => :destroy
> +
> +  has_and_belongs_to_many :usages, :join_table => 'networks_usages'
> +
> +  validates_presence_of :type
> +  validates_presence_of :name
> +  validates_presence_of :boot_type_id
> +
> +  def conversion_valid?
> +    return false if type.to_s == 'Vlan' &&
> +                     Vlan.find(id).bondings.size != 0 ||
> +                    type.to_s == 'PhysicalNetwork' &&
> +                     PhysicalNetwork.find(id).nics.size != 0
> +    return true
> +  end
> +
> +end
> diff --git a/src/app/models/nic.rb b/src/app/models/nic.rb
> index baf7095..25d3ac2 100644
> --- a/src/app/models/nic.rb
> +++ b/src/app/models/nic.rb
> @@ -19,7 +19,19 @@
>  
>  class Nic < ActiveRecord::Base
>    belongs_to :host
> -  belongs_to :boot_type
> +  belongs_to :physical_network
> +  has_many :ip_addresses, :dependent => :destroy
>  
> -  has_and_belongs_to_many :bonding, :join_table => 'bondings_nics'
> +  has_and_belongs_to_many :bondings, :join_table => 'bondings_nics'
> +
> +  protected
> +   def validate
> +     errors.add("host_id", "must be specified") unless host_id
> +     errors.add("physical_network_id", "must be specified") unless physical_network_id

These should be done with validates_presence_of to keep the code
consistent throughout the project. The error message added here is the
default from Rails, so need not be specified.

> +     if physical_network.boot_type.id ==
> +         BootType.find(:first, :conditions => { :proto => 'static' }).id and

You can test this without the second DB call using:

if physical_network.boot_type.proto == static'

> +          ip_addresses.size == 0
> +           errors.add("ip_address_id", "must be specified")
> +     end
> +   end
>  end

> diff --git a/src/app/models/physical_network.rb b/src/app/models/physical_network.rb
> new file mode 100644
> index 0000000..cba696a
> --- /dev/null
> +++ b/src/app/models/physical_network.rb
> @@ -0,0 +1,27 @@
> +# Copyright (C) 2008 Red Hat, Inc.
> +# Written by Mohammed Morsi <mmorsi at redhat.com>
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; version 2 of the License.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write to the Free Software
> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> +# MA  02110-1301, USA.  A copy of the GNU General Public License is
> +# also available at http://www.gnu.org/copyleft/gpl.html.
> +
> +class PhysicalNetwork < Network
> +   has_many :nics
> +
> + protected
> +  def validate
> +    errors.add("name", "must be specified") unless name
> +    errors.add("boot_type_id", "must be specified") unless boot_type_id

Use validates_presence_of here.

> +  end
> +end
> diff --git a/src/app/models/usage.rb b/src/app/models/usage.rb
> new file mode 100644
> index 0000000..353e8f4
> --- /dev/null
> +++ b/src/app/models/usage.rb
> @@ -0,0 +1,21 @@
> +# Copyright (C) 2008 Red Hat, Inc.
> +# Written by Mohammed Morsi <mmorsi at redhat.com>
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; version 2 of the License.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write to the Free Software
> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> +# MA  02110-1301, USA.  A copy of the GNU General Public License is
> +# also available at http://www.gnu.org/copyleft/gpl.html.
> +
> +class Usage < ActiveRecord::Base
> +  has_and_belongs_to_many :networks, :join_table => 'networks_usages'
> +end
> diff --git a/src/app/models/vlan.rb b/src/app/models/vlan.rb
> new file mode 100644
> index 0000000..2b96502
> --- /dev/null
> +++ b/src/app/models/vlan.rb
> @@ -0,0 +1,30 @@
> +# Copyright (C) 2008 Red Hat, Inc.
> +# Written by Mohammed Morsi <mmorsi at redhat.com>
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; version 2 of the License.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write to the Free Software
> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> +# MA  02110-1301, USA.  A copy of the GNU General Public License is
> +# also available at http://www.gnu.org/copyleft/gpl.html.
> +
> +class Vlan < Network
> +   has_many :bondings
> +
> +  validates_presence_of :number
> +
> + protected
> +  def validate
> +    errors.add("name", "must be specified") unless name
> +    errors.add("number", "must be specified") unless number
> +    errors.add("boot_type_id", "must be specified") unless boot_type_id

Use validates_presence_of to be consistent.

> +  end
> +end
> diff --git a/src/app/views/dashboard/index.html.erb b/src/app/views/dashboard/index.html.erb
> index 92cb4da..8815ebc 100644
> --- a/src/app/views/dashboard/index.html.erb
> +++ b/src/app/views/dashboard/index.html.erb
> @@ -13,6 +13,13 @@
>              </table>
>            </div>
>  
> +         <% if @can_modify %>
> +          <h3>Networks</h3>
> +          <a href="<%= url_for :controller => 'network', :action => 'list' %>">
> +             View / Edit
> +          </a>
> +         <% end %>
> +
>            </div> <!-- end #tools -->
>    </td>
>  
> diff --git a/src/app/views/host/edit_network.rhtml b/src/app/views/host/edit_network.rhtml
> new file mode 100644
> index 0000000..7ec3180
> --- /dev/null
> +++ b/src/app/views/host/edit_network.rhtml
> @@ -0,0 +1,85 @@
> +<%- content_for :title do -%>
> +  Edit <%= @host.hostname %> Network Devices
> +<%- end -%>
> +
> +<%- content_for :description do -%>
> +  Select and edit nics and bonded interfaces on <%= @host.hostname %>
> +<%- end -%>
> +
> +<div id="select-host-nic" class="popup-content-selection">
> +<%= select_with_label "NICs", "nic", "id",
> +        @host.nics.
> +          collect{ |nic| [nic.mac, nic.id] }.
> +          insert(0, "") %>
> +</div>
> +
> +<div id="select-host-bonding" class="popup-content-selection">
> +<%= select_with_label "Bonded Interfaces", "bonding", "id", [] %>
> +</div>
> +
> +<div style="clear: both;"></div>
> +
> +<div id="selected_nic_bonding" class="selected_popup_content"></div>
> +
> +<div id="host_network_footer" class="popup-content-footer">
> +  <%= ok_footer %>
> +</div>
> +
> +<script type="text/javascript">
> +function reset_nics_bonding_detail(){
> +   var data='Select NIC or Bonded Interface<br/>';
> +
> +   $("#selected_nic_bonding").html(data);
> +   $("#host_network_footer").show();
> +};
> +
> +reset_nics_bonding_detail(); // run it once for inital content
> +
> +function reset_nics_select(){
> +  $("#nic_id option:first").attr("selected", true);
> +};
> +
> +function reset_bonding_select(){
> +  // incase of new additions / deletions, repopulate select box
> +  $.getJSON(
> +     "<%= url_for :action => 'bondings_json', :id => @host.id %>",
> +      {},
> +      function(j){
> +        var options = "<option value=''></option>" +
> +                      "<option value='New'>New</option>";
> +        for(var i = 0; i < j.length; i++){
> +          options += '<option value="' + j[i].id + '">' + j[i].name +
> +                     '</option>';
> +        }
> +        $("#bonding_id").html(options);
> +      });
> +
> +  $("#bonding_id option:first").attr("selected", true);
> +};
> +
> +reset_bonding_select(); // run it once for initial content
> +
> +$("#nic_id").change(function () {
> +  reset_bonding_select();
> +  if($('#nic_id').val() != ""){
> +    $("#selected_nic_bonding").load("<%= url_for :controller => 'network',
> +        :action => 'edit_nic'%>/" + $('#nic_id').val());
> +    $("#host_network_footer").hide();
> +  }else{
> +     reset_nics_bonding_detail();
> +  }
> +});
> +
> +$("#bonding_id").change(function () {
> +  reset_nics_select();
> +  if($('#bonding_id').val() == "New"){
> +      $("#selected_nic_bonding").load("<%= url_for :controller => 'network', :action => 'new_bonding', :host_id => @host.id %>");
> +    $("#host_network_footer").hide();
> +  }else if($('#bonding_id').val() != ""){
> +      $("#selected_nic_bonding").load("<%= url_for :controller => 'network', :action => 'edit_bonding'%>/" + $('#bonding_id').val());
> +    $("#host_network_footer").hide();
> +  }else{
> +     reset_nics_bonding_detail();
> +  }
> +});
> +</script>
> diff --git a/src/app/views/host/show.rhtml b/src/app/views/host/show.rhtml
> index d1b05ad..bc39a62 100644
> --- a/src/app/views/host/show.rhtml
> +++ b/src/app/views/host/show.rhtml
> @@ -17,6 +17,10 @@
>          <%= image_tag "icon_x.png" %> Clear VMs
>        </a> 
>      <% end -%>
> +    <%= link_to image_tag("icon_edit.png") +"Edit Network",
> +                 {:controller => 'host',
> +                  :action => 'edit_network', :id => @host.id},
> +                 :rel=>"facebox[.bolder]", :class=>"selection_facebox" %>
>    <%- end -%>
>  <%- end -%>
>  <script type="text/javascript">
> diff --git a/src/app/views/network/_bonding_form.rhtml b/src/app/views/network/_bonding_form.rhtml
> new file mode 100644
> index 0000000..4ec0df1
> --- /dev/null
> +++ b/src/app/views/network/_bonding_form.rhtml
> @@ -0,0 +1,46 @@
> + <%= error_messages_for 'bonding' %>
> + <%= error_messages_for 'ip_address' %>
> +
> +<div id="selected_popup_content_expanded" class="dialog_form">
> +  <%= hidden_field_tag 'bonding[host_id]', @host.id %>
> +
> +  <div class="selected_popup_content_left">Name</div>
> +  <div class="selected_popup_content_right">
> +    <%= text_field_with_label "", "bonding", "name" %>
> +  </div>
> +
> +  <div class="selected_popup_content_left">Interface Name</div>
> +  <div class="selected_popup_content_right">
> +    <%= text_field_with_label "", "bonding", "interface_name" %>
> +  </div>
> +
> +  <div class="selected_popup_content_left">Bonding Type</div>
> +  <div class="selected_popup_content_right">
> +      <%= select "bonding", "bonding_type_id",
> +             @bonding_types.collect { |bt| [bt.label, bt.id ] } %>
> +  </div>
> +
> +  <% if @host.nics.size != 0 %>
> +    <div class="selected_popup_content_left">NICs</div>
> +    <div class="selected_popup_content_right">
> +       <select id="bonding_nic_ids" name="bonding[nic_ids][]" multiple="true">
> +        <%= options_from_collection_for_select @host.nics, "id", "mac",
> +                    @bonding ? @bonding.nics.collect{ |x| x.nic_id.to_i } : [] %>
> +       </select>
> +    </div>
> +  <% end %>
> +
> +  <%= render :partial => 'select', :locals => { :target => 'bonding' } %>
> +
> +<div id="static_ip_options"
> + style="<% unless ((@network && @network.boot_type_id == @static_boot_type.id) ||
> +                   (!@network && @networks.size > 0 &&
> +                     @networks[0].boot_type_id == @static_boot_type.id)) %>
> +          display: none;<%end %>">
> +  <%= render :partial => 'ip_addresses_form',
> +             :locals => { :parent_type => 'bonding',
> +                          :parent_id => @bonding ? @bonding.id : nil } %>
> +</div>
> +
> +
> +</div>
> diff --git a/src/app/views/network/_form.rhtml b/src/app/views/network/_form.rhtml
> new file mode 100644
> index 0000000..3f393f7
> --- /dev/null
> +++ b/src/app/views/network/_form.rhtml
> @@ -0,0 +1,31 @@
> +<%= error_messages_for 'network' %>
> +
> +<!--[form:network]-->
> +<%= hidden_field 'network', 'id' if @create %>
> +
> +<%= text_field_with_label "Name:", "network", "name",
> +                          {:style=>"width:250px;"}  %>
> +
> +<%= select_with_label "Boot Type:", 'network', 'boot_type_id',
> +                      @boot_types.collect{ |bt| [bt.label, bt.id] },
> +                      :style=>"width:250px;" %>
> +
> +<%= select_with_label "Type", "network", "type",
> +           [[ "Physical Network", "PhysicalNetwork" ],
> +            [ "VLAN", "Vlan" ] ]  %>
> +
> +<div id="vlan_options" style="display: none;">
> +<%= text_field_with_label "Number:", "network", "number",
> +                          {:style=>"width:250px;"}  %>
> +</div>
> +
> +
> +<script type="text/javascript">
> +$("#network_type").change(function () {
> +  if($('#network_type').val() == "Vlan"){
> +    $("#vlan_options").show();
> +  }else{
> +    $("#vlan_options").hide();
> +  }
> +}).trigger('change');
> +</script>
> diff --git a/src/app/views/network/_grid.rhtml b/src/app/views/network/_grid.rhtml
> new file mode 100644
> index 0000000..6af0c05
> --- /dev/null
> +++ b/src/app/views/network/_grid.rhtml
> @@ -0,0 +1,37 @@
> +<% networks_per_page = 40 unless (defined? networks_per_page) and !(networks_per_page.nil?) %>
> +<% usepager = @networks.size > networks_per_page %>
> +
> +<div id="<%= table_id %>_div">
> +<form id="<%= table_id %>_form">
> +<table id="<%= table_id %>" style="display:none"></table>
> +</form>
> +</div>
> +<script type="text/javascript">
> +    $("#<%= table_id %>").flexigrid
> +    (
> +    {
> +    url: '<%=  url_for :action => "networks_json" %>',
> +    dataType: 'json',
> +    colModel : [
> +        {display: '', width : 20, align: 'left', process: <%= table_id %>checkbox},
> +        {display: 'Name', name: 'name', width : 180, align: 'left'},
> +        {display: 'Type', name: 'type', width : 180, align: 'left'},
> +        {display: 'Boot Type', name: 'boot_type', width : 180, align: 'left'}
> +    ],
> +    sortname: "name",
> +    sortorder: "asc",
> +    usepager: <%= usepager %>,
> +    useRp: <%= usepager %>,
> +    rp: <%= networks_per_page %>,
> +    showTableToggleBtn: true,
> +    onSelect: <%= on_select %>
> +    }
> +    );
> +    function <%= table_id %>checkbox(celDiv)
> +    {
> +        $(celDiv).html('<input type="checkbox" name="grid_checkbox'+$(celDiv).html()+'" class="grid_checkbox" value="'+$(celDiv).html()+'"/>');
> +    }
> +
> +</script>
> +
> +
> diff --git a/src/app/views/network/_ip_address_form.rhtml b/src/app/views/network/_ip_address_form.rhtml
> new file mode 100644
> index 0000000..b952807
> --- /dev/null
> +++ b/src/app/views/network/_ip_address_form.rhtml
> @@ -0,0 +1,62 @@
> +<%= error_messages_for 'ip_address' %>
> +
> +<div id="selected_popup_content_expanded" class="dialog_form">
> + <%= hidden_field_tag 'parent_type', @parent_type%>
> + <%= hidden_field_tag 'ip_address[id]', @ip_address.id if @ip_address%>
> + <%= hidden_field_tag 'ip_address[network_id]', @network.id if @network %>
> + <%= hidden_field_tag 'ip_address[nic_id]', @nic.id if @nic %>
> + <%= hidden_field_tag 'ip_address[bonding_id]', @bonding.id if @bonding %>
> +
> +   <div class="selected_nic_bonding_left">Type:</div>
> +   <div class="selected_nic_bonding_right">
> +       <%= select_with_label "", "ip_address", "type",
> +                          [[ "ipv4", "IpV4Address" ], [ "ipv6", "IpV6Address" ] ]  %>
> +   </div>
> +
> +
> +   <div class="static_ip_common_options">
> +     <div class="selected_nic_bonding_left">IP Address</div>
> +     <div class="selected_nic_bonding_right">
> +       <%= text_field_with_label "", "ip_address", "address" %>
> +     </div>
> +   </div>
> +
> +   <div id="static_ip_v4_options">
> +     <div class="selected_nic_bonding_left">Netmask</div>
> +     <div class="selected_nic_bonding_right">
> +        <%= text_field_with_label "", "ip_address", "netmask" %>
> +     </div>
> +
> +     <div class="selected_nic_bonding_left">Broadcast</div>
> +     <div class="selected_nic_bonding_right">
> +         <%= text_field_with_label "", "ip_address", "broadcast" %>
> +     </div>
> +  </div>
> +
> +  <div id="static_ip_v6_options" style="display: none;">
> +     <div class="selected_nic_bonding_left">Prefix</div>
> +     <div class="selected_nic_bonding_right">
> +         <%= text_field_with_label "", "ip_address", "prefix" %>
> +     </div>
> +  </div>
> +
> +  <div class="static_ip_common_options">
> +     <div class="selected_nic_bonding_left">Gateway</div>
> +     <div class="selected_nic_bonding_right">
> +         <%= text_field_with_label "", "ip_address", "gateway" %>
> +     </div>
> +  </div>
> +
> +</div>
> +
> +<script type="text/javascript">
> +  $("#ip_address_type").change(function () {
> +    if($("#ip_address_type").val() == 'IpV4Address'){
> +        $("#static_ip_v4_options").show();
> +        $("#static_ip_v6_options").hide();
> +    }else{
> +        $("#static_ip_v4_options").hide();
> +        $("#static_ip_v6_options").show();
> +    }
> +  }).trigger('change');
> +</script>
> diff --git a/src/app/views/network/_ip_addresses_form.rhtml b/src/app/views/network/_ip_addresses_form.rhtml
> new file mode 100644
> index 0000000..f833b2a
> --- /dev/null
> +++ b/src/app/views/network/_ip_addresses_form.rhtml
> @@ -0,0 +1,50 @@
> +<div id="select_ip_address" class="popup-content-selection">
> +<%= select_with_label "IP Addresses", "ip_address", "id", [] %>
> +</div>
> +
> +<div id="selected_ip_address" class="selected_popup_content"></div>
> +
> +<script type="text/javascript">
> +function reset_selected_ip_address(){
> +   var data='Select IP Address<br/>';
> +
> +   $("#selected_ip_address").html(data);
> +   $("#ip_addresses_footer").show();
> +};
> +
> +reset_selected_ip_address(); // run it once for inital content
> +
> +function reset_ip_address_select(){
> +  // incase of new additions / deletions, repopulate select box
> +  $.getJSON(
> +     "<%= url_for :action => 'ip_addresses_json', :id => parent_id, :parent_type => parent_type %>",
> +      {},
> +      function(j){
> +        var options = "<option value=''></option>" +
> +                      "<option value='New'>New</option>";
> +        for(var i = 0; i < j.length; i++){
> +          options += '<option value="' + j[i].id + '">' + j[i].name +
> +                     '</option>';
> +        }
> +        $("#ip_address_id").html(options);
> +      });
> +
> +  $("#ip_address_id option:first").attr("selected", true);
> +};
> +
> +reset_ip_address_select(); // run it once for initial content
> +
> +$("#ip_address_id").change(function () {
> +  if($('#ip_address_id').val() == "New"){
> +    $("#selected_ip_address").load("<%= url_for :action => 'new_ip_address', :id => parent_id, :parent_type => parent_type %>");
> +    $("#ip_addresses_footer").hide();
> +  }else if($('#ip_address_id').val() != ""){
> +    $("#selected_ip_address").load("<%= url_for :action => 'edit_ip_address'%>/" + $('#ip_address_id').val() + "?parent_type=<%= parent_type %>");
> +    $("#ip_addresses_footer").hide();
> +  }else{
> +     reset_selected_ip_address();
> +  }
> +});
> +
> +</script>
> +
> diff --git a/src/app/views/network/_select.rhtml b/src/app/views/network/_select.rhtml
> new file mode 100644
> index 0000000..e69d9b0
> --- /dev/null
> +++ b/src/app/views/network/_select.rhtml
> @@ -0,0 +1,32 @@
> +<% target = 'nic' unless target
> +   network_id = 'physical_network_id' if target == 'nic'
> +   network_id = 'vlan_id' if target == 'bonding'
> +
> + %>
> +
> +<div class="selected_popup_content_left">Network:</div>
> +<div class="selected_popup_content_right">
> +    <%= select_with_label "", target, network_id,
> +    @networks.collect { |n| [n.name + ' - ' + n.boot_type.label, n.id ] } %>
> +
> +</div>
> +
> +<script type="text/javascript">
> +  var static_network_ids=<%= static_network_ids = '['
> +    @networks.each { |n|
> +     static_network_ids += ',' if static_network_ids != '['
> +     static_network_ids += n.id.to_s if n.boot_type_id == @static_boot_type.id
> +    }
> +    static_network_ids += ']'
> +    static_network_ids %>;
> +
> +  $("#<%=target %>_<%= network_id %>").change(function () {
> +    $("#static_ip_options").hide();
> +    for(i=0; i<static_network_ids.length; ++i){
> +     if($("#<%= target %>_<%= network_id %>").val() == static_network_ids[i]){
> +          $("#static_ip_options").show();
> +          break;
> +     }
> +    };
> +  });
> +</script>
> diff --git a/src/app/views/network/edit.rhtml b/src/app/views/network/edit.rhtml
> new file mode 100644
> index 0000000..6360b3f
> --- /dev/null
> +++ b/src/app/views/network/edit.rhtml
> @@ -0,0 +1,34 @@
> +<%- content_for :title do -%>
> +  Edit Network
> +<%- end -%>
> +<%- content_for :description do -%>
> +<%- end -%>
> +
> +  <!-- DIALOG  BODY -->
> +  <form method="POST" action="<%= url_for :action => 'update' %>" id="network_form" >
> +  <div class="dialog_form">
> +    <%= hidden_field_tag 'id', @network.id %>
> +    <%= render :partial => 'form', :locals => { :create => false }  %>
> +  </div>
> +  <!-- DIALOG  FOOTER -->
> +  <%= popup_footer("$('#network_form').submit()", "Edit Network") %>
> +  </form>
> +
> +<script type="text/javascript">
> +$(function() {
> +    var networkoptions = {
> +        target:        '<%= url_for :action => 'update' %>',
> +	dataType:      'json',
> +        success: function(response, status) {
> +           afterNetwork(response, status);
> +           refresh_summary_static('networks_selection',
> +            '<div class="selection_left"><div>Select a network.</div></div>');
> +        }
> +    };
> +
> +    // bind form using 'ajaxForm'
> +    $('#network_form').ajaxForm(networkoptions);
> +});
> +</script>
> +
> +
> diff --git a/src/app/views/network/edit_bonding.rhtml b/src/app/views/network/edit_bonding.rhtml
> new file mode 100644
> index 0000000..645e469
> --- /dev/null
> +++ b/src/app/views/network/edit_bonding.rhtml
> @@ -0,0 +1,52 @@
> +<form method="POST"
> +      action="<%= url_for :action => 'update_bonding' %>" id="edit_bonding_form" >
> +  <div id="selected_popup_content_header">
> +      Editing Bonded Interface
> +  </div>
> +
> +  <%= hidden_field_tag('id', @bonding.id) %>
> +  <%= render :partial => 'bonding_form' %>
> +
> +</form>
> +
> +<form method="POST" action="<%= url_for :action => 'destroy_bonding' %>" id="delete_bonding_form" >
> +  <%= hidden_field_tag('id', @bonding.id) %>
> +</form>
> +
> +<%= multi_button_popup_footer({"Edit Bonding" =>
> +                                 "$('#edit_bonding_form').submit()",
> +                               "Delete Bonding" =>
> +                                 "$('#delete_bonding_form').submit()"}) %>
> +
> +<script type="text/javascript">
> +$(function() {
> +    var edit_bonding_options = {
> +        target:        '<%= url_for :action => 'update_bonding' %>',
> +        dataType:      'json',
> +        success:       function(response, status) {
> +          ajax_validation(response, status);
> +          if (response.success) {
> +            reset_bonding_select();
> +            reset_nics_bonding_detail();
> +          }
> +        }
> +    };
> +
> +    var delete_bonding_options = {
> +        target:        '<%= url_for :action => 'destroy_bonding' %>',
> +        dataType:      'json',
> +        success:       function(response, status) {
> +          ajax_validation(response, status);
> +          if (response.success) {
> +            reset_bonding_select();
> +            reset_nics_bonding_detail();
> +          }
> +        }
> +    };
> +
> +    // bind forms using 'ajaxForm'
> +    $('#edit_bonding_form').ajaxForm(edit_bonding_options);
> +    $('#delete_bonding_form').ajaxForm(delete_bonding_options);
> +
> +});
> +</script>
> diff --git a/src/app/views/network/edit_ip_address.rhtml b/src/app/views/network/edit_ip_address.rhtml
> new file mode 100644
> index 0000000..5a3cc18
> --- /dev/null
> +++ b/src/app/views/network/edit_ip_address.rhtml
> @@ -0,0 +1,66 @@
> +<% if @parent_type == 'network' %>
> +<form method="POST"
> +      action="<%= url_for :action => 'update_ip_address' %>"
> +      id="edit_ip_address_form" >
> +<% end %>
> +
> +  <div id="selected_popup_content_header">
> +      Editing IP Address
> +  </div>
> +
> +  <% if @parent_type != 'network' %>
> +     <a href="#" onClick="$('#delete_ip_address_form').submit()" style="color: blue;">Delete</a>
> +  <% end %>
> +
> +  <%= hidden_field_tag('id', @ip_address.id) %>
> +  <%= render :partial => 'ip_address_form' %>
> +
> +<% if @parent_type == 'network' %>
> +</form>
> +<% end %>
> +
> +<form method="POST"
> +      action="<%= url_for :action => 'destroy_ip_address' %>"
> +      id="delete_ip_address_form" >
> +  <%= hidden_field_tag('id', @ip_address.id) %>
> +</form>
> +
> +<% if @parent_type == 'network' %>
> +<%= multi_button_popup_footer({" Edit IP Address" =>
> +                                 "$('#edit_ip_address_form').submit()",
> +                               "Delete IP Address" =>
> +                                 "$('#delete_ip_address_form').submit()"}) %>
> +<% end %>
> +
> +<script type="text/javascript">
> +$(function() {
> +    var edit_ip_address_options = {
> +        target:        '<%= url_for :action => 'update_ip_address' %>',   // target element to update
> +        dataType:      'json',
> +        success:       function(response, status) {
> +          ajax_validation(response, status);
> +          if (response.success) {
> +            reset_selected_ip_address();
> +            reset_ip_address_select();
> +          }
> +        }
> +    };
> +
> +    var delete_ip_address_options = {
> +        target:        '<%= url_for :action => 'delete_ip_address' %>',   // target element to update
> +        dataType:      'json',
> +        success:       function(response, status) {
> +          ajax_validation(response, status);
> +          if (response.success) {
> +            reset_selected_ip_address();
> +            reset_ip_address_select();
> +          }
> +        }
> +    };
> +
> +    // bind forms using 'ajaxForm'
> +    $('#edit_ip_address_form').ajaxForm(edit_ip_address_options);
> +    $('#delete_ip_address_form').ajaxForm(delete_ip_address_options);
> +
> +});
> +</script>
> diff --git a/src/app/views/network/edit_network_ip_addresses.rhtml b/src/app/views/network/edit_network_ip_addresses.rhtml
> new file mode 100644
> index 0000000..7a1e4cb
> --- /dev/null
> +++ b/src/app/views/network/edit_network_ip_addresses.rhtml
> @@ -0,0 +1,13 @@
> +<%- content_for :title do -%>
> +  Edit Network IP Addresses
> +<%- end -%>
> +<%- content_for :description do -%>
> +<%- end -%>
> +
> +<%= render :partial => 'ip_addresses_form',
> +           :locals  => { :parent_type => 'network',
> +                         :parent_id   =>  @network.id } %>
> +
> +<div id="ip_addresses_footer" class="popup-content-footer">
> +  <%= ok_footer %>
> +</div>
> diff --git a/src/app/views/network/edit_nic.rhtml b/src/app/views/network/edit_nic.rhtml
> new file mode 100644
> index 0000000..75af6fb
> --- /dev/null
> +++ b/src/app/views/network/edit_nic.rhtml
> @@ -0,0 +1,62 @@
> +<form method="POST"
> +      action="<%= url_for :action => 'update_nic' %>" id="nic_form" >
> + <div id="selected_popup_content_header">
> +      Editing NIC
> + </div>
> +
> + <%= error_messages_for 'nic' %>
> +
> + <div id="selected_popup_content_expanded" class="dialog_form">
> +  <%= hidden_field_tag 'id', @nic.id %>
> +  <%= hidden_field_tag 'nic_host_id', @nic.host.id %>
> +  <%= hidden_field_tag 'nic_network_id', @nic.physical_network.id %>
> +
> +  <div class="selected_popup_content_left">MAC:</div>
> +  <div class="selected_popup_content_right"><%= @nic.mac %></div>
> +
> +  <% if @nic.host.bondings.size != 0 %>
> +    <div class="selected_popup_content_left">Bonded Interfaces</div>
> +    <div class="selected_popup_content_right">
> +       <select id="nic_bonding_ids" name="nic[bonding_ids][]">
> +         <option value="" />
> +         <%= options_from_collection_for_select @nic.host.bondings,
> +                           "id", "name",
> +                           @nic.bondings.size > 0 ? @nic.bondings[0].bonding_id.to_i : "" %>
> +       </select>
> +    </div>
> +  <% end %>
> +
> +
> +  <%= render :partial => 'select' %>
> +
> +  <div id="static_ip_options"
> +    style="<% if @network.boot_type_id != @static_boot_type.id %>
> +            display: none;<%end %>">
> +    <%= render :partial => 'ip_addresses_form',
> +               :locals => { :parent_type => 'nic',
> +                            :parent_id => @nic.id } %>
> +  </div>
> +
> +
> + </div>
> + <%= popup_footer("$('#nic_form').submit()", "Edit NIC") %>
> +</form>
> +
> +<script type="text/javascript">
> +$(function() {
> +    var nicoptions = {
> +        target:        '<%= url_for :action => 'update_nic' %>',
> +        dataType:      'json',
> +        success:       function(response, status) {
> +          ajax_validation(response, status);
> +          if (response.success) {
> +            reset_nics_select();
> +            reset_nics_bonding_detail();
> +          }
> +        }
> +    };
> +
> +    // bind form using 'ajaxForm'
> +    $('#nic_form').ajaxForm(nicoptions);
> +});
> +</script>
> diff --git a/src/app/views/network/list.html.erb b/src/app/views/network/list.html.erb
> new file mode 100644
> index 0000000..9a304cf
> --- /dev/null
> +++ b/src/app/views/network/list.html.erb
> @@ -0,0 +1,72 @@
> +<div id="toolbar_nav">
> +<ul>
> +    <li><a href="<%= url_for :action => 'new' %>" rel="facebox[.bolder]"><%= image_tag "icon_addstorage.png", :style => "vertical-align:middle;" %>&nbsp;&nbsp;Add Network</a></li>
> +    <li>
> +      <a href="#" onClick="delete_networks();" >
> +        <%= image_tag "icon_remove.png", :style=>"vertical-align:middle;" %>
> +            &nbsp;&nbsp;Remove
> +       </a>
> +    </li>
> +  </ul>
> +</div>
> +
> +<script type="text/javascript">
> +  function delete_networks(){
> +    var networks = get_selected_networks();
> +    if (validate_selected(get_selected_networks(), 'networks')) {
> +      $.post('<%= url_for :action => 'delete' %>',
> +             { network_ids: networks.toString() },
> +             function(data,status){
> +                if (data.alert) {
> +                  $.jGrowl(data.alert);
> +                }
> +               grid = $("#networks_grid");
> +               if (grid.size()>0 && grid != null) {
> +                  grid.flexReload();
> +               }
> +               empty_summary('networks_selection', 'Network');
> +             }, 'json');
> +    }
> +  }
> +
> +  function networks_select(selected_rows)
> +  {
> +    var selected_ids = new Array();
> +    for(i=0; i<selected_rows.length; i++) {
> +      selected_ids[i] = selected_rows[i].id;
> +    }
> +    if (selected_ids.length == 1)
> +    {
> +      $('#networks_selection').load('<%= url_for :action => "show" %>',
> +                { id: parseInt(selected_ids[0].substring(3))});
> +    }
> +  }
> +
> +</script>
> +
> +<div class="panel_header"></div>
> +<% if @networks.size != 0 %>
> +  <div class="data_section">
> +       <%= render :partial => "grid", :locals => { :table_id => "networks_grid",
> +                                                   :networks => @networks,
> +                                                   :on_select => "networks_select"} %>
> +  </div>
> +
> +  <div class="selection_detail" id="networks_selection">
> +    <div class="selection_left">
> +      <div>Select a network.</div>
> +    </div>
> +  </div>
> +<% else %>
> +   <div class="data_section">
> +       <div class="no-grid-items">
> +          <%= image_tag 'no-grid-items.png', :style => 'float: left;' %>
> +
> +          <div class="no-grid-items-text">
> +            No networks found. <br/><br/>
> +            <%= image_tag "icon_addhost.png", :style=>"vertical-align:middle;" %>&nbsp;&nbsp;
> +            <a href="<%= url_for :action => 'new' %>" rel="facebox[.bolder]">Add first network</a>
> +          </div>
> +       </div>
> +   </div>
> +<% end %>
> diff --git a/src/app/views/network/new.rhtml b/src/app/views/network/new.rhtml
> new file mode 100644
> index 0000000..15b7304
> --- /dev/null
> +++ b/src/app/views/network/new.rhtml
> @@ -0,0 +1,28 @@
> +<%- content_for :title do -%>
> +  Add Network
> +<%- end -%>
> +<%- content_for :description do -%>
> +<%- end -%>
> +
> +  <!-- DIALOG  BODY -->
> +  <form method="POST" action="<%= url_for :action => 'create' %>" id="network_form" >
> +  <div class="dialog_form">
> +    <%= render :partial => 'form', :locals => { :create => true }  %>
> +  </div>
> +  <!-- DIALOG  FOOTER -->
> +  <%= popup_footer("$('#network_form').submit()", "Add Network") %>
> +  </form>
> +
> +<script type="text/javascript">
> +$(function() {
> +    var networkoptions = {
> +        target:        '<%= url_for :action => 'create' %>',
> +	dataType:      'json',
> +        success:       afterNetwork  // post-submit callback
> +    };
> +
> +    // bind form using 'ajaxForm'
> +    $('#network_form').ajaxForm(networkoptions);
> +});
> +</script>
> +
> diff --git a/src/app/views/network/new_bonding.rhtml b/src/app/views/network/new_bonding.rhtml
> new file mode 100644
> index 0000000..9ee6994
> --- /dev/null
> +++ b/src/app/views/network/new_bonding.rhtml
> @@ -0,0 +1,32 @@
> +<form method="POST"
> +      action="<%= url_for :action => 'create_bonding' %>" id="bonding_form" >
> +
> +  <div id="selected_popup_content_header">
> +      Create Bonded Interface
> +  </div>
> +
> +  <%= render :partial => 'bonding_form' %>
> +</form>
> +
> +<%= multi_button_popup_footer({"Create Bonding" =>
> +                                 "$('#bonding_form').submit()"}) %>
> +
> +<script type="text/javascript">
> +$(function() {
> +    var bonding_options = {
> +        target:        '<%= url_for :action => 'create_bonding' %>',
> +        dataType:      'json',
> +        success:       function(response, status) {
> +          ajax_validation(response, status);
> +          if (response.success) {
> +            reset_bonding_select();
> +            reset_nics_bonding_detail();
> +          }
> +        }
> +    };
> +
> +    // bind forms using 'ajaxForm'
> +    $('#bonding_form').ajaxForm(bonding_options);
> +
> +});
> +</script>
> diff --git a/src/app/views/network/new_ip_address.rhtml b/src/app/views/network/new_ip_address.rhtml
> new file mode 100644
> index 0000000..6167a76
> --- /dev/null
> +++ b/src/app/views/network/new_ip_address.rhtml
> @@ -0,0 +1,33 @@
> +<% if @parent_type == 'network' %>
> +<form method="POST"
> +      action="<%= url_for :action => 'create_ip_address' %>"
> +      id="ip_address_form" >
> +<% end %>
> +
> +  <div id="selected_popup_content_header">
> +      Create Ip Address
> +  </div>
> +
> +  <%= render :partial => 'ip_address_form' %>
> +
> +<% if @parent_type == 'network' %>
> +</form>
> +<% end %>
> +
> +<% if @parent_type == 'network' %>
> +<%= multi_button_popup_footer({"Create IP Address" =>
> +                                 "$('#ip_address_form').submit()"}) %>
> +<% end %>
> +
> +<script type="text/javascript">
> +$(function() {
> +    var ip_address_options = {
> +        target:        '<%= url_for :action => 'create_ip_address' %>',
> +        dataType:      'json',
> +        success:       afterIpAddress
> +    };
> +
> +    // bind forms using 'ajaxForm'
> +    $('#ip_address_form').ajaxForm(ip_address_options);
> +});
> +</script>
> diff --git a/src/app/views/network/show.rhtml b/src/app/views/network/show.rhtml
> new file mode 100644
> index 0000000..a56c41d
> --- /dev/null
> +++ b/src/app/views/network/show.rhtml
> @@ -0,0 +1,30 @@
> +<%- content_for :title do -%>
> +  <%=h @network.name %>
> +<%- end -%>
> +
> +<%- content_for :action_links do -%>
> +  <%= link_to image_tag("icon_edit.png") + "Edit",
> +        {:action => 'edit', :id => @network.id },
> +         :rel=>"facebox[.bolder]", :class=>"selection_facebox" %>
> +
> +  <%= link_to image_tag("icon_edit.png") + "Edit IP Addresses",
> +        {:action => 'edit_network_ip_addresses', :id => @network.id },
> +         :rel=>"facebox[.bolder]", :class=>"selection_facebox" %>
> +<%- end -%>
> +
> +<div id="hosts_selection_id" style="display:none"><%= @host.id %></div>
> +<div class="selection_key">
> +    Name:<br/>
> +    Type:<br/>
> +    Boot Type:<br/>
> +    IP Addresses:<br/>
> +</div>
> +<div class="selection_value">
> +    <%=h @network.name %><br/>
> +    <%=h @network.type %><br/>
> +    <%=h @network.boot_type.label %><br/>
> +    <%=h @network.ip_addresses.size %><br/>
> +</div>
> +
> +<%- content_for :right do -%>
> +<%- end -%>
> diff --git a/src/app/views/nic/_list.rhtml b/src/app/views/nic/_list.rhtml
> index 07f7e44..eb3a4a7 100644
> --- a/src/app/views/nic/_list.rhtml
> +++ b/src/app/views/nic/_list.rhtml
> @@ -1,7 +1,6 @@
>  <table class='listing'>
>    <thead>
>    <tr>
> -    <th class="empty">IP</th>
>      <th>MAC</th>
>      <th>Bridge</th>
>      <th>Usage Type</th>
> @@ -11,7 +10,6 @@
>    </thead>
>  <% for nic in nics %>
>    <tr class="<%= cycle('odd','even', :name => nics) %>">
> -    <td><%= link_to nic.ip_addr, { :controller => "nic", :action => 'show', :id => nic }, { :class => "show" } %></td>
>      <td><%= nic.mac %></td>
>      <td><%= nic.bridge %></td>
>      <td><%= nic.usage_type %></td>
> diff --git a/src/db/migrate/028_refactor_networking_model.rb b/src/db/migrate/028_refactor_networking_model.rb
> new file mode 100644
> index 0000000..946b976
> --- /dev/null
> +++ b/src/db/migrate/028_refactor_networking_model.rb
> @@ -0,0 +1,271 @@
> +# Copyright (C) 2008 Red Hat, Inc.
> +# Written by Mohammed Morsi <mmorsi at redhat.com>
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; version 2 of the License.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write to the Free Software
> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> +# MA  02110-1301, USA.  A copy of the GNU General Public License is
> +# also available at http://www.gnu.org/copyleft/gpl.html.
> +
> +# introduce networks and ip_addresses tables, refactor relationships
> +class RefactorNetworkingModel < ActiveRecord::Migration
> +  def self.up
> +
> +    ####################################################
> +    # bugfix, bridge tables shouldn't have their own ids
> +    remove_column :bondings_nics, :id
> +
> +    ##################################################################
> +    # add networks, usages tables and networks_usage_types bridge
> +    create_table :networks do |t|
> +      t.string  :type, :null => false
> +      t.string  :name, :null => false
> +      t.integer :boot_type_id, :null => false
> +
> +      # attributes for Vlan (type=Vlan)
> +      t.integer :number
> +    end
> +
> +    create_table :usages do |t|
> +      t.string :label, :null => false
> +      t.string :usage, :null => false
> +    end
> +
> +    create_table :networks_usages, :id => false do |t|
> +      t.integer :network_id, :null => false
> +      t.integer :usage_id, :null => false
> +    end
> +
> +    add_index :networks_usages, [:network_id, :usage_id], :unique => true
> +
> +    # create usages
> +    Usage.create(:label => 'Guest', :usage => 'guest')
> +    Usage.create(:label => 'Management', :usage => 'management')
> +    Usage.create(:label => 'Storage', :usage => 'storage')
> +
> +    # referential integrity for networks tables
> +    execute "alter table networks add constraint
> +             fk_network_boot_types
> +             foreign key (boot_type_id) references
> +             boot_types(id)"
> +    execute "alter table networks_usages add constraint
> +             fk_networks_usages_network_id
> +             foreign key (network_id) references
> +             networks(id)"
> +    execute "alter table networks_usages add constraint
> +             fk_networks_usages_usage_id
> +             foreign key (usage_id) references
> +             usages(id)"
> +
> +    # add foreign keys to nics / bondings table
> +    add_column :nics, :physical_network_id, :integer
> +    add_column :bondings, :vlan_id, :integer
> +
> +    # referential integrity for nic/bondings network ids
> +    execute "alter table nics add constraint
> +             fk_nic_networks
> +             foreign key (physical_network_id) references
> +             networks(id)"
> +    execute "alter table bondings add constraint
> +             fk_bonding_networks
> +             foreign key (vlan_id) references
> +             networks(id)"
> +
> +    ####################################################
> +    # create ip_addresses table
> +    create_table :ip_addresses do |t|
> +      t.string :type
> +
> +      # foreign keys to associated entities
> +      t.integer :nic_id
> +      t.integer :bonding_id
> +      t.integer :network_id
> +
> +      # common attributes
> +      t.string :address,   :limit => 39, :null => false
> +      t.string :gateway,   :limit => 39
> +
> +      # attributes for IPv4 (type=IpV4Address)
> +      t.string :netmask,   :limit => 15
> +      t.string :broadcast, :limit => 15
> +
> +      # attributes for IPv6 (type=IpV6Address)
> +      t.string :prefix,    :limit => 39
> +      t.timestamps
> +    end
> +
> +    # referential integrity for ip_addresses table
> +    execute "alter table ip_addresses add constraint
> +             fk_nic_ip_addresses
> +             foreign key (nic_id) references nics(id)"
> +    execute "alter table ip_addresses add constraint
> +             fk_bonding_ip_addresses
> +             foreign key (bonding_id) references bondings(id)"
> +    execute "alter table ip_addresses add constraint
> +             fk_network_ip_addresses
> +             foreign key (network_id) references networks(id)"
> +
> +    ###################################################################
> +    static_boot_type_id =
> +      BootType.find(:first,
> +           :conditions => {:proto => 'static'} ).id
> +
> +    # migrate nic ip_addresses to networks / ip_addresses table
> +    i = 0
> +    Nic.find(:all).each do |nic|
> +      if nic.boot_type_id == static_boot_type_id
> +        IpV4Address.new(:nic_id    => nic.id,
> +                        :address   => nic.ip_addr).save!
> +
> +      end
> +      network = PhysicalNetwork.new(
> +                            :name => 'Physical Network ' + i.to_s,
> +                            :boot_type_id => nic.boot_type_id)
> +      network.save!
> +
> +      ip_address = IpV4Address.new(:address   => nic.ip_addr ? nic.ip_addr : '0.0.0.0',
> +                                   :netmask   => nic.netmask,
> +                                   :broadcast => nic.broadcast,
> +                                   :gateway   => nic.ip_addr)
> +      ip_address.network = network
> +      ip_address.save!
> +
> +      nic.physical_network = network
> +      nic.save!
> +
> +      i += 1
> +    end
> +
> +    # migrate bonding ip_addresses to networks / ip_addresses table
> +    i = 0
> +    Bonding.find(:all).each do |bonding|
> +      if bonding.boot_type_id == static_boot_type_id
> +        IpV4Address.new(:bonding_id => bonding.id,
> +                        :address    => bonding.ip_addr).save!
> +      end
> +      network = Vlan.new(
> +                     :name => 'VLAN ' + i.to_s,
> +                     :number => i,
> +                     :boot_type_id => bonding.boot_type_id)
> +      network.save!
> +
> +      ip_address = IpV4Address.new(:address   => bonding.ip_addr ? bonding.ip_addr : '0.0.0.0',
> +                                   :netmask   => bonding.netmask,
> +                                   :broadcast => bonding.broadcast,
> +                                   :gateway   => bonding.ip_addr)
> +      ip_address.network = network
> +      ip_address.save!
> +
> +      bonding.vlan = network
> +      bonding.save!
> +
> +      i += 1
> +    end
> +
> +    ##############################################################
> +    # remove nics / bonding ip address and network related columns
> +    remove_column :nics,     :ip_addr
> +    remove_column :nics,     :netmask
> +    remove_column :nics,     :broadcast
> +    remove_column :nics,     :boot_type_id
> +    remove_column :bondings, :ip_addr
> +    remove_column :bondings, :netmask
> +    remove_column :bondings, :broadcast
> +    remove_column :bondings, :boot_type_id
> +
> +
> +  end
> +
> +  def self.down
> +    ##############################################################
> +    # readd nics / bonding ip address related columns
> +    add_column :nics,     :ip_addr,   :string, :limit => 16
> +    add_column :nics,     :netmask,   :string, :limit => 16
> +    add_column :nics,     :broadcast, :string, :limit => 16
> +    add_column :nics,     :boot_type_id, :integer
> +    add_column :bondings, :ip_addr,   :string, :limit => 16
> +    add_column :bondings, :netmask,   :string, :limit => 16
> +    add_column :bondings, :broadcast, :string, :limit => 16
> +    add_column :bondings, :boot_type_id, :integer
> +
> +    execute "alter table nics add constraint
> +             fk_nic_boot_types
> +             foreign key (boot_type_id) references
> +             boot_types(id)"
> +    execute "alter table bondings add constraint
> +             fk_bonding_boot_types
> +             foreign key (boot_type_id) references
> +             boot_types(id)"
> +
> +    ##############################################################
> +    # attempt to migrate ip information back into nics table.
> +    #  because a nic can have multiple ips (if statically
> +    #  assigned) as well as its network, just use the 1st
> +    #  found
> +    Nic.find(:all).each do |nic|
> +      if nic.physical_network.ip_addresses.size > 0
> +        # use the 1st configured network ip
> +        nic.ip_addr   = nic.physical_network.ip_addresses[0].address
> +        nic.netmask   = nic.physical_network.ip_addresses[0].netmask
> +        nic.broadcast = nic.physical_network.ip_addresses[0].broadcast
> +      end
> +
> +      if nic.ip_addresses.size > 0
> +        # use the 1st assigned static ip
> +        nic.ip_addr   = nic.ip_addresses[0].address
> +      end
> +
> +      nic.boot_type_id = nic.physical_network.boot_type_id
> +
> +      nic.save!
> +    end
> +
> +    # attempt to migrate ip information back into bondings table.
> +    #  because a bonding can have multiple ips (if statically
> +    #  assigned) as well as its network, just use the 1st
> +    #  found
> +    Bonding.find(:all).each do |bonding|
> +      if bonding.vlan.ip_addresses.size > 0
> +        # use the 1st configured network ip
> +        bonding.ip_addr   = bonding.vlan.ip_addresses[0].address
> +        bonding.netmask   = bonding.vlan.ip_addresses[0].netmask
> +        bonding.broadcast = bonding.vlan.ip_addresses[0].broadcast
> +      end
> +
> +      if bonding.ip_addresses.size > 0
> +        # use the 1st assigned static ip
> +        bonding.ip_addr   = bonding.ip_addresses[0].address
> +      end
> +
> +      bonding.boot_type_id = bonding.vlan.boot_type_id
> +
> +      bonding.save!
> +    end
> +
> +    ##############################################################
> +    # drop ip_addresses table
> +    drop_table :ip_addresses
> +
> +    # drop network ids from nics / bondings table
> +    remove_column :nics, :physical_network_id
> +    remove_column :bondings, :vlan_id
> +
> +    # drop networks tables
> +    drop_table :networks_usages
> +    drop_table :usages
> +    drop_table :networks
> +
> +    ##############################################################
> +    # undo bugfix above
> +    add_column :bondings_nics, :id, :integer
> +  end
> +end
> diff --git a/src/public/javascripts/ovirt.js b/src/public/javascripts/ovirt.js
> index 4579c80..818b862 100644
> --- a/src/public/javascripts/ovirt.js
> +++ b/src/public/javascripts/ovirt.js
> @@ -297,4 +297,31 @@ function delete_pool(delete_url, id)
>                $.jGrowl(data.alert);
>              }
>             }, 'json');
> -}
> \ No newline at end of file
> +}
> +
> +
> +function get_selected_networks()
> +{
> +    return get_selected_checkboxes("networks_grid_form");
> +}
> +
> +function afterNetwork(response, status){
> +    ajax_validation(response, status);
> +    if (response.success) {
> +      $(document).trigger('close.facebox');
> +      grid = $("#networks_grid");
> +      if (grid.size()>0 && grid != null) {
> +        grid.flexReload();
> +      } else {
> +        $tabs.tabs("load",$tabs.data('selected.tabs'));
> +      }
> +    }
> +}
> +
> +function afterIpAddress(response, status){
> +    ajax_validation(response, status);
> +    if (response.success) {
> +       reset_selected_ip_address();
> +       reset_ip_address_select();
> +    }
> +}
> diff --git a/src/public/stylesheets/components.css b/src/public/stylesheets/components.css
> index 16eaf62..228ff7b 100644
> --- a/src/public/stylesheets/components.css
> +++ b/src/public/stylesheets/components.css
> @@ -267,4 +267,52 @@
>  .detail-pane-chart {
>      height: 50px;
>      width: 375px;
> -};
> +}
> +
> +
> +/*************************
> + *    new popup components
> + *************************/
> +.popup-content-selection {
> +   float: left;
> +   width: 45%;
> +   padding-left: 20px;
> +   padding-top: 10px;
> +}
> +
> +.popup-content-selection select{
> +   min-width: 200px;
> +}
> +
> +.popup-content-footer{
> +  width: 99%;
> +  float: left;
> +}
> +
> +.selected_popup_content {
> +   padding-left: 20px;
> +   min-height: 50px;
> +   float: left;
> +   width: 96%;
> +}
> +
> +#selected_popup_content_header {
> +  padding-bottom: 5px;
> +  font-weight: bold;
> +}
> +
> +#selected_popup_content_expanded{
> +  padding-bottom: 50px;
> +}
> +
> +.selected_popup_content_left {
> +  float: left;
> +  width: 40%;
> +  padding-bottom: 15px;
> +}
> +
> +.selected_popup_content_right {
> +  float: left;
> +  width: 40%;
> +  padding-bottom: 15px;
> +}


- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkkLEPoACgkQjaT4DmxOfxsw5wCaA5ztOXBYcMG/MEwiAJvm4xSh
s7YAnRYUdFzlX5DNzjzePT/uq9Pdojw1
=geqD
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081031/ea295c8f/attachment.vcf>

From mmorsi at redhat.com  Fri Oct 31 14:47:43 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Fri, 31 Oct 2008 10:47:43 -0400
Subject: [Ovirt-devel] [PATCH server] network integration into ovirt server
	db and wui
In-Reply-To: <490B1100.5020401@redhat.com>
References: <1225416455-7607-1-git-send-email-mmorsi@redhat.com>
	<490B1100.5020401@redhat.com>
Message-ID: <490B1A8F.2030403@redhat.com>

Hey Darryl,

   Thanks for the feedback. Comments are also inline below.


Darryl Pierce wrote:
> NAK.
>
> Some of the first things I've noticed is that, by removing columns from
> the bondings and nics tables into the separate IP-related tables,
> updates need to be made to the ManagedNodeConfiguration class. Since the
> data itself is the same and just relocated, refactoring the
> configuration class to get data from the appropriate objects should take
> care of things initially.
>
> Before this patch can be pushed, it needs to fix that class. The unit
> test itself does not need changing since the data ought to still look
> the same once encoded. There may be changes needed for vlans, but that
> will be additional tests.
>
Did you say on irc you were going to take care of this
ManagedNodeConfiguration bit or did I mishear?

[snip]

> > diff --git a/src/app/models/bonding.rb b/src/app/models/bonding.rb
> > index 006c261..a3ad150 100644
> > --- a/src/app/models/bonding.rb
> > +++ b/src/app/models/bonding.rb
> > @@ -30,6 +30,16 @@
> >  # interface. They can be ignored if not used.
> >  #
> >  class Bonding < ActiveRecord::Base
> > +  belongs_to :host
> > +  belongs_to :bonding_type
> > +  belongs_to :vlan
> > +  has_many :ip_addresses, :dependent => :destroy
> > +
> > +  has_and_belongs_to_many :nics,
> > +    :join_table  => 'bondings_nics',
> > +    :foreign_key => :bonding_id
> > +
> > +
> >    validates_presence_of :name,
> >      :message => 'A name is required.'
>
> > @@ -42,18 +52,17 @@ class Bonding < ActiveRecord::Base
> >    validates_presence_of :interface_name,
> >      :message => 'An interface name is required.'
>
> > -  validates_presence_of :boot_type_id,
> > -    :message => 'A boot type must be specified.'
> > -
> >    validates_presence_of :bonding_type_id,
> >      :message => 'A bonding type must be specified.'
>
> > -  belongs_to :host
> > -  belongs_to :bonding_type
> > -  belongs_to :boot_type
> > + protected
> > +  def validate
> > +    errors.add("name", "must be specified") unless name
> > +    errors.add("interface_name", "must be specified") unless
> interface_name
> > +    errors.add("bonding_type_id", "must be specified") unless
> bonding_type_id
>
> This is duplicating the above validation with the validates_presence_of
> check.
The thing I noticed with validates_presence_of is that I found that it
doesn't seem to trigger the validation components of the interface. For
example if name isn't specified in the wui which is caught with a
validate_presence_of instead of in the validate function, the
corresponding errors is never added to the 'errors' array and thus the
'name' textbox on the interface is never highlighted so that the user
knows that he/she must provide that information.


[snip]


>
> > diff --git a/src/app/models/ip_v4_address.rb
> b/src/app/models/ip_v4_address.rb
> > new file mode 100644
> > index 0000000..40e8cf9
> > --- /dev/null
> > +++ b/src/app/models/ip_v4_address.rb
> > @@ -0,0 +1,48 @@
> > +# ip_v4_address.rb
> > +#
> > +# Copyright (C) 2008 Red Hat, Inc.
> > +# Written by Darryl L. Pierce <dpierce at redhat.com>,
> > +#            Mohammed Morsi   <mmorsi at redhat.com>
> > +#
> > +# This program is free software; you can redistribute it and/or modify
> > +# it under the terms of the GNU General Public License as published by
> > +# the Free Software Foundation; version 2 of the License.
> > +#
> > +# This program is distributed in the hope that it will be useful,
> > +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > +# GNU General Public License for more details.
> > +#
> > +# You should have received a copy of the GNU General Public License
> > +# along with this program; if not, write to the Free Software
> > +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> > +# MA  02110-1301, USA.  A copy of the GNU General Public License is
> > +# also available at http://www.gnu.org/copyleft/gpl.html.
> > +
> > +# +IpV4Address+ represents a single IPv4 address.
> > +#
> > +class IpV4Address < IpAddress
> > +  ADDRESS_TEST = %r{^(\d{1,3}\.){3}\d{1,3}$}
> > +
> > +  validates_presence_of :address,
> > +    :message => 'An address must be supplied.'
> > +  validates_format_of :address,
> > +    :with => ADDRESS_TEST
> > +
> > +  protected
> > +   def validate
> > +    unless address and address =~ ADDRESS_TEST
> > +      errors.add("address", "is of incorrect format")
> > +    end
> > +    unless !netmask or netmask == "" or netmask =~ ADDRESS_TEST
> > +      errors.add("netmask", "is of incorrect format")
> > +    end
> > +    unless !gateway or gateway == "" or gateway =~ ADDRESS_TEST
> > +      errors.add("gateway", "is of incorrect format")
> > +    end
> > +    unless !broadcast or broadcast == "" or broadcast =~ ADDRESS_TEST
> > +      errors.add("broadcast", "is of incorrect format")
> > +    end
>
> In the original patch I submitted each of these fields was tested using
> validates_format_of.
Thing is, since ip address is now being used for network, bonding, and
nic, some of those fields won't apply in all cases. Specifically only
the 'address' field should be set for ip addresses associated with nics
/ bondings (setting the others won't break anything, they just won't be
used) and only when the nic is associated with a statically assigned
network. The other fields are only used when an ip address is associated
with a network, thus it doesn't work to validate them for every instance.



>
> > +   end
> > +
> > +end
> > diff --git a/src/app/models/ip_v6_address.rb
> b/src/app/models/ip_v6_address.rb
> > new file mode 100644
> > index 0000000..9720179
> > --- /dev/null
> > +++ b/src/app/models/ip_v6_address.rb
> > @@ -0,0 +1,44 @@
> > +# ip_v6_address.rb
> > +#
> > +# Copyright (C) 2008 Red Hat, Inc.
> > +# Written by Darryl L. Pierce <dpierce at redhat.com>,
> > +#            Mohammed Morsi   <mmorsi at redhat.com>
> > +#
> > +# This program is free software; you can redistribute it and/or modify
> > +# it under the terms of the GNU General Public License as published by
> > +# the Free Software Foundation; version 2 of the License.
> > +#
> > +# This program is distributed in the hope that it will be useful,
> > +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > +# GNU General Public License for more details.
> > +#
> > +# You should have received a copy of the GNU General Public License
> > +# along with this program; if not, write to the Free Software
> > +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> > +# MA  02110-1301, USA.  A copy of the GNU General Public License is
> > +# also available at http://www.gnu.org/copyleft/gpl.html.
> > +
> > +# +IpV6Address+ represents a single IPv6 address.
> > +#
> > +class IpV6Address < IpAddress
> > +  ADDRESS_TEST = %r{^([0-9a-fA-F]{0,4}|0)(\:([0-9a-fA-F]{0,4}|0)){7}$}
> > +
> > +  validates_presence_of :address,
> > +    :message => 'An address must be provided.'
> > +  validates_format_of :address,
> > +    :with => ADDRESS_TEST
> > +
> > +  protected
> > +   def validate
> > +    unless address =~ ADDRESS_TEST
> > +      errors.add("address", "is of incorrect format")
> > +    end
> > +    unless !prefix or prefix == "" or prefix =~ ADDRESS_TEST
> > +      errors.add("prefix", "is of incorrect format")
> > +    end
> > +    unless !gateway or gateway == "" or gateway =~ ADDRESS_TEST
> > +      errors.add("gateway", "is of incorrect format")
> > +    end
>
> See note in the IpV4Address regarding validations. The Rails pattern is
> to use validates_format_of for checking content.
It is also a valid rails approach to use the validate method for
validations.

[snip]

>
> > diff --git a/src/app/models/nic.rb b/src/app/models/nic.rb
> > index baf7095..25d3ac2 100644
> > --- a/src/app/models/nic.rb
> > +++ b/src/app/models/nic.rb
> > @@ -19,7 +19,19 @@
>
> >  class Nic < ActiveRecord::Base
> >    belongs_to :host
> > -  belongs_to :boot_type
> > +  belongs_to :physical_network
> > +  has_many :ip_addresses, :dependent => :destroy
>
> > -  has_and_belongs_to_many :bonding, :join_table => 'bondings_nics'
> > +  has_and_belongs_to_many :bondings, :join_table => 'bondings_nics'
> > +
> > +  protected
> > +   def validate
> > +     errors.add("host_id", "must be specified") unless host_id
> > +     errors.add("physical_network_id", "must be specified") unless
> physical_network_id
>
> These should be done with validates_presence_of to keep the code
> consistent throughout the project. The error message added here is the
> default from Rails, so need not be specified.
>
> > +     if physical_network.boot_type.id ==
> > +         BootType.find(:first, :conditions => { :proto => 'static'
> }).id and
>
> You can test this without the second DB call using:
>
> if physical_network.boot_type.proto == static'

Good catch on this boot_type bit.

[snip]

I'll see what I can change based on this feedback. Once again I'm not
sure that the validation bit will be able to be changed due to the
aforementioned reasons.

  -Mo



From sseago at redhat.com  Fri Oct 31 14:59:05 2008
From: sseago at redhat.com (Scott Seago)
Date: Fri, 31 Oct 2008 10:59:05 -0400
Subject: [Ovirt-devel] [PATCH server] network integration into ovirt server
	db and wui
In-Reply-To: <1225416455-7607-1-git-send-email-mmorsi@redhat.com>
References: <1225416455-7607-1-git-send-email-mmorsi@redhat.com>
Message-ID: <490B1D39.4060202@redhat.com>


Mohammed Morsi wrote:
> diff --git a/src/app/controllers/host_controller.rb b/src/app/controllers/host_controller.rb
> index a40d297..120fe2a 100644
> --- a/src/app/controllers/host_controller.rb
> +++ b/src/app/controllers/host_controller.rb
> @@ -156,6 +156,16 @@ class HostController < ApplicationController
>      render :json => @json_hash
>    end
>  
> +  def edit_network
> +    render :layout => 'popup'
> +  end
> +
> +  def bondings_json
> +    bondings = Host.find(params[:id]).bondings
> +    bondings_json = []
> +    bondings.each{ |x| bondings_json.push({:id => x.id, :name => x.name}) }
> +    render :json => bondings_json
> +  end
>   
This is a really minor comment, but this could be written more compactly as:

+  def bondings_json
+    bondings = Host.find(params[:id]).bondings
+    render :json => bondings.collect{ |x| {:id => x.id, :name => x.name} 
+  end

>  
>  
> diff --git a/src/app/models/bonding.rb b/src/app/models/bonding.rb
> index 006c261..a3ad150 100644
> --- a/src/app/models/bonding.rb
> +++ b/src/app/models/bonding.rb
> @@ -30,6 +30,16 @@
>  # interface. They can be ignored if not used.
>  #
>  class Bonding < ActiveRecord::Base
> +  belongs_to :host
> +  belongs_to :bonding_type
> +  belongs_to :vlan
> +  has_many :ip_addresses, :dependent => :destroy
> +
> +  has_and_belongs_to_many :nics,
> +    :join_table  => 'bondings_nics',
> +    :foreign_key => :bonding_id
> +
> +
>    validates_presence_of :name,
>      :message => 'A name is required.'
>  
> @@ -42,18 +52,17 @@ class Bonding < ActiveRecord::Base
>    validates_presence_of :interface_name,
>      :message => 'An interface name is required.'
>  
> -  validates_presence_of :boot_type_id,
> -    :message => 'A boot type must be specified.'
> -
>    validates_presence_of :bonding_type_id,
>      :message => 'A bonding type must be specified.'
>  
> -  belongs_to :host
> -  belongs_to :bonding_type
> -  belongs_to :boot_type
> + protected
> +  def validate
> +    errors.add("name", "must be specified") unless name
> +    errors.add("interface_name", "must be specified") unless interface_name
> +    errors.add("bonding_type_id", "must be specified") unless bonding_type_id
> +    errors.add("host_id", "must be specified") unless host_id
> +    errors.add("vlan_id", "must be specified") unless vlan_id
> +  end
>   
Why not just use validates_presence_of for these? This seems like the 
standard out-of-the-box use case for validates_presence_of. Also, it 
looks like name and interface_name have the valiadition in both places 
-- validates_presence_of and validate.

>  
> -  has_and_belongs_to_many :nics,
> -    :join_table  => 'bondings_nics',
> -    :foreign_key => :bonding_id
>  
>  end
> diff --git a/src/app/models/physical_network.rb b/src/app/models/physical_network.rb
> new file mode 100644
> index 0000000..cba696a
> --- /dev/null
> +++ b/src/app/models/physical_network.rb
> @@ -0,0 +1,27 @@
> +# Copyright (C) 2008 Red Hat, Inc.
> +# Written by Mohammed Morsi <mmorsi at redhat.com>
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; version 2 of the License.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write to the Free Software
> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> +# MA  02110-1301, USA.  A copy of the GNU General Public License is
> +# also available at http://www.gnu.org/copyleft/gpl.html.
> +
> +class PhysicalNetwork < Network
> +   has_many :nics
> +
> + protected
> +  def validate
> +    errors.add("name", "must be specified") unless name
> +    errors.add("boot_type_id", "must be specified") unless boot_type_id
> +  end
> +end
>   
Why not use validates_presence_of for these?

> diff --git a/src/app/models/vlan.rb b/src/app/models/vlan.rb
> new file mode 100644
> index 0000000..2b96502
> --- /dev/null
> +++ b/src/app/models/vlan.rb
> @@ -0,0 +1,30 @@
> +# Copyright (C) 2008 Red Hat, Inc.
> +# Written by Mohammed Morsi <mmorsi at redhat.com>
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; version 2 of the License.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write to the Free Software
> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> +# MA  02110-1301, USA.  A copy of the GNU General Public License is
> +# also available at http://www.gnu.org/copyleft/gpl.html.
> +
> +class Vlan < Network
> +   has_many :bondings
> +
> +  validates_presence_of :number
> +
> + protected
> +  def validate
> +    errors.add("name", "must be specified") unless name
> +    errors.add("number", "must be specified") unless number
> +    errors.add("boot_type_id", "must be specified") unless boot_type_id
> +  end
> +end
>   
same comment on validates_presence_of here

> diff --git a/src/app/views/dashboard/index.html.erb b/src/app/views/dashboard/index.html.erb
> index 92cb4da..8815ebc 100644
> --- a/src/app/views/dashboard/index.html.erb
> +++ b/src/app/views/dashboard/index.html.erb
> @@ -13,6 +13,13 @@
>              </table>
>            </div>
>  
> +         <% if @can_modify %>
> +          <h3>Networks</h3>
> +          <a href="<%= url_for :controller => 'network', :action => 'list' %>">
> +             View / Edit
> +          </a>
> +         <% end %>
> +
>            </div> <!-- end #tools -->
>    </td> 
>   
I'm not sure adding this to the currently-empty dashboard page is the 
right place -- although I realize the discussions on what to do with 
this were somewhat inconclusive. Here's another thought. Since it 
doesn't really belong to a "dashboard" per se -- and we're not sure that 
the dashboard needs multiple tabs, could we rename the nav column to 
something more generic (like "Home" or something). and then have 
Dashboard as ths first tab, Networks as another tab (if you have 
permissions on them), etc.?

although this doesn't necessarily have to be done for this patch since 
it's more of a general UI cleanup task.

The other issue here is that this breaks the left nav state since it's a 
standard http link instead of an ajax request. We should probably 
address that at the same time we place this on a tab in the UI
>  
> diff --git a/src/app/views/host/edit_network.rhtml b/src/app/views/host/edit_network.rhtml
> new file mode 100644
> index 0000000..7ec3180
> --- /dev/null
> +++ b/src/app/views/host/edit_network.rhtml
>   
For edit, we should remove the ability to change the type.

Also the network details pane needs to show a list of associated IP 
addresses, Number (for vlans) and usages.

And the 'new network' screen doesn't allow you to set usages either.

> diff --git a/src/app/views/host/show.rhtml b/src/app/views/host/show.rhtml
> index d1b05ad..bc39a62 100644
> --- a/src/app/views/host/show.rhtml
> +++ b/src/app/views/host/show.rhtml
> @@ -17,6 +17,10 @@
>          <%= image_tag "icon_x.png" %> Clear VMs
>        </a> 
>      <% end -%>
> +    <%= link_to image_tag("icon_edit.png") +"Edit Network",
> +                 {:controller => 'host',
> +                  :action => 'edit_network', :id => @host.id},
> +                 :rel=>"facebox[.bolder]", :class=>"selection_facebox" %>
>    <%- end -%>
>  <%- end -%>
>  <script type="text/javascript">
>   
The edit network link here lets me add new bonded interfaces and edit 
existing ones. The 'NICs' pulldown doesn't have an option to create a 
new one.
Also the details pane doesn't show details on NICs or Bonded interfaces.


Scott



From dpierce at redhat.com  Fri Oct 31 15:15:01 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Fri, 31 Oct 2008 11:15:01 -0400
Subject: [Ovirt-devel] [PATCH server] network integration into ovirt server
	db and wui
In-Reply-To: <490B1A8F.2030403@redhat.com>
References: <1225416455-7607-1-git-send-email-mmorsi@redhat.com>
	<490B1100.5020401@redhat.com> <490B1A8F.2030403@redhat.com>
Message-ID: <490B20F5.7060905@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Mohammed Morsi wrote:
>> Some of the first things I've noticed is that, by removing columns from
>> the bondings and nics tables into the separate IP-related tables,
>> updates need to be made to the ManagedNodeConfiguration class. Since the
>> data itself is the same and just relocated, refactoring the
>> configuration class to get data from the appropriate objects should take
>> care of things initially.
>>
>> Before this patch can be pushed, it needs to fix that class. The unit
>> test itself does not need changing since the data ought to still look
>> the same once encoded. There may be changes needed for vlans, but that
>> will be additional tests.
>>
> Did you say on irc you were going to take care of this
> ManagedNodeConfiguration bit or did I mishear?

We cam do it in two stages. First you can fix the existing functionality
to use the new domain modeling. That way we lose nothing on that end and
maintain our current feature set.

Then, afterward, I can take on the new functionality for vlans.

>>> +  def validate
>>> +    errors.add("name", "must be specified") unless name
>>> +    errors.add("interface_name", "must be specified") unless
>> interface_name
>>> +    errors.add("bonding_type_id", "must be specified") unless
>> bonding_type_id
>>
>> This is duplicating the above validation with the validates_presence_of
>> check.
> The thing I noticed with validates_presence_of is that I found that it
> doesn't seem to trigger the validation components of the interface. For
> example if name isn't specified in the wui which is caught with a
> validate_presence_of instead of in the validate function, the
> corresponding errors is never added to the 'errors' array and thus the
> 'name' textbox on the interface is never highlighted so that the user
> knows that he/she must provide that information.

Not sure I follow this. Can you try rephrasing it?

>>> +  protected
>>> +   def validate
>>> +    unless address and address =~ ADDRESS_TEST
>>> +      errors.add("address", "is of incorrect format")
>>> +    end
>>> +    unless !netmask or netmask == "" or netmask =~ ADDRESS_TEST
>>> +      errors.add("netmask", "is of incorrect format")
>>> +    end
>>> +    unless !gateway or gateway == "" or gateway =~ ADDRESS_TEST
>>> +      errors.add("gateway", "is of incorrect format")
>>> +    end
>>> +    unless !broadcast or broadcast == "" or broadcast =~ ADDRESS_TEST
>>> +      errors.add("broadcast", "is of incorrect format")
>>> +    end
>> In the original patch I submitted each of these fields was tested using
>> validates_format_of.
> Thing is, since ip address is now being used for network, bonding, and
> nic, some of those fields won't apply in all cases. Specifically only
> the 'address' field should be set for ip addresses associated with nics
> / bondings (setting the others won't break anything, they just won't be
> used) and only when the nic is associated with a statically assigned
> network. The other fields are only used when an ip address is associated
> with a network, thus it doesn't work to validate them for every instance.

validates_presence_of has an :if modifier that accepts a Proc and can be
used to toggle whether that validation is checked. So that will allow
you to check the relationships prior to enforcing the validation.

>> See note in the IpV4Address regarding validations. The Rails pattern is
>> to use validates_format_of for checking content.
> It is also a valid rails approach to use the validate method for
> validations.

True, but we should be consistent in our code.

>>> diff --git a/src/app/models/nic.rb b/src/app/models/nic.rb
>>> index baf7095..25d3ac2 100644
>>> --- a/src/app/models/nic.rb
>>> +++ b/src/app/models/nic.rb
>>> @@ -19,7 +19,19 @@
>>>  class Nic < ActiveRecord::Base
>>>    belongs_to :host
>>> -  belongs_to :boot_type
>>> +  belongs_to :physical_network
>>> +  has_many :ip_addresses, :dependent => :destroy
>>> -  has_and_belongs_to_many :bonding, :join_table => 'bondings_nics'
>>> +  has_and_belongs_to_many :bondings, :join_table => 'bondings_nics'
>>> +
>>> +  protected
>>> +   def validate
>>> +     errors.add("host_id", "must be specified") unless host_id
>>> +     errors.add("physical_network_id", "must be specified") unless
>> physical_network_id
>>
>> These should be done with validates_presence_of to keep the code
>> consistent throughout the project. The error message added here is the
>> default from Rails, so need not be specified.
>>
>>> +     if physical_network.boot_type.id ==
>>> +         BootType.find(:first, :conditions => { :proto => 'static'
>> }).id and
>>
>> You can test this without the second DB call using:
>>
>> if physical_network.boot_type.proto == static'
> 
> Good catch on this boot_type bit.
> 
> [snip]
> 
> I'll see what I can change based on this feedback. Once again I'm not
> sure that the validation bit will be able to be changed due to the
> aforementioned reasons.

Check out the validation docs [1] for some details on using them in
models. I think we can get what you need without being inconsistent.

[1] -
http://api.rubyonrails.com/classes/ActiveRecord/Validations/ClassMethods.html

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkkLIPEACgkQjaT4DmxOfxuzlgCdHMR26G+UR7ns6SHp+7iPkqZ2
lmMAniA/tuTPC/OHHv5O8JhPlgZl8l8e
=+LlI
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081031/3b6b7580/attachment.vcf>

From mmorsi at redhat.com  Fri Oct 31 15:19:51 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Fri, 31 Oct 2008 11:19:51 -0400
Subject: [Ovirt-devel] [PATCH server] network integration into ovirt server
	db and wui
In-Reply-To: <490B1D39.4060202@redhat.com>
References: <1225416455-7607-1-git-send-email-mmorsi@redhat.com>
	<490B1D39.4060202@redhat.com>
Message-ID: <490B2217.9030902@redhat.com>

Scott Seago wrote:
>
> Mohammed Morsi wrote:
>> diff --git a/src/app/controllers/host_controller.rb
>> b/src/app/controllers/host_controller.rb
>> index a40d297..120fe2a 100644
>> --- a/src/app/controllers/host_controller.rb
>> +++ b/src/app/controllers/host_controller.rb
>> @@ -156,6 +156,16 @@ class HostController < ApplicationController
>>      render :json => @json_hash
>>    end
>>  
>> +  def edit_network
>> +    render :layout => 'popup'
>> +  end
>> +
>> +  def bondings_json
>> +    bondings = Host.find(params[:id]).bondings
>> +    bondings_json = []
>> +    bondings.each{ |x| bondings_json.push({:id => x.id, :name =>
>> x.name}) }
>> +    render :json => bondings_json
>> +  end
>>   
> This is a really minor comment, but this could be written more
> compactly as:
>
> +  def bondings_json
> +    bondings = Host.find(params[:id]).bondings
> +    render :json => bondings.collect{ |x| {:id => x.id, :name =>
> x.name} +  end
>
>>  
>>  
>> diff --git a/src/app/models/bonding.rb b/src/app/models/bonding.rb
>> index 006c261..a3ad150 100644
>> --- a/src/app/models/bonding.rb
>> +++ b/src/app/models/bonding.rb
>> @@ -30,6 +30,16 @@
>>  # interface. They can be ignored if not used.
>>  #
>>  class Bonding < ActiveRecord::Base
>> +  belongs_to :host
>> +  belongs_to :bonding_type
>> +  belongs_to :vlan
>> +  has_many :ip_addresses, :dependent => :destroy
>> +
>> +  has_and_belongs_to_many :nics,
>> +    :join_table  => 'bondings_nics',
>> +    :foreign_key => :bonding_id
>> +
>> +
>>    validates_presence_of :name,
>>      :message => 'A name is required.'
>>  
>> @@ -42,18 +52,17 @@ class Bonding < ActiveRecord::Base
>>    validates_presence_of :interface_name,
>>      :message => 'An interface name is required.'
>>  
>> -  validates_presence_of :boot_type_id,
>> -    :message => 'A boot type must be specified.'
>> -
>>    validates_presence_of :bonding_type_id,
>>      :message => 'A bonding type must be specified.'
>>  
>> -  belongs_to :host
>> -  belongs_to :bonding_type
>> -  belongs_to :boot_type
>> + protected
>> +  def validate
>> +    errors.add("name", "must be specified") unless name
>> +    errors.add("interface_name", "must be specified") unless
>> interface_name
>> +    errors.add("bonding_type_id", "must be specified") unless
>> bonding_type_id
>> +    errors.add("host_id", "must be specified") unless host_id
>> +    errors.add("vlan_id", "must be specified") unless vlan_id
>> +  end
>>   
> Why not just use validates_presence_of for these? This seems like the
> standard out-of-the-box use case for validates_presence_of. Also, it
> looks like name and interface_name have the valiadition in both places
> -- validates_presence_of and validate.
See my comments to Darryl's response to my patch. I am just concerned
the 'validates_presence_of' doesn't add anything to the errors array
which is needed by the wui. If this concern is unfound, then I can
remove the validations and simply use validates_presence_of



>
>>  
>> -  has_and_belongs_to_many :nics,
>> -    :join_table  => 'bondings_nics',
>> -    :foreign_key => :bonding_id
>>  
>>  end
>> diff --git a/src/app/models/physical_network.rb
>> b/src/app/models/physical_network.rb
>> new file mode 100644
>> index 0000000..cba696a
>> --- /dev/null
>> +++ b/src/app/models/physical_network.rb
>> @@ -0,0 +1,27 @@
>> +# Copyright (C) 2008 Red Hat, Inc.
>> +# Written by Mohammed Morsi <mmorsi at redhat.com>
>> +#
>> +# This program is free software; you can redistribute it and/or modify
>> +# it under the terms of the GNU General Public License as published by
>> +# the Free Software Foundation; version 2 of the License.
>> +#
>> +# This program is distributed in the hope that it will be useful,
>> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
>> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>> +# GNU General Public License for more details.
>> +#
>> +# You should have received a copy of the GNU General Public License
>> +# along with this program; if not, write to the Free Software
>> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
>> +# MA  02110-1301, USA.  A copy of the GNU General Public License is
>> +# also available at http://www.gnu.org/copyleft/gpl.html.
>> +
>> +class PhysicalNetwork < Network
>> +   has_many :nics
>> +
>> + protected
>> +  def validate
>> +    errors.add("name", "must be specified") unless name
>> +    errors.add("boot_type_id", "must be specified") unless boot_type_id
>> +  end
>> +end
>>   
> Why not use validates_presence_of for these?
>
>> diff --git a/src/app/models/vlan.rb b/src/app/models/vlan.rb
>> new file mode 100644
>> index 0000000..2b96502
>> --- /dev/null
>> +++ b/src/app/models/vlan.rb
>> @@ -0,0 +1,30 @@
>> +# Copyright (C) 2008 Red Hat, Inc.
>> +# Written by Mohammed Morsi <mmorsi at redhat.com>
>> +#
>> +# This program is free software; you can redistribute it and/or modify
>> +# it under the terms of the GNU General Public License as published by
>> +# the Free Software Foundation; version 2 of the License.
>> +#
>> +# This program is distributed in the hope that it will be useful,
>> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
>> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>> +# GNU General Public License for more details.
>> +#
>> +# You should have received a copy of the GNU General Public License
>> +# along with this program; if not, write to the Free Software
>> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
>> +# MA  02110-1301, USA.  A copy of the GNU General Public License is
>> +# also available at http://www.gnu.org/copyleft/gpl.html.
>> +
>> +class Vlan < Network
>> +   has_many :bondings
>> +
>> +  validates_presence_of :number
>> +
>> + protected
>> +  def validate
>> +    errors.add("name", "must be specified") unless name
>> +    errors.add("number", "must be specified") unless number
>> +    errors.add("boot_type_id", "must be specified") unless boot_type_id
>> +  end
>> +end
>>   
> same comment on validates_presence_of here
>
>> diff --git a/src/app/views/dashboard/index.html.erb
>> b/src/app/views/dashboard/index.html.erb
>> index 92cb4da..8815ebc 100644
>> --- a/src/app/views/dashboard/index.html.erb
>> +++ b/src/app/views/dashboard/index.html.erb
>> @@ -13,6 +13,13 @@
>>              </table>
>>            </div>
>>  
>> +         <% if @can_modify %>
>> +          <h3>Networks</h3>
>> +          <a href="<%= url_for :controller => 'network', :action =>
>> 'list' %>">
>> +             View / Edit
>> +          </a>
>> +         <% end %>
>> +
>>            </div> <!-- end #tools -->
>>    </td>   
> I'm not sure adding this to the currently-empty dashboard page is the
> right place -- although I realize the discussions on what to do with
> this were somewhat inconclusive. Here's another thought. Since it
> doesn't really belong to a "dashboard" per se -- and we're not sure
> that the dashboard needs multiple tabs, could we rename the nav column
> to something more generic (like "Home" or something). and then have
> Dashboard as ths first tab, Networks as another tab (if you have
> permissions on them), etc.?
>
> although this doesn't necessarily have to be done for this patch since
> it's more of a general UI cleanup task.
>
> The other issue here is that this breaks the left nav state since it's
> a standard http link instead of an ajax request. We should probably
> address that at the same time we place this on a tab in the UI
>>  
>> diff --git a/src/app/views/host/edit_network.rhtml
>> b/src/app/views/host/edit_network.rhtml
>> new file mode 100644
>> index 0000000..7ec3180
>> --- /dev/null
>> +++ b/src/app/views/host/edit_network.rhtml
>>   
> For edit, we should remove the ability to change the type.
>
> Also the network details pane needs to show a list of associated IP
> addresses, Number (for vlans) and usages.
>
> And the 'new network' screen doesn't allow you to set usages either.
>
>> diff --git a/src/app/views/host/show.rhtml
>> b/src/app/views/host/show.rhtml
>> index d1b05ad..bc39a62 100644
>> --- a/src/app/views/host/show.rhtml
>> +++ b/src/app/views/host/show.rhtml
>> @@ -17,6 +17,10 @@
>>          <%= image_tag "icon_x.png" %> Clear VMs
>>        </a>      <% end -%>
>> +    <%= link_to image_tag("icon_edit.png") +"Edit Network",
>> +                 {:controller => 'host',
>> +                  :action => 'edit_network', :id => @host.id},
>> +                 :rel=>"facebox[.bolder]",
>> :class=>"selection_facebox" %>
>>    <%- end -%>
>>  <%- end -%>
>>  <script type="text/javascript">
>>   
> The edit network link here lets me add new bonded interfaces and edit
> existing ones. The 'NICs' pulldown doesn't have an option to create a
> new one.
> Also the details pane doesn't show details on NICs or Bonded interfaces.
Is creating a new nic valid? I was under the impression that nics were
physical devices, eg a nic gets added when its actually attached to the
host and the node communicates to the server that a new nic has  been
added and should be added to the db.

   -Mo



From mmorsi at redhat.com  Fri Oct 31 15:35:36 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Fri, 31 Oct 2008 11:35:36 -0400
Subject: [Ovirt-devel] Re: [PATCH server] network integration into ovirt
	server db and wui
In-Reply-To: <1225416455-7607-1-git-send-email-mmorsi@redhat.com>
References: <1225416455-7607-1-git-send-email-mmorsi@redhat.com>
Message-ID: <490B25C8.1020509@redhat.com>

Based on Darryl's, Scott's, and Dan's feedback on my patch, the
following things have been identified as needing to be done for the
network component of the interface. I'm not sure all of this will be
able to be done by the end of today (unless I can get some development
help) so this list will need to be prioritized:

1. Remove 'validate' method, replace w/ 'validates_presence_of',
'validate_format_of' where we can
2. Change ManageNodeConfiguration bit, to use new network model / schema
3. Disable type selection for 'edit network' form
4. Associate vlan w/ physical_network, eg add parent_network_id to
network table, allow this to be specified via new / edit network form
(only for vlans)
5. Add ip address information to the network details pane
6. Add nic / bonding information to host details pane
7. VLANs should be associated with nics as well (seemingly small, but
potentially large change)
8. Add usages multi-select box to create / edit network form
9. Remove 'add / edit networks' link from dashboard, use tabs
10. Add 'add / remove nics' functionality and interface
11. Small cleanup fixes

>From what I see / heard, numbers 2,3, 8 are must-haves, eg my patch
can't be pushed w/ out these. The others, as important as they are, can
wait for a subsequent bug fix patch. What do you all think, taking into
consideration that we want this pushed by the end of today.

   -Mo



From dpierce at redhat.com  Fri Oct 31 15:52:52 2008
From: dpierce at redhat.com (Darryl Pierce)
Date: Fri, 31 Oct 2008 11:52:52 -0400
Subject: [Ovirt-devel] [PATCH server] network integration into ovirt server
	db and wui
In-Reply-To: <490B2217.9030902@redhat.com>
References: <1225416455-7607-1-git-send-email-mmorsi@redhat.com>	<490B1D39.4060202@redhat.com>
	<490B2217.9030902@redhat.com>
Message-ID: <490B29D4.2070307@redhat.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Mohammed Morsi wrote:
>> Why not just use validates_presence_of for these? This seems like the
>> standard out-of-the-box use case for validates_presence_of. Also, it
>> looks like name and interface_name have the valiadition in both places
>> -- validates_presence_of and validate.
> See my comments to Darryl's response to my patch. I am just concerned
> the 'validates_presence_of' doesn't add anything to the errors array
> which is needed by the wui. If this concern is unfound, then I can
> remove the validations and simply use validates_presence_of

It should be adding the errors there, definitely. Look at the source in
the link I gave you earlier and you'll see where it does add those error
messages to the record.error attribute.

- --
Darryl L. Pierce <dpierce at redhat.com> : GPG KEYID: 6C4E7F1B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkkLKc8ACgkQjaT4DmxOfxsSvwCdEoWtgeE8o0g/UCFlR6cCQIgq
TG4AmwR7GvpkSIqUyGbW+mOqwxhce+gr
=EzYd
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dpierce.vcf
Type: text/x-vcard
Size: 319 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081031/2d0dc325/attachment.vcf>

From sseago at redhat.com  Fri Oct 31 15:53:17 2008
From: sseago at redhat.com (Scott Seago)
Date: Fri, 31 Oct 2008 11:53:17 -0400
Subject: [Ovirt-devel] [PATCH server] network integration into ovirt server
	db and wui
In-Reply-To: <490B2217.9030902@redhat.com>
References: <1225416455-7607-1-git-send-email-mmorsi@redhat.com>
	<490B1D39.4060202@redhat.com> <490B2217.9030902@redhat.com>
Message-ID: <490B29ED.30602@redhat.com>

Mohammed Morsi wrote:
> Scott Seago wrote:
>   
>> Mohammed Morsi wrote:
>>     
>>
>>>  
>>>  
>>> diff --git a/src/app/models/bonding.rb b/src/app/models/bonding.rb
>>> index 006c261..a3ad150 100644
>>> --- a/src/app/models/bonding.rb
>>> +++ b/src/app/models/bonding.rb
>>> @@ -30,6 +30,16 @@
>>>  # interface. They can be ignored if not used.
>>>  #
>>>  class Bonding < ActiveRecord::Base
>>> +  belongs_to :host
>>> +  belongs_to :bonding_type
>>> +  belongs_to :vlan
>>> +  has_many :ip_addresses, :dependent => :destroy
>>> +
>>> +  has_and_belongs_to_many :nics,
>>> +    :join_table  => 'bondings_nics',
>>> +    :foreign_key => :bonding_id
>>> +
>>> +
>>>    validates_presence_of :name,
>>>      :message => 'A name is required.'
>>>  
>>> @@ -42,18 +52,17 @@ class Bonding < ActiveRecord::Base
>>>    validates_presence_of :interface_name,
>>>      :message => 'An interface name is required.'
>>>  
>>> -  validates_presence_of :boot_type_id,
>>> -    :message => 'A boot type must be specified.'
>>> -
>>>    validates_presence_of :bonding_type_id,
>>>      :message => 'A bonding type must be specified.'
>>>  
>>> -  belongs_to :host
>>> -  belongs_to :bonding_type
>>> -  belongs_to :boot_type
>>> + protected
>>> +  def validate
>>> +    errors.add("name", "must be specified") unless name
>>> +    errors.add("interface_name", "must be specified") unless
>>> interface_name
>>> +    errors.add("bonding_type_id", "must be specified") unless
>>> bonding_type_id
>>> +    errors.add("host_id", "must be specified") unless host_id
>>> +    errors.add("vlan_id", "must be specified") unless vlan_id
>>> +  end
>>>   
>>>       
>> Why not just use validates_presence_of for these? This seems like the
>> standard out-of-the-box use case for validates_presence_of. Also, it
>> looks like name and interface_name have the valiadition in both places
>> -- validates_presence_of and validate.
>>     
> See my comments to Darryl's response to my patch. I am just concerned
> the 'validates_presence_of' doesn't add anything to the errors array
> which is needed by the wui. If this concern is unfound, then I can
> remove the validations and simply use validates_presence_of
>
>
>   
It definitely adds it to the errors array, so both ways of doing this 
should be equivalent.


>
>>     
>>> diff --git a/src/app/views/dashboard/index.html.erb
>>> b/src/app/views/dashboard/index.html.erb
>>> index 92cb4da..8815ebc 100644
>>> --- a/src/app/views/dashboard/index.html.erb
>>> +++ b/src/app/views/dashboard/index.html.erb
>>> @@ -13,6 +13,13 @@
>>>              </table>
>>>            </div>
>>>  
>>> +         <% if @can_modify %>
>>> +          <h3>Networks</h3>
>>> +          <a href="<%= url_for :controller => 'network', :action =>
>>> 'list' %>">
>>> +             View / Edit
>>> +          </a>
>>> +         <% end %>
>>> +
>>>            </div> <!-- end #tools -->
>>>    </td>   
>>>       
>> I'm not sure adding this to the currently-empty dashboard page is the
>> right place -- although I realize the discussions on what to do with
>> this were somewhat inconclusive. Here's another thought. Since it
>> doesn't really belong to a "dashboard" per se -- and we're not sure
>> that the dashboard needs multiple tabs, could we rename the nav column
>> to something more generic (like "Home" or something). and then have
>> Dashboard as ths first tab, Networks as another tab (if you have
>> permissions on them), etc.?
>>
>> although this doesn't necessarily have to be done for this patch since
>> it's more of a general UI cleanup task.
>>
>> The other issue here is that this breaks the left nav state since it's
>> a standard http link instead of an ajax request. We should probably
>> address that at the same time we place this on a tab in the UI
>>     
>>>  
>>> diff --git a/src/app/views/host/edit_network.rhtml
>>> b/src/app/views/host/edit_network.rhtml
>>> new file mode 100644
>>> index 0000000..7ec3180
>>> --- /dev/null
>>> +++ b/src/app/views/host/edit_network.rhtml
>>>   
>>>       
>> For edit, we should remove the ability to change the type.
>>
>> Also the network details pane needs to show a list of associated IP
>> addresses, Number (for vlans) and usages.
>>
>> And the 'new network' screen doesn't allow you to set usages either.
>>
>>     
>>> diff --git a/src/app/views/host/show.rhtml
>>> b/src/app/views/host/show.rhtml
>>> index d1b05ad..bc39a62 100644
>>> --- a/src/app/views/host/show.rhtml
>>> +++ b/src/app/views/host/show.rhtml
>>> @@ -17,6 +17,10 @@
>>>          <%= image_tag "icon_x.png" %> Clear VMs
>>>        </a>      <% end -%>
>>> +    <%= link_to image_tag("icon_edit.png") +"Edit Network",
>>> +                 {:controller => 'host',
>>> +                  :action => 'edit_network', :id => @host.id},
>>> +                 :rel=>"facebox[.bolder]",
>>> :class=>"selection_facebox" %>
>>>    <%- end -%>
>>>  <%- end -%>
>>>  <script type="text/javascript">
>>>   
>>>       
>> The edit network link here lets me add new bonded interfaces and edit
>> existing ones. The 'NICs' pulldown doesn't have an option to create a
>> new one.
>> Also the details pane doesn't show details on NICs or Bonded interfaces.
>>     
> Is creating a new nic valid? I was under the impression that nics were
> physical devices, eg a nic gets added when its actually attached to the
> host and the node communicates to the server that a new nic has  been
> added and should be added to the db.
>
>    -Mo
>   
Ahh, good point. host-browser should be putting in the NICs. Never mind 
the 'new NIC' comment then.

Scott



From hbrock at redhat.com  Fri Oct 31 16:03:13 2008
From: hbrock at redhat.com (Hugh O. Brock)
Date: Fri, 31 Oct 2008 12:03:13 -0400
Subject: [Ovirt-devel] Re: [PATCH server] network integration into ovirt
	server db and wui
In-Reply-To: <490B25C8.1020509@redhat.com>
References: <1225416455-7607-1-git-send-email-mmorsi@redhat.com>
	<490B25C8.1020509@redhat.com>
Message-ID: <20081031160305.GH30553@redhat.com>

On Fri, Oct 31, 2008 at 11:35:36AM -0400, Mohammed Morsi wrote:
> Based on Darryl's, Scott's, and Dan's feedback on my patch, the
> following things have been identified as needing to be done for the
> network component of the interface. I'm not sure all of this will be
> able to be done by the end of today (unless I can get some development
> help) so this list will need to be prioritized:
> 
> 1. Remove 'validate' method, replace w/ 'validates_presence_of',
> 'validate_format_of' where we can
> 2. Change ManageNodeConfiguration bit, to use new network model / schema
> 3. Disable type selection for 'edit network' form
> 4. Associate vlan w/ physical_network, eg add parent_network_id to
> network table, allow this to be specified via new / edit network form
> (only for vlans)
> 5. Add ip address information to the network details pane
> 6. Add nic / bonding information to host details pane
> 7. VLANs should be associated with nics as well (seemingly small, but
> potentially large change)
> 8. Add usages multi-select box to create / edit network form
> 9. Remove 'add / edit networks' link from dashboard, use tabs
> 10. Add 'add / remove nics' functionality and interface
> 11. Small cleanup fixes
> 
> From what I see / heard, numbers 2,3, 8 are must-haves, eg my patch
> can't be pushed w/ out these. The others, as important as they are, can
> wait for a subsequent bug fix patch. What do you all think, taking into
> consideration that we want this pushed by the end of today.

Jay and Scott, can you guys lend a hand and get this patch wrapped
today? I don't know if the work can be partitioned among 3, what do
you think?

Thanks,
--Hugh



From mmorsi at redhat.com  Fri Oct 31 16:21:58 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Fri, 31 Oct 2008 12:21:58 -0400
Subject: [Ovirt-devel] Re: [PATCH server] network integration into ovirt
	server db and wui
In-Reply-To: <20081031160305.GH30553@redhat.com>
References: <1225416455-7607-1-git-send-email-mmorsi@redhat.com>
	<490B25C8.1020509@redhat.com> <20081031160305.GH30553@redhat.com>
Message-ID: <490B30A6.70406@redhat.com>

Hugh O. Brock wrote:
> On Fri, Oct 31, 2008 at 11:35:36AM -0400, Mohammed Morsi wrote:
>   
>> Based on Darryl's, Scott's, and Dan's feedback on my patch, the
>> following things have been identified as needing to be done for the
>> network component of the interface. I'm not sure all of this will be
>> able to be done by the end of today (unless I can get some development
>> help) so this list will need to be prioritized:
>>
>> 1. Remove 'validate' method, replace w/ 'validates_presence_of',
>> 'validate_format_of' where we can
>>     
I can take care of this bit

>> 2. Change ManageNodeConfiguration bit, to use new network model / schema
>>     
The only thing this depends on is the model changes I did, which was
based on http://www.ovirt.org/page/Redesigned_Network_Configuration. If
someone who knows this bit more that I do can take care of it, it would
speed things up

>> 3. Disable type selection for 'edit network' form
>>     
Small, quick fix that I can take care of

>> 4. Associate vlan w/ physical_network, eg add parent_network_id to
>> network table, allow this to be specified via new / edit network form
>> (only for vlans)
>>     
>From what I gather, this is important, but not critical for this patch.
This probably can be taken care of with a followup / bug-fix patch next
week.

>> 5. Add ip address information to the network details pane
>> 6. Add nic / bonding information to host details pane
>>     
Both these items should be fairly straightforward and I can take care of.

>> 7. VLANs should be associated with nics as well (seemingly small, but
>> potentially large change)
>>     
Once again, I'm seeing this as important but can wait till the follow up
patch next week, correct?

>> 8. Add usages multi-select box to create / edit network form
>>     
Another straightforward item I can take care of

>> 9. Remove 'add / edit networks' link from dashboard, use tabs
>>     
Shouldn't be too hard, but low on priority in lieu of the other items,
so if anyone wants to grab this feel free, otherwise it might not get in
today.

>> 10. Add 'add / remove nics' functionality and interface
>>     
This is incorrect and should no longer be on this list.

>> 11. Small cleanup fixes
>>     
There are a few specific things as pointed out by Darryl and Scott, in
addition to things that can just be taken as they are come accross.

>> From what I see / heard, numbers 2,3, 8 are must-haves, eg my patch
>> can't be pushed w/ out these. The others, as important as they are, can
>> wait for a subsequent bug fix patch. What do you all think, taking into
>> consideration that we want this pushed by the end of today.
>>     
>
> Jay and Scott, can you guys lend a hand and get this patch wrapped
> today? I don't know if the work can be partitioned among 3, what do
> you think?
>
> Thanks,
> --Hugh
>   

Thanks for the help everyone,
    -Mo



From sseago at redhat.com  Fri Oct 31 16:32:32 2008
From: sseago at redhat.com (Scott Seago)
Date: Fri, 31 Oct 2008 12:32:32 -0400
Subject: [Ovirt-devel] Re: [PATCH server] network integration into ovirt
	server db and wui
In-Reply-To: <490B30A6.70406@redhat.com>
References: <1225416455-7607-1-git-send-email-mmorsi@redhat.com>
	<490B25C8.1020509@redhat.com>
	<20081031160305.GH30553@redhat.com> <490B30A6.70406@redhat.com>
Message-ID: <490B3320.6000603@redhat.com>

Mohammed Morsi wrote:
> Hugh O. Brock wrote:
>   
>> On Fri, Oct 31, 2008 at 11:35:36AM -0400, Mohammed Morsi wrote:
>>   
>>     
>>> Based on Darryl's, Scott's, and Dan's feedback on my patch, the
>>> following things have been identified as needing to be done for the
>>> network component of the interface. I'm not sure all of this will be
>>> able to be done by the end of today (unless I can get some development
>>> help) so this list will need to be prioritized:
>>>
>>> 1. Remove 'validate' method, replace w/ 'validates_presence_of',
>>> 'validate_format_of' where we can
>>>     
>>>       
> I can take care of this bit
>
>   
>>> 2. Change ManageNodeConfiguration bit, to use new network model / schema
>>>     
>>>       
> The only thing this depends on is the model changes I did, which was
> based on http://www.ovirt.org/page/Redesigned_Network_Configuration. If
> someone who knows this bit more that I do can take care of it, it would
> speed things up
>
>   
>>> 3. Disable type selection for 'edit network' form
>>>     
>>>       
> Small, quick fix that I can take care of
>
>   
>>> 4. Associate vlan w/ physical_network, eg add parent_network_id to
>>> network table, allow this to be specified via new / edit network form
>>> (only for vlans)
>>>     
>>>       
> From what I gather, this is important, but not critical for this patch.
> This probably can be taken care of with a followup / bug-fix patch next
> week.
>
>   
Yeah I wouldn't want to make any last-minute model changes. We should 
have a separate discussion as to whether the model is complete or if 
we're missing any bits involving VLAN associations, etc. We can also 
address the nic/bonding mapping table bit at the  same time.
>>> 5. Add ip address information to the network details pane
>>> 6. Add nic / bonding information to host details pane
>>>     
>>>       
> Both these items should be fairly straightforward and I can take care of.
>
>   
>>> 7. VLANs should be associated with nics as well (seemingly small, but
>>> potentially large change)
>>>     
>>>       
> Once again, I'm seeing this as important but can wait till the follow up
> patch next week, correct?
>
>   
Yes, lets not change the model again today.

>>> 8. Add usages multi-select box to create / edit network form
>>>     
>>>       
> Another straightforward item I can take care of
>
>   
>>> 9. Remove 'add / edit networks' link from dashboard, use tabs
>>>     
>>>       
> Shouldn't be too hard, but low on priority in lieu of the other items,
> so if anyone wants to grab this feel free, otherwise it might not get in
> today.
>
>   
This should probably be a follow-on patch once we have consensus on how 
to present the non-pool UI bits.  I'm thinking what we want here is a 
"Home" nav link (instead of 'dashboard') with 3 tabs for now: Dashboard, 
Networks, and Search. But nothing we need today.
>>> 10. Add 'add / remove nics' functionality and interface
>>>     
>>>       
> This is incorrect and should no longer be on this list.
>
>   
>>> 11. Small cleanup fixes
>>>     
>>>       
> There are a few specific things as pointed out by Darryl and Scott, in
> addition to things that can just be taken as they are come accross.
>
>   
>>> From what I see / heard, numbers 2,3, 8 are must-haves, eg my patch
>>> can't be pushed w/ out these. The others, as important as they are, can
>>> wait for a subsequent bug fix patch. What do you all think, taking into
>>> consideration that we want this pushed by the end of today.
>>>     
>>>       
>> Jay and Scott, can you guys lend a hand and get this patch wrapped
>> today? I don't know if the work can be partitioned among 3, what do
>> you think?
>>
>> Thanks,
>> --Hugh
>>   
>>     
>
> Thanks for the help everyone,
>     -Mo
>   

Scott



From imain at redhat.com  Fri Oct 31 18:30:28 2008
From: imain at redhat.com (Ian Main)
Date: Fri, 31 Oct 2008 11:30:28 -0700
Subject: [Ovirt-devel] [PATCH recipe] Add new rubygem-qpid package to the
	wui.
Message-ID: <1225477828-3304-1-git-send-email-imain@redhat.com>

This patch adds rubygem-qpid package to the node and removes
the python qpid package.

Signed-off-by: Ian Main <imain at redhat.com>
---
 ovirt-recipe.spec.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ovirt-recipe.spec.in b/ovirt-recipe.spec.in
index 9fef6af..2993770 100644
--- a/ovirt-recipe.spec.in
+++ b/ovirt-recipe.spec.in
@@ -38,9 +38,9 @@ Requires: syslinux
 Requires: lokkit
 Requires: curl
 Requires: qpidd
+Requires: rubygem-qpid
 Requires: qpidc
 Requires: qmf
-Requires: python-qpid
 
 %description
 Thincrust oVirt Server Appliance Recipe
-- 
1.5.6.5



From imain at redhat.com  Fri Oct 31 18:31:29 2008
From: imain at redhat.com (Ian Main)
Date: Fri, 31 Oct 2008 11:31:29 -0700
Subject: [Ovirt-devel] [PATCH node-image] Add boost thread library to node.
Message-ID: <1225477889-3370-1-git-send-email-imain@redhat.com>

Apparently we have a new requirement for qmf agents, the boost
thread library.  Add it to the node.

Signed-off-by: Ian Main <imain at redhat.com>
---
 common-blacklist.ks |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/common-blacklist.ks b/common-blacklist.ks
index 149a3b1..2fa2d82 100644
--- a/common-blacklist.ks
+++ b/common-blacklist.ks
@@ -111,9 +111,11 @@ echo "Running image-minimizer..."
 drop /usr/lib/libboost*
 keep /usr/lib/libboost_program_options.so*
 keep /usr/lib/libboost_filesystem.so*
+keep /usr/lib/libboost_thread-mt.so*
 drop /usr/lib64/libboost*
 keep /usr/lib64/libboost_program_options.so*
 keep /usr/lib64/libboost_filesystem.so*
+keep /usr/lib64/libboost_thread-mt.so*
 
 %end
 
-- 
1.5.6.5



From imain at redhat.com  Fri Oct 31 18:32:30 2008
From: imain at redhat.com (Ian Main)
Date: Fri, 31 Oct 2008 11:32:30 -0700
Subject: [Ovirt-devel] [PATCH server] Replace python qpid example with ruby
	example.
In-Reply-To: <\>
References: <\>
Message-ID: <1225477950-3417-1-git-send-email-imain@redhat.com>

This change removes the python qpid demo and replaces it
with a shiny new ruby demo!

Signed-off-by: Ian Main <imain at redhat.com>
---
 src/qmf-libvirt-example.rb |   62 ++++++++++++++++++++++++++++++++++++++++++++
 src/qpid_list_demo.py      |   42 -----------------------------
 2 files changed, 62 insertions(+), 42 deletions(-)
 create mode 100644 src/qmf-libvirt-example.rb
 delete mode 100755 src/qpid_list_demo.py

diff --git a/src/qmf-libvirt-example.rb b/src/qmf-libvirt-example.rb
new file mode 100644
index 0000000..5bfe44d
--- /dev/null
+++ b/src/qmf-libvirt-example.rb
@@ -0,0 +1,62 @@
+#!/usr/bin/ruby
+
+require "rubygems"
+require "qpid"
+
+s = Qpid::Qmf::Session.new()
+b = s.add_broker("amqp://localhost:5672")
+
+while true:
+    nodes = s.objects(:class => "node")
+    nodes.each do |node|
+        puts "node: #{node.hostname}"
+        for (key, val) in node.properties
+            puts "  property: #{key}, #{val}"
+        end
+
+        # Find any domains that on the current node.
+        domains = s.objects(:class => "domain", 'node' => node.object_id)
+        domains.each do |domain|
+            r = domain.getXMLDesc()
+            puts "getXMLDesc() status: #{r.status}"
+            puts "getXMLDesc() status: #{r.text}"
+            if r.status == 0
+                puts "xml length: #{r.description.length}"
+            end
+
+            puts "  domain: #{domain.name}, state: #{domain.state}, id: #{domain.id}"
+            for (key, val) in domain.properties
+                puts "    property: #{key}, #{val}"
+            end
+        end
+
+        pools = s.objects(:class => "pool", 'node' => node.object_id)
+        pools.each do |pool|
+            puts "  pool: #{pool.name}"
+            for (key, val) in pool.properties
+                puts "    property: #{key}, #{val}"
+            end
+
+            r = pool.getXMLDesc()
+            puts "getXMLDesc() status: #{r.status}"
+            puts "getXMLDesc() text: #{r.text}"
+            if r.status == 0
+                puts "xml length: #{r.description.length}"
+            end
+
+            # Find volumes that are part of the pool.
+            volumes = s.objects(:class => "volume", 'pool' => pool.object_id)
+            volumes.each do |volume|
+                puts "    volume: #{volume.name}"
+                for (key, val) in volume.properties
+                    puts "      property: #{key}, #{val}"
+                end
+            end
+        end
+
+    end
+
+    puts '----------------------------'
+    sleep(5)
+
+end
diff --git a/src/qpid_list_demo.py b/src/qpid_list_demo.py
deleted file mode 100755
index 3b96c8a..0000000
--- a/src/qpid_list_demo.py
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/python
-
-# This script is temporary!  It's just a demo to show how the qpid
-# stuff works.  This prints out a hierarchy of nodes/domains/pools/volumes
-# every five seconds.
-
-from qpid.qmfconsole import Session
-import time
-
-s = Session()
-b = s.addBroker()
-
-while True:
-    nodes = s.getObjects(cls="node")
-    for node in nodes:
-        print 'node:', node.hostname
-        for prop in node.properties:
-            print "  property:", prop
-        # Find any domains that on the current node.
-        domains = s.getObjects(cls="domain", node=node.objectId)
-        for domain in domains:
-            print '  domain:', domain.name
-            for prop in domain.properties:
-                print "    property:", prop
-
-        pools = s.getObjects(cls="pool", node=node.objectId)
-        for pool in pools:
-            print '  pool:', pool.name
-            for prop in pool.properties:
-                print "    property:", prop
-
-            # Find volumes that are part of the pool.
-            volumes = s.getObjects(cls="volume", pool=pool.objectId)
-            for volume in volumes:
-                print '    volume:', volume.name
-                for prop in volume.properties:
-                    print "      property:", prop
-
-    time.sleep(5)
-
-    print '----------------------------'
-
-- 
1.5.6.5



From imain at redhat.com  Fri Oct 31 18:47:07 2008
From: imain at redhat.com (Ian Main)
Date: Fri, 31 Oct 2008 11:47:07 -0700
Subject: [Ovirt-devel] Re: [PATCH recipe] Add new rubygem-qpid package to
	the wui.
In-Reply-To: <1225477828-3304-1-git-send-email-imain@redhat.com>
References: <1225477828-3304-1-git-send-email-imain@redhat.com>
Message-ID: <20081031114707.384f8852@tp.mains.net>


I'm just going to push this stuff.  I've smoke tested it and it seems rather benign.

	Ian


On Fri, 31 Oct 2008 11:30:28 -0700
Ian Main <imain at redhat.com> wrote:

> This patch adds rubygem-qpid package to the node and removes
> the python qpid package.
> 
> Signed-off-by: Ian Main <imain at redhat.com>
> ---
>  ovirt-recipe.spec.in |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/ovirt-recipe.spec.in b/ovirt-recipe.spec.in
> index 9fef6af..2993770 100644
> --- a/ovirt-recipe.spec.in
> +++ b/ovirt-recipe.spec.in
> @@ -38,9 +38,9 @@ Requires: syslinux
>  Requires: lokkit
>  Requires: curl
>  Requires: qpidd
> +Requires: rubygem-qpid
>  Requires: qpidc
>  Requires: qmf
> -Requires: python-qpid
>  
>  %description
>  Thincrust oVirt Server Appliance Recipe
> -- 
> 1.5.6.5
> 



From imain at redhat.com  Fri Oct 31 18:52:34 2008
From: imain at redhat.com (Ian Main)
Date: Fri, 31 Oct 2008 11:52:34 -0700
Subject: [Ovirt-devel] Re: [PATCH node-image] Add boost thread library to
	node.
In-Reply-To: <1225477889-3370-1-git-send-email-imain@redhat.com>
References: <1225477889-3370-1-git-send-email-imain@redhat.com>
Message-ID: <20081031115234.28adc318@tp.mains.net>


I see Alan beat me to it on this one. :)  Ignore.


On Fri, 31 Oct 2008 11:31:29 -0700
Ian Main <imain at redhat.com> wrote:

> Apparently we have a new requirement for qmf agents, the boost
> thread library.  Add it to the node.
> 
> Signed-off-by: Ian Main <imain at redhat.com>
> ---
>  common-blacklist.ks |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/common-blacklist.ks b/common-blacklist.ks
> index 149a3b1..2fa2d82 100644
> --- a/common-blacklist.ks
> +++ b/common-blacklist.ks
> @@ -111,9 +111,11 @@ echo "Running image-minimizer..."
>  drop /usr/lib/libboost*
>  keep /usr/lib/libboost_program_options.so*
>  keep /usr/lib/libboost_filesystem.so*
> +keep /usr/lib/libboost_thread-mt.so*
>  drop /usr/lib64/libboost*
>  keep /usr/lib64/libboost_program_options.so*
>  keep /usr/lib64/libboost_filesystem.so*
> +keep /usr/lib64/libboost_thread-mt.so*
>  
>  %end
>  
> -- 
> 1.5.6.5
> 



From imain at redhat.com  Fri Oct 31 18:53:03 2008
From: imain at redhat.com (Ian Main)
Date: Fri, 31 Oct 2008 11:53:03 -0700
Subject: [Ovirt-devel] Re: [PATCH server] Replace python qpid example with
	ruby example.
In-Reply-To: <1225477950-3417-1-git-send-email-imain@redhat.com>
References: <\>
	<1225477950-3417-1-git-send-email-imain@redhat.com>
Message-ID: <20081031115303.2f0929e5@tp.mains.net>


Pushed.


On Fri, 31 Oct 2008 11:32:30 -0700
Ian Main <imain at redhat.com> wrote:

> This change removes the python qpid demo and replaces it
> with a shiny new ruby demo!
> 
> Signed-off-by: Ian Main <imain at redhat.com>
> ---
>  src/qmf-libvirt-example.rb |   62 ++++++++++++++++++++++++++++++++++++++++++++
>  src/qpid_list_demo.py      |   42 -----------------------------
>  2 files changed, 62 insertions(+), 42 deletions(-)
>  create mode 100644 src/qmf-libvirt-example.rb
>  delete mode 100755 src/qpid_list_demo.py
> 
> diff --git a/src/qmf-libvirt-example.rb b/src/qmf-libvirt-example.rb
> new file mode 100644
> index 0000000..5bfe44d
> --- /dev/null
> +++ b/src/qmf-libvirt-example.rb
> @@ -0,0 +1,62 @@
> +#!/usr/bin/ruby
> +
> +require "rubygems"
> +require "qpid"
> +
> +s = Qpid::Qmf::Session.new()
> +b = s.add_broker("amqp://localhost:5672")
> +
> +while true:
> +    nodes = s.objects(:class => "node")
> +    nodes.each do |node|
> +        puts "node: #{node.hostname}"
> +        for (key, val) in node.properties
> +            puts "  property: #{key}, #{val}"
> +        end
> +
> +        # Find any domains that on the current node.
> +        domains = s.objects(:class => "domain", 'node' => node.object_id)
> +        domains.each do |domain|
> +            r = domain.getXMLDesc()
> +            puts "getXMLDesc() status: #{r.status}"
> +            puts "getXMLDesc() status: #{r.text}"
> +            if r.status == 0
> +                puts "xml length: #{r.description.length}"
> +            end
> +
> +            puts "  domain: #{domain.name}, state: #{domain.state}, id: #{domain.id}"
> +            for (key, val) in domain.properties
> +                puts "    property: #{key}, #{val}"
> +            end
> +        end
> +
> +        pools = s.objects(:class => "pool", 'node' => node.object_id)
> +        pools.each do |pool|
> +            puts "  pool: #{pool.name}"
> +            for (key, val) in pool.properties
> +                puts "    property: #{key}, #{val}"
> +            end
> +
> +            r = pool.getXMLDesc()
> +            puts "getXMLDesc() status: #{r.status}"
> +            puts "getXMLDesc() text: #{r.text}"
> +            if r.status == 0
> +                puts "xml length: #{r.description.length}"
> +            end
> +
> +            # Find volumes that are part of the pool.
> +            volumes = s.objects(:class => "volume", 'pool' => pool.object_id)
> +            volumes.each do |volume|
> +                puts "    volume: #{volume.name}"
> +                for (key, val) in volume.properties
> +                    puts "      property: #{key}, #{val}"
> +                end
> +            end
> +        end
> +
> +    end
> +
> +    puts '----------------------------'
> +    sleep(5)
> +
> +end
> diff --git a/src/qpid_list_demo.py b/src/qpid_list_demo.py
> deleted file mode 100755
> index 3b96c8a..0000000
> --- a/src/qpid_list_demo.py
> +++ /dev/null
> @@ -1,42 +0,0 @@
> -#!/usr/bin/python
> -
> -# This script is temporary!  It's just a demo to show how the qpid
> -# stuff works.  This prints out a hierarchy of nodes/domains/pools/volumes
> -# every five seconds.
> -
> -from qpid.qmfconsole import Session
> -import time
> -
> -s = Session()
> -b = s.addBroker()
> -
> -while True:
> -    nodes = s.getObjects(cls="node")
> -    for node in nodes:
> -        print 'node:', node.hostname
> -        for prop in node.properties:
> -            print "  property:", prop
> -        # Find any domains that on the current node.
> -        domains = s.getObjects(cls="domain", node=node.objectId)
> -        for domain in domains:
> -            print '  domain:', domain.name
> -            for prop in domain.properties:
> -                print "    property:", prop
> -
> -        pools = s.getObjects(cls="pool", node=node.objectId)
> -        for pool in pools:
> -            print '  pool:', pool.name
> -            for prop in pool.properties:
> -                print "    property:", prop
> -
> -            # Find volumes that are part of the pool.
> -            volumes = s.getObjects(cls="volume", pool=pool.objectId)
> -            for volume in volumes:
> -                print '    volume:', volume.name
> -                for prop in volume.properties:
> -                    print "      property:", prop
> -
> -    time.sleep(5)
> -
> -    print '----------------------------'
> -
> -- 
> 1.5.6.5
> 



From jguiditt at redhat.com  Fri Oct 31 19:01:34 2008
From: jguiditt at redhat.com (Jason Guiditta)
Date: Fri, 31 Oct 2008 15:01:34 -0400
Subject: [Ovirt-devel] [PATCH server] BUGFIX: 500 error if no smart pools
	exist.
Message-ID: <1225479694-17240-1-git-send-email-jguiditt@redhat.com>

This was happening when you clicked any tab that contained a
smart pool dropdown when no smart pools exist (like on new
appliance install).  smart_pools_for_user was failing when
there was no :children element.

Signed-off-by: Jason Guiditta <jguiditt at redhat.com>
---
 src/app/models/smart_pool.rb |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/app/models/smart_pool.rb b/src/app/models/smart_pool.rb
index 0ecbe05..ac6db5e 100644
--- a/src/app/models/smart_pool.rb
+++ b/src/app/models/smart_pool.rb
@@ -80,19 +80,21 @@ class SmartPool < Pool
     other_pools = []
     nested_pools.each do |pool_element|
       pool = pool_element[:obj]
-      if pool.name == user
-        pool_element[:children].each do |child_element|
-          child_pool = child_element[:obj]
-          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.hasChildren
+        if pool.name == user
+            pool_element[:children].each do |child_element|
+              child_pool = child_element[:obj]
+              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]
+          end
         end
       end
     end
-    user_pools[-1] << "break"
+    user_pools[-1] << "break" unless user_pools.empty?
     user_pools + other_pools
   end
 end
-- 
1.5.6.5



From jguiditt at redhat.com  Fri Oct 31 20:52:38 2008
From: jguiditt at redhat.com (Jason Guiditta)
Date: Fri, 31 Oct 2008 16:52:38 -0400
Subject: [Ovirt-devel] [PATCH server] Add tooltips, y-axis labels, and
	first animation transition to flexchart.
In-Reply-To: <1225312763-31801-1-git-send-email-slinabery@redhat.com>
References: <1225312763-31801-1-git-send-email-slinabery@redhat.com>
Message-ID: <1225486358.28206.15.camel@localhost.localdomain>

On Wed, 2008-10-29 at 15:39 -0500, Steve Linabery wrote:
> Also improve OO design with new classes and better organization thereof.
> ---
>  src/app/controllers/graph_controller.rb            |    3 +-
>  src/flexchart/README.txt                           |    2 +-
>  src/flexchart/flexchart.mxml                       |   69 +++++++--
>  src/flexchart/org/ovirt/ChartLoader.as             |   64 --------
>  src/flexchart/org/ovirt/Constants.as               |   28 ++++
>  src/flexchart/org/ovirt/DataSeries.as              |   42 -----
>  src/flexchart/org/ovirt/DataSource.as              |   14 +-
>  src/flexchart/org/ovirt/charts/BarChart.as         |  158 ++++++++++++++++++++
>  src/flexchart/org/ovirt/charts/Chart.as            |   46 ++++++
>  src/flexchart/org/ovirt/data/DataPoint.as          |   47 ++++++
>  src/flexchart/org/ovirt/data/DataSeries.as         |   54 +++++++
>  src/flexchart/org/ovirt/elements/SingleBar.as      |   67 ++++++++
>  src/flexchart/org/ovirt/elements/TextLiberation.as |   46 ++++++
>  src/flexchart/org/ovirt/elements/YAxisLabel.as     |   41 +++++
>  14 files changed, 556 insertions(+), 125 deletions(-)
>  delete mode 100644 src/flexchart/org/ovirt/ChartLoader.as
>  create mode 100644 src/flexchart/org/ovirt/Constants.as
>  delete mode 100644 src/flexchart/org/ovirt/DataSeries.as
>  create mode 100644 src/flexchart/org/ovirt/charts/BarChart.as
>  create mode 100644 src/flexchart/org/ovirt/charts/Chart.as
>  create mode 100644 src/flexchart/org/ovirt/data/DataPoint.as
>  create mode 100644 src/flexchart/org/ovirt/data/DataSeries.as
>  create mode 100644 src/flexchart/org/ovirt/elements/SingleBar.as
>  create mode 100644 src/flexchart/org/ovirt/elements/TextLiberation.as
>  create mode 100644 src/flexchart/org/ovirt/elements/YAxisLabel.as
> 
> diff --git a/src/app/controllers/graph_controller.rb b/src/app/controllers/graph_controller.rb
> index c1d27b5..0105ea6 100644
> --- a/src/app/controllers/graph_controller.rb
> +++ b/src/app/controllers/graph_controller.rb
> @@ -15,7 +15,8 @@ class GraphController < ApplicationController
>                     :values => graph_obj[:dataset][2][:values].last(40) }
>      my_data = graph_data[:labels].zip(graph_data[:values])
>      graph = { :vectors => my_data,
> -              :max_value => graph_obj[:total_peak]
> +              :max_value => graph_obj[:total_peak],
> +              :description => params[:target]
>              }
>      render :json => graph
>    end
> diff --git a/src/flexchart/README.txt b/src/flexchart/README.txt
> index 66eb183..3de7430 100644
> --- a/src/flexchart/README.txt
> +++ b/src/flexchart/README.txt
> @@ -5,4 +5,4 @@ Once you have mxmlc on your system, run:
>  
>  mxmlc flexchart.mxml
>  
> -in this directory, and copy the resulting file flexchart.swf to /usr/share/ovirt-server/public on your appliance.
> +in this directory, and copy the resulting file flexchart.swf to /usr/share/ovirt-server/public/swfs on your appliance.
> diff --git a/src/flexchart/flexchart.mxml b/src/flexchart/flexchart.mxml
> index 796329d..35fa9a6 100644
> --- a/src/flexchart/flexchart.mxml
> +++ b/src/flexchart/flexchart.mxml
> @@ -1,20 +1,67 @@
>  <?xml version="1.0"?>
> -<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" applicationComplete="populate(flexChart)">
> +<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" applicationComplete="myInit(); populate(mainChart);" styleName="plain" horizontalScrollPolicy="off" verticalScrollPolicy="off">
>    <mx:Script>
>      <![CDATA[
>  
> -      import mx.containers.Box;
> -      import org.ovirt.*;
> +    import mx.containers.VBox;
> +    import mx.effects.Resize;
> +    import org.ovirt.Constants;
> +    import org.ovirt.charts.Chart;
> +    import org.ovirt.charts.BarChart;
>  
> -      private function populate(chart:Box):void {
> -        var chartLoader:ChartLoader = new ChartLoader(chart, parameters['flexchart_data']);
> -        chartLoader.load();
> -      }
> +    private function populate(container:VBox):void {
> +        var chart:Chart = new BarChart(container, parameters['flexchart_data']);
> +        chart.load();
> +    }
> +
> +    private var expandHistory:Resize = new Resize();
> +    private var contractHistory:Resize = new Resize();
> +
> +    private var expandResources:Resize = new Resize();
> +    private var contractResources:Resize = new Resize();
> +
> +    private function myInit():void {
> +      mainChart.height = Constants.height;
> +      mainChart.width = Constants.width;
> +      hostsChart.width = Constants.width;
> +
> +      expandHistory.widthTo = Constants.width;
> +      expandHistory.heightTo = Constants.height;
> +      expandHistory.target = mainChart;
> +
> +      contractHistory.widthTo = Constants.width;
> +      contractHistory.heightTo = Constants.height * .3333;
> +      contractHistory.target = mainChart;
> +
> +      expandResources.widthTo = Constants.width;
> +      expandResources.heightTo = Constants.height * .6666;
> +      expandResources.target = hostsChart;
> +      expandResources.duration = 500;
> +
> +      contractResources.widthTo = Constants.width;
> +      contractResources.heightTo = 0;
> +      contractResources.target = hostsChart;
> +      contractResources.duration = 500;
> +    }
> +
> +    private function zoomOutSeries(e:Event):void {
> +      expandHistory.end(); expandHistory.play();
> +      contractResources.end(); contractResources.play();
> +      hostsChart.visible = false;
> +    }
> +
> +    private function zoomIntoSeries(e:Event):void {
> +      hostsChart.visible=true;
> +      expandResources.end(); expandResources.play();
> +      contractHistory.end(); contractHistory.play();
> +    }
>  
>      ]]>
> +
> +
>    </mx:Script>
> -  <mx:Panel height="100%" width="100%" visible="true">
> -    <mx:HBox id="flexChart"  height="100%" width="100%" visible="true" verticalAlign="bottom" opaqueBackground="0xFFFFFF" borderThickness="0">
> -    </mx:HBox>
> -  </mx:Panel>
> +
> +  <mx:VBox id="mainChart"  click="zoomIntoSeries(event)" />
> +  <mx:VBox id="hostsChart" visible="false" opaqueBackground="0x00ff00" click="zoomOutSeries(event)"/>
> +
>  </mx:Application>
> diff --git a/src/flexchart/org/ovirt/ChartLoader.as b/src/flexchart/org/ovirt/ChartLoader.as
> deleted file mode 100644
> index 4e493a4..0000000
> --- a/src/flexchart/org/ovirt/ChartLoader.as
> +++ /dev/null
> @@ -1,64 +0,0 @@
> -/*
> - Copyright (C) 2008 Red Hat, Inc.
> - Written by Steve Linabery <slinabery at redhat.com>
> -
> - This program is free software; you can redistribute it and/or modify
> - it under the terms of the GNU General Public License as published by
> - the Free Software Foundation; version 2 of the License.
> -
> - This program is distributed in the hope that it will be useful,
> - but WITHOUT ANY WARRANTY; without even the implied warranty of
> - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - GNU General Public License for more details.
> -
> - You should have received a copy of the GNU General Public License
> - along with this program; if not, write to the Free Software
> - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> - MA  02110-1301, USA.  A copy of the GNU General Public License is
> - also available at http://www.gnu.org/copyleft/gpl.html.
> -*/
> -
> -package org.ovirt {
> -
> -  import mx.containers.Box;
> -  import mx.containers.HBox;
> -  import mx.controls.Text;
> -
> -  public class ChartLoader {
> -
> -    private var element:Box;
> -    private var datasourceUrl:String;
> -
> -    public function ChartLoader(element:Box, datasourceUrl:String) {
> -      this.element = element;
> -      this.datasourceUrl = datasourceUrl;
> -    }
> -
> -    public function addData(dataSeries:DataSeries):void {
> -      var points:Array = dataSeries.getPoints();
> -      var maxValue:Number = dataSeries.getMaxValue();
> -      var scale:Number = maxValue;
> -      if (scale == 0) { scale = 1; }
> -      var size:int = points.length;
> -      element.removeAllChildren();
> -      element.setStyle("horizontalGap","2");
> -      for (var i:int = 0; i < size; i++) {
> -        var value:Number = (points[i] as Array)[1];
> -        var bar:HBox = new HBox();
> -        bar.percentHeight = ((value / scale) * 90);
> -        bar.percentWidth = (100 / size);
> -        bar.setStyle("backgroundColor","0x0000FF");
> -        bar.setStyle("left","1");
> -        bar.setStyle("right","1");
> -        bar.visible = true;
> -        bar.setVisible(true);
> -        element.addChild(bar);
> -      }
> -    }
> -
> -    public function load():void {
> -      var dataSource:DataSource = new DataSource(this);
> -      dataSource.retrieveData(datasourceUrl);
> -    }
> -  }
> -}
> \ No newline at end of file
> diff --git a/src/flexchart/org/ovirt/Constants.as b/src/flexchart/org/ovirt/Constants.as
> new file mode 100644
> index 0000000..996a31e
> --- /dev/null
> +++ b/src/flexchart/org/ovirt/Constants.as
> @@ -0,0 +1,28 @@
> +/*
> + Copyright (C) 2008 Red Hat, Inc.
> + Written by Steve Linabery <slinabery at redhat.com>
> +
> + This program is free software; you can redistribute it and/or modify
> + it under the terms of the GNU General Public License as published by
> + the Free Software Foundation; version 2 of the License.
> +
> + This program is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + GNU General Public License for more details.
> +
> + You should have received a copy of the GNU General Public License
> + along with this program; if not, write to the Free Software
> + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> + MA  02110-1301, USA.  A copy of the GNU General Public License is
> + also available at http://www.gnu.org/copyleft/gpl.html.
> +*/
> +
> +package org.ovirt {
> +  public class Constants {
> +    public static var width:int = 722;
> +    public static var height:int = 297;
> +    public static var barSpacing:int = 2;
> +    public static var labelHeight:int = 40;
> +  }
> +}
> diff --git a/src/flexchart/org/ovirt/DataSeries.as b/src/flexchart/org/ovirt/DataSeries.as
> deleted file mode 100644
> index d63162a..0000000
> --- a/src/flexchart/org/ovirt/DataSeries.as
> +++ /dev/null
> @@ -1,42 +0,0 @@
> -/*
> - Copyright (C) 2008 Red Hat, Inc.
> - Written by Steve Linabery <slinabery at redhat.com>
> -
> - This program is free software; you can redistribute it and/or modify
> - it under the terms of the GNU General Public License as published by
> - the Free Software Foundation; version 2 of the License.
> -
> - This program is distributed in the hope that it will be useful,
> - but WITHOUT ANY WARRANTY; without even the implied warranty of
> - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - GNU General Public License for more details.
> -
> - You should have received a copy of the GNU General Public License
> - along with this program; if not, write to the Free Software
> - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> - MA  02110-1301, USA.  A copy of the GNU General Public License is
> - also available at http://www.gnu.org/copyleft/gpl.html.
> -*/
> -
> -//class to encapsulate the json object representation of a data
> -//series returned from stats package
> -
> -package org.ovirt {
> -
> -  public class DataSeries {
> -
> -    private var object:Object;
> -
> -    public function DataSeries (object:Object) {
> -      this.object = object;
> -    }
> -
> -    public function getPoints():Array {
> -      return object["vectors"] as Array;
> -    }
> -
> -    public function getMaxValue():Number {
> -      return object["max_value"] as Number;
> -    }
> -  }
> -}
> \ No newline at end of file
> diff --git a/src/flexchart/org/ovirt/DataSource.as b/src/flexchart/org/ovirt/DataSource.as
> index 1a64f03..44e482d 100644
> --- a/src/flexchart/org/ovirt/DataSource.as
> +++ b/src/flexchart/org/ovirt/DataSource.as
> @@ -25,19 +25,21 @@ package org.ovirt {
>    import com.adobe.serialization.json.JSON;
>    import flash.events.Event;
>    import flash.events.IOErrorEvent;
> +  import org.ovirt.data.DataSeries;
> +  import org.ovirt.charts.Chart;
>  
>    public class DataSource {
>  
> -    private var chartLoader:ChartLoader;
> +    private var chart:Chart;
>  
> -    public function DataSource(chartLoader:ChartLoader) {
> -      this.chartLoader = chartLoader;
> +    public function DataSource(chart:Chart) {
> +      this.chart = chart;
>      }
>  
>      public function retrieveData(url:String):void {
>        var loader:URLLoader = new URLLoader();
> -      loader.addEventListener( IOErrorEvent.IO_ERROR, this.ioError );
> -      loader.addEventListener( Event.COMPLETE, dataLoaded );
> +      loader.addEventListener(IOErrorEvent.IO_ERROR, this.ioError);
> +      loader.addEventListener(Event.COMPLETE, dataLoaded);
>        var request:URLRequest = new URLRequest(url);
>        loader.load(request);
>      }
> @@ -46,7 +48,7 @@ package org.ovirt {
>        var loader:URLLoader = URLLoader(event.target);
>        var object:Object = JSON.decode(loader.data);
>        var series:DataSeries = new DataSeries(object);
> -      chartLoader.addData(series);
> +      chart.addData(series);
>      }
>  
>      private function ioError( e:IOErrorEvent ):void {
> diff --git a/src/flexchart/org/ovirt/charts/BarChart.as b/src/flexchart/org/ovirt/charts/BarChart.as
> new file mode 100644
> index 0000000..83cf0bb
> --- /dev/null
> +++ b/src/flexchart/org/ovirt/charts/BarChart.as
> @@ -0,0 +1,158 @@
> +/*
> + Copyright (C) 2008 Red Hat, Inc.
> + Written by Steve Linabery <slinabery at redhat.com>
> +
> + This program is free software; you can redistribute it and/or modify
> + it under the terms of the GNU General Public License as published by
> + the Free Software Foundation; version 2 of the License.
> +
> + This program is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + GNU General Public License for more details.
> +
> + You should have received a copy of the GNU General Public License
> + along with this program; if not, write to the Free Software
> + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> + MA  02110-1301, USA.  A copy of the GNU General Public License is
> + also available at http://www.gnu.org/copyleft/gpl.html.
> +*/
> +
> +package org.ovirt.charts {
> +
> +  import mx.containers.Box;
> +  import mx.containers.HBox;
> +  import mx.containers.VBox;
> +  import mx.controls.Text;
> +  import mx.containers.Canvas;
> +  import org.ovirt.data.*;
> +  import org.ovirt.elements.*;
> +  import org.ovirt.Constants;
> +
> +  public class BarChart extends Chart {
> +
> +    private var chartArea:HBox;
> +    private var labelArea:Canvas;
> +
> +    public function BarChart(container:Box,
> +                             datasourceUrl:String) {
> +      super(container,datasourceUrl);
> +      chartArea = new HBox();
> +      chartArea.setStyle("horizontalGap",Constants.barSpacing);
> +      chartArea.setStyle("verticalAlign","bottom");
> +      chartArea.percentHeight = 80;
> +      chartArea.percentWidth = 100;
> +      this.container.addChild(chartArea);
> +
> +      labelArea = new Canvas();
> +      labelArea.height = Constants.labelHeight;
> +      labelArea.minHeight = Constants.labelHeight;
> +      labelArea.percentWidth = 100;
> +      this.container.addChild(labelArea);
> +    }
> +
> +    override public function addData(dataSeries:DataSeries):void {
> +      try {
> +        var dataPoints:Array = dataSeries.getDataPoints();
> +        var maxValue:Number = dataSeries.getMaxValue();
> +        var scale:Number = maxValue;
> +        //avoid divide by zero
> +        if (scale == 0) {
> +          scale = 1;
> +        }
> +        var size:int = dataPoints.length;
> +        if (size == 0) {
> +          throw new Error("No data points in range");
> +        }
> +
> +        //have to iterate through datapoint.timestamp strings,
> +        //create a TextLiberation object with them, and add them to
> +        //a parent container before we can tell how wide they are in pixels.
> +        var labelWidth:Number = 0;
> +        for (var i:int = 0; i < size; i++) {
> +          var dataPoint:DataPoint = dataPoints[i] as DataPoint;
> +          var textTemp:TextLiberation =
> +            new TextLiberation(dataPoint.getTimestamp());
> +          textTemp.setVisible(false);
> +          chartArea.addChild(textTemp);
> +          var tempLabelWidth:Number = textTemp.getTextWidth();
> +          if (! isNaN(tempLabelWidth)) {
> +            labelWidth = Math.max(labelWidth, tempLabelWidth);
> +          }
> +        }
> +        //now we have to remove all the children we just added, since we don't
> +        //really want them to be part of the chart.
> +        chartArea.removeAllChildren();
> +
> +        //we always want an odd number of y-axis labels, and we'll
> +        //determine this by using the labelWidth we just determined
> +        var labelCount:int = Math.floor(Constants.width / labelWidth);
> +        if (labelCount > 3 && labelCount % 2 == 1) {
> +          labelCount--;
> +        }
> +
> +        //the distance between left edges of adjacent bars
> +        var gridWidth:Number = Constants.width / size;
> +
> +        //the width of each SingleBar (does not including padding between bars)
> +        var barWidth:Number = gridWidth - Constants.barSpacing;
> +
> +        //use this to center y-axis labels on the bars
> +        var labelOffset:Number = barWidth / 2;
> +
> +        //distance between first and last label
> +        var labelSpace:Number = Constants.width - gridWidth;
> +        var labelSpacing:Number = labelSpace / labelCount;
> +
> +        //add the bars & labels to the chart
> +        var labelCounter:int = 0;
> +        for (i = 0; i < size; i++) {
> +          dataPoint = dataPoints[i] as DataPoint;
> +          var value:Number = dataPoint.getValue();
> +          var bar:SingleBar = new SingleBar(dataPoint);
> +          bar.percentHeight = ((value / scale) * 80);
> +          bar.width = barWidth;
> +          bar.setVisible(true);
> +          chartArea.addChild(bar);
> +          var currentLabelPosition:int = labelCounter * labelSpacing +
> +                                           labelOffset;
> +
> +          if (currentLabelPosition >= i * gridWidth &&
> +                currentLabelPosition < (i + 1) * gridWidth) {
> +            var label:YAxisLabel = new YAxisLabel(dataPoint.getTimestamp());
> +            label.setVisible(false);
> +            label.y = ((labelCounter + 1) % 2) * 13 + 4;
> +            labelArea.addChild(label);
> +            //make sure the label is fully within the chart width
> +            label.x = Math.max(0,
> +                               Math.min((i) * gridWidth -
> +                                 (label.labelText.getTextWidth() / 2) +
> +                                 labelOffset,
> +                               Constants.width -
> +                                 label.labelText.getTextWidth() - 6)
> +                              );
> +            label.setVisible(true);
> +            labelCounter++;
> +
> +            //add a 'tick' in the center of the bar to which this label
> +            //corresponds
> +            var ind:Box = new Box();
> +            ind.opaqueBackground = 0x000000;
> +            ind.width=1;
> +            ind.height=3;
> +            ind.x =  (i) * gridWidth + labelOffset;
> +            ind.y = 0;
> +            ind.setVisible(true);
> +            ind.setStyle("backgroundColor","0x000000");
> +            labelArea.addChild(ind);
> +          }
> +        }
> +      } catch (e:Error) {
> +        var err:Text = new Text();
> +        err.text = e.message;
> +        err.setVisible(true);
> +        chartArea.addChild(err);
> +      }
> +    }
> +  }
> +}
> diff --git a/src/flexchart/org/ovirt/charts/Chart.as b/src/flexchart/org/ovirt/charts/Chart.as
> new file mode 100644
> index 0000000..26c8d02
> --- /dev/null
> +++ b/src/flexchart/org/ovirt/charts/Chart.as
> @@ -0,0 +1,46 @@
> +/*
> + Copyright (C) 2008 Red Hat, Inc.
> + Written by Steve Linabery <slinabery at redhat.com>
> +
> + This program is free software; you can redistribute it and/or modify
> + it under the terms of the GNU General Public License as published by
> + the Free Software Foundation; version 2 of the License.
> +
> + This program is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + GNU General Public License for more details.
> +
> + You should have received a copy of the GNU General Public License
> + along with this program; if not, write to the Free Software
> + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> + MA  02110-1301, USA.  A copy of the GNU General Public License is
> + also available at http://www.gnu.org/copyleft/gpl.html.
> +*/
> +
> +package org.ovirt.charts {
> +
> +  public class Chart {
> +
> +    import org.ovirt.DataSource;
> +    import mx.containers.Box;
> +    import org.ovirt.data.DataSeries;
> +
> +    protected var container:Box;
> +    protected var datasourceUrl:String;
> +
> +    public function Chart(container:Box, datasourceUrl:String) {
> +      this.container = container;
> +      this.datasourceUrl = datasourceUrl;
> +    }
> +
> +    public function addData(dataSeries:DataSeries):void {
> +      //override me!
> +    }
> +
> +    public function load():void {
> +      var dataSource:DataSource = new DataSource(this);
> +      dataSource.retrieveData(datasourceUrl);
> +    }
> +  }
> +}
> diff --git a/src/flexchart/org/ovirt/data/DataPoint.as b/src/flexchart/org/ovirt/data/DataPoint.as
> new file mode 100644
> index 0000000..00cd0a4
> --- /dev/null
> +++ b/src/flexchart/org/ovirt/data/DataPoint.as
> @@ -0,0 +1,47 @@
> +/*
> + Copyright (C) 2008 Red Hat, Inc.
> + Written by Steve Linabery <slinabery at redhat.com>
> +
> + This program is free software; you can redistribute it and/or modify
> + it under the terms of the GNU General Public License as published by
> + the Free Software Foundation; version 2 of the License.
> +
> + This program is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + GNU General Public License for more details.
> +
> + You should have received a copy of the GNU General Public License
> + along with this program; if not, write to the Free Software
> + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> + MA  02110-1301, USA.  A copy of the GNU General Public License is
> + also available at http://www.gnu.org/copyleft/gpl.html.
> +*/
> +
> +package org.ovirt.data {
> +
> +  public class DataPoint {
> +
> +    private var timestamp:String;
> +    private var value:Number;
> +    private var description:String;
> +
> +    public function DataPoint (timestamp:String, value:Number, description:String) {
> +      this.timestamp = timestamp;
> +      this.value = value;
> +      this.description = description;
> +    }
> +
> +    public function getTimestamp():String {
> +      return timestamp;
> +    }
> +
> +    public function getValue():Number {
> +      return value;
> +    }
> +
> +    public function getDescription():String {
> +      return description;
> +    }
> +  }
> +}
> diff --git a/src/flexchart/org/ovirt/data/DataSeries.as b/src/flexchart/org/ovirt/data/DataSeries.as
> new file mode 100644
> index 0000000..764fd34
> --- /dev/null
> +++ b/src/flexchart/org/ovirt/data/DataSeries.as
> @@ -0,0 +1,54 @@
> +/*
> + Copyright (C) 2008 Red Hat, Inc.
> + Written by Steve Linabery <slinabery at redhat.com>
> +
> + This program is free software; you can redistribute it and/or modify
> + it under the terms of the GNU General Public License as published by
> + the Free Software Foundation; version 2 of the License.
> +
> + This program is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + GNU General Public License for more details.
> +
> + You should have received a copy of the GNU General Public License
> + along with this program; if not, write to the Free Software
> + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> + MA  02110-1301, USA.  A copy of the GNU General Public License is
> + also available at http://www.gnu.org/copyleft/gpl.html.
> +*/
> +
> +//class to encapsulate the json object representation of a data
> +//series returned from stats package
> +
> +package org.ovirt.data {
> +
> +  public class DataSeries {
> +
> +    private var object:Object;
> +    private var dataPoints:Array;
> +    private var description:String;
> +    private var maxValue:Number;
> +
> +    public function DataSeries (object:Object) {
> +      this.object = object;
> +      this.description = object["description"] as String;
> +      dataPoints = new Array();
> +      var inDataPoints:Array = object["vectors"] as Array;
> +      for (var i:int = 0; i < inDataPoints.length; i++) {
> +        dataPoints.push(new DataPoint((inDataPoints[i] as Array)[0] as String,
> +                                  (inDataPoints[i] as Array)[1] as Number,
> +                                  description));
> +      }
> +      maxValue = object["max_value"] as Number;
> +    }
> +
> +    public function getDataPoints():Array {
> +      return dataPoints;
> +    }
> +
> +    public function getMaxValue():Number {
> +      return maxValue;
> +    }
> +  }
> +}
> diff --git a/src/flexchart/org/ovirt/elements/SingleBar.as b/src/flexchart/org/ovirt/elements/SingleBar.as
> new file mode 100644
> index 0000000..6e09bff
> --- /dev/null
> +++ b/src/flexchart/org/ovirt/elements/SingleBar.as
> @@ -0,0 +1,67 @@
> +/*
> + Copyright (C) 2008 Red Hat, Inc.
> + Written by Steve Linabery <slinabery at redhat.com>
> +
> + This program is free software; you can redistribute it and/or modify
> + it under the terms of the GNU General Public License as published by
> + the Free Software Foundation; version 2 of the License.
> +
> + This program is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + GNU General Public License for more details.
> +
> + You should have received a copy of the GNU General Public License
> + along with this program; if not, write to the Free Software
> + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> + MA  02110-1301, USA.  A copy of the GNU General Public License is
> + also available at http://www.gnu.org/copyleft/gpl.html.
> +*/
> +
> +package org.ovirt.elements {
> +
> +  import mx.containers.Box;
> +  import mx.controls.ToolTip;
> +  import mx.managers.ToolTipManager;
> +  import flash.events.Event;
> +  import flash.events.MouseEvent;
> +  import flash.geom.Rectangle;
> +  import flash.display.DisplayObject;
> +  import org.ovirt.data.DataPoint;
> +
> +  public class SingleBar extends Box {
> +
> +    private var tip:ToolTip;
> +    private var dataPoint:DataPoint;
> +
> +    public function SingleBar(dataPoint:DataPoint) {
> +      super();
> +      this.dataPoint = dataPoint;
> +      addEventListener(MouseEvent.MOUSE_OVER,showTip);
> +      addEventListener(MouseEvent.MOUSE_OUT,destroyTip);
> +      this.setStyle("backgroundColor","0x0000FF");
> +      this.setStyle("left","1");
> +      this.setStyle("right","1");
> +    }
> +
> +    private function showTip(event:Event):void {
> +      var w:Number = this.stage.width;
> +      var target:DisplayObject = event.currentTarget as DisplayObject;
> +      var pt:Rectangle = this.stage.getBounds(target);
> +      var yPos:Number = pt.y * -1;
> +      var xPos:Number = pt.x * -1;
> +      tip = ToolTipManager.createToolTip(dataPoint.getDescription() + "\n" +
> +                                           dataPoint.getTimestamp() + "\n" +
> +                                           dataPoint.getValue(),
> +                                         xPos,yPos) as ToolTip;
> +      tip.x = Math.min(tip.x,
> +                       w - tip.width);
> +      tip.y = Math.max(0,
> +                       tip.y - tip.height);
> +    }
> +
> +    private function destroyTip(event:Event):void {
> +      ToolTipManager.destroyToolTip(tip);
> +    }
> +  }
> +}
> diff --git a/src/flexchart/org/ovirt/elements/TextLiberation.as b/src/flexchart/org/ovirt/elements/TextLiberation.as
> new file mode 100644
> index 0000000..f0314a2
> --- /dev/null
> +++ b/src/flexchart/org/ovirt/elements/TextLiberation.as
> @@ -0,0 +1,46 @@
> +/*
> + Copyright (C) 2008 Red Hat, Inc.
> + Written by Steve Linabery <slinabery at redhat.com>
> +
> + This program is free software; you can redistribute it and/or modify
> + it under the terms of the GNU General Public License as published by
> + the Free Software Foundation; version 2 of the License.
> +
> + This program is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + GNU General Public License for more details.
> +
> + You should have received a copy of the GNU General Public License
> + along with this program; if not, write to the Free Software
> + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> + MA  02110-1301, USA.  A copy of the GNU General Public License is
> + also available at http://www.gnu.org/copyleft/gpl.html.
> +*/
> +
> +package org.ovirt.elements {
> +
> +  import mx.controls.Label;
> +
> +  public class TextLiberation extends Label {
> +
> +    //FIXME: this should point to a local asset somehow.
> +    [Embed(source='/usr/share/fonts/liberation/LiberationSans-Regular.ttf',
> +           fontName='liberation',
> +           mimeType='application/x-font'
> +          )]
> +    //this variable exists so that the compiler will link in the font.
> +    private var font1:Class;
> +
> +    public function TextLiberation(text:String) {
> +      super();
> +      this.text = text;
> +      this.setStyle("fontFamily","liberation");
> +    }
> +
> +    public function getTextWidth():Number {
> +      this.validateNow();
> +      return this.textWidth;
> +    }
> +  }
> +}
> diff --git a/src/flexchart/org/ovirt/elements/YAxisLabel.as b/src/flexchart/org/ovirt/elements/YAxisLabel.as
> new file mode 100644
> index 0000000..0e93b97
> --- /dev/null
> +++ b/src/flexchart/org/ovirt/elements/YAxisLabel.as
> @@ -0,0 +1,41 @@
> +/*
> + Copyright (C) 2008 Red Hat, Inc.
> + Written by Steve Linabery <slinabery at redhat.com>
> +
> + This program is free software; you can redistribute it and/or modify
> + it under the terms of the GNU General Public License as published by
> + the Free Software Foundation; version 2 of the License.
> +
> + This program is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + GNU General Public License for more details.
> +
> + You should have received a copy of the GNU General Public License
> + along with this program; if not, write to the Free Software
> + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> + MA  02110-1301, USA.  A copy of the GNU General Public License is
> + also available at http://www.gnu.org/copyleft/gpl.html.
> +*/
> +
> +package org.ovirt.elements {
> +
> +  import mx.containers.Box;
> +  import mx.core.ScrollPolicy;
> +
> +  public class YAxisLabel extends Box {
> +
> +    public var labelText:TextLiberation;
> +
> +    public function YAxisLabel(text:String) {
> +      super();
> +      labelText = new TextLiberation(text);
> +      labelText.setVisible(true);
> +      this.addChild(labelText);
> +      this.horizontalScrollPolicy = ScrollPolicy.OFF;
> +      this.verticalScrollPolicy = ScrollPolicy.OFF;
> +      this.setStyle("paddingLeft","0");
> +      this.setStyle("paddingRight","0");
> +    }
> +  }
> +}

Conditional ACK.  This works for me as I understand we expect for the
moment. I got back valid (so far as I can tell) data for memory, cpu,
and load so long as I was looking at the default pool.  However, if I
looked at the data returned for a VmResourcePool, the data points were
null.  As we discussed in irc, I believe this is more a problem with
what rrd is returning vs the actual graph.  If this assumption is
correct, then ACK, we can deal with the data issues separately.

-j



From mmorsi at redhat.com  Fri Oct 31 21:14:27 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Fri, 31 Oct 2008 17:14:27 -0400
Subject: [Ovirt-devel] [PATCH server] network integration into ovirt server
	db and wui
Message-ID: <1225487667-4878-1-git-send-email-mmorsi@redhat.com>

---
 src/app/controllers/host_controller.rb             |   14 +-
 src/app/controllers/network_controller.rb          |  418 ++++++++++++++++++++
 src/app/helpers/application_helper.rb              |   28 +-
 src/app/helpers/network_helper.rb                  |    2 +
 src/app/models/bonding.rb                          |   30 +-
 src/app/models/ip_address.rb                       |   27 ++
 src/app/models/ip_v4_address.rb                    |   53 +++
 src/app/models/ip_v6_address.rb                    |   46 +++
 src/app/models/network.rb                          |   32 ++
 src/app/models/nic.rb                              |   21 +-
 src/app/models/physical_network.rb                 |   21 +
 src/app/models/usage.rb                            |   21 +
 src/app/models/vlan.rb                             |   24 ++
 src/app/views/dashboard/index.html.erb             |    7 +
 src/app/views/host/edit_network.rhtml              |   85 ++++
 src/app/views/host/show.rhtml                      |    8 +
 src/app/views/network/_bonding_form.rhtml          |   46 +++
 src/app/views/network/_form.rhtml                  |   46 +++
 src/app/views/network/_grid.rhtml                  |   37 ++
 src/app/views/network/_ip_address_form.rhtml       |   62 +++
 src/app/views/network/_ip_addresses_form.rhtml     |   50 +++
 src/app/views/network/_select.rhtml                |   32 ++
 src/app/views/network/edit.rhtml                   |   34 ++
 src/app/views/network/edit_bonding.rhtml           |   52 +++
 src/app/views/network/edit_ip_address.rhtml        |   76 ++++
 .../views/network/edit_network_ip_addresses.rhtml  |   13 +
 src/app/views/network/edit_nic.rhtml               |   62 +++
 src/app/views/network/list.html.erb                |   72 ++++
 src/app/views/network/new.rhtml                    |   28 ++
 src/app/views/network/new_bonding.rhtml            |   32 ++
 src/app/views/network/new_ip_address.rhtml         |   44 ++
 src/app/views/network/show.rhtml                   |   31 ++
 src/app/views/nic/_list.rhtml                      |    2 -
 src/db/migrate/028_refactor_networking_model.rb    |  271 +++++++++++++
 src/public/javascripts/ovirt.js                    |   21 +-
 src/public/stylesheets/components.css              |   50 +++-
 36 files changed, 1870 insertions(+), 28 deletions(-)
 create mode 100644 src/app/controllers/network_controller.rb
 create mode 100644 src/app/helpers/network_helper.rb
 create mode 100644 src/app/models/ip_address.rb
 create mode 100644 src/app/models/ip_v4_address.rb
 create mode 100644 src/app/models/ip_v6_address.rb
 create mode 100644 src/app/models/network.rb
 create mode 100644 src/app/models/physical_network.rb
 create mode 100644 src/app/models/usage.rb
 create mode 100644 src/app/models/vlan.rb
 create mode 100644 src/app/views/host/edit_network.rhtml
 create mode 100644 src/app/views/network/_bonding_form.rhtml
 create mode 100644 src/app/views/network/_form.rhtml
 create mode 100644 src/app/views/network/_grid.rhtml
 create mode 100644 src/app/views/network/_ip_address_form.rhtml
 create mode 100644 src/app/views/network/_ip_addresses_form.rhtml
 create mode 100644 src/app/views/network/_select.rhtml
 create mode 100644 src/app/views/network/edit.rhtml
 create mode 100644 src/app/views/network/edit_bonding.rhtml
 create mode 100644 src/app/views/network/edit_ip_address.rhtml
 create mode 100644 src/app/views/network/edit_network_ip_addresses.rhtml
 create mode 100644 src/app/views/network/edit_nic.rhtml
 create mode 100644 src/app/views/network/list.html.erb
 create mode 100644 src/app/views/network/new.rhtml
 create mode 100644 src/app/views/network/new_bonding.rhtml
 create mode 100644 src/app/views/network/new_ip_address.rhtml
 create mode 100644 src/app/views/network/show.rhtml
 create mode 100644 src/db/migrate/028_refactor_networking_model.rb

diff --git a/src/app/controllers/host_controller.rb b/src/app/controllers/host_controller.rb
index a40d297..f961d1a 100644
--- a/src/app/controllers/host_controller.rb
+++ b/src/app/controllers/host_controller.rb
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 Red Hat, Inc.
 # Written by Scott Seago <sseago at redhat.com>
 #
@@ -30,7 +30,7 @@ class HostController < ApplicationController
     end
   end
 
-  before_filter :pre_action, :only => [:host_action, :enable, :disable, :clear_vms]
+  before_filter :pre_action, :only => [:host_action, :enable, :disable, :clear_vms, :edit_network]
 
   # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
   verify :method => [:post, :put], :only => [ :create, :update ],
@@ -81,7 +81,7 @@ class HostController < ApplicationController
 
   def addhost
     @hardware_pool = Pool.find(params[:hardware_pool_id])
-    render :layout => 'popup'    
+    render :layout => 'popup'
   end
 
   def add_to_smart_pool
@@ -156,6 +156,14 @@ class HostController < ApplicationController
     render :json => @json_hash
   end
 
+  def edit_network
+    render :layout => 'popup'
+  end
+
+  def bondings_json
+    bondings = Host.find(params[:id]).bondings
+    render :json => bondings.collect{ |x| {:id => x.id, :name => x.name} }
+  end
 
   private
   #filter methods
diff --git a/src/app/controllers/network_controller.rb b/src/app/controllers/network_controller.rb
new file mode 100644
index 0000000..56b7bd5
--- /dev/null
+++ b/src/app/controllers/network_controller.rb
@@ -0,0 +1,418 @@
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Mohammed Morsi <mmorsi at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+#
+
+class NetworkController < ApplicationController
+   ########################## Networks related actions
+
+   def network_permissions
+     # 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
+   end
+
+   def list
+      @networks = Network.find(:all)
+      network_permissions
+   end
+
+   def networks_json
+      json_list(Network.find(:all), [:id, :name, :type, [:boot_type, :label]])
+   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 }
+    end
+   end
+
+   def new
+    @boot_types = BootType.find(:all)
+    @usage_types = Usage.find(:all)
+    render :layout => 'popup'
+   end
+
+   def create
+    begin
+     @network = PhysicalNetwork.new(params[:network]) if params[:network][:type] == 'PhysicalNetwork'
+     @network = Vlan.new(params[:network]) if params[:network][:type] == 'Vlan'
+     @network.save!
+     alert = "Network was successfully created."
+     render :json => { :object => "network", :success => true,
+                       :alert => alert  }
+    rescue
+     render :json => { :object => "network", :success => false,
+                        :errors =>
+                        @network.errors.localize_error_messages.to_a }
+    end
+   end
+
+   def edit
+    @network = Network.find(params[:id])
+    @usage_types = Usage.find(:all)
+    @boot_types = BootType.find(:all)
+    render :layout => 'popup'
+   end
+
+   def update
+    begin
+     @network = Network.find(params[:id])
+     if @network.type == 'PhysicalNetwork'
+       @network = PhysicalNetwork.find(params[:id])
+     else
+       @network = Vlan.find(params[:id])
+     end
+
+     @network.usages.delete_all
+     @network.update_attributes!(params[:network])
+
+     alert = "Network was successfully updated."
+     render :json => { :object => "network", :success => true,
+                       :alert => alert  }
+    rescue Exception => e
+     render :json => { :object => "network", :success => false,
+                        :errors =>
+                        @network.errors.localize_error_messages.to_a }
+    end
+   end
+
+   def delete
+     failed_networks = []
+     networks_ids_str = params[:network_ids]
+     network_ids = networks_ids_str.split(",").collect {|x| x.to_i}
+     network_ids.each{ |x|
+       network = Network.find(x)
+       unless network.type.to_s == 'Vlan' &&
+               Vlan.find(x).bondings.size != 0 ||
+              network.type.to_s == 'PhysicalNetwork' &&
+               PhysicalNetwork.find(x).nics.size != 0
+         begin
+            Network.destroy(x)
+         rescue
+           failed_networks.push x
+         end
+       else
+         failed_networks.push x
+       end
+     }
+     if failed_networks.size == 0
+      render :json => { :object => "network",
+                        :success => true,
+                        :alert => "Successfully deleted networks" }
+     else
+      render :json => { :object => "network",
+                        :success => false,
+                        :alert => "Failed deleting " +
+                                  failed_networks.size.to_s +
+                             " networks due to existing bondings/nics" }
+     end
+   end
+
+   def edit_network_ip_addresses
+    @network = Network.find(params[:id])
+    render :layout => 'popup'
+   end
+
+
+   ########################## Ip Address related actions
+
+   def ip_addresses_json
+    @parent_type = params[:parent_type]
+    if @parent_type == 'network'
+      ip_addresses = Network.find(params[:id]).ip_addresses
+    elsif @parent_type == 'nic'
+      ip_addresses = Nic.find(params[:id]).ip_addresses
+    elsif @parent_type == 'bonding' and params[:id]
+      ip_addresses = Bonding.find(params[:id]).ip_addresses
+    else
+      ip_addresses = []
+    end
+
+    ip_addresses_json = []
+    ip_addresses.each{ |x|
+          ip_addresses_json.push({:id => x.id, :name => x.address}) }
+    render :json => ip_addresses_json
+   end
+
+   def new_ip_address
+    @parent_type = params[:parent_type]
+    @network = Network.find(params[:id]) if @parent_type == 'network'
+    @nic = Nic.find(params[:id]) if @parent_type == 'nic'
+    @bonding = Bonding.find(params[:id]) if @parent_type == 'bonding' and params[:id]
+
+    render :layout => false
+   end
+
+  def _create_ip_address
+    if params[:ip_address][:type] == "IpV4Address"
+      @ip_address = IpV4Address.new(params[:ip_address])
+    else
+      @ip_address = IpV6Address.new(params[:ip_address])
+    end
+    @ip_address.save!
+  end
+
+  def create_ip_address
+   begin
+    _create_ip_address
+    alert = "Ip Address was successfully created."
+    render :json => { :object => "ip_address", :success => true,
+                      :alert => alert  }
+   rescue
+    render :json => { :object => "ip_address", :success => false,
+                      :errors =>
+                        @ip_address.errors.localize_error_messages.to_a }
+    end
+   end
+
+   def edit_ip_address
+    @ip_address = IpAddress.find(params[:id])
+
+    @parent_type = params[:parent_type]
+    @network = @ip_address.network if @ip_address.network_id
+    @nic = @ip_address.nic if @ip_address.nic_id
+    @bonding = @ip_address.bonding if @ip_address.bonding_id
+
+    render :layout => false
+   end
+
+   def _update_ip_address(id)
+     @ip_address = IpAddress.find(id)
+
+     # special case if we are switching types
+     if @ip_address.type != params[:ip_address][:type]
+       if params[:ip_address][:type] == 'IpV4Address'
+          @ip_address = IpV4Address.new(params[:ip_address])
+          @ip_address.save!
+          IpV6Address.delete(id)
+       else
+          @ip_address = IpV6Address.new(params[:ip_address])
+          @ip_address.save!
+          IpV4Address.delete(id)
+       end
+     else
+       if @ip_address.type == 'IpV4Address'
+          @ip_address = IpV4Address.find(id)
+       else
+          @ip_address = IpV6Address.find(id)
+       end
+       @ip_address.update_attributes!(params[:ip_address])
+     end
+
+   end
+
+   def update_ip_address
+    begin
+     _update_ip_address(params[:id])
+     alert = "IpAddress was successfully updated."
+     render :json => { :object => "network", :success => true,
+                       :alert => alert  }
+    rescue
+     render :json => { :object => "ip_address", :success => false,
+                        :errors =>
+                        @ip_address.errors.localize_error_messages.to_a }
+    end
+   end
+
+   def destroy_ip_address
+    begin
+     IpAddress.delete(params[:id])
+     alert = "Ip Address was successfully deleted."
+     render :json => { :object => "ip_address", :success => true,
+                       :alert => alert  }
+    rescue
+     render :json => { :object => "ip_address", :success => false,
+                      :alert => 'Ip Address Deletion Failed' }
+     end
+   end
+
+
+   ########################## NICs related actions
+
+   def edit_nic
+     @nic = Nic.find(params[:id])
+     @network = @nic.physical_network
+
+     @networks = PhysicalNetwork.find(:all)
+     network_options
+
+     render :layout => false
+   end
+
+   def update_nic
+    begin
+     network_options
+     @network = Network.find(params[:nic][:physical_network_id])
+
+     if @network.boot_type.id == @static_boot_type.id
+       if params[:ip_address][:id] == "New"
+         _create_ip_address
+       elsif params[:ip_address][:id] != ""
+         _update_ip_address(params[:ip_address][:id])
+       end
+     end
+
+     @nic = Nic.find(params[:id])
+     @nic.update_attributes!(params[:nic])
+
+     alert = "Nic was successfully updated."
+     render :json => { :object => "nic", :success => true,
+                       :alert => alert  }
+    rescue Exception => e
+     if @ip_address and @ip_address.errors.size != 0
+        render :json => { :object => "ip_address", :success => false,
+                          :errors =>
+                            @ip_address.errors.localize_error_messages.to_a}
+     else
+        render :json => { :object => "nic", :success => false,
+                          :errors =>
+                          @nic.errors.localize_error_messages.to_a }
+     end
+    end
+   end
+
+   ########################## Bonding related actions
+
+   def new_bonding
+     unless params[:host_id]
+      flash[:notice] = "Host is required."
+      redirect_to :controller => 'dashboard'
+    end
+
+    @host = Host.find(params[:host_id])
+    @networks = Vlan.find(:all)
+    network_options
+
+    render :layout => false
+   end
+
+   def create_bonding
+    begin
+     network_options
+     @network = Network.find(params[:bonding][:vlan_id])
+
+     if @network.boot_type.id == @static_boot_type.id
+       if params[:ip_address][:id] == "New"
+         _create_ip_address
+       elsif params[:ip_address][:id] != ""
+         _update_ip_address(params[:ip_address][:id])
+       end
+     end
+
+    @bonding = Bonding.new(params[:bonding])
+    @bonding.save!
+
+    if @ip_address
+       @ip_address.bonding_id = @bonding.id
+       @ip_address.save!
+    end
+
+     alert = "Bonding was successfully created."
+     render :json => { :object => "bonding", :success => true,
+                       :alert => alert  }
+    rescue
+     if @ip_address and @ip_address.errors.size != 0
+        render :json => { :object => "ip_address", :success => false,
+                          :errors =>
+                            @ip_address.errors.localize_error_messages.to_a}
+     else
+        render :json => { :object => "bonding", :success => false,
+                          :errors =>
+                          @bonding.errors.localize_error_messages.to_a }
+     end
+    end
+   end
+
+   def edit_bonding
+     @bonding = Bonding.find(params[:id])
+     @network = @bonding.vlan
+
+     @host = @bonding.host
+     @networks = Vlan.find(:all)
+     network_options
+
+     render :layout => false
+   end
+
+   def update_bonding
+    begin
+     network_options
+     @network = Network.find(params[:bonding][:vlan_id])
+
+     if @network.boot_type.id == @static_boot_type.id
+       if params[:ip_address][:id] == "New"
+         _create_ip_address
+       elsif params[:ip_address][:id] != ""
+         _update_ip_address(params[:ip_address][:id])
+       end
+     end
+
+     @bonding = Bonding.find(params[:id])
+     @bonding.nics.delete_all
+     @bonding.update_attributes!(params[:bonding])
+
+     alert = "Bonding was successfully updated."
+     render :json => { :object => "bonding", :success => true,
+                       :alert => alert  }
+    rescue
+     if @ip_address and @ip_address.errors.size != 0
+        render :json => { :object => "ip_address", :success => false,
+                          :errors =>
+                            @ip_address.errors.localize_error_messages.to_a}
+     else
+        render :json => { :object => "bonding", :success => false,
+                          :errors =>
+                          @bonding.errors.localize_error_messages.to_a }
+     end
+    end
+   end
+
+   def destroy_bonding
+    begin
+     Bonding.destroy(params[:id])
+     alert = "Bonding was successfully deleted."
+     render :json => { :object => "bonding", :success => true,
+                       :alert => alert  }
+    rescue
+     render :json => { :object => "bonding", :success => false,
+                      :alert => 'Bonding Deletion Failed' }
+     end
+
+   end
+
+
+   ########################## Misc methods
+
+  protected
+   def network_options
+    @bonding_types = BondingType.find(:all)
+    @static_boot_type = BootType.find(:first,
+                                 :conditions => { :proto => 'static' })
+   end
+
+end
diff --git a/src/app/helpers/application_helper.rb b/src/app/helpers/application_helper.rb
index d7b6628..0178ad0 100644
--- a/src/app/helpers/application_helper.rb
+++ b/src/app/helpers/application_helper.rb
@@ -84,21 +84,31 @@ module ApplicationHelper
      }
   end
 
-  def popup_footer(action, label)
-    %{ 
-      <div style="background: url(#{image_path "fb_footer.jpg"}) repeat-x; height: 37px; text-align:right; padding: 9px 9px 0 0;">
+  # expects hash of labels => actions
+  def multi_button_popup_footer(buttons = {})
+      buttons_html = ""
+      buttons.each{ |label, action|
+       buttons_html+="<div class=\"button\">" +
+                     " <div class=\"button_left_blue\"></div>" +
+                     " <div class=\"button_middle_blue\"><a href=\"#\" onclick=\"#{action}\">#{label}</a></div>" +
+                     " <div class=\"button_right_blue\"></div>" +
+                     "</div>"
+      }
+
+   %{
+      <div style="background: url(#{image_path "fb_footer.jpg"}) repeat-x; height: 37px; text-align:right; padding: 9px 9px 0 0; float: left; width: 97%;">
         <div class="button">
           <div class="button_left_grey"></div>
           <div class="button_middle_grey"><a href="#" onclick="$(document).trigger('close.facebox')">Cancel</a></div>
           <div class="button_right_grey"></div>
         </div>
-        <div class="button">
-          <div class="button_left_blue"></div>
-          <div class="button_middle_blue"><a href="#" onclick="#{action}">#{label}</a></div>
-          <div class="button_right_blue"></div>
-        </div> 
+        #{buttons_html}
       </div>
-     }
+    }
+  end
+
+  def popup_footer(action, label)
+    multi_button_popup_footer({label => action})
   end
 
   def ok_footer
diff --git a/src/app/helpers/network_helper.rb b/src/app/helpers/network_helper.rb
new file mode 100644
index 0000000..ebbce0b
--- /dev/null
+++ b/src/app/helpers/network_helper.rb
@@ -0,0 +1,2 @@
+module NetworkHelper
+end
diff --git a/src/app/models/bonding.rb b/src/app/models/bonding.rb
index 006c261..c9af38c 100644
--- a/src/app/models/bonding.rb
+++ b/src/app/models/bonding.rb
@@ -30,6 +30,16 @@
 # interface. They can be ignored if not used.
 #
 class Bonding < ActiveRecord::Base
+  belongs_to :host
+  belongs_to :bonding_type
+  belongs_to :vlan
+  has_many :ip_addresses, :dependent => :destroy
+
+  has_and_belongs_to_many :nics,
+    :join_table  => 'bondings_nics',
+    :foreign_key => :bonding_id
+
+
   validates_presence_of :name,
     :message => 'A name is required.'
 
@@ -42,18 +52,20 @@ class Bonding < ActiveRecord::Base
   validates_presence_of :interface_name,
     :message => 'An interface name is required.'
 
-  validates_presence_of :boot_type_id,
-    :message => 'A boot type must be specified.'
-
   validates_presence_of :bonding_type_id,
     :message => 'A bonding type must be specified.'
 
-  belongs_to :host
-  belongs_to :bonding_type
-  belongs_to :boot_type
+  validates_presence_of :vlan_id,
+    :message => 'A vlan must be specified.'
+
+ protected
+  def validate
+    if vlan.boot_type.proto == 'static' and ip_addresses.size == 0
+           errors.add("vlan_id",
+                      "is static. Must create at least one static ip")
+     end
+
+  end
 
-  has_and_belongs_to_many :nics,
-    :join_table  => 'bondings_nics',
-    :foreign_key => :bonding_id
 
 end
diff --git a/src/app/models/ip_address.rb b/src/app/models/ip_address.rb
new file mode 100644
index 0000000..5d2e6af
--- /dev/null
+++ b/src/app/models/ip_address.rb
@@ -0,0 +1,27 @@
+# ip_address.rb
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+# +IpAddress+ is the base class for all address related classes.
+#
+class IpAddress < ActiveRecord::Base
+   # one of these 3 will apply for each address
+   belongs_to :network
+   belongs_to :nic
+   belongs_to :bonding
+end
diff --git a/src/app/models/ip_v4_address.rb b/src/app/models/ip_v4_address.rb
new file mode 100644
index 0000000..f3128a4
--- /dev/null
+++ b/src/app/models/ip_v4_address.rb
@@ -0,0 +1,53 @@
+# ip_v4_address.rb
+#
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>,
+#            Mohammed Morsi   <mmorsi at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+# +IpV4Address+ represents a single IPv4 address.
+#
+class IpV4Address < IpAddress
+  ADDRESS_TEST = %r{^(\d{1,3}\.){3}\d{1,3}$}
+
+  validates_presence_of :address,
+    :message => 'An address must be supplied.'
+  validates_format_of :address,
+    :with => ADDRESS_TEST
+
+  validates_presence_of :netmask,
+    :message => 'A netmask must be supplied.',
+    :if => Proc.new { |ip| ip.network_id != nil }
+  validates_format_of :netmask,
+    :with => ADDRESS_TEST,
+    :if => Proc.new { |ip| ip.network_id != nil }
+
+  validates_presence_of :gateway,
+    :message => 'A gateway address must be supplied.',
+    :if => Proc.new { |ip| ip.network_id != nil }
+  validates_format_of :gateway,
+    :with => ADDRESS_TEST,
+    :if => Proc.new { |ip| ip.network_id != nil }
+
+  validates_presence_of :broadcast,
+    :message => 'A broadcast address must be supplied.',
+    :if => Proc.new { |ip| ip.network_id != nil }
+  validates_format_of :broadcast,
+    :with => ADDRESS_TEST,
+    :if => Proc.new { |ip| ip.network_id != nil }
+
+end
diff --git a/src/app/models/ip_v6_address.rb b/src/app/models/ip_v6_address.rb
new file mode 100644
index 0000000..11951cc
--- /dev/null
+++ b/src/app/models/ip_v6_address.rb
@@ -0,0 +1,46 @@
+# ip_v6_address.rb
+#
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>,
+#            Mohammed Morsi   <mmorsi at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+# +IpV6Address+ represents a single IPv6 address.
+#
+class IpV6Address < IpAddress
+  ADDRESS_TEST = %r{^([0-9a-fA-F]{0,4}|0)(\:([0-9a-fA-F]{0,4}|0)){7}$}
+
+  validates_presence_of :address,
+    :message => 'An address must be provided.'
+  validates_format_of :address,
+    :with => ADDRESS_TEST
+
+  validates_presence_of :gateway,
+    :message => 'A gateway address must be provided.',
+    :if => Proc.new { |ip| ip.network_id != nil }
+  validates_format_of :gateway,
+    :with => ADDRESS_TEST,
+    :if => Proc.new { |ip| ip.network_id != nil }
+
+  validates_presence_of :prefix,
+    :message => 'A prefix must be provided.',
+    :if => Proc.new { |ip| ip.network_id != nil }
+  validates_format_of :prefix,
+    :with => ADDRESS_TEST,
+    :if => Proc.new { |ip| ip.network_id != nil }
+
+end
diff --git a/src/app/models/network.rb b/src/app/models/network.rb
new file mode 100644
index 0000000..404633d
--- /dev/null
+++ b/src/app/models/network.rb
@@ -0,0 +1,32 @@
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Mohammed Morsi <mmorsi at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+class Network < ActiveRecord::Base
+  belongs_to :boot_type
+  has_many :ip_addresses, :dependent => :destroy
+
+  has_and_belongs_to_many :usages, :join_table => 'networks_usages'
+
+  validates_presence_of :type,
+    :message => 'A type must be specified.'
+  validates_presence_of :name,
+    :message => 'A name must be specified.'
+  validates_presence_of :boot_type_id,
+    :message => 'A boot type must be specified.'
+
+end
diff --git a/src/app/models/nic.rb b/src/app/models/nic.rb
index baf7095..5649763 100644
--- a/src/app/models/nic.rb
+++ b/src/app/models/nic.rb
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 Red Hat, Inc.
 # Written by Scott Seago <sseago at redhat.com>
 #
@@ -19,7 +19,22 @@
 
 class Nic < ActiveRecord::Base
   belongs_to :host
-  belongs_to :boot_type
+  belongs_to :physical_network
+  has_many :ip_addresses, :dependent => :destroy
+
+  has_and_belongs_to_many :bondings, :join_table => 'bondings_nics'
+
+  validates_presence_of :host_id,
+    :message => 'A host must be specified.'
+
+  validates_presence_of :physical_network_id,
+    :message => 'A network must be specified.'
 
-  has_and_belongs_to_many :bonding, :join_table => 'bondings_nics'
+  protected
+   def validate
+    if 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
+   end
 end
diff --git a/src/app/models/physical_network.rb b/src/app/models/physical_network.rb
new file mode 100644
index 0000000..6923e40
--- /dev/null
+++ b/src/app/models/physical_network.rb
@@ -0,0 +1,21 @@
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Mohammed Morsi <mmorsi at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+class PhysicalNetwork < Network
+   has_many :nics
+end
diff --git a/src/app/models/usage.rb b/src/app/models/usage.rb
new file mode 100644
index 0000000..353e8f4
--- /dev/null
+++ b/src/app/models/usage.rb
@@ -0,0 +1,21 @@
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Mohammed Morsi <mmorsi at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+class Usage < ActiveRecord::Base
+  has_and_belongs_to_many :networks, :join_table => 'networks_usages'
+end
diff --git a/src/app/models/vlan.rb b/src/app/models/vlan.rb
new file mode 100644
index 0000000..f7889f4
--- /dev/null
+++ b/src/app/models/vlan.rb
@@ -0,0 +1,24 @@
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Mohammed Morsi <mmorsi at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+class Vlan < Network
+   has_many :bondings
+
+  validates_presence_of :number,
+    :message => 'A number must be specified.'
+end
diff --git a/src/app/views/dashboard/index.html.erb b/src/app/views/dashboard/index.html.erb
index 92cb4da..8815ebc 100644
--- a/src/app/views/dashboard/index.html.erb
+++ b/src/app/views/dashboard/index.html.erb
@@ -13,6 +13,13 @@
             </table>
           </div>
 
+         <% if @can_modify %>
+          <h3>Networks</h3>
+          <a href="<%= url_for :controller => 'network', :action => 'list' %>">
+             View / Edit
+          </a>
+         <% end %>
+
           </div> <!-- end #tools -->
   </td>
 
diff --git a/src/app/views/host/edit_network.rhtml b/src/app/views/host/edit_network.rhtml
new file mode 100644
index 0000000..7ec3180
--- /dev/null
+++ b/src/app/views/host/edit_network.rhtml
@@ -0,0 +1,85 @@
+<%- content_for :title do -%>
+  Edit <%= @host.hostname %> Network Devices
+<%- end -%>
+
+<%- content_for :description do -%>
+  Select and edit nics and bonded interfaces on <%= @host.hostname %>
+<%- end -%>
+
+<div id="select-host-nic" class="popup-content-selection">
+<%= select_with_label "NICs", "nic", "id",
+        @host.nics.
+          collect{ |nic| [nic.mac, nic.id] }.
+          insert(0, "") %>
+</div>
+
+<div id="select-host-bonding" class="popup-content-selection">
+<%= select_with_label "Bonded Interfaces", "bonding", "id", [] %>
+</div>
+
+<div style="clear: both;"></div>
+
+<div id="selected_nic_bonding" class="selected_popup_content"></div>
+
+<div id="host_network_footer" class="popup-content-footer">
+  <%= ok_footer %>
+</div>
+
+<script type="text/javascript">
+function reset_nics_bonding_detail(){
+   var data='Select NIC or Bonded Interface<br/>';
+
+   $("#selected_nic_bonding").html(data);
+   $("#host_network_footer").show();
+};
+
+reset_nics_bonding_detail(); // run it once for inital content
+
+function reset_nics_select(){
+  $("#nic_id option:first").attr("selected", true);
+};
+
+function reset_bonding_select(){
+  // incase of new additions / deletions, repopulate select box
+  $.getJSON(
+     "<%= url_for :action => 'bondings_json', :id => @host.id %>",
+      {},
+      function(j){
+        var options = "<option value=''></option>" +
+                      "<option value='New'>New</option>";
+        for(var i = 0; i < j.length; i++){
+          options += '<option value="' + j[i].id + '">' + j[i].name +
+                     '</option>';
+        }
+        $("#bonding_id").html(options);
+      });
+
+  $("#bonding_id option:first").attr("selected", true);
+};
+
+reset_bonding_select(); // run it once for initial content
+
+$("#nic_id").change(function () {
+  reset_bonding_select();
+  if($('#nic_id').val() != ""){
+    $("#selected_nic_bonding").load("<%= url_for :controller => 'network',
+        :action => 'edit_nic'%>/" + $('#nic_id').val());
+    $("#host_network_footer").hide();
+  }else{
+     reset_nics_bonding_detail();
+  }
+});
+
+$("#bonding_id").change(function () {
+  reset_nics_select();
+  if($('#bonding_id').val() == "New"){
+      $("#selected_nic_bonding").load("<%= url_for :controller => 'network', :action => 'new_bonding', :host_id => @host.id %>");
+    $("#host_network_footer").hide();
+  }else if($('#bonding_id').val() != ""){
+      $("#selected_nic_bonding").load("<%= url_for :controller => 'network', :action => 'edit_bonding'%>/" + $('#bonding_id').val());
+    $("#host_network_footer").hide();
+  }else{
+     reset_nics_bonding_detail();
+  }
+});
+</script>
diff --git a/src/app/views/host/show.rhtml b/src/app/views/host/show.rhtml
index d1b05ad..c9562b1 100644
--- a/src/app/views/host/show.rhtml
+++ b/src/app/views/host/show.rhtml
@@ -17,6 +17,10 @@
         <%= image_tag "icon_x.png" %> Clear VMs
       </a> 
     <% end -%>
+    <%= link_to image_tag("icon_edit.png") +"Edit Network",
+                 {:controller => 'host',
+                  :action => 'edit_network', :id => @host.id},
+                 :rel=>"facebox[.bolder]", :class=>"selection_facebox" %>
   <%- end -%>
 <%- end -%>
 <script type="text/javascript">
@@ -47,6 +51,8 @@
 	Hypervisor Type:<br/> 
         Status:<br/>
         VMs:<br/>
+        NICs:<br/>
+        Bondings:<br/>
     </div>
     <div class="selection_value">
     	<%=h @host.uuid %><br/>
@@ -56,6 +62,8 @@
         <%=h @host.arch %><br/>
 	<%=h @host.hypervisor_type %><br/>
 	<%=h @host.status_str %><br/>
+	<%=  @host.nics.collect{ |n| n.mac }.join("<br/>") %><br/>
+	<%=h @host.bondings.collect { |n| n.name }.join("<br/>") %><br/>
     <%= @host.vms.collect{|x| x.uuid }.join(" <br/> ") %><br/>
 
 <!-- FIXME: need styling
diff --git a/src/app/views/network/_bonding_form.rhtml b/src/app/views/network/_bonding_form.rhtml
new file mode 100644
index 0000000..4ec0df1
--- /dev/null
+++ b/src/app/views/network/_bonding_form.rhtml
@@ -0,0 +1,46 @@
+ <%= error_messages_for 'bonding' %>
+ <%= error_messages_for 'ip_address' %>
+
+<div id="selected_popup_content_expanded" class="dialog_form">
+  <%= hidden_field_tag 'bonding[host_id]', @host.id %>
+
+  <div class="selected_popup_content_left">Name</div>
+  <div class="selected_popup_content_right">
+    <%= text_field_with_label "", "bonding", "name" %>
+  </div>
+
+  <div class="selected_popup_content_left">Interface Name</div>
+  <div class="selected_popup_content_right">
+    <%= text_field_with_label "", "bonding", "interface_name" %>
+  </div>
+
+  <div class="selected_popup_content_left">Bonding Type</div>
+  <div class="selected_popup_content_right">
+      <%= select "bonding", "bonding_type_id",
+             @bonding_types.collect { |bt| [bt.label, bt.id ] } %>
+  </div>
+
+  <% if @host.nics.size != 0 %>
+    <div class="selected_popup_content_left">NICs</div>
+    <div class="selected_popup_content_right">
+       <select id="bonding_nic_ids" name="bonding[nic_ids][]" multiple="true">
+        <%= options_from_collection_for_select @host.nics, "id", "mac",
+                    @bonding ? @bonding.nics.collect{ |x| x.nic_id.to_i } : [] %>
+       </select>
+    </div>
+  <% end %>
+
+  <%= render :partial => 'select', :locals => { :target => 'bonding' } %>
+
+<div id="static_ip_options"
+ style="<% unless ((@network && @network.boot_type_id == @static_boot_type.id) ||
+                   (!@network && @networks.size > 0 &&
+                     @networks[0].boot_type_id == @static_boot_type.id)) %>
+          display: none;<%end %>">
+  <%= render :partial => 'ip_addresses_form',
+             :locals => { :parent_type => 'bonding',
+                          :parent_id => @bonding ? @bonding.id : nil } %>
+</div>
+
+
+</div>
diff --git a/src/app/views/network/_form.rhtml b/src/app/views/network/_form.rhtml
new file mode 100644
index 0000000..6c67a0e
--- /dev/null
+++ b/src/app/views/network/_form.rhtml
@@ -0,0 +1,46 @@
+<%= error_messages_for 'network' %>
+
+<!--[form:network]-->
+<%= hidden_field 'network', 'id' if @create %>
+
+<%= text_field_with_label "Name:", "network", "name",
+                          {:style=>"width:250px;"}  %>
+
+<%= select_with_label "Boot Type:", 'network', 'boot_type_id',
+                      @boot_types.collect{ |bt| [bt.label, bt.id] },
+                      :style=>"width:250px;" %>
+
+<% if create %>
+<%= select_with_label "Type", "network", "type",
+           [[ "Physical Network", "PhysicalNetwork" ],
+            [ "VLAN", "Vlan" ] ]  %>
+<% end %>
+
+
+<div class="field_title">Usage:</div>
+<div class="form_field">
+ <select id="network_usages_ids" name="network[usage_ids][]" multiple="true">
+ <%= options_from_collection_for_select @usage_types, "id", "label",
+          @network ? @network.usages.collect{ |x| x.id.to_i } : [] %>
+ </select>
+</div>
+
+<div id="vlan_options"
+     <% if @network && @network.type != 'Vlan' %>
+     style="display: none;"
+     <% end %>
+>
+<%= text_field_with_label "Number:", "network", "number",
+                          {:style=>"width:250px;"}  %>
+</div>
+
+
+<script type="text/javascript">
+$("#network_type").change(function () {
+  if($('#network_type').val() == "Vlan"){
+    $("#vlan_options").show();
+  }else{
+    $("#vlan_options").hide();
+  }
+}).trigger('change');
+</script>
diff --git a/src/app/views/network/_grid.rhtml b/src/app/views/network/_grid.rhtml
new file mode 100644
index 0000000..6af0c05
--- /dev/null
+++ b/src/app/views/network/_grid.rhtml
@@ -0,0 +1,37 @@
+<% networks_per_page = 40 unless (defined? networks_per_page) and !(networks_per_page.nil?) %>
+<% usepager = @networks.size > networks_per_page %>
+
+<div id="<%= table_id %>_div">
+<form id="<%= table_id %>_form">
+<table id="<%= table_id %>" style="display:none"></table>
+</form>
+</div>
+<script type="text/javascript">
+    $("#<%= table_id %>").flexigrid
+    (
+    {
+    url: '<%=  url_for :action => "networks_json" %>',
+    dataType: 'json',
+    colModel : [
+        {display: '', width : 20, align: 'left', process: <%= table_id %>checkbox},
+        {display: 'Name', name: 'name', width : 180, align: 'left'},
+        {display: 'Type', name: 'type', width : 180, align: 'left'},
+        {display: 'Boot Type', name: 'boot_type', width : 180, align: 'left'}
+    ],
+    sortname: "name",
+    sortorder: "asc",
+    usepager: <%= usepager %>,
+    useRp: <%= usepager %>,
+    rp: <%= networks_per_page %>,
+    showTableToggleBtn: true,
+    onSelect: <%= on_select %>
+    }
+    );
+    function <%= table_id %>checkbox(celDiv)
+    {
+        $(celDiv).html('<input type="checkbox" name="grid_checkbox'+$(celDiv).html()+'" class="grid_checkbox" value="'+$(celDiv).html()+'"/>');
+    }
+
+</script>
+
+
diff --git a/src/app/views/network/_ip_address_form.rhtml b/src/app/views/network/_ip_address_form.rhtml
new file mode 100644
index 0000000..b952807
--- /dev/null
+++ b/src/app/views/network/_ip_address_form.rhtml
@@ -0,0 +1,62 @@
+<%= error_messages_for 'ip_address' %>
+
+<div id="selected_popup_content_expanded" class="dialog_form">
+ <%= hidden_field_tag 'parent_type', @parent_type%>
+ <%= hidden_field_tag 'ip_address[id]', @ip_address.id if @ip_address%>
+ <%= hidden_field_tag 'ip_address[network_id]', @network.id if @network %>
+ <%= hidden_field_tag 'ip_address[nic_id]', @nic.id if @nic %>
+ <%= hidden_field_tag 'ip_address[bonding_id]', @bonding.id if @bonding %>
+
+   <div class="selected_nic_bonding_left">Type:</div>
+   <div class="selected_nic_bonding_right">
+       <%= select_with_label "", "ip_address", "type",
+                          [[ "ipv4", "IpV4Address" ], [ "ipv6", "IpV6Address" ] ]  %>
+   </div>
+
+
+   <div class="static_ip_common_options">
+     <div class="selected_nic_bonding_left">IP Address</div>
+     <div class="selected_nic_bonding_right">
+       <%= text_field_with_label "", "ip_address", "address" %>
+     </div>
+   </div>
+
+   <div id="static_ip_v4_options">
+     <div class="selected_nic_bonding_left">Netmask</div>
+     <div class="selected_nic_bonding_right">
+        <%= text_field_with_label "", "ip_address", "netmask" %>
+     </div>
+
+     <div class="selected_nic_bonding_left">Broadcast</div>
+     <div class="selected_nic_bonding_right">
+         <%= text_field_with_label "", "ip_address", "broadcast" %>
+     </div>
+  </div>
+
+  <div id="static_ip_v6_options" style="display: none;">
+     <div class="selected_nic_bonding_left">Prefix</div>
+     <div class="selected_nic_bonding_right">
+         <%= text_field_with_label "", "ip_address", "prefix" %>
+     </div>
+  </div>
+
+  <div class="static_ip_common_options">
+     <div class="selected_nic_bonding_left">Gateway</div>
+     <div class="selected_nic_bonding_right">
+         <%= text_field_with_label "", "ip_address", "gateway" %>
+     </div>
+  </div>
+
+</div>
+
+<script type="text/javascript">
+  $("#ip_address_type").change(function () {
+    if($("#ip_address_type").val() == 'IpV4Address'){
+        $("#static_ip_v4_options").show();
+        $("#static_ip_v6_options").hide();
+    }else{
+        $("#static_ip_v4_options").hide();
+        $("#static_ip_v6_options").show();
+    }
+  }).trigger('change');
+</script>
diff --git a/src/app/views/network/_ip_addresses_form.rhtml b/src/app/views/network/_ip_addresses_form.rhtml
new file mode 100644
index 0000000..f833b2a
--- /dev/null
+++ b/src/app/views/network/_ip_addresses_form.rhtml
@@ -0,0 +1,50 @@
+<div id="select_ip_address" class="popup-content-selection">
+<%= select_with_label "IP Addresses", "ip_address", "id", [] %>
+</div>
+
+<div id="selected_ip_address" class="selected_popup_content"></div>
+
+<script type="text/javascript">
+function reset_selected_ip_address(){
+   var data='Select IP Address<br/>';
+
+   $("#selected_ip_address").html(data);
+   $("#ip_addresses_footer").show();
+};
+
+reset_selected_ip_address(); // run it once for inital content
+
+function reset_ip_address_select(){
+  // incase of new additions / deletions, repopulate select box
+  $.getJSON(
+     "<%= url_for :action => 'ip_addresses_json', :id => parent_id, :parent_type => parent_type %>",
+      {},
+      function(j){
+        var options = "<option value=''></option>" +
+                      "<option value='New'>New</option>";
+        for(var i = 0; i < j.length; i++){
+          options += '<option value="' + j[i].id + '">' + j[i].name +
+                     '</option>';
+        }
+        $("#ip_address_id").html(options);
+      });
+
+  $("#ip_address_id option:first").attr("selected", true);
+};
+
+reset_ip_address_select(); // run it once for initial content
+
+$("#ip_address_id").change(function () {
+  if($('#ip_address_id').val() == "New"){
+    $("#selected_ip_address").load("<%= url_for :action => 'new_ip_address', :id => parent_id, :parent_type => parent_type %>");
+    $("#ip_addresses_footer").hide();
+  }else if($('#ip_address_id').val() != ""){
+    $("#selected_ip_address").load("<%= url_for :action => 'edit_ip_address'%>/" + $('#ip_address_id').val() + "?parent_type=<%= parent_type %>");
+    $("#ip_addresses_footer").hide();
+  }else{
+     reset_selected_ip_address();
+  }
+});
+
+</script>
+
diff --git a/src/app/views/network/_select.rhtml b/src/app/views/network/_select.rhtml
new file mode 100644
index 0000000..e69d9b0
--- /dev/null
+++ b/src/app/views/network/_select.rhtml
@@ -0,0 +1,32 @@
+<% target = 'nic' unless target
+   network_id = 'physical_network_id' if target == 'nic'
+   network_id = 'vlan_id' if target == 'bonding'
+
+ %>
+
+<div class="selected_popup_content_left">Network:</div>
+<div class="selected_popup_content_right">
+    <%= select_with_label "", target, network_id,
+    @networks.collect { |n| [n.name + ' - ' + n.boot_type.label, n.id ] } %>
+
+</div>
+
+<script type="text/javascript">
+  var static_network_ids=<%= static_network_ids = '['
+    @networks.each { |n|
+     static_network_ids += ',' if static_network_ids != '['
+     static_network_ids += n.id.to_s if n.boot_type_id == @static_boot_type.id
+    }
+    static_network_ids += ']'
+    static_network_ids %>;
+
+  $("#<%=target %>_<%= network_id %>").change(function () {
+    $("#static_ip_options").hide();
+    for(i=0; i<static_network_ids.length; ++i){
+     if($("#<%= target %>_<%= network_id %>").val() == static_network_ids[i]){
+          $("#static_ip_options").show();
+          break;
+     }
+    };
+  });
+</script>
diff --git a/src/app/views/network/edit.rhtml b/src/app/views/network/edit.rhtml
new file mode 100644
index 0000000..6360b3f
--- /dev/null
+++ b/src/app/views/network/edit.rhtml
@@ -0,0 +1,34 @@
+<%- content_for :title do -%>
+  Edit Network
+<%- end -%>
+<%- content_for :description do -%>
+<%- end -%>
+
+  <!-- DIALOG  BODY -->
+  <form method="POST" action="<%= url_for :action => 'update' %>" id="network_form" >
+  <div class="dialog_form">
+    <%= hidden_field_tag 'id', @network.id %>
+    <%= render :partial => 'form', :locals => { :create => false }  %>
+  </div>
+  <!-- DIALOG  FOOTER -->
+  <%= popup_footer("$('#network_form').submit()", "Edit Network") %>
+  </form>
+
+<script type="text/javascript">
+$(function() {
+    var networkoptions = {
+        target:        '<%= url_for :action => 'update' %>',
+	dataType:      'json',
+        success: function(response, status) {
+           afterNetwork(response, status);
+           refresh_summary_static('networks_selection',
+            '<div class="selection_left"><div>Select a network.</div></div>');
+        }
+    };
+
+    // bind form using 'ajaxForm'
+    $('#network_form').ajaxForm(networkoptions);
+});
+</script>
+
+
diff --git a/src/app/views/network/edit_bonding.rhtml b/src/app/views/network/edit_bonding.rhtml
new file mode 100644
index 0000000..645e469
--- /dev/null
+++ b/src/app/views/network/edit_bonding.rhtml
@@ -0,0 +1,52 @@
+<form method="POST"
+      action="<%= url_for :action => 'update_bonding' %>" id="edit_bonding_form" >
+  <div id="selected_popup_content_header">
+      Editing Bonded Interface
+  </div>
+
+  <%= hidden_field_tag('id', @bonding.id) %>
+  <%= render :partial => 'bonding_form' %>
+
+</form>
+
+<form method="POST" action="<%= url_for :action => 'destroy_bonding' %>" id="delete_bonding_form" >
+  <%= hidden_field_tag('id', @bonding.id) %>
+</form>
+
+<%= multi_button_popup_footer({"Edit Bonding" =>
+                                 "$('#edit_bonding_form').submit()",
+                               "Delete Bonding" =>
+                                 "$('#delete_bonding_form').submit()"}) %>
+
+<script type="text/javascript">
+$(function() {
+    var edit_bonding_options = {
+        target:        '<%= url_for :action => 'update_bonding' %>',
+        dataType:      'json',
+        success:       function(response, status) {
+          ajax_validation(response, status);
+          if (response.success) {
+            reset_bonding_select();
+            reset_nics_bonding_detail();
+          }
+        }
+    };
+
+    var delete_bonding_options = {
+        target:        '<%= url_for :action => 'destroy_bonding' %>',
+        dataType:      'json',
+        success:       function(response, status) {
+          ajax_validation(response, status);
+          if (response.success) {
+            reset_bonding_select();
+            reset_nics_bonding_detail();
+          }
+        }
+    };
+
+    // bind forms using 'ajaxForm'
+    $('#edit_bonding_form').ajaxForm(edit_bonding_options);
+    $('#delete_bonding_form').ajaxForm(delete_bonding_options);
+
+});
+</script>
diff --git a/src/app/views/network/edit_ip_address.rhtml b/src/app/views/network/edit_ip_address.rhtml
new file mode 100644
index 0000000..60fe8f1
--- /dev/null
+++ b/src/app/views/network/edit_ip_address.rhtml
@@ -0,0 +1,76 @@
+<% if @parent_type == 'network' %>
+<form method="POST"
+      action="<%= url_for :action => 'update_ip_address' %>"
+      id="edit_ip_address_form" >
+<% end %>
+
+  <div id="selected_popup_content_header">
+      Editing IP Address
+  </div>
+
+  <% if @parent_type != 'network' %>
+     <a href="#" onClick="$('#delete_ip_address_form').submit()" style="color: blue;">Delete</a>
+  <% end %>
+
+  <%= hidden_field_tag('id', @ip_address.id) %>
+  <%= render :partial => 'ip_address_form' %>
+
+<% if @parent_type == 'network' %>
+</form>
+<% end %>
+
+<form method="POST"
+      action="<%= url_for :action => 'destroy_ip_address' %>"
+      id="delete_ip_address_form" >
+  <%= hidden_field_tag('id', @ip_address.id) %>
+</form>
+
+<% if @parent_type == 'network' %>
+<%= multi_button_popup_footer({" Edit IP Address" =>
+                                 "$('#edit_ip_address_form').submit()",
+                               "Delete IP Address" =>
+                                 "$('#delete_ip_address_form').submit()"}) %>
+<% end %>
+
+<script type="text/javascript">
+$(function() {
+    var edit_ip_address_options = {
+        target:        '<%= url_for :action => 'update_ip_address' %>',   // target element to update
+        dataType:      'json',
+        success:       function(response, status) {
+          ajax_validation(response, status);
+          if (response.success) {
+            reset_selected_ip_address();
+            reset_ip_address_select();
+           <% if @parent_type == 'network' %>
+            refresh_summary('networks_selection',
+                '<%= url_for :controller => "network", :action => "show" %>',
+                 <%= @network.id %>);
+           <% end %>
+          }
+        }
+    };
+
+    var delete_ip_address_options = {
+        target:        '<%= url_for :action => 'delete_ip_address' %>',   // target element to update
+        dataType:      'json',
+        success:       function(response, status) {
+          ajax_validation(response, status);
+          if (response.success) {
+            reset_selected_ip_address();
+            reset_ip_address_select();
+           <% if @parent_type == 'network' %>
+            refresh_summary('networks_selection',
+                '<%= url_for :controller => "network", :action => "show" %>',
+                 <%= @network.id %>);
+           <% end %>
+          }
+        }
+    };
+
+    // bind forms using 'ajaxForm'
+    $('#edit_ip_address_form').ajaxForm(edit_ip_address_options);
+    $('#delete_ip_address_form').ajaxForm(delete_ip_address_options);
+
+});
+</script>
diff --git a/src/app/views/network/edit_network_ip_addresses.rhtml b/src/app/views/network/edit_network_ip_addresses.rhtml
new file mode 100644
index 0000000..7a1e4cb
--- /dev/null
+++ b/src/app/views/network/edit_network_ip_addresses.rhtml
@@ -0,0 +1,13 @@
+<%- content_for :title do -%>
+  Edit Network IP Addresses
+<%- end -%>
+<%- content_for :description do -%>
+<%- end -%>
+
+<%= render :partial => 'ip_addresses_form',
+           :locals  => { :parent_type => 'network',
+                         :parent_id   =>  @network.id } %>
+
+<div id="ip_addresses_footer" class="popup-content-footer">
+  <%= ok_footer %>
+</div>
diff --git a/src/app/views/network/edit_nic.rhtml b/src/app/views/network/edit_nic.rhtml
new file mode 100644
index 0000000..75af6fb
--- /dev/null
+++ b/src/app/views/network/edit_nic.rhtml
@@ -0,0 +1,62 @@
+<form method="POST"
+      action="<%= url_for :action => 'update_nic' %>" id="nic_form" >
+ <div id="selected_popup_content_header">
+      Editing NIC
+ </div>
+
+ <%= error_messages_for 'nic' %>
+
+ <div id="selected_popup_content_expanded" class="dialog_form">
+  <%= hidden_field_tag 'id', @nic.id %>
+  <%= hidden_field_tag 'nic_host_id', @nic.host.id %>
+  <%= hidden_field_tag 'nic_network_id', @nic.physical_network.id %>
+
+  <div class="selected_popup_content_left">MAC:</div>
+  <div class="selected_popup_content_right"><%= @nic.mac %></div>
+
+  <% if @nic.host.bondings.size != 0 %>
+    <div class="selected_popup_content_left">Bonded Interfaces</div>
+    <div class="selected_popup_content_right">
+       <select id="nic_bonding_ids" name="nic[bonding_ids][]">
+         <option value="" />
+         <%= options_from_collection_for_select @nic.host.bondings,
+                           "id", "name",
+                           @nic.bondings.size > 0 ? @nic.bondings[0].bonding_id.to_i : "" %>
+       </select>
+    </div>
+  <% end %>
+
+
+  <%= render :partial => 'select' %>
+
+  <div id="static_ip_options"
+    style="<% if @network.boot_type_id != @static_boot_type.id %>
+            display: none;<%end %>">
+    <%= render :partial => 'ip_addresses_form',
+               :locals => { :parent_type => 'nic',
+                            :parent_id => @nic.id } %>
+  </div>
+
+
+ </div>
+ <%= popup_footer("$('#nic_form').submit()", "Edit NIC") %>
+</form>
+
+<script type="text/javascript">
+$(function() {
+    var nicoptions = {
+        target:        '<%= url_for :action => 'update_nic' %>',
+        dataType:      'json',
+        success:       function(response, status) {
+          ajax_validation(response, status);
+          if (response.success) {
+            reset_nics_select();
+            reset_nics_bonding_detail();
+          }
+        }
+    };
+
+    // bind form using 'ajaxForm'
+    $('#nic_form').ajaxForm(nicoptions);
+});
+</script>
diff --git a/src/app/views/network/list.html.erb b/src/app/views/network/list.html.erb
new file mode 100644
index 0000000..9a304cf
--- /dev/null
+++ b/src/app/views/network/list.html.erb
@@ -0,0 +1,72 @@
+<div id="toolbar_nav">
+<ul>
+    <li><a href="<%= url_for :action => 'new' %>" rel="facebox[.bolder]"><%= image_tag "icon_addstorage.png", :style => "vertical-align:middle;" %>&nbsp;&nbsp;Add Network</a></li>
+    <li>
+      <a href="#" onClick="delete_networks();" >
+        <%= image_tag "icon_remove.png", :style=>"vertical-align:middle;" %>
+            &nbsp;&nbsp;Remove
+       </a>
+    </li>
+  </ul>
+</div>
+
+<script type="text/javascript">
+  function delete_networks(){
+    var networks = get_selected_networks();
+    if (validate_selected(get_selected_networks(), 'networks')) {
+      $.post('<%= url_for :action => 'delete' %>',
+             { network_ids: networks.toString() },
+             function(data,status){
+                if (data.alert) {
+                  $.jGrowl(data.alert);
+                }
+               grid = $("#networks_grid");
+               if (grid.size()>0 && grid != null) {
+                  grid.flexReload();
+               }
+               empty_summary('networks_selection', 'Network');
+             }, 'json');
+    }
+  }
+
+  function networks_select(selected_rows)
+  {
+    var selected_ids = new Array();
+    for(i=0; i<selected_rows.length; i++) {
+      selected_ids[i] = selected_rows[i].id;
+    }
+    if (selected_ids.length == 1)
+    {
+      $('#networks_selection').load('<%= url_for :action => "show" %>',
+                { id: parseInt(selected_ids[0].substring(3))});
+    }
+  }
+
+</script>
+
+<div class="panel_header"></div>
+<% if @networks.size != 0 %>
+  <div class="data_section">
+       <%= render :partial => "grid", :locals => { :table_id => "networks_grid",
+                                                   :networks => @networks,
+                                                   :on_select => "networks_select"} %>
+  </div>
+
+  <div class="selection_detail" id="networks_selection">
+    <div class="selection_left">
+      <div>Select a network.</div>
+    </div>
+  </div>
+<% else %>
+   <div class="data_section">
+       <div class="no-grid-items">
+          <%= image_tag 'no-grid-items.png', :style => 'float: left;' %>
+
+          <div class="no-grid-items-text">
+            No networks found. <br/><br/>
+            <%= image_tag "icon_addhost.png", :style=>"vertical-align:middle;" %>&nbsp;&nbsp;
+            <a href="<%= url_for :action => 'new' %>" rel="facebox[.bolder]">Add first network</a>
+          </div>
+       </div>
+   </div>
+<% end %>
diff --git a/src/app/views/network/new.rhtml b/src/app/views/network/new.rhtml
new file mode 100644
index 0000000..15b7304
--- /dev/null
+++ b/src/app/views/network/new.rhtml
@@ -0,0 +1,28 @@
+<%- content_for :title do -%>
+  Add Network
+<%- end -%>
+<%- content_for :description do -%>
+<%- end -%>
+
+  <!-- DIALOG  BODY -->
+  <form method="POST" action="<%= url_for :action => 'create' %>" id="network_form" >
+  <div class="dialog_form">
+    <%= render :partial => 'form', :locals => { :create => true }  %>
+  </div>
+  <!-- DIALOG  FOOTER -->
+  <%= popup_footer("$('#network_form').submit()", "Add Network") %>
+  </form>
+
+<script type="text/javascript">
+$(function() {
+    var networkoptions = {
+        target:        '<%= url_for :action => 'create' %>',
+	dataType:      'json',
+        success:       afterNetwork  // post-submit callback
+    };
+
+    // bind form using 'ajaxForm'
+    $('#network_form').ajaxForm(networkoptions);
+});
+</script>
+
diff --git a/src/app/views/network/new_bonding.rhtml b/src/app/views/network/new_bonding.rhtml
new file mode 100644
index 0000000..9ee6994
--- /dev/null
+++ b/src/app/views/network/new_bonding.rhtml
@@ -0,0 +1,32 @@
+<form method="POST"
+      action="<%= url_for :action => 'create_bonding' %>" id="bonding_form" >
+
+  <div id="selected_popup_content_header">
+      Create Bonded Interface
+  </div>
+
+  <%= render :partial => 'bonding_form' %>
+</form>
+
+<%= multi_button_popup_footer({"Create Bonding" =>
+                                 "$('#bonding_form').submit()"}) %>
+
+<script type="text/javascript">
+$(function() {
+    var bonding_options = {
+        target:        '<%= url_for :action => 'create_bonding' %>',
+        dataType:      'json',
+        success:       function(response, status) {
+          ajax_validation(response, status);
+          if (response.success) {
+            reset_bonding_select();
+            reset_nics_bonding_detail();
+          }
+        }
+    };
+
+    // bind forms using 'ajaxForm'
+    $('#bonding_form').ajaxForm(bonding_options);
+
+});
+</script>
diff --git a/src/app/views/network/new_ip_address.rhtml b/src/app/views/network/new_ip_address.rhtml
new file mode 100644
index 0000000..df2a2bb
--- /dev/null
+++ b/src/app/views/network/new_ip_address.rhtml
@@ -0,0 +1,44 @@
+<% if @parent_type == 'network' %>
+<form method="POST"
+      action="<%= url_for :action => 'create_ip_address' %>"
+      id="ip_address_form" >
+<% end %>
+
+  <div id="selected_popup_content_header">
+      Create Ip Address
+  </div>
+
+  <%= render :partial => 'ip_address_form' %>
+
+<% if @parent_type == 'network' %>
+</form>
+<% end %>
+
+<% if @parent_type == 'network' %>
+<%= multi_button_popup_footer({"Create IP Address" =>
+                                 "$('#ip_address_form').submit()"}) %>
+<% end %>
+
+<script type="text/javascript">
+$(function() {
+    var ip_address_options = {
+        target:        '<%= url_for :action => 'create_ip_address' %>',
+        dataType:      'json',
+        success:       function(response, status) {
+          ajax_validation(response, status);
+          if (response.success) {
+            reset_selected_ip_address();
+            reset_ip_address_select();
+           <% if @parent_type == 'network' %>
+            refresh_summary('networks_selection',
+                '<%= url_for :controller => "network", :action => "show" %>',
+                 <%= @network.id %>);
+           <% end %>
+          }
+        }
+    };
+
+    // bind forms using 'ajaxForm'
+    $('#ip_address_form').ajaxForm(ip_address_options);
+});
+</script>
diff --git a/src/app/views/network/show.rhtml b/src/app/views/network/show.rhtml
new file mode 100644
index 0000000..2ac68ea
--- /dev/null
+++ b/src/app/views/network/show.rhtml
@@ -0,0 +1,31 @@
+<%- content_for :title do -%>
+  <%=h @network.name %>
+<%- end -%>
+
+<%- content_for :action_links do -%>
+  <%= link_to image_tag("icon_edit.png") + "Edit",
+        {:action => 'edit', :id => @network.id },
+         :rel=>"facebox[.bolder]", :class=>"selection_facebox" %>
+
+  <%= link_to image_tag("icon_edit.png") + "Edit IP Addresses",
+        {:action => 'edit_network_ip_addresses', :id => @network.id },
+         :rel=>"facebox[.bolder]", :class=>"selection_facebox" %>
+<%- end -%>
+
+<div id="hosts_selection_id" style="display:none"><%= @host.id %></div>
+<div class="selection_key">
+    Name:<br/>
+    Type:<br/>
+    Boot Type:<br/>
+    IP Addresses:<br/>
+</div>
+<div class="selection_value">
+    <%=h @network.name %><br/>
+    <%=h @network.type %><br/>
+    <%=h @network.boot_type.label %><br/>
+    <%=@network.ip_addresses.collect{ |ip|
+         ip.address}.join("<br/>") %>
+</div>
+
+<%- content_for :right do -%>
+<%- end -%>
diff --git a/src/app/views/nic/_list.rhtml b/src/app/views/nic/_list.rhtml
index 07f7e44..eb3a4a7 100644
--- a/src/app/views/nic/_list.rhtml
+++ b/src/app/views/nic/_list.rhtml
@@ -1,7 +1,6 @@
 <table class='listing'>
   <thead>
   <tr>
-    <th class="empty">IP</th>
     <th>MAC</th>
     <th>Bridge</th>
     <th>Usage Type</th>
@@ -11,7 +10,6 @@
   </thead>
 <% for nic in nics %>
   <tr class="<%= cycle('odd','even', :name => nics) %>">
-    <td><%= link_to nic.ip_addr, { :controller => "nic", :action => 'show', :id => nic }, { :class => "show" } %></td>
     <td><%= nic.mac %></td>
     <td><%= nic.bridge %></td>
     <td><%= nic.usage_type %></td>
diff --git a/src/db/migrate/028_refactor_networking_model.rb b/src/db/migrate/028_refactor_networking_model.rb
new file mode 100644
index 0000000..946b976
--- /dev/null
+++ b/src/db/migrate/028_refactor_networking_model.rb
@@ -0,0 +1,271 @@
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Mohammed Morsi <mmorsi at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+# introduce networks and ip_addresses tables, refactor relationships
+class RefactorNetworkingModel < ActiveRecord::Migration
+  def self.up
+
+    ####################################################
+    # bugfix, bridge tables shouldn't have their own ids
+    remove_column :bondings_nics, :id
+
+    ##################################################################
+    # add networks, usages tables and networks_usage_types bridge
+    create_table :networks do |t|
+      t.string  :type, :null => false
+      t.string  :name, :null => false
+      t.integer :boot_type_id, :null => false
+
+      # attributes for Vlan (type=Vlan)
+      t.integer :number
+    end
+
+    create_table :usages do |t|
+      t.string :label, :null => false
+      t.string :usage, :null => false
+    end
+
+    create_table :networks_usages, :id => false do |t|
+      t.integer :network_id, :null => false
+      t.integer :usage_id, :null => false
+    end
+
+    add_index :networks_usages, [:network_id, :usage_id], :unique => true
+
+    # create usages
+    Usage.create(:label => 'Guest', :usage => 'guest')
+    Usage.create(:label => 'Management', :usage => 'management')
+    Usage.create(:label => 'Storage', :usage => 'storage')
+
+    # referential integrity for networks tables
+    execute "alter table networks add constraint
+             fk_network_boot_types
+             foreign key (boot_type_id) references
+             boot_types(id)"
+    execute "alter table networks_usages add constraint
+             fk_networks_usages_network_id
+             foreign key (network_id) references
+             networks(id)"
+    execute "alter table networks_usages add constraint
+             fk_networks_usages_usage_id
+             foreign key (usage_id) references
+             usages(id)"
+
+    # add foreign keys to nics / bondings table
+    add_column :nics, :physical_network_id, :integer
+    add_column :bondings, :vlan_id, :integer
+
+    # referential integrity for nic/bondings network ids
+    execute "alter table nics add constraint
+             fk_nic_networks
+             foreign key (physical_network_id) references
+             networks(id)"
+    execute "alter table bondings add constraint
+             fk_bonding_networks
+             foreign key (vlan_id) references
+             networks(id)"
+
+    ####################################################
+    # create ip_addresses table
+    create_table :ip_addresses do |t|
+      t.string :type
+
+      # foreign keys to associated entities
+      t.integer :nic_id
+      t.integer :bonding_id
+      t.integer :network_id
+
+      # common attributes
+      t.string :address,   :limit => 39, :null => false
+      t.string :gateway,   :limit => 39
+
+      # attributes for IPv4 (type=IpV4Address)
+      t.string :netmask,   :limit => 15
+      t.string :broadcast, :limit => 15
+
+      # attributes for IPv6 (type=IpV6Address)
+      t.string :prefix,    :limit => 39
+      t.timestamps
+    end
+
+    # referential integrity for ip_addresses table
+    execute "alter table ip_addresses add constraint
+             fk_nic_ip_addresses
+             foreign key (nic_id) references nics(id)"
+    execute "alter table ip_addresses add constraint
+             fk_bonding_ip_addresses
+             foreign key (bonding_id) references bondings(id)"
+    execute "alter table ip_addresses add constraint
+             fk_network_ip_addresses
+             foreign key (network_id) references networks(id)"
+
+    ###################################################################
+    static_boot_type_id =
+      BootType.find(:first,
+           :conditions => {:proto => 'static'} ).id
+
+    # migrate nic ip_addresses to networks / ip_addresses table
+    i = 0
+    Nic.find(:all).each do |nic|
+      if nic.boot_type_id == static_boot_type_id
+        IpV4Address.new(:nic_id    => nic.id,
+                        :address   => nic.ip_addr).save!
+
+      end
+      network = PhysicalNetwork.new(
+                            :name => 'Physical Network ' + i.to_s,
+                            :boot_type_id => nic.boot_type_id)
+      network.save!
+
+      ip_address = IpV4Address.new(:address   => nic.ip_addr ? nic.ip_addr : '0.0.0.0',
+                                   :netmask   => nic.netmask,
+                                   :broadcast => nic.broadcast,
+                                   :gateway   => nic.ip_addr)
+      ip_address.network = network
+      ip_address.save!
+
+      nic.physical_network = network
+      nic.save!
+
+      i += 1
+    end
+
+    # migrate bonding ip_addresses to networks / ip_addresses table
+    i = 0
+    Bonding.find(:all).each do |bonding|
+      if bonding.boot_type_id == static_boot_type_id
+        IpV4Address.new(:bonding_id => bonding.id,
+                        :address    => bonding.ip_addr).save!
+      end
+      network = Vlan.new(
+                     :name => 'VLAN ' + i.to_s,
+                     :number => i,
+                     :boot_type_id => bonding.boot_type_id)
+      network.save!
+
+      ip_address = IpV4Address.new(:address   => bonding.ip_addr ? bonding.ip_addr : '0.0.0.0',
+                                   :netmask   => bonding.netmask,
+                                   :broadcast => bonding.broadcast,
+                                   :gateway   => bonding.ip_addr)
+      ip_address.network = network
+      ip_address.save!
+
+      bonding.vlan = network
+      bonding.save!
+
+      i += 1
+    end
+
+    ##############################################################
+    # remove nics / bonding ip address and network related columns
+    remove_column :nics,     :ip_addr
+    remove_column :nics,     :netmask
+    remove_column :nics,     :broadcast
+    remove_column :nics,     :boot_type_id
+    remove_column :bondings, :ip_addr
+    remove_column :bondings, :netmask
+    remove_column :bondings, :broadcast
+    remove_column :bondings, :boot_type_id
+
+
+  end
+
+  def self.down
+    ##############################################################
+    # readd nics / bonding ip address related columns
+    add_column :nics,     :ip_addr,   :string, :limit => 16
+    add_column :nics,     :netmask,   :string, :limit => 16
+    add_column :nics,     :broadcast, :string, :limit => 16
+    add_column :nics,     :boot_type_id, :integer
+    add_column :bondings, :ip_addr,   :string, :limit => 16
+    add_column :bondings, :netmask,   :string, :limit => 16
+    add_column :bondings, :broadcast, :string, :limit => 16
+    add_column :bondings, :boot_type_id, :integer
+
+    execute "alter table nics add constraint
+             fk_nic_boot_types
+             foreign key (boot_type_id) references
+             boot_types(id)"
+    execute "alter table bondings add constraint
+             fk_bonding_boot_types
+             foreign key (boot_type_id) references
+             boot_types(id)"
+
+    ##############################################################
+    # attempt to migrate ip information back into nics table.
+    #  because a nic can have multiple ips (if statically
+    #  assigned) as well as its network, just use the 1st
+    #  found
+    Nic.find(:all).each do |nic|
+      if nic.physical_network.ip_addresses.size > 0
+        # use the 1st configured network ip
+        nic.ip_addr   = nic.physical_network.ip_addresses[0].address
+        nic.netmask   = nic.physical_network.ip_addresses[0].netmask
+        nic.broadcast = nic.physical_network.ip_addresses[0].broadcast
+      end
+
+      if nic.ip_addresses.size > 0
+        # use the 1st assigned static ip
+        nic.ip_addr   = nic.ip_addresses[0].address
+      end
+
+      nic.boot_type_id = nic.physical_network.boot_type_id
+
+      nic.save!
+    end
+
+    # attempt to migrate ip information back into bondings table.
+    #  because a bonding can have multiple ips (if statically
+    #  assigned) as well as its network, just use the 1st
+    #  found
+    Bonding.find(:all).each do |bonding|
+      if bonding.vlan.ip_addresses.size > 0
+        # use the 1st configured network ip
+        bonding.ip_addr   = bonding.vlan.ip_addresses[0].address
+        bonding.netmask   = bonding.vlan.ip_addresses[0].netmask
+        bonding.broadcast = bonding.vlan.ip_addresses[0].broadcast
+      end
+
+      if bonding.ip_addresses.size > 0
+        # use the 1st assigned static ip
+        bonding.ip_addr   = bonding.ip_addresses[0].address
+      end
+
+      bonding.boot_type_id = bonding.vlan.boot_type_id
+
+      bonding.save!
+    end
+
+    ##############################################################
+    # drop ip_addresses table
+    drop_table :ip_addresses
+
+    # drop network ids from nics / bondings table
+    remove_column :nics, :physical_network_id
+    remove_column :bondings, :vlan_id
+
+    # drop networks tables
+    drop_table :networks_usages
+    drop_table :usages
+    drop_table :networks
+
+    ##############################################################
+    # undo bugfix above
+    add_column :bondings_nics, :id, :integer
+  end
+end
diff --git a/src/public/javascripts/ovirt.js b/src/public/javascripts/ovirt.js
index 4579c80..d84b3d9 100644
--- a/src/public/javascripts/ovirt.js
+++ b/src/public/javascripts/ovirt.js
@@ -297,4 +297,23 @@ function delete_pool(delete_url, id)
               $.jGrowl(data.alert);
             }
            }, 'json');
-}
\ No newline at end of file
+}
+
+
+function get_selected_networks()
+{
+    return get_selected_checkboxes("networks_grid_form");
+}
+
+function afterNetwork(response, status){
+    ajax_validation(response, status);
+    if (response.success) {
+      $(document).trigger('close.facebox');
+      grid = $("#networks_grid");
+      if (grid.size()>0 && grid != null) {
+        grid.flexReload();
+      } else {
+        $tabs.tabs("load",$tabs.data('selected.tabs'));
+      }
+    }
+}
diff --git a/src/public/stylesheets/components.css b/src/public/stylesheets/components.css
index 16eaf62..228ff7b 100644
--- a/src/public/stylesheets/components.css
+++ b/src/public/stylesheets/components.css
@@ -267,4 +267,52 @@
 .detail-pane-chart {
     height: 50px;
     width: 375px;
-};
+}
+
+
+/*************************
+ *    new popup components
+ *************************/
+.popup-content-selection {
+   float: left;
+   width: 45%;
+   padding-left: 20px;
+   padding-top: 10px;
+}
+
+.popup-content-selection select{
+   min-width: 200px;
+}
+
+.popup-content-footer{
+  width: 99%;
+  float: left;
+}
+
+.selected_popup_content {
+   padding-left: 20px;
+   min-height: 50px;
+   float: left;
+   width: 96%;
+}
+
+#selected_popup_content_header {
+  padding-bottom: 5px;
+  font-weight: bold;
+}
+
+#selected_popup_content_expanded{
+  padding-bottom: 50px;
+}
+
+.selected_popup_content_left {
+  float: left;
+  width: 40%;
+  padding-bottom: 15px;
+}
+
+.selected_popup_content_right {
+  float: left;
+  width: 40%;
+  padding-bottom: 15px;
+}
-- 
1.5.6.5



From sseago at redhat.com  Fri Oct 31 21:47:23 2008
From: sseago at redhat.com (Scott Seago)
Date: Fri, 31 Oct 2008 17:47:23 -0400
Subject: [Ovirt-devel] Re: [PATCH server] network integration into ovirt
	server db and wui
In-Reply-To: <490B30A6.70406@redhat.com>
References: <1225416455-7607-1-git-send-email-mmorsi@redhat.com>
	<490B25C8.1020509@redhat.com>
	<20081031160305.GH30553@redhat.com> <490B30A6.70406@redhat.com>
Message-ID: <490B7CEB.2080302@redhat.com>

Testing the revised patch now.

Mohammed Morsi wrote:
> Hugh O. Brock wrote:
>   
>> On Fri, Oct 31, 2008 at 11:35:36AM -0400, Mohammed Morsi wrote:
>>   
>>     
>>> 1. Remove 'validate' method, replace w/ 'validates_presence_of',
>>> 'validate_format_of' where we can
>>>     
>>>       
> I can take care of this bit
>
>   
OK this is done.
>>> 2. Change ManageNodeConfiguration bit, to use new network model / schema
>>>     
>>>       
> The only thing this depends on is the model changes I did, which was
> based on http://www.ovirt.org/page/Redesigned_Network_Configuration. If
> someone who knows this bit more that I do can take care of it, it would
> speed things up
>
>   
I'm not sure what the state of this is, and I'm not sure how to test it. 
If there's anything here that must be in the release, hopefully dpierce 
can confirm.

>>> 3. Disable type selection for 'edit network' form
>>>     
>>>       
> Small, quick fix that I can take care of
>
>   
This is done.
>>> 5. Add ip address information to the network details pane
>>> 6. Add nic / bonding information to host details pane
>>>     
>>>       
> Both these items should be fairly straightforward and I can take care of.
>
>   
Basic summary of IP address is showing (i.e. the actual IP address) but 
the other metadata isn't there. The only way you can see it is the edit 
form -- but someone without edit rights wouldn't be able to do that. I 
think this is good enough for this patch and release, but we need to go 
back and make all of the data available in some sort of view page -- 
either via a flexigrid on the details pane or via a 'details' dialog.

For 6) -- I'm not sure if NIC is showing up properly, as my current DB 
doesn't have any NICs for hosts, but in addition to just the name we 
need a way to show all the metadata.
For the bonding -- I can't create a bonding w/ a static IP VLAN. for 
dhcp it works. However,  the summary pane isn't giving me anything 
useful for the bonding metadata. it shows: 
'71bcc3d3-bc81-fe8d-bf93-e2fa9814ba54' instead of the name. And the 
additional metadata isn't available.

The points that need to be fixed before pushing here are 1) static IP 
vlan; 2) bonding field in details pane needs to show the proper name. 
The other parts can be fixed later.


>
>>> 8. Add usages multi-select box to create / edit network form
>>>     
>>>       
> Another straightforward item I can take care of
>
>   
Usage is in the form -- it's not showing up in details -- another one 
for post-release if there are no objections here.

so not yet ACK -- we need to fix:

1) ManagedNodeConfiguration bit -- I'm not sure about this one -- but my 
concern is without this fix networking will be completely broken on the 
nodes/VMs
2) static IP VLAN for bondings
3) host details pane needs to show the bonding name in the 'bonding' 
section.

Scott



From apevec at redhat.com  Fri Oct 31 22:35:49 2008
From: apevec at redhat.com (Alan Pevec)
Date: Fri, 31 Oct 2008 23:35:49 +0100
Subject: [Ovirt-devel] [PATCH recipe] Add new rubygem-qpid package to
	the	wui.
In-Reply-To: <1225477828-3304-1-git-send-email-imain@redhat.com>
References: <1225477828-3304-1-git-send-email-imain@redhat.com>
Message-ID: <490B8845.5060405@redhat.com>

> +Requires: rubygem-qpid

Fedora Review BZ for this package please :)



From lutter at redhat.com  Fri Oct 31 23:01:29 2008
From: lutter at redhat.com (David Lutterkort)
Date: Fri, 31 Oct 2008 16:01:29 -0700
Subject: [Ovirt-devel] [PATCH recipe] Add new rubygem-qpid package to
	the	wui.
In-Reply-To: <490B8845.5060405@redhat.com>
References: <1225477828-3304-1-git-send-email-imain@redhat.com>
	<490B8845.5060405@redhat.com>
Message-ID: <1225494089.10508.21.camel@localhost.localdomain>

On Fri, 2008-10-31 at 23:35 +0100, Alan Pevec wrote:
> > +Requires: rubygem-qpid
> 
> Fedora Review BZ for this package please :)

A catch-22: we haven't handed the ruby/qpid code over to the Qpid team
yet, since we first wanted to make sure it works well for ovirt's need
(right now, a bugfix is a commit to our internal git repo, after the
handoff we'll have to send in patches and wait for them to show up in
Qpid's svn, and for them to make a release)

OTOH, we don't want to own that package, i.e. the review request should
come from the Qpid folks.

Can we live with this situation for a few days until Ian has used it
enough to make sure we don't have terribly obvious bugs in the client ?

David




From mmorsi at redhat.com  Fri Oct 31 23:51:53 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Fri, 31 Oct 2008 19:51:53 -0400
Subject: [Ovirt-devel] [PATCH server] network integration into ovirt server
	db and wui
Message-ID: <1225497113-5039-1-git-send-email-mmorsi@redhat.com>

---
 src/app/controllers/host_controller.rb             |   14 +-
 src/app/controllers/network_controller.rb          |  419 ++++++++++++++++++++
 src/app/helpers/application_helper.rb              |   28 +-
 src/app/helpers/network_helper.rb                  |    2 +
 src/app/models/bonding.rb                          |   30 +-
 src/app/models/ip_address.rb                       |   27 ++
 src/app/models/ip_v4_address.rb                    |   53 +++
 src/app/models/ip_v6_address.rb                    |   46 +++
 src/app/models/network.rb                          |   32 ++
 src/app/models/nic.rb                              |   21 +-
 src/app/models/physical_network.rb                 |   21 +
 src/app/models/usage.rb                            |   21 +
 src/app/models/vlan.rb                             |   24 ++
 src/app/views/dashboard/index.html.erb             |    7 +
 src/app/views/host/edit_network.rhtml              |   85 ++++
 src/app/views/host/show.rhtml                      |   30 +-
 src/app/views/network/_bonding_form.rhtml          |   46 +++
 src/app/views/network/_form.rhtml                  |   46 +++
 src/app/views/network/_grid.rhtml                  |   37 ++
 src/app/views/network/_ip_address_form.rhtml       |   62 +++
 src/app/views/network/_ip_addresses_form.rhtml     |   50 +++
 src/app/views/network/_select.rhtml                |   32 ++
 src/app/views/network/edit.rhtml                   |   34 ++
 src/app/views/network/edit_bonding.rhtml           |   60 +++
 src/app/views/network/edit_ip_address.rhtml        |   76 ++++
 .../views/network/edit_network_ip_addresses.rhtml  |   13 +
 src/app/views/network/edit_nic.rhtml               |   62 +++
 src/app/views/network/list.html.erb                |   72 ++++
 src/app/views/network/new.rhtml                    |   28 ++
 src/app/views/network/new_bonding.rhtml            |   36 ++
 src/app/views/network/new_ip_address.rhtml         |   44 ++
 src/app/views/network/show.rhtml                   |   31 ++
 src/app/views/nic/_list.rhtml                      |    2 -
 src/db/migrate/028_refactor_networking_model.rb    |  271 +++++++++++++
 src/public/javascripts/ovirt.js                    |   21 +-
 src/public/stylesheets/components.css              |   50 +++-
 36 files changed, 1894 insertions(+), 39 deletions(-)
 create mode 100644 src/app/controllers/network_controller.rb
 create mode 100644 src/app/helpers/network_helper.rb
 create mode 100644 src/app/models/ip_address.rb
 create mode 100644 src/app/models/ip_v4_address.rb
 create mode 100644 src/app/models/ip_v6_address.rb
 create mode 100644 src/app/models/network.rb
 create mode 100644 src/app/models/physical_network.rb
 create mode 100644 src/app/models/usage.rb
 create mode 100644 src/app/models/vlan.rb
 create mode 100644 src/app/views/host/edit_network.rhtml
 create mode 100644 src/app/views/network/_bonding_form.rhtml
 create mode 100644 src/app/views/network/_form.rhtml
 create mode 100644 src/app/views/network/_grid.rhtml
 create mode 100644 src/app/views/network/_ip_address_form.rhtml
 create mode 100644 src/app/views/network/_ip_addresses_form.rhtml
 create mode 100644 src/app/views/network/_select.rhtml
 create mode 100644 src/app/views/network/edit.rhtml
 create mode 100644 src/app/views/network/edit_bonding.rhtml
 create mode 100644 src/app/views/network/edit_ip_address.rhtml
 create mode 100644 src/app/views/network/edit_network_ip_addresses.rhtml
 create mode 100644 src/app/views/network/edit_nic.rhtml
 create mode 100644 src/app/views/network/list.html.erb
 create mode 100644 src/app/views/network/new.rhtml
 create mode 100644 src/app/views/network/new_bonding.rhtml
 create mode 100644 src/app/views/network/new_ip_address.rhtml
 create mode 100644 src/app/views/network/show.rhtml
 create mode 100644 src/db/migrate/028_refactor_networking_model.rb

diff --git a/src/app/controllers/host_controller.rb b/src/app/controllers/host_controller.rb
index a40d297..f961d1a 100644
--- a/src/app/controllers/host_controller.rb
+++ b/src/app/controllers/host_controller.rb
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 Red Hat, Inc.
 # Written by Scott Seago <sseago at redhat.com>
 #
@@ -30,7 +30,7 @@ class HostController < ApplicationController
     end
   end
 
-  before_filter :pre_action, :only => [:host_action, :enable, :disable, :clear_vms]
+  before_filter :pre_action, :only => [:host_action, :enable, :disable, :clear_vms, :edit_network]
 
   # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
   verify :method => [:post, :put], :only => [ :create, :update ],
@@ -81,7 +81,7 @@ class HostController < ApplicationController
 
   def addhost
     @hardware_pool = Pool.find(params[:hardware_pool_id])
-    render :layout => 'popup'    
+    render :layout => 'popup'
   end
 
   def add_to_smart_pool
@@ -156,6 +156,14 @@ class HostController < ApplicationController
     render :json => @json_hash
   end
 
+  def edit_network
+    render :layout => 'popup'
+  end
+
+  def bondings_json
+    bondings = Host.find(params[:id]).bondings
+    render :json => bondings.collect{ |x| {:id => x.id, :name => x.name} }
+  end
 
   private
   #filter methods
diff --git a/src/app/controllers/network_controller.rb b/src/app/controllers/network_controller.rb
new file mode 100644
index 0000000..725e60d
--- /dev/null
+++ b/src/app/controllers/network_controller.rb
@@ -0,0 +1,419 @@
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Mohammed Morsi <mmorsi at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+#
+
+class NetworkController < ApplicationController
+   ########################## Networks related actions
+
+   def network_permissions
+     # 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
+   end
+
+   def list
+      @networks = Network.find(:all)
+      network_permissions
+   end
+
+   def networks_json
+      json_list(Network.find(:all), [:id, :name, :type, [:boot_type, :label]])
+   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 }
+    end
+   end
+
+   def new
+    @boot_types = BootType.find(:all)
+    @usage_types = Usage.find(:all)
+    render :layout => 'popup'
+   end
+
+   def create
+    begin
+     @network = PhysicalNetwork.new(params[:network]) if params[:network][:type] == 'PhysicalNetwork'
+     @network = Vlan.new(params[:network]) if params[:network][:type] == 'Vlan'
+     @network.save!
+     alert = "Network was successfully created."
+     render :json => { :object => "network", :success => true,
+                       :alert => alert  }
+    rescue
+     render :json => { :object => "network", :success => false,
+                        :errors =>
+                        @network.errors.localize_error_messages.to_a }
+    end
+   end
+
+   def edit
+    @network = Network.find(params[:id])
+    @usage_types = Usage.find(:all)
+    @boot_types = BootType.find(:all)
+    render :layout => 'popup'
+   end
+
+   def update
+    begin
+     @network = Network.find(params[:id])
+     if @network.type == 'PhysicalNetwork'
+       @network = PhysicalNetwork.find(params[:id])
+     else
+       @network = Vlan.find(params[:id])
+     end
+
+     @network.usages.delete_all
+     @network.update_attributes!(params[:network])
+
+     alert = "Network was successfully updated."
+     render :json => { :object => "network", :success => true,
+                       :alert => alert  }
+    rescue Exception => e
+     render :json => { :object => "network", :success => false,
+                        :errors =>
+                        @network.errors.localize_error_messages.to_a }
+    end
+   end
+
+   def delete
+     failed_networks = []
+     networks_ids_str = params[:network_ids]
+     network_ids = networks_ids_str.split(",").collect {|x| x.to_i}
+     network_ids.each{ |x|
+       network = Network.find(x)
+       unless network.type.to_s == 'Vlan' &&
+               Vlan.find(x).bondings.size != 0 ||
+              network.type.to_s == 'PhysicalNetwork' &&
+               PhysicalNetwork.find(x).nics.size != 0
+         begin
+            Network.destroy(x)
+         rescue
+           failed_networks.push x
+         end
+       else
+         failed_networks.push x
+       end
+     }
+     if failed_networks.size == 0
+      render :json => { :object => "network",
+                        :success => true,
+                        :alert => "Successfully deleted networks" }
+     else
+      render :json => { :object => "network",
+                        :success => false,
+                        :alert => "Failed deleting " +
+                                  failed_networks.size.to_s +
+                             " networks due to existing bondings/nics" }
+     end
+   end
+
+   def edit_network_ip_addresses
+    @network = Network.find(params[:id])
+    render :layout => 'popup'
+   end
+
+
+   ########################## Ip Address related actions
+
+   def ip_addresses_json
+    @parent_type = params[:parent_type]
+    if @parent_type == 'network'
+      ip_addresses = Network.find(params[:id]).ip_addresses
+    elsif @parent_type == 'nic'
+      ip_addresses = Nic.find(params[:id]).ip_addresses
+    elsif @parent_type == 'bonding' and params[:id]
+      ip_addresses = Bonding.find(params[:id]).ip_addresses
+    else
+      ip_addresses = []
+    end
+
+    ip_addresses_json = []
+    ip_addresses.each{ |x|
+          ip_addresses_json.push({:id => x.id, :name => x.address}) }
+    render :json => ip_addresses_json
+   end
+
+   def new_ip_address
+    @parent_type = params[:parent_type]
+    @network = Network.find(params[:id]) if @parent_type == 'network'
+    @nic = Nic.find(params[:id]) if @parent_type == 'nic'
+    @bonding = Bonding.find(params[:id]) if @parent_type == 'bonding' and params[:id]
+
+    render :layout => false
+   end
+
+  def _create_ip_address
+    if params[:ip_address][:type] == "IpV4Address"
+      @ip_address = IpV4Address.new(params[:ip_address])
+    else
+      @ip_address = IpV6Address.new(params[:ip_address])
+    end
+    @ip_address.save!
+  end
+
+  def create_ip_address
+   begin
+    _create_ip_address
+    alert = "Ip Address was successfully created."
+    render :json => { :object => "ip_address", :success => true,
+                      :alert => alert  }
+   rescue
+    render :json => { :object => "ip_address", :success => false,
+                      :errors =>
+                        @ip_address.errors.localize_error_messages.to_a }
+    end
+   end
+
+   def edit_ip_address
+    @ip_address = IpAddress.find(params[:id])
+
+    @parent_type = params[:parent_type]
+    @network = @ip_address.network if @ip_address.network_id
+    @nic = @ip_address.nic if @ip_address.nic_id
+    @bonding = @ip_address.bonding if @ip_address.bonding_id
+
+    render :layout => false
+   end
+
+   def _update_ip_address(id)
+     @ip_address = IpAddress.find(id)
+
+     # special case if we are switching types
+     if @ip_address.type != params[:ip_address][:type]
+       if params[:ip_address][:type] == 'IpV4Address'
+          @ip_address = IpV4Address.new(params[:ip_address])
+          @ip_address.save!
+          IpV6Address.delete(id)
+       else
+          @ip_address = IpV6Address.new(params[:ip_address])
+          @ip_address.save!
+          IpV4Address.delete(id)
+       end
+     else
+       if @ip_address.type == 'IpV4Address'
+          @ip_address = IpV4Address.find(id)
+       else
+          @ip_address = IpV6Address.find(id)
+       end
+       @ip_address.update_attributes!(params[:ip_address])
+     end
+
+   end
+
+   def update_ip_address
+    begin
+     _update_ip_address(params[:id])
+     alert = "IpAddress was successfully updated."
+     render :json => { :object => "network", :success => true,
+                       :alert => alert  }
+    rescue
+     render :json => { :object => "ip_address", :success => false,
+                        :errors =>
+                        @ip_address.errors.localize_error_messages.to_a }
+    end
+   end
+
+   def destroy_ip_address
+    begin
+     IpAddress.delete(params[:id])
+     alert = "Ip Address was successfully deleted."
+     render :json => { :object => "ip_address", :success => true,
+                       :alert => alert  }
+    rescue
+     render :json => { :object => "ip_address", :success => false,
+                      :alert => 'Ip Address Deletion Failed' }
+     end
+   end
+
+
+   ########################## NICs related actions
+
+   def edit_nic
+     @nic = Nic.find(params[:id])
+     @network = @nic.physical_network
+
+     @networks = PhysicalNetwork.find(:all)
+     network_options
+
+     render :layout => false
+   end
+
+   def update_nic
+    begin
+     network_options
+     @network = Network.find(params[:nic][:physical_network_id])
+
+     if @network.boot_type.id == @static_boot_type.id
+       if params[:ip_address][:id] == "New"
+         _create_ip_address
+       elsif params[:ip_address][:id] != ""
+         _update_ip_address(params[:ip_address][:id])
+       end
+     end
+
+     @nic = Nic.find(params[:id])
+     @nic.update_attributes!(params[:nic])
+
+     alert = "Nic was successfully updated."
+     render :json => { :object => "nic", :success => true,
+                       :alert => alert  }
+    rescue Exception => e
+     if @ip_address and @ip_address.errors.size != 0
+        render :json => { :object => "ip_address", :success => false,
+                          :errors =>
+                            @ip_address.errors.localize_error_messages.to_a}
+     else
+        render :json => { :object => "nic", :success => false,
+                          :errors =>
+                          @nic.errors.localize_error_messages.to_a }
+     end
+    end
+   end
+
+   ########################## Bonding related actions
+
+   def new_bonding
+     unless params[:host_id]
+      flash[:notice] = "Host is required."
+      redirect_to :controller => 'dashboard'
+    end
+
+    @host = Host.find(params[:host_id])
+    @networks = Vlan.find(:all)
+    network_options
+
+    render :layout => false
+   end
+
+   def create_bonding
+    begin
+     network_options
+     @network = Network.find(params[:bonding][:vlan_id])
+
+     if @network.boot_type.id == @static_boot_type.id
+       if params[:ip_address][:id] == "New"
+         _create_ip_address
+       elsif params[:ip_address][:id] != ""
+         _update_ip_address(params[:ip_address][:id])
+       end
+     end
+
+    @bonding = Bonding.new(params[:bonding])
+    @bonding.ip_addresses << @ip_address if @ip_address
+    @bonding.save!
+
+    if @ip_address
+       @ip_address.bonding_id = @bonding.id
+       @ip_address.save!
+    end
+
+     alert = "Bonding was successfully created."
+     render :json => { :object => "bonding", :success => true,
+                       :alert => alert  }
+    rescue
+     if @ip_address and @ip_address.errors.size != 0
+        render :json => { :object => "ip_address", :success => false,
+                          :errors =>
+                            @ip_address.errors.localize_error_messages.to_a}
+     else
+        render :json => { :object => "bonding", :success => false,
+                          :errors =>
+                          @bonding.errors.localize_error_messages.to_a }
+     end
+    end
+   end
+
+   def edit_bonding
+     @bonding = Bonding.find(params[:id])
+     @network = @bonding.vlan
+
+     @host = @bonding.host
+     @networks = Vlan.find(:all)
+     network_options
+
+     render :layout => false
+   end
+
+   def update_bonding
+    begin
+     network_options
+     @network = Network.find(params[:bonding][:vlan_id])
+
+     if @network.boot_type.id == @static_boot_type.id
+       if params[:ip_address][:id] == "New"
+         _create_ip_address
+       elsif params[:ip_address][:id] != ""
+         _update_ip_address(params[:ip_address][:id])
+       end
+     end
+
+     @bonding = Bonding.find(params[:id])
+     @bonding.nics.delete_all
+     @bonding.update_attributes!(params[:bonding])
+
+     alert = "Bonding was successfully updated."
+     render :json => { :object => "bonding", :success => true,
+                       :alert => alert  }
+    rescue
+     if @ip_address and @ip_address.errors.size != 0
+        render :json => { :object => "ip_address", :success => false,
+                          :errors =>
+                            @ip_address.errors.localize_error_messages.to_a}
+     else
+        render :json => { :object => "bonding", :success => false,
+                          :errors =>
+                          @bonding.errors.localize_error_messages.to_a }
+     end
+    end
+   end
+
+   def destroy_bonding
+    begin
+     Bonding.destroy(params[:id])
+     alert = "Bonding was successfully deleted."
+     render :json => { :object => "bonding", :success => true,
+                       :alert => alert  }
+    rescue
+     render :json => { :object => "bonding", :success => false,
+                      :alert => 'Bonding Deletion Failed' }
+     end
+
+   end
+
+
+   ########################## Misc methods
+
+  protected
+   def network_options
+    @bonding_types = BondingType.find(:all)
+    @static_boot_type = BootType.find(:first,
+                                 :conditions => { :proto => 'static' })
+   end
+
+end
diff --git a/src/app/helpers/application_helper.rb b/src/app/helpers/application_helper.rb
index d7b6628..0178ad0 100644
--- a/src/app/helpers/application_helper.rb
+++ b/src/app/helpers/application_helper.rb
@@ -84,21 +84,31 @@ module ApplicationHelper
      }
   end
 
-  def popup_footer(action, label)
-    %{ 
-      <div style="background: url(#{image_path "fb_footer.jpg"}) repeat-x; height: 37px; text-align:right; padding: 9px 9px 0 0;">
+  # expects hash of labels => actions
+  def multi_button_popup_footer(buttons = {})
+      buttons_html = ""
+      buttons.each{ |label, action|
+       buttons_html+="<div class=\"button\">" +
+                     " <div class=\"button_left_blue\"></div>" +
+                     " <div class=\"button_middle_blue\"><a href=\"#\" onclick=\"#{action}\">#{label}</a></div>" +
+                     " <div class=\"button_right_blue\"></div>" +
+                     "</div>"
+      }
+
+   %{
+      <div style="background: url(#{image_path "fb_footer.jpg"}) repeat-x; height: 37px; text-align:right; padding: 9px 9px 0 0; float: left; width: 97%;">
         <div class="button">
           <div class="button_left_grey"></div>
           <div class="button_middle_grey"><a href="#" onclick="$(document).trigger('close.facebox')">Cancel</a></div>
           <div class="button_right_grey"></div>
         </div>
-        <div class="button">
-          <div class="button_left_blue"></div>
-          <div class="button_middle_blue"><a href="#" onclick="#{action}">#{label}</a></div>
-          <div class="button_right_blue"></div>
-        </div> 
+        #{buttons_html}
       </div>
-     }
+    }
+  end
+
+  def popup_footer(action, label)
+    multi_button_popup_footer({label => action})
   end
 
   def ok_footer
diff --git a/src/app/helpers/network_helper.rb b/src/app/helpers/network_helper.rb
new file mode 100644
index 0000000..ebbce0b
--- /dev/null
+++ b/src/app/helpers/network_helper.rb
@@ -0,0 +1,2 @@
+module NetworkHelper
+end
diff --git a/src/app/models/bonding.rb b/src/app/models/bonding.rb
index 006c261..c9af38c 100644
--- a/src/app/models/bonding.rb
+++ b/src/app/models/bonding.rb
@@ -30,6 +30,16 @@
 # interface. They can be ignored if not used.
 #
 class Bonding < ActiveRecord::Base
+  belongs_to :host
+  belongs_to :bonding_type
+  belongs_to :vlan
+  has_many :ip_addresses, :dependent => :destroy
+
+  has_and_belongs_to_many :nics,
+    :join_table  => 'bondings_nics',
+    :foreign_key => :bonding_id
+
+
   validates_presence_of :name,
     :message => 'A name is required.'
 
@@ -42,18 +52,20 @@ class Bonding < ActiveRecord::Base
   validates_presence_of :interface_name,
     :message => 'An interface name is required.'
 
-  validates_presence_of :boot_type_id,
-    :message => 'A boot type must be specified.'
-
   validates_presence_of :bonding_type_id,
     :message => 'A bonding type must be specified.'
 
-  belongs_to :host
-  belongs_to :bonding_type
-  belongs_to :boot_type
+  validates_presence_of :vlan_id,
+    :message => 'A vlan must be specified.'
+
+ protected
+  def validate
+    if vlan.boot_type.proto == 'static' and ip_addresses.size == 0
+           errors.add("vlan_id",
+                      "is static. Must create at least one static ip")
+     end
+
+  end
 
-  has_and_belongs_to_many :nics,
-    :join_table  => 'bondings_nics',
-    :foreign_key => :bonding_id
 
 end
diff --git a/src/app/models/ip_address.rb b/src/app/models/ip_address.rb
new file mode 100644
index 0000000..5d2e6af
--- /dev/null
+++ b/src/app/models/ip_address.rb
@@ -0,0 +1,27 @@
+# ip_address.rb
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+# +IpAddress+ is the base class for all address related classes.
+#
+class IpAddress < ActiveRecord::Base
+   # one of these 3 will apply for each address
+   belongs_to :network
+   belongs_to :nic
+   belongs_to :bonding
+end
diff --git a/src/app/models/ip_v4_address.rb b/src/app/models/ip_v4_address.rb
new file mode 100644
index 0000000..f3128a4
--- /dev/null
+++ b/src/app/models/ip_v4_address.rb
@@ -0,0 +1,53 @@
+# ip_v4_address.rb
+#
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>,
+#            Mohammed Morsi   <mmorsi at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+# +IpV4Address+ represents a single IPv4 address.
+#
+class IpV4Address < IpAddress
+  ADDRESS_TEST = %r{^(\d{1,3}\.){3}\d{1,3}$}
+
+  validates_presence_of :address,
+    :message => 'An address must be supplied.'
+  validates_format_of :address,
+    :with => ADDRESS_TEST
+
+  validates_presence_of :netmask,
+    :message => 'A netmask must be supplied.',
+    :if => Proc.new { |ip| ip.network_id != nil }
+  validates_format_of :netmask,
+    :with => ADDRESS_TEST,
+    :if => Proc.new { |ip| ip.network_id != nil }
+
+  validates_presence_of :gateway,
+    :message => 'A gateway address must be supplied.',
+    :if => Proc.new { |ip| ip.network_id != nil }
+  validates_format_of :gateway,
+    :with => ADDRESS_TEST,
+    :if => Proc.new { |ip| ip.network_id != nil }
+
+  validates_presence_of :broadcast,
+    :message => 'A broadcast address must be supplied.',
+    :if => Proc.new { |ip| ip.network_id != nil }
+  validates_format_of :broadcast,
+    :with => ADDRESS_TEST,
+    :if => Proc.new { |ip| ip.network_id != nil }
+
+end
diff --git a/src/app/models/ip_v6_address.rb b/src/app/models/ip_v6_address.rb
new file mode 100644
index 0000000..11951cc
--- /dev/null
+++ b/src/app/models/ip_v6_address.rb
@@ -0,0 +1,46 @@
+# ip_v6_address.rb
+#
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Darryl L. Pierce <dpierce at redhat.com>,
+#            Mohammed Morsi   <mmorsi at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+# +IpV6Address+ represents a single IPv6 address.
+#
+class IpV6Address < IpAddress
+  ADDRESS_TEST = %r{^([0-9a-fA-F]{0,4}|0)(\:([0-9a-fA-F]{0,4}|0)){7}$}
+
+  validates_presence_of :address,
+    :message => 'An address must be provided.'
+  validates_format_of :address,
+    :with => ADDRESS_TEST
+
+  validates_presence_of :gateway,
+    :message => 'A gateway address must be provided.',
+    :if => Proc.new { |ip| ip.network_id != nil }
+  validates_format_of :gateway,
+    :with => ADDRESS_TEST,
+    :if => Proc.new { |ip| ip.network_id != nil }
+
+  validates_presence_of :prefix,
+    :message => 'A prefix must be provided.',
+    :if => Proc.new { |ip| ip.network_id != nil }
+  validates_format_of :prefix,
+    :with => ADDRESS_TEST,
+    :if => Proc.new { |ip| ip.network_id != nil }
+
+end
diff --git a/src/app/models/network.rb b/src/app/models/network.rb
new file mode 100644
index 0000000..404633d
--- /dev/null
+++ b/src/app/models/network.rb
@@ -0,0 +1,32 @@
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Mohammed Morsi <mmorsi at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+class Network < ActiveRecord::Base
+  belongs_to :boot_type
+  has_many :ip_addresses, :dependent => :destroy
+
+  has_and_belongs_to_many :usages, :join_table => 'networks_usages'
+
+  validates_presence_of :type,
+    :message => 'A type must be specified.'
+  validates_presence_of :name,
+    :message => 'A name must be specified.'
+  validates_presence_of :boot_type_id,
+    :message => 'A boot type must be specified.'
+
+end
diff --git a/src/app/models/nic.rb b/src/app/models/nic.rb
index baf7095..5649763 100644
--- a/src/app/models/nic.rb
+++ b/src/app/models/nic.rb
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 Red Hat, Inc.
 # Written by Scott Seago <sseago at redhat.com>
 #
@@ -19,7 +19,22 @@
 
 class Nic < ActiveRecord::Base
   belongs_to :host
-  belongs_to :boot_type
+  belongs_to :physical_network
+  has_many :ip_addresses, :dependent => :destroy
+
+  has_and_belongs_to_many :bondings, :join_table => 'bondings_nics'
+
+  validates_presence_of :host_id,
+    :message => 'A host must be specified.'
+
+  validates_presence_of :physical_network_id,
+    :message => 'A network must be specified.'
 
-  has_and_belongs_to_many :bonding, :join_table => 'bondings_nics'
+  protected
+   def validate
+    if 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
+   end
 end
diff --git a/src/app/models/physical_network.rb b/src/app/models/physical_network.rb
new file mode 100644
index 0000000..6923e40
--- /dev/null
+++ b/src/app/models/physical_network.rb
@@ -0,0 +1,21 @@
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Mohammed Morsi <mmorsi at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+class PhysicalNetwork < Network
+   has_many :nics
+end
diff --git a/src/app/models/usage.rb b/src/app/models/usage.rb
new file mode 100644
index 0000000..353e8f4
--- /dev/null
+++ b/src/app/models/usage.rb
@@ -0,0 +1,21 @@
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Mohammed Morsi <mmorsi at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+class Usage < ActiveRecord::Base
+  has_and_belongs_to_many :networks, :join_table => 'networks_usages'
+end
diff --git a/src/app/models/vlan.rb b/src/app/models/vlan.rb
new file mode 100644
index 0000000..f7889f4
--- /dev/null
+++ b/src/app/models/vlan.rb
@@ -0,0 +1,24 @@
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Mohammed Morsi <mmorsi at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+class Vlan < Network
+   has_many :bondings
+
+  validates_presence_of :number,
+    :message => 'A number must be specified.'
+end
diff --git a/src/app/views/dashboard/index.html.erb b/src/app/views/dashboard/index.html.erb
index 92cb4da..8815ebc 100644
--- a/src/app/views/dashboard/index.html.erb
+++ b/src/app/views/dashboard/index.html.erb
@@ -13,6 +13,13 @@
             </table>
           </div>
 
+         <% if @can_modify %>
+          <h3>Networks</h3>
+          <a href="<%= url_for :controller => 'network', :action => 'list' %>">
+             View / Edit
+          </a>
+         <% end %>
+
           </div> <!-- end #tools -->
   </td>
 
diff --git a/src/app/views/host/edit_network.rhtml b/src/app/views/host/edit_network.rhtml
new file mode 100644
index 0000000..7ec3180
--- /dev/null
+++ b/src/app/views/host/edit_network.rhtml
@@ -0,0 +1,85 @@
+<%- content_for :title do -%>
+  Edit <%= @host.hostname %> Network Devices
+<%- end -%>
+
+<%- content_for :description do -%>
+  Select and edit nics and bonded interfaces on <%= @host.hostname %>
+<%- end -%>
+
+<div id="select-host-nic" class="popup-content-selection">
+<%= select_with_label "NICs", "nic", "id",
+        @host.nics.
+          collect{ |nic| [nic.mac, nic.id] }.
+          insert(0, "") %>
+</div>
+
+<div id="select-host-bonding" class="popup-content-selection">
+<%= select_with_label "Bonded Interfaces", "bonding", "id", [] %>
+</div>
+
+<div style="clear: both;"></div>
+
+<div id="selected_nic_bonding" class="selected_popup_content"></div>
+
+<div id="host_network_footer" class="popup-content-footer">
+  <%= ok_footer %>
+</div>
+
+<script type="text/javascript">
+function reset_nics_bonding_detail(){
+   var data='Select NIC or Bonded Interface<br/>';
+
+   $("#selected_nic_bonding").html(data);
+   $("#host_network_footer").show();
+};
+
+reset_nics_bonding_detail(); // run it once for inital content
+
+function reset_nics_select(){
+  $("#nic_id option:first").attr("selected", true);
+};
+
+function reset_bonding_select(){
+  // incase of new additions / deletions, repopulate select box
+  $.getJSON(
+     "<%= url_for :action => 'bondings_json', :id => @host.id %>",
+      {},
+      function(j){
+        var options = "<option value=''></option>" +
+                      "<option value='New'>New</option>";
+        for(var i = 0; i < j.length; i++){
+          options += '<option value="' + j[i].id + '">' + j[i].name +
+                     '</option>';
+        }
+        $("#bonding_id").html(options);
+      });
+
+  $("#bonding_id option:first").attr("selected", true);
+};
+
+reset_bonding_select(); // run it once for initial content
+
+$("#nic_id").change(function () {
+  reset_bonding_select();
+  if($('#nic_id').val() != ""){
+    $("#selected_nic_bonding").load("<%= url_for :controller => 'network',
+        :action => 'edit_nic'%>/" + $('#nic_id').val());
+    $("#host_network_footer").hide();
+  }else{
+     reset_nics_bonding_detail();
+  }
+});
+
+$("#bonding_id").change(function () {
+  reset_nics_select();
+  if($('#bonding_id').val() == "New"){
+      $("#selected_nic_bonding").load("<%= url_for :controller => 'network', :action => 'new_bonding', :host_id => @host.id %>");
+    $("#host_network_footer").hide();
+  }else if($('#bonding_id').val() != ""){
+      $("#selected_nic_bonding").load("<%= url_for :controller => 'network', :action => 'edit_bonding'%>/" + $('#bonding_id').val());
+    $("#host_network_footer").hide();
+  }else{
+     reset_nics_bonding_detail();
+  }
+});
+</script>
diff --git a/src/app/views/host/show.rhtml b/src/app/views/host/show.rhtml
index d1b05ad..b671578 100644
--- a/src/app/views/host/show.rhtml
+++ b/src/app/views/host/show.rhtml
@@ -6,17 +6,21 @@
     <%if @host.disabled?  -%>
       <a href="#" onClick="host_action('enable')">
         <%= image_tag "icon_start.png" %> Enable Host
-      </a> 
+      </a>
     <% else -%>
       <a href="#" onClick="host_action('disable')">
         <%= image_tag "icon_suspend.png" %> Disable Host
-      </a> 
+      </a>
     <% end -%>
     <%if @host.is_clear_task_valid? -%>
       <a href="#" onClick="host_action('clear_vms')">
         <%= image_tag "icon_x.png" %> Clear VMs
-      </a> 
+      </a>
     <% end -%>
+    <%= link_to image_tag("icon_edit.png") +"Edit Network",
+                 {:controller => 'host',
+                  :action => 'edit_network', :id => @host.id},
+                 :rel=>"facebox[.bolder]", :class=>"selection_facebox" %>
   <%- end -%>
 <%- end -%>
 <script type="text/javascript">
@@ -25,8 +29,8 @@
       $.post('<%= url_for :controller => "host", :action => 'host_action', :id => @host%>',
              { action_type: action },
               function(data,status){
-                refresh_summary('hosts_selection', 
-                            '<%= url_for :controller => "host", 
+                refresh_summary('hosts_selection',
+                            '<%= url_for :controller => "host",
                                          :action => "show" %>',
                             <%= @host.id %>)
                 $("#hosts_grid").flexReload()
@@ -39,14 +43,16 @@
 
     <div id="hosts_selection_id" style="display:none"><%= @host.id %></div>
     <div class="selection_key">
-        UUID:<br/>            
-	CPUs:<br/>        
-	Speed:<br/>       
-	Memory:<br/>          
-	Architecture:<br/>    
-	Hypervisor Type:<br/> 
+        UUID:<br/>
+	CPUs:<br/>
+	Speed:<br/>
+	Memory:<br/>
+	Architecture:<br/>
+	Hypervisor Type:<br/>
         Status:<br/>
         VMs:<br/>
+        NICs:<br/>
+        Bondings:<br/>
     </div>
     <div class="selection_value">
     	<%=h @host.uuid %><br/>
@@ -56,6 +62,8 @@
         <%=h @host.arch %><br/>
 	<%=h @host.hypervisor_type %><br/>
 	<%=h @host.status_str %><br/>
+	<%=  @host.nics.collect{ |n| n.mac }.join("<br/>") %><br/>
+	<%=  @host.bondings.collect { |n| n.name }.join("<br/>") %><br/>
     <%= @host.vms.collect{|x| x.uuid }.join(" <br/> ") %><br/>
 
 <!-- FIXME: need styling
diff --git a/src/app/views/network/_bonding_form.rhtml b/src/app/views/network/_bonding_form.rhtml
new file mode 100644
index 0000000..4ec0df1
--- /dev/null
+++ b/src/app/views/network/_bonding_form.rhtml
@@ -0,0 +1,46 @@
+ <%= error_messages_for 'bonding' %>
+ <%= error_messages_for 'ip_address' %>
+
+<div id="selected_popup_content_expanded" class="dialog_form">
+  <%= hidden_field_tag 'bonding[host_id]', @host.id %>
+
+  <div class="selected_popup_content_left">Name</div>
+  <div class="selected_popup_content_right">
+    <%= text_field_with_label "", "bonding", "name" %>
+  </div>
+
+  <div class="selected_popup_content_left">Interface Name</div>
+  <div class="selected_popup_content_right">
+    <%= text_field_with_label "", "bonding", "interface_name" %>
+  </div>
+
+  <div class="selected_popup_content_left">Bonding Type</div>
+  <div class="selected_popup_content_right">
+      <%= select "bonding", "bonding_type_id",
+             @bonding_types.collect { |bt| [bt.label, bt.id ] } %>
+  </div>
+
+  <% if @host.nics.size != 0 %>
+    <div class="selected_popup_content_left">NICs</div>
+    <div class="selected_popup_content_right">
+       <select id="bonding_nic_ids" name="bonding[nic_ids][]" multiple="true">
+        <%= options_from_collection_for_select @host.nics, "id", "mac",
+                    @bonding ? @bonding.nics.collect{ |x| x.nic_id.to_i } : [] %>
+       </select>
+    </div>
+  <% end %>
+
+  <%= render :partial => 'select', :locals => { :target => 'bonding' } %>
+
+<div id="static_ip_options"
+ style="<% unless ((@network && @network.boot_type_id == @static_boot_type.id) ||
+                   (!@network && @networks.size > 0 &&
+                     @networks[0].boot_type_id == @static_boot_type.id)) %>
+          display: none;<%end %>">
+  <%= render :partial => 'ip_addresses_form',
+             :locals => { :parent_type => 'bonding',
+                          :parent_id => @bonding ? @bonding.id : nil } %>
+</div>
+
+
+</div>
diff --git a/src/app/views/network/_form.rhtml b/src/app/views/network/_form.rhtml
new file mode 100644
index 0000000..6c67a0e
--- /dev/null
+++ b/src/app/views/network/_form.rhtml
@@ -0,0 +1,46 @@
+<%= error_messages_for 'network' %>
+
+<!--[form:network]-->
+<%= hidden_field 'network', 'id' if @create %>
+
+<%= text_field_with_label "Name:", "network", "name",
+                          {:style=>"width:250px;"}  %>
+
+<%= select_with_label "Boot Type:", 'network', 'boot_type_id',
+                      @boot_types.collect{ |bt| [bt.label, bt.id] },
+                      :style=>"width:250px;" %>
+
+<% if create %>
+<%= select_with_label "Type", "network", "type",
+           [[ "Physical Network", "PhysicalNetwork" ],
+            [ "VLAN", "Vlan" ] ]  %>
+<% end %>
+
+
+<div class="field_title">Usage:</div>
+<div class="form_field">
+ <select id="network_usages_ids" name="network[usage_ids][]" multiple="true">
+ <%= options_from_collection_for_select @usage_types, "id", "label",
+          @network ? @network.usages.collect{ |x| x.id.to_i } : [] %>
+ </select>
+</div>
+
+<div id="vlan_options"
+     <% if @network && @network.type != 'Vlan' %>
+     style="display: none;"
+     <% end %>
+>
+<%= text_field_with_label "Number:", "network", "number",
+                          {:style=>"width:250px;"}  %>
+</div>
+
+
+<script type="text/javascript">
+$("#network_type").change(function () {
+  if($('#network_type').val() == "Vlan"){
+    $("#vlan_options").show();
+  }else{
+    $("#vlan_options").hide();
+  }
+}).trigger('change');
+</script>
diff --git a/src/app/views/network/_grid.rhtml b/src/app/views/network/_grid.rhtml
new file mode 100644
index 0000000..6af0c05
--- /dev/null
+++ b/src/app/views/network/_grid.rhtml
@@ -0,0 +1,37 @@
+<% networks_per_page = 40 unless (defined? networks_per_page) and !(networks_per_page.nil?) %>
+<% usepager = @networks.size > networks_per_page %>
+
+<div id="<%= table_id %>_div">
+<form id="<%= table_id %>_form">
+<table id="<%= table_id %>" style="display:none"></table>
+</form>
+</div>
+<script type="text/javascript">
+    $("#<%= table_id %>").flexigrid
+    (
+    {
+    url: '<%=  url_for :action => "networks_json" %>',
+    dataType: 'json',
+    colModel : [
+        {display: '', width : 20, align: 'left', process: <%= table_id %>checkbox},
+        {display: 'Name', name: 'name', width : 180, align: 'left'},
+        {display: 'Type', name: 'type', width : 180, align: 'left'},
+        {display: 'Boot Type', name: 'boot_type', width : 180, align: 'left'}
+    ],
+    sortname: "name",
+    sortorder: "asc",
+    usepager: <%= usepager %>,
+    useRp: <%= usepager %>,
+    rp: <%= networks_per_page %>,
+    showTableToggleBtn: true,
+    onSelect: <%= on_select %>
+    }
+    );
+    function <%= table_id %>checkbox(celDiv)
+    {
+        $(celDiv).html('<input type="checkbox" name="grid_checkbox'+$(celDiv).html()+'" class="grid_checkbox" value="'+$(celDiv).html()+'"/>');
+    }
+
+</script>
+
+
diff --git a/src/app/views/network/_ip_address_form.rhtml b/src/app/views/network/_ip_address_form.rhtml
new file mode 100644
index 0000000..b952807
--- /dev/null
+++ b/src/app/views/network/_ip_address_form.rhtml
@@ -0,0 +1,62 @@
+<%= error_messages_for 'ip_address' %>
+
+<div id="selected_popup_content_expanded" class="dialog_form">
+ <%= hidden_field_tag 'parent_type', @parent_type%>
+ <%= hidden_field_tag 'ip_address[id]', @ip_address.id if @ip_address%>
+ <%= hidden_field_tag 'ip_address[network_id]', @network.id if @network %>
+ <%= hidden_field_tag 'ip_address[nic_id]', @nic.id if @nic %>
+ <%= hidden_field_tag 'ip_address[bonding_id]', @bonding.id if @bonding %>
+
+   <div class="selected_nic_bonding_left">Type:</div>
+   <div class="selected_nic_bonding_right">
+       <%= select_with_label "", "ip_address", "type",
+                          [[ "ipv4", "IpV4Address" ], [ "ipv6", "IpV6Address" ] ]  %>
+   </div>
+
+
+   <div class="static_ip_common_options">
+     <div class="selected_nic_bonding_left">IP Address</div>
+     <div class="selected_nic_bonding_right">
+       <%= text_field_with_label "", "ip_address", "address" %>
+     </div>
+   </div>
+
+   <div id="static_ip_v4_options">
+     <div class="selected_nic_bonding_left">Netmask</div>
+     <div class="selected_nic_bonding_right">
+        <%= text_field_with_label "", "ip_address", "netmask" %>
+     </div>
+
+     <div class="selected_nic_bonding_left">Broadcast</div>
+     <div class="selected_nic_bonding_right">
+         <%= text_field_with_label "", "ip_address", "broadcast" %>
+     </div>
+  </div>
+
+  <div id="static_ip_v6_options" style="display: none;">
+     <div class="selected_nic_bonding_left">Prefix</div>
+     <div class="selected_nic_bonding_right">
+         <%= text_field_with_label "", "ip_address", "prefix" %>
+     </div>
+  </div>
+
+  <div class="static_ip_common_options">
+     <div class="selected_nic_bonding_left">Gateway</div>
+     <div class="selected_nic_bonding_right">
+         <%= text_field_with_label "", "ip_address", "gateway" %>
+     </div>
+  </div>
+
+</div>
+
+<script type="text/javascript">
+  $("#ip_address_type").change(function () {
+    if($("#ip_address_type").val() == 'IpV4Address'){
+        $("#static_ip_v4_options").show();
+        $("#static_ip_v6_options").hide();
+    }else{
+        $("#static_ip_v4_options").hide();
+        $("#static_ip_v6_options").show();
+    }
+  }).trigger('change');
+</script>
diff --git a/src/app/views/network/_ip_addresses_form.rhtml b/src/app/views/network/_ip_addresses_form.rhtml
new file mode 100644
index 0000000..f833b2a
--- /dev/null
+++ b/src/app/views/network/_ip_addresses_form.rhtml
@@ -0,0 +1,50 @@
+<div id="select_ip_address" class="popup-content-selection">
+<%= select_with_label "IP Addresses", "ip_address", "id", [] %>
+</div>
+
+<div id="selected_ip_address" class="selected_popup_content"></div>
+
+<script type="text/javascript">
+function reset_selected_ip_address(){
+   var data='Select IP Address<br/>';
+
+   $("#selected_ip_address").html(data);
+   $("#ip_addresses_footer").show();
+};
+
+reset_selected_ip_address(); // run it once for inital content
+
+function reset_ip_address_select(){
+  // incase of new additions / deletions, repopulate select box
+  $.getJSON(
+     "<%= url_for :action => 'ip_addresses_json', :id => parent_id, :parent_type => parent_type %>",
+      {},
+      function(j){
+        var options = "<option value=''></option>" +
+                      "<option value='New'>New</option>";
+        for(var i = 0; i < j.length; i++){
+          options += '<option value="' + j[i].id + '">' + j[i].name +
+                     '</option>';
+        }
+        $("#ip_address_id").html(options);
+      });
+
+  $("#ip_address_id option:first").attr("selected", true);
+};
+
+reset_ip_address_select(); // run it once for initial content
+
+$("#ip_address_id").change(function () {
+  if($('#ip_address_id').val() == "New"){
+    $("#selected_ip_address").load("<%= url_for :action => 'new_ip_address', :id => parent_id, :parent_type => parent_type %>");
+    $("#ip_addresses_footer").hide();
+  }else if($('#ip_address_id').val() != ""){
+    $("#selected_ip_address").load("<%= url_for :action => 'edit_ip_address'%>/" + $('#ip_address_id').val() + "?parent_type=<%= parent_type %>");
+    $("#ip_addresses_footer").hide();
+  }else{
+     reset_selected_ip_address();
+  }
+});
+
+</script>
+
diff --git a/src/app/views/network/_select.rhtml b/src/app/views/network/_select.rhtml
new file mode 100644
index 0000000..e69d9b0
--- /dev/null
+++ b/src/app/views/network/_select.rhtml
@@ -0,0 +1,32 @@
+<% target = 'nic' unless target
+   network_id = 'physical_network_id' if target == 'nic'
+   network_id = 'vlan_id' if target == 'bonding'
+
+ %>
+
+<div class="selected_popup_content_left">Network:</div>
+<div class="selected_popup_content_right">
+    <%= select_with_label "", target, network_id,
+    @networks.collect { |n| [n.name + ' - ' + n.boot_type.label, n.id ] } %>
+
+</div>
+
+<script type="text/javascript">
+  var static_network_ids=<%= static_network_ids = '['
+    @networks.each { |n|
+     static_network_ids += ',' if static_network_ids != '['
+     static_network_ids += n.id.to_s if n.boot_type_id == @static_boot_type.id
+    }
+    static_network_ids += ']'
+    static_network_ids %>;
+
+  $("#<%=target %>_<%= network_id %>").change(function () {
+    $("#static_ip_options").hide();
+    for(i=0; i<static_network_ids.length; ++i){
+     if($("#<%= target %>_<%= network_id %>").val() == static_network_ids[i]){
+          $("#static_ip_options").show();
+          break;
+     }
+    };
+  });
+</script>
diff --git a/src/app/views/network/edit.rhtml b/src/app/views/network/edit.rhtml
new file mode 100644
index 0000000..6360b3f
--- /dev/null
+++ b/src/app/views/network/edit.rhtml
@@ -0,0 +1,34 @@
+<%- content_for :title do -%>
+  Edit Network
+<%- end -%>
+<%- content_for :description do -%>
+<%- end -%>
+
+  <!-- DIALOG  BODY -->
+  <form method="POST" action="<%= url_for :action => 'update' %>" id="network_form" >
+  <div class="dialog_form">
+    <%= hidden_field_tag 'id', @network.id %>
+    <%= render :partial => 'form', :locals => { :create => false }  %>
+  </div>
+  <!-- DIALOG  FOOTER -->
+  <%= popup_footer("$('#network_form').submit()", "Edit Network") %>
+  </form>
+
+<script type="text/javascript">
+$(function() {
+    var networkoptions = {
+        target:        '<%= url_for :action => 'update' %>',
+	dataType:      'json',
+        success: function(response, status) {
+           afterNetwork(response, status);
+           refresh_summary_static('networks_selection',
+            '<div class="selection_left"><div>Select a network.</div></div>');
+        }
+    };
+
+    // bind form using 'ajaxForm'
+    $('#network_form').ajaxForm(networkoptions);
+});
+</script>
+
+
diff --git a/src/app/views/network/edit_bonding.rhtml b/src/app/views/network/edit_bonding.rhtml
new file mode 100644
index 0000000..e7f3cda
--- /dev/null
+++ b/src/app/views/network/edit_bonding.rhtml
@@ -0,0 +1,60 @@
+<form method="POST"
+      action="<%= url_for :action => 'update_bonding' %>" id="edit_bonding_form" >
+  <div id="selected_popup_content_header">
+      Editing Bonded Interface
+  </div>
+
+  <%= hidden_field_tag('id', @bonding.id) %>
+  <%= render :partial => 'bonding_form' %>
+
+</form>
+
+<form method="POST" action="<%= url_for :action => 'destroy_bonding' %>" id="delete_bonding_form" >
+  <%= hidden_field_tag('id', @bonding.id) %>
+</form>
+
+<%= multi_button_popup_footer({"Edit Bonding" =>
+                                 "$('#edit_bonding_form').submit()",
+                               "Delete Bonding" =>
+                                 "$('#delete_bonding_form').submit()"}) %>
+
+<script type="text/javascript">
+$(function() {
+    var edit_bonding_options = {
+        target:        '<%= url_for :action => 'update_bonding' %>',
+        dataType:      'json',
+        success:       function(response, status) {
+          ajax_validation(response, status);
+          if (response.success) {
+            reset_bonding_select();
+            reset_nics_bonding_detail();
+            refresh_summary('hosts_selection',
+                            '<%= url_for :controller => "host",
+                                         :action => "show" %>',
+                            <%= @host.id %>)
+          }
+        }
+    };
+
+    var delete_bonding_options = {
+        target:        '<%= url_for :action => 'destroy_bonding' %>',
+        dataType:      'json',
+        success:       function(response, status) {
+          ajax_validation(response, status);
+          if (response.success) {
+            reset_bonding_select();
+            reset_nics_bonding_detail();
+            refresh_summary('hosts_selection',
+                            '<%= url_for :controller => "host",
+                                         :action => "show" %>',
+                            <%= @host.id %>)
+          }
+        }
+    };
+
+    // bind forms using 'ajaxForm'
+    $('#edit_bonding_form').ajaxForm(edit_bonding_options);
+    $('#delete_bonding_form').ajaxForm(delete_bonding_options);
+
+});
+</script>
diff --git a/src/app/views/network/edit_ip_address.rhtml b/src/app/views/network/edit_ip_address.rhtml
new file mode 100644
index 0000000..60fe8f1
--- /dev/null
+++ b/src/app/views/network/edit_ip_address.rhtml
@@ -0,0 +1,76 @@
+<% if @parent_type == 'network' %>
+<form method="POST"
+      action="<%= url_for :action => 'update_ip_address' %>"
+      id="edit_ip_address_form" >
+<% end %>
+
+  <div id="selected_popup_content_header">
+      Editing IP Address
+  </div>
+
+  <% if @parent_type != 'network' %>
+     <a href="#" onClick="$('#delete_ip_address_form').submit()" style="color: blue;">Delete</a>
+  <% end %>
+
+  <%= hidden_field_tag('id', @ip_address.id) %>
+  <%= render :partial => 'ip_address_form' %>
+
+<% if @parent_type == 'network' %>
+</form>
+<% end %>
+
+<form method="POST"
+      action="<%= url_for :action => 'destroy_ip_address' %>"
+      id="delete_ip_address_form" >
+  <%= hidden_field_tag('id', @ip_address.id) %>
+</form>
+
+<% if @parent_type == 'network' %>
+<%= multi_button_popup_footer({" Edit IP Address" =>
+                                 "$('#edit_ip_address_form').submit()",
+                               "Delete IP Address" =>
+                                 "$('#delete_ip_address_form').submit()"}) %>
+<% end %>
+
+<script type="text/javascript">
+$(function() {
+    var edit_ip_address_options = {
+        target:        '<%= url_for :action => 'update_ip_address' %>',   // target element to update
+        dataType:      'json',
+        success:       function(response, status) {
+          ajax_validation(response, status);
+          if (response.success) {
+            reset_selected_ip_address();
+            reset_ip_address_select();
+           <% if @parent_type == 'network' %>
+            refresh_summary('networks_selection',
+                '<%= url_for :controller => "network", :action => "show" %>',
+                 <%= @network.id %>);
+           <% end %>
+          }
+        }
+    };
+
+    var delete_ip_address_options = {
+        target:        '<%= url_for :action => 'delete_ip_address' %>',   // target element to update
+        dataType:      'json',
+        success:       function(response, status) {
+          ajax_validation(response, status);
+          if (response.success) {
+            reset_selected_ip_address();
+            reset_ip_address_select();
+           <% if @parent_type == 'network' %>
+            refresh_summary('networks_selection',
+                '<%= url_for :controller => "network", :action => "show" %>',
+                 <%= @network.id %>);
+           <% end %>
+          }
+        }
+    };
+
+    // bind forms using 'ajaxForm'
+    $('#edit_ip_address_form').ajaxForm(edit_ip_address_options);
+    $('#delete_ip_address_form').ajaxForm(delete_ip_address_options);
+
+});
+</script>
diff --git a/src/app/views/network/edit_network_ip_addresses.rhtml b/src/app/views/network/edit_network_ip_addresses.rhtml
new file mode 100644
index 0000000..7a1e4cb
--- /dev/null
+++ b/src/app/views/network/edit_network_ip_addresses.rhtml
@@ -0,0 +1,13 @@
+<%- content_for :title do -%>
+  Edit Network IP Addresses
+<%- end -%>
+<%- content_for :description do -%>
+<%- end -%>
+
+<%= render :partial => 'ip_addresses_form',
+           :locals  => { :parent_type => 'network',
+                         :parent_id   =>  @network.id } %>
+
+<div id="ip_addresses_footer" class="popup-content-footer">
+  <%= ok_footer %>
+</div>
diff --git a/src/app/views/network/edit_nic.rhtml b/src/app/views/network/edit_nic.rhtml
new file mode 100644
index 0000000..75af6fb
--- /dev/null
+++ b/src/app/views/network/edit_nic.rhtml
@@ -0,0 +1,62 @@
+<form method="POST"
+      action="<%= url_for :action => 'update_nic' %>" id="nic_form" >
+ <div id="selected_popup_content_header">
+      Editing NIC
+ </div>
+
+ <%= error_messages_for 'nic' %>
+
+ <div id="selected_popup_content_expanded" class="dialog_form">
+  <%= hidden_field_tag 'id', @nic.id %>
+  <%= hidden_field_tag 'nic_host_id', @nic.host.id %>
+  <%= hidden_field_tag 'nic_network_id', @nic.physical_network.id %>
+
+  <div class="selected_popup_content_left">MAC:</div>
+  <div class="selected_popup_content_right"><%= @nic.mac %></div>
+
+  <% if @nic.host.bondings.size != 0 %>
+    <div class="selected_popup_content_left">Bonded Interfaces</div>
+    <div class="selected_popup_content_right">
+       <select id="nic_bonding_ids" name="nic[bonding_ids][]">
+         <option value="" />
+         <%= options_from_collection_for_select @nic.host.bondings,
+                           "id", "name",
+                           @nic.bondings.size > 0 ? @nic.bondings[0].bonding_id.to_i : "" %>
+       </select>
+    </div>
+  <% end %>
+
+
+  <%= render :partial => 'select' %>
+
+  <div id="static_ip_options"
+    style="<% if @network.boot_type_id != @static_boot_type.id %>
+            display: none;<%end %>">
+    <%= render :partial => 'ip_addresses_form',
+               :locals => { :parent_type => 'nic',
+                            :parent_id => @nic.id } %>
+  </div>
+
+
+ </div>
+ <%= popup_footer("$('#nic_form').submit()", "Edit NIC") %>
+</form>
+
+<script type="text/javascript">
+$(function() {
+    var nicoptions = {
+        target:        '<%= url_for :action => 'update_nic' %>',
+        dataType:      'json',
+        success:       function(response, status) {
+          ajax_validation(response, status);
+          if (response.success) {
+            reset_nics_select();
+            reset_nics_bonding_detail();
+          }
+        }
+    };
+
+    // bind form using 'ajaxForm'
+    $('#nic_form').ajaxForm(nicoptions);
+});
+</script>
diff --git a/src/app/views/network/list.html.erb b/src/app/views/network/list.html.erb
new file mode 100644
index 0000000..9a304cf
--- /dev/null
+++ b/src/app/views/network/list.html.erb
@@ -0,0 +1,72 @@
+<div id="toolbar_nav">
+<ul>
+    <li><a href="<%= url_for :action => 'new' %>" rel="facebox[.bolder]"><%= image_tag "icon_addstorage.png", :style => "vertical-align:middle;" %>&nbsp;&nbsp;Add Network</a></li>
+    <li>
+      <a href="#" onClick="delete_networks();" >
+        <%= image_tag "icon_remove.png", :style=>"vertical-align:middle;" %>
+            &nbsp;&nbsp;Remove
+       </a>
+    </li>
+  </ul>
+</div>
+
+<script type="text/javascript">
+  function delete_networks(){
+    var networks = get_selected_networks();
+    if (validate_selected(get_selected_networks(), 'networks')) {
+      $.post('<%= url_for :action => 'delete' %>',
+             { network_ids: networks.toString() },
+             function(data,status){
+                if (data.alert) {
+                  $.jGrowl(data.alert);
+                }
+               grid = $("#networks_grid");
+               if (grid.size()>0 && grid != null) {
+                  grid.flexReload();
+               }
+               empty_summary('networks_selection', 'Network');
+             }, 'json');
+    }
+  }
+
+  function networks_select(selected_rows)
+  {
+    var selected_ids = new Array();
+    for(i=0; i<selected_rows.length; i++) {
+      selected_ids[i] = selected_rows[i].id;
+    }
+    if (selected_ids.length == 1)
+    {
+      $('#networks_selection').load('<%= url_for :action => "show" %>',
+                { id: parseInt(selected_ids[0].substring(3))});
+    }
+  }
+
+</script>
+
+<div class="panel_header"></div>
+<% if @networks.size != 0 %>
+  <div class="data_section">
+       <%= render :partial => "grid", :locals => { :table_id => "networks_grid",
+                                                   :networks => @networks,
+                                                   :on_select => "networks_select"} %>
+  </div>
+
+  <div class="selection_detail" id="networks_selection">
+    <div class="selection_left">
+      <div>Select a network.</div>
+    </div>
+  </div>
+<% else %>
+   <div class="data_section">
+       <div class="no-grid-items">
+          <%= image_tag 'no-grid-items.png', :style => 'float: left;' %>
+
+          <div class="no-grid-items-text">
+            No networks found. <br/><br/>
+            <%= image_tag "icon_addhost.png", :style=>"vertical-align:middle;" %>&nbsp;&nbsp;
+            <a href="<%= url_for :action => 'new' %>" rel="facebox[.bolder]">Add first network</a>
+          </div>
+       </div>
+   </div>
+<% end %>
diff --git a/src/app/views/network/new.rhtml b/src/app/views/network/new.rhtml
new file mode 100644
index 0000000..15b7304
--- /dev/null
+++ b/src/app/views/network/new.rhtml
@@ -0,0 +1,28 @@
+<%- content_for :title do -%>
+  Add Network
+<%- end -%>
+<%- content_for :description do -%>
+<%- end -%>
+
+  <!-- DIALOG  BODY -->
+  <form method="POST" action="<%= url_for :action => 'create' %>" id="network_form" >
+  <div class="dialog_form">
+    <%= render :partial => 'form', :locals => { :create => true }  %>
+  </div>
+  <!-- DIALOG  FOOTER -->
+  <%= popup_footer("$('#network_form').submit()", "Add Network") %>
+  </form>
+
+<script type="text/javascript">
+$(function() {
+    var networkoptions = {
+        target:        '<%= url_for :action => 'create' %>',
+	dataType:      'json',
+        success:       afterNetwork  // post-submit callback
+    };
+
+    // bind form using 'ajaxForm'
+    $('#network_form').ajaxForm(networkoptions);
+});
+</script>
+
diff --git a/src/app/views/network/new_bonding.rhtml b/src/app/views/network/new_bonding.rhtml
new file mode 100644
index 0000000..76d3b94
--- /dev/null
+++ b/src/app/views/network/new_bonding.rhtml
@@ -0,0 +1,36 @@
+<form method="POST"
+      action="<%= url_for :action => 'create_bonding' %>" id="bonding_form" >
+
+  <div id="selected_popup_content_header">
+      Create Bonded Interface
+  </div>
+
+  <%= render :partial => 'bonding_form' %>
+</form>
+
+<%= multi_button_popup_footer({"Create Bonding" =>
+                                 "$('#bonding_form').submit()"}) %>
+
+<script type="text/javascript">
+$(function() {
+    var bonding_options = {
+        target:        '<%= url_for :action => 'create_bonding' %>',
+        dataType:      'json',
+        success:       function(response, status) {
+          ajax_validation(response, status);
+          if (response.success) {
+            reset_bonding_select();
+            reset_nics_bonding_detail();
+            refresh_summary('hosts_selection',
+                            '<%= url_for :controller => "host",
+                                         :action => "show" %>',
+                            <%= @host.id %>)
+          }
+        }
+    };
+
+    // bind forms using 'ajaxForm'
+    $('#bonding_form').ajaxForm(bonding_options);
+
+});
+</script>
diff --git a/src/app/views/network/new_ip_address.rhtml b/src/app/views/network/new_ip_address.rhtml
new file mode 100644
index 0000000..df2a2bb
--- /dev/null
+++ b/src/app/views/network/new_ip_address.rhtml
@@ -0,0 +1,44 @@
+<% if @parent_type == 'network' %>
+<form method="POST"
+      action="<%= url_for :action => 'create_ip_address' %>"
+      id="ip_address_form" >
+<% end %>
+
+  <div id="selected_popup_content_header">
+      Create Ip Address
+  </div>
+
+  <%= render :partial => 'ip_address_form' %>
+
+<% if @parent_type == 'network' %>
+</form>
+<% end %>
+
+<% if @parent_type == 'network' %>
+<%= multi_button_popup_footer({"Create IP Address" =>
+                                 "$('#ip_address_form').submit()"}) %>
+<% end %>
+
+<script type="text/javascript">
+$(function() {
+    var ip_address_options = {
+        target:        '<%= url_for :action => 'create_ip_address' %>',
+        dataType:      'json',
+        success:       function(response, status) {
+          ajax_validation(response, status);
+          if (response.success) {
+            reset_selected_ip_address();
+            reset_ip_address_select();
+           <% if @parent_type == 'network' %>
+            refresh_summary('networks_selection',
+                '<%= url_for :controller => "network", :action => "show" %>',
+                 <%= @network.id %>);
+           <% end %>
+          }
+        }
+    };
+
+    // bind forms using 'ajaxForm'
+    $('#ip_address_form').ajaxForm(ip_address_options);
+});
+</script>
diff --git a/src/app/views/network/show.rhtml b/src/app/views/network/show.rhtml
new file mode 100644
index 0000000..2ac68ea
--- /dev/null
+++ b/src/app/views/network/show.rhtml
@@ -0,0 +1,31 @@
+<%- content_for :title do -%>
+  <%=h @network.name %>
+<%- end -%>
+
+<%- content_for :action_links do -%>
+  <%= link_to image_tag("icon_edit.png") + "Edit",
+        {:action => 'edit', :id => @network.id },
+         :rel=>"facebox[.bolder]", :class=>"selection_facebox" %>
+
+  <%= link_to image_tag("icon_edit.png") + "Edit IP Addresses",
+        {:action => 'edit_network_ip_addresses', :id => @network.id },
+         :rel=>"facebox[.bolder]", :class=>"selection_facebox" %>
+<%- end -%>
+
+<div id="hosts_selection_id" style="display:none"><%= @host.id %></div>
+<div class="selection_key">
+    Name:<br/>
+    Type:<br/>
+    Boot Type:<br/>
+    IP Addresses:<br/>
+</div>
+<div class="selection_value">
+    <%=h @network.name %><br/>
+    <%=h @network.type %><br/>
+    <%=h @network.boot_type.label %><br/>
+    <%=@network.ip_addresses.collect{ |ip|
+         ip.address}.join("<br/>") %>
+</div>
+
+<%- content_for :right do -%>
+<%- end -%>
diff --git a/src/app/views/nic/_list.rhtml b/src/app/views/nic/_list.rhtml
index 07f7e44..eb3a4a7 100644
--- a/src/app/views/nic/_list.rhtml
+++ b/src/app/views/nic/_list.rhtml
@@ -1,7 +1,6 @@
 <table class='listing'>
   <thead>
   <tr>
-    <th class="empty">IP</th>
     <th>MAC</th>
     <th>Bridge</th>
     <th>Usage Type</th>
@@ -11,7 +10,6 @@
   </thead>
 <% for nic in nics %>
   <tr class="<%= cycle('odd','even', :name => nics) %>">
-    <td><%= link_to nic.ip_addr, { :controller => "nic", :action => 'show', :id => nic }, { :class => "show" } %></td>
     <td><%= nic.mac %></td>
     <td><%= nic.bridge %></td>
     <td><%= nic.usage_type %></td>
diff --git a/src/db/migrate/028_refactor_networking_model.rb b/src/db/migrate/028_refactor_networking_model.rb
new file mode 100644
index 0000000..946b976
--- /dev/null
+++ b/src/db/migrate/028_refactor_networking_model.rb
@@ -0,0 +1,271 @@
+# Copyright (C) 2008 Red Hat, Inc.
+# Written by Mohammed Morsi <mmorsi at redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+# introduce networks and ip_addresses tables, refactor relationships
+class RefactorNetworkingModel < ActiveRecord::Migration
+  def self.up
+
+    ####################################################
+    # bugfix, bridge tables shouldn't have their own ids
+    remove_column :bondings_nics, :id
+
+    ##################################################################
+    # add networks, usages tables and networks_usage_types bridge
+    create_table :networks do |t|
+      t.string  :type, :null => false
+      t.string  :name, :null => false
+      t.integer :boot_type_id, :null => false
+
+      # attributes for Vlan (type=Vlan)
+      t.integer :number
+    end
+
+    create_table :usages do |t|
+      t.string :label, :null => false
+      t.string :usage, :null => false
+    end
+
+    create_table :networks_usages, :id => false do |t|
+      t.integer :network_id, :null => false
+      t.integer :usage_id, :null => false
+    end
+
+    add_index :networks_usages, [:network_id, :usage_id], :unique => true
+
+    # create usages
+    Usage.create(:label => 'Guest', :usage => 'guest')
+    Usage.create(:label => 'Management', :usage => 'management')
+    Usage.create(:label => 'Storage', :usage => 'storage')
+
+    # referential integrity for networks tables
+    execute "alter table networks add constraint
+             fk_network_boot_types
+             foreign key (boot_type_id) references
+             boot_types(id)"
+    execute "alter table networks_usages add constraint
+             fk_networks_usages_network_id
+             foreign key (network_id) references
+             networks(id)"
+    execute "alter table networks_usages add constraint
+             fk_networks_usages_usage_id
+             foreign key (usage_id) references
+             usages(id)"
+
+    # add foreign keys to nics / bondings table
+    add_column :nics, :physical_network_id, :integer
+    add_column :bondings, :vlan_id, :integer
+
+    # referential integrity for nic/bondings network ids
+    execute "alter table nics add constraint
+             fk_nic_networks
+             foreign key (physical_network_id) references
+             networks(id)"
+    execute "alter table bondings add constraint
+             fk_bonding_networks
+             foreign key (vlan_id) references
+             networks(id)"
+
+    ####################################################
+    # create ip_addresses table
+    create_table :ip_addresses do |t|
+      t.string :type
+
+      # foreign keys to associated entities
+      t.integer :nic_id
+      t.integer :bonding_id
+      t.integer :network_id
+
+      # common attributes
+      t.string :address,   :limit => 39, :null => false
+      t.string :gateway,   :limit => 39
+
+      # attributes for IPv4 (type=IpV4Address)
+      t.string :netmask,   :limit => 15
+      t.string :broadcast, :limit => 15
+
+      # attributes for IPv6 (type=IpV6Address)
+      t.string :prefix,    :limit => 39
+      t.timestamps
+    end
+
+    # referential integrity for ip_addresses table
+    execute "alter table ip_addresses add constraint
+             fk_nic_ip_addresses
+             foreign key (nic_id) references nics(id)"
+    execute "alter table ip_addresses add constraint
+             fk_bonding_ip_addresses
+             foreign key (bonding_id) references bondings(id)"
+    execute "alter table ip_addresses add constraint
+             fk_network_ip_addresses
+             foreign key (network_id) references networks(id)"
+
+    ###################################################################
+    static_boot_type_id =
+      BootType.find(:first,
+           :conditions => {:proto => 'static'} ).id
+
+    # migrate nic ip_addresses to networks / ip_addresses table
+    i = 0
+    Nic.find(:all).each do |nic|
+      if nic.boot_type_id == static_boot_type_id
+        IpV4Address.new(:nic_id    => nic.id,
+                        :address   => nic.ip_addr).save!
+
+      end
+      network = PhysicalNetwork.new(
+                            :name => 'Physical Network ' + i.to_s,
+                            :boot_type_id => nic.boot_type_id)
+      network.save!
+
+      ip_address = IpV4Address.new(:address   => nic.ip_addr ? nic.ip_addr : '0.0.0.0',
+                                   :netmask   => nic.netmask,
+                                   :broadcast => nic.broadcast,
+                                   :gateway   => nic.ip_addr)
+      ip_address.network = network
+      ip_address.save!
+
+      nic.physical_network = network
+      nic.save!
+
+      i += 1
+    end
+
+    # migrate bonding ip_addresses to networks / ip_addresses table
+    i = 0
+    Bonding.find(:all).each do |bonding|
+      if bonding.boot_type_id == static_boot_type_id
+        IpV4Address.new(:bonding_id => bonding.id,
+                        :address    => bonding.ip_addr).save!
+      end
+      network = Vlan.new(
+                     :name => 'VLAN ' + i.to_s,
+                     :number => i,
+                     :boot_type_id => bonding.boot_type_id)
+      network.save!
+
+      ip_address = IpV4Address.new(:address   => bonding.ip_addr ? bonding.ip_addr : '0.0.0.0',
+                                   :netmask   => bonding.netmask,
+                                   :broadcast => bonding.broadcast,
+                                   :gateway   => bonding.ip_addr)
+      ip_address.network = network
+      ip_address.save!
+
+      bonding.vlan = network
+      bonding.save!
+
+      i += 1
+    end
+
+    ##############################################################
+    # remove nics / bonding ip address and network related columns
+    remove_column :nics,     :ip_addr
+    remove_column :nics,     :netmask
+    remove_column :nics,     :broadcast
+    remove_column :nics,     :boot_type_id
+    remove_column :bondings, :ip_addr
+    remove_column :bondings, :netmask
+    remove_column :bondings, :broadcast
+    remove_column :bondings, :boot_type_id
+
+
+  end
+
+  def self.down
+    ##############################################################
+    # readd nics / bonding ip address related columns
+    add_column :nics,     :ip_addr,   :string, :limit => 16
+    add_column :nics,     :netmask,   :string, :limit => 16
+    add_column :nics,     :broadcast, :string, :limit => 16
+    add_column :nics,     :boot_type_id, :integer
+    add_column :bondings, :ip_addr,   :string, :limit => 16
+    add_column :bondings, :netmask,   :string, :limit => 16
+    add_column :bondings, :broadcast, :string, :limit => 16
+    add_column :bondings, :boot_type_id, :integer
+
+    execute "alter table nics add constraint
+             fk_nic_boot_types
+             foreign key (boot_type_id) references
+             boot_types(id)"
+    execute "alter table bondings add constraint
+             fk_bonding_boot_types
+             foreign key (boot_type_id) references
+             boot_types(id)"
+
+    ##############################################################
+    # attempt to migrate ip information back into nics table.
+    #  because a nic can have multiple ips (if statically
+    #  assigned) as well as its network, just use the 1st
+    #  found
+    Nic.find(:all).each do |nic|
+      if nic.physical_network.ip_addresses.size > 0
+        # use the 1st configured network ip
+        nic.ip_addr   = nic.physical_network.ip_addresses[0].address
+        nic.netmask   = nic.physical_network.ip_addresses[0].netmask
+        nic.broadcast = nic.physical_network.ip_addresses[0].broadcast
+      end
+
+      if nic.ip_addresses.size > 0
+        # use the 1st assigned static ip
+        nic.ip_addr   = nic.ip_addresses[0].address
+      end
+
+      nic.boot_type_id = nic.physical_network.boot_type_id
+
+      nic.save!
+    end
+
+    # attempt to migrate ip information back into bondings table.
+    #  because a bonding can have multiple ips (if statically
+    #  assigned) as well as its network, just use the 1st
+    #  found
+    Bonding.find(:all).each do |bonding|
+      if bonding.vlan.ip_addresses.size > 0
+        # use the 1st configured network ip
+        bonding.ip_addr   = bonding.vlan.ip_addresses[0].address
+        bonding.netmask   = bonding.vlan.ip_addresses[0].netmask
+        bonding.broadcast = bonding.vlan.ip_addresses[0].broadcast
+      end
+
+      if bonding.ip_addresses.size > 0
+        # use the 1st assigned static ip
+        bonding.ip_addr   = bonding.ip_addresses[0].address
+      end
+
+      bonding.boot_type_id = bonding.vlan.boot_type_id
+
+      bonding.save!
+    end
+
+    ##############################################################
+    # drop ip_addresses table
+    drop_table :ip_addresses
+
+    # drop network ids from nics / bondings table
+    remove_column :nics, :physical_network_id
+    remove_column :bondings, :vlan_id
+
+    # drop networks tables
+    drop_table :networks_usages
+    drop_table :usages
+    drop_table :networks
+
+    ##############################################################
+    # undo bugfix above
+    add_column :bondings_nics, :id, :integer
+  end
+end
diff --git a/src/public/javascripts/ovirt.js b/src/public/javascripts/ovirt.js
index 4579c80..d84b3d9 100644
--- a/src/public/javascripts/ovirt.js
+++ b/src/public/javascripts/ovirt.js
@@ -297,4 +297,23 @@ function delete_pool(delete_url, id)
               $.jGrowl(data.alert);
             }
            }, 'json');
-}
\ No newline at end of file
+}
+
+
+function get_selected_networks()
+{
+    return get_selected_checkboxes("networks_grid_form");
+}
+
+function afterNetwork(response, status){
+    ajax_validation(response, status);
+    if (response.success) {
+      $(document).trigger('close.facebox');
+      grid = $("#networks_grid");
+      if (grid.size()>0 && grid != null) {
+        grid.flexReload();
+      } else {
+        $tabs.tabs("load",$tabs.data('selected.tabs'));
+      }
+    }
+}
diff --git a/src/public/stylesheets/components.css b/src/public/stylesheets/components.css
index 16eaf62..228ff7b 100644
--- a/src/public/stylesheets/components.css
+++ b/src/public/stylesheets/components.css
@@ -267,4 +267,52 @@
 .detail-pane-chart {
     height: 50px;
     width: 375px;
-};
+}
+
+
+/*************************
+ *    new popup components
+ *************************/
+.popup-content-selection {
+   float: left;
+   width: 45%;
+   padding-left: 20px;
+   padding-top: 10px;
+}
+
+.popup-content-selection select{
+   min-width: 200px;
+}
+
+.popup-content-footer{
+  width: 99%;
+  float: left;
+}
+
+.selected_popup_content {
+   padding-left: 20px;
+   min-height: 50px;
+   float: left;
+   width: 96%;
+}
+
+#selected_popup_content_header {
+  padding-bottom: 5px;
+  font-weight: bold;
+}
+
+#selected_popup_content_expanded{
+  padding-bottom: 50px;
+}
+
+.selected_popup_content_left {
+  float: left;
+  width: 40%;
+  padding-bottom: 15px;
+}
+
+.selected_popup_content_right {
+  float: left;
+  width: 40%;
+  padding-bottom: 15px;
+}
-- 
1.5.6.5



From mmorsi at redhat.com  Fri Oct 31 23:57:37 2008
From: mmorsi at redhat.com (Mohammed Morsi)
Date: Fri, 31 Oct 2008 19:57:37 -0400
Subject: [Ovirt-devel] Re: [PATCH server] network integration into ovirt
	server db and wui
In-Reply-To: <490B7CEB.2080302@redhat.com>
References: <1225416455-7607-1-git-send-email-mmorsi@redhat.com>
	<490B25C8.1020509@redhat.com>
	<20081031160305.GH30553@redhat.com> <490B30A6.70406@redhat.com>
	<490B7CEB.2080302@redhat.com>
Message-ID: <490B9B71.2040409@redhat.com>

[snip]
> so not yet ACK -- we need to fix:
>
> 1) ManagedNodeConfiguration bit -- I'm not sure about this one -- but
> my concern is without this fix networking will be completely broken on
> the nodes/VMs
> 2) static IP VLAN for bondings
> 3) host details pane needs to show the bonding name in the 'bonding'
> section.
>
> Scott
>
I just sent out an updated patch containing fixes for #2 and #3. I'm not
sure about #1. If it isn't an issue then I believe this patch is
committable.

   -Mo