summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhihui wu <wu.zhihui1@zte.com.cn>2016-11-18 08:32:12 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-18 08:32:13 +0000
commit3fe85ce6a6a19e5906e325370e6e6db16ec9d41e (patch)
tree30aa4c78d9eba869a0d687a23772f554a847addf
parent1de0941e0b7d6b3a2663bb5ee058d7087130d203 (diff)
parenta28cc39929bef8027300c158d6c4804c0f55db75 (diff)
Merge changes from topics 'fix', 'cli'
* changes: Bugfix: Correct the path in setup and entry points Ansible related commands in its own module.
-rw-r--r--qtip/cli/commands/cmd_ansible.py29
-rw-r--r--qtip/cli/entry.py36
-rw-r--r--setup.py4
3 files changed, 37 insertions, 32 deletions
diff --git a/qtip/cli/commands/cmd_ansible.py b/qtip/cli/commands/cmd_ansible.py
index 001185a3..857e68e2 100644
--- a/qtip/cli/commands/cmd_ansible.py
+++ b/qtip/cli/commands/cmd_ansible.py
@@ -30,3 +30,32 @@ class Ansible:
def status(self):
click.echo("check connectivity")
pass
+
+
+@click.group()
+def cli():
+ pass
+
+_ansible = Ansible()
+
+
+@cli.group()
+@click.pass_context
+def ansible(ctx):
+ pass
+
+
+@ansible.command('prepare', help="Prepares the ansible environment. "
+ "This step is needed run benchmarks.")
+def ansible_prepare():
+ _ansible.prepare()
+
+
+@ansible.command('show', help="Shows the current ansible configuration.")
+def ansible_show():
+ _ansible.show()
+
+
+@ansible.command('status', help="Checks if ansible still connects to hosts.")
+def ansible_status():
+ _ansible.status()
diff --git a/qtip/cli/entry.py b/qtip/cli/entry.py
index f9dc440c..66e45ddc 100644
--- a/qtip/cli/entry.py
+++ b/qtip/cli/entry.py
@@ -8,37 +8,13 @@
##############################################################################
import click
-
-from cli.commands.ansible import Ansible
+from qtip.cli.commands import cmd_perftest
+from qtip.cli.commands import cmd_suite
+from qtip.cli.commands import cmd_ansible
CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'])
+cli = click.CommandCollection(sources=[cmd_perftest.cli, cmd_suite.cli, cmd_ansible.cli])
-@click.group(context_settings=CONTEXT_SETTINGS)
-@click.version_option(version='0.1.dev0')
-def cli():
- pass
-
-_ansible = Ansible()
-
-
-@cli.group()
-@click.pass_context
-def ansible(ctx):
- pass
-
-
-@ansible.command('prepare', help="Prepares the ansible environment. "
- "This step is needed run benchmarks.")
-def ansible_prepare():
- _ansible.prepare()
-
-
-@ansible.command('show', help="Shows the current ansible configuration.")
-def ansible_show():
- _ansible.show()
-
-
-@ansible.command('status', help="Checks if ansible still connects to hosts.")
-def ansible_status():
- _ansible.status()
+if __name__ == '__main__':
+ cli()
diff --git a/setup.py b/setup.py
index e00e97ba..15900362 100644
--- a/setup.py
+++ b/setup.py
@@ -10,9 +10,9 @@ setup(
author='OPNFV',
author_email='zhang.yujunz@zte.com.cn',
install_requires=['click', 'pyyaml', 'prettytable'],
- packages=['cli'],
+ packages=['qtip.cli'],
entry_points={
- 'console_scripts': ['qtip=cli.entry:cli']
+ 'console_scripts': ['qtip=qtip.cli.entry:cli']
},
license='Apache-2.0',
keywords="performance benchmark opnfv",