Updating BBWF configs
Change-Id: If4534184552d8c98d1a31668aaef6be25648d7fe
diff --git a/tosca-configs/att-workflow/bbwf-fabric.yaml b/tosca-configs/att-workflow/bbwf-fabric.yaml
index ef9a6d1..100db89 100755
--- a/tosca-configs/att-workflow/bbwf-fabric.yaml
+++ b/tosca-configs/att-workflow/bbwf-fabric.yaml
@@ -73,28 +73,28 @@
node: switch#agg_sw
relationship: tosca.relationships.BelongsToOne
- # Setup the Iskratel XGS-PON OLT switch port
- port#iskratelx_olt_port:
- type: tosca.nodes.SwitchPort
- properties:
- portId: 46
- host_learning: false
- requirements:
- - switch:
- node: switch#agg_sw
- relationship: tosca.relationships.BelongsToOne
-
- # # Setup the Iskratel GPON OLT switch port
- # port#iskratelg_olt_port:
+ # # Setup the Iskratel XGS-PON OLT switch port
+ # port#iskratelx_olt_port:
# type: tosca.nodes.SwitchPort
# properties:
- # portId: 47
+ # portId: 46
# host_learning: false
# requirements:
# - switch:
# node: switch#agg_sw
# relationship: tosca.relationships.BelongsToOne
+ # Setup the Iskratel GPON OLT switch port
+ port#iskratelg_olt_port:
+ type: tosca.nodes.SwitchPort
+ properties:
+ portId: 47
+ host_learning: false
+ requirements:
+ - switch:
+ node: switch#agg_sw
+ relationship: tosca.relationships.BelongsToOne
+
# Port connected to the BNG
port#bng_port:
type: tosca.nodes.SwitchPort
@@ -136,30 +136,30 @@
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 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
+ 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:
@@ -226,17 +226,17 @@
node: service#att
relationship: tosca.relationships.BelongsToOne
- # # ONUs connected to Iskratel XGS-PON OLT
- ISKT71e81070:
- type: tosca.nodes.AttWorkflowDriverWhiteListEntry
- properties:
- serial_number: ISKT71e81070
- pon_port_id: 536870912
- device_id: of:00000000c0a86472
- requirements:
- - owner:
- node: service#att
- relationship: tosca.relationships.BelongsToOne
+ # # # ONUs connected to Iskratel XGS-PON OLT
+ # ISKT71e81070:
+ # type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ # properties:
+ # serial_number: ISKT71e81070
+ # pon_port_id: 536870912
+ # device_id: of:00000000c0a86472
+ # requirements:
+ # - owner:
+ # node: service#att
+ # relationship: tosca.relationships.BelongsToOne
# ISKT71e81071:
# type: tosca.nodes.AttWorkflowDriverWhiteListEntry
@@ -249,17 +249,17 @@
# node: service#att
# relationship: tosca.relationships.BelongsToOne
- # # ONUs connected to Iskratel GPON OLT
- # ISKT45f2c688:
- # type: tosca.nodes.AttWorkflowDriverWhiteListEntry
- # properties:
- # serial_number: ISKT45f2c688
- # pon_port_id: 536870912
- # device_id: of:00000000c0a86473
- # requirements:
- # - owner:
- # node: service#att
- # relationship: tosca.relationships.BelongsToOne
+ # ONUs connected to Iskratel GPON OLT
+ ISKT45f2c688:
+ type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: ISKT45f2c688
+ pon_port_id: 536870912
+ device_id: of:00000000c0a86473
+ requirements:
+ - owner:
+ node: service#att
+ relationship: tosca.relationships.BelongsToOne
# ISKT45f2bd61:
# type: tosca.nodes.AttWorkflowDriverWhiteListEntry
diff --git a/tosca-configs/att-workflow/bbwf-olt.yaml b/tosca-configs/att-workflow/bbwf-olt.yaml
index 26a01ad..ccd218b 100755
--- a/tosca-configs/att-workflow/bbwf-olt.yaml
+++ b/tosca-configs/att-workflow/bbwf-olt.yaml
@@ -80,32 +80,15 @@
node: service#volt
relationship: tosca.relationships.BelongsToOne
- iskratel-xgspon:
- type: tosca.nodes.OLTDevice
- properties:
- name: Iskratel XGS-PON OLT
- device_type: openolt
- host: 192.168.100.114
- port: 9191
- switch_datapath_id: of:0000000000000001
- switch_port: "46"
- outer_tpid: "0x8100"
- uplink: "65536"
- nas_id: "NAS_ID"
- requirements:
- - volt_service:
- node: service#volt
- relationship: tosca.relationships.BelongsToOne
-
- # iskratel-gpon:
+ # iskratel-xgspon:
# type: tosca.nodes.OLTDevice
# properties:
- # name: Iskratel GPON OLT
+ # name: Iskratel XGS-PON OLT
# device_type: openolt
- # host: 192.168.100.115
+ # host: 192.168.100.114
# port: 9191
# switch_datapath_id: of:0000000000000001
- # switch_port: "47"
+ # switch_port: "46"
# outer_tpid: "0x8100"
# uplink: "65536"
# nas_id: "NAS_ID"
@@ -113,3 +96,20 @@
# - volt_service:
# node: service#volt
# relationship: tosca.relationships.BelongsToOne
+
+ iskratel-gpon:
+ type: tosca.nodes.OLTDevice
+ properties:
+ name: Iskratel GPON OLT
+ device_type: openolt
+ host: 192.168.100.115
+ port: 9191
+ switch_datapath_id: of:0000000000000001
+ switch_port: "47"
+ outer_tpid: "0x8100"
+ uplink: "65536"
+ nas_id: "NAS_ID"
+ requirements:
+ - volt_service:
+ node: service#volt
+ relationship: tosca.relationships.BelongsToOne
diff --git a/tosca-configs/att-workflow/bbwf-subscriber.yaml b/tosca-configs/att-workflow/bbwf-subscriber.yaml
index a5f6f5a..80ac9c0 100755
--- a/tosca-configs/att-workflow/bbwf-subscriber.yaml
+++ b/tosca-configs/att-workflow/bbwf-subscriber.yaml
@@ -86,18 +86,18 @@
circuit_id: cig_sub1_circuit
remote_id: cig_sub1_remote
- # Iskratel XGS-PON OLT subscribers
- iskratelx_subscriber_1:
- type: tosca.nodes.RCORDSubscriber
- properties:
- name: Sub_ISKT71e81070
- status: pre-provisioned
- c_tag: 41
- s_tag: 444
- onu_device: ISKT71e81070
- nas_port_id : "PON 1/1/05/1:1.1.1"
- circuit_id: iskx_sub1_circuit
- remote_id: iskx_sub1_remote
+ # # Iskratel XGS-PON OLT subscribers
+ # iskratelx_subscriber_1:
+ # type: tosca.nodes.RCORDSubscriber
+ # properties:
+ # name: Sub_ISKT71e81070
+ # status: pre-provisioned
+ # c_tag: 41
+ # s_tag: 444
+ # onu_device: ISKT71e81070
+ # nas_port_id : "PON 1/1/05/1:1.1.1"
+ # circuit_id: iskx_sub1_circuit
+ # remote_id: iskx_sub1_remote
# iskratelx_subscriber_2:
# type: tosca.nodes.RCORDSubscriber
@@ -111,18 +111,18 @@
# circuit_id: iskx_sub2_circuit
# remote_id: iskx_sub2_remote
- # # Iskratel GPON OLT subscribers
- # iskratelg_subscriber_1:
- # type: tosca.nodes.RCORDSubscriber
- # properties:
- # name: Sub_ISKT45f2c688
- # status: pre-provisioned
- # c_tag: 51
- # s_tag: 555
- # onu_device: ISKT45f2c688
- # nas_port_id : "PON 1/1/05/1:1.1.1"
- # circuit_id: iskg_sub1_circuit
- # remote_id: iskg_sub1_remote
+ # Iskratel GPON OLT subscribers
+ iskratelg_subscriber_1:
+ type: tosca.nodes.RCORDSubscriber
+ properties:
+ name: Sub_ISKT45f2c688
+ status: pre-provisioned
+ c_tag: 51
+ s_tag: 555
+ onu_device: ISKT45f2c688
+ nas_port_id : "PON 1/1/05/1:1.1.1"
+ circuit_id: iskg_sub1_circuit
+ remote_id: iskg_sub1_remote
# iskratelg_subscriber_2:
# type: tosca.nodes.RCORDSubscriber