search for: nnic

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> -- 1.7.10.4

...208 deletions(-) diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb index 54c39cf..eda5798 100644 --- a/src/app/controllers/vm_controller.rb +++ b/src/app/controllers/vm_controller.rb @@ -177,9 +177,10 @@ class VmController < ApplicationController nnic = Nic.new(:mac => nic.mac, :vm_id => @vm.id, :network => nic.network) - if(nic.network.boot_type.proto == 'static') - nnic.ip_addresses << IpAddress.new(:address => nic.ip_address) - end + + if(nic.networ...

...-git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb index 9860843..c4ad7ce 100644 --- a/src/app/controllers/vm_controller.rb +++ b/src/app/controllers/vm_controller.rb @@ -193,7 +193,7 @@ class VmController < ApplicationController networks.each{ |net| nnic = Nic.new(:mac => Nic::gen_mac, :network => net) if(net.boot_type.proto == 'static') - nnic.ip_addresses << IpAddress.new(:address => '127.0.0.1') # FIXME + nnic.ip_addresses << IpAddress.new(:address => net.gen_address)...

...d_model_to_nic.rb diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb index adc8988..54abd15 100644 --- a/src/app/controllers/vm_controller.rb +++ b/src/app/controllers/vm_controller.rb @@ -199,7 +199,7 @@ class VmController < ApplicationController nnic = Nic.new(:mac => nic.mac, :vm_id => @vm.id, :network => nic.network, - :virtio => nic.virtio) + :model => nic.model) if(nic.network.boot_type.proto == 'static')...

...dify(params[:id]) + @vm = Vm.find(params[:id]) + # TODO + end + protected def _setup_provisioning_options @provisioning_options = [[Vm::PXE_OPTION_LABEL, Vm::PXE_OPTION_VALUE], @@ -176,7 +188,8 @@ class VmController < ApplicationController @vm.nics.each { |nic| nnic = Nic.new(:mac => nic.mac, :vm_id => @vm.id, - :network => nic.network) + :network => nic.network, + :virtio => nic.virtio) if(nic.network.boot_type.proto == 'static')...

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

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi all, 4.2 and 4.1 suffers from SEGV during xl network-attach in libxl__device_nic_add. In 4.3-unstable it is fixed by: 5420f2650 libxl: Set vfb and vkb devid if not done so by the caller So either the patch need to be backported to 4.1 and 4.2, or fixed by this one: - ------ libxl: Fix SEGV in network-attach When "device/vif" directory

...roller #if cobbler doesn't respond/is misconfigured/etc just don't add profiles end end + + # sets up a list of nics for the vm form + def _setup_network_options + net_conditions = "" + @nics = [] + + unless @vm.nil? + @vm.nics.each { |nic| + nnic = Nic.new(:mac => nic.mac, + :vm_id => @vm.id, + :network => nic.network) + if(nic.network.boot_type.proto == 'static') + nnic.ip_addresses << IpAddress.new(:address => nic.ip_address) + end + @nics.push nnic + +...