From 35569a24604dbe80ecbc9f2b9166cb40c660cadc Mon Sep 17 00:00:00 2001 From: Angel Luis Moya Gonzalez Date: Tue, 5 Nov 2019 18:00:51 +0100 Subject: [PATCH] F #3440: Fix errors on NSX auth (#3913) --- src/sunstone/routes/nsx.rb | 4 ++-- src/vmm_mad/remotes/lib/nsx_driver/nsx_constants.rb | 2 +- src/vmm_mad/remotes/lib/nsx_driver/nsxt_client.rb | 8 ++++---- src/vmm_mad/remotes/lib/nsx_driver/nsxv_client.rb | 7 ++++++- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/sunstone/routes/nsx.rb b/src/sunstone/routes/nsx.rb index 3730023da0..c0362f8b5b 100644 --- a/src/sunstone/routes/nsx.rb +++ b/src/sunstone/routes/nsx.rb @@ -56,10 +56,10 @@ post '/nsx/auth' do nsxpassword, nsx_type) if nsx_type == 'NSX-T' - url = nsxmgr + NSXDriver::NSXConstants::NSXT_AUTH + url = NSXDriver::NSXConstants::NSXT_AUTH response = nsx_client.get_token(url) elsif nsx_type == 'NSX-V' - url = nsxmgr + NSXDriver::NSXConstants::NSXV_AUTH + url = NSXDriver::NSXConstants::NSXV_AUTH response = nsx_client.get_token(url) else return [400, diff --git a/src/vmm_mad/remotes/lib/nsx_driver/nsx_constants.rb b/src/vmm_mad/remotes/lib/nsx_driver/nsx_constants.rb index 0eaaf1f207..0ad864151b 100644 --- a/src/vmm_mad/remotes/lib/nsx_driver/nsx_constants.rb +++ b/src/vmm_mad/remotes/lib/nsx_driver/nsx_constants.rb @@ -57,7 +57,7 @@ module NSXDriver NSXV_TZ_XPATH = '//virtualWire/vdnScopeId' # OpaqueNetwork NSXT_BASE = '/api/v1' - NSXT_AUTH = '/aaa/registration-token' + NSXT_AUTH = NSXT_BASE + '/aaa/registration-token' NSXT_LS_SECTION = NSXT_BASE + '/logical-switches/' # Messages MSG_INCOMPLETE_REQ = 'Incomplete request, NSX_MANAGER, NSX_USER, \ diff --git a/src/vmm_mad/remotes/lib/nsx_driver/nsxt_client.rb b/src/vmm_mad/remotes/lib/nsx_driver/nsxt_client.rb index 2b3160e6dc..ff57f14e13 100644 --- a/src/vmm_mad/remotes/lib/nsx_driver/nsxt_client.rb +++ b/src/vmm_mad/remotes/lib/nsx_driver/nsxt_client.rb @@ -119,10 +119,10 @@ module NSXDriver :verify_mode => OpenSSL::SSL::VERIFY_NONE) do |https| https.request(request) end - response_xml = Nokogiri::XML response.body \ - if check_response(response, 200) - token = response_xml.xpath('//authToken/value').text - { 'token' => token }.to_json + + return unless check_response(response, 200) + + response.body end end diff --git a/src/vmm_mad/remotes/lib/nsx_driver/nsxv_client.rb b/src/vmm_mad/remotes/lib/nsx_driver/nsxv_client.rb index 58aa05716e..a5172cb750 100644 --- a/src/vmm_mad/remotes/lib/nsx_driver/nsxv_client.rb +++ b/src/vmm_mad/remotes/lib/nsx_driver/nsxv_client.rb @@ -117,7 +117,12 @@ module NSXDriver :verify_mode => OpenSSL::SSL::VERIFY_NONE) do |https| https.request(request) end - response.body if check_response(response, 200) + + return unless check_response(response, 200) + + response_xml = Nokogiri::XML response.body + token = response_xml.xpath('//authToken/value').text + { 'token' => token }.to_json end end