update: address for testing db

Change-Id: I48b30fffd1de2512e4f46ee951a85299edc06a1c
Signed-off-by: MofassirArif <Mofassir_Arif@dellteam.com>

diff --git a/dashboard/pushtoDB.py b/dashboard/pushtoDB.py
index 4460262..750ec03 100644 (file)
--- a/dashboard/pushtoDB.py
+++ b/dashboard/pushtoDB.py
@@ -2,7 +2,7 @@ import requests
 import json\r
 import datetime\r
 import os\r
-TEST_DB = 'http://213.77.62.197'\r
+TEST_DB = 'http://testresults.opnfv.org/testapi'\r
 \r
 suite_list = [('compute_result.json', 'compute_test_suite'),('network_result.json', 'network_test_suite'),('storage_result.json', 'storage_test_suite')]\r
 payload_list = { }\r

diff --git a/data/hosts b/data/hosts
index ec2e4b8..5efc7cb 100644 (file)
--- a/data/hosts
+++ b/data/hosts
@@ -1,4 +1,3 @@
-[1-server]
-10.20.0.5
-[2-host]
-10.20.0.4
+[host]
+172.18.1.39
+172.18.1.38

diff --git a/data/my_key.pem b/data/my_key.pem
index d7c96f2..c08dbd7 100644 (file)
--- a/data/my_key.pem
+++ b/data/my_key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

diff --git a/docker/run_qtip.sh b/docker/run_qtip.sh
index 79c2a22..a4729c0 100755 (executable)
--- a/docker/run_qtip.sh
+++ b/docker/run_qtip.sh
@@ -11,17 +11,17 @@ source ${QTIP_DIR}/opnfv-creds.sh
 
 if [ "$TEST_CASE" == "compute" ]; then
     cd ${QTIP_DIR}  && python qtip.py -l ${NODE_NAME} -f compute
-    cd ${QTIP_DIR}/data/ref_results/ $$ python compute_suite.py
+    cd ${QTIP_DIR}/data/ref_results/ && python compute_suite.py
 fi
 
 if [ "$TEST_CASE" == "storage" ]; then
     cd ${QTIP_DIR}  && python qtip.py -l ${NODE_NAME} -f storage
-    cd ${QTIP_DIR}/data/ref_results/ $$ python storage_suite.py
+    cd ${QTIP_DIR}/data/ref_results/ && python storage_suite.py
 fi
 
 if [ "$TEST_CASE" == "network" ]; then
     cd ${QTIP_DIR}  && python qtip.py -l ${NODE_NAME} -f network
-    cd ${QTIP_DIR}/data/ref_results/ $$ python network_suite.py
+    cd ${QTIP_DIR}/data/ref_results/ && python network_suite.py
 fi
 
 
@@ -30,9 +30,9 @@ if [ "$TEST_CASE" == "all" ]; then
     cd ${QTIP_DIR}  && python qtip.py -l ${NODE_NAME} -f storage
     cd ${QTIP_DIR}  && python qtip.py -l ${NODE_NAME} -f network
 
-    cd ${QTIP_DIR}/data/ref_results/ $$ python compute_suite.py
-    cd ${QTIP_DIR}/data/ref_results/ $$ python storage_suite.py
-    cd ${QTIP_DIR}/data/ref_results/ $$ python network_suite.py
+    cd ${QTIP_DIR}/data/ref_results/ && python compute_suite.py
+    cd ${QTIP_DIR}/data/ref_results/ && python storage_suite.py
+    cd ${QTIP_DIR}/data/ref_results/ && python network_suite.py
 fi
 
 

diff --git a/docs/network_testcases.rst b/docs/network_testcases.rst
index ac68b11..1c6fb91 100644 (file)
--- a/docs/network_testcases.rst
+++ b/docs/network_testcases.rst
@@ -7,11 +7,12 @@ Network Throughput for VMs
 Network Throughput for Compute Nodes\r
 \r
 For the throughout of the compute nodes we simply go into the systems-under-test\r
