[COMAC-127] Add branches to enable/disable ProgRAN
Change-Id: Iec68686adea8a4e0003440d980e706221c257b5b
diff --git a/xos-profiles/mcord/Chart.yaml b/xos-profiles/mcord/Chart.yaml
index 427a8ed..9ec12ec 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.7
+version: 1.1.8
# 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 e8903d5..51b5f28 100644
--- a/xos-profiles/mcord/templates/_tosca.tpl
+++ b/xos-profiles/mcord/templates/_tosca.tpl
@@ -93,7 +93,9 @@
- custom_types/fabricservice.yaml
- custom_types/mcordsubscriberservice.yaml
- custom_types/onosservice.yaml
+{{- if .Values.progran.enabled }}
- custom_types/progranservice.yaml
+{{- end }}
- custom_types/vrouterservice.yaml
- custom_types/servicegraphconstraint.yaml
- custom_types/servicedependency.yaml
@@ -103,13 +105,13 @@
topology_template:
node_templates:
-
+{{ if .Values.progran.enabled }}
service#progran:
type: tosca.nodes.ProgranService
properties:
name: progran
must-exist: true
-
+{{ end }}
service#vrouter:
type: tosca.nodes.VRouterService
properties:
@@ -178,6 +180,7 @@
node: service#fabric
relationship: tosca.relationships.BelongsToOne
+{{ if .Values.progran.enabled }}
service_dependency#mcord_progran:
type: tosca.nodes.ServiceDependency
properties:
@@ -202,18 +205,6 @@
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#omec-up
- relationship: tosca.relationships.BelongsToOne
- - provider_service:
- node: service#omec-cp
- relationship: tosca.relationships.BelongsToOne
-
service_dependency#progran_epc_up:
type: tosca.nodes.ServiceDependency
properties:
@@ -226,6 +217,44 @@
node: service#progran
relationship: tosca.relationships.BelongsToOne
+{{ else }}
+ service_dependency#mcord_epc_cp:
+ type: tosca.nodes.ServiceDependency
+ properties:
+ connect_method: none
+ requirements:
+ - subscriber_service:
+ node: service#omec-cp
+ relationship: tosca.relationships.BelongsToOne
+ - provider_service:
+ node: service#mcord
+ relationship: tosca.relationships.BelongsToOne
+
+ service_dependency#mcord_epc_up:
+ type: tosca.nodes.ServiceDependency
+ properties:
+ connect_method: none
+ requirements:
+ - subscriber_service:
+ node: service#omec-up
+ relationship: tosca.relationships.BelongsToOne
+ - provider_service:
+ node: service#mcord
+ relationship: tosca.relationships.BelongsToOne
+{{ end }}
+
+ service_dependency#epc_cp_epc_up:
+ type: tosca.nodes.ServiceDependency
+ properties:
+ connect_method: none
+ requirements:
+ - subscriber_service:
+ node: service#omec-up
+ relationship: tosca.relationships.BelongsToOne
+ - provider_service:
+ node: service#omec-cp
+ relationship: tosca.relationships.BelongsToOne
+
service_dependency#epc_up_cdn_local:
type: tosca.nodes.ServiceDependency
properties:
@@ -253,9 +282,11 @@
constraints:
type: tosca.nodes.ServiceGraphConstraint
properties:
-{{- if .Values.seba.enabled }}
+{{ if (.Values.seba.enabled) and (.Values.progran.enabled) }}
constraints: '[ ["mcord", null, "onos"], ["progran", null, "fabric"], ["omec-cp", null, null] ["omec-up", null, null] ]'
-{{ else }}
+{{ else if (not .Values.seba.enabled) and (.Values.progran.enabled) }}
constraints: '[ ["mcord", "progran", null], ["omec-cp", "omec-up", "onos"], [null, "cdn-local", "fabric"], [null, "cdn-remote", "vrouter"] ]'
-{{- end -}}
+{{ else if (not .Values.seba.enabled) and (not .Values.progran.enabled) }}
+ constraints: '[ [null, "mcord", null], ["omec-cp", "omec-up", "onos"], [null, "cdn-local", "fabric"], [null, "cdn-remote", "vrouter"] ]'
+{{ end }}
{{- end -}}
\ No newline at end of file