search for: poolcontroller

...), 18 deletions(-) diff --git a/src/app/controllers/hardware_controller.rb b/src/app/controllers/hardware_controller.rb index 4d93e2f..6d879b9 100644 --- a/src/app/controllers/hardware_controller.rb +++ b/src/app/controllers/hardware_controller.rb @@ -187,10 +187,7 @@ class HardwareController < PoolController end def additional_create_params - ret_hash = {:resource_ids => params[:resource_ids], - :parent_id => (params[:hardware_pool] ? - params[:hardware_pool][:parent_id] : - params[:parent_id])} + ret_hash =...

...6 ++++++ 9 files changed, 45 insertions(+), 8 deletions(-) diff --git a/src/app/controllers/pool_controller.rb b/src/app/controllers/pool_controller.rb index 74a958c..44cb780 100644 --- a/src/app/controllers/pool_controller.rb +++ b/src/app/controllers/pool_controller.rb @@ -96,7 +96,7 @@ class PoolController < ApplicationController def vms_json(args) attr_list = [:id, :description, :uuid, :num_vcpus_allocated, :memory_allocated_in_mb, - :vnic_mac_addr, :state, :id] + :vnic_mac_addr, :state, :calc_uptime, :id] if (@pool.is_a? VmResourcePo...

...6 ++++++ 9 files changed, 45 insertions(+), 8 deletions(-) diff --git a/src/app/controllers/pool_controller.rb b/src/app/controllers/pool_controller.rb index 74a958c..44cb780 100644 --- a/src/app/controllers/pool_controller.rb +++ b/src/app/controllers/pool_controller.rb @@ -96,7 +96,7 @@ class PoolController < ApplicationController def vms_json(args) attr_list = [:id, :description, :uuid, :num_vcpus_allocated, :memory_allocated_in_mb, - :vnic_mac_addr, :state, :id] + :vnic_mac_addr, :state, :calc_uptime, :id] if (@pool.is_a? VmResourcePo...

...6 ++++++ 9 files changed, 44 insertions(+), 7 deletions(-) diff --git a/src/app/controllers/pool_controller.rb b/src/app/controllers/pool_controller.rb index 74a958c..44cb780 100644 --- a/src/app/controllers/pool_controller.rb +++ b/src/app/controllers/pool_controller.rb @@ -96,7 +96,7 @@ class PoolController < ApplicationController def vms_json(args) attr_list = [:id, :description, :uuid, :num_vcpus_allocated, :memory_allocated_in_mb, - :vnic_mac_addr, :state, :id] + :vnic_mac_addr, :state, :calc_uptime, :id] if (@pool.is_a? VmResourcePo...

...4 +++- 8 files changed, 35 insertions(+), 6 deletions(-) diff --git a/src/app/controllers/pool_controller.rb b/src/app/controllers/pool_controller.rb index 74a958c..44cb780 100644 --- a/src/app/controllers/pool_controller.rb +++ b/src/app/controllers/pool_controller.rb @@ -96,7 +96,7 @@ class PoolController < ApplicationController def vms_json(args) attr_list = [:id, :description, :uuid, :num_vcpus_allocated, :memory_allocated_in_mb, - :vnic_mac_addr, :state, :id] + :vnic_mac_addr, :state, :calc_uptime, :id] if (@pool.is_a? VmResourcePo...

...Access denied") diff --git a/src/app/controllers/hardware_controller.rb b/src/app/controllers/hardware_controller.rb index 56b6e08..4d93e2f 100644 --- a/src/app/controllers/hardware_controller.rb +++ b/src/app/controllers/hardware_controller.rb @@ -57,18 +57,13 @@ class HardwareController < PoolController end def json_view_tree - json_tree_internal(Privilege::VIEW, :select_hardware_and_vm_pools) + json_tree_internal(:svc_show, :select_hardware_and_vm_pools) end def json_move_tree - json_tree_internal(Privilege::MODIFY, :select_hardware_pools) - end - def json_tree_internal(p...

...(-) create mode 100644 src/db/migrate/044_add_vm_fields.rb diff --git a/src/app/controllers/pool_controller.rb b/src/app/controllers/pool_controller.rb index e86b064..e6c341d 100644 --- a/src/app/controllers/pool_controller.rb +++ b/src/app/controllers/pool_controller.rb @@ -94,11 +94,11 @@ class PoolController < ApplicationController end def vms_json(args) - attr_list = [:id, :description, :uuid, + attr_list = [:id, :description, :num_vcpus_allocated, :memory_allocated_in_mb, - :state, :calc_uptime, :id] + :state, :contact, :os, :eol, :co...

...failures.empty? diff --git a/src/app/controllers/resources_controller.rb b/src/app/controllers/resources_controller.rb index 6990df7..efd3cb6 100644 --- a/src/app/controllers/resources_controller.rb +++ b/src/app/controllers/resources_controller.rb @@ -80,10 +80,9 @@ class ResourcesController < PoolController begin svc_destroy(pool_id) successes << @pool - rescue PermissionError => perm_error - failures[@pool] = perm_error.message + # PermissionError expected rescue Exception => ex - failures[@pool] = ex.message + failures[@pool....

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

...ate mode 100644 src/db/migrate/040_associate_vms_with_nics.rb diff --git a/src/app/controllers/pool_controller.rb b/src/app/controllers/pool_controller.rb index 74a958c..0d2e491 100644 --- a/src/app/controllers/pool_controller.rb +++ b/src/app/controllers/pool_controller.rb @@ -96,7 +96,7 @@ class PoolController < ApplicationController def vms_json(args) attr_list = [:id, :description, :uuid, :num_vcpus_allocated, :memory_allocated_in_mb, - :vnic_mac_addr, :state, :id] + :state, :id] if (@pool.is_a? VmResourcePool) and @pool.get_hardware_poo...