From cce7f52780293ce1723120ff4d7178ce6602535a Mon Sep 17 00:00:00 2001 From: Bryan Strassner Date: Tue, 14 Nov 2017 11:24:15 -0600 Subject: [PATCH] Fix naming for --os-auth related CLI options This aligns on the use of hyphens instead of underscores for the openstack auth CLI options. This matches the openstack usage. Change-Id: I624c9f027921a78f4d7fa16baf1c8adf47b0a138 --- shipyard_client/cli/commands.py | 12 ++++++------ .../tests/unit/cli/commit/test_commit_commands.py | 11 ++++++----- .../tests/unit/cli/control/test_control_commands.py | 11 ++++++----- .../tests/unit/cli/create/test_create_commands.py | 11 ++++++----- .../unit/cli/describe/test_describe_commands.py | 11 ++++++----- .../tests/unit/cli/get/test_get_commands.py | 11 ++++++----- .../tests/unit/cli/test_shipyard_commands.py | 12 ++++++------ 7 files changed, 42 insertions(+), 37 deletions(-) diff --git a/shipyard_client/cli/commands.py b/shipyard_client/cli/commands.py index da23df5d..fa501497 100644 --- a/shipyard_client/cli/commands.py +++ b/shipyard_client/cli/commands.py @@ -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, diff --git a/shipyard_client/tests/unit/cli/commit/test_commit_commands.py b/shipyard_client/tests/unit/cli/commit/test_commit_commands.py index 759b441e..ddedc3db 100644 --- a/shipyard_client/tests/unit/cli/commit/test_commit_commands.py +++ b/shipyard_client/tests/unit/cli/commit/test_commit_commands.py @@ -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): diff --git a/shipyard_client/tests/unit/cli/control/test_control_commands.py b/shipyard_client/tests/unit/cli/control/test_control_commands.py index 2e72b111..d6fb4377 100644 --- a/shipyard_client/tests/unit/cli/control/test_control_commands.py +++ b/shipyard_client/tests/unit/cli/control/test_control_commands.py @@ -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): diff --git a/shipyard_client/tests/unit/cli/create/test_create_commands.py b/shipyard_client/tests/unit/cli/create/test_create_commands.py index 787a7b45..33af683e 100644 --- a/shipyard_client/tests/unit/cli/create/test_create_commands.py +++ b/shipyard_client/tests/unit/cli/create/test_create_commands.py @@ -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(): diff --git a/shipyard_client/tests/unit/cli/describe/test_describe_commands.py b/shipyard_client/tests/unit/cli/describe/test_describe_commands.py index 3063ca55..3e749156 100644 --- a/shipyard_client/tests/unit/cli/describe/test_describe_commands.py +++ b/shipyard_client/tests/unit/cli/describe/test_describe_commands.py @@ -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(): diff --git a/shipyard_client/tests/unit/cli/get/test_get_commands.py b/shipyard_client/tests/unit/cli/get/test_get_commands.py index eb6b8396..c07ab3ff 100644 --- a/shipyard_client/tests/unit/cli/get/test_get_commands.py +++ b/shipyard_client/tests/unit/cli/get/test_get_commands.py @@ -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): diff --git a/shipyard_client/tests/unit/cli/test_shipyard_commands.py b/shipyard_client/tests/unit/cli/test_shipyard_commands.py index aa115407..2ee83745 100644 --- a/shipyard_client/tests/unit/cli/test_shipyard_commands.py +++ b/shipyard_client/tests/unit/cli/test_shipyard_commands.py @@ -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',