From 49c319a894865b2fb01b3b2970c2897a53de005c Mon Sep 17 00:00:00 2001 From: Anna Khmelnitsky Date: Wed, 20 Sep 2017 16:03:07 -0700 Subject: [PATCH] Nsx policy: change nsx manager initialization Use alternative API to init nsx manager client. This will allow nsx manager connection to use client certificate authentication. Change-Id: I030a03be23b10b9a5288741a0a8fa07592279d65 --- .../drivers/vmware/nsx_policy/nsx_policy_mapping.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gbpservice/neutron/services/grouppolicy/drivers/vmware/nsx_policy/nsx_policy_mapping.py b/gbpservice/neutron/services/grouppolicy/drivers/vmware/nsx_policy/nsx_policy_mapping.py index ce4fa5c4c..eb6fa1567 100644 --- a/gbpservice/neutron/services/grouppolicy/drivers/vmware/nsx_policy/nsx_policy_mapping.py +++ b/gbpservice/neutron/services/grouppolicy/drivers/vmware/nsx_policy/nsx_policy_mapping.py @@ -14,6 +14,7 @@ from oslo_config import cfg from oslo_log import log as logging from vmware_nsx.db import db as nsx_db +from vmware_nsx.plugins.nsx_v3 import utils as nsx_utils from vmware_nsxlib import v3 from vmware_nsxlib.v3 import config @@ -127,12 +128,9 @@ class NsxPolicyMappingDriver(api.ResourceMappingDriver): def get_nsxmanager_client(self): """Prepare agent for NSX Manager API calls""" - nsxlib_config = config.NsxLibConfig( - nsx_api_managers=cfg.CONF.nsx_v3.nsx_api_managers, - username=cfg.CONF.nsx_v3.nsx_api_user, - password=cfg.CONF.nsx_v3.nsx_api_password) + nsxlib = nsx_utils.get_nsxlib_wrapper() - return v3.NsxLib(nsxlib_config).client + return nsxlib.client def initialize(self): super(NsxPolicyMappingDriver, self).initialize()