Updating BBWF configs
Change-Id: I3f3e4099819d730cd242091ea4845f2191cacb6f
diff --git a/tosca-configs/att-workflow/bbwf-fabric.yaml b/tosca-configs/att-workflow/bbwf-fabric.yaml
index 8c33bd4..b426642 100755
--- a/tosca-configs/att-workflow/bbwf-fabric.yaml
+++ b/tosca-configs/att-workflow/bbwf-fabric.yaml
@@ -52,48 +52,48 @@
relationship: tosca.relationships.BelongsToOne
# Setup the Adtran OLT switch port
- port#adtran_olt_port:
- type: tosca.nodes.SwitchPort
- properties:
- portId: 50
- host_learning: false
- requirements:
- - switch:
- node: switch#agg_sw
- relationship: tosca.relationships.BelongsToOne
+ # port#adtran_olt_port:
+ # type: tosca.nodes.SwitchPort
+ # properties:
+ # portId: 50
+ # host_learning: false
+ # requirements:
+ # - switch:
+ # node: switch#agg_sw
+ # relationship: tosca.relationships.BelongsToOne
- # Setup the CIG OLT switch port
- port#cig_olt_port:
- type: tosca.nodes.SwitchPort
- properties:
- portId: 51
- host_learning: false
- requirements:
- - switch:
- node: switch#agg_sw
- relationship: tosca.relationships.BelongsToOne
+ # # Setup the CIG OLT switch port
+ # port#cig_olt_port:
+ # type: tosca.nodes.SwitchPort
+ # properties:
+ # portId: 51
+ # host_learning: false
+ # requirements:
+ # - switch:
+ # 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 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:
- type: tosca.nodes.SwitchPort
- properties:
- portId: 47
- 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:
@@ -137,29 +137,29 @@
relationship: tosca.relationships.BelongsToOne
# OLT app extra config
- onos_app#olt:
- type: tosca.nodes.ONOSApp
- properties:
- name: olt
- 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/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:
@@ -180,105 +180,105 @@
node: service#att
relationship: tosca.relationships.BelongsToOne
- ISKT71e81130:
- type: tosca.nodes.AttWorkflowDriverWhiteListEntry
- properties:
- serial_number: ISKT71e81130
- pon_port_id: 536870912
- device_id: of:00000000c0a8646f
- requirements:
- - owner:
- node: service#att
- relationship: tosca.relationships.BelongsToOne
+ # ISKT71e81130:
+ # type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ # properties:
+ # serial_number: ISKT71e81130
+ # pon_port_id: 536870912
+ # device_id: of:00000000c0a8646f
+ # requirements:
+ # - owner:
+ # node: service#att
+ # relationship: tosca.relationships.BelongsToOne
- # ONUs connected to Adtran OLT
- ADTN17510028:
- type: tosca.nodes.AttWorkflowDriverWhiteListEntry
- properties:
- serial_number: ADTN17510028
- pon_port_id: 5
- device_id: of:00000024454A6BE4
- requirements:
- - owner:
- node: service#att
- relationship: tosca.relationships.BelongsToOne
+ # # ONUs connected to Adtran OLT
+ # ADTN17510028:
+ # type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ # properties:
+ # serial_number: ADTN17510028
+ # pon_port_id: 5
+ # device_id: of:00000024454A6BE4
+ # requirements:
+ # - owner:
+ # node: service#att
+ # relationship: tosca.relationships.BelongsToOne
- ADTN16180345:
- type: tosca.nodes.AttWorkflowDriverWhiteListEntry
- properties:
- serial_number: ADTN16180345
- pon_port_id: 6
- device_id: of:00000024454A6BE4
- requirements:
- - owner:
- node: service#att
- relationship: tosca.relationships.BelongsToOne
+ # ADTN16180345:
+ # type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ # properties:
+ # serial_number: ADTN16180345
+ # pon_port_id: 6
+ # device_id: of:00000024454A6BE4
+ # requirements:
+ # - owner:
+ # node: service#att
+ # relationship: tosca.relationships.BelongsToOne
- # ONUs connected to CIG OLT
- CIGG18a00002:
- type: tosca.nodes.AttWorkflowDriverWhiteListEntry
- properties:
- serial_number: CIGG18a00002
- pon_port_id: 536870913
- device_id: of:00000000c0a86471
- requirements:
- - owner:
- node: service#att
- relationship: tosca.relationships.BelongsToOne
+ # # ONUs connected to CIG OLT
+ # CIGG18a00002:
+ # type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ # properties:
+ # serial_number: CIGG18a00002
+ # pon_port_id: 536870913
+ # device_id: of:00000000c0a86471
+ # 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
+ # # 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
- properties:
- serial_number: ISKT71e81071
- pon_port_id: 536870912
- device_id: of:00000000c0a86472
- requirements:
- - owner:
- node: service#att
- relationship: tosca.relationships.BelongsToOne
+ # ISKT71e81071:
+ # type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ # properties:
+ # serial_number: ISKT71e81071
+ # pon_port_id: 536870912
+ # device_id: of:00000000c0a86472
+ # 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
+ # # 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
- properties:
- serial_number: ISKT45f2bd61
- pon_port_id: 536870912
- device_id: of:00000000c0a86473
- requirements:
- - owner:
- node: service#att
- relationship: tosca.relationships.BelongsToOne
+ # ISKT45f2bd61:
+ # type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ # properties:
+ # serial_number: ISKT45f2bd61
+ # pon_port_id: 536870912
+ # device_id: of:00000000c0a86473
+ # requirements:
+ # - owner:
+ # node: service#att
+ # relationship: tosca.relationships.BelongsToOne
- ISKT45f2c1e4:
- type: tosca.nodes.AttWorkflowDriverWhiteListEntry
- properties:
- serial_number: ISKT45f2c1e4
- pon_port_id: 536870912
- device_id: of:00000000c0a86473
- requirements:
- - owner:
- node: service#att
- relationship: tosca.relationships.BelongsToOne
+ # ISKT45f2c1e4:
+ # type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ # properties:
+ # serial_number: ISKT45f2c1e4
+ # pon_port_id: 536870912
+ # device_id: of:00000000c0a86473
+ # requirements:
+ # - owner:
+ # node: service#att
+ # relationship: tosca.relationships.BelongsToOne
diff --git a/tosca-configs/att-workflow/bbwf-olt.yaml b/tosca-configs/att-workflow/bbwf-olt.yaml
index 2f1fb6e..8b75f9c 100755
--- a/tosca-configs/att-workflow/bbwf-olt.yaml
+++ b/tosca-configs/att-workflow/bbwf-olt.yaml
@@ -46,70 +46,70 @@
node: service#volt
relationship: tosca.relationships.BelongsToOne
- adtran:
- type: tosca.nodes.OLTDevice
- properties:
- name: Adtran OLT
- device_type: adtran_olt
- host: 192.168.100.112
- port: 830
- switch_datapath_id: of:0000000000000001
- switch_port: "50"
- outer_tpid: "0x8100"
- uplink: "1"
- nas_id: "NAS_ID"
- requirements:
- - volt_service:
- node: service#volt
- relationship: tosca.relationships.BelongsToOne
+ # adtran:
+ # type: tosca.nodes.OLTDevice
+ # properties:
+ # name: Adtran OLT
+ # device_type: adtran_olt
+ # host: 192.168.100.112
+ # port: 830
+ # switch_datapath_id: of:0000000000000001
+ # switch_port: "50"
+ # outer_tpid: "0x8100"
+ # uplink: "1"
+ # nas_id: "NAS_ID"
+ # requirements:
+ # - volt_service:
+ # node: service#volt
+ # relationship: tosca.relationships.BelongsToOne
- cig:
- type: tosca.nodes.OLTDevice
- properties:
- name: CIG OLT
- device_type: openolt
- host: 192.168.100.113
- port: 10400
- switch_datapath_id: of:0000000000000001
- switch_port: "51"
- outer_tpid: "0x8100"
- uplink: "65536"
- nas_id: "NAS_ID"
- requirements:
- - volt_service:
- node: service#volt
- relationship: tosca.relationships.BelongsToOne
+ # cig:
+ # type: tosca.nodes.OLTDevice
+ # properties:
+ # name: CIG OLT
+ # device_type: openolt
+ # host: 192.168.100.113
+ # port: 10400
+ # switch_datapath_id: of:0000000000000001
+ # switch_port: "51"
+ # outer_tpid: "0x8100"
+ # uplink: "65536"
+ # nas_id: "NAS_ID"
+ # requirements:
+ # - volt_service:
+ # 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-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:
- 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
+ # 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 5c0d0f3..8679746 100755
--- a/tosca-configs/att-workflow/bbwf-subscriber.yaml
+++ b/tosca-configs/att-workflow/bbwf-subscriber.yaml
@@ -36,114 +36,114 @@
circuit_id: edgecore_alpha_circuit
remote_id: edgecore_alpha_remote
- edgecore_iskratel_subscriber:
- type: tosca.nodes.RCORDSubscriber
- properties:
- name: Sub_ISKT71e81130
- status: pre-provisioned
- c_tag: 12
- s_tag: 111
- onu_device: ISKT71e81130
- nas_port_id : "PON 1/1/04/1:1.1.1"
- circuit_id: edgecore_iskratel_circuit
- remote_id: edgecore_iskratel_remote
+ # edgecore_iskratel_subscriber:
+ # type: tosca.nodes.RCORDSubscriber
+ # properties:
+ # name: Sub_ISKT71e81130
+ # status: pre-provisioned
+ # c_tag: 12
+ # s_tag: 111
+ # onu_device: ISKT71e81130
+ # nas_port_id : "PON 1/1/04/1:1.1.1"
+ # circuit_id: edgecore_iskratel_circuit
+ # remote_id: edgecore_iskratel_remote
- # Adtran OLT subscribers
- adtran_subscriber_1:
- type: tosca.nodes.RCORDSubscriber
- properties:
- name: Sub_ADTN17510028
- status: pre-provisioned
- c_tag: 21
- s_tag: 222
- onu_device: ADTN17510028
- nas_port_id : "PON 1/1/05/1:1.1.1"
- circuit_id: adtran_sub1_circuit
- remote_id: adtran_sub1_remote
+ # # Adtran OLT subscribers
+ # adtran_subscriber_1:
+ # type: tosca.nodes.RCORDSubscriber
+ # properties:
+ # name: Sub_ADTN17510028
+ # status: pre-provisioned
+ # c_tag: 21
+ # s_tag: 222
+ # onu_device: ADTN17510028
+ # nas_port_id : "PON 1/1/05/1:1.1.1"
+ # circuit_id: adtran_sub1_circuit
+ # remote_id: adtran_sub1_remote
- adtran_subscriber_2:
- type: tosca.nodes.RCORDSubscriber
- properties:
- name: Sub_ADTN16180345
- status: pre-provisioned
- c_tag: 22
- s_tag: 222
- onu_device: ADTN16180345
- nas_port_id : "PON 1/1/05/1:1.1.1"
- circuit_id: adtran_sub2_circuit
- remote_id: adtran_sub2_remote
+ # adtran_subscriber_2:
+ # type: tosca.nodes.RCORDSubscriber
+ # properties:
+ # name: Sub_ADTN16180345
+ # status: pre-provisioned
+ # c_tag: 22
+ # s_tag: 222
+ # onu_device: ADTN16180345
+ # nas_port_id : "PON 1/1/05/1:1.1.1"
+ # circuit_id: adtran_sub2_circuit
+ # remote_id: adtran_sub2_remote
- # CIG OLT subscribers
- cig_subscriber_1:
- type: tosca.nodes.RCORDSubscriber
- properties:
- name: Sub_CIGG18a00002
- status: pre-provisioned
- c_tag: 31
- s_tag: 333
- onu_device: CIGG18a00002
- nas_port_id : "PON 1/1/05/1:1.1.1"
- circuit_id: cig_sub1_circuit
- remote_id: cig_sub1_remote
+ # # CIG OLT subscribers
+ # cig_subscriber_1:
+ # type: tosca.nodes.RCORDSubscriber
+ # properties:
+ # name: Sub_CIGG18a00002
+ # status: pre-provisioned
+ # c_tag: 31
+ # s_tag: 333
+ # onu_device: CIGG18a00002
+ # nas_port_id : "PON 1/1/05/1:1.1.1"
+ # 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
- properties:
- name: Sub_ISKT71e81071
- status: pre-provisioned
- c_tag: 42
- s_tag: 444
- onu_device: ISKT71e81071
- nas_port_id : "PON 1/1/05/1:1.1.1"
- circuit_id: iskx_sub2_circuit
- remote_id: iskx_sub2_remote
+ # iskratelx_subscriber_2:
+ # type: tosca.nodes.RCORDSubscriber
+ # properties:
+ # name: Sub_ISKT71e81071
+ # status: pre-provisioned
+ # c_tag: 42
+ # s_tag: 444
+ # onu_device: ISKT71e81071
+ # nas_port_id : "PON 1/1/05/1:1.1.1"
+ # 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
- properties:
- name: Sub_ISKT45f2bd61
- status: pre-provisioned
- c_tag: 52
- s_tag: 555
- onu_device: ISKT45f2bd61
- nas_port_id : "PON 1/1/05/1:1.1.1"
- circuit_id: iskg_sub2_circuit
- remote_id: iskg_sub2_remote
+ # iskratelg_subscriber_2:
+ # type: tosca.nodes.RCORDSubscriber
+ # properties:
+ # name: Sub_ISKT45f2bd61
+ # status: pre-provisioned
+ # c_tag: 52
+ # s_tag: 555
+ # onu_device: ISKT45f2bd61
+ # nas_port_id : "PON 1/1/05/1:1.1.1"
+ # circuit_id: iskg_sub2_circuit
+ # remote_id: iskg_sub2_remote
- iskratelg_subscriber_3:
- type: tosca.nodes.RCORDSubscriber
- properties:
- name: Sub_ISKT45f2c1e4
- status: pre-provisioned
- c_tag: 53
- s_tag: 555
- onu_device: ISKT45f2c1e4
- nas_port_id : "PON 1/1/05/1:1.1.1"
- circuit_id: iskg_sub3_circuit
- remote_id: iskg_sub3_remote
+ # iskratelg_subscriber_3:
+ # type: tosca.nodes.RCORDSubscriber
+ # properties:
+ # name: Sub_ISKT45f2c1e4
+ # status: pre-provisioned
+ # c_tag: 53
+ # s_tag: 555
+ # onu_device: ISKT45f2c1e4
+ # nas_port_id : "PON 1/1/05/1:1.1.1"
+ # circuit_id: iskg_sub3_circuit
+ # remote_id: iskg_sub3_remote