Update to OC v5.0.0 (#503)

* Update to OC v5.0.0 * fix
openconfig · Dec 5, 2024 · 271c51e · 271c51e
1 parent 18fc679
commit 271c51e
Show file tree

Hide file tree

Showing 127 changed files with 207,161 additions and 184,618 deletions.
diff --git a/bgp/ocgobgp.go b/bgp/ocgobgp.go
@@ -21,10 +21,11 @@ import (
 	"strings"
 
 	log "github.com/golang/glog"
-	"github.com/openconfig/lemming/gnmi/oc"
-	"github.com/openconfig/lemming/internal/lemmingutil"
 	api "github.com/osrg/gobgp/v3/api"
 	gobgpoc "github.com/osrg/gobgp/v3/pkg/config/oc"
+
+	"github.com/openconfig/lemming/gnmi/oc"
+	"github.com/openconfig/lemming/internal/lemmingutil"
 )
 
 // convertPolicyName converts from OC policy name to a neighbour-qualified
@@ -344,8 +345,6 @@ func convertMED(med oc.RoutingPolicy_PolicyDefinition_Statement_Actions_BgpActio
 		return "", nil
 	}
 	switch c := med.(type) {
-	case oc.UnionString:
-		return string(c), nil
 	case oc.UnionUint32:
 		return strconv.FormatUint(uint64(c), 10), nil
 	case oc.E_BgpPolicy_BgpSetMedType_Enum:

diff --git a/gnmi/generate.sh b/gnmi/generate.sh
@@ -19,6 +19,7 @@
 set -e
 
 git clone https://github.com/openconfig/public.git
+cd public && git checkout v5.0.0 && cd ..
 
 EXCLUDE_MODULES=ietf-interfaces,openconfig-bfd,openconfig-messages
 

diff --git a/gnmi/oc/acl/acl-0.go b/gnmi/oc/acl/acl-0.go
@@ -2,7 +2,7 @@
 Package acl is a generated package which contains definitions
 of structs which generate gNMI paths for a YANG schema.
 
-This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.18)
+This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.19)
 using the following YANG input files:
   - public/release/models/acl/openconfig-acl.yang
   - public/release/models/acl/openconfig-packet-match.yang

diff --git a/gnmi/oc/acl/acl-1.go b/gnmi/oc/acl/acl-1.go
@@ -2,7 +2,7 @@
 Package acl is a generated package which contains definitions
 of structs which generate gNMI paths for a YANG schema.
 
-This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.18)
+This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.19)
 using the following YANG input files:
   - public/release/models/acl/openconfig-acl.yang
   - public/release/models/acl/openconfig-packet-match.yang

diff --git a/gnmi/oc/acl/acl-2.go b/gnmi/oc/acl/acl-2.go
@@ -2,7 +2,7 @@
 Package acl is a generated package which contains definitions
 of structs which generate gNMI paths for a YANG schema.
 
-This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.18)
+This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.19)
 using the following YANG input files:
   - public/release/models/acl/openconfig-acl.yang
   - public/release/models/acl/openconfig-packet-match.yang

diff --git a/gnmi/oc/acl/acl-3.go b/gnmi/oc/acl/acl-3.go
@@ -2,7 +2,7 @@
 Package acl is a generated package which contains definitions
 of structs which generate gNMI paths for a YANG schema.
 
-This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.18)
+This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.19)
 using the following YANG input files:
   - public/release/models/acl/openconfig-acl.yang
   - public/release/models/acl/openconfig-packet-match.yang

diff --git a/gnmi/oc/acl/acl-4.go b/gnmi/oc/acl/acl-4.go
@@ -2,7 +2,7 @@
 Package acl is a generated package which contains definitions
 of structs which generate gNMI paths for a YANG schema.
 
-This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.18)
+This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.19)
 using the following YANG input files:
   - public/release/models/acl/openconfig-acl.yang
   - public/release/models/acl/openconfig-packet-match.yang

diff --git a/gnmi/oc/acl/acl-5.go b/gnmi/oc/acl/acl-5.go
@@ -2,7 +2,7 @@
 Package acl is a generated package which contains definitions
 of structs which generate gNMI paths for a YANG schema.
 
-This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.18)
+This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.19)
 using the following YANG input files:
   - public/release/models/acl/openconfig-acl.yang
   - public/release/models/acl/openconfig-packet-match.yang

