Upgrading M-CORD chart
Change-Id: I601eda806ae0535acc38d2acda979c2017edc330
diff --git a/xos-profiles/mcord/Chart.yaml b/xos-profiles/mcord/Chart.yaml
index 82a1b38..9377702 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.0.4
+version: 1.0.5
# xosproject/tosca-loader version
appVersion: 1.1.5
diff --git a/xos-profiles/mcord/templates/_tosca.tpl b/xos-profiles/mcord/templates/_tosca.tpl
index 8ad427e..220a6c1 100644
--- a/xos-profiles/mcord/templates/_tosca.tpl
+++ b/xos-profiles/mcord/templates/_tosca.tpl
@@ -101,8 +101,9 @@
- custom_types/progranservice.yaml
- custom_types/servicegraphconstraint.yaml
- custom_types/servicedependency.yaml
+ - custom_types/service.yaml
-description: Configures the base-openstack service graph
+description: Configures the M-CORD service graph
topology_template:
node_templates:
@@ -131,6 +132,16 @@
name: fabric
must-exist: true
+ service#epc-local:
+ type: tosca.nodes.Service
+ properties:
+ name: epc-local
+
+ service#epc-remote:
+ type: tosca.nodes.Service
+ properties:
+ name: epc-remote
+
mcord_progran:
type: tosca.nodes.ServiceDependency
properties:
@@ -143,6 +154,30 @@
node: service#mcord
relationship: tosca.relationships.BelongsToOne
+ 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
+
+ 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:
@@ -158,6 +193,10 @@
constraints:
type: tosca.nodes.ServiceGraphConstraint
properties:
- constraints: '[ ["mcord", null, "onos"], ["progran", null, "fabric"] ]'
+{{- if .Values.seba.enabled }}
+ constraints: '[ ["mcord", null, "onos"], ["progran", null, "fabric"], ["epc-local", null, null] ["epc-remote", null, null] ]'
+{{ else }}
+ constraints: '[ ["mcord", "rcord", null], ["progran", "volt", "att-workflow-driver"], ["epc-local", "fabric-crossconnect", "onos"], ["epc-remote", null, "fabric"] ]'
+{{- end -}}
{{- end -}}
diff --git a/xos-profiles/mcord/values.yaml b/xos-profiles/mcord/values.yaml
index 05149b2..a7a818b 100644
--- a/xos-profiles/mcord/values.yaml
+++ b/xos-profiles/mcord/values.yaml
@@ -44,4 +44,8 @@
fabric:
enabled: true
onos-service:
- enabled: true
\ No newline at end of file
+ enabled: true
+
+# wheter SEBA will be installed on the side or not
+seba:
+ enabled: false
\ No newline at end of file