diff options
| author |   liang gao <jean.gaoliang@huawei.com> | 2016-07-26 01:34:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-07-26 01:34:14 +0000 |
| commit | dab477b757c53c18cc619f7f5c82fe5c0e61e67f (patch) | |
| tree | 5cc1213eb23c7d2a34fdc9b56fa3bf34b523532d | |
| parent | b0d32886194231709d9fc03cdb111b77529a4da0 (diff) | |
| parent | 3f8aabb29a49d650609832073c60589e68d9f3e8 (diff) | |
Merge "Update setup.py to include plugin install/remove scripts and rename "script" directory to "scripts""
| -rwxr-xr-x | setup.py | 4 | ||||
| -rw-r--r-- | yardstick/cmd/commands/plugin.py | 4 | ||||
| -rw-r--r-- | yardstick/resources/scripts/install/sample.bash (renamed from yardstick/resources/script/install/sample.bash) | 0 | ||||
| -rw-r--r-- | yardstick/resources/scripts/remove/sample.bash (renamed from yardstick/resources/script/remove/sample.bash) | 0 |
4 files changed, 5 insertions, 3 deletions
@@ -19,7 +19,9 @@ setup( 'benchmark/scenarios/networking/*.txt', 'benchmark/scenarios/parser/*.sh', 'benchmark/scenarios/storage/*.bash', - 'resources/files/*' + 'resources/files/*', + 'resources/scripts/install/*.bash', + 'resources/scripts/remove/*.bash' ] }, url="https://www.opnfv.org", diff --git a/yardstick/cmd/commands/plugin.py b/yardstick/cmd/commands/plugin.py index 52ecf2005..8e3ddb5a5 100644 --- a/yardstick/cmd/commands/plugin.py +++ b/yardstick/cmd/commands/plugin.py @@ -76,7 +76,7 @@ class PluginCommands(object): '''Deployment environment setup''' target_script = plugin_name + ".bash" self.script = pkg_resources.resource_filename( - 'yardstick.resources', 'script/install/' + target_script) + 'yardstick.resources', 'scripts/install/' + target_script) deployment_user = deployment.get("user") deployment_ip = deployment.get("ip") @@ -95,7 +95,7 @@ class PluginCommands(object): '''Deployment environment setup''' target_script = plugin_name + ".bash" self.script = pkg_resources.resource_filename( - 'yardstick.resources', 'script/remove/' + target_script) + 'yardstick.resources', 'scripts/remove/' + target_script) deployment_user = deployment.get("user") deployment_ip = deployment.get("ip") diff --git a/yardstick/resources/script/install/sample.bash b/yardstick/resources/scripts/install/sample.bash index 21eb14680..21eb14680 100644 --- a/yardstick/resources/script/install/sample.bash +++ b/yardstick/resources/scripts/install/sample.bash diff --git a/yardstick/resources/script/remove/sample.bash b/yardstick/resources/scripts/remove/sample.bash index 15618df2d..15618df2d 100644 --- a/yardstick/resources/script/remove/sample.bash +++ b/yardstick/resources/scripts/remove/sample.bash |