Merge branch 'main' into plt-1.1.v2

openconfig · Dec 19, 2024 · 39262b6 · 39262b6
2 parents 546be2c + 1d3aa0f
commit 39262b6
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 18 deletions.
diff --git a/...ure/bgp/bgp_isis_redistribution/otg_tests/bgp_isis_redistribution_test/metadata.textproto b/...ure/bgp/bgp_isis_redistribution/otg_tests/bgp_isis_redistribution_test/metadata.textproto
@@ -21,7 +21,6 @@ platform_exceptions:  {
     skip_isis_set_metric_style_type:  true
     skip_set_rp_match_set_options:  true
     skip_setting_disable_metric_propagation:  true
-    bgp_conditions_match_community_set_unsupported: true
   }
 }
 platform_exceptions: {

diff --git a/feature/bgp/policybase/otg_tests/aspath_and_community_test/metadata.textproto b/feature/bgp/policybase/otg_tests/aspath_and_community_test/metadata.textproto
@@ -19,7 +19,6 @@ platform_exceptions: {
     default_network_instance: "default"
     skip_set_rp_match_set_options: true
     skip_setting_disable_metric_propagation: true
-    bgp_conditions_match_community_set_unsupported: true
   }
 }
 

diff --git a/feature/bgp/policybase/otg_tests/aspath_test/metadata.textproto b/feature/bgp/policybase/otg_tests/aspath_test/metadata.textproto
@@ -18,7 +18,6 @@ platform_exceptions: {
     default_network_instance: "default"
     skip_set_rp_match_set_options: true
     skip_setting_disable_metric_propagation: true
-    bgp_conditions_match_community_set_unsupported: true
   }
 }
 platform_exceptions: {

diff --git a/feature/bgp/policybase/otg_tests/comm_match_action_test/metadata.textproto b/feature/bgp/policybase/otg_tests/comm_match_action_test/metadata.textproto
@@ -24,7 +24,6 @@ platform_exceptions:  {
     omit_l2_mtu: true
     interface_enabled: true
     default_network_instance: "default"
-    bgp_conditions_match_community_set_unsupported: true
   }
 }
 tags:  TAGS_AGGREGATION

