diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-17 13:55:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-17 13:55:47 +0000 |
| commit | bbe71eb9a310c67f6c8a1b8da1b2fb2ec37fd3ab (patch) | |
| tree | f1b9d2d043f63b488d7c32aeb8d63930ee7ece71 /openstackclient/tests/test_shell.py | |
| parent | 83edde0ec9070927320dac926a3a0b5d33c86009 (diff) | |
| parent | 36391a81a3415d24c55d6bbc318157dc119da8a7 (diff) | |
| download | python-openstackclient-bbe71eb9a310c67f6c8a1b8da1b2fb2ec37fd3ab.tar.gz | |
Merge "Rename endpoint type to interface"
Diffstat (limited to 'openstackclient/tests/test_shell.py')
| -rw-r--r-- | openstackclient/tests/test_shell.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/openstackclient/tests/test_shell.py b/openstackclient/tests/test_shell.py index 0b4ff685..e2f0580b 100644 --- a/openstackclient/tests/test_shell.py +++ b/openstackclient/tests/test_shell.py @@ -39,7 +39,7 @@ DEFAULT_REGION_NAME = "ZZ9_Plural_Z_Alpha" DEFAULT_TOKEN = "token" DEFAULT_SERVICE_URL = "http://127.0.0.1:8771/v3.0/" DEFAULT_AUTH_PLUGIN = "v2password" -DEFAULT_ENDPOINT_TYPE = "internal" +DEFAULT_INTERFACE = "internal" DEFAULT_COMPUTE_API_VERSION = "2" DEFAULT_IDENTITY_API_VERSION = "2" @@ -63,7 +63,7 @@ CLOUD_1 = { }, 'region_name': 'occ-cloud', 'donut': 'glazed', - 'endpoint_type': 'public', + 'interface': 'public', } } } @@ -107,7 +107,7 @@ global_options = { '--os-default-domain': (DEFAULT_DOMAIN_NAME, True, True), '--os-cacert': ('/dev/null', True, True), '--timing': (True, True, False), - '--os-endpoint-type': (DEFAULT_ENDPOINT_TYPE, True, True) + '--os-interface': (DEFAULT_INTERFACE, True, True) } auth_options = { @@ -127,7 +127,7 @@ auth_options = { '--os-auth-type': ("v2password", True, True), '--os-token': (DEFAULT_TOKEN, True, True), '--os-url': (DEFAULT_SERVICE_URL, True, True), - '--os-endpoint-type': (DEFAULT_ENDPOINT_TYPE, True, True), + '--os-interface': (DEFAULT_INTERFACE, True, True), } @@ -616,7 +616,7 @@ class TestShellCli(TestShell): ) self.assertEqual( 'public', - _shell.cloud.config['endpoint_type'], + _shell.cloud.config['interface'], ) @mock.patch("os_client_config.config.OpenStackConfig._load_vendor_file") |