[SEBA-181] Creating At&t charts
Change-Id: Ia29498fc219728600fd63324a880764b620aeaf1
diff --git a/examples/filter-images.yaml b/examples/filter-images.yaml
index 76f1e3a..524b579 100644
--- a/examples/filter-images.yaml
+++ b/examples/filter-images.yaml
@@ -42,6 +42,7 @@
- xosproject/vsg-hw-synchronizer
- xosproject/fabric-synchronizer
- xosproject/fabric-crossconnect-synchronizer
+- xosproject/att-workflow-driver-synchronizer
# base-openstack images
- xosproject/openstack-synchronizer
diff --git a/examples/image-tag-candidate.yaml b/examples/image-tag-candidate.yaml
index 0faf0b7..e1b9c27 100644
--- a/examples/image-tag-candidate.yaml
+++ b/examples/image-tag-candidate.yaml
@@ -30,6 +30,8 @@
# in RCORD service chart
addressmanager:
addressmanager_synchronizerImage: 'xosproject/addressmanager-synchronizer:candidate'
+att-workflow-driver:
+ attWorkflowDriver_synchronizerImage: 'xosproject/att-workflow-driver-synchronizer:candidate'
fabric:
fabric_synchronizerImage: 'xosproject/fabric-synchronizer:candidate'
fabric-crossconnect:
diff --git a/examples/imagePullPolicy-IfNotPresent.yaml b/examples/imagePullPolicy-IfNotPresent.yaml
index 5431420..2cadc2d 100644
--- a/examples/imagePullPolicy-IfNotPresent.yaml
+++ b/examples/imagePullPolicy-IfNotPresent.yaml
@@ -23,6 +23,8 @@
# in RCORD service chart
addressmanager:
imagePullPolicy: 'IfNotPresent'
+att-workflow-driver:
+ imagePullPolicy: 'IfNotPresent'
fabric:
imagePullPolicy: 'IfNotPresent'
fabric-crossconnect:
diff --git a/xos-profiles/rcord-fc/Chart.yaml b/xos-profiles/att-workflow/Chart.yaml
similarity index 88%
rename from xos-profiles/rcord-fc/Chart.yaml
rename to xos-profiles/att-workflow/Chart.yaml
index 8dc3f2c..242f5e6 100644
--- a/xos-profiles/rcord-fc/Chart.yaml
+++ b/xos-profiles/att-workflow/Chart.yaml
@@ -16,6 +16,6 @@
apiVersion: v1
appVersion: "1.0"
-description: A Helm chart for XOS's "rcord-fc" profile
-name: rcord-fc
+description: A Helm chart for XOS's "att-workflow" profile
+name: att-workflow
version: 0.1.0
diff --git a/xos-profiles/rcord-fc/requirements.yaml b/xos-profiles/att-workflow/requirements.yaml
similarity index 88%
rename from xos-profiles/rcord-fc/requirements.yaml
rename to xos-profiles/att-workflow/requirements.yaml
index acb0780..211304d 100644
--- a/xos-profiles/rcord-fc/requirements.yaml
+++ b/xos-profiles/att-workflow/requirements.yaml
@@ -27,5 +27,8 @@
version: 2.0.1
repository: file://../../xos-services/volt
- name: fabric-crossconnect
- version: 1.0.0
+ version: 1.0.0-dev
repository: file://../../xos-services/fabric-crossconnect
+- name: att-workflow-driver
+ version: 1.0.0-dev
+ repository: file://../../xos-services/att-workflow-driver
diff --git a/xos-profiles/rcord-fc/templates/_helpers.tpl b/xos-profiles/att-workflow/templates/_helpers.tpl
similarity index 93%
rename from xos-profiles/rcord-fc/templates/_helpers.tpl
rename to xos-profiles/att-workflow/templates/_helpers.tpl
index 31d71ba..432a7f1 100644
--- a/xos-profiles/rcord-fc/templates/_helpers.tpl
+++ b/xos-profiles/att-workflow/templates/_helpers.tpl
@@ -17,7 +17,7 @@
{{/*
Expand the name of the chart.
*/}}
-{{- define "rcord-fc.name" -}}
+{{- define "att-workflow.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
@@ -26,7 +26,7 @@
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
-{{- define "rcord-fc.fullname" -}}
+{{- define "att-workflow.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
@@ -42,7 +42,7 @@
{{/*
Create chart name and version as used by the chart label.
*/}}
-{{- define "rcord-fc.chart" -}}
+{{- define "att-workflow.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
diff --git a/xos-profiles/rcord-fc/templates/_tosca.tpl b/xos-profiles/att-workflow/templates/_tosca.tpl
similarity index 85%
rename from xos-profiles/rcord-fc/templates/_tosca.tpl
rename to xos-profiles/att-workflow/templates/_tosca.tpl
index be872ef..5158c0a 100644
--- a/xos-profiles/rcord-fc/templates/_tosca.tpl
+++ b/xos-profiles/att-workflow/templates/_tosca.tpl
@@ -14,14 +14,14 @@
See the License for the specific language governing permissions and
limitations under the License.
*/}}
-{{- define "rcord-fc.basicFixturesTosca" -}}
+{{- define "att-workflow.basicFixturesTosca" -}}
tosca_definitions_version: tosca_simple_yaml_1_0
description: Some basic fixtures
imports:
- - custom_types/siterole.yaml
+ - custom_types/deployment.yaml
- custom_types/networkparametertype.yaml
- custom_types/networktemplate.yaml
- - custom_types/deployment.yaml
+ - custom_types/siterole.yaml
topology_template:
node_templates:
@@ -105,9 +105,10 @@
{{- end -}}
-{{- define "rcord-fc.serviceGraphTosca" -}}
+{{- define "att-workflow.serviceGraphTosca" -}}
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
+ - custom_types/attworkflowdriverservice.yaml
- custom_types/fabricservice.yaml
- custom_types/onosservice.yaml
- custom_types/rcordservice.yaml
@@ -115,7 +116,7 @@
- custom_types/fabriccrossconnectservice.yaml
- custom_types/servicedependency.yaml
- custom_types/servicegraphconstraint.yaml
-description: rcord-fc service graph
+description: att-workflow service graph
topology_template:
node_templates:
@@ -157,12 +158,18 @@
name: fabric-crossconnect
must-exist: true
-# The rcord-fc service graph
+ service#att-workflow-driver:
+ type: tosca.nodes.AttWorkflowDriverService
+ properties:
+ name: att-workflow-driver
+ must-exist: true
+
+# The att-workflow service graph
service_dependency#onos-fabric_fabric:
type: tosca.nodes.ServiceDependency
properties:
- connect_method: None
+ connect_method: none
requirements:
- subscriber_service:
node: service#ONOS_Fabric
@@ -174,7 +181,7 @@
service_dependency#rcord_volt:
type: tosca.nodes.ServiceDependency
properties:
- connect_method: None
+ connect_method: none
requirements:
- subscriber_service:
node: service#rcord
@@ -186,7 +193,7 @@
service_dependency#onos_voltha_volt:
type: tosca.nodes.ServiceDependency
properties:
- connect_method: None
+ connect_method: none
requirements:
- subscriber_service:
node: service#volt
@@ -198,7 +205,7 @@
service_dependency#volt_fabric-crossconnect:
type: tosca.nodes.ServiceDependency
properties:
- connect_method: None
+ connect_method: none
requirements:
- subscriber_service:
node: service#volt
@@ -210,7 +217,7 @@
service_dependency#onos_fabric_fabric-crossconnect:
type: tosca.nodes.ServiceDependency
properties:
- connect_method: None
+ connect_method: none
requirements:
- subscriber_service:
node: service#fabric-crossconnect
@@ -219,9 +226,21 @@
node: service#ONOS_Fabric
relationship: tosca.relationships.BelongsToOne
+ service_dependency#workflow_volt:
+ type: tosca.nodes.ServiceDependency
+ properties:
+ connect_method: none
+ requirements:
+ - subscriber_service:
+ node: service#att-workflow-driver
+ relationship: tosca.relationships.BelongsToOne
+ - provider_service:
+ node: service#volt
+ relationship: tosca.relationships.BelongsToOne
+
constraints:
type: tosca.nodes.ServiceGraphConstraint
properties:
- constraints: '[[null, "rcord"], ["ONOS_VOLTHA", "volt"], ["ONOS_Fabric", "fabric-crossconnect"], ["fabric", null]]'
+ constraints: '[[null, "rcord", null], ["ONOS_VOLTHA", "volt", null], ["ONOS_Fabric", "fabric-crossconnect", "att-workflow-driver"], ["fabric", null, null]]'
{{- end -}}
diff --git a/xos-profiles/rcord-fc/templates/tosca-configmap.yaml b/xos-profiles/att-workflow/templates/tosca-configmap.yaml
similarity index 82%
rename from xos-profiles/rcord-fc/templates/tosca-configmap.yaml
rename to xos-profiles/att-workflow/templates/tosca-configmap.yaml
index f726990..979b875 100644
--- a/xos-profiles/rcord-fc/templates/tosca-configmap.yaml
+++ b/xos-profiles/att-workflow/templates/tosca-configmap.yaml
@@ -17,10 +17,10 @@
apiVersion: v1
kind: ConfigMap
metadata:
- name: rcord-fc-tosca
+ name: att-workflow-tosca
data:
010-fixtures.yaml: |
-{{ include "rcord-fc.basicFixturesTosca" . | indent 4 }}
+{{ include "att-workflow.basicFixturesTosca" . | indent 4 }}
020-rcord-subscriber-service.yaml: |
{{ include "rcord.serviceTosca" .Values.rcord | indent 4 }}
030-volt-service.yaml: |
@@ -33,5 +33,7 @@
{{ include "onos-service.volthaOnosTosca" (index .Values "onos-service") | indent 4 }}
070-fabric-service.yaml: |
{{ include "fabric.serviceTosca" .Values.fabric | indent 4 }}
+ 080-workflow-service.yaml: |
+{{ include "att-workflow-driver.serviceTosca" (index .Values "att-workflow-driver") | indent 4 }}
300-service-graph.yaml: |
-{{ include "rcord-fc.serviceGraphTosca" . | indent 4 }}
+{{ include "att-workflow.serviceGraphTosca" . | indent 4 }}
diff --git a/xos-profiles/rcord-fc/templates/tosca-job.yaml b/xos-profiles/att-workflow/templates/tosca-job.yaml
similarity index 82%
rename from xos-profiles/rcord-fc/templates/tosca-job.yaml
rename to xos-profiles/att-workflow/templates/tosca-job.yaml
index 6bfd6a2..792a56c 100644
--- a/xos-profiles/rcord-fc/templates/tosca-job.yaml
+++ b/xos-profiles/att-workflow/templates/tosca-job.yaml
@@ -17,10 +17,10 @@
apiVersion: batch/v1
kind: Job
metadata:
- name: {{ template "rcord-fc.fullname" . }}-tosca-loader
+ name: {{ template "att-workflow.fullname" . }}-tosca-loader
labels:
- app: {{ template "rcord-fc.name" . }}
- chart: {{ template "rcord-fc.chart" . }}
+ app: {{ template "att-workflow.name" . }}
+ chart: {{ template "att-workflow.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
@@ -28,7 +28,7 @@
template:
metadata:
labels:
- app: {{ template "rcord-fc.name" . }}
+ app: {{ template "att-workflow.name" . }}
release: {{ .Release.Name }}
annotations:
checksum/config: {{ include (print $.Template.BasePath "/tosca-configmap.yaml") . | sha256sum }}
@@ -47,9 +47,9 @@
name: xos-admin-passwd-secret
key: password
volumeMounts:
- - name: rcord-fc-tosca
+ - name: att-workflow-tosca
mountPath: /opt/tosca
volumes:
- - name: rcord-fc-tosca
+ - name: att-workflow-tosca
configMap:
- name: rcord-fc-tosca
+ name: att-workflow-tosca
diff --git a/xos-profiles/rcord-fc/values.yaml b/xos-profiles/att-workflow/values.yaml
similarity index 100%
rename from xos-profiles/rcord-fc/values.yaml
rename to xos-profiles/att-workflow/values.yaml
diff --git a/xos-services/att-workflow-driver/.helmignore b/xos-services/att-workflow-driver/.helmignore
new file mode 100644
index 0000000..f0c1319
--- /dev/null
+++ b/xos-services/att-workflow-driver/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/xos-profiles/rcord-fc/Chart.yaml b/xos-services/att-workflow-driver/Chart.yaml
similarity index 83%
copy from xos-profiles/rcord-fc/Chart.yaml
copy to xos-services/att-workflow-driver/Chart.yaml
index 8dc3f2c..5918548 100644
--- a/xos-profiles/rcord-fc/Chart.yaml
+++ b/xos-services/att-workflow-driver/Chart.yaml
@@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for XOS's "rcord-fc" profile
-name: rcord-fc
-version: 0.1.0
+name: att-workflow-driver
+description: A Helm chart for XOS's "att-workflow-driver" service
+version: 1.0.0-dev
diff --git a/xos-profiles/rcord-fc/templates/_helpers.tpl b/xos-services/att-workflow-driver/templates/_helpers.tpl
similarity index 66%
copy from xos-profiles/rcord-fc/templates/_helpers.tpl
copy to xos-services/att-workflow-driver/templates/_helpers.tpl
index 31d71ba..920bcf7 100644
--- a/xos-profiles/rcord-fc/templates/_helpers.tpl
+++ b/xos-services/att-workflow-driver/templates/_helpers.tpl
@@ -17,7 +17,7 @@
{{/*
Expand the name of the chart.
*/}}
-{{- define "rcord-fc.name" -}}
+{{- define "att-workflow-driver.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
@@ -26,7 +26,7 @@
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
-{{- define "rcord-fc.fullname" -}}
+{{- define "att-workflow-driver.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
@@ -42,10 +42,33 @@
{{/*
Create chart name and version as used by the chart label.
*/}}
-{{- define "rcord-fc.chart" -}}
+{{- define "att-workflow-driver.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
-{{/*
-The R-CORD synchronizer loads R-CORD-specific models into the core
-*/}}
+{{- define "att-workflow-driver.serviceConfig" -}}
+name: att-workflow-driver
+accessor:
+ username: {{ .Values.xosAdminUser | quote }}
+ password: {{ .Values.xosAdminPassword | quote }}
+ endpoint: xos-core:50051
+event_bus:
+ endpoint: {{ .Values.kafkaService | quote }}
+ kind: kafka
+logging:
+ version: 1
+ handlers:
+ console:
+ class: logging.StreamHandler
+ file:
+ class: logging.handlers.RotatingFileHandler
+ filename: /var/log/xos.log
+ maxBytes: 10485760
+ backupCount: 5
+ loggers:
+ 'multistructlog':
+ handlers:
+ - console
+ - file
+ level: DEBUG
+{{- end -}}
diff --git a/xos-services/att-workflow-driver/templates/_tosca.tpl b/xos-services/att-workflow-driver/templates/_tosca.tpl
new file mode 100644
index 0000000..1e92a0c
--- /dev/null
+++ b/xos-services/att-workflow-driver/templates/_tosca.tpl
@@ -0,0 +1,30 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Copyright 2018-present Open Networking Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/}}
+{{- define "att-workflow-driver.serviceTosca" -}}
+tosca_definitions_version: tosca_simple_yaml_1_0
+description: Set up att-workflow-driver service
+imports:
+ - custom_types/attworkflowdriverservice.yaml
+
+topology_template:
+ node_templates:
+ service#att-workflow-driver:
+ type: tosca.nodes.AttWorkflowDriverService
+ properties:
+ name: att-workflow-driver
+ kind: oss
+{{- end -}}
diff --git a/xos-profiles/rcord-fc/Chart.yaml b/xos-services/att-workflow-driver/templates/configmap.yaml
similarity index 80%
copy from xos-profiles/rcord-fc/Chart.yaml
copy to xos-services/att-workflow-driver/templates/configmap.yaml
index 8dc3f2c..ce09cb5 100644
--- a/xos-profiles/rcord-fc/Chart.yaml
+++ b/xos-services/att-workflow-driver/templates/configmap.yaml
@@ -1,5 +1,4 @@
---
-
# Copyright 2018-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +14,9 @@
# limitations under the License.
apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for XOS's "rcord-fc" profile
-name: rcord-fc
-version: 0.1.0
+kind: ConfigMap
+metadata:
+ name: att-workflow-driver
+data:
+ serviceConfig: |
+{{ include "att-workflow-driver.serviceConfig" . | indent 4 }}
diff --git a/xos-services/att-workflow-driver/templates/deployment.yaml b/xos-services/att-workflow-driver/templates/deployment.yaml
new file mode 100644
index 0000000..2f1f479
--- /dev/null
+++ b/xos-services/att-workflow-driver/templates/deployment.yaml
@@ -0,0 +1,77 @@
+---
+
+# Copyright 2018-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+ name: {{ template "att-workflow-driver.fullname" . }}
+ labels:
+ app: {{ template "att-workflow-driver.name" . }}
+ chart: {{ template "att-workflow-driver.chart" . }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+spec:
+ replicas: {{ .Values.replicaCount }}
+ selector:
+ matchLabels:
+ app: {{ template "att-workflow-driver.name" . }}
+ release: {{ .Release.Name }}
+ template:
+ metadata:
+ labels:
+ app: {{ template "att-workflow-driver.name" . }}
+ release: {{ .Release.Name }}
+ annotations:
+ checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+ spec:
+ containers:
+ - name: {{ .Chart.Name }}
+ image: {{ tpl .Values.attWorkflowDriver_synchronizerImage . | quote }}
+ imagePullPolicy: {{ .Values.imagePullPolicy }}
+ resources:
+{{ toYaml .Values.resources | indent 12 }}
+ volumeMounts:
+ - name: att-workflow-driver-config
+ mountPath: /opt/xos/synchronizers/att-workflow-driver/mounted_config.yaml
+ subPath: mounted_config.yaml
+ - name: certchain-volume
+ mountPath: /usr/local/share/ca-certificates/local_certs.crt
+ subPath: config/ca_cert_chain.pem
+ volumes:
+ - name: att-workflow-driver-config
+ configMap:
+ name: att-workflow-driver
+ items:
+ - key: serviceConfig
+ path: mounted_config.yaml
+ - name: certchain-volume
+ configMap:
+ name: ca-certificates
+ items:
+ - key: chain
+ path: config/ca_cert_chain.pem
+ {{- with .Values.nodeSelector }}
+ nodeSelector:
+{{ toYaml . | indent 8 }}
+ {{- end }}
+ {{- with .Values.affinity }}
+ affinity:
+{{ toYaml . | indent 8 }}
+ {{- end }}
+ {{- with .Values.tolerations }}
+ tolerations:
+{{ toYaml . | indent 8 }}
+ {{- end }}
diff --git a/xos-services/att-workflow-driver/values.yaml b/xos-services/att-workflow-driver/values.yaml
new file mode 100644
index 0000000..d6335d3
--- /dev/null
+++ b/xos-services/att-workflow-driver/values.yaml
@@ -0,0 +1,40 @@
+---
+# Copyright 2018-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Default values for vOLT
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+nameOverride: ""
+fullnameOverride: ""
+
+imagePullPolicy: 'Always'
+
+attWorkflowDriver_synchronizerImage: "xosproject/att-workflow-driver-synchronizer:master"
+
+xosAdminUser: "admin@opencord.org"
+xosAdminPassword: "letmein"
+
+kafkaService: "cord-kafka"
+
+resources: {}
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
diff --git a/xos-services/fabric-crossconnect/Chart.yaml b/xos-services/fabric-crossconnect/Chart.yaml
index f24f330..0df5df0 100644
--- a/xos-services/fabric-crossconnect/Chart.yaml
+++ b/xos-services/fabric-crossconnect/Chart.yaml
@@ -15,4 +15,4 @@
name: fabric-crossconnect
description: A Helm chart for XOS's "fabric-crossconnect" service
-version: 1.0.0
+version: 1.0.0-dev
diff --git a/xos-services/fabric-crossconnect/values.yaml b/xos-services/fabric-crossconnect/values.yaml
index ebfc13f..ab4f2c2 100644
--- a/xos-services/fabric-crossconnect/values.yaml
+++ b/xos-services/fabric-crossconnect/values.yaml
@@ -24,7 +24,7 @@
imagePullPolicy: 'Always'
-fabric_crossconnect_synchronizerImage: "xosproject/fabric-crossconnect-synchronizer:{{ .Chart.Version }}"
+fabric_crossconnect_synchronizerImage: "xosproject/fabric-crossconnect-synchronizer:master"
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"