From 04b1e4764cf5b2537d4649530dea78899bba3de3 Mon Sep 17 00:00:00 2001
From: Yujun Zhang <zhang.yujunz@zte.com.cn>
Date: Tue, 1 Nov 2016 13:40:40 +0800
Subject: Create setuptool configuration for qtip-cli

- currently only the cli is installed via setuptool
- api server in docker container will be installed via cli[1]
- normalized version string[2] for cli

[1]: https://jira.opnfv.org/browse/QTIP-133
[2]: https://setuptools.readthedocs.io/en/latest/setuptools.html#specifying-your-project-s-version

JIRA: QTIP-137
Change-Id: Ia53ae14fca271a250d59cb08e7c6c5cd7dad97a9
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
---
 cli/cli_entry.py | 44 --------------------------------------------
 cli/entry.py     | 44 ++++++++++++++++++++++++++++++++++++++++++++
 setup.py         | 22 ++++++++++++++++------
 3 files changed, 60 insertions(+), 50 deletions(-)
 delete mode 100644 cli/cli_entry.py
 create mode 100644 cli/entry.py

diff --git a/cli/cli_entry.py b/cli/cli_entry.py
deleted file mode 100644
index f6838f0c..00000000
--- a/cli/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.cli_ansible import CliAnsible
-
-CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'])
-
-
-@click.group(context_settings=CONTEXT_SETTINGS)
-@click.version_option(version='opnfv qtip.0.1 ')
-def cli():
-    pass
-
-_ansible = CliAnsible()
-
-
-@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/entry.py b/cli/entry.py
new file mode 100644
index 00000000..0f27be06
--- /dev/null
+++ b/cli/entry.py
@@ -0,0 +1,44 @@
+##############################################################################
+# 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.cli_ansible import CliAnsible
+
+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 = CliAnsible()
+
+
+@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/setup.py b/setup.py
index 85dc966b..fb6711c6 100644
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,20 @@
 #!/usr/bin/env python
 
-from distutils.core import setup
+from setuptools import setup
 
 
-setup(name='qtip',
-      py_modules=['qtip'],
-      version='1.0',
-      author='opnfv',
-      packages=['func', 'scripts.ref_results', 'utils.report'])
+setup(
+    name='qtip-cli',
+    version='0.1.dev0',
+    description='Platform Performance Benchmarking for OPNFV',
+    author='OPNFV',
+    author_email='zhang.yujunz@zte.com.cn',
+    install_requires=['click'],
+    packages=['cli'],
+    entry_points={
+        'console_scripts': ['qtip=cli.entry:cli']
+    },
+    license='Apache-2.0',
+    keywords="performance benchmark opnfv",
+    url="https://wiki.opnfv.org/display/qtip"
+)
-- 
cgit 1.2.3-korg