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 changes from topics 'YARDSTICK-1250', 'YARDSTICK-1249'
[yardstick.git]
/
samples
/
vnf_samples
/
nsut
/
acl
/
acl-tg-topology.yaml
diff --git
a/samples/vnf_samples/nsut/acl/acl-tg-topology.yaml
b/samples/vnf_samples/nsut/acl/acl-tg-topology.yaml
index
9bc3e85
..
0066609
100644
(file)
--- a/
samples/vnf_samples/nsut/acl/acl-tg-topology.yaml
+++ b/
samples/vnf_samples/nsut/acl/acl-tg-topology.yaml
@@
-20,31
+20,31
@@
nsd:nsd-catalog:
description: 3tg-topology
constituent-vnfd:
- member-vnf-index: '1'
description: 3tg-topology
constituent-vnfd:
- member-vnf-index: '1'
- vnfd-id-ref: tg__
1
+ vnfd-id-ref: tg__
0
VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml #VNF type
- member-vnf-index: '2'
VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml #VNF type
- member-vnf-index: '2'
- vnfd-id-ref: vnf__
1
+ vnfd-id-ref: vnf__
0
VNF model: ../../vnf_descriptors/acl_vnf.yaml #VNF type
vld:
VNF model: ../../vnf_descriptors/acl_vnf.yaml #VNF type
vld:
- - id:
private_1
- 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
+ vnfd-id-ref: tg__
0
- 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
+ vnfd-id-ref: vnf__
0
- - id:
public_1
- 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
+ vnfd-id-ref: vnf__
0
- 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
+ vnfd-id-ref: tg__
0