Merge branch 'main' of https://github.com/open-traffic-generator/feat…

…ureprofiles into otg_rt2.13_update
openconfig · Jan 27, 2025 · de67f2d · de67f2d
2 parents aedd34d + f7b680a
commit de67f2d
Show file tree

Hide file tree

Showing 54 changed files with 961 additions and 98 deletions.
diff --git a/feature/aft/afts_summary/otg_tests/route_summary_counters_test/metadata.textproto b/feature/aft/afts_summary/otg_tests/route_summary_counters_test/metadata.textproto
@@ -49,7 +49,6 @@ platform_exceptions: {
 		default_network_instance: "default"
     isis_instance_enabled_required: true
     isis_interface_afi_unsupported: true
-    route_policy_under_afi_unsupported: true
   }
 }
 
diff --git a/feature/aft/afts_summary/otg_tests/scale_aft_summary/metadata.textproto b/feature/aft/afts_summary/otg_tests/scale_aft_summary/metadata.textproto
@@ -49,6 +49,5 @@ platform_exceptions: {
 		default_network_instance: "default"
     isis_instance_enabled_required: true
     isis_interface_afi_unsupported: true
-    route_policy_under_afi_unsupported: true
   }
 }
diff --git a/feature/bgp/addpath/otg_tests/route_propagation_test/metadata.textproto b/feature/bgp/addpath/otg_tests/route_propagation_test/metadata.textproto
@@ -28,7 +28,6 @@ platform_exceptions: {
     vendor: ARISTA
   }
   deviations: {
-    route_policy_under_afi_unsupported: true
     omit_l2_mtu: true
     interface_enabled: true
     default_network_instance: "default"

diff --git a/feature/bgp/admin_distance/otg_tests/admin_distance_test/metadata.textproto b/feature/bgp/admin_distance/otg_tests/admin_distance_test/metadata.textproto
@@ -16,9 +16,6 @@ platform_exceptions:  {
     interface_enabled:  true
     default_network_instance:  "default"
     isis_interface_afi_unsupported:  true
-    skip_isis_set_level:  true
-    skip_set_rp_match_set_options:  true
-    skip_setting_disable_metric_propagation:  true
     skip_setting_statement_for_policy:  true
   }
 }

