[CORD-3084] Attaching a subscriber to an ONU
Change-Id: Id73c2ba3238b51615e541139b0e7ad0de30a0ba5
diff --git a/samples/olt_device.yaml b/samples/olt_device.yaml
index c8a1485..c83b65c 100644
--- a/samples/olt_device.yaml
+++ b/samples/olt_device.yaml
@@ -17,6 +17,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- custom_types/oltdevice.yaml
+ - custom_types/onudevice.yaml
- custom_types/ponport.yaml
- custom_types/voltservice.yaml
description: Create a simulated OLT Device in VOLTHA
@@ -36,6 +37,9 @@
device_type: simulated_olt
host: 172.17.0.1
port: 50060
+ switch_datapath_id: of:0000000000000001
+ switch_port: "1"
+ outer_tpid: "0x8100"
requirements:
- volt_service:
node: service#volt
@@ -51,3 +55,14 @@
- olt_device:
node: device#olt
relationship: tosca.relationships.BelongsToOne
+
+ onu:
+ type: tosca.nodes.ONUDevice
+ properties:
+ serial_number: BRCM1234
+ vendor: Broadcom
+ device_type: broadcom_onu
+ requirements:
+ - pon_port:
+ node: pon_port
+ relationship: tosca.relationships.BelongsToOne
diff --git a/samples/subscriber.yaml b/samples/subscriber.yaml
index ba79a16..fe8d646 100644
--- a/samples/subscriber.yaml
+++ b/samples/subscriber.yaml
@@ -16,48 +16,13 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - custom_types/cordsubscriberroot.yaml
- - custom_types/ponport.yaml
- - custom_types/voltservice.yaml
- - custom_types/oltdevice.yaml
+ - custom_types/rcordsubscriber.yaml
description: Create a test subscriber
topology_template:
node_templates:
- service#volt:
- type: tosca.nodes.VOLTService
- properties:
- name: volt
- must-exist: true
-
- # Setup an OLT Device
- olt_device:
- type: tosca.nodes.OLTDevice
- properties:
- name: volt-1
- device_type: simulated_olt
- host: 172.17.0.1
- port: 50060
- switch_datapath_id: of:0000000ce2314000
- switch_port: "5"
- outer_tpid: "0x8100"
- requirements:
- - volt_service:
- node: service#volt
- relationship: tosca.relationships.BelongsToOne
-
- pon_port:
- type: tosca.nodes.PONPort
- properties:
- name: volt-port-1
- s_tag: 222
- requirements:
- - olt_device:
- node: olt_device
- relationship: tosca.relationships.BelongsToOne
-
# A subscriber
my_house:
- type: tosca.nodes.CordSubscriberRoot
+ type: tosca.nodes.RCORDSubscriber
properties:
name: My House
service_specific_id: "123"
@@ -66,8 +31,7 @@
url_filter_enable: false
url_filter_level: R
c_tag: 111
- olt_device: volt-1
- olt_port: volt-port-1
+ onu_device: BRCM1234
uni_port_id: 101
mac_address: 00:AA:00:00:00:01
ip_address: 10.8.2.1
diff --git a/samples/volt_service.yaml b/samples/volt_service.yaml
index 64569e4..c12525e 100644
--- a/samples/volt_service.yaml
+++ b/samples/volt_service.yaml
@@ -25,7 +25,9 @@
properties:
name: volt
must-exist: true
- voltha_url: 10.128.22.3:8882
- p_onos_url: 10.128.22.3:8181
- p_onos_user: karaf
- p_onos_pass: karaf
+ voltha_url: 10.128.22.3
+ voltha_port: 8882
+ onos_voltha_url: 10.128.22.3
+ onos_voltha_port: 8181
+ onos_voltha_user: karaf
+ onos_voltha_pass: karaf