Update the EMS validation for hostname so that uniqueness is not scop…

…ed to the tenant. https://bugzilla.redhat.com/show_bug.cgi?id=1276405
ManageIQ · Nov 18, 2015 · 83e2f17 · 83e2f17
1 parent 8069e78
commit 83e2f17
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/models/ext_management_system.rb b/app/models/ext_management_system.rb
@@ -55,7 +55,7 @@ def self.supported_types_and_descriptions_hash
   validates :name,     :presence => true, :uniqueness => {:scope => [:tenant_id]}
   validates :hostname,
             :presence   => true,
-            :uniqueness => {:scope => [:tenant_id], :case_sensitive => false},
+            :uniqueness => {:case_sensitive => false},
             :if         => :hostname_required?
 
   # TODO: Remove all callers of address

diff --git a/spec/models/ext_management_system_spec.rb b/spec/models/ext_management_system_spec.rb
@@ -193,10 +193,10 @@
         end.to_not raise_error
       end
 
-      it "allowing duplicate hostname" do
+      it "not allowing duplicate hostname" do
         expect do
           FactoryGirl.create(:ems_vmware, :hostname => @ems.hostname, :tenant => @tenant2)
-        end.to_not raise_error
+        end.to raise_error(ActiveRecord::RecordInvalid)
       end
     end
   end