Fixing conflict and comments

.github/CODEOWNERS

@@ -11,7 +11,26 @@
 *       @openconfig/featureprofiles-maintainers
 
 # /feature folders each have owners who are auto requested for review and may merge PR's
-/feature/bgp/   @dplore
+/feature/acl/          @alokmtri-g
+/feature/aft/          @sudhinj
+/feature/bgp/          @dplore
+/feature/dhcp/         @alokmtri-g
+/feature/ethernet/     @ram-mac
+/feature/interface/    @ram-mac
+/feature/isis/         @rohit-rp
+/feature/lldp/         @alokmtri-g
+/feature/mpls/         @swetha-haridasula
+/feature/mtu/          @swetha-haridasula
+/feature/networkinstance/    @swetha-haridasula
+/feature/platform/           @amrindrr
+/feature/qos                 @sezhang2
+/feature/routing_policy/     @swetha-haridasula
+/feature/sampling/           @sudhinj
+/feature/security            @mihirpitale-googler
+/feature/staticroute/        @swetha-haridasula
+/feature/stp/                @alokmtri-g
+/feature/system              @swetha-haridasula
+/feature/vrrp                @amrindrr
 
 # Common OTG utilities 
 /internal/otgutils/  @openconfig/featureprofiles-maintainers-otg

.github/workflows/readme_oc_path_and_rpc.yml

@@ -37,7 +37,7 @@ jobs:
 
         exemption_flags=(
           --non-test-readme feature/security/gnsi/certz/test_data/README.md
-          --non-test-readme feature/experimental/p4rt/README.md
+          --non-test-readme feature/p4rt/README.md
           --non-test-readme feature/security/gnsi/acctz/README.md
         )
 

.gitignore

@@ -1,6 +1,7 @@
 *~
 topologies/kne/testbed.kne.yml
 .vscode/
+.idea/
 # used by `make validate_paths`
 openconfig_public/
 # used by `make proto/...`

CONTRIBUTING.md

@@ -62,10 +62,6 @@ The directory tree is organized as follows:
 *   `cloudbuild/` contains google cloud build scripts for running virtual
     routers in containers on [KNE](https://github.com/openconfig/kne)
 *   `feature/` contains definition and tests of feature profiles.
-*   `feature/experimental` contains tests which have automation which is
-    not confirmed to pass on any hardware platform or software release.
-    When the test automation is passing against at least one DUT,
-    it is moved to the `feature/` directory.
 *   `internal/` contains packages used by feature profile tests.
 *   `proto/` contains protobuf files for feature profiles.
 *   `tools/` contains code used for CI checks.

feature/bgp/admin_distance/otg_tests/admin_distance_test/admin_distance_test.go

@@ -154,6 +154,8 @@ func TestAdminDistance(t *testing.T) {
 				otgutils.WaitForARP(t, ts.ATE.OTG(), ts.ATETop, "IPv4")
 				otgutils.WaitForARP(t, ts.ATE.OTG(), ts.ATETop, "IPv6")
 
+				// b/374639328 #3 30 sec delay added for bgp and isis to come up
+				time.Sleep(30 * time.Second)
 				ts.ATE.OTG().StartTraffic(t)
 				// added 30 seconds for sleep for traffic flow
 				time.Sleep(30 * time.Second)