airship/shipyard
Code Issues Proposed changes

Merge "Fix naming for --os-auth related CLI options"

Browse Source
This commit is contained in:
Mark Burnett 2017-11-16 18:00:13 -05:00 committed by Gerrit Code Review
commit 717ea6c9f4
7 changed files with 42 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
shipyard_client/cli/commands.py
View File

@ -45,20 +45,20 @@ from shipyard_client.cli.input_checks import check_control_action, check_id
type=click.Choice(['format', 'raw', 'cli']),
default='cli')
# Supported Environment Variables
@click.option('--os_project_domain_name',
@click.option('--os-project-domain-name',
envvar='OS_PROJECT_DOMAIN_NAME',
required=False,
default='default')
@click.option('--os_user_domain_name',
@click.option('--os-user-domain-name',
envvar='OS_USER_DOMAIN_NAME',
required=False,
default='default')
@click.option('--os_project_name', envvar='OS_PROJECT_NAME', required=False)
@click.option('--os_username', envvar='OS_USERNAME', required=False)
@click.option('--os_password', envvar='OS_PASSWORD', required=False)
@click.option('--os-project-name', envvar='OS_PROJECT_NAME', required=False)
@click.option('--os-username', envvar='OS_USERNAME', required=False)
@click.option('--os-password', envvar='OS_PASSWORD', required=False)
# os_auth_url is required for all command except help, please see shipyard def
@click.option(
'--os_auth_url', envvar='OS_AUTH_URL', required=False)
'--os-auth-url', envvar='OS_AUTH_URL', required=False)
# Allows context (ctx) to be passed
@click.pass_context
def shipyard(ctx, context_marker, debug, os_project_domain_name,

11
shipyard_client/tests/unit/cli/commit/test_commit_commands.py
View File

@ -17,11 +17,12 @@ from mock import patch, ANY
from shipyard_client.cli.commit.actions import CommitConfigdocs
from shipyard_client.cli.commands import shipyard
auth_vars = ('--os_project_domain_name=OS_PROJECT_DOMAIN_NAME_test '
'--os_user_domain_name=OS_USER_DOMAIN_NAME_test '
'--os_project_name=OS_PROJECT_NAME_test '
'--os_username=OS_USERNAME_test --os_password=OS_PASSWORD_test '
'--os_auth_url=OS_AUTH_URL_test')
auth_vars = ('--os-project-domain-name=OS_PROJECT_DOMAIN_NAME_test '
'--os-user-domain-name=OS_USER_DOMAIN_NAME_test '
'--os-project-name=OS_PROJECT_NAME_test '
'--os-username=OS_USERNAME_test '
'--os-password=OS_PASSWORD_test '
'--os-auth-url=OS_AUTH_URL_test')
def test_commit_configdocs(*args):

11
shipyard_client/tests/unit/cli/control/test_control_commands.py
View File

@ -18,11 +18,12 @@ from mock import patch, ANY
from shipyard_client.cli.control.actions import Control
from shipyard_client.cli.commands import shipyard
auth_vars = ('--os_project_domain_name=OS_PROJECT_DOMAIN_NAME_test '
'--os_user_domain_name=OS_USER_DOMAIN_NAME_test '
'--os_project_name=OS_PROJECT_NAME_test '
'--os_username=OS_USERNAME_test --os_password=OS_PASSWORD_test '
'--os_auth_url=OS_AUTH_URL_test')
auth_vars = ('--os-project-domain-name=OS_PROJECT_DOMAIN_NAME_test '
'--os-user-domain-name=OS_USER_DOMAIN_NAME_test '
'--os-project-name=OS_PROJECT_NAME_test '
'--os-username=OS_USERNAME_test '
'--os-password=OS_PASSWORD_test '
'--os-auth-url=OS_AUTH_URL_test')
def test_control_pause(*args):

11
shipyard_client/tests/unit/cli/create/test_create_commands.py
View File

@ -17,11 +17,12 @@ from mock import patch, ANY
from shipyard_client.cli.create.actions import CreateAction, CreateConfigdocs
from shipyard_client.cli.commands import shipyard
auth_vars = ('--os_project_domain_name=OS_PROJECT_DOMAIN_NAME_test '
'--os_user_domain_name=OS_USER_DOMAIN_NAME_test '
'--os_project_name=OS_PROJECT_NAME_test '
'--os_username=OS_USERNAME_test --os_password=OS_PASSWORD_test '
'--os_auth_url=OS_AUTH_URL_test')
auth_vars = ('--os-project-domain-name=OS_PROJECT_DOMAIN_NAME_test '
'--os-user-domain-name=OS_USER_DOMAIN_NAME_test '
'--os-project-name=OS_PROJECT_NAME_test '
'--os-username=OS_USERNAME_test '
'--os-password=OS_PASSWORD_test '
'--os-auth-url=OS_AUTH_URL_test')
def test_create_action():

11
shipyard_client/tests/unit/cli/describe/test_describe_commands.py
View File

@ -20,11 +20,12 @@ from shipyard_client.cli.describe.actions import DescribeStep
from shipyard_client.cli.describe.actions import DescribeValidation
from shipyard_client.cli.commands import shipyard
auth_vars = ('--os_project_domain_name=OS_PROJECT_DOMAIN_NAME_test '
'--os_user_domain_name=OS_USER_DOMAIN_NAME_test '
'--os_project_name=OS_PROJECT_NAME_test '
'--os_username=OS_USERNAME_test --os_password=OS_PASSWORD_test '
'--os_auth_url=OS_AUTH_URL_test')
auth_vars = ('--os-project-domain-name=OS_PROJECT_DOMAIN_NAME_test '
'--os-user-domain-name=OS_USER_DOMAIN_NAME_test '
'--os-project-name=OS_PROJECT_NAME_test '
'--os-username=OS_USERNAME_test '
'--os-password=OS_PASSWORD_test '
'--os-auth-url=OS_AUTH_URL_test')
def test_describe_action():

11
shipyard_client/tests/unit/cli/get/test_get_commands.py
View File

@ -19,11 +19,12 @@ from shipyard_client.cli.get.actions import (GetActions, GetConfigdocs,
GetRenderedConfigdocs)
from shipyard_client.cli.commands import shipyard
auth_vars = ('--os_project_domain_name=OS_PROJECT_DOMAIN_NAME_test '
'--os_user_domain_name=OS_USER_DOMAIN_NAME_test '
'--os_project_name=OS_PROJECT_NAME_test '
'--os_username=OS_USERNAME_test --os_password=OS_PASSWORD_test '
'--os_auth_url=OS_AUTH_URL_test')
auth_vars = ('--os-project-domain-name=OS_PROJECT_DOMAIN_NAME_test '
'--os-user-domain-name=OS_USER_DOMAIN_NAME_test '
'--os-project-name=OS_PROJECT_NAME_test '
'--os-username=OS_USERNAME_test '
'--os-password=OS_PASSWORD_test '
'--os-auth-url=OS_AUTH_URL_test')
def test_get_actions(*args):

12
shipyard_client/tests/unit/cli/test_shipyard_commands.py
View File

@ -24,12 +24,12 @@ def test_shipyard():
context_marker = '--context-marker=88888888-4444-4444-4444-121212121212'
debug = '--debug'
os_project_domain_name = (
'--os_project_domain_name=OS_PROJECT_DOMAIN_NAME_test')
os_user_domain_name = '--os_user_domain_name=OS_USER_DOMAIN_NAME_test'
os_project_name = '--os_project_name=OS_PROJECT_NAME_test'
os_username = '--os_username=OS_USERNAME_test'
os_password = '--os_password=OS_PASSWORD_test'
os_auth_url = '--os_auth_url=OS_AUTH_URL_test'
'--os-project-domain-name=OS_PROJECT_DOMAIN_NAME_test')
os_user_domain_name = '--os-user-domain-name=OS_USER_DOMAIN_NAME_test'
os_project_name = '--os-project-name=OS_PROJECT_NAME_test'
os_username = '--os-username=OS_USERNAME_test'
os_password = '--os-password=OS_PASSWORD_test'
os_auth_url = '--os-auth-url=OS_AUTH_URL_test'
auth_vars = {
'project_domain_name': 'OS_PROJECT_DOMAIN_NAME_test',