Commit a4e7f52a8b0673d52642fac9e0d2698409cef76f - python-castellan

Use Keystone V3 Identity Plugins for Functional Tests Changes the way keystone authentication is being accessed in Functional Tests. Change-Id: I32c938f1a353d1704b5bc30fd40c7eb5f2ae708d “Fernando authored 8 years ago Fernando Diaz committed 8 years ago

2 changed file(s) with 24 addition(s) and 9 deletion(s). Raw diff Collapse all Expand all

-2

castellan/tests/functional/config.py less more

20	20
21	21	identity_group = cfg.OptGroup(name='identity')
22	22	identity_options = [
23		cfg.StrOpt('uri',
	23	cfg.StrOpt('auth_url',
24	24	default='http://localhost:5000/v3',
25	25	help='Keystone endpoint'),
26	26	cfg.StrOpt('username',

31	31	help='Password used with Keystone username'),
32	32	cfg.StrOpt('project_name',
33	33	default='admin',
34		help='Name of project, used by the given username')]
	34	help='Name of project, used by the given username'),
	35	cfg.StrOpt('user_domain_name',
	36	default='Default',
	37	help='Name of domain, used by the given username'),
	38	cfg.StrOpt('project_domain_name',
	39	default='Default',
	40	help='Name of domain, used by the given project')]
35	41
36	42
37	43	def setup_config(config_file=''):

+16

-7

castellan/tests/functional/key_manager/test_barbican_key_manager.py less more

20	20
21	21	import uuid
22	22
	23	from keystoneclient.auth.identity import v3
	24	from keystoneclient import session
23	25	from keystoneclient.v3 import client
24	26	from oslo_config import cfg
25	27	from oslo_context import context

45	47	username = CONF.identity.username
46	48	password = CONF.identity.password
47	49	project_name = CONF.identity.project_name
48		auth_url = CONF.identity.uri
49		keystone_client = client.Client(username=username,
50		password=password,
51		project_name=project_name,
52		auth_url=auth_url,
53		project_domain_id='default')
	50	auth_url = CONF.identity.auth_url
	51	user_domain_name = CONF.identity.user_domain_name
	52	project_domain_name = CONF.identity.project_domain_name
	53
	54	auth = v3.Password(auth_url=auth_url,
	55	username=username,
	56	password=password,
	57	project_name=project_name,
	58	user_domain_name=user_domain_name,
	59	project_domain_name=project_domain_name)
	60	sess = session.Session(auth=auth)
	61	keystone_client = client.Client(session=sess)
	62
54	63	project_list = keystone_client.projects.list(name=project_name)
55	64
56	65	self.ctxt = context.RequestContext(
57		auth_token=keystone_client.auth_token,
	66	auth_token=auth.auth_ref.auth_token,
58	67	tenant=project_list[0].id)
59	68
60	69	def tearDown(self):