diff --git a/feature/bgp/policybase/otg_tests/community_test/metadata.textproto b/feature/bgp/policybase/otg_tests/community_test/metadata.textproto
@@ -18,7 +18,6 @@ platform_exceptions: {
     default_network_instance: "default"
     skip_set_rp_match_set_options: true
     skip_setting_disable_metric_propagation: true
-    bgp_conditions_match_community_set_unsupported: true
   }
 }
 platform_exceptions: {

diff --git a/feature/bgp/policybase/otg_tests/import_export_multi_test/metadata.textproto b/feature/bgp/policybase/otg_tests/import_export_multi_test/metadata.textproto
@@ -18,7 +18,6 @@ platform_exceptions: {
     missing_value_for_defaults: true
     skip_set_rp_match_set_options: true
     bgp_community_set_refs_unsupported: true
-    bgp_conditions_match_community_set_unsupported: true
     bgp_community_member_is_a_string: true
     skip_bgp_send_community_type: 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
@@ -604,20 +604,20 @@ func TestLacpMember(t *testing.T) {
 	dut := ondatra.DUT(t, "dut")
 	lacpIntfs := gnmi.GetAll(t, dut, gnmi.OC().Lacp().InterfaceAny().Name().State())
 	if len(lacpIntfs) == 0 {
-		t.Errorf("Lacp().InterfaceAny().Name().Get(t) for %q: got 0, want > 0", dut.Name())
+		t.Logf("Lacp().InterfaceAny().Name().Get(t) for %q: got 0, want > 0", dut.Name())
 	}
-	t.Logf("Found %d LACP interfaces: %v", len(lacpIntfs)+1, lacpIntfs)
+	t.Logf("Found %d LACP interfaces: %v", len(lacpIntfs), lacpIntfs)
 
 	for i, intf := range lacpIntfs {
 		t.Logf("Telemetry LACP interface %d: %s:", i, intf)
 		members := gnmi.LookupAll(t, dut, gnmi.OC().Lacp().Interface(intf).MemberAny().State())
 		if len(members) == 0 {
-			t.Errorf("MemberAny().Lookup(t) for %q: got 0, want > 0", intf)
+			t.Logf("MemberAny().Lookup(t) for %q: got 0, want > 0", intf)
 		}
 		for i, member := range members {
 			memberVal, present := member.Val()
 			if !present {
-				t.Errorf("member.IsPresent() for %q: got false, want true", intf)
+				t.Logf("member.IsPresent() for %q: got false, want true", intf)
 			}
 			t.Logf("Telemetry path/value %d: %v=>%v:", i, member.Path.String(), memberVal)
 
@@ -626,45 +626,45 @@ func TestLacpMember(t *testing.T) {
 
 			lacpInPkts := counters.GetLacpInPkts()
 			if lacpInPkts == 0 {
-				t.Errorf("counters.GetLacpInPkts() for %q: got 0, want >0", memberVal.GetInterface())
+				t.Logf("counters.GetLacpInPkts() for %q: got 0, want >0", memberVal.GetInterface())
 			}
 			t.Logf("counters.GetLacpInPkts() for %q: %d", memberVal.GetInterface(), lacpInPkts)
 
 			lacpOutPkts := counters.GetLacpOutPkts()
 			if lacpOutPkts == 0 {
-				t.Errorf("counters.GetLacpOutPkts() for %q: got 0, want >0", memberVal.GetInterface())
+				t.Logf("counters.GetLacpOutPkts() for %q: got 0, want >0", memberVal.GetInterface())
 			}
 			t.Logf("counters.GetLacpOutPkts() for %q: %d", memberVal.GetInterface(), lacpOutPkts)
 
 			// Check LACP interface status.
 			if !memberVal.GetAggregatable() {
-				t.Errorf("memberVal.GetAggregatable() for %q: got false, want true", memberVal.GetInterface())
+				t.Logf("memberVal.GetAggregatable() for %q: got false, want true", memberVal.GetInterface())
 			}
 			t.Logf("memberVal.GetAggregatable() for %q: %v", memberVal.GetInterface(), memberVal.GetAggregatable())
 
 			if !memberVal.GetCollecting() {
-				t.Errorf("memberVal.GetCollecting() for %q: got false, want true", memberVal.GetInterface())
+				t.Logf("memberVal.GetCollecting() for %q: got false, want true", memberVal.GetInterface())
 			}
 			t.Logf("memberVal.GetCollecting() for %q: %v", memberVal.GetInterface(), memberVal.GetAggregatable())
 
 			if !memberVal.GetDistributing() {
-				t.Errorf("memberVal.GetDistributing() for %q: got false, want true", memberVal.GetInterface())
+				t.Logf("memberVal.GetDistributing() for %q: got false, want true", memberVal.GetInterface())
 			}
 			t.Logf("memberVal.GetDistributing() for %q: %v", memberVal.GetInterface(), memberVal.GetAggregatable())
 
 			// Check LCP partner info.
 			if memberVal.GetPartnerId() == "" {
-				t.Errorf("memberVal.GetPartnerId() for %q: got empty string, want non-empty string", memberVal.GetInterface())
+				t.Logf("memberVal.GetPartnerId() for %q: got empty string, want non-empty string", memberVal.GetInterface())
 			}
 			t.Logf("memberVal.GetPartnerId() for %q: %s", memberVal.GetInterface(), memberVal.GetPartnerId())
 
 			if memberVal.GetPartnerKey() == 0 {
-				t.Errorf("memberVal.GetPartnerKey() for %q: got 0, want > 0", memberVal.GetInterface())
+				t.Logf("memberVal.GetPartnerKey() for %q: got 0, want > 0", memberVal.GetInterface())
 			}
 			t.Logf("memberVal.GetPartnerKey() for %q: %d", memberVal.GetInterface(), memberVal.GetPartnerKey())
 
 			if memberVal.GetPartnerPortNum() == 0 {
-				t.Errorf("memberVal.GetPartnerPortNum() for %q: got 0, want > 0", memberVal.GetInterface())
+				t.Logf("memberVal.GetPartnerPortNum() for %q: got 0, want > 0", memberVal.GetInterface())
 			}
 			t.Logf("memberVal.GetPartnerPortNum() for %q: %d", memberVal.GetInterface(), memberVal.GetPartnerPortNum())
 		}