-and install iperf3 on the nodes. One of the SUTs is used a server and the other as a\r
-client. The client pushes traffic to the server for a duration specified by the user\r
-configuration file for iperf. These files can be found in the test_cases/{POD}/network/\r
-directory. The bandwidth is limited only by the physical link layer speed available to the server.\r
-The result file inlcudes the b/s bandwidth and the CPU usage for both the client and server.\r
+ and install iperf3 on the nodes. One of the SUTs is used a server and the\r
+ other as a client. The client pushes traffic to the server for a duration specified by\r
+ the user\r
+ configuration file for iperf. These files can be found in the test_cases/{POD}/network/\r
+ directory. The bandwidth is limited only by the physical link layer speed available to the server.\r
+ The result file inlcudes the b/s bandwidth and the CPU usage for both the client and server.\r
 \r
 For the VMs we are running two topologies through the framework.\r
 \r
@@ -19,20 +20,20 @@ For the VMs we are running two topologies through the framework.
 2: VMs on different compute nodes\r
 \r
 QTIP framework sets up a stack with a private network, security groups, routers and attaches the VMs to this network. Iperf3 is installed\r
-on the VMs and one is assigned the role of client while other serves as a server. Traffic is pushed\r
-over the QTIP private network between the VMs. A closer look in needed to see how the traffic actually\r
-flows between the VMs in this configuration to understand what is happening to the packet as traverses\r
-the openstack network.\r
+ on the VMs and one is assigned the role of client while other serves as a server. Traffic is pushed\r
+ over the QTIP private network between the VMs. A closer look in needed to see how the traffic actually\r
+ flows between the VMs in this configuration to understand what is happening to the packet as traverses\r
+ the openstack network.\r
 \r
 The packet originates from VM1 and its sent to the linux bridge via a tap interface where the security groups\r
-are written. Afterwards the packet is forwarded to the Integration bridge via a patch port. Since VM2 is also connected\r
-to the Integration bridge in a similar manner as VM1 so the packet gets forwarded to the linux bridge connecting\r
-VM2. After the linux bridge the packet is sent to VM2 and is recieved by the Iperf3 server. Since no physical link is\r
-involved in this topology, only the OVS (Integration bridge) is being benchmarked and we are seeing bandwidth in the range\r
-of 14-15 Gbps.\r
+ are written. Afterwards the packet is forwarded to the Integration bridge via a patch port. Since VM2 is also connected\r
+ to the Integration bridge in a similar manner as VM1 so the packet gets forwarded to the linux bridge connecting\r
+ VM2. After the linux bridge the packet is sent to VM2 and is recieved by the Iperf3 server. Since no physical link is\r
+ involved in this topology, only the OVS (Integration bridge) is being benchmarked and we are seeing bandwidth in the range\r
+ of 14-15 Gbps.\r
 \r
 For the topology where the VMs are spawned on different compute nodes, the path the packet takes becomes more cumbersome.\r
-The packet leaves a VM and makes its way to the Integration Bridge as in the first topology however the integration bridge\r
+The packet leaves a VM and makes its way to the Integration Bridge as in the first topology however the integration bridge \r
 forwards the packet to the physical link through the ethernet bridge. The packet then gets a VLAN/Tunnel depending on the network\r
 and is forwarded to the particular Compute node where the second VM is spwaned. The packets enter the compute node through the physical\r
 ethernet port and makes its way to the VM through the integration bridge and linux bridge. As seen here the path is much more involved\r

diff --git a/func/driver.py b/func/driver.py
index d20c0e9..9f7db23 100644 (file)
--- a/func/driver.py
+++ b/func/driver.py
@@ -21,7 +21,7 @@ class Driver:
         print os.environ['PWD']
         self.dic_json = defaultdict()
 
-    def drive_bench(self, benchmark, roles, benchmark_detail= None, pip_dict = None):
+    def drive_bench(self, benchmark, roles, benchmark_detail = None, pip_dict = None):
 
         roles= sorted(roles)
         pip_dict = sorted(pip_dict)