similar to: [PATCH] Introduce ability to select any kind of nic model, not just default or virtio.

From: Simon Courtois <scourtois at linagora.com> Signed-off-by: Simon Courtois <scourtois at linagora.com> --- src/app/controllers/vm_controller.rb | 19 ++++++++++++++++- src/app/views/vm/_form.rhtml | 25 ++++++++++++++++++++--- src/db/migrate/044_add_virtio_to_vm_and_nic.rb | 11 ++++++++++ src/public/stylesheets/components.css | 5

- changes to the form/style cleaning it up greatly - changes to the controller fixing allowing nics/ networks to actually be saved (credit to Michel Loiseleur for helping with this) - very small test and indentation fixes --- src/app/controllers/vm_controller.rb | 41 +++- src/app/views/vm/_form.rhtml | 365 ++++++++++++++---------------

- db, model, service, controller, and view changes - many tests additions - various fixes / cleanup to get things working depends on my last two (still unacked) patches: - add collapsable sections to vm form - provide default vm allocated cpu and memory values ovirt-agent might need to be updated to work with the changes --- src/app/controllers/pool_controller.rb | 2 +-

Frontend and backend changes needed to implement http://ovirt.org/page/Networking_UX#Option_3 --- src/app/controllers/host_controller.rb | 38 ++- src/app/services/host_service.rb | 35 ++ src/app/views/host/edit_network.rhtml | 593 ++++++++++++++++++++++++++++---- src/public/stylesheets/components.css | 76 ++++ 4 files changed, 676 insertions(+), 66 deletions(-) diff --git

redux patchset permitting a vm to be associated with multiple networks and vice-versa. updated patchset so as to be applicable against current oVirt server HEAD these patches may be applied in any order, they all need to be pushed together

This patchset contains changes to the ovirt server frontend, backend, and tests components, permitting vms to be associated with multiple networks and vice versa. Also included are two patches which are required for the frontend bits; a patch adding collapsable sections to the vm form, which in itself depends on the second patch that provides default values for the cpu and memory vm table fields

Fix a little bug in virtio disk attributions Signed-off-by: Arthur Clement <aclement at linagora.com> --- src/task-omatic/task_vm.rb | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb index 3a197f9..cf84ea2 100644 --- a/src/task-omatic/task_vm.rb +++ b/src/task-omatic/task_vm.rb @@ -66,7 +66,9 @@ def

Signed-off-by: Simon COURTOIS <scourtois at linagora.com> --- src/app/controllers/vm_controller.rb | 5 ++ src/app/models/vm_task.rb | 4 +- src/app/views/vm/start.rhtml | 77 ++++++++++++++++++++++++++++++++++ src/task-omatic/taskomatic.rb | 7 +++- 4 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 src/app/views/vm/start.rhtml diff

Previously, a pxe-booted vm would always boot to HD at next startup. Signed-off-by: Nicolas Ochem <nicolas.ochem at alcatel-lucent.com> --- src/app/controllers/vm_controller.rb | 1 + src/app/models/vm.rb | 15 +++++++++++---- src/app/views/vm/_form.rhtml | 2 +- src/task-omatic/taskomatic.rb | 13 +++++++++++-- 4 files changed, 24 insertions(+), 7

since the introduction of ovirt-vnc-proxy and the updating of ovirt-viewer to user it the forward vnc functionality is no longer necessary / and incompatable w/ the current system. --- src/app/controllers/vm_controller.rb | 2 - src/app/models/host.rb | 9 - src/app/models/vm.rb | 36 ----

Hi, Does somebody know what is the purpose of this line in taskomatic.rb : set_vm_vnc_port(db_vm, result.description) unless result.status != 0 We removed it to avoid 2 errors in taskomatic.log when a vm is launched : ERROR Mon Aug 30 15:23:00 +0000 2010 (26416) Task action processing failed: ActiveRecord::RecordInvalid: Validation failed: Vnc port must be greater than or equal to 0 ERROR

Changed relative pathing issue for anyterm.js to work properly Changed /proxy/anyterm-module so it gets piped through vmnodes:$1 instead of through vmnodes:anyterm --- conf/ovirt-server.conf | 6 ++++-- src/app/controllers/vm_controller.rb | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/conf/ovirt-server.conf b/conf/ovirt-server.conf index

Signed-off-by: Simon COURTOIS <scourtois at linagora.com> --- src/app/controllers/vm_controller.rb | 16 ++++++++++++++ src/app/views/vm/edit_vmpool.rhtml | 36 ++++++++++++++++++++++++++++++++ src/app/views/vm/show.rhtml | 3 ++ src/public/images/icon_vmpool_11px.png | Bin 0 -> 542 bytes 4 files changed, 55 insertions(+), 0 deletions(-) create mode 100644

Signed-off-by: Simon COURTOIS <scourtois at linagora.com> --- src/app/controllers/vm_controller.rb | 16 +++++++++++++ src/app/views/vm/edit_vmpool.rhtml | 39 ++++++++++++++++++++++++++++++++ src/app/views/vm/show.rhtml | 3 ++ src/public/images/icon_vmpool_11px.png | Bin 0 -> 542 bytes 4 files changed, 58 insertions(+), 0 deletions(-) create mode 100644

In addition, removed unnecessary 'rescue' clauses and fixed a bug in a prior fix for this problem for the Permission and Network controllers. Signed-off-by: Scott Seago <sseago at redhat.com> --- src/app/controllers/application.rb | 2 +- src/app/controllers/network_controller.rb | 2 +- src/app/controllers/permission_controller.rb | 6 ++----

The error is caused by the save! method updating an object that another thread (most likely in taskomatic) already updated. In the case of this race condition, we retry saving. However, a proper fix would involve fixing the locking. --- src/db-omatic/db_omatic.rb | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/db-omatic/db_omatic.rb

--- src/db-omatic/db_omatic.rb | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/db-omatic/db_omatic.rb b/src/db-omatic/db_omatic.rb index 155ff5e..b5b7b81 100755 --- a/src/db-omatic/db_omatic.rb +++ b/src/db-omatic/db_omatic.rb @@ -270,10 +270,10 @@ class DbOmatic < Qpid::Qmf::Console end def object_props(broker, obj) - target =

I've been playing with ovirt built from source. When I try to start my first VM, I get this error in taskomatic.log: INFO Wed Aug 26 14:33:28 -0600 2009 (12750) starting task_start_vm INFO Wed Aug 26 14:33:29 -0600 2009 (12750) VM will be started on node node94.ovirt.priv DEBUG Wed Aug 26 14:33:29 -0600 2009 (12750) Connecting volumes: DEBUG Wed Aug 26 14:33:29 -0600 2009 (12750) XML Domain

--- src/task-omatic/task_storage.rb | 50 +++++++++++++++++++++++++++++++++++++++ src/task-omatic/utils.rb | 40 +++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 0 deletions(-) diff --git a/src/task-omatic/task_storage.rb b/src/task-omatic/task_storage.rb index 77363ac..97ae4fc 100644 --- a/src/task-omatic/task_storage.rb +++ b/src/task-omatic/task_storage.rb @@

This fixes a bug where if db-omatic restarted, any running vm lost the association with the host it is running on in the db. --- src/db-omatic/db_omatic.rb | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/src/db-omatic/db_omatic.rb b/src/db-omatic/db_omatic.rb index b5b7b81..d2540e1 100755 --- a/src/db-omatic/db_omatic.rb +++ b/src/db-omatic/db_omatic.rb @@