From e5a6bb6b99221e6fa0640ddf6e03ee7a53fbfa58 Mon Sep 17 00:00:00 2001 From: Angel Luis Moya Gonzalez Date: Mon, 2 Sep 2019 18:18:50 +0200 Subject: [PATCH] F #3440: Fix monitoring loop (#3636) Fix a monitoring loop that occurs when NSX Manager is not reachable. An SSH exception is created an created a personalized message that break the format of the attribute NSX_STATUS. That message has been changed to a static message. Also fix a typo when launching an Standard Error. --- src/vmm_mad/remotes/lib/nsx_driver/nsx_client.rb | 2 +- src/vmm_mad/remotes/lib/vcenter_driver/host.rb | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/vmm_mad/remotes/lib/nsx_driver/nsx_client.rb b/src/vmm_mad/remotes/lib/nsx_driver/nsx_client.rb index cf9e01f821..daf0898523 100644 --- a/src/vmm_mad/remotes/lib/nsx_driver/nsx_client.rb +++ b/src/vmm_mad/remotes/lib/nsx_driver/nsx_client.rb @@ -102,7 +102,7 @@ module NSXDriver do |https| https.request(request) end - rescue StandtardError => e + rescue StandardError => e raise e end return Nokogiri::XML response.body if check_response(response, 200) diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/host.rb b/src/vmm_mad/remotes/lib/vcenter_driver/host.rb index 68db314377..5408389359 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/host.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/host.rb @@ -104,7 +104,7 @@ class ClusterComputeResource extensionList = @vi_client.vim.serviceContent.extensionManager.extensionList extensionList.each do |extList| if extList.key == "com.vmware.vShieldManager" - nsx_obj['type'] = "NSX-V" + nsx_obj['type'] = "NSX-V" urlFull = extList.client[0].url urlSplit = urlFull.split("/") # protocol = "https://" @@ -113,8 +113,8 @@ class ClusterComputeResource ipPort = urlSplit[2] nsx_obj['url'] = protocol + ipPort elsif extList.key == "com.vmware.nsx.management.nsxt" - nsx_obj['type'] = "NSX-T" - nsx_obj['url'] = extList.server[0].url + nsx_obj['type'] = "NSX-T" + nsx_obj['url'] = extList.server[0].url else next end @@ -175,7 +175,7 @@ class ClusterComputeResource end rescue StandardError => e @nsx_status = "NSX_STATUS = \"Error connecting to " \ - "NSX_MANAGER\": #{e.message}\n" + "NSX_MANAGER\"\n" return false end end @@ -184,7 +184,7 @@ class ClusterComputeResource # URL to test a connection url = "#{@one_item["TEMPLATE/NSX_MANAGER"]}/api/v1/transport-zones" begin - if nsx_client.get_json(url) + if nsx_client.get_json(url) return true else @nsx_status = "NSX_STATUS = \"Response code incorrect\"\n" @@ -192,7 +192,7 @@ class ClusterComputeResource end rescue StandardError => e @nsx_status = "NSX_STATUS = \"Error connecting to "\ - "NSX_MANAGER\": #{e.message}\n" + "NSX_MANAGER\"\n" return false end end @@ -221,7 +221,7 @@ class ClusterComputeResource elsif @one_item["TEMPLATE/NSX_TYPE"] == "NSX-T" r = tz_object.tzs_nsxt r["results"].each do |tz| - tz_info << tz["display_name"] << "=\"" + tz_info << tz["display_name"] << "=\"" tz_info << tz["id"] << "\"," end tz_info.chomp!(',') @@ -293,7 +293,7 @@ class ClusterComputeResource # HA enabled str_info << "VCENTER_HA=" << ha_enabled.to_s << "\n" - + # NSX info str_info << get_nsx str_info << get_tz