Fixes #10479 - prevent validation error on host creation when domain …

…contains capital letters

app/models/nic/base.rb

@@ -110,7 +110,7 @@ def name=(*args)
     end
 
     def shortname
-      domain.nil? ? name : name.to_s.chomp("." + domain.name)
+      domain.nil? ? name : name.sub(/\.#{Regexp.escape domain.name}/i, '')
     end
 
     def validated?

app/models/nic/interface.rb

@@ -91,7 +91,7 @@ def normalize_name
       # A managed host we should know the domain for; and the shortname shouldn't include a period
       # This only applies for unattended=true, as otherwise the name field includes the domain
       errors.add(:name, _("must not include periods")) if ( host && host.managed? && managed? && shortname.include?(".") && SETTINGS[:unattended] )
-      self.name = Net::Validations.normalize_hostname(name) if self.name.present?
+      self.name = Net::Validations.normalize_hostname(name)
     end
   end
 end

test/unit/nics/managed_test.rb

@@ -43,6 +43,14 @@ class ManagedTest < ActiveSupport::TestCase
     assert_nil nic.domain
   end
 
+  test "#normalize_hostname accepts domain even if it contains capital letters" do
+    domain = FactoryGirl.create(:domain, :name => "CAPITAL.com")
+    nic = setup_primary_nic_with_name(" Host.#{domain.name}", :domain => nil)
+    nic.send(:normalize_name)
+    assert_equal "host.#{domain.name.downcase}", nic.name
+    assert_equal domain, nic.domain
+  end
+
   test "#normalize_hostname keeps domain nil if it can't find such domain based on name" do
     nic = setup_primary_nic_with_name(" Host", :domain => nil)
     nic.send(:normalize_name)