Merge "Latest values"
diff --git a/tosca-configs/att-workflow/edgecore-pod1-fabric.yaml b/tosca-configs/att-workflow/edgecore-pod1-fabric.yaml
index f311ce3..fefcc3c 100755
--- a/tosca-configs/att-workflow/edgecore-pod1-fabric.yaml
+++ b/tosca-configs/att-workflow/edgecore-pod1-fabric.yaml
@@ -43,7 +43,7 @@
port#olt_port:
type: tosca.nodes.SwitchPort
properties:
- portId: 1
+ portId: 49
host_learning: false
requirements:
- switch:
@@ -54,7 +54,7 @@
port#bng_port:
type: tosca.nodes.SwitchPort
properties:
- portId: 1
+ portId: 48
host_learning: false
requirements:
- switch:
@@ -67,7 +67,7 @@
type: tosca.nodes.BNGPortMapping
properties:
s_tag: any
- switch_port: 1
+ switch_port: 48
# ONU Whitelist
service#att:
@@ -76,10 +76,10 @@
name: att-workflow-driver
must-exist: true
- ISKT71E81130:
+ ALPHe3d1cea3:
type: tosca.nodes.AttWorkflowDriverWhiteListEntry
properties:
- serial_number: ISKT71E81130
+ serial_number: ALPHe3d1cea3
pon_port_id: 536870912
device_id: of:00000000c0a863b6
requirements:
@@ -87,10 +87,32 @@
node: service#att
relationship: tosca.relationships.BelongsToOne
- ISKT71E81050:
+ ALPHe3d1cee9:
type: tosca.nodes.AttWorkflowDriverWhiteListEntry
properties:
- serial_number: ISKT71E81050
+ serial_number: ALPHe3d1cee9
+ pon_port_id: 536870912
+ device_id: of:00000000c0a863b6
+ requirements:
+ - owner:
+ node: service#att
+ relationship: tosca.relationships.BelongsToOne
+
+ ISKT71e810c0:
+ type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: ISKT71e810c0
+ pon_port_id: 536870912
+ device_id: of:00000000c0a863b6
+ requirements:
+ - owner:
+ node: service#att
+ relationship: tosca.relationships.BelongsToOne
+
+ ISKT71e81130:
+ type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: ISKT71e81130
pon_port_id: 536870913
device_id: of:00000000c0a863b6
requirements:
@@ -98,10 +120,10 @@
node: service#att
relationship: tosca.relationships.BelongsToOne
- ISKT71E810C0:
+ ISKT71e81050:
type: tosca.nodes.AttWorkflowDriverWhiteListEntry
properties:
- serial_number: ISKT71E810C0
+ serial_number: ISKT71e81050
pon_port_id: 536870913
device_id: of:00000000c0a863b6
requirements:
diff --git a/tosca-configs/att-workflow/edgecore-pod1-olt.yaml b/tosca-configs/att-workflow/edgecore-pod1-olt.yaml
index 8040f7d..853e0b1 100755
--- a/tosca-configs/att-workflow/edgecore-pod1-olt.yaml
+++ b/tosca-configs/att-workflow/edgecore-pod1-olt.yaml
@@ -37,7 +37,7 @@
host: 192.168.99.182
port: 9191
switch_datapath_id: of:0000000000000001
- switch_port: "1"
+ switch_port: "49"
outer_tpid: "0x8100"
uplink: "65536"
nas_id: "NAS_ID"
diff --git a/tosca-configs/att-workflow/edgecore-pod1-subscriber.yaml b/tosca-configs/att-workflow/edgecore-pod1-subscriber.yaml
index f53095e..babe922 100755
--- a/tosca-configs/att-workflow/edgecore-pod1-subscriber.yaml
+++ b/tosca-configs/att-workflow/edgecore-pod1-subscriber.yaml
@@ -23,38 +23,62 @@
topology_template:
node_templates:
- ISKT71E81130:
+ ISKT71e81130:
type: tosca.nodes.RCORDSubscriber
properties:
- name: ISKT71E81130
+ name: ISKT71e81130
status: pre-provisioned
s_tag: 111
c_tag: 11
- onu_device: ISKT71E81130
- nas_port_id : "nas-port-id-ISKT71E81130"
- circuit_id: "circuit-id-ISKT71E81130"
- remote_id: "remote-id-ISKT71E81130"
+ onu_device: ISKT71e81130
+ nas_port_id : "nas-port-id-ISKT71e81130"
+ circuit_id: "circuit-id-ISKT71e81130"
+ remote_id: "remote-id-ISKT71e81130"
- ISKT71E81050:
+ ISKT71e81050:
type: tosca.nodes.RCORDSubscriber
properties:
- name: ISKT71E81050
+ name: ISKT71e81050
status: pre-provisioned
s_tag: 111
- c_tag: 12
- onu_device: ISKT71E81050
- nas_port_id : "nas-port-id-ISKT71E81050"
- circuit_id: "circuit-id-ISKT71E81050"
- remote_id: "remote-id-ISKT71E81050"
+ c_tag: 22
+ onu_device: ISKT71e81050
+ nas_port_id : "nas-port-id-ISKT71e81050"
+ circuit_id: "circuit-id-ISKT71e81050"
+ remote_id: "remote-id-ISKT71e81050"
- ISKT71E81130:
+ ISKT71e810c0:
type: tosca.nodes.RCORDSubscriber
properties:
- name: ISKT71E810C0
+ name: ISKT71e810c0
status: pre-provisioned
s_tag: 111
- c_tag: 13
- onu_device: ISKT71E810C0
- nas_port_id : "nas-port-id-ISKT71E810C0"
- circuit_id: "circuit-id-ISKT71E810C0"
- remote_id: "remote-id-ISKT71E810C0"
+ c_tag: 33
+ onu_device: ISKT71e810c0
+ nas_port_id : "nas-port-id-ISKT71e810c0"
+ circuit_id: "circuit-id-ISKT71e810c0"
+ remote_id: "remote-id-ISKT71e810c0"
+
+ ALPHe3d1cea3:
+ type: tosca.nodes.RCORDSubscriber
+ properties:
+ name: ALPHe3d1cea3
+ status: pre-provisioned
+ s_tag: 111
+ c_tag: 44
+ onu_device: ALPHe3d1cea3
+ nas_port_id : "nas-port-id-ALPHe3d1cea3"
+ circuit_id: "circuit-id-ALPHe3d1cea3"
+ remote_id: "remote-id-ALPHe3d1cea3"
+
+ ALPHe3d1cee9:
+ type: tosca.nodes.RCORDSubscriber
+ properties:
+ name: ALPHe3d1cee9
+ status: pre-provisioned
+ s_tag: 111
+ c_tag: 55
+ onu_device: ALPHe3d1cee9
+ nas_port_id : "nas-port-id-ALPHe3d1cee9"
+ circuit_id: "circuit-id-ALPHe3d1cee9"
+ remote_id: "remote-id-ALPHe3d1cee9"