search for: bondings_nics

...app/models/bonding.rb @@ -35,7 +35,7 @@ class Bonding < ActiveRecord::Base belongs_to :host belongs_to :bonding_type belongs_to :vlan - has_many :ip_addresses, :dependent => :destroy + has_many :ip_addresses, :dependent => :destroy # FIXME should really be a has_one # FIXME bondings_nics table should just be replaced with # bonding_id column in nics table, and relationship changed diff --git a/src/app/models/network.rb b/src/app/models/network.rb index 89f9876..22e5692 100644 --- a/src/app/models/network.rb +++ b/src/app/models/network.rb @@ -18,7 +18,7 @@ class Network <...

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

...e8b7768..f03c525 100644 --- a/src/app/models/nic.rb +++ b/src/app/models/nic.rb @@ -19,7 +19,10 @@ class Nic < ActiveRecord::Base belongs_to :host - belongs_to :physical_network + belongs_to :vm + + belongs_to :network + has_many :ip_addresses, :dependent => :destroy # FIXME bondings_nics table should just be replaced with @@ -33,24 +36,31 @@ class Nic < ActiveRecord::Base validates_format_of :mac, :with => %r{^([0-9a-fA-F]{2}([:-]|$)){6}$} - validates_presence_of :host_id, - :message => 'A host must be specified.' + # nic must be assigned to network...

Note that one of the 8 patches (#6) will be sent separately in reply to this email, as some of the replaced lines are too long, so git won't let me send the email. However, there is nothing wrong with that patch, and it should be applied in the sequence listed below. Note also that I assume this will be tested on a clean f11 install, rather than an upgrade of an existing ovirt server