Added support for running SiaB with SD-BNG
- new mininet topology with PPPoE server
- new fabric configuration for Ponsim
- new DT-workflow
- new values file to run SD-BNG on SiaB
Change-Id: Ib9d61111d6399e9240afb60bb6a77f152a6ecd01
diff --git a/workflows/dt-workflow/Chart.yaml b/workflows/dt-workflow/Chart.yaml
new file mode 100644
index 0000000..3077758
--- /dev/null
+++ b/workflows/dt-workflow/Chart.yaml
@@ -0,0 +1,23 @@
+---
+# Copyright 2019-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: dt-workflow
+description: A Helm chart for XOS's "dt-workflow"
+icon: https://guide.opencord.org/logos/cord.svg
+version: 1.0.0
+
+# xosproject/tosca-loader version
+appVersion: 1.3.1
diff --git a/workflows/dt-workflow/requirements.yaml b/workflows/dt-workflow/requirements.yaml
new file mode 100644
index 0000000..d2fbde0
--- /dev/null
+++ b/workflows/dt-workflow/requirements.yaml
@@ -0,0 +1,19 @@
+---
+# Copyright 2019-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: dt-workflow-driver
+ version: 1.0.0
+ repository: file://../../xos-services/dt-workflow-driver
diff --git a/workflows/dt-workflow/templates/_helpers.tpl b/workflows/dt-workflow/templates/_helpers.tpl
new file mode 100644
index 0000000..a21229e
--- /dev/null
+++ b/workflows/dt-workflow/templates/_helpers.tpl
@@ -0,0 +1,47 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Copyright 2019-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 "dt-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 "dt-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 "dt-workflow.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/workflows/dt-workflow/templates/_tosca.tpl b/workflows/dt-workflow/templates/_tosca.tpl
new file mode 100644
index 0000000..9209f11
--- /dev/null
+++ b/workflows/dt-workflow/templates/_tosca.tpl
@@ -0,0 +1,98 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Copyright 2019-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 "dt-workflow.serviceGraphTosca" -}}
+tosca_definitions_version: tosca_simple_yaml_1_0
+imports:
+ - custom_types/dtworkflowdriverservice.yaml
+ - custom_types/voltservice.yaml
+ - custom_types/servicedependency.yaml
+ - custom_types/servicegraphconstraint.yaml
+description: dt-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#dt-workflow-driver:
+ type: tosca.nodes.DtWorkflowDriverService
+ properties:
+ name: dt-workflow-driver
+ must-exist: true
+
+ service_dependency#workflow_volt:
+ type: tosca.nodes.ServiceDependency
+ properties:
+ connect_method: none
+ requirements:
+ - subscriber_service:
+ node: service#dt-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", "vrouter", "dt-workflow-driver"], ["fabric", null, null]]'
+{{- end -}}
+
+{{- define "dt-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#olt:
+ type: tosca.nodes.ONOSApp
+ properties:
+ name: olt
+ must-exist: true
+
+ olt-config-attr:
+ type: tosca.nodes.ServiceInstanceAttribute
+ properties:
+ name: /onos/v1/configuration/org.opencord.olt.impl.Olt?preset=true
+ value: >
+ {
+ "enableDhcpOnProvisioning" : false
+ }
+ requirements:
+ - service_instance:
+ node: onos_app#olt
+ relationship: tosca.relationships.BelongsToOne
+{{- end -}}
diff --git a/workflows/dt-workflow/templates/tosca-configmap.yaml b/workflows/dt-workflow/templates/tosca-configmap.yaml
new file mode 100644
index 0000000..c359b91
--- /dev/null
+++ b/workflows/dt-workflow/templates/tosca-configmap.yaml
@@ -0,0 +1,27 @@
+---
+
+# Copyright 2019-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: dt-workflow-tosca
+data:
+ 010-fixtures.yaml: |
+{{ include "dt-workflow-driver.serviceTosca" (index .Values "dt-workflow-driver") | indent 4 }}
+ 100-onos-apps.yaml: |
+{{ include "dt-workflow.onosTosca" . | indent 4 }}
+ 300-service-graph.yaml: |
+{{ include "dt-workflow.serviceGraphTosca" . | indent 4 }}
diff --git a/workflows/dt-workflow/templates/tosca-job.yaml b/workflows/dt-workflow/templates/tosca-job.yaml
new file mode 100644
index 0000000..09a4bfd
--- /dev/null
+++ b/workflows/dt-workflow/templates/tosca-job.yaml
@@ -0,0 +1,55 @@
+---
+
+# Copyright 2019-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 "dt-workflow.fullname" . }}-tosca-loader
+ labels:
+ app: {{ template "dt-workflow.name" . }}
+ chart: {{ template "dt-workflow.chart" . }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+spec:
+ backoffLimit: 12
+ template:
+ metadata:
+ labels:
+ app: {{ template "dt-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: dt-workflow-tosca
+ mountPath: /opt/tosca
+ volumes:
+ - name: dt-workflow-tosca
+ configMap:
+ name: dt-workflow-tosca
diff --git a/workflows/dt-workflow/values.yaml b/workflows/dt-workflow/values.yaml
new file mode 100644
index 0000000..a3de677
--- /dev/null
+++ b/workflows/dt-workflow/values.yaml
@@ -0,0 +1,37 @@
+---
+# Copyright 2019-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 dt-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: ""
+
+dt-workflow-driver:
+ kafkaService: "cord-platform-kafka"
+
+xosAdminUser: "admin@opencord.org"
+xosAdminPassword: "letmein"