SEBA-525 Disable EAPOL processing for TT workflow
Change-Id: I7bc034ec9d0e5ebcbacad4a4773399a1022823ad
diff --git a/configs/seba-ponsim-latest.yaml b/configs/seba-ponsim-latest.yaml
index 7ab936f..bd4ad22 100644
--- a/configs/seba-ponsim-latest.yaml
+++ b/configs/seba-ponsim-latest.yaml
@@ -17,9 +17,9 @@
# Use this file to deploy the 'master' (dev) versions of all services.
# This is mainly useful for testing.
-etcd-operator:
- etcdCluster:
- size: 1
+# voltha
+etcd-cluster:
+ clusterSize: 1
# in xos-core chart and other charts with multiple images
images:
@@ -36,7 +36,7 @@
# ONOS
onos:
repository: 'matteoscandolo/onos'
- tag: '1.13.9-rc3'
+ tag: '1.13.9-rc4'
# VOLTHA
vcore:
tag: 'latest'
@@ -105,8 +105,7 @@
# in workflow/tt-workflow service chart
tt-workflow-driver:
image:
- repository: andybavier/test-image-synchronizer
- tag: tt-workflow-driver
+ tag: 'master'
# 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 34e5460..2cc4f97 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.2.0
+version: 1.2.1
# xosproject/tosca-loader version
appVersion: 1.3.0
diff --git a/workflows/att-workflow/templates/_tosca.tpl b/workflows/att-workflow/templates/_tosca.tpl
index 32c2a68..073a5f3 100644
--- a/workflows/att-workflow/templates/_tosca.tpl
+++ b/workflows/att-workflow/templates/_tosca.tpl
@@ -107,4 +107,23 @@
- service_instance:
node: onos_app#aaa
relationship: tosca.relationships.BelongsToOne
+
+ 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" : true
+ }
+ requirements:
+ - service_instance:
+ node: onos_app#olt
+ relationship: tosca.relationships.BelongsToOne
{{- end -}}
diff --git a/workflows/tt-workflow/Chart.yaml b/workflows/tt-workflow/Chart.yaml
index 781f4fd..e95c96b 100644
--- a/workflows/tt-workflow/Chart.yaml
+++ b/workflows/tt-workflow/Chart.yaml
@@ -17,7 +17,7 @@
name: tt-workflow
description: A Helm chart for XOS's "tt-workflow"
icon: https://guide.opencord.org/logos/cord.svg
-version: 0.1.1-dev
+version: 0.1.2-dev
# xosproject/tosca-loader version
appVersion: 1.3.0
diff --git a/workflows/tt-workflow/templates/_tosca.tpl b/workflows/tt-workflow/templates/_tosca.tpl
index 17603bc..0888759 100644
--- a/workflows/tt-workflow/templates/_tosca.tpl
+++ b/workflows/tt-workflow/templates/_tosca.tpl
@@ -57,3 +57,43 @@
properties:
constraints: '[[null, "rcord", null], [null, "volt", null], ["onos", "fabric-crossconnect", "tt-workflow-driver"], ["fabric", null, null]]'
{{- end -}}
+
+{{- define "tt-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" : true,
+ "enableEapol" : false
+ }
+ requirements:
+ - service_instance:
+ node: onos_app#olt
+ relationship: tosca.relationships.BelongsToOne
+{{- end -}}
diff --git a/workflows/tt-workflow/templates/tosca-configmap.yaml b/workflows/tt-workflow/templates/tosca-configmap.yaml
index 10adbbb..beb18bc 100644
--- a/workflows/tt-workflow/templates/tosca-configmap.yaml
+++ b/workflows/tt-workflow/templates/tosca-configmap.yaml
@@ -21,5 +21,7 @@
data:
010-fixtures.yaml: |
{{ include "tt-workflow-driver.serviceTosca" (index .Values "tt-workflow-driver") | indent 4 }}
+ 100-onos-apps.yaml: |
+{{ include "tt-workflow.onosTosca" . | indent 4 }}
300-service-graph.yaml: |
{{ include "tt-workflow.serviceGraphTosca" . | indent 4 }}
diff --git a/xos-profiles/seba-services/Chart.yaml b/xos-profiles/seba-services/Chart.yaml
index 1d0140f..eed0129 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.2.0
+version: 1.2.1
# xosproject/tosca-loader version
appVersion: 1.3.0
diff --git a/xos-profiles/seba-services/templates/_tosca.tpl b/xos-profiles/seba-services/templates/_tosca.tpl
index e394891..712f176 100644
--- a/xos-profiles/seba-services/templates/_tosca.tpl
+++ b/xos-profiles/seba-services/templates/_tosca.tpl
@@ -121,19 +121,6 @@
node: onos_app#kafka
relationship: tosca.relationships.BelongsToOne
- olt-config-attr:
- type: tosca.nodes.ServiceInstanceAttribute
- properties:
- name: /onos/v1/configuration/org.opencord.olt.impl.Olt?preset=true
- value: >
- {
- "enableDhcpOnProvisioning" : true
- }
- requirements:
- - service_instance:
- node: onos_app#olt
- relationship: tosca.relationships.BelongsToOne
-
sadis-config-attr:
type: tosca.nodes.ServiceInstanceAttribute
properties: