search for: svc_new

...lers/storage_volume_controller.rb index b89513a..fb6bc9c 100644 --- a/src/app/controllers/storage_volume_controller.rb +++ b/src/app/controllers/storage_volume_controller.rb @@ -21,7 +21,11 @@ class StorageVolumeController < ApplicationController include StorageVolumeService def new - svc_new(params[:storage_pool_id], params[:source_volume_id]) + if params[:storage_pool_id] + svc_new(params[:storage_pool_id]) + else + svc_new_lv(params[:source_volume_id]) + end @return_to_workflow = params[:return_to_workflow] || false render :layout => 'popup'...

...ces/hardware_pool_service.rb +++ b/src/app/services/hardware_pool_service.rb @@ -43,8 +43,8 @@ module HardwarePoolService # +parent_id+ # === Required permissions # [<tt>Privilege::MODIFY</tt>] for the parent pool - def svc_create(pool_hash, other_args) - svc_new(other_args[:parent_id], pool_hash) + def svc_create(pool_hash, parent_id, other_args) + svc_new(parent_id, pool_hash) Pool.transaction do @pool.create_with_parent(@parent) diff --git a/src/app/services/smart_pool_service.rb b/src/app/services/smart_pool_service.rb index 28bdaf3..1...

...++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/app/services/vm_service.rb b/src/app/services/vm_service.rb index 4c29bcf..47ac5f5 100644 --- a/src/app/services/vm_service.rb +++ b/src/app/services/vm_service.rb @@ -52,15 +52,9 @@ module VmService def svc_new(vm_resource_pool_id) raise ActionError.new("VM Resource Pool is required.") unless vm_resource_pool_id - # random MAC - mac = [ 0x00, 0x16, 0x3e, rand(0x7f), rand(0xff), rand(0xff) ] - # random uuid - uuid = ["%02x"*4, "%02x"*2, "%02x"*2, &...

I've rebased the patch series to the current next branch and am sending them again.

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

...:name, :type, [:boot_type, :label]]) + end - def show + def show + svc_show(params[:id]) respond_to do |format| format.html { render :layout => 'selection' } format.xml { render :xml => @network.to_xml } end - end + end - def new + def new + svc_new() @boot_types = BootType.find(:all) @usage_types = Usage.find(:all) render :layout => 'popup' - end + end - def create - begin - @network = PhysicalNetwork.new(params[:network]) if params[:network][:type] == 'PhysicalNetwork' - @network = Vlan.new...

...end diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb index 197241d..2c0079c 100644 --- a/src/app/controllers/vm_controller.rb +++ b/src/app/controllers/vm_controller.rb @@ -55,29 +55,31 @@ class VmController < ApplicationController def new alert = svc_new(params[:vm_resource_pool_id]) _setup_provisioning_options + _setup_network_options @storage_tree = VmResourcePool.find(params[:vm_resource_pool_id]).get_hardware_pool.storage_tree.to_json - @networks = Network.find(:all).collect{ |net| [net.name, net.id] } render :layout =>...