summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ceilometerclient/shell.py4
-rw-r--r--ceilometerclient/tests/test_shell.py5
2 files changed, 8 insertions, 1 deletions
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):