Restructured Dt Fttb test input yaml

Change-Id: Id6a2cd71b0ecda5d9e3070909fca98cf5be884ca
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: