Project

General

Profile

« Previous | Next » 

Revision 43c4bd72

Added by Marek Hulán over 9 years ago

Fixes #7456 - Extract primary interface from host

Contributions from:

All host must have at least one primary interface and one provision (can
be the same interface). Primary interface gives host a name so even
unamanaged host have primary interface (we skip validations of other
attributes for unamanged hosts though).

Host still have name attribute which is a cache of primary interface name.
Therefore we can use the host name in SQL queries, as a friendly_id etc.

- realm moved to the primary tab
- fqdn in nics table
- flags in nics table
- checkboxes for provision and primary flags
- modal resize fix
- original fields for primary NIC removed
- skipping validation for new resources
- warnings before switching flags and table update
- host name and primary interface name connected
- host domain name in the page title
- nics on host show page
- clearing modal window on cancel
- fixed domain validation in NIC::Base
- ip suggestion for all interfaces
- flags switchable from the overview table
- use icons instead of text for primary/provision on NICs overview tab
- attempt to fix sending NIC template
- fix fqdn algorithm
- ip addres in the overview table
- fix for class name collision
- better behavior of host name <-> primary name sync
- fix for subnet combobox values
- fix for modal poping up on form submission
- network partial for CRs moved from VM tab to modal
- fix ip suggestion race for ipam=db

View differences:

test/unit/orchestration/dhcp_test.rb
class DhcpOrchestrationTest < ActiveSupport::TestCase
def setup
User.current = users(:one)
disable_orchestration
SETTINGS[:locations_enabled] = false
SETTINGS[:organizations_enabled] = false
......
def teardown
SETTINGS[:locations_enabled] = true
SETTINGS[:organizations_enabled] = true
User.current = nil
end
test 'host_should_have_dhcp' do
......
end
end
def test_bmc_should_have_valid_dhcp_record
test 'bmc_should_have_valid_dhcp_record' do
if unattended?
h = FactoryGirl.create(:host, :with_dhcp_orchestration)
b = nics(:bmc)
b = FactoryGirl.build(:nic_bmc, :ip => '10.0.0.10', :name => 'bmc')
b.host = h
b.domain = domains(:mydomain)
b.subnet = subnets(:five)
......
end
test "jumpstart parameter generation" do
h = FactoryGirl.create(:host, :managed,
:ip => '2.3.4.10',
:architecture => architectures(:sparc),
:operatingsystem => operatingsystems(:solaris10),
:subnet => subnets(:one),
:domain => domains(:yourdomain),
:compute_resource => compute_resources(:one),
:model => models(:V210),
:medium => media(:solaris10),
:puppet_proxy => smart_proxies(:puppetmaster),
:ptable => ptables(:one)
h = FactoryGirl.create(:host, :managed, :domain => domains(:yourdomain),
:interfaces => [ FactoryGirl.build(:nic_primary_and_provision,
:ip => '2.3.4.10') ],
:architecture => architectures(:sparc),
:operatingsystem => operatingsystems(:solaris10),
:compute_resource => compute_resources(:one),
:model => models(:V210),
:medium => media(:solaris10),
:puppet_proxy => smart_proxies(:puppetmaster),
:ptable => ptables(:one)
)
Resolv::DNS.any_instance.stubs(:getaddress).with("brsla01").returns("2.3.4.5").once
Resolv::DNS.any_instance.stubs(:getaddress).with("brsla01.yourdomain.net").returns("2.3.4.5").once
result = h.os.jumpstart_params h, h.model.vendor_class
assert_equal result, {
:vendor => "<Sun-Fire-V210>",
:install_path => "/vol/solgi_5.10/sol10_hw0910_sparc",
:install_server_ip => "2.3.4.5",
:install_server_name => "brsla01",
:jumpstart_server_path => "2.3.4.5:/vol/jumpstart",
:root_path_name => "/vol/solgi_5.10/sol10_hw0910_sparc/Solaris_10/Tools/Boot",
:root_server_hostname => "brsla01",
:root_server_ip => "2.3.4.5",
:sysid_server_path => "2.3.4.5:/vol/jumpstart/sysidcfg/sysidcfg_primary"
}
assert_equal({
:vendor => "<Sun-Fire-V210>",
:install_path => "/vol/solgi_5.10/sol10_hw0910_sparc",
:install_server_ip => "2.3.4.5",
:install_server_name => "brsla01",
:jumpstart_server_path => "2.3.4.5:/vol/jumpstart",
:root_path_name => "/vol/solgi_5.10/sol10_hw0910_sparc/Solaris_10/Tools/Boot",
:root_server_hostname => "brsla01",
:root_server_ip => "2.3.4.5",
:sysid_server_path => "2.3.4.5:/vol/jumpstart/sysidcfg/sysidcfg_primary"
}, result)
end
test "new host should create a dhcp reservation" do
......
:subnet_id => h.subnet_id, :provider => 'IPMI', :type => 'Nic::BMC', :domain_id => h.domain_id}]
assert h.valid?
bmc = h.interfaces.detect { |i| i.name == 'dummy-bmc' }
bmc = h.interfaces.detect { |i| i.name =~ /^dummy-bmc/ }
host_tasks = h.queue.items.select { |t| t.action.first == h }
primary_interface_tasks = h.queue.items.select { |t| t.action.first == h.primary_interface }
interface_tasks = h.queue.items.select { |t| t.action.first == bmc }
assert_equal 1, host_tasks.select { |t| t.action.last == :set_dhcp }.size
assert_empty host_tasks.select { |t| t.action.last == :del_dhcp }
assert_equal 1, primary_interface_tasks.select { |t| t.action.last == :set_dhcp }.size
assert_empty primary_interface_tasks.select { |t| t.action.last == :del_dhcp }
assert_equal 1, interface_tasks.select { |t| t.action.last == :set_dhcp }.size
assert_empty interface_tasks.select { |t| t.action.last == :del_dhcp }
end
......
h = FactoryGirl.create(:host, :with_dhcp_orchestration)
h.ip = h.ip.succ
assert h.valid?
# 1st creation, 2nd update
assert_equal 2, h.queue.items.select {|x| x.action == [ h, :set_dhcp ] }.size
assert_equal 1, h.queue.items.select {|x| x.action == [ h.old, :del_dhcp ] }.size
# 1st is creation from factory, 2nd is triggered by h.valid?
assert_equal 2, h.queue.items.select {|x| x.action == [ h.primary_interface, :set_dhcp ] }.size
# and also one deletion (of original creation)
assert_equal 1, h.primary_interface.queue.items.select {|x| x.action.last == :del_dhcp }.size
end
test "when an existing host change its bmc ip address, its dhcp record should be updated" do
......
h = FactoryGirl.create(:host, :with_dhcp_orchestration)
h.mac = next_mac(h.mac)
assert h.valid?
assert_equal 2, h.queue.items.select {|x| x.action == [ h, :set_dhcp ] }.size
assert_equal 1, h.queue.items.select {|x| x.action == [ h.old, :del_dhcp ] }.size
assert_equal 2, h.queue.items.select {|x| x.action == [ h.primary_interface, :set_dhcp ] }.size
assert_equal 1, h.primary_interface.queue.items.select {|x| x.action.last == :del_dhcp }.size
end
test "when an existing host change its bmc mac address, its dhcp record should be updated" do
......
bmc.mac = next_mac(bmc.mac)
assert h.valid?
assert bmc.valid?
assert_equal 2, h.queue.items.select {|x| x.action == [ h, :set_dhcp ] }.size
assert_equal 1, h.queue.items.select {|x| x.action == [ h.old, :del_dhcp ] }.size
assert_equal 2, h.queue.items.select {|x| x.action == [ h.primary_interface, :set_dhcp ] }.size
assert_equal 1, h.queue.items.select {|x| x.action.last == :del_dhcp }.size
assert_equal 1, bmc.queue.items.select {|x| x.action == [ bmc, :set_dhcp ] }.size
assert_equal 1, bmc.queue.items.select {|x| x.action == [ bmc.old, :del_dhcp ] }.size
end

Also available in: Unified diff