Merge "Adding SEBA config to M-CORD fo hybrid setup"
diff --git a/tosca-configs/att-workflow/onf-mcord-pod1-fabric.yaml b/tosca-configs/att-workflow/onf-mcord-pod1-fabric.yaml
new file mode 100755
index 0000000..b34c5df
--- /dev/null
+++ b/tosca-configs/att-workflow/onf-mcord-pod1-fabric.yaml
@@ -0,0 +1,135 @@
+# 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
+ - custom_types/serviceinstanceattribute.yaml
+ - custom_types/onosapp.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: AGG_SWITCH
+ ofId: of:0000000000000001
+ routerMac: 00:00:02:01:06:01
+
+ # Setup the OLT switch port
+ port#olt_port:
+ type: tosca.nodes.SwitchPort
+ properties:
+ portId: 2
+ 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
+ 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
+
+ # DHCP L2 Relay config
+ onos_app#dhcpl2relay:
+ type: tosca.nodes.ONOSApp
+ properties:
+ name: dhcpl2relay
+ must-exist: true
+
+ dhcpl2relay-config-attr:
+ type: tosca.nodes.ServiceInstanceAttribute
+ properties:
+ name: /onos/v1/network/configuration/apps/org.opencord.dhcpl2relay
+ value: >
+ {
+ "dhcpl2relay" : {
+ "useOltUplinkForServerPktInOut" : false,
+ "dhcpServerConnectPoints" : [ "of:0000000000000001/31" ]
+ }
+ }
+ requirements:
+ - service_instance:
+ node: onos_app#dhcpl2relay
+ relationship: tosca.relationships.BelongsToOne
+
+ # 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
diff --git a/tosca-configs/att-workflow/onf-mcord-pod1-olt.yaml b/tosca-configs/att-workflow/onf-mcord-pod1-olt.yaml
new file mode 100755
index 0000000..c31eb6b
--- /dev/null
+++ b/tosca-configs/att-workflow/onf-mcord-pod1-olt.yaml
@@ -0,0 +1,47 @@
+# 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-olt.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
+description: Create a simulated OLT Device in VOLTHA
+topology_template:
+ node_templates:
+
+ service#volt:
+ type: tosca.nodes.VOLTService
+ properties:
+ name: volt
+ must-exist: true
+
+ olt_device:
+ type: tosca.nodes.OLTDevice
+ properties:
+ name: ONF OLT
+ device_type: openolt
+ host: 10.90.0.114
+ port: 9191
+ switch_datapath_id: of:0000000000000001
+ switch_port: "2"
+ outer_tpid: "0x8100"
+ uplink: "65536"
+ nas_id: "NAS_ID"
+ requirements:
+ - volt_service:
+ node: service#volt
+ relationship: tosca.relationships.BelongsToOne
\ No newline at end of file
diff --git a/tosca-configs/att-workflow/onf-mcord-pod1-subscriber.yaml b/tosca-configs/att-workflow/onf-mcord-pod1-subscriber.yaml
new file mode 100755
index 0000000..5ee3c0c
--- /dev/null
+++ b/tosca-configs/att-workflow/onf-mcord-pod1-subscriber.yaml
@@ -0,0 +1,61 @@
+# 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