summaryrefslogtreecommitdiffstats
path: root/samples
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2017-09-26 23:30:06 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-26 23:30:06 +0000
commit624e4d44b60b08deece8ed957829734698250368 (patch)
tree206c60988140add89c1cf191643d394967ed9239 /samples
parentc84187fc404d44082826f98b47c28d3d8f6690e5 (diff)
parent61c14d899ebd62cf0ec82a21353fc3ec1c637430 (diff)
Merge "Fix vPE VNF characterization issues."
Diffstat (limited to 'samples')
-rw-r--r--samples/vnf_samples/nsut/vpe/vpe_vnf_topology-3node.yaml4
-rw-r--r--samples/vnf_samples/nsut/vpe/vpe_vnf_topology.yaml4
-rw-r--r--samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixia.yaml4
-rw-r--r--samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixload.yaml4
-rw-r--r--samples/vnf_samples/traffic_profiles/ipv4_throughput_vpe.yaml16
5 files changed, 16 insertions, 16 deletions
diff --git a/samples/vnf_samples/nsut/vpe/vpe_vnf_topology-3node.yaml b/samples/vnf_samples/nsut/vpe/vpe_vnf_topology-3node.yaml
index 8a1d335de..7bd4bff84 100644
--- a/samples/vnf_samples/nsut/vpe/vpe_vnf_topology-3node.yaml
+++ b/samples/vnf_samples/nsut/vpe/vpe_vnf_topology-3node.yaml
@@ -30,7 +30,7 @@ nsd:nsd-catalog:
VNF model: ../../vnf_descriptors/udp_replay_vnf.yaml #tg_vpe_upstream.yaml #VPE VNF
vld:
- - id: uplink
+ - id: uplink_0
name: tg__0 to vnf__0 link 1
type: ELAN
vnfd-connection-point-ref:
@@ -41,7 +41,7 @@ nsd:nsd-catalog:
vnfd-connection-point-ref: xe0
vnfd-id-ref: vnf__0 #VNF
- - id: downlink
+ - id: downlink_0
name: vnf__0 to tg__1 link 2
type: ELAN
vnfd-connection-point-ref:
diff --git a/samples/vnf_samples/nsut/vpe/vpe_vnf_topology.yaml b/samples/vnf_samples/nsut/vpe/vpe_vnf_topology.yaml
index 5ad45028a..4ade967f7 100644
--- a/samples/vnf_samples/nsut/vpe/vpe_vnf_topology.yaml
+++ b/samples/vnf_samples/nsut/vpe/vpe_vnf_topology.yaml
@@ -27,7 +27,7 @@ nsd:nsd-catalog:
VNF model: ../../vnf_descriptors/vpe_vnf.yaml #tg_l3fwd.yaml #tg_trex_tpl.yaml #TREX
vld:
- - id: uplink
+ - id: uplink_0
name: tg__0 to vnf__0 link 1
type: ELAN
vnfd-connection-point-ref:
@@ -38,7 +38,7 @@ nsd:nsd-catalog:
vnfd-connection-point-ref: xe0
vnfd-id-ref: vnf__0 #VNF
- - id: downlink
+ - id: downlink_0
name: vnf__0 to tg__0 link 2
type: ELAN
vnfd-connection-point-ref:
diff --git a/samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixia.yaml b/samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixia.yaml
index 315a30845..d7e11a696 100644
--- a/samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixia.yaml
+++ b/samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixia.yaml
@@ -27,7 +27,7 @@ nsd:nsd-catalog:
VNF model: ../../vnf_descriptors/vpe_vnf.yaml
vld:
- - id: uplink
+ - id: uplink_0
name: tg__0 to vnf__0 link 1
type: ELAN
vnfd-connection-point-ref:
@@ -38,7 +38,7 @@ nsd:nsd-catalog:
vnfd-connection-point-ref: xe0
vnfd-id-ref: vnf__0 #VNF
- - id: downlink
+ - id: downlink_0
name: vnf__0 to tg__0 link 2
type: ELAN
vnfd-connection-point-ref:
diff --git a/samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixload.yaml b/samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixload.yaml
index aa1dc0d4f..3d93f79e3 100644
--- a/samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixload.yaml
+++ b/samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixload.yaml
@@ -27,7 +27,7 @@ nsd:nsd-catalog:
VNF model: ../../vnf_descriptors/vpe_vnf.yaml
vld:
- - id: uplink
+ - id: uplink_0
name: tg__0 to vnf__0 link 1
type: ELAN
vnfd-connection-point-ref:
@@ -38,7 +38,7 @@ nsd:nsd-catalog:
vnfd-connection-point-ref: xe0
vnfd-id-ref: vnf__0 #VNF
- - id: downlink
+ - id: downlink_0
name: vnf__0 to tg__0 link 2
type: ELAN
vnfd-connection-point-ref:
diff --git a/samples/vnf_samples/traffic_profiles/ipv4_throughput_vpe.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput_vpe.yaml
index f42db932c..8bac32404 100644
--- a/samples/vnf_samples/traffic_profiles/ipv4_throughput_vpe.yaml
+++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput_vpe.yaml
@@ -131,15 +131,15 @@ uplink_1:
outer_l3v4:
proto: "tcp"
- srcip4: "{{get(flow, 'flow.src_ip1', '192.168.0.0-192.168.255.255') }}"
- dstip4: "{{get(flow, 'flow.dst_ip1', '192.16.0.0-192.16.0.31') }}"
+ srcip4: "{{get(flow, 'flow.src_ip_1', '192.168.0.0-192.168.255.255') }}"
+ dstip4: "{{get(flow, 'flow.dst_ip_1', '192.16.0.0-192.16.0.31') }}"
count: "{{get(flow, 'flow.count', '1') }}"
ttl: 32
dscp: 32
outer_l4:
- srcport: "{{get(flow, 'flow.src_port1', '0') }}"
- dstport: "{{get(flow, 'flow.dst_port1', '0') }}"
+ srcport: "{{get(flow, 'flow.src_port_1', '0') }}"
+ dstport: "{{get(flow, 'flow.dst_port_1', '0') }}"
count: "{{get(flow, 'flow.count', '1') }}"
downlink_1:
ipv4:
@@ -155,13 +155,13 @@ downlink_1:
outer_l3v4:
proto: "tcp"
- srcip4: "{{get(flow, 'flow.dst_ip1', '192.16.0.0-192.16.0.31') }}"
- dstip4: "{{get(flow, 'flow.src_ip1', '192.168.0.0-192.168.255.255') }}"
+ srcip4: "{{get(flow, 'flow.dst_ip_1', '192.16.0.0-192.16.0.31') }}"
+ dstip4: "{{get(flow, 'flow.src_ip_1', '192.168.0.0-192.168.255.255') }}"
count: "{{get(flow, 'flow.count', '1') }}"
ttl: 32
dscp: 32
outer_l4:
- srcport: "{{get(flow, 'flow.dst_port1', '0') }}"
- dstport: "{{get(flow, 'flow.src_port1', '0') }}"
+ srcport: "{{get(flow, 'flow.dst_port_1', '0') }}"
+ dstport: "{{get(flow, 'flow.src_port_1', '0') }}"
count: "{{get(flow, 'flow.count', '1') }}"