Updating BBWF configs
Change-Id: Ic5c8de703df9582b6d39841d02b9fc5d93ee1066
diff --git a/tosca-configs/att-workflow/bbwf-fabric.yaml b/tosca-configs/att-workflow/bbwf-fabric.yaml
index 45fe310..d57962a 100755
--- a/tosca-configs/att-workflow/bbwf-fabric.yaml
+++ b/tosca-configs/att-workflow/bbwf-fabric.yaml
@@ -23,11 +23,10 @@
- custom_types/attworkflowdriverwhitelistentry.yaml
- custom_types/attworkflowdriverservice.yaml
-description: Configures the ONF SEBA POD with AT&T workflow
+description: Configures the fabric and the whitelist
topology_template:
node_templates:
- # Fabric configuration
switch#leaf_1:
type: tosca.nodes.Switch
properties:
@@ -120,21 +119,11 @@
name: att-workflow-driver
must-exist: true
- ALPHA:
+ # ONUs connected to EdgeCore OLT
+ ALPHE3D1CEE9:
type: tosca.nodes.AttWorkflowDriverWhiteListEntry
properties:
- serial_number: ALPHA
- pon_port_id: 12345678
- device_id: of:000000000a5a0072
- requirements:
- - owner:
- node: service#att
- relationship: tosca.relationships.BelongsToOne
-
- ADTRAN:
- type: tosca.nodes.AttWorkflowDriverWhiteListEntry
- properties:
- serial_number: ADTRAN
+ serial_number: ALPHE3D1CEE9
pon_port_id: 536870912
device_id: of:000000000a5a0072
requirements:
@@ -142,6 +131,41 @@
node: service#att
relationship: tosca.relationships.BelongsToOne
+ ISKT71E81130:
+ type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: ISKT71E81130
+ pon_port_id: 536870913
+ device_id: of:000000000a5a0072
+ 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: 536870912
+ device_id: of:000000000a5a0072
+ requirements:
+ - owner:
+ node: service#att
+ relationship: tosca.relationships.BelongsToOne
+
+ ADTN16180345:
+ type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: ADTN16180345
+ pon_port_id: 536870913
+ device_id: of:000000000a5a0072
+ requirements:
+ - owner:
+ node: service#att
+ relationship: tosca.relationships.BelongsToOne
+
+ # ONUs connected to CIG OLT
CIG:
type: tosca.nodes.AttWorkflowDriverWhiteListEntry
properties:
@@ -153,10 +177,11 @@
node: service#att
relationship: tosca.relationships.BelongsToOne
- ISKRATELK:
+ # ONUs connected to Iskratel XGS-PON OLT
+ ISKT71E81070:
type: tosca.nodes.AttWorkflowDriverWhiteListEntry
properties:
- serial_number: ISKRATELK
+ serial_number: ISKT71E81070
pon_port_id: 536870912
device_id: of:000000000a5a0072
requirements:
@@ -164,13 +189,47 @@
node: service#att
relationship: tosca.relationships.BelongsToOne
- ISKRATELG:
+ SBB2888AA010:
type: tosca.nodes.AttWorkflowDriverWhiteListEntry
properties:
- serial_number: ISKRATELG
+ serial_number: SBB2888AA010
+ pon_port_id: 536870913
+ device_id: of:000000000a5a0072
+ 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:000000000a5a0072
requirements:
- owner:
node: service#att
- relationship: tosca.relationships.BelongsToOne
\ No newline at end of file
+ relationship: tosca.relationships.BelongsToOne
+
+ ISKT45F2BD61:
+ type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: ISKT45F2BD61
+ pon_port_id: 536870913
+ device_id: of:000000000a5a0072
+ requirements:
+ - owner:
+ node: service#att
+ relationship: tosca.relationships.BelongsToOne
+
+ ISKT45F2C1E4:
+ type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: ISKT45F2C1E4
+ pon_port_id: 536870914
+ device_id: of:000000000a5a0072
+ 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 7a8fd24..3f56138 100755
--- a/tosca-configs/att-workflow/bbwf-olt.yaml
+++ b/tosca-configs/att-workflow/bbwf-olt.yaml
@@ -19,7 +19,7 @@
- custom_types/oltdevice.yaml
- custom_types/onudevice.yaml
- custom_types/voltservice.yaml
-description: Create a simulated OLT Device in VOLTHA
+description: Creates OLT devices
topology_template:
node_templates:
@@ -80,7 +80,7 @@
node: service#volt
relationship: tosca.relationships.BelongsToOne
- olt_device:
+ olt_device:
type: tosca.nodes.OLTDevice
properties:
name: Iskratel XGS-PON OLT
@@ -97,7 +97,7 @@
node: service#volt
relationship: tosca.relationships.BelongsToOne
- olt_device:
+ olt_device:
type: tosca.nodes.OLTDevice
properties:
name: Iskratel GPON OLT
@@ -112,4 +112,4 @@
requirements:
- volt_service:
node: service#volt
- relationship: tosca.relationships.BelongsToOne
\ No newline at end of file
+ relationship: tosca.relationships.BelongsToOne
diff --git a/tosca-configs/att-workflow/bbwf-subscriber.yaml b/tosca-configs/att-workflow/bbwf-subscriber.yaml
index 5ee3c0c..11eeee2 100755
--- a/tosca-configs/att-workflow/bbwf-subscriber.yaml
+++ b/tosca-configs/att-workflow/bbwf-subscriber.yaml
@@ -18,44 +18,132 @@
imports:
- custom_types/rcordsubscriber.yaml
-description: Pre-provsion a subscriber
+description: Pre-provsion subscribers
topology_template:
node_templates:
- # Pre-provision the subscriber the subscriber
- onf_subscriber_1:
+ # EdgeCore OLT subscribers
+ edgecore_alpha_subscriber:
type: tosca.nodes.RCORDSubscriber
properties:
- name: Sub_BRCM22222222
+ name: Sub_ALPHE3D1CEE9
status: pre-provisioned
- c_tag: 111
+ c_tag: 11
s_tag: 111
- onu_device: BRCM22222222
+ onu_device: ALPHE3D1CEE9
nas_port_id : "PON 1/1/03/1:1.1.1"
- circuit_id: foo1
- remote_id: bar1
+ circuit_id: edgecore_alpha_circuit
+ remote_id: edgecore_alpha_remote
- onf_subscriber_2:
+ edgecore_iskratel_subscriber:
type: tosca.nodes.RCORDSubscriber
properties:
- name: Sub_ALPHe3d1cfde
+ name: Sub_ISKT71E81130
status: pre-provisioned
- c_tag: 112
+ c_tag: 22
s_tag: 111
- onu_device: ALPHe3d1cfde
+ onu_device: ISKT71E81130
nas_port_id : "PON 1/1/04/1:1.1.1"
- circuit_id: foo2
- remote_id: bar2
+ circuit_id: edgecore_iskratel_circuit
+ remote_id: edgecore_iskratel_remote
- onf_subscriber_3:
+ # Adtran OLT subscribers
+ adtran_subscriber_1:
type: tosca.nodes.RCORDSubscriber
properties:
- name: Sub_ISKT71e801a0
+ name: Sub_ADTN17510028
status: pre-provisioned
- c_tag: 113
- s_tag: 111
- onu_device: ISKT71e801a0
+ c_tag: 11
+ s_tag: 222
+ onu_device: ADTN17510028
nas_port_id : "PON 1/1/05/1:1.1.1"
- circuit_id: foo3
- remote_id: bar3
+ 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
+
+ # CIG OLT subscribers
+ cig_subscriber_1:
+ type: tosca.nodes.RCORDSubscriber
+ properties:
+ name: Sub_CIG
+ status: pre-provisioned
+ c_tag: 11
+ s_tag: 333
+ onu_device: CIG
+ 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: 11
+ 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_SBB2888AA010
+ status: pre-provisioned
+ c_tag: 22
+ s_tag: 444
+ onu_device: SBB2888AA010
+ 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: 11
+ 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: 22
+ 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: 33
+ 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