X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=setup.py;h=881ef9272aff37d7d7cfd8e25050c7f95e980074;hb=c06dd21f8aea56ab7c299bdb1ef1487a3f75572e;hp=a346f57650bab28f39b26f5042df568b4e51218d;hpb=ce671dba3dafe0d7d80d4a7eea1f9395bc4d6d7d;p=yardstick.git

diff --git a/setup.py b/setup.py
old mode 100644
new mode 100755
index a346f5765..881ef9272
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,14 @@
-import ez_setup
+##############################################################################
+# Copyright (c) 2017 Ericsson AB 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 __future__ import absolute_import
 from setuptools import setup, find_packages
 
-ez_setup.use_setuptools()
 
 setup(
     name="yardstick",
@@ -10,30 +17,47 @@ setup(
     include_package_data=True,
     package_data={
         'yardstick': [
+            'benchmark/scenarios/availability/*.yaml',
+            'benchmark/scenarios/availability/attacker/*.yaml',
+            'benchmark/scenarios/availability/ha_tools/*.bash',
+            'benchmark/scenarios/availability/ha_tools/*/*.bash',
+            'benchmark/scenarios/availability/attacker/scripts/*.bash',
+            'benchmark/scenarios/availability/monitor/*.yaml',
+            'benchmark/scenarios/availability/monitor/script_tools/*.bash',
             'benchmark/scenarios/compute/*.bash',
             'benchmark/scenarios/networking/*.bash',
+            'benchmark/scenarios/networking/*.txt',
+            'benchmark/scenarios/parser/*.sh',
             'benchmark/scenarios/storage/*.bash',
-            'resources/files/*'
-         ]
+            'network_services/nfvi/collectd.conf',
+            'network_services/nfvi/collectd.sh',
+            'resources/files/*',
+            'resources/scripts/install/*.bash',
+            'resources/scripts/remove/*.bash'
+        ],
+        'etc': [
+            'yardstick/nodes/*/*.yaml',
+            'yardstick/*.sample'
+        ],
+        'tests': [
+            'opnfv/*/*.yaml',
+            'ci/*.sh'
+        ]
     },
     url="https://www.opnfv.org",
-    install_requires=["backport_ipaddress",  # remove with python3
-                      "flake8",
-                      "PyYAML>=3.10",
-                      "pbr<2.0,>=1.3",
-                      "python-glanceclient>=0.12.0",
-                      "python-heatclient>=0.2.12",
-                      "python-keystoneclient>=0.11.1",
-                      "python-neutronclient>=2.3.9",
-                      "python-novaclient>=2.24.1",
-                      "mock>=1.0.1",  # remove with python3
-                      "paramiko",
-                      "six"
-                      ],
+    extras_require={
+        'plot': ["matplotlib>=1.4.2"]
+    },
     entry_points={
         'console_scripts': [
             'yardstick=yardstick.main:main',
+            'yardstick-plot=yardstick.plot.plotter:main [plot]'
         ],
+        'yardstick.scenario': []
     },
-    scripts=['tools/yardstick-img-modify']
+    scripts=[
+        'tools/yardstick-img-modify',
+        'tools/yardstick-img-lxd-modify',
+        'tools/yardstick-img-dpdk-modify'
+    ]
 )