[COMAC-177,COMAC-131] Refactor comac profile for residential service in CiaB
Change-Id: I362ed3564da5721b5512fd4eddc24c40407435e5
diff --git a/xos-profiles/comac/Chart.yaml b/xos-profiles/comac/Chart.yaml
index 87b6e94..c645020 100644
--- a/xos-profiles/comac/Chart.yaml
+++ b/xos-profiles/comac/Chart.yaml
@@ -17,7 +17,7 @@
name: comac
description: A Helm chart for the "COMAC" profile
icon: https://guide.opencord.org/logos/cord.svg
-version: 0.0.1
+version: 0.0.2
# xosproject/tosca-loader version
appVersion: 1.3.0
diff --git a/xos-profiles/comac/requirements.yaml b/xos-profiles/comac/requirements.yaml
index a95a056..fe49052 100644
--- a/xos-profiles/comac/requirements.yaml
+++ b/xos-profiles/comac/requirements.yaml
@@ -17,7 +17,7 @@
- name: rcord
version: 1.0.16
repository: file://../../xos-services/rcord
- condition: wired_service.enabled
+ condition: resdentialService.enabled
- name: onos-service
version: 2.1.3
repository: file://../../xos-services/onos-service
@@ -32,15 +32,15 @@
- name: volt
version: 2.2.5
repository: file://../../xos-services/volt
- condition: wired_service.enabled
+ condition: resdentialService.enabled
- name: fabric-crossconnect
version: 1.2.2
repository: file://../../xos-services/fabric-crossconnect
- condition: wired_service.enabled
+ condition: resdentialService.enabled
- name: sadis-server
version: 1.0.4
repository: file://../../sadis-server
- condition: wired_service.enabled
+ condition: resdentialService.enabled
- name: vrouter
version: 2.1.0
repository: file://../../xos-services/vrouter
diff --git a/xos-profiles/comac/templates/_tosca.tpl b/xos-profiles/comac/templates/_tosca.tpl
index 68b97d8..9169540 100644
--- a/xos-profiles/comac/templates/_tosca.tpl
+++ b/xos-profiles/comac/templates/_tosca.tpl
@@ -36,7 +36,7 @@
rest_hostname: {{ .onosRestService | quote }}
rest_port: 8181
-{{- if $.wired_service.enabled }}
+{{- if $.resdentialService.enabled }}
onos_app#openflow-base:
type: tosca.nodes.ONOSApp
properties:
@@ -258,7 +258,7 @@
- custom_types/mcordsubscriberservice.yaml
- custom_types/onosservice.yaml
- custom_types/vrouterservice.yaml
-{{- if .Values.wired_service.enabled }}
+{{- if .Values.resdentialService.enabled }}
- custom_types/rcordservice.yaml
- custom_types/voltservice.yaml
- custom_types/fabriccrossconnectservice.yaml
@@ -294,7 +294,7 @@
name: mcord
must-exist: true
-{{- if .Values.wired_service.enabled }}
+{{- if .Values.resdentialService.enabled }}
service#rcord:
type: tosca.nodes.RCORDService
properties:
@@ -358,7 +358,7 @@
node: service#fabric
relationship: tosca.relationships.BelongsToOne
-{{- if .Values.wired_service.enabled }}
+{{- if .Values.resdentialService.enabled }}
service_dependency#rcord_volt:
type: tosca.nodes.ServiceDependency
properties:
diff --git a/xos-profiles/comac/templates/tosca-configmap.yaml b/xos-profiles/comac/templates/tosca-configmap.yaml
index 90ab9fc..f04a688 100644
--- a/xos-profiles/comac/templates/tosca-configmap.yaml
+++ b/xos-profiles/comac/templates/tosca-configmap.yaml
@@ -18,7 +18,7 @@
metadata:
name: comac-tosca
data:
-{{- if .Values.wired_service.enabled }}
+{{- if .Values.resdentialService.enabled }}
010-rcord-subscriber-service.yaml: |
{{ include "rcord.serviceTosca" .Values.rcord | indent 4 }}
020-volt-service.yaml: |
@@ -32,7 +32,7 @@
050-fabric-service.yaml: |
{{ include "fabric.serviceTosca" .Values.fabric | indent 4 }}
{{- end }}
-{{- if .Values.wired_service.enabled }}
+{{- if .Values.resdentialService.enabled }}
060-fixtures.yaml: |
{{ include "comac.basicFixturesTosca" . | indent 4 }}
{{- end }}
diff --git a/xos-profiles/comac/templates/tosca-job.yaml b/xos-profiles/comac/templates/tosca-job.yaml
index 3471695..63caaaa 100644
--- a/xos-profiles/comac/templates/tosca-job.yaml
+++ b/xos-profiles/comac/templates/tosca-job.yaml
@@ -35,8 +35,8 @@
restartPolicy: OnFailure
containers:
- name: {{ .Chart.Name }}-tosca-loader
- image: {{ .Values.global.registry }}{{ .Values.images.tosca_loader.repository }}:{{ tpl .Values.images.tosca_loader.tag . }}
- imagePullPolicy: {{ .Values.images.tosca_loader.pullPolicy }}
+ image: {{ .Values.global.registry }}{{ .Values.images.toscaLoader.repository }}:{{ tpl .Values.images.toscaLoader.tag . }}
+ imagePullPolicy: {{ .Values.images.toscaLoader.pullPolicy }}
env:
- name: XOS_USER
value: {{ .Values.xosAdminUser }}
diff --git a/xos-profiles/comac/values.yaml b/xos-profiles/comac/values.yaml
index a854b54..4d682f8 100644
--- a/xos-profiles/comac/values.yaml
+++ b/xos-profiles/comac/values.yaml
@@ -23,7 +23,7 @@
fullnameOverride: ""
images:
- tosca_loader:
+ toscaLoader:
repository: 'xosproject/tosca-loader'
tag: '{{ .Chart.AppVersion }}'
pullPolicy: 'Always'
@@ -54,7 +54,7 @@
onosRestService: "onos-ui.default.svc.cluster.local"
kafkaService: "cord-kafka.default.svc.cluster.local:9092"
-wired_service:
+resdentialService:
enabled: false
# whether to install or not this shared services