diff options
| -rw-r--r-- | ceilometerclient/client.py | 2 | ||||
| -rw-r--r-- | ceilometerclient/shell.py | 4 | ||||
| -rw-r--r-- | ceilometerclient/tests/test_shell.py | 5 | ||||
| -rw-r--r-- | doc/ext/gen_ref.py | 5 | ||||
| -rw-r--r-- | doc/source/index.rst | 1 | ||||
| -rw-r--r-- | requirements.txt | 12 | ||||
| -rw-r--r-- | test-requirements.txt | 2 |
7 files changed, 17 insertions, 14 deletions
diff --git a/ceilometerclient/client.py b/ceilometerclient/client.py index 2a9a06b..c4378eb 100644 --- a/ceilometerclient/client.py +++ b/ceilometerclient/client.py @@ -258,7 +258,9 @@ def get_client(version, **kwargs): * ceilometer_url: (DEPRECATED) Ceilometer API endpoint, use os_endpoint instead * os_endpoint: Ceilometer API endpoint + or: + * os_username: name of user * os_password: user's password * os_user_id: user's id diff --git a/ceilometerclient/shell.py b/ceilometerclient/shell.py index 8057933..10a43d5 100644 --- a/ceilometerclient/shell.py +++ b/ceilometerclient/shell.py @@ -46,6 +46,9 @@ def _positive_non_zero_int(argument_value): class CeilometerShell(object): + def __init__(self): + self.auth_plugin = ceiloclient.AuthPlugin() + def get_base_parser(self): parser = argparse.ArgumentParser( prog='ceilometer', @@ -158,7 +161,6 @@ class CeilometerShell(object): def parse_args(self, argv): # Parse args once to find version - self.auth_plugin = ceiloclient.AuthPlugin() parser = self.get_base_parser() (options, args) = parser.parse_known_args(argv) self.auth_plugin.parse_opts(options) diff --git a/ceilometerclient/tests/test_shell.py b/ceilometerclient/tests/test_shell.py index 6d6403b..c3a138e 100644 --- a/ceilometerclient/tests/test_shell.py +++ b/ceilometerclient/tests/test_shell.py @@ -92,6 +92,11 @@ class ShellHelpTest(ShellTestBase): self.assertThat(help_text, matchers.MatchesRegex(r, self.RE_OPTIONS)) + def test_get_base_parser(self): + standalone_shell = ceilometer_shell.CeilometerShell() + parser = standalone_shell.get_base_parser() + self.assertEqual(600, parser.get_default('timeout')) + class ShellKeystoneV2Test(ShellTestBase): diff --git a/doc/ext/gen_ref.py b/doc/ext/gen_ref.py index f3ea677..f8560b3 100644 --- a/doc/ext/gen_ref.py +++ b/doc/ext/gen_ref.py @@ -52,8 +52,3 @@ def gen_ref(ver, title, names): % {"title": name.capitalize(), "signs": "=" * len(name), "pkg": pkg, "name": name}) - -gen_ref("", "Client Reference", ["client", "exc"]) -gen_ref("v1", "Version 1 API Reference", - ["stacks", "resources", "events", "actions", - "software_configs", "software_deployments"]) diff --git a/doc/source/index.rst b/doc/source/index.rst index 56f671a..cec3b5c 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -24,7 +24,6 @@ Contents: ref/index ref/v1/index ref/v2/index - releases Contributing ============ diff --git a/requirements.txt b/requirements.txt index bfafab6..22d73a6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,11 +4,11 @@ pbr>=0.6,!=0.7,<1.0 argparse iso8601>=0.1.9 -oslo.i18n>=1.3.0 # Apache-2.0 -oslo.serialization>=1.2.0 # Apache-2.0 -oslo.utils>=1.2.0 # Apache-2.0 +oslo.i18n>=1.5.0,<1.6.0 # Apache-2.0 +oslo.serialization>=1.4.0,<1.5.0 # Apache-2.0 +oslo.utils>=1.4.0,<1.5.0 # Apache-2.0 PrettyTable>=0.7,<0.8 -python-keystoneclient>=1.1.0 +python-keystoneclient>=1.1.0,<1.4.0 requests>=2.2.0,!=2.4.0 -six>=1.7.0 -stevedore>=1.1.0 # Apache-2.0 +six>=1.9.0 +stevedore>=1.3.0,<1.4.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 6dffed5..882cebb 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,7 +7,7 @@ coverage>=3.6 discover fixtures>=0.3.14 mock>=1.0 -oslosphinx>=2.2.0 # Apache-2.0 +oslosphinx>=2.5.0,<2.6.0 # Apache-2.0 python-subunit>=0.0.18 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 testrepository>=0.0.18 |