removed physical intf deviation (openconfig#2087)

nokia · Oct 24, 2023 · 5aa57be · 5aa57be
1 parent 1d73c49
commit 5aa57be
Show file tree

Hide file tree

Showing 5 changed files with 427 additions and 454 deletions.
diff --git a/feature/gnmi/otg_tests/telemetry_basic_check_test/metadata.textproto b/feature/gnmi/otg_tests/telemetry_basic_check_test/metadata.textproto
@@ -12,7 +12,6 @@ platform_exceptions: {
   }
   deviations: {
     ipv4_missing_enabled: true
-    missing_interface_physical_channel: true
     interface_counters_from_container: true
   }
 }
@@ -23,7 +22,6 @@ platform_exceptions: {
   }
   deviations: {
     ipv4_missing_enabled: true
-    missing_interface_physical_channel: true
     interface_counters_from_container: true
     os_component_parent_is_supervisor_or_linecard: true
   }

diff --git a/feature/gnmi/otg_tests/telemetry_basic_check_test/telemetry_basic_check_test.go b/feature/gnmi/otg_tests/telemetry_basic_check_test/telemetry_basic_check_test.go
@@ -150,9 +150,6 @@ func TestInterfaceOperStatus(t *testing.T) {
 
 func TestInterfacePhysicalChannel(t *testing.T) {
 	dut := ondatra.DUT(t, "dut")
-	if deviations.MissingInterfacePhysicalChannel(dut) {
-		t.Skip("Test is skipped due to MissingInterfacePhysicalChannel deviation")
-	}
 	dp := dut.Port(t, "port1")
 
 	phyChannel := gnmi.Get(t, dut, gnmi.OC().Interface(dp.Name()).PhysicalChannel().State())

diff --git a/internal/deviations/deviations.go b/internal/deviations/deviations.go
@@ -303,11 +303,6 @@ func GRIBIRIBAckOnly(dut *ondatra.DUTDevice) bool {
 	return lookupDUTDeviations(dut).GetGribiRibackOnly()
 }
 
-// MissingInterfacePhysicalChannel returns if device does not support interface/physicalchannel leaf.
-func MissingInterfacePhysicalChannel(dut *ondatra.DUTDevice) bool {
-	return lookupDUTDeviations(dut).GetMissingInterfacePhysicalChannel()
-}
-
 // MissingValueForDefaults returns if device returns no value for some OpenConfig paths if the operational value equals the default.
 func MissingValueForDefaults(dut *ondatra.DUTDevice) bool {
 	return lookupDUTDeviations(dut).GetMissingValueForDefaults()

diff --git a/proto/metadata.proto b/proto/metadata.proto
@@ -101,9 +101,6 @@ message Metadata {
     // Skip BGP TestPassword mismatch subtest if value is true.
     // Cisco: partnerissuetracker.corp.google.com/273285907
     bool skip_bgp_test_password_mismatch = 19;
-    // Device does not support interface/physicalchannel leaf.
-    // Cisco: partnerissuetracker.corp.google.com/273287821
-    bool missing_interface_physical_channel = 20;
     // Skip check for
     // bgp/neighbors/neighbor/state/messages/received/last-notification-error-code
     // leaf missing case.
@@ -357,7 +354,7 @@ message Metadata {
     bool tunnel_config_path_unsupported = 118;
 
     // Reserved field numbers and identifiers.
-    reserved 84, 9, 28, 90;
+    reserved 84, 9, 28, 20, 90;
   }
 
   message PlatformExceptions {