From 766f0f86fa14776145888f3ececdb2749f0f5091 Mon Sep 17 00:00:00 2001 From: "Carlos J. Herrera" Date: Mon, 16 Nov 2020 12:04:14 -0500 Subject: [PATCH] B #5019: fix reference when not called from sunstone (#430) Signed-off-by: Carlos Herrera --- src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb | 9 ++++++++- src/vmm_mad/remotes/lib/vcenter_driver/vi_helper.rb | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb b/src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb index 31e66c9df2..cfc9180415 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb @@ -557,7 +557,14 @@ class DatacenterFolder networks = {} # Selected host in OpenNebula - one_client = OpenNebula::Client.new(nil, $conf[:one_xmlrpc]) + if $conf.nil? + one_client = OpenNebula::Client.new + else + one_client = OpenNebula::Client.new( + nil, + $conf[:one_xmlrpc] + ) + end one_host = OpenNebula::Host.new_with_id(args[:host], one_client) rc = one_host.info diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/vi_helper.rb b/src/vmm_mad/remotes/lib/vcenter_driver/vi_helper.rb index 6ad898c107..de746b1fcf 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/vi_helper.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/vi_helper.rb @@ -23,7 +23,14 @@ class VIHelper VM_PREFIX_DEFAULT = "one-$i-" def self.client - @@client ||= OpenNebula::Client.new(nil, $conf[:one_xmlrpc]) # rubocop:disable Style/ClassVars + if $conf.nil? + @@client ||= OpenNebula::Client.new # rubocop:disable Style/ClassVars + else + @@client ||= OpenNebula::Client.new( + nil, + $conf[:one_xmlrpc] + ) + end end def self.set_client(options, client=nil)