diff --git a/feature/bgp/ate_tests/bgp_long_lived_graceful_restart/metadata.textproto b/feature/bgp/ate_tests/bgp_long_lived_graceful_restart/metadata.textproto
@@ -36,7 +36,6 @@ platform_exceptions: {
     vendor: ARISTA
   }
   deviations: {
-    route_policy_under_afi_unsupported: true
     omit_l2_mtu: true
     interface_config_vrf_before_address: true
     deprecated_vlan_id: true

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
@@ -11,16 +11,11 @@ platform_exceptions:  {
   }
   deviations:  {
     isis_instance_enabled_required:  true
-    route_policy_under_afi_unsupported:  true
     omit_l2_mtu:  true
     missing_value_for_defaults:  true
     interface_enabled:  true
     default_network_instance:  "default"
     isis_interface_afi_unsupported:  true
-    skip_isis_set_level:  true
-    skip_isis_set_metric_style_type:  true
-    skip_set_rp_match_set_options:  true
-    skip_setting_disable_metric_propagation:  true
   }
 }
 platform_exceptions: {

diff --git a/feature/bgp/gracefulrestart/ate_tests/bgp_graceful_restart_test/metadata.textproto b/feature/bgp/gracefulrestart/ate_tests/bgp_graceful_restart_test/metadata.textproto
@@ -28,7 +28,6 @@ platform_exceptions: {
     vendor: ARISTA
   }
   deviations: {
-    route_policy_under_afi_unsupported: true
     omit_l2_mtu: true
     interface_enabled: true
     default_network_instance: "default"

diff --git a/feature/bgp/multipath/otg_tests/bgp_multipath_ecmp_test/metadata.textproto b/feature/bgp/multipath/otg_tests/bgp_multipath_ecmp_test/metadata.textproto
@@ -39,7 +39,6 @@ platform_exceptions: {
     vendor: ARISTA
   }
   deviations: {
-    route_policy_under_afi_unsupported: true
     omit_l2_mtu: true
     interface_enabled: true
     default_network_instance: "default"

diff --git a/feature/bgp/multipath/otg_tests/bgp_multipath_wecmp_lbw_community_test/metadata.textproto b/feature/bgp/multipath/otg_tests/bgp_multipath_wecmp_lbw_community_test/metadata.textproto
@@ -39,7 +39,6 @@ platform_exceptions: {
     vendor: ARISTA
   }
   deviations: {
-    route_policy_under_afi_unsupported: true
     omit_l2_mtu: true
     interface_enabled: true
     default_network_instance: "default"

diff --git a/feature/bgp/otg_tests/bgp_2byte_4byte_asn/metadata.textproto b/feature/bgp/otg_tests/bgp_2byte_4byte_asn/metadata.textproto
@@ -10,7 +10,6 @@ platform_exceptions: {
     vendor: ARISTA
   }
   deviations: {
-    route_policy_under_afi_unsupported: true
     omit_l2_mtu: true
     network_instance_table_deletion_required: true
     interface_enabled: true

diff --git a/feature/bgp/otg_tests/bgp_2byte_4byte_asn_policy_test/metadata.textproto b/feature/bgp/otg_tests/bgp_2byte_4byte_asn_policy_test/metadata.textproto
@@ -30,7 +30,6 @@ platform_exceptions: {
     vendor: ARISTA
   }
   deviations: {
-    route_policy_under_afi_unsupported: true
     omit_l2_mtu: true
     interface_enabled: true
     default_network_instance: "default"

diff --git a/feature/bgp/otg_tests/bgp_afi_safi_defaults/metadata.textproto b/feature/bgp/otg_tests/bgp_afi_safi_defaults/metadata.textproto
@@ -36,7 +36,6 @@ platform_exceptions: {
     vendor: ARISTA
   }
   deviations: {
-    route_policy_under_afi_unsupported: true
     omit_l2_mtu: true
     network_instance_table_deletion_required: true
     interface_enabled: true

diff --git a/feature/bgp/otg_tests/bgp_always_compare_med/metadata.textproto b/feature/bgp/otg_tests/bgp_always_compare_med/metadata.textproto
@@ -19,7 +19,6 @@ platform_exceptions: {
     vendor: ARISTA
   }
   deviations: {
-    route_policy_under_afi_unsupported: true
     omit_l2_mtu: true
     interface_enabled: true
     default_network_instance: "default"

diff --git a/feature/bgp/otg_tests/bgp_override_as_path_split_horizon_test/metadata.textproto b/feature/bgp/otg_tests/bgp_override_as_path_split_horizon_test/metadata.textproto
@@ -19,7 +19,6 @@ platform_exceptions: {
     vendor: ARISTA
   }
   deviations: {
-    route_policy_under_afi_unsupported: true
     omit_l2_mtu: true
     interface_enabled: true
     default_network_instance: "default"

diff --git a/...re/bgp/policybase/otg_tests/actions_med_localpref_prepend_flow_control/metadata.textproto b/...re/bgp/policybase/otg_tests/actions_med_localpref_prepend_flow_control/metadata.textproto
@@ -42,7 +42,6 @@ platform_exceptions: {
     vendor: ARISTA
   }
   deviations: {
-    route_policy_under_afi_unsupported: true
     omit_l2_mtu: true
     interface_enabled: true
     default_network_instance: "default"

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
@@ -17,8 +17,6 @@ platform_exceptions: {
     missing_value_for_defaults: true
     interface_enabled: true
     default_network_instance: "default"
-    skip_set_rp_match_set_options: true
-    skip_setting_disable_metric_propagation: true
   }
 }
 

diff --git a/feature/bgp/policybase/otg_tests/aspath_test/metadata.textproto b/feature/bgp/policybase/otg_tests/aspath_test/metadata.textproto
@@ -11,13 +11,10 @@ platform_exceptions: {
     vendor: ARISTA
   }
   deviations: {
-    route_policy_under_afi_unsupported: true
     omit_l2_mtu: true
     missing_value_for_defaults: true
     interface_enabled: true
     default_network_instance: "default"
-    skip_set_rp_match_set_options: true
-    skip_setting_disable_metric_propagation: true
   }
 }
 platform_exceptions: {

diff --git a/feature/bgp/policybase/otg_tests/chained_policies_test/metadata.textproto b/feature/bgp/policybase/otg_tests/chained_policies_test/metadata.textproto
@@ -14,7 +14,6 @@ platform_exceptions: {
     interface_enabled: true
     default_network_instance: "default"
     missing_value_for_defaults: true
-    skip_set_rp_match_set_options: true
     default_import_export_policy_unsupported: false
     skip_setting_statement_for_policy: true
   }

diff --git a/feature/bgp/policybase/otg_tests/community_test/metadata.textproto b/feature/bgp/policybase/otg_tests/community_test/metadata.textproto
@@ -11,13 +11,10 @@ platform_exceptions: {
     vendor: ARISTA
   }
   deviations: {
-    route_policy_under_afi_unsupported: true
     omit_l2_mtu: true
     missing_value_for_defaults: true
     interface_enabled: true
     default_network_instance: "default"
-    skip_set_rp_match_set_options: true
-    skip_setting_disable_metric_propagation: true
   }
 }
 platform_exceptions: {

diff --git a/feature/bgp/policybase/otg_tests/default_policies_test/metadata.textproto b/feature/bgp/policybase/otg_tests/default_policies_test/metadata.textproto
@@ -24,7 +24,6 @@ platform_exceptions:  {
     missing_isis_interface_afi_safi_enable: true
     isis_interface_afi_unsupported: true
     isis_instance_enabled_required: true
-    default_import_export_policy_unsupported: true
     bgp_default_policy_unsupported: true
   }
 }

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
@@ -16,10 +16,7 @@ platform_exceptions: {
     interface_enabled: true
     default_network_instance: "default"
     missing_value_for_defaults: true
-    skip_set_rp_match_set_options: true
-    bgp_community_set_refs_unsupported: true
     bgp_community_member_is_a_string: true
-    skip_bgp_send_community_type: true
   }
 }
 platform_exceptions: {

diff --git a/feature/bgp/policybase/otg_tests/link_bandwidth_test/metadata.textproto b/feature/bgp/policybase/otg_tests/link_bandwidth_test/metadata.textproto
@@ -10,13 +10,10 @@ platform_exceptions:  {
     vendor:  ARISTA
   }
   deviations:  {
-    route_policy_under_afi_unsupported:  true
     omit_l2_mtu:  true
     missing_value_for_defaults:  true
     interface_enabled:  true
     default_network_instance:  "default"
-    skip_set_rp_match_set_options:  true
-    skip_setting_disable_metric_propagation:  true
     bgp_extended_community_index_unsupported:  true
   }
 }

diff --git a/feature/bgp/policybase/otg_tests/nested_policies/metadata.textproto b/feature/bgp/policybase/otg_tests/nested_policies/metadata.textproto
@@ -14,7 +14,6 @@ platform_exceptions: {
     interface_enabled: true
     default_network_instance: "default"
     missing_value_for_defaults: true
-    skip_set_rp_match_set_options: true
     routing_policy_chaining_unsupported: true
   }
 }

diff --git a/feature/bgp/policybase/otg_tests/prefix_set_test/metadata.textproto b/feature/bgp/policybase/otg_tests/prefix_set_test/metadata.textproto
@@ -27,7 +27,6 @@ platform_exceptions:  {
     default_network_instance: "default"
     missing_value_for_defaults: true
     skip_set_rp_match_set_options: true
-    default_import_export_policy_unsupported: true
   }
 }
 platform_exceptions:  {

diff --git a/feature/bgp/policybase/otg_tests/route_installation_test/metadata.textproto b/feature/bgp/policybase/otg_tests/route_installation_test/metadata.textproto
@@ -29,7 +29,6 @@ platform_exceptions: {
     vendor: ARISTA
   }
   deviations: {
-    route_policy_under_afi_unsupported: true
     omit_l2_mtu: true
     interface_enabled: true
     default_network_instance: "default"

diff --git a/feature/bgp/prefixlimit/otg_tests/bgp_prefix_limit_test/metadata.textproto b/feature/bgp/prefixlimit/otg_tests/bgp_prefix_limit_test/metadata.textproto
@@ -38,7 +38,6 @@ platform_exceptions: {
     vendor: ARISTA
   }
   deviations: {
-    route_policy_under_afi_unsupported: true
     omit_l2_mtu: true
     interface_enabled: true
     default_network_instance: "default"

diff --git a/...oute_bgp_redistribution/otg_tests/static_route_bgp_redistribution_test/metadata.textproto b/...oute_bgp_redistribution/otg_tests/static_route_bgp_redistribution_test/metadata.textproto
@@ -18,7 +18,6 @@ platform_exceptions:  {
     skip_set_rp_match_set_options:  true
     skip_prefix_set_mode:  true
     table_connections_unsupported:  true
-    use_vendor_native_tag_set_config:  true
     skip_bgp_send_community_type:  true
   }
 }
@@ -31,10 +30,7 @@ platform_exceptions:  {
     default_network_instance: "default"
     interface_enabled: true
     static_protocol_name: "STATIC"
-    skip_bgp_send_community_type: true
-    skip_setting_disable_metric_propagation: true
     same_policy_attached_to_all_afis: true
-    set_metric_as_preference: true
   }
 }
 platform_exceptions:  {

diff --git a/feature/bgp/tests/local_bgp_test/metadata.textproto b/feature/bgp/tests/local_bgp_test/metadata.textproto
@@ -32,7 +32,6 @@ platform_exceptions: {
   }
   deviations: {
     connect_retry: true
-    route_policy_under_afi_unsupported: true
     omit_l2_mtu: true
     network_instance_table_deletion_required: true
     missing_value_for_defaults: true

diff --git a/...re/bgp/timers/otg_tests/bgp_keepalive_and_holdtimer_configuration_test/metadata.textproto b/...re/bgp/timers/otg_tests/bgp_keepalive_and_holdtimer_configuration_test/metadata.textproto
@@ -29,7 +29,6 @@ platform_exceptions: {
     vendor: ARISTA
   }
   deviations: {
-    route_policy_under_afi_unsupported: true
     omit_l2_mtu: true
     interface_enabled: true
     default_network_instance: "default"

diff --git a/feature/gribi/otg_tests/fib_failed_due_to_hw_res_exhaust_test/metadata.textproto b/feature/gribi/otg_tests/fib_failed_due_to_hw_res_exhaust_test/metadata.textproto
@@ -36,7 +36,6 @@ platform_exceptions: {
     vendor: ARISTA
   }
   deviations: {
-    route_policy_under_afi_unsupported: true
     omit_l2_mtu: true
     interface_enabled: true
     default_network_instance: "default"

diff --git a/feature/gribi/otg_tests/gribi_route_test/metadata.textproto b/feature/gribi/otg_tests/gribi_route_test/metadata.textproto
@@ -45,7 +45,6 @@ platform_exceptions: {
     isis_interface_afi_unsupported: true
     missing_isis_interface_afi_safi_enable: true
     isis_require_same_l1_metric_with_l2_metric: true
-    route_policy_under_afi_unsupported: true
     static_protocol_name: "STATIC"
     aggregate_atomic_update: true
     missing_value_for_defaults: true

diff --git a/feature/gribi/otg_tests/gribigo_compliance_test/gribigo_compliance_test.go b/feature/gribi/otg_tests/gribigo_compliance_test/gribigo_compliance_test.go
@@ -224,6 +224,14 @@ func testAdditionalCompliance(tcArgs *testArgs, t *testing.T) {
 			fn:   addNHGReferencingToDownPort,
 		},
 	}
+
+	defer func() {
+		// Flush all entries after test.
+		if err := gribi.FlushAll(tcArgs.client); err != nil {
+			t.Error(err)
+		}
+	}()
+
 	for _, tt := range tests {
 		t.Run(tt.desc, func(t *testing.T) {
 			if err := gribi.FlushAll(tcArgs.client); err != nil {

diff --git a/feature/interface/aggregate/otg_tests/aggregate_all_not_viable_test/metadata.textproto b/feature/interface/aggregate/otg_tests/aggregate_all_not_viable_test/metadata.textproto
@@ -45,7 +45,6 @@ platform_exceptions: {
     isis_interface_afi_unsupported: true
     missing_isis_interface_afi_safi_enable: true
     isis_require_same_l1_metric_with_l2_metric: true
-    route_policy_under_afi_unsupported: true
     static_protocol_name: "STATIC"
     aggregate_atomic_update: true
     missing_value_for_defaults: true

diff --git a/feature/isis/otg_tests/graceful_restart_helper/metadata.textproto b/feature/isis/otg_tests/graceful_restart_helper/metadata.textproto
@@ -16,6 +16,5 @@ platform_exceptions: {
     isis_interface_afi_unsupported: true
     isis_instance_enabled_required: true
     missing_value_for_defaults: true
-    skip_isis_set_level: true
   }
 }
diff --git a/feature/isis/otg_tests/graceful_restart_restarting/metadata.textproto b/feature/isis/otg_tests/graceful_restart_restarting/metadata.textproto
@@ -16,6 +16,5 @@ platform_exceptions: {
     isis_interface_afi_unsupported: true
     isis_instance_enabled_required: true
     missing_value_for_defaults: true
-    skip_isis_set_level: true
   }
 }
diff --git a/feature/isis/otg_tests/static_route_isis_redistribution/metadata.textproto b/feature/isis/otg_tests/static_route_isis_redistribution/metadata.textproto
@@ -26,12 +26,7 @@ platform_exceptions: {
     isis_interface_afi_unsupported: true
     isis_instance_enabled_required: true
     missing_value_for_defaults: true
-    skip_isis_set_level: true
-    skip_setting_disable_metric_propagation: true
-    ipv6_static_route_with_ipv4_next_hop_requires_static_arp: true
-    routing_policy_tag_set_embedded: true
     same_policy_attached_to_all_afis: true
-    match_tag_set_condition_unsupported: true
   }
 }
 platform_exceptions: {

diff --git a/feature/isis/otg_tests/weighted_ecmp_test/metadata.textproto b/feature/isis/otg_tests/weighted_ecmp_test/metadata.textproto
@@ -17,7 +17,6 @@ platform_exceptions: {
     isis_interface_afi_unsupported: true
     missing_isis_interface_afi_safi_enable: true
     isis_require_same_l1_metric_with_l2_metric: true
-    route_policy_under_afi_unsupported: true
     static_protocol_name: "STATIC"
     rib_wecmp: true
     explicit_port_speed: true