Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "bug-fix: ipv6 ml2 file should use variable"
[yardstick.git]
/
setup.py
diff --git
a/setup.py
b/setup.py
index
654ea0f
..
a2131cf
100755
(executable)
--- a/
setup.py
+++ b/
setup.py
@@
-8,12
+8,21
@@
setup(
include_package_data=True,
package_data={
'yardstick': [
include_package_data=True,
package_data={
'yardstick': [
+ 'benchmark/scenarios/availability/*.yaml',
'benchmark/scenarios/availability/attacker/*.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/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/compute/*.bash',
'benchmark/scenarios/networking/*.bash',
+ 'benchmark/scenarios/networking/*.txt',
+ 'benchmark/scenarios/parser/*.sh',
'benchmark/scenarios/storage/*.bash',
'benchmark/scenarios/storage/*.bash',
- 'resources/files/*'
+ 'resources/files/*',
+ 'resources/scripts/install/*.bash',
+ 'resources/scripts/remove/*.bash'
]
},
url="https://www.opnfv.org",
]
},
url="https://www.opnfv.org",
@@
-21,8
+30,10
@@
setup(
"coverage>=3.6",
"flake8",
"Jinja2>=2.6",
"coverage>=3.6",
"flake8",
"Jinja2>=2.6",
+ "lxml",
"PyYAML>=3.10",
"pbr<2.0,>=1.3",
"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-glanceclient>=0.12.0",
"python-heatclient>=0.2.12",
"python-keystoneclient>=0.11.1",
@@
-31,9
+42,11
@@
setup(
"mock>=1.0.1", # remove with python3
"paramiko",
"netifaces",
"mock>=1.0.1", # remove with python3
"paramiko",
"netifaces",
+ "scp",
"six",
"testrepository>=0.0.18",
"six",
"testrepository>=0.0.18",
- "testtools>=1.4.0"
+ "testtools>=1.4.0",
+ "nose"
],
extras_require={
'plot': ["matplotlib>=1.4.2"]
],
extras_require={
'plot': ["matplotlib>=1.4.2"]