Generate ΛEnumTypes for shadow paths (#917)

* Generate `ΛEnumTypes` for shadow paths * Fixed unmarshalling union leafs for shadow paths. * Use correct path for keying `ΛEnumTypes`. * Re-generate exampleoc for schema test. * Remove stale comment
openconfig · Sep 28, 2023 · 23c9aac · 23c9aac
1 parent 2224a32
commit 23c9aac
Show file tree

Hide file tree

Showing 11 changed files with 143,866 additions and 130,505 deletions.
diff --git a/exampleoc/oc.go b/exampleoc/oc.go
diff --git a/exampleoc/ocpath.go b/exampleoc/ocpath.go
diff --git a/exampleoc/opstateoc/oc.go b/exampleoc/opstateoc/oc.go
diff --git a/exampleoc/opstateoc/update.sh b/exampleoc/opstateoc/update.sh
@@ -32,6 +32,7 @@ go run ../../generator/generator.go -path=public,deps -output_file=oc.go \
   public/release/models/optical-transport/openconfig-terminal-device.yang \
   public/release/models/optical-transport/openconfig-transport-line-protection.yang \
   public/release/models/platform/openconfig-platform.yang \
+  public/release/models/bgp/openconfig-bgp-policy.yang \
   public/release/models/policy/openconfig-routing-policy.yang \
   public/release/models/lacp/openconfig-lacp.yang \
   public/release/models/system/openconfig-system.yang \

diff --git a/exampleoc/update.sh b/exampleoc/update.sh
@@ -34,6 +34,7 @@ go run ../generator/generator.go -path=public,deps -output_file=oc.go \
   public/release/models/optical-transport/openconfig-terminal-device.yang \
   public/release/models/optical-transport/openconfig-transport-line-protection.yang \
   public/release/models/platform/openconfig-platform.yang \
+  public/release/models/bgp/openconfig-bgp-policy.yang \
   public/release/models/policy/openconfig-routing-policy.yang \
   public/release/models/lacp/openconfig-lacp.yang \
   public/release/models/system/openconfig-system.yang \

diff --git a/exampleoc/wrapperunionoc/oc.go b/exampleoc/wrapperunionoc/oc.go
@@ -9,6 +9,11 @@ It should not be used within your application, as it WILL change,
 without warning. Rather, you should generate structs directly from
 OpenConfig models using the ygot package.
 
+NOTE WELL: This is an example code file that is distributed with ygot.
+It should not be used within your application, as it WILL change,
+without warning. Rather, you should generate structs directly from
+OpenConfig models using the ygot package.
+
 This package was generated by github.com/openconfig/ygot
 using the following YANG input files:
   - public/release/models/network-instance/openconfig-network-instance.yang

diff --git a/gogen/codegen.go b/gogen/codegen.go
@@ -5,7 +5,6 @@ import (
 	"bytes"
 	"fmt"
 	"sort"
-	"strings"
 
 	"github.com/openconfig/ygot/internal/igenutil"
 	"github.com/openconfig/ygot/util"
@@ -274,8 +273,7 @@ func (cg *CodeGenerator) Generate(yangFiles, includePaths []string) (*GeneratedC
 		for _, fn := range dir.OrderedFieldNames() {
 			field := dir.Fields[fn]
 
-			// Strip the module name from the path.
-			schemaPath := util.SlicePathToString(append([]string{""}, strings.Split(field.YANGDetails.Path, "/")[2:]...))
+			schemaPath := field.YANGDetails.SchemaPath
 			switch {
 			case field.LangType == nil:
 				// This is a directory, so we continue.
@@ -304,6 +302,11 @@ func (cg *CodeGenerator) Generate(yangFiles, includePaths []string) (*GeneratedC
 					return field.LangType.UnionTypes[enumTypeMap[schemaPath][i]].Index < field.LangType.UnionTypes[enumTypeMap[schemaPath][j]].Index
 				})
 			}
+			if v, ok := enumTypeMap[schemaPath]; ok {
+				if shadowPath := field.YANGDetails.ShadowSchemaPath; shadowPath != "" {
+					enumTypeMap[shadowPath] = v
+				}
+			}
 		}
 	}
 

diff --git a/gogen/testdata/schema/openconfig-options-explicit.formatted-txt b/gogen/testdata/schema/openconfig-options-explicit.formatted-txt
@@ -357,5 +357,8 @@ func initΛEnumTypes(){
 	"/parent/child/config/three": []reflect.Type{
 		reflect.TypeOf((E_Child_Three)(0)),
 	},
+	"/parent/child/state/three": []reflect.Type{
+		reflect.TypeOf((E_Child_Three)(0)),
+	},
   }
 }