Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "fix invalid chracters in ansible scripts"
[yardstick.git]
/
samples
/
vnf_samples
/
nsut
/
vpe
/
vpe_vnf_topology_ixload.yaml
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
5505a83
..
3d93f79
100644
(file)
--- a/
samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixload.yaml
+++ b/
samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixload.yaml
@@
-20,31
+20,31
@@
nsd:nsd-catalog:
description: scenario with VPE,L3fwd and VNF
constituent-vnfd:
- member-vnf-index: '1'
description: scenario with VPE,L3fwd and VNF
constituent-vnfd:
- member-vnf-index: '1'
- vnfd-id-ref: tg__
1
+ vnfd-id-ref: tg__
0
VNF model: ../../vnf_descriptors/tg_ixload.yaml
- member-vnf-index: '2'
VNF model: ../../vnf_descriptors/tg_ixload.yaml
- member-vnf-index: '2'
- vnfd-id-ref: vnf__
1
+ vnfd-id-ref: vnf__
0
VNF model: ../../vnf_descriptors/vpe_vnf.yaml
vld:
VNF model: ../../vnf_descriptors/vpe_vnf.yaml
vld:
- - id:
private
- name: tg__
1 to vnf__1
link 1
+ - id:
uplink_0
+ name: tg__
0 to vnf__0
link 1
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe0
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: tg__
1
#TREX
+ vnfd-id-ref: tg__
0
#TREX
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe0
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: vnf__
1
#VNF
+ vnfd-id-ref: vnf__
0
#VNF
- - id:
public
- name: vnf__
1 to tg__1
link 2
+ - id:
downlink_0
+ name: vnf__
0 to tg__0
link 2
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe1
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: vnf__
1
#L3fwd
+ vnfd-id-ref: vnf__
0
#L3fwd
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe1
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: tg__
1
#VPE VNF
+ vnfd-id-ref: tg__
0
#VPE VNF