Introduce TOSCA 'order' property for connection points

This is a follow-on to [1] which uses dictionary for VNFD
template and no longer relies on OrderedDict to preserve
the order of the node_types in the VNFD template. Instead
we are going to insist the templates to explicit mention
the order of the CP.

[1] https://review.openstack.org/#/c/360809

Change-Id: Iaf7389305cfea90f158da0eaaa19afe86869541b
Closes-Bug: #1591361
This commit is contained in:
Sridhar Ramaswamy 2016-08-30 23:57:15 +00:00
parent ff5b90fdac
commit cf7f677fc7
17 changed files with 49 additions and 0 deletions

View File

@ -24,6 +24,7 @@ topology_template:
type: tosca.nodes.nfv.CP.Tacker
properties:
management: true
order: 0
requirements:
- virtualLink:
node: VL1

View File

@ -27,6 +27,7 @@ topology_template:
type: tosca.nodes.nfv.CP.Tacker
properties:
management: true
order: 0
anti_spoofing_protection: false
requirements:
- virtualLink:
@ -37,6 +38,7 @@ topology_template:
CP2:
type: tosca.nodes.nfv.CP.Tacker
properties:
order: 1
anti_spoofing_protection: false
requirements:
- virtualLink:
@ -47,6 +49,7 @@ topology_template:
CP3:
type: tosca.nodes.nfv.CP.Tacker
properties:
order: 2
anti_spoofing_protection: false
requirements:
- virtualLink:

View File

@ -35,6 +35,7 @@ topology_template:
type: tosca.nodes.nfv.CP.Tacker
properties:
management: true
order: 0
anti_spoofing_protection: false
requirements:
- virtualLink:
@ -45,6 +46,7 @@ topology_template:
CP2:
type: tosca.nodes.nfv.CP.Tacker
properties:
order: 1
anti_spoofing_protection: false
requirements:
- virtualLink:
@ -55,6 +57,7 @@ topology_template:
CP3:
type: tosca.nodes.nfv.CP.Tacker
properties:
order: 2
anti_spoofing_protection: false
requirements:
- virtualLink:

View File

@ -23,6 +23,7 @@ topology_template:
type: tosca.nodes.nfv.CP.Tacker
properties:
management: true
order: 0
requirements:
- virtualLink:
node: VL1

View File

@ -30,6 +30,7 @@ topology_template:
type: tosca.nodes.nfv.CP.Tacker
properties:
management: true
order: 0
anti_spoofing_protection: false
requirements:
- virtualLink:
@ -40,6 +41,7 @@ topology_template:
CP2:
type: tosca.nodes.nfv.CP.Tacker
properties:
order: 1
anti_spoofing_protection: false
requirements:
- virtualLink:
@ -50,6 +52,7 @@ topology_template:
CP3:
type: tosca.nodes.nfv.CP.Tacker
properties:
order: 2
anti_spoofing_protection: false
requirements:
- virtualLink:

View File

@ -28,6 +28,7 @@ topology_template:
type: tosca.nodes.nfv.CP.Tacker
properties:
management: true
order: 0
anti_spoofing_protection: false
requirements:
- virtualLink:

View File

@ -36,6 +36,7 @@ topology_template:
type: tosca.nodes.nfv.CP.Tacker
properties:
management: true
order: 0
anti_spoofing_protection: false
requirements:
- virtualLink:
@ -46,6 +47,7 @@ topology_template:
CP2:
type: tosca.nodes.nfv.CP.Tacker
properties:
order: 1
anti_spoofing_protection: false
requirements:
- virtualLink:
@ -56,6 +58,7 @@ topology_template:
CP3:
type: tosca.nodes.nfv.CP.Tacker
properties:
order: 2
anti_spoofing_protection: false
requirements:
- virtualLink:

View File

