Merge "Split out nsx_user/pass to nsxv3 section"

vmware_nsx/neutron/plugins/vmware/common/config.py

@@ -158,6 +158,13 @@ cluster_opts = [
 ]
 
 nsx_v3_opts = [
+    cfg.StrOpt('nsx_user',
+               default='admin',
+               help=_('User name for NSX controllers in this cluster')),
+    cfg.StrOpt('nsx_password',
+               default='default',
+               secret=True,
+               help=_('Password for NSX controllers in this cluster')),
     cfg.StrOpt('default_edge_cluster_uuid',
                help=_("Default edge cluster identifier"))]
 

vmware_nsx/neutron/plugins/vmware/nsxlib/v3/__init__.py

@@ -31,8 +31,8 @@ def _get_controller_endpoint():
     # NOTE: The same options defined for 'old' NSX controller connection can be
     # reused for connecting to next-gen NSX controllers
     controller = cfg.CONF.nsx_controllers[0]
-    username = cfg.CONF.nsx_user
-    password = cfg.CONF.nsx_password
+    username = cfg.CONF.nsx_v3.nsx_user
+    password = cfg.CONF.nsx_v3.nsx_password
     return "https://%s" % controller, username, password