14f63647e9
Problem: When we run nova client unit test, there are lots of UserWarnings printed on the screen. These warnings mean to remind users not to use v2.client directly. Solution: 1. In top level tests such as some tests in test_auth_plugins.py test_client.py and fixture_data/client.py, we use updated usage novaclient.client instead of using novaclient.v2.client directly. 2. In v2 unit tests, we clean those warnings with setting direct_use False. Change-Id: I70682e54874860f1d67d29325811c9da616bb705 Closes-Bug: #1532711
72 lines
2.4 KiB
Python
72 lines
2.4 KiB
Python
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import fixtures
|
|
from keystoneauth1 import fixture
|
|
from keystoneauth1 import loading
|
|
from keystoneauth1 import session
|
|
|
|
from novaclient import client
|
|
|
|
IDENTITY_URL = 'http://identityserver:5000/v2.0'
|
|
COMPUTE_URL = 'http://compute.host'
|
|
|
|
|
|
class V1(fixtures.Fixture):
|
|
|
|
def __init__(self, requests,
|
|
compute_url=COMPUTE_URL, identity_url=IDENTITY_URL):
|
|
super(V1, self).__init__()
|
|
self.identity_url = identity_url
|
|
self.compute_url = compute_url
|
|
self.client = None
|
|
self.requests = requests
|
|
|
|
self.token = fixture.V2Token()
|
|
self.token.set_scope()
|
|
self.discovery = fixture.V2Discovery(href=self.identity_url)
|
|
|
|
s = self.token.add_service('compute')
|
|
s.add_endpoint(self.compute_url)
|
|
|
|
s = self.token.add_service('computev3')
|
|
s.add_endpoint(self.compute_url)
|
|
|
|
def setUp(self):
|
|
super(V1, self).setUp()
|
|
|
|
auth_url = '%s/tokens' % self.identity_url
|
|
headers = {'X-Content-Type': 'application/json'}
|
|
self.requests.register_uri('POST', auth_url,
|
|
json=self.token,
|
|
headers=headers)
|
|
self.requests.register_uri('GET', self.identity_url,
|
|
json=self.discovery,
|
|
headers=headers)
|
|
self.client = self.new_client()
|
|
|
|
def new_client(self):
|
|
return client.Client("2", username='xx',
|
|
api_key='xx',
|
|
project_id='xx',
|
|
auth_url=self.identity_url)
|
|
|
|
|
|
class SessionV1(V1):
|
|
|
|
def new_client(self):
|
|
self.session = session.Session()
|
|
loader = loading.get_plugin_loader('password')
|
|
self.session.auth = loader.load_from_options(
|
|
auth_url=self.identity_url, username='xx', password='xx')
|
|
return client.Client("2", session=self.session)
|