Update setup.py to include plugin install/remove scripts and rename "script" director...

Change-Id: I420b391acc15e6c65816c33b8568e86d8238bcc7
Signed-off-by: JingLu5 <lvjing5@huawei.com>

diff --git a/setup.py b/setup.py
index 8b37943..3503738 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -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 52ecf20..8e3ddb5 100644 (file)
--- 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
similarity index 100%
rename from yardstick/resources/script/install/sample.bash
rename to yardstick/resources/scripts/install/sample.bash

diff --git a/yardstick/resources/script/remove/sample.bash b/yardstick/resources/scripts/remove/sample.bash
similarity index 100%
rename from yardstick/resources/script/remove/sample.bash
rename to yardstick/resources/scripts/remove/sample.bash