Merge changes from topic 'euphrates-sync-2017-10-18' into stable/euphrates

* changes:
  tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_scale_2: fix indent
  Hamonization of the titles of the documents (Testing group)
  scale-out testcase template

1 files changed, 122 insertions, 0 deletions

diff --git a/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology-3node-4.yaml b/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology-3node-4.yaml
new file mode 100644
index 000000000..bf6431f8d
--- /dev/null
+++ b/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology-3node-4.yaml
@@ -0,0 +1,122 @@
+# Copyright (c) 2016 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.
+---
+nsd:nsd-catalog:
+  nsd:
+    - id: 4-vnf-correlated
+      name: 4-vnf-correlated
+      short-name: 4-vnf-correlated
+      description: 4-vnf-correlated
+      constituent-vnfd:
+        - member-vnf-index: '0'
+          vnfd-id-ref: tg__0
+          VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml      #VNF type
+        - member-vnf-index: '1'
+          vnfd-id-ref: tg__1
+          VNF model: ../../vnf_descriptors/udp_replay_vnf.yaml      #VNF type
+        - member-vnf-index: '2'
+          vnfd-id-ref: vnf__0
+          VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml      #VNF type
+        - member-vnf-index: '3'
+          vnfd-id-ref: vnf__1
+          VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml      #VNF type
+        - member-vnf-index: '4'
+          vnfd-id-ref: vnf__2
+          VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml      #VNF type
+        - member-vnf-index: '5'
+          vnfd-id-ref: vnf__3
+          VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml      #VNF type
+
+      vld:
+        - id: uplink_0
+          name: "tg__0 to vnf__0 link 0"
+          type: ELAN
+          vnfd-connection-point-ref:
+            - member-vnf-index-ref: '0'
+              vnfd-connection-point-ref: xe0
+              vnfd-id-ref: tg__0
+            - member-vnf-index-ref: '2'
+              vnfd-connection-point-ref: xe0
+              vnfd-id-ref: vnf__0
+        - id: downlink_0
+          name: "vnf__0 to tg__1 link 0"
+          type: ELAN
+          vnfd-connection-point-ref:
+            - member-vnf-index-ref: '2'
+              vnfd-connection-point-ref: xe1
+              vnfd-id-ref: vnf__0
+            - member-vnf-index-ref: '1'
+              vnfd-connection-point-ref: xe0
+              vnfd-id-ref: tg__1
+        - id: uplink_1
+          name: "tg__0 to vnf__1 link 1"
+          type: ELAN
+          vnfd-connection-point-ref:
+            - member-vnf-index-ref: '0'
+              vnfd-connection-point-ref: xe1
+              vnfd-id-ref: tg__0
+            - member-vnf-index-ref: '3'
+              vnfd-connection-point-ref: xe0
+              vnfd-id-ref: vnf__1
+        - id: downlink_1
+          name: "vnf__1 to tg__1 link 1"
+          type: ELAN
+          vnfd-connection-point-ref:
+            - member-vnf-index-ref: '3'
+              vnfd-connection-point-ref: xe1
+              vnfd-id-ref: vnf__1
+            - member-vnf-index-ref: '1'
+              vnfd-connection-point-ref: xe1
+              vnfd-id-ref: tg__1
+        - id: uplink_2
+          name: "tg__0 to vnf__2 link 2"
+          type: ELAN
+          vnfd-connection-point-ref:
+            - member-vnf-index-ref: '0'
+              vnfd-connection-point-ref: xe2
+              vnfd-id-ref: tg__0
+            - member-vnf-index-ref: '4'
+              vnfd-connection-point-ref: xe0
+              vnfd-id-ref: vnf__2
+        - id: downlink_2
+          name: "vnf__2 to tg__1 link 2"
+          type: ELAN
+          vnfd-connection-point-ref:
+            - member-vnf-index-ref: '4'
+              vnfd-connection-point-ref: xe1
+              vnfd-id-ref: vnf__2
+            - member-vnf-index-ref: '1'
+              vnfd-connection-point-ref: xe2
+              vnfd-id-ref: tg__1
+        - id: uplink_3
+          name: "tg__0 to vnf__3 link 3"
+          type: ELAN
+          vnfd-connection-point-ref:
+            - member-vnf-index-ref: '0'
+              vnfd-connection-point-ref: xe3
+              vnfd-id-ref: tg__0
+            - member-vnf-index-ref: '5'
+              vnfd-connection-point-ref: xe0
+              vnfd-id-ref: vnf__3
+        - id: downlink_3
+          name: "vnf__3 to tg__1 link 3"
+          type: ELAN
+          vnfd-connection-point-ref:
+            - member-vnf-index-ref: '5'
+              vnfd-connection-point-ref: xe1
+              vnfd-id-ref: vnf__3
+            - member-vnf-index-ref: '1'
+              vnfd-connection-point-ref: xe3
+              vnfd-id-ref: tg__1
+