adjust project directories

JIRA: BOTTLENECK-56

Change-Id: Ic9acad5eaa4917093bdb85a80960f796f5b4ba7f
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>

23 files changed, 0 insertions, 749 deletions

diff --git a/vstf/etc/vstf/amqp/amqp.ini b/vstf/etc/vstf/amqp/amqp.ini
deleted file mode 100644
index 8f355e68..00000000
--- a/vstf/etc/vstf/amqp/amqp.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[rabbit]
-user=guest
-passwd=guest
-host=192.168.188.10
-port=5672
-id="local"
-[spirent]
-package='/home/Spirent_TestCenter_4.46/Spirent_TestCenter_Application_Linux'
-
diff --git a/vstf/etc/vstf/default/reporters.html-settings b/vstf/etc/vstf/default/reporters.html-settings
deleted file mode 100644
index de75f70b..00000000
--- a/vstf/etc/vstf/default/reporters.html-settings
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "style":{
-        "table":{
-            "font-family":"\"Trebuchet MS\", Arial, Helvetica, sans-serif",
-            "border":"1px solid green",
-            "border-collapse":"collapse",
-            "padding":"8px",
-            "text-align":"center"
-        },
-        "td":{
-            "border":"1px solid green",
-            "padding":"8px",
-            "word-wrap":"break-all"
-        },
-        "th":{
-            "background-color":"#EAF2D3",
-            "border":"1px solid green",
-            "padding":"8px"
-        }
-    }
-    
-}
diff --git a/vstf/etc/vstf/default/reporters.mail.mail-settings b/vstf/etc/vstf/default/reporters.mail.mail-settings
deleted file mode 100644
index 89bbcb5f..00000000
--- a/vstf/etc/vstf/default/reporters.mail.mail-settings
+++ /dev/null
@@ -1,21 +0,0 @@
-//Place your settings in the file "user/reporters.mail.mail-settings",
-//which overrides the settings in here.
-{
-    "server": 
-    {
-        "host": "localhost",
-        "username": null, 
-        "password": null
-    },
-    "body":
-    {
-        "from": ["vstf_from@vstf.com"],
-        "to": ["vstf_to@vstf.com"],
-        "cc": ["vstf_cc@vstf.com"],
-        "bcc": ["vstf_bcc@vstf.com"],
-        "subject": "Virtual Switching Performance Test Report"
-    }
-}
-
-
-
diff --git a/vstf/etc/vstf/default/sw_perf.tool-settings b/vstf/etc/vstf/default/sw_perf.tool-settings
deleted file mode 100644
index e72a0bc2..00000000
--- a/vstf/etc/vstf/default/sw_perf.tool-settings
+++ /dev/null
@@ -1,29 +0,0 @@
-//Place your settings in the file "user/sw_perf.tool-settings",
-//which overrides the settings in here.
-{
-    "pktgen":{
-        "threads": 2,
-        "wait": 5,
-        "time": 20
-    },
-    "netperf":{
-        "threads": 2,
-        "wait": 5,
-        "time": 20
-    },
-    "qperf":{
-        "threads": 1,
-        "wait": 5,
-        "time": 2
-    },
-    "iperf":{
-        "threads": 1,
-        "wait": 5,
-        "time": 20
-    },
-    "netmap":{
-        "threads": 1,
-        "wait": 12,
-        "time": 20
-    }
-}
\ No newline at end of file
diff --git a/vstf/etc/vstf/env/Ti.json b/vstf/etc/vstf/env/Ti.json
deleted file mode 100644
index d122ddde..00000000
--- a/vstf/etc/vstf/env/Ti.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-    "env-build": [
-        {
-            "ip": "192.168.188.14",
-            "drivers": [
-                "ixgbe"
-            ]
-        },
-        {
-            "ip": "192.168.188.16",
-            "drivers": [
-                "ixgbe",
-                "vhost_net"
-            ],
-            "bridges": [
-                {
-                    "type": "ovs",
-                    "name": "ovs1",
-                    "uplinks": [
-                        {
-                            "bdf": "04:00.0",
-                            "vlan_mode": "trunk",
-                            "vlan_id": "1,100,200,300,400"
-                        }
-                    ],
-                    "vtep": {},
-                    "fastlink": [
-                        {
-                            "inport": "04:00.0",
-                            "outport": "tap0"
-                        }
-                    ]
-                }
-            ],
-            "vms": [
-                {
-                    "vm_cpu": 3,
-                    "vm_name": "test1",
-                    "vm_memory": 4194304,
-                    "image_path": "/mnt/sdb/test1.qcow2",
-                    "image_type": "qcow2",
-                    "init_config": {
-                        "amqp_server": "192.168.188.10",
-                        "ctrl_ip_setting": "192.168.188.200/23",
-                        "ctrl_gw": "192.168.188.1"
-                    },
-                    "taps": [
-                        {
-                            "tap_name": "tap0",
-                            "br_type": "ovs",
-                            "br_name": "ovs1",
-                            "tap_mac": "56:6f:44:a5:3f:a2",
-                            "vlan_mode": "access",
-                            "vlan_id": "1"
-                        }
-                    ],
-                    "ctrl_mac": "16:6f:44:a5:3f:a2",
-                    "ctrl_br": "br0"
-                }
-            ]
-        }
-    ]
-}
diff --git a/vstf/etc/vstf/env/Tn.json b/vstf/etc/vstf/env/Tn.json
deleted file mode 100644
index f731457e..00000000
--- a/vstf/etc/vstf/env/Tn.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "env-build": [
-        {
-            "ip": "192.168.188.16",
-            "drivers": [
-                "ixgbe"
-            ],
-            "bridges": [
-                {
-                    "type": "ovs",
-                    "name": "ovs1",
-                    "uplinks": [
-                        {
-                            "bdf": "04:00.0",
-                            "vlan_mode": "trunk",
-                            "vlan_id": "1,100,200"
-                        },
-                        {
-                            "bdf": "04:00.1",
-                            "vlan_mode": "trunk",
-                            "vlan_id": "1,100,200"
-                        }
-                    ],
-                    "vtep": {},
-                    "fastlink": [
-                        {
-                            "inport": "04:00.0",
-                            "outport": "04:00.1"
-                        }
-                    ]
-                }
-            ],
-            "vms": []
-        }
-    ]
-}
diff --git a/vstf/etc/vstf/env/Tnv.json b/vstf/etc/vstf/env/Tnv.json
deleted file mode 100644
index 3697dbbf..00000000
--- a/vstf/etc/vstf/env/Tnv.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-    "env-build": [
-        {
-            "ip": "192.168.188.16",
-            "drivers": [
-                "ixgbe",
-                "vhost_net"
-            ],
-            "bridges": [
-                {
-                    "type": "ovs",
-                    "name": "ovs1",
-                    "uplinks": [
-                        {
-                            "bdf": "04:00.0",
-                            "vlan_mode": "access",
-                            "vlan_id": "1"
-                        }
-                    ],
-                    "vtep": {},
-                    "fastlink": [
-                        {
-                            "inport": "04:00.0",
-                            "outport": "tap0"
-                        }
-                    ]
-                },
-                {
-                    "type": "ovs",
-                    "name": "ovs2",
-                    "uplinks": [
-                        {
-                            "bdf": "04:00.1",
-                            "vlan_mode": "access",
-                            "vlan_id": "1"
-                        }
-                    ],
-                    "vtep": {},
-                    "fastlink": [
-                        {
-                            "inport": "04:00.1",
-                            "outport": "tap1"
-                        }
-                    ]
-                }
-            ],
-            "vms": [
-                {
-                    "vm_cpu": 3,
-                    "vm_name": "test1",
-                    "vm_memory": 4194304,
-                    "image_path": "/mnt/sdb/test1.qcow2",
-                    "image_type": "qcow2",
-                    "init_config": {
-                        "amqp_server": "192.168.188.10",
-                        "ctrl_ip_setting": "192.168.188.200/23",
-                        "tap_pktloop_config": "dpdk",
-                        "ctrl_gw": "192.168.188.1"
-                    },
-                    "taps": [
-                        {
-                            "tap_name": "tap0",
-                            "br_type": "ovs",
-                            "br_name": "ovs1",
-                            "tap_mac": "56:6f:44:a5:3f:a2",
-                            "vlan_mode": "access",
-                            "vlan_id": "1"
-                        },
-                        {
-                            "tap_name": "tap1",
-                            "br_type": "ovs",
-                            "br_name": "ovs2",
-                            "tap_mac": "56:6f:44:a5:3f:a3",
-                            "vlan_mode": "access",
-                            "vlan_id": "1"
-                        }
-                    ],
-                    "ctrl_br": "br0",
-                    "ctrl_model": "rtl8139"
-                }
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/vstf/etc/vstf/env/Tu.json b/vstf/etc/vstf/env/Tu.json
deleted file mode 100644
index 95bb81fc..00000000
--- a/vstf/etc/vstf/env/Tu.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-    "env-build": [
-        {
-            "ip": "192.168.188.16",
-            "drivers": [
-                "vhost_net"
-            ],
-            "bridges": [
-                {
-                    "type": "ovs",
-                    "name": "ovs1",
-                    "uplinks": [],
-                    "vtep": {},
-                    "fastlink": [
-                        {
-                            "inport": "tap0",
-                            "outport": "tap1"
-                        }
-                    ]
-                }
-            ],
-            "vms": [
-                {
-                    "vm_cpu": 3,
-                    "vm_name": "test1",
-                    "vm_memory": 4194304,
-                    "image_path": "/mnt/sdb/test1.qcow2",
-                    "image_type": "qcow2",
-                    "init_config": {
-                        "amqp_server": "192.168.188.10",
-                        "ctrl_ip_setting": "192.168.188.200/23",
-                        "ctrl_gw": "192.168.188.1"
-                    },
-                    "taps": [
-                        {
-                            "tap_name": "tap0",
-                            "br_type": "ovs",
-                            "br_name": "ovs1",
-                            "tap_mac": "56:6f:44:a5:3f:a2",
-                            "vlan_mode": "access",
-                            "vlan_id": "100"
-                        }
-                    ]
-                },
-                {
-                    "vm_cpu": 3,
-                    "vm_name": "test2",
-                    "vm_memory": 4194304,
-                    "image_path": "/mnt/sdb/test2.qcow2",
-                    "image_type": "qcow2",
-                    "init_config": {
-                        "amqp_server": "192.168.188.10",
-                        "ctrl_ip_setting": "192.168.188.201/23",
-                        "ctrl_gw": "192.168.188.1"
-                    },
-                    "taps": [
-                        {
-                            "tap_name": "tap1",
-                            "br_type": "ovs",
-                            "br_name": "ovs1",
-                            "tap_mac": "56:6f:44:a5:3f:a4",
-                            "vlan_mode": "access",
-                            "vlan_id": "100"
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}
diff --git a/vstf/etc/vstf/env/eth2eth.json b/vstf/etc/vstf/env/eth2eth.json
deleted file mode 100644
index 5662ae15..00000000
--- a/vstf/etc/vstf/env/eth2eth.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "env-build": [
-        {
-            "ip": "hostA",
-            "drivers": ["ixgbe"],
-            "bridges": [],
-            "vms": []
-        },
-        {
-            "ip": "hostB",
-            "drivers": ["ixgbe"],
-            "bridges": [],
-            "vms": []
-        }	
-    ]
-}
diff --git a/vstf/etc/vstf/env/images.json b/vstf/etc/vstf/env/images.json
deleted file mode 100644
index a1c187cd..00000000
--- a/vstf/etc/vstf/env/images.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "parent_image": "/mnt/sdb/ubuntu_salt_master.img",
-    "dst_location": "/mnt/sdb",
-    "full_clone":false,
-    "type": "qcow2",
-    "names": ["test1","test2","test3","test4"]
-}
diff --git a/vstf/etc/vstf/env/src.json b/vstf/etc/vstf/env/src.json
deleted file mode 100644
index 391b084c..00000000
--- a/vstf/etc/vstf/env/src.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "vnx-bin":{
-        "install":true,
-        "url": "root@192.168.188.10:/root/src/vnx-bin",
-        "repo_type": "git"
-    }
-}
diff --git a/vstf/etc/vstf/env/tester.json b/vstf/etc/vstf/env/tester.json
deleted file mode 100644
index 213658df..00000000
--- a/vstf/etc/vstf/env/tester.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "drivers": ["ixgbe"]
-}
\ No newline at end of file
diff --git a/vstf/etc/vstf/perf/sw_perf.batch-settings b/vstf/etc/vstf/perf/sw_perf.batch-settings
deleted file mode 100644
index 83c6970d..00000000
--- a/vstf/etc/vstf/perf/sw_perf.batch-settings
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-    "Tn":[
-        {
-            "case": "Tn-1",
-            "tool": "netperf",
-            "protocol": "udp",
-            "type": "frameloss",
-            "sizes": [64, 128, 512, 1024]
-        },
-        {
-            "case": "Tn-2",
-            "tool": "pktgen",
-            "protocol": "udp",
-            "type": "frameloss",
-            "sizes": [64, 128, 512, 1024]
-        }
-    ],
-    "Ti":[
-        {
-            "case": "Ti-1",
-            "tool": "netperf",
-            "protocol": "udp",
-            "type": "frameloss",
-            "sizes": [64, 128, 512, 1024]
-        },
-        {
-            "case": "Ti-2",
-            "tool": "pktgen",
-            "protocol": "udp",
-            "type": "frameloss",
-            "sizes": [64, 128, 512, 1024]
-        },
-        {
-            "case": "Ti-3",
-            "tool": "pktgen",
-            "protocol": "udp",
-            "type": "frameloss",
-            "sizes": [64, 128, 512, 1024]
-        }
-    ],
-    "Tnv":[
-        {
-            "case": "Tnv-1",
-            "tool": "netmap",
-            "protocol": "udp",
-            "type": "frameloss",
-            "sizes": [64, 128, 512, 1024]
-        },
-        {
-            "case": "Tnv-2",
-            "tool": "netperf",
-            "protocol": "udp",
-            "type": "frameloss",
-            "sizes": [64, 128, 512, 1024]
-        }
-    ],
-    "Tu":[
-        {
-            "case": "Tu-1",
-            "tool": "netperf",
-            "protocol": "udp",
-            "type": "frameloss",
-            "sizes": [64, 128, 512, 1024]
-        },
-        {
-            "case": "Tu-2",
-            "tool": "pktgen",
-            "protocol": "udp",
-            "type": "frameloss",
-            "sizes": [64, 128, 512, 1024]
-        },
-        {
-            "case": "Tu-3",
-            "tool": "netperf",
-            "protocol": "udp",
-            "type": "frameloss",
-            "sizes": [64, 128, 512, 1024]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/vstf/etc/vstf/perf/sw_perf.cpu-settings b/vstf/etc/vstf/perf/sw_perf.cpu-settings
deleted file mode 100644
index 77b9304c..00000000
--- a/vstf/etc/vstf/perf/sw_perf.cpu-settings
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "affctl":{
-        "policy": 2
-    }
-}
\ No newline at end of file
diff --git a/vstf/etc/vstf/perf/sw_perf.device-settings b/vstf/etc/vstf/perf/sw_perf.device-settings
deleted file mode 100644
index e0dac25a..00000000
--- a/vstf/etc/vstf/perf/sw_perf.device-settings
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "tester":{
-        "agent": "192.168.188.14",
-        "devs": [
-            {
-                "bdf": "04:00.0"
-            },
-            {
-                "bdf": "04:00.1"
-            }
-        ]
-    },
-    "host":{
-        "agent": "192.168.188.16",
-        "devs": [
-            {
-                "bdf": "04:00.0"
-            },
-            {
-                "bdf": "04:00.1"
-            },
-            {
-                "iface": "tap0"
-            },
-            {
-                "iface": "tap1"
-            }
-        ]
-    },
-    "vm-200":{
-        "agent": "192.168.188.185",
-        "devs": [
-            {
-                "mac": "56:6f:44:a5:3f:a2"
-            },
-            {
-                "mac": "56:6f:44:a5:3f:a3"
-            }
-        ]
-    },
-     "vm-201":{
-        "agent": "192.168.188.186",
-        "devs": [
-            {
-                "mac": "56:6f:44:a5:3f:a4"
-            },
-            {
-                "mac": "56:6f:44:a5:3f:a5"
-            }
-        ]
-    },
-    "tables":{
-        "vm-201": "host",
-        "vm-200": "host"
-    }
-}
diff --git a/vstf/etc/vstf/perf/sw_perf.flownodes-settings b/vstf/etc/vstf/perf/sw_perf.flownodes-settings
deleted file mode 100644
index c9cc75b7..00000000
--- a/vstf/etc/vstf/perf/sw_perf.flownodes-settings
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-    "cpu_listens":[
-        {
-            "agent":"192.168.188.16",
-            "affctl":{
-                "policy": 2
-            }
-        }
-    ],
-    "flows":2,
-    "namespaces":[
-        {
-            "agent":"192.168.188.14",
-            "dev":{
-                "bdf":"04:00.0",
-                "iface":"eth4",
-                "ip":"192.168.1.100",
-                "mac":"90:e2:ba:20:1f:d8",
-                "namespace":"vstf-space-1"
-            }
-        },
-        {
-            "agent":"192.168.188.14",
-            "dev":{
-                "bdf":"04:00.1",
-                "iface":"p57p2",
-                "ip":"192.168.1.101",
-                "mac":"90:e2:ba:20:1f:d9",
-                "namespace":"vstf-space-2"
-            }
-        }
-    ],
-    "receivers":[
-        {
-            "agent":"192.168.188.14",
-            "dev":{
-                "bdf":"04:00.1",
-                "iface":"p57p2",
-                "ip":"192.168.1.101",
-                "mac":"90:e2:ba:20:1f:d9",
-                "namespace":"vstf-space-2"
-            }
-        },
-        {
-            "agent":"192.168.188.14",
-            "dev":{
-                "bdf":"04:00.0",
-                "iface":"eth4",
-                "ip":"192.168.1.100",
-                "mac":"90:e2:ba:20:1f:d8",
-                "namespace":"vstf-space-1"
-            }
-        }
-    ],
-    "senders":[
-        {
-            "agent":"192.168.188.14",
-            "dev":{
-                "bdf":"04:00.0",
-                "iface":"eth4",
-                "ip":"192.168.1.100",
-                "mac":"90:e2:ba:20:1f:d8",
-                "namespace":"vstf-space-1"
-            }
-        },
-        {
-            "agent":"192.168.188.14",
-            "dev":{
-                "bdf":"04:00.1",
-                "iface":"p57p2",
-                "ip":"192.168.1.101",
-                "mac":"90:e2:ba:20:1f:d9",
-                "namespace":"vstf-space-2"
-            }
-        }
-    ],
-    "watchers":[
-        {
-            "agent":"192.168.188.14",
-            "dev":{
-                "bdf":"04:00.0",
-                "iface":"eth4",
-                "ip":"192.168.1.100",
-                "mac":"90:e2:ba:20:1f:d8",
-                "namespace":"vstf-space-1"
-            }
-        },
-        {
-            "agent":"192.168.188.14",
-            "dev":{
-                "bdf":"04:00.1",
-                "iface":"p57p2",
-                "ip":"192.168.1.101",
-                "mac":"90:e2:ba:20:1f:d9",
-                "namespace":"vstf-space-2"
-            }
-        }
-    ]
-}
\ No newline at end of file
diff --git a/vstf/etc/vstf/perf/sw_perf.forwarding-settings b/vstf/etc/vstf/perf/sw_perf.forwarding-settings
deleted file mode 100644
index 17f66434..00000000
--- a/vstf/etc/vstf/perf/sw_perf.forwarding-settings
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "head": {
-        "ip": "192.168.1.100",
-        "namespace": "vstf-space-1"
-    },
-
-    "tail": {
-        "ip": "192.168.1.101",
-        "namespace": "vstf-space-2"
-    },
-
-    "Tnv":{
-        "flows":[
-            ["tester", 0],
-            ["host", 0],
-            ["host", 2],
-            ["host", 3],
-            ["host", 1],
-            ["tester", 1]
-        ],
-        "watchers": [1, 4]
-    },
-    "Tn":{
-        "flows":[
-            ["tester", 0],
-            ["host", 0],
-            ["host", 1],
-            ["tester", 1]
-        ],
-        "watchers": [1, 2]
-    },
-    "Tu":{
-        "flows":[
-            ["vm-200", 0],
-            ["host", 2],
-            ["host", 3],
-            ["vm-201", 0]
-
-        ],
-        "watchers": [1, 2]
-    },
-    "Ti":{
-        "flows":[
-            ["tester", 1],
-            ["host", 0],
-            ["host", 2],
-            ["vm-200", 0]
-        ],
-        "watchers": [1, 2]
-    }
-}
\ No newline at end of file
diff --git a/vstf/etc/vstf/reporter/reporters.template-settings b/vstf/etc/vstf/reporter/reporters.template-settings
deleted file mode 100644
index f0e4a29e..00000000
--- a/vstf/etc/vstf/reporter/reporters.template-settings
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "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", "", "", "", "", ""]
-                ]
-            }
-        }
-
-    }
-}
diff --git a/vstf/etc/vstf/spirent/optimize.ini b/vstf/etc/vstf/spirent/optimize.ini
deleted file mode 100644
index 23fefea7..00000000
--- a/vstf/etc/vstf/spirent/optimize.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[common]
-tester_ip = 9.31.1.215
-[send]
-nic=enp129s0f1
-port=2/5
-vlans=100 300 500 700
-macs = 68:05:CA:30:4F:01 68:05:CA:30:4F:02 68:05:CA:30:4F:03 68:05:CA:30:4F:04
-ip_sections=193.168.100.1 194.168.100.1 195.168.100.1 196.168.100.1
-[recv]
-nic=enp129s0f0
-port=2/9
-macs = 68:05:CA:30:4F:05 68:05:CA:30:4F:06 68:05:CA:30:4F:07 68:05:CA:30:4F:08
-vlans=200 400 600 800
-ip_sections=193.168.100.2 194.168.100.2 195.168.100.2 196.168.100.2
diff --git a/vstf/etc/vstf/spirent/strategy.ini b/vstf/etc/vstf/spirent/strategy.ini
deleted file mode 100644
index 08731505..00000000
--- a/vstf/etc/vstf/spirent/strategy.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-[strategy1]
-qemu_numa=1
-src_vhost_numa=1
-dst_vhost_numa=1
-src_irq_numa=1
-dst_irq_numa=1
-loan_numa=0
-[strategy2]
-qemu_numa=0
-src_vhost_numa=0
-dst_vhost_numa=0
-src_irq_numa=0
-dst_irq_numa=0
-loan_numa=1
-[strategy3]
-qemu_numa=1
-src_vhost_numa=0
-dst_vhost_numa=0
-src_irq_numa=0
-dst_irq_numa=0
-loan_numa=1
diff --git a/vstf/etc/vstf/user/reporters.html-settings b/vstf/etc/vstf/user/reporters.html-settings
deleted file mode 100644
index deaa69b8..00000000
--- a/vstf/etc/vstf/user/reporters.html-settings
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-   
-}
diff --git a/vstf/etc/vstf/user/reporters.mail.mail-settings b/vstf/etc/vstf/user/reporters.mail.mail-settings
deleted file mode 100644
index e5c7b44f..00000000
--- a/vstf/etc/vstf/user/reporters.mail.mail-settings
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "server": {
-        "host": "localhost",
-        "username": null,
-        "password": null
-    },
-    "body": {
-        "from": [
-        ],
-        "to": [
-        ],
-        "cc": [],
-        "bcc": []
-    }
-}
diff --git a/vstf/etc/vstf/user/sw_perf.tool-settings b/vstf/etc/vstf/user/sw_perf.tool-settings
deleted file mode 100644
index 2c63c085..00000000
--- a/vstf/etc/vstf/user/sw_perf.tool-settings
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}