Merge "CLI acommadation to the current test case calling method"

4 files changed, 26 insertions, 33 deletions

diff --git a/cli/bottlenecks_cli.py b/cli/bottlenecks_cli.py
index 0328578f..ebbf05dc 100644
--- a/cli/bottlenecks_cli.py
+++ b/cli/bottlenecks_cli.py
@@ -26,18 +26,40 @@ def main(ctx):
     """
     pass
 
+
 _testcase = Testcase()
 
+
 @main.group()
 @click.pass_context
 def testcase(ctx):
     """testcase cli group for bottlenecks project"""
     pass
 
+
 @testcase.command('run', help="To execute a test case.")
 @click.argument('testname', type=click.STRING, required=True)
 @click.option('-n', '--noclean', is_flag=True, default=False,
               help='Openstack resources created by the test'
               'will not be cleaned after the testcase execution.')
 def testcase_run(testname, noclean):
-    _testcase.run(testname, noclean)
+    _testcase.run('-c ' + testname, noclean)
+
+
+_teststory = Testcase()
+
+
+@main.group()
+@click.pass_context
+def teststory(ctx):
+    """teststory cli group for bottlenecks project"""
+    pass
+
+
+@teststory.command('run', help="To execute a test story.")
+@click.argument('testname', type=click.STRING, required=True)
+@click.option('-n', '--noclean', is_flag=True, default=False,
+              help='Openstack resources created by the test'
+              'will not be cleaned after the teststory execution.')
+def teststory_run(testname, noclean):
+    _testcase.run('-s ' + testname, noclean)
\ No newline at end of file
diff --git a/cli/command_group/testcase.py b/cli/command_group/testcase.py
index 1fe0fba7..33c15786 100644
--- a/cli/command_group/testcase.py
+++ b/cli/command_group/testcase.py
@@ -22,5 +22,4 @@ class Testcase(object):
         self.test_case_list = []
 
     def run(self, testname, noclean=False):
-        if testname == 'posca':
-            os.system('bash /home/opnfv/bottlenecks/run_tests.sh -s posca')
+        os.system('bash /home/opnfv/bottlenecks/run_tests.sh ' + testname)
diff --git a/cli/setup.py b/cli/setup.py
deleted file mode 100644
index 28314910..00000000
--- a/cli/setup.py
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env python
-##############################################################################
-# Copyright (c) 2016 Huawei Technologies Co.,Ltd 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 setuptools import setup
-
-setup(
-    name='bottlenecks',
-    version='0.1',
-    py_modules=['bottlenecks_cli'],
-    include_package_data=True,
-    install_requires=[
-        'click',
-    ],
-    entry_points='''
-        [console_scripts]
-        bottlenecks=bottlenecks_cli:main
-    ''',
-)
-
diff --git a/setup.py b/setup.py
index 8ca86175..244dc945 100644
--- a/setup.py
+++ b/setup.py
@@ -15,15 +15,13 @@ from setuptools import setup, find_packages
 
 setup(
     name="bottlenecks",
-    version="master",
+    version="0.1",
     py_modules=['cli/bottlenecks_cli'],
     packages=find_packages(),
     include_package_data=True,
     package_data={
         'utils': [
-            'utils/infra_setup/heat/*.py',
-            'utils/infra_setup/runner/*.py',
-            'utils/*.py'
+            '*.py'
         ],
         'config': [
             '*.yaml'