search for: vnic_mac_addr

...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_pool.can_view(@user) attr_list.insert(3, [:host, :hostname]) end diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb index 197241d..2c0079c 10064...

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

...ff), rand(0xff) ] - # random uuid - uuid = ["%02x"*4, "%02x"*2, "%02x"*2, "%02x"*2, "%02x"*6].join("-") % - Array.new(16) {|x| rand(0xff) } - - @vm = Vm.new({:vm_resource_pool_id => vm_resource_pool_id, - :vnic_mac_addr => mac.collect {|x| "%02x" % x}.join(":"), - :uuid => uuid }) + new_vm_hash = {:vm_resource_pool_id => vm_resource_pool_id} + default_mac_and_uuid(new_vm_hash) + @vm = Vm.new(new_vm_hash) authorized!(Privilege::MODIFY, @vm.vm_resource_pool...

...INT64, :desc => "Amount of memory to allocate.", :units => "KB")) + method.add_argument(Qmf::SchemaArgument.new("uuid", Qmf::TYPE_SSTR, :desc => "UUID of VM, will be assigned if left empty.")) + method.add_argument(Qmf::SchemaArgument.new("vnic_mac_addr", Qmf::TYPE_SSTR, :desc => "MAC address of virtual NIC, will be assigned if left empty.")) + method.add_argument(Qmf::SchemaArgument.new("vm", Qmf::TYPE_REF, :desc => "Newly created domain object id.", :dir => Qmf::DIR_OUT)) + @ovirt_class.add_metho...

...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? VmResourcePool) and @pool.get_hardware_pool.can_view(@user) attr_list.insert(3, [:host, :hostname]) end diff --git a/src/app/controllers/resources_controller.rb b/src/app/controllers/resource...

...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? VmResourcePool) and @pool.get_hardware_pool.can_view(@user) attr_list.insert(3, [:host, :hostname]) end diff --git a/src/app/controllers/resources_controller.rb b/src/app/controllers/resource...

...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? VmResourcePool) and @pool.get_hardware_pool.can_view(@user) attr_list.insert(3, [:host, :hostname]) end diff --git a/src/app/controllers/resources_controller.rb b/src/app/controllers/resource...

...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? VmResourcePool) and @pool.get_hardware_pool.can_view(@user) attr_list.insert(3, [:host, :hostname]) end diff --git a/src/app/controllers/resources_controller.rb b/src/app/controllers/resource...

...<div class="form_heading">Network</div> - <div class="clear_row"></div> - <div class="clear_row"></div> - <div style="float:left;"> - <%= text_field_with_label "VNIC:", "vm", "vnic_mac_addr", {:style=>"width:250;"} %> - </div> - <div style="float:left;"> - <%= select_with_label "Network:", 'vm', 'network_id', @networks.insert(0, ""), :style=>"width:250px;" %> + <div clas...

...:hardware_pool_id => @default_pool.id, - :vm => { :uuid => 'f43b298c-1e65-46fa-965f-0f6fb9ffaa10', - :description => 'descript', - :num_vcpus_allocated => 4, - :memory_allocated => 262144, - :vnic_mac_addr => 'AA:BB:CC:DD:EE:FF', - :boot_device => 'network' } + post :create, :vm => { :uuid => 'f43b298c-1e65-46fa-965f-0f6fb9ffaa10', + :vm_resource_pool_id => @vm_pool.id, + :description => 'descript', +...

...bug("Connecting volumes: #{volumes}") storagedevs = connect_storage_pools(node, volumes) # determine if vm has been assigned to physical or @@ -370,6 +387,8 @@ class TaskOmatic db_vm.memory_used, db_vm.num_vcpus_allocated, db_vm.boot_device, db_vm.vnic_mac_addr, net_device, storagedevs) + @logger.debug("XML Domain definition: #{xml}") + result = node.domainDefineXML(xml.to_s) raise "Error defining virtual machine: #{result.text}" unless result.status == 0 @@ -506,17 +525,18 @@ class TaskOmatic volumes = []...

..._test.rb +++ b/src/test/functional/vm_controller_test.rb @@ -61,7 +61,6 @@ class VmControllerTest < ActionController::TestCase :description => 'descript', :num_vcpus_allocated => 4, :memory_allocated => 262144, - :vnic_mac_addr => 'AA:BB:CC:DD:EE:FF', :boot_device => 'network' } assert_response :success -- 1.6.0.6

...host: fedoraworkstation_foobar_com vm_resource_pool: corp_com_production_vmpool +corp_com_qa_postgres_vm: + uuid: f6059569-a81f-4728-bb61-6f16b1c594e7 + description: corp.com qa postgres vm + num_vcpus_allocated: 2 + num_vcpus_used: 2 + memory_allocated: 262144 + memory_used: 131072 + vnic_mac_addr: 00:16:3e:04:de:c8 + state: running + needs_restart: 0 + boot_device: hd + host: macworkstation_qa_corp_com + vm_resource_pool: corp_qa_vmpool foobar_prod2_vm: uuid: 24b9a994-d415-481d-ace8-1d810b601eb6 description: foobar prod2 diff --git a/src/test/unit/vm_service_test.rb b/src/test/u...

This resend includes the rebase, but fixes a problem I just noticed with nil/empty checks.

This is a resend of the 2-patch series from a week or so ago, needed to be rebased due to some commits on next

The following two patches should be applied in the order: * [PATCH server] Add svc_vm_actions method to VmService. * [PATCH server] Cloud UI layer to initiate actions on vms. The service layer patch should work fine on its own (and not break anything), but cloud patch relies on service being there.