@ -27,6 +27,7 @@ topology_template:
type: tosca.nodes.nfv.CP.Tacker
properties:
management: true
order: 0
anti_spoofing_protection: false
requirements:
- virtualLink:
@ -37,6 +38,7 @@ topology_template:
CP12:
type: tosca.nodes.nfv.CP.Tacker
properties:
order: 1
anti_spoofing_protection: false
requirements:
- virtualLink:
@ -47,6 +49,7 @@ topology_template:
CP13:
type: tosca.nodes.nfv.CP.Tacker
properties:
order: 2
anti_spoofing_protection: false
requirements:
- virtualLink:
@ -69,6 +72,7 @@ topology_template:
type: tosca.nodes.nfv.CP.Tacker
properties:
management: true
order: 0
requirements:
- virtualLink:
node: VL1
@ -77,6 +81,9 @@ topology_template:
CP22:
type: tosca.nodes.nfv.CP.Tacker
properties:
order: 1
anti_spoofing_protection: false
requirements:
- virtualLink:
node: VL2
@ -85,6 +92,9 @@ topology_template:
CP23:
type: tosca.nodes.nfv.CP.Tacker
properties:
order: 2
anti_spoofing_protection: false
requirements:
- virtualLink:
node: VL3
@ -106,6 +116,7 @@ topology_template:
type: tosca.nodes.nfv.CP.Tacker
properties:
management: true
order: 0
requirements:
- virtualLink:
node: VL1
@ -114,6 +125,9 @@ topology_template:
CP32:
type: tosca.nodes.nfv.CP.Tacker
properties:
order: 1
anti_spoofing_protection: false
requirements:
- virtualLink:
node: VL2
@ -122,6 +136,9 @@ topology_template:
CP33:
type: tosca.nodes.nfv.CP.Tacker
properties:
order: 2
anti_spoofing_protection: false
requirements:
- virtualLink:
node: VL3

View File

@ -22,6 +22,7 @@ topology_template:
type: tosca.nodes.nfv.CP.Tacker
properties:
management: true
order: 0
anti_spoofing_protection: false
requirements:
- virtualLink:
@ -32,6 +33,7 @@ topology_template:
CP2:
type: tosca.nodes.nfv.CP.Tacker
properties:
order: 1
anti_spoofing_protection: false
requirements:
- virtualLink:
@ -42,6 +44,7 @@ topology_template:
CP3:
type: tosca.nodes.nfv.CP.Tacker
properties:
order: 2
anti_spoofing_protection: false
requirements:
- virtualLink:

View File

@ -22,6 +22,7 @@ topology_template:
type: tosca.nodes.nfv.CP.Tacker
properties:
management: true
order: 0
anti_spoofing_protection: false
requirements:
- virtualLink:
@ -32,6 +33,7 @@ topology_template:
CP2:
type: tosca.nodes.nfv.CP.Tacker
properties:
order: 1
anti_spoofing_protection: false
requirements:
- virtualLink:
@ -42,6 +44,7 @@ topology_template:
CP3:
type: tosca.nodes.nfv.CP.Tacker
properties:
order: 2
anti_spoofing_protection: false
requirements:
- virtualLink:

View File

@ -23,6 +23,7 @@ topology_template:
type: tosca.nodes.nfv.CP.Tacker
properties:
management: true
order: 0
requirements:
- virtualLink:
node: VL1

View File

@ -33,6 +33,7 @@ topology_template:
type: tosca.nodes.nfv.CP.Tacker
properties:
management: true
order: 0
requirements:
- virtualLink:
node: VL1

View File

@ -34,6 +34,7 @@ topology_template:
type: tosca.nodes.nfv.CP.Tacker
properties:
management: true
order: 0
anti_spoofing_protection: false
requirements:
- virtualLink:
@ -44,6 +45,7 @@ topology_template:
CP2:
type: tosca.nodes.nfv.CP.Tacker
properties:
order: 1
anti_spoofing_protection: false
requirements:
- virtualLink:
@ -54,6 +56,7 @@ topology_template:
CP3:
type: tosca.nodes.nfv.CP.Tacker
properties:
order: 2
anti_spoofing_protection: false
requirements:
- virtualLink:

View File

@ -19,6 +19,7 @@ topology_template:
type: tosca.nodes.nfv.CP.Tacker
properties:
management: true
order: 0
anti_spoofing_protection: false
requirements:
- virtualLink:
@ -38,6 +39,7 @@ topology_template:
type: tosca.nodes.nfv.CP.Tacker
properties:
management: true
order: 0
anti_spoofing_protection: false
requirements:
- virtualLink:

View File

@ -17,6 +17,7 @@ topology_template:
type: tosca.nodes.nfv.CP.Tacker
properties:
management: true
order: 0
requirements:
- virtualLink:
node: VL1
@ -26,6 +27,7 @@ topology_template:
CP2:
type: tosca.nodes.nfv.CP.Tacker
properties:
order: 1
type: sriov
requirements:
- virtualLink:

View File

@ -31,6 +31,7 @@ topology_template:
type: tosca.nodes.nfv.CP.Tacker
properties:
management: true
order: 0
anti_spoofing_protection: false
requirements:
- virtualLink:

View File

@ -26,6 +26,7 @@ topology_template:
type: tosca.nodes.nfv.CP.Tacker
properties:
management: true
order: 0
requirements:
- virtualLink:
node: VL1