X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=setup.py;h=881ef9272aff37d7d7cfd8e25050c7f95e980074;hb=bb31e6c8221b854041a668ddca438444fe97d212;hp=31d23de3aae141ac05b69a19a0d69b364fdf3f07;hpb=07db529f918b0c319df7aec2ce5f29d36c9a7a70;p=yardstick.git

diff --git a/setup.py b/setup.py
index 31d23de3a..881ef9272 100755
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,12 @@
+##############################################################################
+# 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
 
 
@@ -8,7 +17,10 @@ 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',
@@ -17,32 +29,22 @@ setup(
             '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
-                      "coverage>=3.6",
-                      "flake8",
-                      "Jinja2>=2.6",
-                      "lxml",
-                      "PyYAML>=3.10",
-                      "pbr<2.0,>=1.3",
-                      "python-openstackclient>=2.1.0",
-                      "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",
-                      "netifaces",
-                      "scp",
-                      "six",
-                      "testrepository>=0.0.18",
-                      "testtools>=1.4.0",
-                      "nose"
-                      ],
     extras_require={
         'plot': ["matplotlib>=1.4.2"]
     },
@@ -51,6 +53,11 @@ setup(
             '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'
+    ]
 )