Merge "Use identity v3 api"
This commit is contained in:
commit
4560a0495d
|
@ -109,7 +109,7 @@ class AristaRPCWrapperBase(object):
|
|||
{'protocol': self.keystone_conf.auth_protocol,
|
||||
'host': self.keystone_conf.auth_host,
|
||||
'port': self.keystone_conf.auth_port})
|
||||
return '%s/v2.0/' % auth_uri
|
||||
return '%s/v3/' % auth_uri
|
||||
|
||||
def _api_username(self):
|
||||
return cfg.CONF.ml2_arista.eapi_username
|
||||
|
|
|
@ -282,7 +282,7 @@ class TestAristaJSONRPCWrapper(testlib_api.SqlTestCase):
|
|||
self.drv.register_with_eos()
|
||||
post_data = {'name': 'keystone', 'password': 'fun',
|
||||
'tenant': 'tenant_name', 'user': 'neutron',
|
||||
'authUrl': 'abc://host:5000/v2.0/'}
|
||||
'authUrl': 'abc://host:5000/v3/'}
|
||||
clean_data = post_data.copy()
|
||||
clean_data['password'] = "*****"
|
||||
calls = [
|
||||
|
@ -1277,7 +1277,7 @@ class PositiveRPCWrapperValidConfigTestCase(testlib_api.SqlTestCase):
|
|||
def test_register_with_eos(self, mock_send_eapi_req):
|
||||
self.drv.register_with_eos()
|
||||
auth = utils.fake_keystone_info_class()
|
||||
keystone_url = '%s://%s:%s/v2.0/' % (auth.auth_protocol,
|
||||
keystone_url = '%s://%s:%s/v3/' % (auth.auth_protocol,
|
||||
auth.auth_host,
|
||||
auth.auth_port)
|
||||
auth_cmd = ('auth url %s user %s password %s tenant %s' % (
|
||||
|
|
|
@ -1416,7 +1416,7 @@ class fake_keystone_info_class(object):
|
|||
Arista Driver expects Keystone auth info. This fake information
|
||||
is for testing only
|
||||
"""
|
||||
auth_uri = 'abc://host:35357/v2.0/'
|
||||
auth_uri = 'abc://host:35357/v3/'
|
||||
identity_uri = 'abc://host:5000'
|
||||
admin_user = 'neutron'
|
||||
admin_password = 'fun'
|
||||
|
|
Loading…
Reference in New Issue