diff --git a/gnmi/oc/acl/acl-6.go b/gnmi/oc/acl/acl-6.go
@@ -2,7 +2,7 @@
 Package acl is a generated package which contains definitions
 of structs which generate gNMI paths for a YANG schema.
 
-This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.18)
+This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.19)
 using the following YANG input files:
   - public/release/models/acl/openconfig-acl.yang
   - public/release/models/acl/openconfig-packet-match.yang

diff --git a/gnmi/oc/acl/acl-7.go b/gnmi/oc/acl/acl-7.go
@@ -2,7 +2,7 @@
 Package acl is a generated package which contains definitions
 of structs which generate gNMI paths for a YANG schema.
 
-This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.18)
+This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.19)
 using the following YANG input files:
   - public/release/models/acl/openconfig-acl.yang
   - public/release/models/acl/openconfig-packet-match.yang

diff --git a/gnmi/oc/bgpgue/bgpgue-0.go b/gnmi/oc/bgpgue/bgpgue-0.go
@@ -2,7 +2,7 @@
 Package bgpgue is a generated package which contains definitions
 of structs which generate gNMI paths for a YANG schema.
 
-This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.18)
+This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.19)
 using the following YANG input files:
   - public/release/models/acl/openconfig-acl.yang
   - public/release/models/acl/openconfig-packet-match.yang

diff --git a/gnmi/oc/bgpgue/bgpgue-1.go b/gnmi/oc/bgpgue/bgpgue-1.go
@@ -2,7 +2,7 @@
 Package bgpgue is a generated package which contains definitions
 of structs which generate gNMI paths for a YANG schema.
 
-This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.18)
+This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.19)
 using the following YANG input files:
   - public/release/models/acl/openconfig-acl.yang
   - public/release/models/acl/openconfig-packet-match.yang

diff --git a/gnmi/oc/bgpgue/bgpgue-2.go b/gnmi/oc/bgpgue/bgpgue-2.go
@@ -2,7 +2,7 @@
 Package bgpgue is a generated package which contains definitions
 of structs which generate gNMI paths for a YANG schema.
 
-This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.18)
+This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.19)
 using the following YANG input files:
   - public/release/models/acl/openconfig-acl.yang
   - public/release/models/acl/openconfig-packet-match.yang

diff --git a/gnmi/oc/bgpgue/bgpgue-3.go b/gnmi/oc/bgpgue/bgpgue-3.go
@@ -2,7 +2,7 @@
 Package bgpgue is a generated package which contains definitions
 of structs which generate gNMI paths for a YANG schema.
 
-This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.18)
+This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.19)
 using the following YANG input files:
   - public/release/models/acl/openconfig-acl.yang
   - public/release/models/acl/openconfig-packet-match.yang

diff --git a/gnmi/oc/bgpgue/bgpgue-4.go b/gnmi/oc/bgpgue/bgpgue-4.go
@@ -2,7 +2,7 @@
 Package bgpgue is a generated package which contains definitions
 of structs which generate gNMI paths for a YANG schema.
 
-This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.18)
+This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.19)
 using the following YANG input files:
   - public/release/models/acl/openconfig-acl.yang
   - public/release/models/acl/openconfig-packet-match.yang

diff --git a/gnmi/oc/bgpgue/bgpgue-5.go b/gnmi/oc/bgpgue/bgpgue-5.go
@@ -2,7 +2,7 @@
 Package bgpgue is a generated package which contains definitions
 of structs which generate gNMI paths for a YANG schema.
 
-This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.18)
+This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.19)
 using the following YANG input files:
   - public/release/models/acl/openconfig-acl.yang
   - public/release/models/acl/openconfig-packet-match.yang

diff --git a/gnmi/oc/bgpgue/bgpgue-6.go b/gnmi/oc/bgpgue/bgpgue-6.go
@@ -2,7 +2,7 @@
 Package bgpgue is a generated package which contains definitions
 of structs which generate gNMI paths for a YANG schema.
 
-This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.18)
+This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.19)
 using the following YANG input files:
   - public/release/models/acl/openconfig-acl.yang
   - public/release/models/acl/openconfig-packet-match.yang

