Adding ADTRAN config
Change-Id: I9cdd3889441836a282feccf4d19479b378de4470
diff --git a/kubernetes-configs/onlab-pod1.yml b/kubernetes-configs/onlab-pod1.yml
index 07cf990..8fb6435 100644
--- a/kubernetes-configs/onlab-pod1.yml
+++ b/kubernetes-configs/onlab-pod1.yml
@@ -14,6 +14,14 @@
vcoreImage: 'voltha/voltha-voltha:latest'
#onosImage: 'matteoscandolo/onos:berlin'
+volt:
+ image:
+ repository: '10.90.0.101:30500/xosproject/volt-synchronizer'
+ tag: 'candidate'
+sadis-server:
+ image:
+ repository: '10.90.0.101:30500/opencord/sadis-server'
+ tag: 'candidate'
onosImage: 'onosproject/onos:1.13.5'
diff --git a/tosca-configs/att-workflow/bbwf-fabric.yaml b/tosca-configs/att-workflow/bbwf-fabric.yaml
index 8914df9..27cc997 100755
--- a/tosca-configs/att-workflow/bbwf-fabric.yaml
+++ b/tosca-configs/att-workflow/bbwf-fabric.yaml
@@ -136,6 +136,29 @@
node: onos_app#dhcpl2relay
relationship: tosca.relationships.BelongsToOne
+ # OLT app extra config
+ onos_app#olt:
+ type: tosca.nodes.ONOSApp
+ properties:
+ name: olt
+ must-exist: true
+
+ olt-config-attr:
+ type: tosca.nodes.ServiceInstanceAttribute
+ properties:
+ name: /onos/v1/network/configuration/devices
+ value: >
+ "of:00000024454a6be4" : {
+ "basic" : {
+ "name" : "ADTRAN OLT",
+ "driver" : "voltha"
+ }
+ }
+ requirements:
+ - service_instance:
+ node: onos_app#olt
+ relationship: tosca.relationships.BelongsToOne
+
# ONU Whitelist
service#att:
type: tosca.nodes.AttWorkflowDriverService
diff --git a/tosca-configs/att-workflow/onlab-pod1-bbsim.yaml b/tosca-configs/att-workflow/onlab-pod1-bbsim.yaml
index e6011a9..2ab8a89 100755
--- a/tosca-configs/att-workflow/onlab-pod1-bbsim.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-bbsim.yaml
@@ -23,6 +23,8 @@
- custom_types/attworkflowdriverwhitelistentry.yaml
- custom_types/attworkflowdriverservice.yaml
- custom_types/rcordsubscriber.yaml
+ - custom_types/serviceinstanceattribute.yaml
+ - custom_types/onosapp.yaml
description: Create a simulated OLT Device in VOLTHA
topology_template:
node_templates:
@@ -51,12 +53,35 @@
node: service#volt
relationship: tosca.relationships.BelongsToOne
+ # POD Config
bngmapping:
type: tosca.nodes.BNGPortMapping
properties:
s_tag: any
switch_port: 31
+ # DHCP L2 Relay config
+ onos_app#dhcpl2relay:
+ type: tosca.nodes.ONOSApp
+ properties:
+ name: dhcpl2relay
+ must-exist: true
+
+ dhcpl2relay-config-attr:
+ type: tosca.nodes.ServiceInstanceAttribute
+ properties:
+ name: /onos/v1/network/configuration/apps/org.opencord.dhcpl2relay
+ value: >
+ {
+ "dhcpl2relay" : {
+ "useOltUplinkForServerPktInOut" : true
+ }
+ }
+ requirements:
+ - service_instance:
+ node: onos_app#dhcpl2relay
+ relationship: tosca.relationships.BelongsToOne
+
# Whitelist
service#att:
type: tosca.nodes.AttWorkflowDriverService