Merge pull request #16391 from chrisarcand/bz-1509172

Fix Zone creation
ManageIQ · Nov 3, 2017 · f8fbc91 · f8fbc91
2 parents 07a7684 + 4c610b2
commit f8fbc91
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/lib/vmdb/settings/database_source.rb b/lib/vmdb/settings/database_source.rb
@@ -36,7 +36,9 @@ def self.parent_sources_for(resource)
       end
 
       def resource
-        @resource_instance == :my_server ? my_server : @resource_instance.reload
+        return my_server if @resource_instance == :my_server
+        @resource_instance.reload if @resource_instance.persisted?
+        @resource_instance
       end
 
       def load

diff --git a/spec/lib/vmdb/settings_spec.rb b/spec/lib/vmdb/settings_spec.rb
@@ -355,7 +355,7 @@
       expect(settings.api.token_ttl).to eq "3.hour"
     end
 
-    it "applied settings from hierarchy Region -> Zone -> Server" do
+    it "applies settings from up the hierarchy: Region -> Zone -> Server" do
       MiqRegion.seed
 
       described_class.save!(server.zone.miq_region, :api => {:token_ttl => "3.hour"})
@@ -369,6 +369,9 @@
       described_class.save!(server, :api => {:token_ttl => "5.hour"})
       settings = Vmdb::Settings.for_resource(server)
       expect(settings.api.token_ttl).to eq "5.hour"
+
+      settings = Vmdb::Settings.for_resource(MiqServer.new(:zone => server.zone))
+      expect(settings.api.token_ttl).to eq "4.hour"
     end
   end