Add proxy info in sample-config.yaml and 03-usage-guide.rst

JIRA:QTIP-73

Change-Id: I4cf5ee2f1bd7eeb79076b505cc51d607516410ed
Signed-off-by: zhifeng.jiang <jiang.zhifeng@zte.com.cn>

diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index eae9ea2..8dcaa11 100644 (file)
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -28,6 +28,11 @@ Context:
       OS_image: QTIP_CentOS
       flavor: m1.large
       role: server
+#Proxy_Environment key was optional.If all the Machines could access the public network, no need to define Proxy_Environment.Could be used later for getting http,https proxy infos which would be setted on all the Host_Manchines and Virtual_Machines.
+  Proxy_Environment:
+    http_proxy: http://10.20.0.1:8118
+    https_proxy: http://10.20.0.1:8118
+    no_proxy: localhost,127.0.0.1,10.20.*,192.168.*
 
 # A general description of the testcase. Could be used later for reports.
 Test_Description:
@@ -43,5 +48,3 @@ Test_Description:
           OS_image:
           flavor:
           role: '''
-  
- 

diff --git a/docs/user_guides/03-usage-guide.rst b/docs/user_guides/03-usage-guide.rst
index 69eed34..56cc16b 100644 (file)
--- a/docs/user_guides/03-usage-guide.rst
+++ b/docs/user_guides/03-usage-guide.rst
@@ -243,6 +243,33 @@ virtualmachine_1 and then run on virtualmachine_2.
 The above field is purely for a decription purpose to explain to
 the user the working of the test and is not fed to the framework.
 
+Running dhrystone with proxy (Optional):
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In order to run the dhrystone on the hosts or vms which can only access the
+public network by proxy, the user needs to add the `Proxy_Environment` info
+in `Context` tag.
+
+::
+
+  Context:
+    Host_Machines:
+      machine_1:
+        ip: 10.20.0.29
+        pw:
+        role: host
+      machine_2:
+        ip: 10.20.0.30
+        pw:
+        role: host
+
+    Virtual_Machines:
+
+    Proxy_Environment:
+      http_proxy: http://10.20.0.1:8118
+      https_proxy: http://10.20.0.1:8118
+      no_proxy: localhost,127.0.0.1,10.20.*,192.168.*
+
 Sample dhrystone_vm.yaml file:
 ------------------------------
 ::