[CORD-2453] Remove the old TOSCA engine (and obsolete roles/playbooks)
Change-Id: I769303b5ddfa6e2a6ffd5bcc08e6e7f3285e7bba
diff --git a/roles/test-subscriber-config/templates/test-subscriber.yaml.j2 b/roles/test-subscriber-config/templates/test-subscriber.yaml.j2
index 4a6d5f5..b2b85c1 100644
--- a/roles/test-subscriber-config/templates/test-subscriber.yaml.j2
+++ b/roles/test-subscriber-config/templates/test-subscriber.yaml.j2
@@ -21,7 +21,13 @@
description: Creates a CORD test subscriber, created by platform-install
imports:
- - custom_types/xos.yaml
+ - custom_types/cordsubscriberroot.yaml
+ - custom_types/site.yaml
+ - custom_types/slice.yaml
+ - custom_types/user.yaml
+ - custom_types/voltservice.yaml
+ - custom_types/volttenant.yaml
+ - custom_types/serviceinstancelink.yaml
topology_template:
node_templates:
@@ -30,24 +36,21 @@
{{ site_name }}:
type: tosca.nodes.Site
properties:
- no-delete: true
- no-create: true
- no-update: true
+ name: {{ site_name }}
+ must-exist: true
# vsg slice, volt service, fully created in cord-services.yaml
{{ site_name }}_vsg:
type: tosca.nodes.Slice
properties:
- no-delete: true
- no-create: true
- no-update: true
+ name: {{ site_name }}_vsg
+ must-exist: true
service#volt:
type: tosca.nodes.VOLTService
properties:
- no-delete: true
- no-create: true
- no-update: true
+ name: volt
+ must-exist: true
# Test subscriber
@@ -58,82 +61,98 @@
password: letmein
firstname: john
lastname: doe
+ username: johndoe@myhouse.com
+ email: johndoe@myhouse.com
requirements:
- site:
node: {{ site_name }}
- relationship: tosca.relationships.MemberOfSite
- - dependency:
- node: {{ site_name }}_vsg
- relationship: tosca.relationships.DependsOn
+ relationship: tosca.relationships.BelongsToOne
+ # NOTE: is this useful? can't find this relation in the old TOSCA
+ # - dependency:
+ # node: {{ site_name }}_vsg
+ # relationship: tosca.relationships.DependsOn
# A subscriber
- My House:
- type: tosca.nodes.CORDSubscriber
+ my_house:
+ type: tosca.nodes.CordSubscriberRoot
properties:
- service_specific_id: 123
+ name: My House
+ service_specific_id: "123"
firewall_enable: false
cdn_enable: false
url_filter_enable: false
url_filter_level: R
- requirements:
- - house_admin:
- node: johndoe@myhouse.com
- relationship: tosca.relationships.AdminPrivilege
+ # NOTE this appears not to be used
+ # requirements:
+ # - house_admin:
+ # node: johndoe@myhouse.com
+ # relationship: tosca.relationships.AdminPrivilege
- Mom's PC:
- type: tosca.nodes.CORDUser
- properties:
- mac: 01:02:03:04:05:06
- level: PG_13
- requirements:
- - household:
- node: My House
- relationship: tosca.relationships.SubscriberDevice
+ # NOTE needs to be moved to a new model (now they are JSON encoded)
+ # Mom's PC:
+ # type: tosca.nodes.CORDUser
+ # properties:
+ # mac: 01:02:03:04:05:06
+ # level: PG_13
+ # requirements:
+ # - household:
+ # node: My House
+ # relationship: tosca.relationships.SubscriberDevice
- Dad's PC:
- type: tosca.nodes.CORDUser
- properties:
- mac: 90:E2:BA:82:F9:75
- level: PG_13
- requirements:
- - household:
- node: My House
- relationship: tosca.relationships.SubscriberDevice
+ # Dad's PC:
+ # type: tosca.nodes.CORDUser
+ # properties:
+ # mac: 90:E2:BA:82:F9:75
+ # level: PG_13
+ # requirements:
+ # - household:
+ # node: My House
+ # relationship: tosca.relationships.SubscriberDevice
- Jack's Laptop:
- type: tosca.nodes.CORDUser
- properties:
- mac: 68:5B:35:9D:91:D5
- level: PG_13
- requirements:
- - household:
- node: My House
- relationship: tosca.relationships.SubscriberDevice
+ # Jack's Laptop:
+ # type: tosca.nodes.CORDUser
+ # properties:
+ # mac: 68:5B:35:9D:91:D5
+ # level: PG_13
+ # requirements:
+ # - household:
+ # node: My House
+ # relationship: tosca.relationships.SubscriberDevice
- Jill's Laptop:
- type: tosca.nodes.CORDUser
- properties:
- mac: 34:36:3B:C9:B6:A6
- level: PG_13
- requirements:
- - household:
- node: My House
- relationship: tosca.relationships.SubscriberDevice
+ # Jill's Laptop:
+ # type: tosca.nodes.CORDUser
+ # properties:
+ # mac: 34:36:3B:C9:B6:A6
+ # level: PG_13
+ # requirements:
+ # - household:
+ # node: My House
+ # relationship: tosca.relationships.SubscriberDevice
- My Volt:
+ si#volt:
type: tosca.nodes.VOLTTenant
properties:
- service_specific_id: 123
+ name: My Volt
+ service_specific_id: "123"
s_tag: 222
c_tag: 111
requirements:
- - provider_service:
+ - owner:
node: service#volt
- relationship: tosca.relationships.MemberOfService
- - subscriber:
- node: My House
- relationship: tosca.relationships.BelongsToSubscriber
- - dependency:
- node: {{ site_name }}_vsg
- relationship: tosca.relationships.DependsOn
+ relationship: tosca.relationships.BelongsToOne
+ # - subscriber:
+ # node: my_house
+ # relationship: tosca.relationships.BelongsToSubscriber
+ # - dependency:
+ # node: {{ site_name }}_vsg
+ # relationship: tosca.relationships.DependsOn
+ My_Volt_My_House:
+ type: tosca.nodes.ServiceInstanceLink
+ requirements:
+ - provider_service_instance:
+ node: si#volt
+ relationship: tosca.relationships.BelongsToOne
+ - subscriber_service_instance:
+ node: my_house
+ relationship: tosca.relationships.BelongsToOne