Merge "Adding sample yardstick.conf & pod files to help describe the topology"

2 files changed, 82 insertions, 0 deletions

diff --git a/etc/yardstick/nodes/pod.yaml.nsb.sample b/etc/yardstick/nodes/pod.yaml.nsb.sample
new file mode 100644
index 000000000..af51bdf8a
--- /dev/null
+++ b/etc/yardstick/nodes/pod.yaml.nsb.sample
@@ -0,0 +1,78 @@
+# Copyright (c) 2016-2017 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+nodes:
+-
+    name: trafficgen_1
+    role: TrafficGen
+    ip: 1.1.1.1
+    user: root
+    password: r00t
+    interfaces:
+        xe0:  # logical name from topology.yaml and vnfd.yaml
+            vpci:      "0000:05:00.0"
+            driver:    <nic kernel driver>
+            dpdk_port_num: 0
+            local_ip: "152.16.100.20"
+            netmask:   "255.255.255.0"
+            local_mac:   "00:00:00:00:00:01"
+        xe1:  # logical name from topology.yaml and vnfd.yaml
+            vpci:      "0000:05:00.1"
+            driver:    <nic kernel driver>
+            dpdk_port_num: 1
+            local_ip: "152.16.40.19"
+            netmask:   "255.255.255.0"
+            local_mac:   "00:00:00:00:00:02"
+
+-
+    name: vnf
+    role: TrafficGen
+    ip: 1.1.1.2
+    user: root
+    password: r00t
+    host: 1.1.1.2 # BM - Host == ip, Standalone virtualization - Host == compute node
+    interfaces:
+        xe0:  # logical name from topology.yaml and vnfd.yaml
+            vpci:      "0000:05:00.0"
+            driver:    <nic kernel driver>
+            dpdk_port_num: 0
+            local_ip: "152.16.100.21"
+            netmask:   "255.255.255.0"
+            local_mac:   "00:00:00:00:00:03"
+
+        xe1:  # logical name from topology.yaml and vnfd.yaml
+            vpci:      "0000:05:00.1"
+            driver:    <nic kernel driver>
+            dpdk_port_num: 1
+            local_ip: "152.16.40.21"
+            netmask:   "255.255.255.0"
+            local_mac:   "00:00:00:00:00:04"
+    routing_table:
+    - network: "152.16.100.20"
+      netmask: "255.255.255.0"
+      gateway: "152.16.100.20"
+      if: "xe0"
+    - network: "152.16.40.20"
+      netmask: "255.255.255.0"
+      gateway: "152.16.40.20"
+      if: "xe1"
+    nd_route_tbl:
+    - network: "0064:ff9b:0:0:0:0:9810:6414"
+      netmask: "112"
+      gateway: "0064:ff9b:0:0:0:0:9810:6414"
+      if: "xe0"
+    - network: "0064:ff9b:0:0:0:0:9810:2814"
+      netmask: "112"
+      gateway: "0064:ff9b:0:0:0:0:9810:2814"
+      if: "xe1"
diff --git a/etc/yardstick/yardstick.conf.sample b/etc/yardstick/yardstick.conf.sample
index 70cf71ade..572051186 100644
--- a/etc/yardstick/yardstick.conf.sample
+++ b/etc/yardstick/yardstick.conf.sample
@@ -26,3 +26,7 @@ target = http://127.0.0.1:8086
 db_name = yardstick
 username = root
 password = root
+
+[nsb]
+trex_path=/opt/nsb_bin/trex/scripts
+bin_path=/opt/nsb_bin