Created file for CIG OLT
Change-Id: I6cd5a477f47ce8768acb97b82d543d0c6cd63f03
diff --git a/tosca-configs/att-workflow/onlab-pod1-cig-fabric.yaml b/tosca-configs/att-workflow/onlab-pod1-cig-fabric.yaml
deleted file mode 100755
index e5de74d..0000000
--- a/tosca-configs/att-workflow/onlab-pod1-cig-fabric.yaml
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @onlab-pod1-fabric.yaml http://10.90.0.101:30007/run
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-imports:
- - custom_types/switch.yaml
- - custom_types/switchport.yaml
- - custom_types/portinterface.yaml
- - custom_types/bngportmapping.yaml
- - custom_types/attworkflowdriverwhitelistentry.yaml
- - custom_types/attworkflowdriverservice.yaml
-
-description: Configures the ONF SEBA POD with AT&T workflow
-
-topology_template:
- node_templates:
- # Fabric configuration
- switch#leaf_1:
- type: tosca.nodes.Switch
- properties:
- driver: ofdpa3
- ipv4Loopback: 192.168.0.201
- ipv4NodeSid: 17
- isEdgeRouter: True
- name: leaf_1
- ofId: of:0000000000000001
- routerMac: 00:00:02:01:06:01
-
- # Setup the EdgeCore OLT switch port
- port#olt_port_edgecore:
- type: tosca.nodes.SwitchPort
- properties:
- portId: 1
- host_learning: false
- requirements:
- - switch:
- node: switch#leaf_1
- relationship: tosca.relationships.BelongsToOne
-
- # Setup the CIG OLT switch port
- port#olt_port_cig:
- type: tosca.nodes.SwitchPort
- properties:
- portId: 3
- host_learning: false
- requirements:
- - switch:
- node: switch#leaf_1
- relationship: tosca.relationships.BelongsToOne
-
- # Port connected to the BNG
- port#bng_port:
- type: tosca.nodes.SwitchPort
- properties:
- portId: 31
- host_learning: false
- requirements:
- - switch:
- node: switch#leaf_1
- relationship: tosca.relationships.BelongsToOne
-
- # Setup the fabric switch port where the external
- # router is connected to
- bngmapping:
- type: tosca.nodes.BNGPortMapping
- properties:
- s_tag: any
- switch_port: 31
-
- # ONU Whitelist
- service#att:
- type: tosca.nodes.AttWorkflowDriverService
- properties:
- name: att-workflow-driver
- must-exist: true
-
- BRCM22222222:
- type: tosca.nodes.AttWorkflowDriverWhiteListEntry
- properties:
- serial_number: BRCM22222222
- # pon_port_id: 536870912
- pon_port_id: 12345678
- device_id: of:000000000a5a0072
- requirements:
- - owner:
- node: service#att
- relationship: tosca.relationships.BelongsToOne
-
- ALPHe3d1cfde:
- type: tosca.nodes.AttWorkflowDriverWhiteListEntry
- properties:
- serial_number: ALPHe3d1cfde
- pon_port_id: 536870912
- device_id: of:000000000a5a0072
- requirements:
- - owner:
- node: service#att
- relationship: tosca.relationships.BelongsToOne
-
- ISKT71e801a0:
- type: tosca.nodes.AttWorkflowDriverWhiteListEntry
- properties:
- serial_number: ISKT71e801a0
- pon_port_id: 536870912
- device_id: of:000000000a5a0072
- requirements:
- - owner:
- node: service#att
- relationship: tosca.relationships.BelongsToOne
-
- CIG:
- type: tosca.nodes.AttWorkflowDriverWhiteListEntry
- properties:
- serial_number: CIG
- pon_port_id: 536870912
- device_id: of:000000000a5a0072
- requirements:
- - owner:
- node: service#att
- relationship: tosca.relationships.BelongsToOne
diff --git a/tosca-configs/att-workflow/onlab-pod1-cig-subscriber.yaml b/tosca-configs/att-workflow/onlab-pod1-cig-subscriber.yaml
deleted file mode 100755
index f87c3f5..0000000
--- a/tosca-configs/att-workflow/onlab-pod1-cig-subscriber.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @onlab-pod1-subscriber.yaml http://10.90.0.101:30007/run
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-imports:
- - custom_types/rcordsubscriber.yaml
-
-description: Pre-provsion a subscriber
-
-topology_template:
- node_templates:
-
- # Pre-provision the subscriber the subscriber
- onf_subscriber_1:
- type: tosca.nodes.RCORDSubscriber
- properties:
- name: Sub_BRCM22222222
- status: pre-provisioned
- c_tag: 111
- s_tag: 111
- onu_device: BRCM22222222
- nas_port_id : "PON 1/1/03/1:1.1.1"
- circuit_id: foo1
- remote_id: bar1
-
- onf_subscriber_2:
- type: tosca.nodes.RCORDSubscriber
- properties:
- name: Sub_ALPHe3d1cfde
- status: pre-provisioned
- c_tag: 112
- s_tag: 111
- onu_device: ALPHe3d1cfde
- nas_port_id : "PON 1/1/04/1:1.1.1"
- circuit_id: foo2
- remote_id: bar2
-
- onf_subscriber_3:
- type: tosca.nodes.RCORDSubscriber
- properties:
- name: Sub_ISKT71e801a0
- status: pre-provisioned
- c_tag: 113
- s_tag: 111
- onu_device: ISKT71e801a0
- nas_port_id : "PON 1/1/05/1:1.1.1"
- circuit_id: foo3
- remote_id: bar3
-
- onf_cig_subscriber:
- type: tosca.nodes.RCORDSubscriber
- properties:
- name: Sub_CIG
- status: pre-provisioned
- c_tag: 111
- s_tag: 112
- onu_device: CIG
- nas_port_id : "PON 1/1/05/1:1.1.1"
- circuit_id: foo3
- remote_id: bar3
\ No newline at end of file
diff --git a/tosca-configs/att-workflow/onlab-pod1-cig-olt.yaml b/tosca-configs/att-workflow/onlab-pod1-cig.yaml
similarity index 62%
rename from tosca-configs/att-workflow/onlab-pod1-cig-olt.yaml
rename to tosca-configs/att-workflow/onlab-pod1-cig.yaml
index 58186b6..2ae457f 100755
--- a/tosca-configs/att-workflow/onlab-pod1-cig-olt.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-cig.yaml
@@ -12,13 +12,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @onlab-pod1-olt.yaml http://10.90.0.101:30007/run
+# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @onlab-pod1-cig.yaml http://10.90.0.101:30007/run
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- custom_types/oltdevice.yaml
- custom_types/onudevice.yaml
- custom_types/voltservice.yaml
+ - custom_types/attworkflowdriverwhitelistentry.yaml
+ - custom_types/attworkflowdriverservice.yaml
+ - custom_types/rcordsubscriber.yaml
description: Create a simulated OLT Device in VOLTHA
topology_template:
node_templates:
@@ -29,24 +32,6 @@
name: volt
must-exist: true
- # EdgeCore
- olt_device:
- type: tosca.nodes.OLTDevice
- properties:
- name: EdgeCore
- device_type: openolt
- host: 10.90.0.114
- port: 9191
- switch_datapath_id: of:0000000000000001
- switch_port: "1"
- outer_tpid: "0x8100"
- uplink: "65536"
- nas_id: "NAS_ID"
- requirements:
- - volt_service:
- node: service#volt
- relationship: tosca.relationships.BelongsToOne
-
# CIG
olt_device:
type: tosca.nodes.OLTDevice
@@ -54,7 +39,7 @@
name: CIG
device_type: openolt
host: 10.90.0.115
- port: 9191
+ port: 10400
switch_datapath_id: of:0000000000000001
switch_port: "3"
outer_tpid: "0x8100"
@@ -63,4 +48,35 @@
requirements:
- volt_service:
node: service#volt
- relationship: tosca.relationships.BelongsToOne
\ No newline at end of file
+ relationship: tosca.relationships.BelongsToOne
+
+ # Whitelist
+ service#att:
+ type: tosca.nodes.AttWorkflowDriverService
+ properties:
+ name: att-workflow-driver
+ must-exist: true
+
+ CIG:
+ type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: CIGG70606829
+ pon_port_id: 536870913
+ device_id: of:000000000a5a0073
+ requirements:
+ - owner:
+ node: service#att
+ relationship: tosca.relationships.BelongsToOne
+
+ # Pre-provision the subscriber
+ cig_subscriber_1:
+ type: tosca.nodes.RCORDSubscriber
+ properties:
+ name: Sub_CIGG70606829
+ status: pre-provisioned
+ c_tag: 111
+ s_tag: 444
+ onu_device: CIGG70606829
+ nas_port_id : "PON 1/1/03/1:1.1.1"
+ circuit_id: foo1
+ remote_id: bar1
\ No newline at end of file