Add a patch to make ram_num configurable for DPDKovp-2.1.0

1. add a patch to change bottlenecks source code within git repo
   /home/opnfv/bottlenecks
2. add a script to run the patch within Bottlenecks git repo
3. copy the edited file yardstick.py to /usr/local/lib
4. change the results dir from /home/opnfv/bottlenecks/results to
   /home/opnfv/results which is out of Bottlenecks git repo

JIRA: BOTTLENECKS-248

Change-Id: I86ff51ec41caf79fb16e0985db8eefa679153102
Signed-off-by: xudan <xudan16@huawei.com>

2 files changed, 7 insertions, 5 deletions

diff --git a/docs/testing/user/userguide/cli_reference.rst b/docs/testing/user/userguide/cli_reference.rst
index 97eccffc..c3ff0ed0 100644
--- a/docs/testing/user/userguide/cli_reference.rst
+++ b/docs/testing/user/userguide/cli_reference.rst
@@ -81,7 +81,7 @@ Commands List
 | dovetail run --report | -r <db_url>                                    | Package the results directory which can be used to upload to OVP web portal                       |
 |                                                                        |                                                                                                   |
 +------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------+
-| dovetail run --deploy-scenario <deploy_scenario_name>                  | Specify the deploy scenario having as project name 'ovs'                                          |
+| dovetail run --deploy-scenario <scenario> --ram-num <number>           | Specify the deploy scenario having as project name 'ovs' following the RAM number of flavors.     |
 |                                                                        |                                                                                                   |
 +------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------+
 | dovetail run --no-api-validation                                       | Disable strict API response validation                                                            |
@@ -255,6 +255,7 @@ Dovetail Run Commands
    -d, --debug             Flag for showing debug log on screen.
    --testcase TEXT         Compliance testcase. Specify option multiple times to include multiple test cases.
    --testarea TEXT         Compliance testarea within testsuite. Specify option multiple times to include multiple test areas.
+   --ram-num TEXT          Specify the RAM_NUM if it's DPDK scenario. The default value is 512 if not set.
    -s, --stop              Flag for stopping on test case failure.
    -n, --no-clean          Keep all Containers created for debuging.
    --no-api-validation     disable strict API response validation
@@ -264,12 +265,13 @@ Dovetail Run Commands
 
 .. code-block:: bash
 
-   root@1f230e719e44:~/dovetail/dovetail# dovetail run --testcase functest.vping.ssh --offline -r --deploy-scenario os-nosdn-ovs-ha
+   root@1f230e719e44:~/dovetail/dovetail# dovetail run --testcase functest.vping.ssh --offline -r --deploy-scenario os-nosdn-ovs-ha --ram-num 1024
    2017-10-12 14:57:51,278 - run - INFO - ================================================
    2017-10-12 14:57:51,278 - run - INFO - Dovetail compliance: ovp.2018.09!
    2017-10-12 14:57:51,278 - run - INFO - ================================================
    2017-10-12 14:57:51,278 - run - INFO - Build tag: daily-master-b80bca76-af5d-11e7-879a-0242ac110002
    2017-10-12 14:57:51,278 - run - INFO - DEPLOY_SCENARIO : os-nosdn-ovs-ha
+   2017-10-12 14:57:51,278 - run - INFO - RAM_NUM : 1024
    2017-10-12 14:57:51,336 - run - WARNING - There is no hosts file /home/dovetail/pre_config/hosts.yaml, may be some issues with domain name resolution.
    2017-10-12 14:57:51,336 - run - INFO - Get hardware info of all nodes list in file /home/cvp/pre_config/pod.yaml ...
    2017-10-12 14:57:51,336 - run - INFO - Hardware info of all nodes are stored in file /home/cvp/results/all_hosts_info.json.
diff --git a/docs/testing/user/userguide/testing_guide.rst b/docs/testing/user/userguide/testing_guide.rst
index 9010c80d..99bc001a 100644
--- a/docs/testing/user/userguide/testing_guide.rst
+++ b/docs/testing/user/userguide/testing_guide.rst
@@ -626,12 +626,12 @@ the DEPLOY_SCENARIO environment parameter having as substring the feature name "
 
 Note for the users:
  - if their system uses DPDK, they should run with --deploy-scenario <xx-yy-ovs-zz>
-   (e.g. os-nosdn-ovs-ha)
- - this is an experimental feature
+   (e.g. os-nosdn-ovs-ha) and --ram-num <number>
+ - deploy-scenario is an experimental feature
 
 .. code-block:: bash
 
-   $ dovetail run --testcase functest.tempest.osinterop --deploy-scenario os-nosdn-ovs-ha
+   $ dovetail run --testcase functest.tempest.osinterop --deploy-scenario os-nosdn-ovs-ha --ram-num 1024
 
 By default, results are stored in local files on the Test Host at ``$DOVETAIL_HOME/results``.
 Each time the 'dovetail run' command is executed, the results in the aforementioned directory