diff options
Diffstat (limited to 'qtip')
-rw-r--r-- | qtip/base/constant.py | 29 | ||||
-rw-r--r-- | qtip/cli/commands/cmd_metric.py | 34 | ||||
-rw-r--r-- | qtip/cli/commands/cmd_perftest.py | 58 | ||||
-rw-r--r-- | qtip/cli/commands/cmd_plan.py | 45 | ||||
-rw-r--r-- | qtip/cli/commands/cmd_qpi.py | 35 | ||||
-rw-r--r-- | qtip/cli/commands/cmd_suite.py | 54 | ||||
-rw-r--r-- | qtip/cli/entry.py | 9 | ||||
-rw-r--r-- | qtip/loader/base.py | 15 | ||||
-rw-r--r-- | qtip/loader/plan.py | 5 | ||||
-rw-r--r-- | qtip/loader/qpi.py | 14 | ||||
-rw-r--r-- | qtip/runner/__init__.py | 10 |
11 files changed, 143 insertions, 165 deletions
diff --git a/qtip/base/constant.py b/qtip/base/constant.py index 76481b47..58cc0cc1 100644 --- a/qtip/base/constant.py +++ b/qtip/base/constant.py @@ -25,26 +25,49 @@ class PkgName(object): SPEC = 'spec' -class PropName(object): +class BaseProp(object): """property names""" # list NAME = 'name' CONTENT = 'content' ABSPATH = 'abspath' + # content - name = 'name' DESCRIPTION = 'description' + + +class SpecProp(BaseProp): # spec SECTIONS = 'sections' WEIGHT = 'weight' FORMULA = 'formula' METRICS = 'metrics' WORKLOADS = 'workloads' + + +class PlanProp(BaseProp): # plan - CONFIG = 'config' + INFO = 'info' + FACILITY = 'facility' ENGINEER = 'engineer' + + CONFIG = 'config' + DRIVER = 'driver' COLLECTOR = 'collector' REPORTER = 'reporter' + QPIS = 'QPIs' + + +class CollectorProp(BaseProp): + LOGS = 'logs' + FILENAME = 'filename' + PATTERNS = 'patterns' + MATCH = 'match' + CAPTURE = 'capture' + + +class ReporterBaseProp(BaseProp): + TRANSFORMER = 'transformer' diff --git a/qtip/cli/commands/cmd_metric.py b/qtip/cli/commands/cmd_metric.py new file mode 100644 index 00000000..d2fbd58f --- /dev/null +++ b/qtip/cli/commands/cmd_metric.py @@ -0,0 +1,34 @@ +############################################################################## +# 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 qtip.cli.entry import Context + +pass_context = click.make_pass_decorator(Context, ensure=False) + + +@click.group() +@pass_context +def cli(ctx): + ''' Performance Metrics Group ''' + pass + + +@cli.command('list', help='List all the Metric Groups') +@pass_context +def cmd_list(ctx): + pass + + +@cli.command('run', help='Run tests to collect Performance Metrics') +@click.argument('name') +@pass_context +def cmd_run(ctx, name): + pass diff --git a/qtip/cli/commands/cmd_perftest.py b/qtip/cli/commands/cmd_perftest.py deleted file mode 100644 index 129ee2d9..00000000 --- a/qtip/cli/commands/cmd_perftest.py +++ /dev/null @@ -1,58 +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 qtip.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/qtip/cli/commands/cmd_plan.py b/qtip/cli/commands/cmd_plan.py index 6f622e5a..0c0a3c12 100644 --- a/qtip/cli/commands/cmd_plan.py +++ b/qtip/cli/commands/cmd_plan.py @@ -1,4 +1,4 @@ -############################################################################# +############################################################################## # Copyright (c) 2016 ZTE Corp and others. # # All rights reserved. This program and the accompanying materials @@ -7,38 +7,39 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## + import click -from prettytable import PrettyTable -from qtip.loader.plan import Plan +from qtip.cli.entry import Context + + +pass_context = click.make_pass_decorator(Context, ensure=False) @click.group() -def cli(): +@pass_context +def cli(ctx): + ''' Bechmarking Plan ''' pass -@cli.group() -def plan_cmd(): +@cli.command('init', help='Initialize Environment') +@click.option('--inst_type', prompt='Installer Type') +@click.option('--inst_ip', prompt='Installer IP') +@click.option('--ext_net', prompt='Openstack External Network') +@pass_context +def init(ctx, inst_type, inst_ip, ext_net): pass -@plan_cmd.command('list', help='List the different TestPlans.') -def list_all(): - plans = Plan.list_all() - table = PrettyTable(["Testplans"]) - table.align = 'l' - for plan in plans: - table.add_row([plan['name']]) - click.echo(table) +@cli.command('list', help='List the Plans') +@pass_context +def list(ctx): + pass -@plan_cmd.command('show', help='Show details of specified TestPlan.') +@cli.command('run', help='Execute a Plan') @click.argument('name') -def show(name): - plan = Plan(name) - results = plan.content() - table = PrettyTable(["Name", "Description"]) - table.align = 'l' - table.add_row([results['name'], results['description']]) - click.echo(table) +@pass_context +def run(ctx, name): + pass diff --git a/qtip/cli/commands/cmd_qpi.py b/qtip/cli/commands/cmd_qpi.py new file mode 100644 index 00000000..f33f0104 --- /dev/null +++ b/qtip/cli/commands/cmd_qpi.py @@ -0,0 +1,35 @@ +############################################################################## +# 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 qtip.cli.entry import Context + +pass_context = click.make_pass_decorator(Context, ensure=False) + + +@click.group() +@pass_context +def cli(ctx): + ''' Collection of performance tests ''' + pass + + +@cli.command('list', help='List all the QPI specs') +@pass_context +def cmd_list(ctx): + pass + + +@cli.command('run', help='Run performance tests for the specified QPI') +@click.argument('name') +@pass_context +def run(ctx, name): + pass diff --git a/qtip/cli/commands/cmd_suite.py b/qtip/cli/commands/cmd_suite.py deleted file mode 100644 index 45c739df..00000000 --- a/qtip/cli/commands/cmd_suite.py +++ /dev/null @@ -1,54 +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 -from qtip.cli import helper - - -class Suite: - - def __init__(self): - self.path = os.path.join(helper.fetch_root(), '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/qtip/cli/entry.py b/qtip/cli/entry.py index 0ecb06cd..9f51f25e 100644 --- a/qtip/cli/entry.py +++ b/qtip/cli/entry.py @@ -22,7 +22,6 @@ class Context(object): def __init__(self): self.verbose = False self.debug = False - self.version = 'qtip-1.0.0' def log(self, msg, *args): ''' Log message to stderr ''' @@ -32,10 +31,6 @@ class Context(object): ''' Log message to stderr when verbose ''' pass - def version(self): - ''' Display programs version ''' - pass - def debug(self, msg, *args): ''' Log message to debug ''' pass @@ -72,7 +67,7 @@ class QtipCli(click.MultiCommand): invoke_without_command=True) @click.option('-v', '--verbose', is_flag=True, help='Enable verbose mode.') @click.option('-d', '--debug', is_flag=True, help='Enable debug mode.') -@click.option('--version', is_flag=True, help='Shows program current version.') +@click.version_option('dev') @pass_context -def cli(ctx, verbose, version, debug): +def cli(ctx, verbose, debug): pass diff --git a/qtip/loader/base.py b/qtip/loader/base.py index d3a7e1d3..a0e5d031 100644 --- a/qtip/loader/base.py +++ b/qtip/loader/base.py @@ -7,13 +7,14 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## +from collections import defaultdict from itertools import chain from os import listdir from os import path import yaml from qtip.base.error import InvalidFormat, NotFound -from qtip.base.constant import PropName +from qtip.base.constant import BaseProp ROOT_DIR = path.join(path.dirname(__file__), path.pardir, path.pardir, @@ -28,15 +29,15 @@ class BaseLoader(object): def __init__(self, name, paths=None): self._file = name self._abspath = self._find(name, paths=paths) + content = defaultdict(lambda: None) try: - content = yaml.safe_load(file(self._abspath)) + content.update(yaml.safe_load(file(self._abspath))) except yaml.YAMLError: # TODO(yujunz) log yaml error raise InvalidFormat(self._abspath) - self.name = content[PropName.NAME] if PropName.NAME in content \ - else path.splitext(name)[0] + self.name = content[BaseProp.NAME] or path.splitext(name)[0] self.content = content def _find(self, name, paths=None): @@ -57,6 +58,6 @@ class BaseLoader(object): for name in names: item = cls(name, paths=paths) yield { - PropName.NAME: name, - PropName.ABSPATH: item._abspath, - PropName.CONTENT: item.content} + BaseProp.NAME: name, + BaseProp.ABSPATH: item._abspath, + BaseProp.CONTENT: item.content} diff --git a/qtip/loader/plan.py b/qtip/loader/plan.py index cf517ea2..c1ee00be 100644 --- a/qtip/loader/plan.py +++ b/qtip/loader/plan.py @@ -8,7 +8,7 @@ ############################################################################## -from qtip.base.constant import PropName +from qtip.base.constant import PlanProp from qtip.loader.base import BaseLoader from qtip.loader.qpi import QPISpec @@ -24,4 +24,5 @@ class Plan(BaseLoader): super(Plan, self).__init__(name, paths) self.qpis = [QPISpec(qpi, paths=paths) - for qpi in self.content[PropName.QPIS]] + for qpi in self.content[PlanProp.QPIS]] + self.info = self.content[PlanProp.INFO] diff --git a/qtip/loader/qpi.py b/qtip/loader/qpi.py index fe2323dd..ef6e065e 100644 --- a/qtip/loader/qpi.py +++ b/qtip/loader/qpi.py @@ -10,7 +10,7 @@ from base import BaseLoader from metric import MetricSpec -from qtip.base.constant import PropName +from qtip.base.constant import SpecProp from qtip.util.formula import Formula @@ -24,15 +24,15 @@ class QPISpec(BaseLoader): def __init__(self, name, paths=None): super(QPISpec, self).__init__(name, paths=paths) content = self.content - self.formula = Formula(content[PropName.FORMULA]) + self.formula = Formula(content[SpecProp.FORMULA]) self.sections = [Section(record, paths=paths) - for record in content[PropName.SECTIONS]] + for record in content[SpecProp.SECTIONS]] class Section(object): def __init__(self, content, paths=None): - self.name = content[PropName.NAME] - self.weight = content[PropName.WEIGHT] - self.formula = Formula(content[PropName.FORMULA]) + self.name = content[SpecProp.NAME] + self.weight = content[SpecProp.WEIGHT] + self.formula = Formula(content[SpecProp.FORMULA]) self.metrics = [MetricSpec(record, paths=paths) - for record in content[PropName.METRICS]] + for record in content[SpecProp.METRICS]] diff --git a/qtip/runner/__init__.py b/qtip/runner/__init__.py index eab81156..1db8498e 100644 --- a/qtip/runner/__init__.py +++ b/qtip/runner/__init__.py @@ -7,7 +7,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -from qtip.base.constant import PkgName, PropName +from qtip.base.constant import PkgName, BaseProp from qtip.base.error import NotFound from qtip.collector.stdout import StdoutCollector from qtip.driver.random import RandomDriver @@ -17,11 +17,11 @@ from qtip.reporter.console import ConsoleReporter class Runner(object): def __init__(self, spec, config=None): if config is None: - config = spec[PropName.CONFIG] + config = spec[BaseProp.CONFIG] - driver_name = config[PropName.DRIVER] - collector_name = config[PropName.COLLECTOR] - reporter_name = config[PropName.REPORTER] + driver_name = config[BaseProp.DRIVER] + collector_name = config[BaseProp.COLLECTOR] + reporter_name = config[BaseProp.REPORTER] # TODO(yujunz) dynamically load modules by name |