search for: networks_usages

...s(+), 4 deletions(-) diff --git a/src/app/models/network.rb b/src/app/models/network.rb index a4b1b8b..89f9876 100644 --- a/src/app/models/network.rb +++ b/src/app/models/network.rb @@ -22,6 +22,8 @@ class Network < ActiveRecord::Base has_and_belongs_to_many :usages, :join_table => 'networks_usages' + has_many :nics + validates_presence_of :type, :message => 'A type must be specified.' validates_presence_of :name, diff --git a/src/app/models/physical_network.rb b/src/app/models/physical_network.rb index 52a748a..f50eeff 100644 --- a/src/app/models/physical_network...

...ls/network.rb @@ -18,7 +18,7 @@ class Network < ActiveRecord::Base belongs_to :boot_type - has_many :ip_addresses, :dependent => :destroy + has_many :ip_addresses, :dependent => :destroy # FIXME should really be a has_one has_and_belongs_to_many :usages, :join_table => 'networks_usages' diff --git a/src/app/models/nic.rb b/src/app/models/nic.rb index 51425bc..22304e9 100644 --- a/src/app/models/nic.rb +++ b/src/app/models/nic.rb @@ -23,7 +23,7 @@ class Nic < ActiveRecord::Base belongs_to :network - has_many :ip_addresses, :dependent => :destroy + has_many :ip...

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

...iv> } end diff --git a/src/app/models/network.rb b/src/app/models/network.rb index 0e2aa8c..a4b1b8b 100644 --- a/src/app/models/network.rb +++ b/src/app/models/network.rb @@ -22,8 +22,6 @@ class Network < ActiveRecord::Base has_and_belongs_to_many :usages, :join_table => 'networks_usages' - has_many :vms - validates_presence_of :type, :message => 'A type must be specified.' validates_presence_of :name, diff --git a/src/app/models/nic.rb b/src/app/models/nic.rb index e8b7768..f03c525 100644 --- a/src/app/models/nic.rb +++ b/src/app/models/nic.rb @@ -19,7...