adjust project directories

JIRA: BOTTLENECK-56

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

8 files changed, 286 insertions, 0 deletions

diff --git a/testsuites/vstf/vstf_scripts/etc/vstf/env/Ti.json b/testsuites/vstf/vstf_scripts/etc/vstf/env/Ti.json
new file mode 100644
index 00000000..d122ddde
--- /dev/null
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/env/Ti.json
@@ -0,0 +1,63 @@
+{
+    "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/testsuites/vstf/vstf_scripts/etc/vstf/env/Tn.json b/testsuites/vstf/vstf_scripts/etc/vstf/env/Tn.json
new file mode 100644
index 00000000..f731457e
--- /dev/null
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/env/Tn.json
@@ -0,0 +1,36 @@
+{
+    "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/testsuites/vstf/vstf_scripts/etc/vstf/env/Tnv.json b/testsuites/vstf/vstf_scripts/etc/vstf/env/Tnv.json
new file mode 100644
index 00000000..3697dbbf
--- /dev/null
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/env/Tnv.json
@@ -0,0 +1,84 @@
+{
+    "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/testsuites/vstf/vstf_scripts/etc/vstf/env/Tu.json b/testsuites/vstf/vstf_scripts/etc/vstf/env/Tu.json
new file mode 100644
index 00000000..95bb81fc
--- /dev/null
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/env/Tu.json
@@ -0,0 +1,70 @@
+{
+    "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/testsuites/vstf/vstf_scripts/etc/vstf/env/eth2eth.json b/testsuites/vstf/vstf_scripts/etc/vstf/env/eth2eth.json
new file mode 100644
index 00000000..5662ae15
--- /dev/null
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/env/eth2eth.json
@@ -0,0 +1,16 @@
+{
+    "env-build": [
+        {
+            "ip": "hostA",
+            "drivers": ["ixgbe"],
+            "bridges": [],
+            "vms": []
+        },
+        {
+            "ip": "hostB",
+            "drivers": ["ixgbe"],
+            "bridges": [],
+            "vms": []
+        }	
+    ]
+}
diff --git a/testsuites/vstf/vstf_scripts/etc/vstf/env/images.json b/testsuites/vstf/vstf_scripts/etc/vstf/env/images.json
new file mode 100644
index 00000000..a1c187cd
--- /dev/null
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/env/images.json
@@ -0,0 +1,7 @@
+{
+    "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/testsuites/vstf/vstf_scripts/etc/vstf/env/src.json b/testsuites/vstf/vstf_scripts/etc/vstf/env/src.json
new file mode 100644
index 00000000..391b084c
--- /dev/null
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/env/src.json
@@ -0,0 +1,7 @@
+{
+    "vnx-bin":{
+        "install":true,
+        "url": "root@192.168.188.10:/root/src/vnx-bin",
+        "repo_type": "git"
+    }
+}
diff --git a/testsuites/vstf/vstf_scripts/etc/vstf/env/tester.json b/testsuites/vstf/vstf_scripts/etc/vstf/env/tester.json
new file mode 100644
index 00000000..213658df
--- /dev/null
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/env/tester.json
@@ -0,0 +1,3 @@
+{
+    "drivers": ["ixgbe"]
+}
\ No newline at end of file