diff options
Diffstat (limited to 'qtip')
-rw-r--r-- | qtip/api/__main__.py | 11 | ||||
-rw-r--r-- | qtip/api/controllers/__init__.py | 0 | ||||
-rw-r--r-- | qtip/api/swagger/swagger.yaml | 9 | ||||
-rw-r--r-- | qtip/cli/commands/cmd_metric.py | 7 | ||||
-rw-r--r-- | qtip/cli/commands/cmd_plan.py | 7 | ||||
-rw-r--r-- | qtip/cli/commands/cmd_qpi.py | 7 | ||||
-rw-r--r-- | qtip/collector/parser/grep.py | 4 | ||||
-rw-r--r-- | qtip/util/logger.py | 9 |
8 files changed, 47 insertions, 7 deletions
diff --git a/qtip/api/__main__.py b/qtip/api/__main__.py new file mode 100644 index 00000000..89298e6d --- /dev/null +++ b/qtip/api/__main__.py @@ -0,0 +1,11 @@ +import connexion + + +def main(): + app = connexion.App(__name__, specification_dir='swagger/') + app.add_api('swagger.yaml', base_path='/v1.0') + app.run(host='0.0.0.0', port='5000') + + +if __name__ == '__main__': + main() diff --git a/qtip/api/controllers/__init__.py b/qtip/api/controllers/__init__.py new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/qtip/api/controllers/__init__.py diff --git a/qtip/api/swagger/swagger.yaml b/qtip/api/swagger/swagger.yaml new file mode 100644 index 00000000..97a9c352 --- /dev/null +++ b/qtip/api/swagger/swagger.yaml @@ -0,0 +1,9 @@ +swagger: '2.0' +info: + title: QTIP-API +consumes: + - application/json +produces: + - application/json +paths: + #TODO (akhil) add paths
\ No newline at end of file diff --git a/qtip/cli/commands/cmd_metric.py b/qtip/cli/commands/cmd_metric.py index aa4df1f4..b6035e2d 100644 --- a/qtip/cli/commands/cmd_metric.py +++ b/qtip/cli/commands/cmd_metric.py @@ -27,6 +27,13 @@ def cmd_list(ctx): pass +@cli.command('show', help='View details of a Metric') +@click.argument('name') +@pass_context +def show(ctx, name): + pass + + @cli.command('run', help='Run tests to run Performance Metrics') @click.argument('name') @pass_context diff --git a/qtip/cli/commands/cmd_plan.py b/qtip/cli/commands/cmd_plan.py index c1dd7cf6..64c702d3 100644 --- a/qtip/cli/commands/cmd_plan.py +++ b/qtip/cli/commands/cmd_plan.py @@ -35,6 +35,13 @@ def list(ctx): pass +@cli.command('show', help='View details of a Plan') +@click.argument('name') +@pass_context +def show(ctx, name): + pass + + @cli.command('run', help='Execute a Plan') @click.argument('name') @pass_context diff --git a/qtip/cli/commands/cmd_qpi.py b/qtip/cli/commands/cmd_qpi.py index f33f0104..5fc9bec8 100644 --- a/qtip/cli/commands/cmd_qpi.py +++ b/qtip/cli/commands/cmd_qpi.py @@ -28,6 +28,13 @@ def cmd_list(ctx): pass +@cli.command('show', help='View details of a QPI') +@click.argument('name') +@pass_context +def show(ctx, name): + pass + + @cli.command('run', help='Run performance tests for the specified QPI') @click.argument('name') @pass_context diff --git a/qtip/collector/parser/grep.py b/qtip/collector/parser/grep.py index c3274bc2..f74ce403 100644 --- a/qtip/collector/parser/grep.py +++ b/qtip/collector/parser/grep.py @@ -29,6 +29,6 @@ class GrepParser(BaseActor): def grep_in_file(filename, regex): - with open(filename, "r") as outfile: + with open(filename, 'r') as f: return filter(lambda x: x is not None, - list(re.finditer(regex, outfile.read(), re.MULTILINE))) + re.finditer(regex, f.read(), re.MULTILINE)) diff --git a/qtip/util/logger.py b/qtip/util/logger.py index d5e76a64..a7847dfc 100644 --- a/qtip/util/logger.py +++ b/qtip/util/logger.py @@ -27,11 +27,11 @@ import os class Logger(object): - file_path = '/var/log' formatter = logging.Formatter('%(asctime)s - %(name)s - ' '%(levelname)s - %(message)s') - def __init__(self, logger_name): + def __init__(self, logger_name, file_path=None): + self.file_path = '/var/log' if not file_path else file_path IF_DEBUG = os.getenv('IF_DEBUG') @@ -59,10 +59,9 @@ class Logger(object): class QtipLogger(Logger): - file_path = '{}/qtip/logs'.format(os.environ['HOME']) - def __init__(self, logger_name): + self.file_path = '{}/qtip/logs'.format(os.environ['HOME']) if not os.path.exists(self.file_path): os.makedirs(self.file_path) - super(QtipLogger, self).__init__(logger_name) + super(QtipLogger, self).__init__(logger_name, self.file_path) |