Update scaling test TE-14.1

feature/gribi/otg_tests/gribi_scaling/README.md

@@ -10,34 +10,31 @@ Validate gRIBI scaling requirements.
 *   Create 64 L3 sub-interfaces under DUT port-2 and corresponding 64 L3
     sub-interfaces on ATE port-2
 *   On DUT port-1 and ATE port-1 create a single L3 interface
-*   On DUT, create a policy-based forwarding rule to redirect all traffic received from DUT port-1 into VRF-1 (based on src. IP match criteria)
+*   On DUT, create a policy-based forwarding rule to redirect all traffic received from DUT port-1 into VRF-1 (based on src. IP match 111.111.111.111)
+*   On DUT, create a policy-based forwarding rule to redirect all traffic received from DUT port-1 into VRF-2 (based on src. IP match 222.222.222.222)
 *   Establish gRIBI client connection with DUT negotiating FIBACK as the
     requested ack_type and make it become leader.
-*   Using gRIBI Modify RPC install the following IPv4Entry sets, and validate
+*   TODO: Using gRIBI Modify RPC install the following IPv4Entry sets, and validate
     the specified behaviours:
-    *   <Default VRF> IPv4Entries -> NHG -> Multiple NH.
-        *   Inject IPv4Entries(IPBlockDefaultVRF: 198.18.196.1/22) in default
-            VRF
-        *   Install 64 L3 sub-interfaces IP to NextHopGroup containing one
-            NextHop specified to ATE port-2.
-        *   Validate that the entries are installed as FIB_PROGRAMMED
-    *   <VRF1> IPv4Entries -> Multiple NHG -> Multiple NH.
-        *   Inject IPv4Entries(IPBlock1: "198.18.0.1/18") in VRF1.
-        *   Install 1000 IPs from IPBlockDefaultVRF to 10 NextHopGroups
-            containing 100 NextHops each
-        *   Validate that the entries are installed as FIB_PROGRAMMED
-    *   <VRF2> IPv4Entries -> Multiple NHG -> Multiple NH.
-        *   Inject IPv4Entries(IPBlock2: "198.18.64.1/18") in VRF2.
-        *   Install *repeat* 17.5K NH from 1K /32 from IPBlockDefaultVRF to 35
-            NextHopGroups containing 45 NextHops each
-        *   Validate that the entries are installed as FIB_PROGRAMMED
-    *   <VRF3> IPv4Entries -> Multiple NHG -> Multiple NH.
-        *   Inject IPv4Entries(IPBlock3: "198.18.128.1/18") in VRF3.
-        *   Install IPiniP decap-then-encap to 500 first /32 from <IPBlockVRF1>
-            to 500 NextHopGroups containing 1 NextHop each
-        *   Validate that the entries are installed as FIB_PROGRAMMED
+    *   <Default VRF>
+        * A) Install 400 NextHops, egressing out different interfaces.
+        * B) Install 200 NextHopGroups.  Each points at 8 NextHops from the first 200 entries of A) with equal weight.
+        * C) Install 200 IPv4 Entries, each pointing at a unique NHG (1:1) from B.
+        * D.1) Install 100 NextHops.  Each will redirect to an IP from C).
+        * D.2) Install 100 NextHops.  Each will redirect to an IP from C).
+        * E) Install 100 NextHopGroups.  Each will contain 1 NextHops from D.1 with weights 1 and 1 NextHop from D.1 with weight 31. The backup next_hop_group will be to redirect to VRF3.
+        * F) Install 100 NextHopGroups.  Each will contain 2 NextHops from D.1 with weights 1 abd 1 NextHop from D.2 with weight 31. The backup next_hop_group will be to decap and redirect to DEFAULT vrf.
+        * G) Install 700 NextHops.  Each will decaps + reencap to an IP in VRF2.
+        * H) Install 700 NextHopGroups.  Each will point to a NextHop from G) and have a backup next_hop_group to decap and redirect to DEFAULT vrf.
+    *   <VRF1>
+        *   Install 9000 IPv4Entries.  Each points to a NextHopGroup from E).
+    *   <VRF2>
+        *   Install 9000 IPv4Entries (Same IPAddress as VRF1).  Each points to a NextHopGroup from F).
+    *   <VRF3>
+        *   Install 9000 IPv4Entries (Same IPAddress as VRF1).  Each points to a NextHopGroup from H).
+*   Validate that each entry above are installed as FIB_PROGRAMMED.
 *   TODO: Add flows destinating to IPBlocks and ensure ATEPort2 receives it with
-    no loss
+    no loss and proper weights
 
 ## OpenConfig Path and RPC Coverage
 ```yaml

feature/gribi/otg_tests/gribi_scaling/gribi_scaling_test.go

@@ -134,7 +134,7 @@ func configurePBF(dut *ondatra.DUTDevice) *oc.NetworkInstance_PolicyForwarding {
 
 // applyForwardingPolicy applies the forwarding policy on the interface.
 func applyForwardingPolicy(t *testing.T, ingressPort string) {
-	t.Logf("Applying forwarding policy on interface %v ... ", ingressPort)
+	t.Logf("Apply7ing forwarding policy on interface %v ... ", ingressPort)
 	d := &oc.Root{}
 	dut := ondatra.DUT(t, "dut")
 	interfaceID := ingressPort