SEBA-544 Helm charts for TT Workflow
Change-Id: I3eb33c501876f1b76312836b2fa16d68d4bb9c9a
diff --git a/configs/seba-ponsim-latest.yaml b/configs/seba-ponsim-latest.yaml
index 03f8006..66de913 100644
--- a/configs/seba-ponsim-latest.yaml
+++ b/configs/seba-ponsim-latest.yaml
@@ -99,6 +99,15 @@
# this is mandatory, it's needed to correctly configure the kafka endpoint
kafkaService: cord-kafka
+# in workflow/tt-workflow service chart
+tt-workflow-driver:
+ image:
+ repository: andybavier/test-image-synchronizer
+ tag: tt-workflow-driver
+
+ # this is mandatory, it's needed to correctly configure the kafka endpoint
+ kafkaService: cord-kafka
+
# ONOS applications
aaaAppUrl: "https://oss.sonatype.org/content/repositories/snapshots/org/opencord/aaa/1.8.0-SNAPSHOT/aaa-1.8.0-20181129.184849-116.oar"
aaaAppVersion: "1.8.0.SNAPSHOT"
diff --git a/configs/seba-ponsim.yaml b/configs/seba-ponsim.yaml
index 911c9bb..b3753fa 100644
--- a/configs/seba-ponsim.yaml
+++ b/configs/seba-ponsim.yaml
@@ -24,3 +24,12 @@
att-workflow-driver:
# this is mandatory, it's needed to correctly configure the kafka endpoint
kafkaService: cord-kafka
+
+# in workflow/tt-workflow service chart
+tt-workflow-driver:
+ image:
+ repository: andybavier/test-image-synchronizer
+ tag: tt-workflow-driver
+
+ # this is mandatory, it's needed to correctly configure the kafka endpoint
+ kafkaService: cord-kafka
diff --git a/workflows/att-workflow/Chart.yaml b/workflows/att-workflow/Chart.yaml
index 4595d92..21c719a 100644
--- a/workflows/att-workflow/Chart.yaml
+++ b/workflows/att-workflow/Chart.yaml
@@ -17,7 +17,7 @@
name: att-workflow
description: A Helm chart for XOS's "att-workflow"
icon: https://guide.opencord.org/logos/cord.svg
-version: 1.0.6
+version: 1.1.0
# xosproject/tosca-loader version
appVersion: 1.1.7
diff --git a/workflows/att-workflow/templates/_tosca.tpl b/workflows/att-workflow/templates/_tosca.tpl
index b919834..32c2a68 100644
--- a/workflows/att-workflow/templates/_tosca.tpl
+++ b/workflows/att-workflow/templates/_tosca.tpl
@@ -21,6 +21,7 @@
- custom_types/attworkflowdriverservice.yaml
- custom_types/voltservice.yaml
- custom_types/servicedependency.yaml
+ - custom_types/servicegraphconstraint.yaml
description: att-workflow-driver service graph
topology_template:
node_templates:
@@ -50,4 +51,60 @@
- provider_service:
node: service#volt
relationship: tosca.relationships.BelongsToOne
+
+ constraints:
+ type: tosca.nodes.ServiceGraphConstraint
+ properties:
+ constraints: '[[null, "rcord", null], [null, "volt", null], ["onos", "fabric-crossconnect", "att-workflow-driver"], ["fabric", null, null]]'
+{{- end -}}
+
+{{- define "att-workflow.onosTosca" -}}
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+imports:
+ - custom_types/onosapp.yaml
+ - custom_types/onosservice.yaml
+ - custom_types/serviceinstanceattribute.yaml
+
+description: Configures workflow-specific ONOS apps
+
+topology_template:
+ node_templates:
+
+ service#onos:
+ type: tosca.nodes.ONOSService
+ properties:
+ name: onos
+ must-exist: true
+
+ onos_app#aaa:
+ type: tosca.nodes.ONOSApp
+ properties:
+ name: aaa
+ app_id: org.opencord.aaa
+ url: {{ .Values.aaaAppUrl }}
+ version: {{ .Values.aaaAppVersion }}
+ dependencies: org.opencord.sadis
+ requirements:
+ - owner:
+ node: service#onos
+ relationship: tosca.relationships.BelongsToOne
+
+ aaa-config-attr:
+ type: tosca.nodes.ServiceInstanceAttribute
+ properties:
+ name: /onos/v1/network/configuration/apps/org.opencord.aaa
+ value: >
+ {
+ "AAA" : {
+ "radiusConnectionType" : "socket",
+ "radiusHost" : "freeradius.voltha.svc.cluster.local",
+ "radiusServerPort" : "1812",
+ "radiusSecret" : "SECRET"
+ }
+ }
+ requirements:
+ - service_instance:
+ node: onos_app#aaa
+ relationship: tosca.relationships.BelongsToOne
{{- end -}}
diff --git a/workflows/att-workflow/templates/tosca-configmap.yaml b/workflows/att-workflow/templates/tosca-configmap.yaml
index 9fc6add..ec4a064 100644
--- a/workflows/att-workflow/templates/tosca-configmap.yaml
+++ b/workflows/att-workflow/templates/tosca-configmap.yaml
@@ -21,5 +21,7 @@
data:
010-fixtures.yaml: |
{{ include "att-workflow-driver.serviceTosca" (index .Values "att-workflow-driver") | indent 4 }}
+ 100-onos-apps.yaml: |
+{{ include "att-workflow.onosTosca" . | indent 4 }}
300-service-graph.yaml: |
{{ include "att-workflow.serviceGraphTosca" . | indent 4 }}
diff --git a/workflows/att-workflow/values.yaml b/workflows/att-workflow/values.yaml
index 52d1556..88e4da4 100644
--- a/workflows/att-workflow/values.yaml
+++ b/workflows/att-workflow/values.yaml
@@ -35,3 +35,7 @@
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"
+
+# ONOS applications
+aaaAppUrl: "https://oss.sonatype.org/service/local/repositories/releases/content/org/opencord/aaa/1.8.0/aaa-1.8.0.oar"
+aaaAppVersion: "1.8.0"
diff --git a/workflows/tt-workflow/Chart.yaml b/workflows/tt-workflow/Chart.yaml
new file mode 100644
index 0000000..f41e810
--- /dev/null
+++ b/workflows/tt-workflow/Chart.yaml
@@ -0,0 +1,23 @@
+---
+# 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: v1
+name: tt-workflow
+description: A Helm chart for XOS's "tt-workflow"
+icon: https://guide.opencord.org/logos/cord.svg
+version: 0.1.0-dev
+
+# xosproject/tosca-loader version
+appVersion: 1.1.7
diff --git a/workflows/tt-workflow/requirements.yaml b/workflows/tt-workflow/requirements.yaml
new file mode 100644
index 0000000..a2eb7d5
--- /dev/null
+++ b/workflows/tt-workflow/requirements.yaml
@@ -0,0 +1,19 @@
+---
+# 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.
+
+dependencies:
+- name: tt-workflow-driver
+ version: 0.1.0-dev
+ repository: file://../../xos-services/tt-workflow-driver
diff --git a/workflows/tt-workflow/templates/_helpers.tpl b/workflows/tt-workflow/templates/_helpers.tpl
new file mode 100644
index 0000000..c69782b
--- /dev/null
+++ b/workflows/tt-workflow/templates/_helpers.tpl
@@ -0,0 +1,47 @@
+{{/* 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.
+*/}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "tt-workflow.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+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 "tt-workflow.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "tt-workflow.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/workflows/tt-workflow/templates/_tosca.tpl b/workflows/tt-workflow/templates/_tosca.tpl
new file mode 100644
index 0000000..17603bc
--- /dev/null
+++ b/workflows/tt-workflow/templates/_tosca.tpl
@@ -0,0 +1,59 @@
+{{/* 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 "tt-workflow.serviceGraphTosca" -}}
+tosca_definitions_version: tosca_simple_yaml_1_0
+imports:
+ - custom_types/ttworkflowdriverservice.yaml
+ - custom_types/voltservice.yaml
+ - custom_types/servicedependency.yaml
+ - custom_types/servicegraphconstraint.yaml
+description: tt-workflow-driver service graph
+topology_template:
+ node_templates:
+
+# These services must be defined before loading the graph
+
+ service#volt:
+ type: tosca.nodes.VOLTService
+ properties:
+ name: volt
+ must-exist: true
+
+ service#tt-workflow-driver:
+ type: tosca.nodes.TtWorkflowDriverService
+ properties:
+ name: tt-workflow-driver
+ must-exist: true
+
+ service_dependency#workflow_volt:
+ type: tosca.nodes.ServiceDependency
+ properties:
+ connect_method: none
+ requirements:
+ - subscriber_service:
+ node: service#tt-workflow-driver
+ relationship: tosca.relationships.BelongsToOne
+ - provider_service:
+ node: service#volt
+ relationship: tosca.relationships.BelongsToOne
+
+ constraints:
+ type: tosca.nodes.ServiceGraphConstraint
+ properties:
+ constraints: '[[null, "rcord", null], [null, "volt", null], ["onos", "fabric-crossconnect", "tt-workflow-driver"], ["fabric", null, null]]'
+{{- end -}}
diff --git a/workflows/tt-workflow/templates/tosca-configmap.yaml b/workflows/tt-workflow/templates/tosca-configmap.yaml
new file mode 100644
index 0000000..10adbbb
--- /dev/null
+++ b/workflows/tt-workflow/templates/tosca-configmap.yaml
@@ -0,0 +1,25 @@
+---
+
+# 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: v1
+kind: ConfigMap
+metadata:
+ name: tt-workflow-tosca
+data:
+ 010-fixtures.yaml: |
+{{ include "tt-workflow-driver.serviceTosca" (index .Values "tt-workflow-driver") | indent 4 }}
+ 300-service-graph.yaml: |
+{{ include "tt-workflow.serviceGraphTosca" . | indent 4 }}
diff --git a/workflows/tt-workflow/templates/tosca-job.yaml b/workflows/tt-workflow/templates/tosca-job.yaml
new file mode 100644
index 0000000..5596dbe
--- /dev/null
+++ b/workflows/tt-workflow/templates/tosca-job.yaml
@@ -0,0 +1,55 @@
+---
+
+# 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: batch/v1
+kind: Job
+metadata:
+ name: {{ template "tt-workflow.fullname" . }}-tosca-loader
+ labels:
+ app: {{ template "tt-workflow.name" . }}
+ chart: {{ template "tt-workflow.chart" . }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+spec:
+ backoffLimit: 12
+ template:
+ metadata:
+ labels:
+ app: {{ template "tt-workflow.name" . }}
+ release: {{ .Release.Name }}
+ annotations:
+ checksum/config: {{ include (print $.Template.BasePath "/tosca-configmap.yaml") . | sha256sum }}
+ spec:
+ 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 }}
+ env:
+ - name: XOS_USER
+ value: {{ .Values.xosAdminUser }}
+ - name: XOS_PASSWD
+ valueFrom:
+ secretKeyRef:
+ name: xos-admin-passwd-secret
+ key: password
+ volumeMounts:
+ - name: tt-workflow-tosca
+ mountPath: /opt/tosca
+ volumes:
+ - name: tt-workflow-tosca
+ configMap:
+ name: tt-workflow-tosca
diff --git a/workflows/tt-workflow/values.yaml b/workflows/tt-workflow/values.yaml
new file mode 100644
index 0000000..61cea53
--- /dev/null
+++ b/workflows/tt-workflow/values.yaml
@@ -0,0 +1,37 @@
+---
+# 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 the tt-workflow profile.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+
+nameOverride: ""
+fullnameOverride: ""
+
+images:
+ tosca_loader:
+ repository: 'xosproject/tosca-loader'
+ tag: '{{ .Chart.AppVersion }}'
+ pullPolicy: 'Always'
+
+global:
+ registry: ""
+
+tt-workflow-driver:
+ kafkaService: "cord-platform-kafka"
+
+xosAdminUser: "admin@opencord.org"
+xosAdminPassword: "letmein"
diff --git a/xos-profiles/ponsim-pod/Chart.yaml b/xos-profiles/ponsim-pod/Chart.yaml
index 4a1256c..9e47a34 100644
--- a/xos-profiles/ponsim-pod/Chart.yaml
+++ b/xos-profiles/ponsim-pod/Chart.yaml
@@ -17,7 +17,7 @@
description: A Helm chart for loading the Ponsim pod's TOSCA files into XOS
icon: https://guide.opencord.org/logos/xos.svg
-version: 1.0.1
+version: 1.1.0
# xosproject/tosca-loader version
appVersion: 1.1.5
diff --git a/xos-profiles/ponsim-pod/templates/tosca-configmap.yaml b/xos-profiles/ponsim-pod/templates/tosca-configmap.yaml
index 531715d..265c40a 100644
--- a/xos-profiles/ponsim-pod/templates/tosca-configmap.yaml
+++ b/xos-profiles/ponsim-pod/templates/tosca-configmap.yaml
@@ -19,4 +19,6 @@
metadata:
name: ponsim-pod-tosca
data:
+{{- $workflowpath := printf "tosca/%s/*" .Values.workflow }}
+{{ (.Files.Glob $workflowpath).AsConfig | indent 2 }}
{{ (.Files.Glob "tosca/*").AsConfig | indent 2 }}
\ No newline at end of file
diff --git a/xos-profiles/ponsim-pod/tosca/030-fabric.yaml b/xos-profiles/ponsim-pod/tosca/030-fabric.yaml
index 912cd36..ce3dda8 100644
--- a/xos-profiles/ponsim-pod/tosca/030-fabric.yaml
+++ b/xos-profiles/ponsim-pod/tosca/030-fabric.yaml
@@ -22,7 +22,7 @@
- custom_types/bngportmapping.yaml
- custom_types/serviceinstanceattribute.yaml
-description: Configures the Ponsim SEBA POD with AT&T workflow
+description: Configures the Ponsim SEBA POD fabric
topology_template:
node_templates:
diff --git a/xos-profiles/ponsim-pod/tosca/010-att-workflow.yaml b/xos-profiles/ponsim-pod/tosca/att-workflow/010-att-workflow.yaml
similarity index 100%
rename from xos-profiles/ponsim-pod/tosca/010-att-workflow.yaml
rename to xos-profiles/ponsim-pod/tosca/att-workflow/010-att-workflow.yaml
diff --git a/xos-profiles/ponsim-pod/tosca/tt-workflow/010-tt-workflow.yaml b/xos-profiles/ponsim-pod/tosca/tt-workflow/010-tt-workflow.yaml
new file mode 100644
index 0000000..c7a0bd7
--- /dev/null
+++ b/xos-profiles/ponsim-pod/tosca/tt-workflow/010-tt-workflow.yaml
@@ -0,0 +1,43 @@
+---
+# 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.
+
+# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary 010-tt-workflow.yaml http://10.90.0.101:30007/run
+
+tosca_definitions_version: tosca_simple_yaml_1_0
+imports:
+ - custom_types/servicedependency.yaml
+ - custom_types/voltservice.yaml
+ - custom_types/ttworkflowdriverwhitelistentry.yaml
+ - custom_types/ttworkflowdriverservice.yaml
+description: Create an instance of the OSS Service and connect it to the vOLT Service
+topology_template:
+ node_templates:
+
+ service#tt:
+ type: tosca.nodes.TtWorkflowDriverService
+ properties:
+ name: tt-workflow-driver
+ must-exist: true
+
+ whitelist:
+ type: tosca.nodes.TtWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: PSMO12345678
+ device_id: of:0000aabbccddeeff
+ pon_port_id: 1
+ requirements:
+ - owner:
+ node: service#tt
+ relationship: tosca.relationships.BelongsToOne
diff --git a/xos-profiles/ponsim-pod/values.yaml b/xos-profiles/ponsim-pod/values.yaml
index e6ac302..d594ce5 100644
--- a/xos-profiles/ponsim-pod/values.yaml
+++ b/xos-profiles/ponsim-pod/values.yaml
@@ -32,3 +32,6 @@
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"
+
+# Supported workflows: att-workflow (AT&T) or tt-workflow (Turk Telekom)
+workflow: att-workflow
diff --git a/xos-profiles/seba-services/Chart.yaml b/xos-profiles/seba-services/Chart.yaml
index ea665e8..917a223 100644
--- a/xos-profiles/seba-services/Chart.yaml
+++ b/xos-profiles/seba-services/Chart.yaml
@@ -17,7 +17,7 @@
name: seba-services
description: A Helm chart for XOS's "SEBA" profile
icon: https://guide.opencord.org/logos/cord.svg
-version: 1.0.9
+version: 1.1.0
# xosproject/tosca-loader version
appVersion: 1.1.7
diff --git a/xos-profiles/seba-services/templates/_tosca.tpl b/xos-profiles/seba-services/templates/_tosca.tpl
index 1e4ca3c..cb329b4 100644
--- a/xos-profiles/seba-services/templates/_tosca.tpl
+++ b/xos-profiles/seba-services/templates/_tosca.tpl
@@ -93,19 +93,6 @@
node: service#onos
relationship: tosca.relationships.BelongsToOne
- onos_app#aaa:
- type: tosca.nodes.ONOSApp
- properties:
- name: aaa
- app_id: org.opencord.aaa
- url: {{ .aaaAppUrl }}
- version: {{ .aaaAppVersion }}
- dependencies: org.opencord.sadis
- requirements:
- - owner:
- node: service#onos
- relationship: tosca.relationships.BelongsToOne
-
onos_app#kafka:
type: tosca.nodes.ONOSApp
properties:
@@ -113,7 +100,6 @@
app_id: org.opencord.kafka
url: {{ .kafkaAppUrl }}
version: {{ .kafkaAppVersion }}
- dependencies: org.opencord.olt,org.opencord.aaa,org.opencord.dhcpl2relay
requirements:
- owner:
node: service#onos
@@ -148,24 +134,6 @@
node: onos_app#olt
relationship: tosca.relationships.BelongsToOne
- aaa-config-attr:
- type: tosca.nodes.ServiceInstanceAttribute
- properties:
- name: /onos/v1/network/configuration/apps/org.opencord.aaa
- value: >
- {
- "AAA" : {
- "radiusConnectionType" : "socket",
- "radiusHost" : "freeradius.voltha.svc.cluster.local",
- "radiusServerPort" : "1812",
- "radiusSecret" : "SECRET"
- }
- }
- requirements:
- - service_instance:
- node: onos_app#aaa
- relationship: tosca.relationships.BelongsToOne
-
sadis-config-attr:
type: tosca.nodes.ServiceInstanceAttribute
properties:
@@ -389,9 +357,4 @@
- provider_service:
node: service#onos
relationship: tosca.relationships.BelongsToOne
-
- constraints:
- type: tosca.nodes.ServiceGraphConstraint
- properties:
- constraints: '[[null, "rcord", null], [null, "volt", null], ["onos", "fabric-crossconnect", "att-workflow-driver"], ["fabric", null, null]]'
{{- end -}}
diff --git a/xos-profiles/seba-services/values.yaml b/xos-profiles/seba-services/values.yaml
index ec65381..fce29c4 100644
--- a/xos-profiles/seba-services/values.yaml
+++ b/xos-profiles/seba-services/values.yaml
@@ -40,9 +40,6 @@
xosAdminPassword: "letmein"
# ONOS applications
-aaaAppUrl: "https://oss.sonatype.org/service/local/repositories/releases/content/org/opencord/aaa/1.8.0/aaa-1.8.0.oar"
-aaaAppVersion: "1.8.0"
-
sadisAppUrl: "https://oss.sonatype.org/service/local/repositories/releases/content/org/opencord/sadis-app/2.2.0/sadis-app-2.2.0.oar"
sadisAppVersion: "2.2.0"
@@ -62,4 +59,4 @@
fabric:
enabled: true
onos-service:
- enabled: true
\ No newline at end of file
+ enabled: true
diff --git a/xos-services/tt-workflow-driver/.helmignore b/xos-services/tt-workflow-driver/.helmignore
new file mode 100644
index 0000000..f0c1319
--- /dev/null
+++ b/xos-services/tt-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-services/tt-workflow-driver/Chart.yaml b/xos-services/tt-workflow-driver/Chart.yaml
new file mode 100644
index 0000000..5fb038a
--- /dev/null
+++ b/xos-services/tt-workflow-driver/Chart.yaml
@@ -0,0 +1,21 @@
+---
+# 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.
+
+name: tt-workflow-driver
+description: A Helm chart for XOS's "tt-workflow-driver" service
+icon: https://guide.opencord.org/logos/cord.svg
+
+version: 0.1.0-dev
+appVersion: 0.1.0-dev
diff --git a/xos-services/tt-workflow-driver/templates/_helpers.tpl b/xos-services/tt-workflow-driver/templates/_helpers.tpl
new file mode 100644
index 0000000..344fc5c
--- /dev/null
+++ b/xos-services/tt-workflow-driver/templates/_helpers.tpl
@@ -0,0 +1,80 @@
+{{/* 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.
+*/}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "tt-workflow-driver.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+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 "tt-workflow-driver.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "tt-workflow-driver.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "tt-workflow-driver.serviceConfig" -}}
+name: tt-workflow-driver
+accessor:
+ username: {{ .Values.xosAdminUser | quote }}
+ password: {{ .Values.xosAdminPassword | quote }}
+ endpoint: {{ .Values.xosCoreService | quote }}
+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
+ kafka:
+ class: kafkaloghandler.KafkaLogHandler
+ bootstrap_servers:
+ - "{{ .Values.kafkaService }}:9092"
+ topic: xos.log.tt-workflow-driver
+ loggers:
+ '':
+ handlers:
+ - console
+ - file
+ - kafka
+ level: DEBUG
+{{- end -}}
diff --git a/xos-services/tt-workflow-driver/templates/_tosca.tpl b/xos-services/tt-workflow-driver/templates/_tosca.tpl
new file mode 100644
index 0000000..1b3588d
--- /dev/null
+++ b/xos-services/tt-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 "tt-workflow-driver.serviceTosca" -}}
+tosca_definitions_version: tosca_simple_yaml_1_0
+description: Set up tt-workflow-driver service
+imports:
+ - custom_types/ttworkflowdriverservice.yaml
+
+topology_template:
+ node_templates:
+ service#tt-workflow-driver:
+ type: tosca.nodes.TtWorkflowDriverService
+ properties:
+ name: tt-workflow-driver
+ kind: oss
+{{- end -}}
diff --git a/xos-services/tt-workflow-driver/templates/configmap.yaml b/xos-services/tt-workflow-driver/templates/configmap.yaml
new file mode 100644
index 0000000..0035330
--- /dev/null
+++ b/xos-services/tt-workflow-driver/templates/configmap.yaml
@@ -0,0 +1,22 @@
+---
+# 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: v1
+kind: ConfigMap
+metadata:
+ name: tt-workflow-driver
+data:
+ serviceConfig: |
+{{ include "tt-workflow-driver.serviceConfig" . | indent 4 }}
diff --git a/xos-services/tt-workflow-driver/templates/deployment.yaml b/xos-services/tt-workflow-driver/templates/deployment.yaml
new file mode 100644
index 0000000..1cdea92
--- /dev/null
+++ b/xos-services/tt-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 "tt-workflow-driver.fullname" . }}
+ labels:
+ app: {{ template "tt-workflow-driver.name" . }}
+ chart: {{ template "tt-workflow-driver.chart" . }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+spec:
+ replicas: {{ .Values.replicaCount }}
+ selector:
+ matchLabels:
+ app: {{ template "tt-workflow-driver.name" . }}
+ release: {{ .Release.Name }}
+ template:
+ metadata:
+ labels:
+ app: {{ template "tt-workflow-driver.name" . }}
+ release: {{ .Release.Name }}
+ annotations:
+ checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+ spec:
+ containers:
+ - name: {{ .Chart.Name }}
+ image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
+ imagePullPolicy: {{ .Values.image.pullPolicy }}
+ resources:
+{{ toYaml .Values.resources | indent 12 }}
+ volumeMounts:
+ - name: tt-workflow-driver-config
+ mountPath: /opt/xos/synchronizers/tt-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: tt-workflow-driver-config
+ configMap:
+ name: tt-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/tt-workflow-driver/values.yaml b/xos-services/tt-workflow-driver/values.yaml
new file mode 100644
index 0000000..c8c1b83
--- /dev/null
+++ b/xos-services/tt-workflow-driver/values.yaml
@@ -0,0 +1,45 @@
+---
+# 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 the tt-workflow-driver service
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+nameOverride: ""
+fullnameOverride: ""
+
+image:
+ repository: 'xosproject/tt-workflow-driver-synchronizer'
+ tag: '{{ .Chart.AppVersion }}'
+ pullPolicy: 'Always'
+
+global:
+ registry: ''
+
+xosAdminUser: "admin@opencord.org"
+xosAdminPassword: "letmein"
+xosCoreService: "xos-core:50051"
+
+kafkaService: "cord-kafka"
+
+resources: {}
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}