Fixing configs
Change-Id: Ib8a315aef8a854e4a0468b458f2af33db6892751
diff --git a/kubernetes-configs/bbwf.yml b/kubernetes-configs/bbwf.yml
index 8b34ab4..4d3fb79 100644
--- a/kubernetes-configs/bbwf.yml
+++ b/kubernetes-configs/bbwf.yml
@@ -6,24 +6,11 @@
vcliImage: 'voltha/voltha-cli:amsterdam'
vcoreImage: 'voltha/voltha-voltha:amsterdam'
-onosImage: 'onosproject/onos:1.13.4'
+onosImage: 'matteoscandolo/onos:berlin'
-# XOS core images
-images:
- xos_core:
- tag: 2.1.0
-
-# service images
-fabric:
- images:
- tag: 2.1.0
-
-att-workflow-driver:
- images:
- tag: 1.0.0
-
-# application_logs: |
-# log4j.logger.org.opencord.olt = DEBUG
-# log4j.logger.org.opencord.kafka = DEBUG
-# log4j.logger.org.opencord.sadis = DEBUG
-# log4j.logger.org.opencord.aaa = DEBUG
+application_logs: |
+ log4j.logger.org.opencord.olt = TRACE
+ log4j.logger.org.opencord.kafka = DEBUG
+ log4j.logger.org.opencord.sadis = DEBUG
+ log4j.logger.org.opencord.aaa = TRACE
+ log4j.logger.org.opencord.dhcpl2relay = TRACE
diff --git a/tosca-configs/att-workflow/bbwf-fabric.yaml b/tosca-configs/att-workflow/bbwf-fabric.yaml
index fa61437..f0285c9 100755
--- a/tosca-configs/att-workflow/bbwf-fabric.yaml
+++ b/tosca-configs/att-workflow/bbwf-fabric.yaml
@@ -22,6 +22,8 @@
- custom_types/bngportmapping.yaml
- custom_types/attworkflowdriverwhitelistentry.yaml
- custom_types/attworkflowdriverservice.yaml
+ - custom_types/serviceinstanceattribute.yaml
+ - custom_types/onosapp.yaml
description: Configures the fabric and the whitelist
@@ -98,7 +100,6 @@
type: tosca.nodes.SwitchPort
properties:
portId: 48
- host_learning: false
requirements:
- switch:
node: switch#leaf_1
@@ -112,6 +113,29 @@
s_tag: any
switch_port: 48
+ # 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" : false,
+ "dhcpServerConnectPoints" : [ "of:0000000000000001/31" ]
+ }
+ }
+ requirements:
+ - service_instance:
+ node: onos_app#dhcpl2relay
+ relationship: tosca.relationships.BelongsToOne
+
# ONU Whitelist
service#att:
type: tosca.nodes.AttWorkflowDriverService
diff --git a/tosca-configs/att-workflow/bbwf-olt.yaml b/tosca-configs/att-workflow/bbwf-olt.yaml
index 1fd6316..8a8f993 100755
--- a/tosca-configs/att-workflow/bbwf-olt.yaml
+++ b/tosca-configs/att-workflow/bbwf-olt.yaml
@@ -69,7 +69,7 @@
name: CIG OLT
device_type: openolt
host: 192.168.100.113
- port: 9191
+ port: 10400
switch_datapath_id: of:0000000000000001
switch_port: "51"
outer_tpid: "0x8100"
diff --git a/tosca-configs/att-workflow/onlab-pod1-fabric.yaml b/tosca-configs/att-workflow/onlab-pod1-fabric.yaml
index 77cae6b..0f9ddb0 100755
--- a/tosca-configs/att-workflow/onlab-pod1-fabric.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-fabric.yaml
@@ -23,6 +23,7 @@
- custom_types/attworkflowdriverwhitelistentry.yaml
- custom_types/attworkflowdriverservice.yaml
- custom_types/serviceinstanceattribute.yaml
+ - custom_types/onosapp.yaml
description: Configures the ONF SEBA POD with AT&T workflow
@@ -70,6 +71,12 @@
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:
diff --git a/tosca-configs/att-workflow/onlab-pod2-fabric.yaml b/tosca-configs/att-workflow/onlab-pod2-fabric.yaml
index 76f16a9..382d8b4 100755
--- a/tosca-configs/att-workflow/onlab-pod2-fabric.yaml
+++ b/tosca-configs/att-workflow/onlab-pod2-fabric.yaml
@@ -23,6 +23,7 @@
- custom_types/attworkflowdriverwhitelistentry.yaml
- custom_types/attworkflowdriverservice.yaml
- custom_types/serviceinstanceattribute.yaml
+ - custom_types/onosapp.yaml
description: Configures the ONF SEBA POD2 with AT&T workflow
@@ -70,6 +71,12 @@
switch_port: 32
# 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: