CLI: remove auth_token, unused vars and add tests
Remove unused variables related to token and synergy_url. Also add some unit tests for the shell. Change-Id: I101a77e478b95534ac04e1ae73d26fef98898a5c Sem-Ver: bugfix
This commit is contained in:
Vincent Llorens
parent
adf0f27de6
commit
f31e39b9ea
@ -82,18 +82,6 @@ def main():
|
||||
default=os.environ.get("OS_PROJECT_DOMAIN_NAME"),
|
||||
help="defaults to env[OS_PROJECT_DOMAIN_NAME]")
|
||||
|
||||
parser.add_argument("--os-auth-token",
|
||||
metavar="<auth-token>",
|
||||
default=os.environ.get("OS_AUTH_TOKEN", None),
|
||||
help="defaults to env[OS_AUTH_TOKEN]")
|
||||
|
||||
parser.add_argument('--os-auth-token-cache',
|
||||
default=os.environ.get("OS_AUTH_TOKEN_CACHE",
|
||||
False),
|
||||
action='store_true',
|
||||
help="Use the auth token cache. Defaults to False "
|
||||
"if env[OS_AUTH_TOKEN_CACHE] is not set")
|
||||
|
||||
parser.add_argument("--os-auth-url",
|
||||
metavar="<auth-url>",
|
||||
default=os.environ.get("OS_AUTH_URL"),
|
||||
@ -132,13 +120,10 @@ def main():
|
||||
os_project_name = args.os_project_name
|
||||
os_project_domain_id = args.os_project_domain_id
|
||||
os_project_domain_name = args.os_project_domain_name
|
||||
os_auth_token = args.os_auth_token
|
||||
os_auth_token_cache = args.os_auth_token_cache
|
||||
os_auth_url = args.os_auth_url
|
||||
os_cacert = args.os_cacert
|
||||
bypass_url = args.bypass_url
|
||||
command_name = args.command_name
|
||||
synergy_url = None
|
||||
|
||||
if bypass_url:
|
||||
synergy_url = bypass_url
|
||||
@ -172,23 +157,14 @@ def main():
|
||||
project_domain_id=os_project_domain_id,
|
||||
project_domain_name=os_project_domain_name)
|
||||
|
||||
token = None
|
||||
|
||||
if os_auth_token:
|
||||
token = os_auth_token
|
||||
elif os_auth_token_cache:
|
||||
token = keystone_v3.Token.load(".auth_token")
|
||||
|
||||
if token is None or token.isExpired():
|
||||
client.authenticate()
|
||||
token = client.getToken()
|
||||
token.save(".auth_token")
|
||||
else:
|
||||
client.authenticate()
|
||||
token = client.getToken()
|
||||
client.authenticate()
|
||||
|
||||
synergy_service = client.getService(name="synergy")
|
||||
|
||||
if not synergy_service:
|
||||
print("Synergy service not found into the Keystone catalog!")
|
||||
sys.exit(1)
|
||||
|
||||
synergy_endpoint = client.getEndpoint(
|
||||
service_id=synergy_service["id"])
|
||||
|
||||
|
||||
187
synergy/tests/unit/test_client_shell.py
Normal file
187
synergy/tests/unit/test_client_shell.py
Normal file
@ -0,0 +1,187 @@
|
||||
# coding: utf-8
|
||||
#
|
||||
# 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.
|
||||
"""
|
||||
Test the shell.
|
||||
|
||||
"""
|
||||
|
||||
import mock
|
||||
|
||||
from argparse import Namespace
|
||||
from synergy.client import keystone_v3
|
||||
from synergy.client.shell import main
|
||||
from synergy.tests import base
|
||||
|
||||
|
||||
class TestHTTPCommand(base.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
super(TestHTTPCommand, self).setUp()
|
||||
|
||||
@mock.patch('synergy.client.command.ManagerCommand.execute')
|
||||
@mock.patch('sys.argv')
|
||||
def test_create_keystone_client(self, mock_argv, _mock_httpcmd):
|
||||
"""Check success when all parameters are filled."""
|
||||
args = [
|
||||
'--os-username', 'username',
|
||||
'--os-password', 'password',
|
||||
'--os-user-domain-id', 'user_domain_id',
|
||||
'--os-user-domain-name', 'user_domain_name',
|
||||
'--os-project-name', 'project_name',
|
||||
'--os-project-domain-id', 'project_domain_id',
|
||||
'--os-project-domain-name', 'project_domain_name',
|
||||
'--os-auth-url', 'auth_url',
|
||||
'--os-cacert', 'cacert',
|
||||
'manager', 'list']
|
||||
mock_argv.__getitem__.return_value = args
|
||||
|
||||
with mock.patch.object(keystone_v3, 'KeystoneClient') as m:
|
||||
main()
|
||||
m.assert_called_once_with(
|
||||
auth_url='auth_url',
|
||||
username='username',
|
||||
password='password',
|
||||
ca_cert='cacert',
|
||||
user_domain_id='user_domain_id',
|
||||
user_domain_name='user_domain_name',
|
||||
project_name='project_name',
|
||||
project_domain_id='project_domain_id',
|
||||
project_domain_name='project_domain_name')
|
||||
|
||||
@mock.patch('synergy.client.command.ManagerCommand.execute')
|
||||
@mock.patch('sys.argv')
|
||||
def test_no_username(self, mock_argv, _mock_httpcmd):
|
||||
"""CLI should exit if no username is specified."""
|
||||
args = [
|
||||
'--os-password', 'password',
|
||||
'--os-user-domain-id', 'user_domain_id',
|
||||
'--os-user-domain-name', 'user_domain_name',
|
||||
'--os-project-name', 'project_name',
|
||||
'--os-project-domain-id', 'project_domain_id',
|
||||
'--os-project-domain-name', 'project_domain_name',
|
||||
'--os-auth-url', 'auth_url',
|
||||
'--os-cacert', 'cacert',
|
||||
'manager', 'list']
|
||||
mock_argv.__getitem__.return_value = args
|
||||
|
||||
with mock.patch('sys.exit') as m:
|
||||
main()
|
||||
m.assert_called_once_with(1)
|
||||
|
||||
@mock.patch('synergy.client.command.ManagerCommand.execute')
|
||||
@mock.patch('sys.argv')
|
||||
def test_no_password(self, mock_argv, _mock_httpcmd):
|
||||
"""CLI should exit if no password is specified."""
|
||||
args = [
|
||||
'--os-username', 'username',
|
||||
'--os-user-domain-id', 'user_domain_id',
|
||||
'--os-user-domain-name', 'user_domain_name',
|
||||
'--os-project-name', 'project_name',
|
||||
'--os-project-domain-id', 'project_domain_id',
|
||||
'--os-project-domain-name', 'project_domain_name',
|
||||
'--os-auth-url', 'auth_url',
|
||||
'--os-cacert', 'cacert',
|
||||
'manager', 'list']
|
||||
mock_argv.__getitem__.return_value = args
|
||||
|
||||
with mock.patch('sys.exit') as m:
|
||||
main()
|
||||
m.assert_called_once_with(1)
|
||||
|
||||
@mock.patch('synergy.client.command.ManagerCommand.execute')
|
||||
@mock.patch('sys.argv')
|
||||
def test_no_project_name(self, mock_argv, _mock_httpcmd):
|
||||
"""CLI should exit if no project name is specified."""
|
||||
args = [
|
||||
'--os-username', 'username',
|
||||
'--os-password', 'password',
|
||||
'--os-user-domain-id', 'user_domain_id',
|
||||
'--os-user-domain-name', 'user_domain_name',
|
||||
'--os-project-domain-id', 'project_domain_id',
|
||||
'--os-project-domain-name', 'project_domain_name',
|
||||
'--os-auth-url', 'auth_url',
|
||||
'--os-cacert', 'cacert',
|
||||
'manager', 'list']
|
||||
mock_argv.__getitem__.return_value = args
|
||||
|
||||
with mock.patch('sys.exit') as m:
|
||||
main()
|
||||
m.assert_called_once_with(1)
|
||||
|
||||
@mock.patch('synergy.client.command.ManagerCommand.execute')
|
||||
@mock.patch('sys.argv')
|
||||
def test_no_auth_url(self, mock_argv, _mock_httpcmd):
|
||||
"""CLI should exit if no auth URL is specified."""
|
||||
args = [
|
||||
'--os-username', 'username',
|
||||
'--os-password', 'password',
|
||||
'--os-user-domain-id', 'user_domain_id',
|
||||
'--os-user-domain-name', 'user_domain_name',
|
||||
'--os-project-name', 'project_name',
|
||||
'--os-project-domain-id', 'project_domain_id',
|
||||
'--os-project-domain-name', 'project_domain_name',
|
||||
'--os-cacert', 'cacert',
|
||||
'manager', 'list']
|
||||
mock_argv.__getitem__.return_value = args
|
||||
|
||||
with mock.patch('sys.exit') as m:
|
||||
main()
|
||||
m.assert_called_once_with(1)
|
||||
|
||||
@mock.patch('synergy.client.command.ManagerCommand.execute')
|
||||
@mock.patch('sys.argv')
|
||||
def test_minimum_parameters(self, mock_argv, _mock_httpcmd):
|
||||
"""CLI should not exit when the required parameters are filled."""
|
||||
args = [
|
||||
'--os-username', 'username',
|
||||
'--os-password', 'password',
|
||||
'--os-project-name', 'project_name',
|
||||
'--os-auth-url', 'auth_url',
|
||||
'manager', 'list']
|
||||
mock_argv.__getitem__.return_value = args
|
||||
|
||||
# Bypass HTTP call
|
||||
with mock.patch.object(keystone_v3, 'KeystoneClient'):
|
||||
with mock.patch('sys.exit') as sys_exit:
|
||||
main()
|
||||
sys_exit.assert_not_called()
|
||||
|
||||
@mock.patch('synergy.client.command.ManagerCommand.execute')
|
||||
@mock.patch('sys.argv')
|
||||
def test_bypass_url(self, mock_argv, mock_httpcmd):
|
||||
"""Filling bypass-url should set other params as defaults."""
|
||||
args = [
|
||||
'--bypass-url', 'bypass_url',
|
||||
'manager', 'list']
|
||||
mock_argv.__getitem__.return_value = args
|
||||
|
||||
with mock.patch.object(keystone_v3, 'KeystoneClient'):
|
||||
main()
|
||||
|
||||
ns = Namespace(
|
||||
bypass_url='bypass_url',
|
||||
command='list',
|
||||
command_name='manager',
|
||||
debug=False,
|
||||
os_auth_url=None,
|
||||
os_cacert=None,
|
||||
os_password=None,
|
||||
os_project_domain_id=None,
|
||||
os_project_domain_name=None,
|
||||
os_project_id=None,
|
||||
os_project_name=None,
|
||||
os_user_domain_id=None,
|
||||
os_user_domain_name=None,
|
||||
os_username=None)
|
||||
mock_httpcmd.assert_called_once_with("bypass_url", ns)
|
||||
Loading…
x
Reference in New Issue
Block a user