Update new TOSCA recipes
Change-Id: I02b903c65ba2c79c8b42aaf49b4f1c834b44db44
diff --git a/roles/cord-profile/templates/sdn-controller-service.yaml.j2 b/roles/cord-profile/templates/sdn-controller-service.yaml.j2
index d76df34..e0f4b36 100644
--- a/roles/cord-profile/templates/sdn-controller-service.yaml.j2
+++ b/roles/cord-profile/templates/sdn-controller-service.yaml.j2
@@ -21,7 +21,15 @@
imports:
- custom_types/xos.yaml
- - custom_types/sdncontroller.yaml
+ - custom_types/slice.yaml
+ - custom_types/site.yaml
+ - custom_types/image.yaml
+ - custom_types/flavor.yaml
+ - custom_types/network.yaml
+ - custom_types/networkslice.yaml
+ - custom_types/sdncontrollerservice.yaml
+ - custom_types/sdncontrollervendor.yaml
+ - custom_types/sdncontrollerserviceinstance.yaml
topology_template:
node_templates:
@@ -29,58 +37,58 @@
# site, image, fully created in deployment.yaml
{{ site_name }}:
type: tosca.nodes.Site
+ properties:
+ must-exist: true
+ name: {{ site_name }}
m1.small:
type: tosca.nodes.Flavor
- m1.large:
- type: tosca.nodes.Flavor
- m1.medium:
- type: tosca.nodes.Flavor
- m1.xlarge:
- type: tosca.nodes.Flavor
+ properties:
+ name: m1.small
+ must-exist: true
trusty-server-multi-nic:
type: tosca.nodes.Image
+ properties:
+ name: trusty-server-multi-nic
+ must-exist: true
# management networks, fully created in management-net.yaml
management:
- type: tosca.nodes.network.Network.XOS
+ type: tosca.nodes.Network
properties:
- no-create: true
- no-delete: true
- no-update: true
+ must-exist: true
+ name: management
{% if use_management_hosts %}
management_hosts:
- type: tosca.nodes.network.Network.XOS
+ type: tosca.nodes.Network
properties:
- no-create: true
- no-delete: true
- no-update: true
+ must-exist: true
+ name: management_hosts
{% endif %}
-# sbi_network
+# sbi_network is for connectivity between VMs, fully created in sbi-net.yaml
sbi_network:
- type: tosca.nodes.network.Network.XOS
+ type: tosca.nodes.Network
properties:
- no-create: true
- no-delete: true
- no-update: true
+ must-exist: true
+ name: sbi_network
-# nbi_network
+# nbi_network is for connectivity between VMs, fully created in nbi-net.yaml
nbi_network:
- type: tosca.nodes.network.Network.XOS
+ type: tosca.nodes.Network
properties:
- no-create: true
- no-delete: true
- no-update: true
+ must-exist: true
+ name: nbi_network
# CORD Services
service#sdncontroller:
type: tosca.nodes.SDNControllerService
properties:
- public_key: { get_artifact: [ SELF, pubkey, LOCAL_FILE] }
+ name: sdncontroller
+ public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
private_key_fn: /opt/xos/services/sdncontroller/keys/mcord_rsa
artifacts:
pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
@@ -90,26 +98,76 @@
description: SDN controller slice
type: tosca.nodes.Slice
properties:
+ name: {{ site_name }}_sdncontroller
+ default_isolation: vm
network: noauto
requirements:
- site:
node: mysite
- relationship: tosca.relationships.MemberOfSite
- - sdncontroller_service:
+ relationship: tosca.relationships.BelongsToOne
+ - service:
node: service#sdncontroller
- relationship: tosca.relationships.MemberOfService
+ relationship: tosca.relationships.BelongsToOne
- default_image:
node: trusty-server-multi-nic
- relationship: tosca.relationships.DefaultImage
+ relationship: tosca.relationships.BelongsToOne
- default_flavor:
node: m1.small
- relationship: tosca.relationships.DefaultFlavor
- - connection_to_management:
- node: management
- relationship: tosca.relationships.ConnectsToNetwork
- - connection_to_sbi_network:
- node: sbi_network
- relationship: tosca.relationships.ConnectsToNetwork
- - connection_to_nbi_network:
- node: nbi_network
- relationship: tosca.relationships.ConnectsToNetwork
\ No newline at end of file
+ relationship: tosca.relationships.BelongsToOne
+
+# CORD Service Instances
+
+ intel_sdncontroller:
+ type: tosca.nodes.SDNControllerVendor
+ properties:
+ name: intel_sdncontroller
+ requirements:
+ - image:
+ node: trusty-server-multi-nic
+ relationship: tosca.relationships.BelongsToOne
+ - flavor:
+ node: m1.small
+ relationship: tosca.relationships.BelongsToOne
+
+ serviceinstance#sdncontroller_instance:
+ type: tosca.nodes.SDNControllerServiceInstance
+ properties:
+ name: sdncontroller_instance1
+ requirements:
+ - sdncontroller_vendor:
+ node: intel_sdncontroller
+ relationship: tosca.relationships.BelongsToOne
+ - owner:
+ node: service#sdncontroller
+ relationship: tosca.relationships.BelongsToOne
+
+# CORD NetworkSlices
+ sdncontroller_slice_management_network:
+ type: tosca.nodes.NetworkSlice
+ requirements:
+ - network:
+ node: management
+ relationship: tosca.relationships.BelongsToOne
+ - slice:
+ node: {{ site_name }}_sdncontroller
+ relationship: tosca.relationships.BelongsToOne
+
+ sdncontroller_slice_sbi_network:
+ type: tosca.nodes.NetworkSlice
+ requirements:
+ - network:
+ node: sbi_network
+ relationship: tosca.relationships.BelongsToOne
+ - slice:
+ node: {{ site_name }}_sdncontroller
+ relationship: tosca.relationships.BelongsToOne
+
+ sdncontroller_slice_nbi_network:
+ type: tosca.nodes.NetworkSlice
+ requirements:
+ - network:
+ node: nbi_network
+ relationship: tosca.relationships.BelongsToOne
+ - slice:
+ node: {{ site_name }}_sdncontroller
+ relationship: tosca.relationships.BelongsToOne