Updating BBWF configs
Change-Id: Ic4b140ae600ef44c3662523f40d7111913ef7ab5
diff --git a/tosca-configs/att-workflow/bbwf-fabric.yaml b/tosca-configs/att-workflow/bbwf-fabric.yaml
index b426642..ef9a6d1 100755
--- a/tosca-configs/att-workflow/bbwf-fabric.yaml
+++ b/tosca-configs/att-workflow/bbwf-fabric.yaml
@@ -62,27 +62,27 @@
# 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:
@@ -214,29 +214,29 @@
# 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
+ 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
diff --git a/tosca-configs/att-workflow/bbwf-olt.yaml b/tosca-configs/att-workflow/bbwf-olt.yaml
index 8b75f9c..26a01ad 100755
--- a/tosca-configs/att-workflow/bbwf-olt.yaml
+++ b/tosca-configs/att-workflow/bbwf-olt.yaml
@@ -63,39 +63,39 @@
# 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
diff --git a/tosca-configs/att-workflow/bbwf-subscriber.yaml b/tosca-configs/att-workflow/bbwf-subscriber.yaml
index 8679746..a5f6f5a 100755
--- a/tosca-configs/att-workflow/bbwf-subscriber.yaml
+++ b/tosca-configs/att-workflow/bbwf-subscriber.yaml
@@ -73,31 +73,31 @@
# 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