From 9edb0f9e48cc923ed443d3d66886713cde9b628d Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Thu, 10 Nov 2016 10:59:26 +0800 Subject: Adjust folder structure Note: this patchset may break existing features, but it will help to accelerate the refactoring work. JIRA: QTIP-131 Change-Id: Ie0cd9d185e6b02316878daef905e26f4e533a66b Signed-off-by: Yujun Zhang --- cli/README.rst | 11 ---------- cli/__init__.py | 0 cli/commands/__init__.py | 0 cli/commands/ansible.py | 32 --------------------------- cli/commands/perftest.py | 57 ------------------------------------------------ cli/commands/suite.py | 52 ------------------------------------------- cli/entry.py | 44 ------------------------------------- cli/helper.py | 14 ------------ 8 files changed, 210 deletions(-) delete mode 100644 cli/README.rst delete mode 100644 cli/__init__.py delete mode 100644 cli/commands/__init__.py delete mode 100644 cli/commands/ansible.py delete mode 100644 cli/commands/perftest.py delete mode 100644 cli/commands/suite.py delete mode 100644 cli/entry.py delete mode 100644 cli/helper.py (limited to 'cli') diff --git a/cli/README.rst b/cli/README.rst deleted file mode 100644 index 65f4af86..00000000 --- a/cli/README.rst +++ /dev/null @@ -1,11 +0,0 @@ -QTIP CLI -======== -Note: The cli is only tested within docker - -install -------- -pip install . - -usage ------ -qtip -h diff --git a/cli/__init__.py b/cli/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/cli/commands/__init__.py b/cli/commands/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/cli/commands/ansible.py b/cli/commands/ansible.py deleted file mode 100644 index 001185a3..00000000 --- a/cli/commands/ansible.py +++ /dev/null @@ -1,32 +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 diff --git a/cli/commands/perftest.py b/cli/commands/perftest.py deleted file mode 100644 index 0eb6d062..00000000 --- a/cli/commands/perftest.py +++ /dev/null @@ -1,57 +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 -############################################################################## - -from prettytable import PrettyTable -import yaml -import click -import os -from cli import helper - - -class PerfTest: - - def __init__(self): - self.path = os.path.join(helper.fetch_root(), 'perftest/summary') - - def list(self): - table = PrettyTable(["Name", "Description"]) - table.align = 'l' - with open(self.path) as tests: - line = tests.read() - data = yaml.safe_load(line)['test_cases'] - for i in range(0, len(data)): - points = data[i] - table.add_row([points['name'], points['description']]) - click.echo(table) - - def run(self): - click.echo("Run a perftest") - - -@click.group() -def cli(): - pass - - -@cli.group() -@click.pass_context -def perftest(ctx): - pass - -_perftest = PerfTest() - - -@perftest.command("list", help="Lists all perftest benchmarks.") -def list(): - _perftest.list() - - -@perftest.command("run", help="Executes a single perftest benchmark.") -def execute(): - _perftest.run() diff --git a/cli/commands/suite.py b/cli/commands/suite.py deleted file mode 100644 index 757f11a1..00000000 --- a/cli/commands/suite.py +++ /dev/null @@ -1,52 +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 -############################################################################## - -from prettytable import PrettyTable -import os -import click - - -class Suite: - - def __init__(self): - self.path = os.path.join(os.path.dirname(__file__), '..', '..', 'benchmarks/suite') - - def list(self): - table = PrettyTable(["Name"]) - table.align = 'l' - suites = os.listdir(self.path) - for suite in suites: - table.add_row([suite]) - click.echo(table) - - def run(self): - print("Run a suite") - - -@click.group() -def cli(): - pass - - -@cli.group() -@click.pass_context -def suite(ctx): - pass - -_suite = Suite() - - -@suite.command("list", help="Lists all the available suites") -def list(): - _suite.list() - - -@suite.command("run", help="Execute one complete suite") -def execute(): - _suite.run() diff --git a/cli/entry.py b/cli/entry.py deleted file mode 100644 index f9dc440c..00000000 --- a/cli/entry.py +++ /dev/null @@ -1,44 +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 click - -from cli.commands.ansible import Ansible - -CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help']) - - -@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() diff --git a/cli/helper.py b/cli/helper.py deleted file mode 100644 index a5865bce..00000000 --- a/cli/helper.py +++ /dev/null @@ -1,14 +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 - - -def fetch_root(): - return os.path.join(os.path.dirname(__file__), os.pardir, 'benchmarks/') -- cgit 1.2.3-korg