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