TE-15.1: Adding flag to skip ipv6 compliance cases (openconfig#2522)

Based on discussion in b/318469590 making following changes -
    1. Adding skip_ipv6 flag to skip recently added ipv6 tests in gribigo compliance library.
    2. Updating gribigo package version in go.mod

"This code is a Contribution to the OpenConfig Feature Profiles project ("Work") made under the Google Software Grant and Corporate Contributor License Agreement ("CLA") and governed by the Apache License 2.0. No other rights or licenses in or to any of Nokia's intellectual property are granted for any other purpose. This code is provided on an "as is" basis without any warranties of any kind."

Co-authored-by: Sergey Fomin <sergey.fomin@nokia.com>

fixed merged conflict

feature/gribi/otg_tests/gribigo_compliance_test/gribigo_compliance_test.go

@@ -42,6 +42,7 @@ var (
 	skipIdempotentDelete = flag.Bool("skip_idempotent_delete", true, "Skip tests for idempotent DELETE operations")
 	skipNonDefaultNINHG  = flag.Bool("skip_non_default_ni_nhg", true, "skip tests that add entries to non-default network-instance")
 	skipMPLS             = flag.Bool("skip_mpls", true, "skip tests that add mpls entries")
+	skipIPv6             = flag.Bool("skip_ipv6", true, "skip tests that add ipv6 entries")
 
 	nonDefaultNI = flag.String("non_default_ni", "non-default-vrf", "non-default network-instance name")
 
@@ -105,6 +106,8 @@ func shouldSkip(tt *compliance.TestSpec) string {
 		return "This RequiresIdempotentDelete test is skipped by --skip_idempotent_delete"
 	case *skipMPLS && tt.In.RequiresMPLS:
 		return "This RequiresMPLS test is skipped by --skip_mpls"
+	case *skipIPv6 && tt.In.RequiresIPv6:
+		return "This RequiresIPv6 test is skipped by --skip_ipv6"
 	}
 	return moreSkipReasons[tt.In.ShortName]
 }

go.mod

@@ -23,7 +23,7 @@ require (
 	github.com/openconfig/gocloser v0.0.0-20220310182203-c6c950ed3b0b
 	github.com/openconfig/goyang v1.4.5
 	github.com/openconfig/gribi v1.0.0
-	github.com/openconfig/gribigo v0.0.0-20231201171903-dd8df80f57a9
+	github.com/openconfig/gribigo v0.0.0-20231211221638-48fe45d9284d
 	github.com/openconfig/kne v0.1.14
 	github.com/openconfig/models-ci v1.0.2-0.20231113233730-f0986391428e
 	github.com/openconfig/ondatra v0.4.8

go.sum

@@ -1196,10 +1196,8 @@ github.com/openconfig/goyang v1.4.5/go.mod h1:sdNZi/wdTZyLNBNfgLzmmbi7kISm7FskMD
 github.com/openconfig/gribi v0.1.1-0.20210423184541-ce37eb4ba92f/go.mod h1:OoH46A2kV42cIXGyviYmAlGmn6cHjGduyC2+I9d/iVs=
 github.com/openconfig/gribi v1.0.0 h1:xMwEg0mBD+21mOxuFOw0d9dBKuIPwJEhMUUeUulZdLg=
 github.com/openconfig/gribi v1.0.0/go.mod h1:VFqGH2ZPFIfnKTimP4/AQB4OK0eySW5muJNFxXAwP6k=
-github.com/openconfig/gribigo v0.0.0-20231031140438-9a293da13ff9 h1:AXdc2tqHWnYr4GlzYcs50wpQ7NLv6YWckHlgOHZ2qgo=
-github.com/openconfig/gribigo v0.0.0-20231031140438-9a293da13ff9/go.mod h1:Fue9aTSqtMM9AxH9p3wOEAPGec5uBRurxLmtcjTHhWg=
-github.com/openconfig/gribigo v0.0.0-20231201171903-dd8df80f57a9 h1:JyY9e0T2PHcmbemfbFFxuPR2cqiENS0MeRbt+pFc14g=
-github.com/openconfig/gribigo v0.0.0-20231201171903-dd8df80f57a9/go.mod h1:fW2+Z2NiQ5L3hY/wrDsZBIvGYrM5ryHIzjHeVTiPzuM=
+github.com/openconfig/gribigo v0.0.0-20231211221638-48fe45d9284d h1:xnJSugvjH4EfsZ+kZ+fpPH7geOyfbHiA91GVdg7YUl0=
+github.com/openconfig/gribigo v0.0.0-20231211221638-48fe45d9284d/go.mod h1:fW2+Z2NiQ5L3hY/wrDsZBIvGYrM5ryHIzjHeVTiPzuM=
 github.com/openconfig/grpctunnel v0.0.0-20220819142823-6f5422b8ca70 h1:t6SvvdfWCMlw0XPlsdxO8EgO+q/fXnTevDjdYREKFwU=
 github.com/openconfig/grpctunnel v0.0.0-20220819142823-6f5422b8ca70/go.mod h1:OmTWe7RyZj2CIzIgy4ovEBzCLBJzRvWSZmn7u02U9gU=
 github.com/openconfig/kne v0.1.14 h1:3xHy2bP+rr+2/2uFqliWXGjMPR7umO6mvFXh/TA2aJE=