From a4f8adbb935737122b4800efbb19b9d9b75c7e01 Mon Sep 17 00:00:00 2001 From: Linda Wang Date: Wed, 2 Aug 2017 02:41:15 +0000 Subject: Add domain name when creating projects and users (spisarski) Also clarified the difference between domain ID and name Added helper methods and domain object for Domains JIRA: FUNCTEST-858 Change-Id: Iccd7eef56713a4ad0c23232073f52bc71168bf5c Signed-off-by: Linda Wang --- snaps/openstack/create_user.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'snaps/openstack/create_user.py') diff --git a/snaps/openstack/create_user.py b/snaps/openstack/create_user.py index 18de215..b16cea4 100644 --- a/snaps/openstack/create_user.py +++ b/snaps/openstack/create_user.py @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Cable Television Laboratories, Inc. ("CableLabs") +# Copyright (c) 2017 Cable Television Laboratories, Inc. ("CableLabs") # and others. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -87,7 +87,9 @@ class OpenStackUser: auth_url=self.__os_creds.auth_url, project_name=project_name, identity_api_version=self.__os_creds.identity_api_version, + user_domain_name=self.__os_creds.user_domain_name, user_domain_id=self.__os_creds.user_domain_id, + project_domain_name=self.__os_creds.project_domain_name, project_domain_id=self.__os_creds.project_domain_id, interface=self.__os_creds.interface, proxy_settings=self.__os_creds.proxy_settings, @@ -115,7 +117,7 @@ class UserSettings: self.password = kwargs.get('password') self.project_name = kwargs.get('project_name') self.email = kwargs.get('email') - self.domain_name = kwargs.get('domain_name', 'default') + self.domain_name = kwargs.get('domain_name', 'Default') self.enabled = kwargs.get('enabled', True) self.roles = kwargs.get('roles', dict()) -- cgit 1.2.3-korg