summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--qtip/cli/commands/cmd_ansible.py62
-rw-r--r--qtip/cli/entry.py3
-rw-r--r--tests/data/helper/ansible.yaml12
-rw-r--r--tests/unit/cli/test_module.py3
4 files changed, 3 insertions, 77 deletions
diff --git a/qtip/cli/commands/cmd_ansible.py b/qtip/cli/commands/cmd_ansible.py
deleted file mode 100644
index 453fa331..00000000
--- a/qtip/cli/commands/cmd_ansible.py
+++ /dev/null
@@ -1,62 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 ZTE Corp and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-import os
-
-import click
-
-ANSIBLE_CONF = '{}/conf/ansible.cfg'.format(os.environ['HOME'])
-
-
-class Ansible:
-
- def __init__(self):
- pass
-
- def show(self):
- click.echo("show ansible configuration")
- pass
-
- def prepare(self):
- click.echo("prepare ansible env")
- pass
-
- 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 66e45ddc..c3ebf96a 100644
--- a/qtip/cli/entry.py
+++ b/qtip/cli/entry.py
@@ -10,11 +10,10 @@
import click
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])
+cli = click.CommandCollection(sources=[cmd_perftest.cli, cmd_suite.cli])
if __name__ == '__main__':
cli()
diff --git a/tests/data/helper/ansible.yaml b/tests/data/helper/ansible.yaml
deleted file mode 100644
index c55816fb..00000000
--- a/tests/data/helper/ansible.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-
- tests:
- - command: ['ansible', 'prepare']
- output: "prepare ansible env\n"
-
- - command: ['ansible', 'show']
- output: "show ansible configuration\n"
-
- - command: ['ansible', 'status']
- output: "check connectivity\n"
-
diff --git a/tests/unit/cli/test_module.py b/tests/unit/cli/test_module.py
index 822fa606..a8900684 100644
--- a/tests/unit/cli/test_module.py
+++ b/tests/unit/cli/test_module.py
@@ -8,13 +8,14 @@ from qtip.cli.entry import cli
class TestClass(object):
+ '''TODO(taseer) Remove hardcoded behaviour '''
@pytest.fixture()
def runner(self):
return CliRunner()
def test(self, runner):
- unit = 'ansible'
+ unit = 'perftest'
test_file = 'data/helper/' + unit + '.yaml'
path = os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, test_file)