Switch to keystoneauth

keystoneclient.auth was deprecated in favour of keystoneauth1, this
patch updates Cueclient accordingly. requirements.txt was also updated
to reflect this change.

ps: oslo.seralization was added to test-requirements.txt because unit
tests were failing with its absence.

Change-Id: I7e9ce5f46f5ea53fbd8333452ab5d77e42f5b417
This commit is contained in:
Clenimar Filemon 2016-06-20 21:07:44 -03:00
parent c5550fb672
commit bb1f4adca0
5 changed files with 16 additions and 15 deletions

View File

@ -11,7 +11,7 @@
# under the License.
import fixtures
from keystoneclient import session
from keystoneauth1 import session
from six.moves.urllib import parse
from cueclient.v1 import client

View File

@ -13,7 +13,7 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from keystoneclient import adapter
from keystoneauth1 import adapter
from cueclient.v1.clusters import ClusterController
from cueclient import version

View File

@ -16,8 +16,8 @@ the bindings.
#!/usr/bin/env python
from keystoneclient.auth.identity import v3 as keystone_v3_auth
from keystoneclient import session as keystone_session
from keystoneauth1.identity import v3 as keystone_v3_auth
from keystoneauth1 import session as keystone_session
from cueclient.v1 import client
auth = keystone_v3_auth.Password(
@ -66,8 +66,8 @@ Below is a sample of standard authentication with keystone v3:
#!/usr/bin/env python
from keystoneclient.auth.identity import v3 as keystone_v3_auth
from keystoneclient import session as keystone_session
from keystoneauth1.identity import v3 as keystone_v3_auth
from keystoneauth1 import session as keystone_session
auth = keystone_v3_auth.Password(
auth_url="http://example.com:5000/v3",
@ -88,8 +88,8 @@ Cluster List
#!/usr/bin/env python
from keystoneclient.auth.identity import v3 as keystone_v3_auth
from keystoneclient import session as keystone_session
from keystoneauth1.identity import v3 as keystone_v3_auth
from keystoneauth1 import session as keystone_session
from cueclient.v1 import client
auth = keystone_v3_auth.Password(
@ -115,8 +115,8 @@ Cluster Show
#!/usr/bin/env python
from keystoneclient.auth.identity import v3 as keystone_v3_auth
from keystoneclient import session as keystone_session
from keystoneauth1.identity import v3 as keystone_v3_auth
from keystoneauth1 import session as keystone_session
from cueclient.v1 import client
auth = keystone_v3_auth.Password(
@ -144,8 +144,8 @@ Cluster Create
#!/usr/bin/env python
from keystoneclient.auth.identity import v3 as keystone_v3_auth
from keystoneclient import session as keystone_session
from keystoneauth1.auth.identity import v3 as keystone_v3_auth
from keystoneauth1 import session as keystone_session
from cueclient.v1 import client
auth = keystone_v3_auth.Password(
@ -173,8 +173,8 @@ Cluster Delete
#!/usr/bin/env python
from keystoneclient.auth.identity import v3 as keystone_v3_auth
from keystoneclient import session as keystone_session
from keystoneauth1.identity import v3 as keystone_v3_auth
from keystoneauth1 import session as keystone_session
from cueclient.v1 import client
auth = keystone_v3_auth.Password(

View File

@ -2,9 +2,9 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
cliff!=1.16.0,!=1.17.0,>=1.15.0 # Apache-2.0
keystoneauth1>=2.7.0 # Apache-2.0
jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT
pbr>=1.6 # Apache-2.0
python-keystoneclient!=1.8.0,!=2.1.0,>=1.6.0 # Apache-2.0
requests!=2.9.0,>=2.8.1 # Apache-2.0
six>=1.9.0 # MIT
stevedore>=1.5.0 # Apache-2.0

View File

@ -7,6 +7,7 @@ coverage>=3.6 # Apache-2.0
discover # BSD
fixtures>=1.3.1 # Apache-2.0/BSD
mock>=1.2 # BSD
oslo.serialization>=1.10.0 # Apache-2.0
requests-mock>=0.7.0 # Apache-2.0
python-subunit>=0.0.18 # Apache-2.0/BSD
testrepository>=0.0.18 # Apache-2.0/BSD