Moving DHCP config into pod-config as it's pod specific
Change-Id: Ib5e4146d696fec33dbfdd7ee43e40f703e3acafd
diff --git a/tosca-configs/att-workflow/onlab-pod1-fabric.yaml b/tosca-configs/att-workflow/onlab-pod1-fabric.yaml
index a00df87..60ea4f6 100755
--- a/tosca-configs/att-workflow/onlab-pod1-fabric.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-fabric.yaml
@@ -22,6 +22,7 @@
- custom_types/bngportmapping.yaml
- custom_types/attworkflowdriverwhitelistentry.yaml
- custom_types/attworkflowdriverservice.yaml
+ - custom_types/serviceinstanceattribute.yaml
description: Configures the ONF SEBA POD with AT&T workflow
@@ -55,7 +56,6 @@
type: tosca.nodes.SwitchPort
properties:
portId: 31
- host_learning: false
requirements:
- switch:
node: switch#leaf_1
@@ -69,6 +69,23 @@
s_tag: any
switch_port: 31
+ # DHCP L2 Relay config
+ 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/onlab-pod2-fabric.yaml b/tosca-configs/att-workflow/onlab-pod2-fabric.yaml
index 6d0e8de..76f16a9 100755
--- a/tosca-configs/att-workflow/onlab-pod2-fabric.yaml
+++ b/tosca-configs/att-workflow/onlab-pod2-fabric.yaml
@@ -22,6 +22,7 @@
- custom_types/bngportmapping.yaml
- custom_types/attworkflowdriverwhitelistentry.yaml
- custom_types/attworkflowdriverservice.yaml
+ - custom_types/serviceinstanceattribute.yaml
description: Configures the ONF SEBA POD2 with AT&T workflow
@@ -55,7 +56,6 @@
type: tosca.nodes.SwitchPort
properties:
portId: 32
- host_learning: false
requirements:
- switch:
node: switch#leaf_1
@@ -69,6 +69,23 @@
s_tag: any
switch_port: 32
+ # DHCP L2 Relay config
+ dhcpl2relay-config-attr:
+ type: tosca.nodes.ServiceInstanceAttribute
+ properties:
+ name: /onos/v1/network/configuration/apps/org.opencord.dhcpl2relay
+ value: >
+ {
+ "dhcpl2relay" : {
+ "useOltUplinkForServerPktInOut" : false,
+ "dhcpServerConnectPoints" : [ "of:0000000000000002/32" ]
+ }
+ }
+ requirements:
+ - service_instance:
+ node: onos_app#dhcpl2relay
+ relationship: tosca.relationships.BelongsToOne
+
# ONU Whitelist
service#att:
type: tosca.nodes.AttWorkflowDriverService