Merge "Adding scale up test case for l3fwd SRIOV."

[yardstick.git] / samples / vnf_samples / nsut / prox / prox-tg-topology-scale-up.yaml

diff --git a/samples/vnf_samples/nsut/prox/prox-tg-topology-scale-up.yaml b/samples/vnf_samples/nsut/prox/prox-tg-topology-scale-up.yaml
index 74c48ba..87db370 100644 (file)
--- a/samples/vnf_samples/nsut/prox/prox-tg-topology-scale-up.yaml
+++ b/samples/vnf_samples/nsut/prox/prox-tg-topology-scale-up.yaml
@@ -11,8 +11,9 @@
 # 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.
-
+---
 {% set vports = get(extra_args, 'vports', 2) %}
+
 nsd:nsd-catalog:
     nsd:
     -   id: prox-tg-topology
@@ -27,36 +28,25 @@ nsd:nsd-catalog:
             vnfd-id-ref: vnf__0
             VNF model: ../../vnf_descriptors/prox_vnf.yaml
         vld:
-        -   id: uplink_0
-            name: tg__0 to vnf__0 link 1
+{% for vport in range(0,vports,2|int) %}
+        -   id: uplink_{{loop.index0}}
+            name: tg__0 to vnf__0 link {{ vport + 1 }}
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '1'
-                vnfd-connection-point-ref: xe0
+                vnfd-connection-point-ref: xe{{ vport }}
                 vnfd-id-ref: tg__0
             -   member-vnf-index-ref: '2'
-                vnfd-connection-point-ref: xe0
+                vnfd-connection-point-ref: xe{{ vport }}
                 vnfd-id-ref: vnf__0
-{% for vport in range(vports-1|int) %}
-        -   id: downlink_{{ vport }}
-            name: vnf__0 to tg__0 link {{ vport+2 }}
+        -   id: downlink_{{loop.index0}}
+            name: vnf__0 to tg__0 link {{ vport + 2 }}
             type: ELAN
             vnfd-connection-point-ref:
-            -   member-vnf-index-ref: '1'
-                vnfd-connection-point-ref: xe{{ vport+1 }}
-                vnfd-id-ref: vnf__0
             -   member-vnf-index-ref: '2'
-                vnfd-connection-point-ref: xe{{ vport+1 }}
-                vnfd-id-ref: tg__0
-{% else %}
-        -   id: downlink_0
-            name: vnf__0 to tg__0 link 1
-            type: ELAN
-            vnfd-connection-point-ref:
-            -   member-vnf-index-ref: '1'
-                vnfd-connection-point-ref: xe0
+                vnfd-connection-point-ref: xe{{ vport + 1 }}
                 vnfd-id-ref: vnf__0
-            -   member-vnf-index-ref: '2'
-                vnfd-connection-point-ref: xe0
+            -   member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: xe{{ vport + 1 }}
                 vnfd-id-ref: tg__0
-{% endfor %}
\ No newline at end of file
+{% endfor %}