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
changes/52/363352/3
Sridhar Ramaswamy 6 years ago
parent ff5b90fdac
commit cf7f677fc7
  1. 1
      samples/tosca-templates/vnfd/tosca-vnfd-cpu-dedicate.yaml
  2. 3
      samples/tosca-templates/vnfd/tosca-vnfd-hello-world.yaml
  3. 3
      samples/tosca-templates/vnfd/tosca-vnfd-http-monitor.yaml
  4. 1
      samples/tosca-templates/vnfd/tosca-vnfd-hugepages.yaml
  5. 3
      samples/tosca-templates/vnfd/tosca-vnfd-image.yaml
  6. 1
      samples/tosca-templates/vnfd/tosca-vnfd-keyname.yaml
  7. 3
      samples/tosca-templates/vnfd/tosca-vnfd-monitor.yaml
  8. 17
      samples/tosca-templates/vnfd/tosca-vnfd-multi-vdu.yaml
  9. 3
      samples/tosca-templates/vnfd/tosca-vnfd-network.yaml
  10. 3
      samples/tosca-templates/vnfd/tosca-vnfd-nova-flavor.yaml
  11. 1
      samples/tosca-templates/vnfd/tosca-vnfd-numacount.yaml
  12. 1
      samples/tosca-templates/vnfd/tosca-vnfd-numadefine.yaml
  13. 3
      samples/tosca-templates/vnfd/tosca-vnfd-openwrt.yaml
  14. 2
      samples/tosca-templates/vnfd/tosca-vnfd-scale.yaml
  15. 2
      samples/tosca-templates/vnfd/tosca-vnfd-sriov.yaml
  16. 1
      samples/tosca-templates/vnfd/tosca-vnfd-userdata.yaml
  17. 1
      samples/tosca-templates/vnfd/tosca-vnfd-vcpu-topology.yaml

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

@ -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:

@ -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:

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

@ -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:

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

@ -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:

@ -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

@ -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:

@ -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:

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

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

@ -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:

@ -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:

@ -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:

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

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

Loading…
Cancel
Save