SEBA-544 Helm charts for TT Workflow
Change-Id: I3eb33c501876f1b76312836b2fa16d68d4bb9c9a
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"