[SEBA-181] Creating At&t charts
Change-Id: Ia29498fc219728600fd63324a880764b620aeaf1
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