[COMAC-91,92,96] Define COMAC services and draw service chains on latest XOS
Change-Id: I6c179fafa53b8f341a9904ea266bb5d978d57537
diff --git a/xos-profiles/mcord/Chart.yaml b/xos-profiles/mcord/Chart.yaml
index 47998d4..cf3108b 100644
--- a/xos-profiles/mcord/Chart.yaml
+++ b/xos-profiles/mcord/Chart.yaml
@@ -17,7 +17,7 @@
description: A Helm chart for the "mcord" profile
icon: https://guide.opencord.org/logos/cord.svg
-version: 1.1.2
+version: 1.1.3
# xosproject/tosca-loader version
appVersion: 1.3.0
diff --git a/xos-profiles/mcord/templates/_tosca.tpl b/xos-profiles/mcord/templates/_tosca.tpl
index 175f406..45f3b12 100644
--- a/xos-profiles/mcord/templates/_tosca.tpl
+++ b/xos-profiles/mcord/templates/_tosca.tpl
@@ -18,7 +18,6 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - custom_types/deployment.yaml
- custom_types/site.yaml
description: set up site and deployment and link them
@@ -135,15 +134,15 @@
name: fabric
must-exist: true
- service#epc-local:
+ service#epc-cp:
type: tosca.nodes.Service
properties:
- name: epc-local
+ name: epc-cp
- service#epc-remote:
+ service#epc-up:
type: tosca.nodes.Service
properties:
- name: epc-remote
+ name: epc-up
service#cdn-local:
type: tosca.nodes.Service
@@ -155,66 +154,6 @@
properties:
name: cdn-remote
- service_dependency#epc_local_cdn_local:
- type: tosca.nodes.ServiceDependency
- properties:
- connect_method: none
- requirements:
- - subscriber_service:
- node: service#epc-local
- relationship: tosca.relationships.BelongsToOne
- - provider_service:
- node: service#cdn-local
- relationship: tosca.relationships.BelongsToOne
-
- service_dependency#cdn_local_cdn_remote:
- type: tosca.nodes.ServiceDependency
- properties:
- connect_method: none
- requirements:
- - subscriber_service:
- node: service#cdn-local
- relationship: tosca.relationships.BelongsToOne
- - provider_service:
- node: service#cdn-remote
- relationship: tosca.relationships.BelongsToOne
-
- service_dependency#mcord_progran:
- type: tosca.nodes.ServiceDependency
- properties:
- connect_method: none
- requirements:
- - subscriber_service:
- node: service#progran
- relationship: tosca.relationships.BelongsToOne
- - provider_service:
- node: service#mcord
- relationship: tosca.relationships.BelongsToOne
-
- service_dependency#progran_epc_local:
- type: tosca.nodes.ServiceDependency
- properties:
- connect_method: none
- requirements:
- - subscriber_service:
- node: service#epc-local
- relationship: tosca.relationships.BelongsToOne
- - provider_service:
- node: service#progran
- relationship: tosca.relationships.BelongsToOne
-
- service_dependency#epc_local_epc_remote:
- type: tosca.nodes.ServiceDependency
- properties:
- connect_method: none
- requirements:
- - subscriber_service:
- node: service#epc-remote
- relationship: tosca.relationships.BelongsToOne
- - provider_service:
- node: service#epc-local
- relationship: tosca.relationships.BelongsToOne
-
service_dependency#onos-fabric_fabric:
type: tosca.nodes.ServiceDependency
properties:
@@ -239,12 +178,84 @@
node: service#fabric
relationship: tosca.relationships.BelongsToOne
+ service_dependency#mcord_progran:
+ type: tosca.nodes.ServiceDependency
+ properties:
+ connect_method: none
+ requirements:
+ - subscriber_service:
+ node: service#progran
+ relationship: tosca.relationships.BelongsToOne
+ - provider_service:
+ node: service#mcord
+ relationship: tosca.relationships.BelongsToOne
+
+ service_dependency#progran_epc_cp:
+ type: tosca.nodes.ServiceDependency
+ properties:
+ connect_method: none
+ requirements:
+ - subscriber_service:
+ node: service#epc-cp
+ relationship: tosca.relationships.BelongsToOne
+ - provider_service:
+ node: service#progran
+ relationship: tosca.relationships.BelongsToOne
+
+ service_dependency#epc_cp_epc_up:
+ type: tosca.nodes.ServiceDependency
+ properties:
+ connect_method: none
+ requirements:
+ - subscriber_service:
+ node: service#epc-up
+ relationship: tosca.relationships.BelongsToOne
+ - provider_service:
+ node: service#epc-cp
+ relationship: tosca.relationships.BelongsToOne
+
+ service_dependency#progran_epc_up:
+ type: tosca.nodes.ServiceDependency
+ properties:
+ connect_method: none
+ requirements:
+ - subscriber_service:
+ node: service#epc-up
+ relationship: tosca.relationships.BelongsToOne
+ - provider_service:
+ node: service#progran
+ relationship: tosca.relationships.BelongsToOne
+
+ service_dependency#epc_up_cdn_local:
+ type: tosca.nodes.ServiceDependency
+ properties:
+ connect_method: none
+ requirements:
+ - subscriber_service:
+ node: service#cdn-local
+ relationship: tosca.relationships.BelongsToOne
+ - provider_service:
+ node: service#epc-up
+ relationship: tosca.relationships.BelongsToOne
+
+ service_dependency#cdn_local_cdn_remote:
+ type: tosca.nodes.ServiceDependency
+ properties:
+ connect_method: none
+ requirements:
+ - subscriber_service:
+ node: service#cdn-remote
+ relationship: tosca.relationships.BelongsToOne
+ - provider_service:
+ node: service#cdn-local
+ relationship: tosca.relationships.BelongsToOne
+
constraints:
type: tosca.nodes.ServiceGraphConstraint
properties:
{{- if .Values.seba.enabled }}
- constraints: '[ ["mcord", null, "onos"], ["progran", null, "fabric"], ["epc-local", null, null] ["epc-remote", null, null] ]'
+ constraints: '[ ["mcord", null, "onos"], ["progran", null, "fabric"], ["epc-cp", null, null] ["epc-up", null, null] ]'
{{ else }}
- constraints: '[ ["mcord", null, "rcord", null], ["progran", null, "volt", "att-workflow-driver"], ["epc-local", "cdn-local", "fabric-crossconnect", "onos"], ["epc-remote", "cdn-remote", "vrouter", "fabric"] ]'
+ constraints: '[ ["mcord", "progran", null], ["epc-cp", "epc-up", "onos"], [null, "cdn-local", "fabric"], [null, "cdn-remote", "vrouter"] ]'
{{- end -}}
-{{- end -}}
+{{- end -}}
\ No newline at end of file