diff --git a/gnmi/oc/bgpgue/bgpgue-7.go b/gnmi/oc/bgpgue/bgpgue-7.go
@@ -2,7 +2,7 @@
 Package bgpgue is a generated package which contains definitions
 of structs which generate gNMI paths for a YANG schema.
 
-This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.18)
+This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.19)
 using the following YANG input files:
   - public/release/models/acl/openconfig-acl.yang
   - public/release/models/acl/openconfig-packet-match.yang

diff --git a/gnmi/oc/definedsets/definedsets-0.go b/gnmi/oc/definedsets/definedsets-0.go
@@ -2,7 +2,7 @@
 Package definedsets is a generated package which contains definitions
 of structs which generate gNMI paths for a YANG schema.
 
-This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.18)
+This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.19)
 using the following YANG input files:
   - public/release/models/acl/openconfig-acl.yang
   - public/release/models/acl/openconfig-packet-match.yang

diff --git a/gnmi/oc/definedsets/definedsets-1.go b/gnmi/oc/definedsets/definedsets-1.go
@@ -2,7 +2,7 @@
 Package definedsets is a generated package which contains definitions
 of structs which generate gNMI paths for a YANG schema.
 
-This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.18)
+This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.19)
 using the following YANG input files:
   - public/release/models/acl/openconfig-acl.yang
   - public/release/models/acl/openconfig-packet-match.yang

diff --git a/gnmi/oc/definedsets/definedsets-2.go b/gnmi/oc/definedsets/definedsets-2.go
@@ -2,7 +2,7 @@
 Package definedsets is a generated package which contains definitions
 of structs which generate gNMI paths for a YANG schema.
 
-This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.18)
+This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.19)
 using the following YANG input files:
   - public/release/models/acl/openconfig-acl.yang
   - public/release/models/acl/openconfig-packet-match.yang

diff --git a/gnmi/oc/definedsets/definedsets-3.go b/gnmi/oc/definedsets/definedsets-3.go
@@ -2,7 +2,7 @@
 Package definedsets is a generated package which contains definitions
 of structs which generate gNMI paths for a YANG schema.
 
-This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.18)
+This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.19)
 using the following YANG input files:
   - public/release/models/acl/openconfig-acl.yang
   - public/release/models/acl/openconfig-packet-match.yang

diff --git a/gnmi/oc/definedsets/definedsets-4.go b/gnmi/oc/definedsets/definedsets-4.go
@@ -2,7 +2,7 @@
 Package definedsets is a generated package which contains definitions
 of structs which generate gNMI paths for a YANG schema.
 
-This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.18)
+This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.19)
 using the following YANG input files:
   - public/release/models/acl/openconfig-acl.yang
   - public/release/models/acl/openconfig-packet-match.yang

diff --git a/gnmi/oc/definedsets/definedsets-5.go b/gnmi/oc/definedsets/definedsets-5.go
@@ -2,7 +2,7 @@
 Package definedsets is a generated package which contains definitions
 of structs which generate gNMI paths for a YANG schema.
 
-This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.18)
+This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.19)
 using the following YANG input files:
   - public/release/models/acl/openconfig-acl.yang
   - public/release/models/acl/openconfig-packet-match.yang

diff --git a/gnmi/oc/definedsets/definedsets-6.go b/gnmi/oc/definedsets/definedsets-6.go
@@ -2,7 +2,7 @@
 Package definedsets is a generated package which contains definitions
 of structs which generate gNMI paths for a YANG schema.
 
-This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.18)
+This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.19)
 using the following YANG input files:
   - public/release/models/acl/openconfig-acl.yang
   - public/release/models/acl/openconfig-packet-match.yang

diff --git a/gnmi/oc/definedsets/definedsets-7.go b/gnmi/oc/definedsets/definedsets-7.go
@@ -2,7 +2,7 @@
 Package definedsets is a generated package which contains definitions
 of structs which generate gNMI paths for a YANG schema.
 
-This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.18)
+This package was generated by ygnmi version: v0.11.1: (ygot: v0.29.19)
 using the following YANG input files:
   - public/release/models/acl/openconfig-acl.yang
   - public/release/models/acl/openconfig-packet-match.yang
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,7 @@ @@
     set -e
     git clone https://github.com/openconfig/public.git
+    cd public && git checkout v5.0.0 && cd ..
     EXCLUDE_MODULES=ietf-interfaces,openconfig-bfd,openconfig-messages
@@ Expand Down @@