JIRA: BOTTLENECKS-29

 add the performance test framework

 add the copyright on the code.

Change-Id: I6ec9eefe65bf07c2dd6c636d1b90b64da303952e
Signed-off-by: Yiting.Li <liyiting@huawei.com>

5 files changed, 38 insertions, 57 deletions

diff --git a/vstf/etc/vstf/perf/sw_perf.batch-settings b/vstf/etc/vstf/perf/sw_perf.batch-settings
index 7926877d..83c6970d 100755
--- a/vstf/etc/vstf/perf/sw_perf.batch-settings
+++ b/vstf/etc/vstf/perf/sw_perf.batch-settings
@@ -4,7 +4,6 @@
             "case": "Tn-1",
             "tool": "netperf",
             "protocol": "udp",
-            "profile": "rdp",
             "type": "frameloss",
             "sizes": [64, 128, 512, 1024]
         },
@@ -12,7 +11,6 @@
             "case": "Tn-2",
             "tool": "pktgen",
             "protocol": "udp",
-            "profile": "rdp",
             "type": "frameloss",
             "sizes": [64, 128, 512, 1024]
         }
@@ -22,7 +20,6 @@
             "case": "Ti-1",
             "tool": "netperf",
             "protocol": "udp",
-            "profile": "rdp",
             "type": "frameloss",
             "sizes": [64, 128, 512, 1024]
         },
@@ -30,7 +27,6 @@
             "case": "Ti-2",
             "tool": "pktgen",
             "protocol": "udp",
-            "profile": "rdp",
             "type": "frameloss",
             "sizes": [64, 128, 512, 1024]
         },
@@ -38,7 +34,6 @@
             "case": "Ti-3",
             "tool": "pktgen",
             "protocol": "udp",
-            "profile": "rdp",
             "type": "frameloss",
             "sizes": [64, 128, 512, 1024]
         }
@@ -48,7 +43,6 @@
             "case": "Tnv-1",
             "tool": "netmap",
             "protocol": "udp",
-            "profile": "rdp",
             "type": "frameloss",
             "sizes": [64, 128, 512, 1024]
         },
@@ -56,7 +50,6 @@
             "case": "Tnv-2",
             "tool": "netperf",
             "protocol": "udp",
-            "profile": "rdp",
             "type": "frameloss",
             "sizes": [64, 128, 512, 1024]
         }
@@ -66,7 +59,6 @@
             "case": "Tu-1",
             "tool": "netperf",
             "protocol": "udp",
-            "profile": "rdp",
             "type": "frameloss",
             "sizes": [64, 128, 512, 1024]
         },
@@ -74,7 +66,6 @@
             "case": "Tu-2",
             "tool": "pktgen",
             "protocol": "udp",
-            "profile": "rdp",
             "type": "frameloss",
             "sizes": [64, 128, 512, 1024]
         },
@@ -82,7 +73,6 @@
             "case": "Tu-3",
             "tool": "netperf",
             "protocol": "udp",
-            "profile": "rdp",
             "type": "frameloss",
             "sizes": [64, 128, 512, 1024]
         }
diff --git a/vstf/etc/vstf/perf/sw_perf.device-settings b/vstf/etc/vstf/perf/sw_perf.device-settings
index a91340bd..e0dac25a 100755
--- a/vstf/etc/vstf/perf/sw_perf.device-settings
+++ b/vstf/etc/vstf/perf/sw_perf.device-settings
@@ -28,7 +28,7 @@
         ]
     },
     "vm-200":{
-        "agent": "192.168.188.200",
+        "agent": "192.168.188.185",
         "devs": [
             {
                 "mac": "56:6f:44:a5:3f:a2"
@@ -39,7 +39,7 @@
         ]
     },
      "vm-201":{
-        "agent": "192.168.188.201",
+        "agent": "192.168.188.186",
         "devs": [
             {
                 "mac": "56:6f:44:a5:3f:a4"
diff --git a/vstf/etc/vstf/reporter/reporter.pdf.story-show b/vstf/etc/vstf/reporter/reporter.pdf.story-show
deleted file mode 100755
index 514a0cc2..00000000
--- a/vstf/etc/vstf/reporter/reporter.pdf.story-show
+++ /dev/null
@@ -1,32 +0,0 @@
-[
-   {
-      "cover":{
-         "title":[],
-         "logo":[],
-         "header": [],
-         "footer": [],
-         "note": [],
-      }
-   },
-   {
-      "chapter":
-      {
-          "title":[],
-          "type":[],
-          "content":[
-              "paragraph":{
-                  "type": [],
-                  "content":[]
-              }
-              "section"
-
-
-          }
-
-
-      }
-
-   }
-
-
-]
\ No newline at end of file
diff --git a/vstf/etc/vstf/reporter/reporters.html.data-settings b/vstf/etc/vstf/reporter/reporters.html.data-settings
deleted file mode 100755
index 5c4e32b0..00000000
--- a/vstf/etc/vstf/reporter/reporters.html.data-settings
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "ovs":{
-        "content":{
-            "version":3.0
-        },
-        "title":"Ovs info"
-    },
-    "result":{
-        "content":{},
-        "title":"Performance Result"
-    },
-    "subject":"ATF Performance Test"
-}
diff --git a/vstf/etc/vstf/reporter/reporters.template-settings b/vstf/etc/vstf/reporter/reporters.template-settings
new file mode 100755
index 00000000..f0e4a29e
--- /dev/null
+++ b/vstf/etc/vstf/reporter/reporters.template-settings
@@ -0,0 +1,36 @@
+{
+    "theme":{
+        "style": "default",
+        "title": ["Virtual Switch Test Framework Report", "Scenario Tn"],
+        "logo": ["/root/workspace/esp-atf-2/vstf/controller/res/logo.jpg"],
+        "header": [""],
+        "footer": [""],
+        "note": [""]
+    },
+    "contents":{
+        "enable": true
+    },
+    "context":{
+        "01##chapter#1": {
+            "01##title#1": ["System Environment"],
+            "02##table#1": None
+        },
+        "02##chapter#2": {
+            "01##title#1": ["Scenario Result"],
+            "02##section#1": {
+                "01##title#2": ["Case: Tn-1"],
+                "02##paragraph#2": ["Parameter"],
+                "03##paragraph#2": ["test tool: pktgen", "vswitch: ovs", "protocol: udp", "type: frameloss" ],
+                "04##paragraph#2": ["Result"],
+                "05##table#1":[
+                    ["FrameSize (bytes)", "Bandwidth(Mpps)", "Load(%)", "CPU Usage(%)", "Mpps/Ghz"],
+                    ["64", "", "", "", "", ""]
+                ],
+                "06##plot#1":[
+                    ["64", "", "", "", "", ""]
+                ]
+            }
+        }
+
+    }
+}