Making barbican endpoint selection values to be configurable attributes.

Added configurable attributes in barbican functional config with current
values as default values. So it should not impact gate builds.

Change-Id: I4908e0da700154322183f82431c0a1a0f272cf52
Closes-bug: #1501462

etc/barbican/barbican-functional.conf

@@ -41,6 +41,14 @@ auditor_b_password=barbican
 
 [keymanager]
 
+# For selecting service endpoint from service catalog,
+# following attributes are used to find it.
+
+#service_type=key-manager
+#service_name=barbican
+#region_name=RegionOne
+#endpoint_type=public
+
 # use this to run the functional tests against a
 # different barbican server than the one that is
 # specified in the service catalog.  To use what is

functionaltests/common/client.py

@@ -192,10 +192,10 @@ class BarbicanClient(object):
 
         auth = self._auth[self._default_user_name]
         endpoint = auth.service_catalog.get_endpoints(
-            service_type='key-manager',
-            service_name='barbican',
-            region_name='RegionOne',
-            endpoint_type='public')
+            service_type=CONF.keymanager.service_type,
+            service_name=CONF.keymanager.service_name,
+            region_name=CONF.keymanager.region_name,
+            endpoint_type=CONF.keymanager.endpoint_type)
 
         if auth.version.lower() == 'v2':
             base_url = endpoint['key-manager'][0].get('publicURL')

functionaltests/common/config.py

@@ -65,6 +65,10 @@ def setup_config(config_file=''):
 
     keymanager_group = cfg.OptGroup(name='keymanager')
     keymanager_options = [
+        cfg.StrOpt('service_type', default='key-manager'),
+        cfg.StrOpt('service_name', default='barbican'),
+        cfg.StrOpt('region_name', default='RegionOne'),
+        cfg.StrOpt('endpoint_type', default='public'),
         cfg.StrOpt('override_url', default=''),
         cfg.StrOpt('override_url_version', default='')
     ]