Restructured Dt Fttb test input yaml
Change-Id: Id6a2cd71b0ecda5d9e3070909fca98cf5be884ca
diff --git a/libraries/utils.robot b/libraries/utils.robot
index 234f5a7..5fc187f 100755
--- a/libraries/utils.robot
+++ b/libraries/utils.robot
@@ -407,10 +407,10 @@
# Verify Meters in ONOS
Wait Until Keyword Succeeds ${timeout} 5s
... Verify Meters in ONOS Ietf ${ONOS_SSH_IP} ${ONOS_SSH_PORT} ${of_id} ${onu_port}
- ... ${src['service'][0]['name']}
+ ... FTTB_SUBSCRIBER_TRAFFIC
# Verify Mac Learner Mappings
Wait Until Keyword Succeeds ${timeout} 5s Validate Mac Learner Mapping in ONOS
- ... ${ONOS_SSH_IP} ${ONOS_SSH_PORT} ${of_id} ${onu_port} ${src['service'][2]['s_tag']}
+ ... ${ONOS_SSH_IP} ${ONOS_SSH_PORT} ${of_id} ${onu_port} ${src['service'][0]['s_tag']}
Run Keyword If ${has_dataplane} Validate DHCP and Ping True
... True ${src['dp_iface_name']} ${src['s_tag']} ${src['c_tag']} ${dst['dp_iface_ip_qinq']}
... ${src['ip']} ${src['user']} ${src['pass']} ${src['container_type']} ${src['container_name']}
diff --git a/tests/data/bbsim-kind-dt-fttb-1OLTx1PONx2ONUx2UNI.yaml b/tests/data/bbsim-kind-dt-fttb-1OLTx1PONx2ONUx2UNI.yaml
index 0f7d502..1dc635f 100644
--- a/tests/data/bbsim-kind-dt-fttb-1OLTx1PONx2ONUx2UNI.yaml
+++ b/tests/data/bbsim-kind-dt-fttb-1OLTx1PONx2ONUx2UNI.yaml
@@ -38,8 +38,13 @@
-
onu: 'BBSM000a0001'
olt: 'BBSIM_OLT_10'
+ # maintain the below service order for all the entries
service:
-
+ name: DPU_MGMT_TRAFFIC
+ c_tag: '6'
+ s_tag: '60'
+ -
name: FTTB_SUBSCRIBER_TRAFFIC
c_tag: '101'
s_tag: '3101'
@@ -47,16 +52,16 @@
name: DPU_ANCP_TRAFFIC
c_tag: '4'
s_tag: '40'
- -
- name: DPU_MGMT_TRAFFIC
- c_tag: '6'
- s_tag: '60'
uni_id: '1'
-
onu: 'BBSM000a0001'
olt: 'BBSIM_OLT_10'
service:
-
+ name: DPU_MGMT_TRAFFIC
+ c_tag: '6'
+ s_tag: '60'
+ -
name: FTTB_SUBSCRIBER_TRAFFIC
c_tag: '102'
s_tag: '3102'
@@ -64,16 +69,16 @@
name: DPU_ANCP_TRAFFIC
c_tag: '4'
s_tag: '40'
- -
- name: DPU_MGMT_TRAFFIC
- c_tag: '6'
- s_tag: '60'
uni_id: '2'
-
onu: 'BBSM000a0002'
olt: 'BBSIM_OLT_10'
service:
-
+ name: DPU_MGMT_TRAFFIC
+ c_tag: '6'
+ s_tag: '60'
+ -
name: FTTB_SUBSCRIBER_TRAFFIC
c_tag: '105'
s_tag: '3105'
@@ -81,10 +86,6 @@
name: DPU_ANCP_TRAFFIC
c_tag: '4'
s_tag: '40'
- -
- name: DPU_MGMT_TRAFFIC
- c_tag: '6'
- s_tag: '60'
uni_id: '1'
dst: