TE-1.1 : static_arp_test.go (openconfig#2899)

* removed deviation * resolving conflicts * Resolving conflicts * Resolving conflicts * Resolving conflicts * Resolving conflicts * Resolving conflicts * Resolving conflicts * resolving commits --------- Co-authored-by: sudhirakondi <[email protected]> Co-authored-by: sudhirakondi <[email protected]>
open-traffic-generator · Sep 4, 2024 · 4c0bd06 · 4c0bd06
1 parent 44cb5ed
commit 4c0bd06
Show file tree

Hide file tree

Showing 6 changed files with 428 additions and 452 deletions.
diff --git a/feature/interface/staticarp/otg_tests/static_arp_test/README.md b/feature/interface/staticarp/otg_tests/static_arp_test/README.md
@@ -37,3 +37,13 @@ are the destination MAC addresses of the packets seen by the OTG.
 *   /interfaces/interface/subinterfaces/subinterface/ipv6/addresses/address/config/prefix-length
 *   /interfaces/interface/subinterfaces/subinterface/ipv6/neighbors/neighbor/config/ip
 *   /interfaces/interface/subinterfaces/subinterface/ipv6/neighbors/neighbor/config/link-layer-address
+
+## OpenConfig Path and RPC Coverage
+
+```yaml
+rpcs:
+  gnmi:
+    gNMI.Get:
+    gNMI.Subscribe:
+
+```
diff --git a/feature/interface/staticarp/otg_tests/static_arp_test/metadata.textproto b/feature/interface/staticarp/otg_tests/static_arp_test/metadata.textproto
@@ -13,14 +13,6 @@ platform_exceptions: {
     ipv4_missing_enabled: true
   }
 }
-platform_exceptions: {
-  platform: {
-    vendor: JUNIPER
-  }
-  deviations: {
-    enable_flowctrl_flag: true
-  }
-}
 platform_exceptions: {
   platform: {
     vendor: NOKIA

diff --git a/feature/interface/staticarp/otg_tests/static_arp_test/static_arp_test.go b/feature/interface/staticarp/otg_tests/static_arp_test/static_arp_test.go
@@ -127,9 +127,6 @@ func configInterfaceDUT(t *testing.T, p *ondatra.Port, me, peer *attrs.Attribute
 	if me.MAC != "" {
 		e := i.GetOrCreateEthernet()
 		e.MacAddress = ygot.String(me.MAC)
-		if deviations.EnableFlowctrlFlag(dut) {
-			e.EnableFlowControl = ygot.Bool(true)
-		}
 	}
 
 	s := i.GetOrCreateSubinterface(0)
@@ -296,13 +293,12 @@ func testFlow(
 }
 
 func TestStaticARP(t *testing.T) {
-	// Configure the ATE
-	ate := ondatra.ATE(t, "ate")
-	config := configureATE(t)
-
 	// Configure the DUT with dynamic ARP.
 	configureDUT(t, noStaticMAC)
 
+	// Configure the ATE
+	ate := ondatra.ATE(t, "ate")
+	config := configureATE(t)
 	ate.OTG().StartProtocols(t)
 	otgutils.WaitForARP(t, ate.OTG(), config, "IPv4")
 	dstMac := gnmi.Get(t, ate.OTG(), gnmi.OTG().Interface(ateSrc.Name+".Eth").Ipv4Neighbor(dutSrc.IPv4).LinkLayerAddress().State())

diff --git a/internal/deviations/deviations.go b/internal/deviations/deviations.go
@@ -720,11 +720,6 @@ func SkipStaticNexthopCheck(dut *ondatra.DUTDevice) bool {
 	return lookupDUTDeviations(dut).GetSkipStaticNexthopCheck()
 }
 
-// EnableFlowctrlFlag returns if device needs set leaf specific enable flag.
-func EnableFlowctrlFlag(dut *ondatra.DUTDevice) bool {
-	return lookupDUTDeviations(dut).GetEnableFlowctrlFlag()
-}
-
 // Ipv6RouterAdvertisementConfigUnsupported returns true for devices which don't support Ipv6 RouterAdvertisement configuration
 func Ipv6RouterAdvertisementConfigUnsupported(dut *ondatra.DUTDevice) bool {
 	return lookupDUTDeviations(dut).GetIpv6RouterAdvertisementConfigUnsupported()

diff --git a/proto/metadata.proto b/proto/metadata.proto
@@ -393,9 +393,6 @@ message Metadata {
     // Devices which does not support nexthop index state
     // Juniper: b/304729237
     bool skip_static_nexthop_check = 136;
-    // Devices which needs to enable leaf specific flag
-    // Juniper: b/319202763
-    bool enable_flowctrl_flag = 137;
     // Device doesn't support router advertisement enable and mode config
     // Juniper: b/316173974
     bool ipv6_router_advertisement_config_unsupported = 138;
@@ -611,7 +608,6 @@ message Metadata {
     // SFlow source address update is unsupported
     // Arista: b/357914789
     bool sflow_source_address_update_unsupported = 217;
-
     // Reserved field numbers and identifiers.
     reserved 84, 9, 28, 20, 90, 97, 55, 89, 19, 36, 35, 40, 173;
   }