-
Notifications
You must be signed in to change notification settings - Fork 107
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Refactor how path structs are split. #719
Open
robshakir
wants to merge
1
commit into
master
Choose a base branch
from
splitn
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 0 additions & 15 deletions
15
ypathgen/testdata/splitstructs/openconfig-simple-32.path-txt
This file was deleted.
Oops, something went wrong.
59 changes: 59 additions & 0 deletions
59
ypathgen/testdata/splitstructs/openconfig-simple.higher-0.path-txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| Package ocstructs is a generated package which contains definitions | ||
| of structs which generate gNMI paths for a YANG schema. The generated paths are | ||
| based on a compressed form of the schema. | ||
|
|
||
| This package was generated by pathgen-tests | ||
| using the following YANG input files: | ||
| - ../testdata/modules/openconfig-simple.yang | ||
| Imported modules were sourced from: | ||
| */ | ||
| package ocstructs | ||
|
|
||
| import ( | ||
| oc "github.com/openconfig/ygot/ypathgen/testdata/exampleoc" | ||
| "github.com/openconfig/ygot/ygot" | ||
| ) | ||
|
|
||
| // Device represents the /device YANG schema element. | ||
| type Device struct { | ||
| *ygot.DeviceRootBase | ||
| } | ||
|
|
||
| // DeviceRoot returns a new path object from which YANG paths can be constructed. | ||
| func DeviceRoot(id string) *Device { | ||
| return &Device{ygot.NewDeviceRootBase(id)} | ||
| } | ||
|
|
||
| // Parent (container): I am a parent container | ||
| // that has 4 children. | ||
| // ---------------------------------------- | ||
| // Defining module: "openconfig-simple" | ||
| // Instantiating module: "openconfig-simple" | ||
| // Path from parent: "parent" | ||
| // Path from root: "/parent" | ||
| func (n *Device) Parent() *Parent { | ||
| return &Parent{ | ||
| NodePath: ygot.NewNodePath( | ||
| []string{"parent"}, | ||
| map[string]interface{}{}, | ||
| n, | ||
| ), | ||
| } | ||
| } | ||
|
|
||
| // RemoteContainer (container): | ||
| // ---------------------------------------- | ||
| // Defining module: "openconfig-remote" | ||
| // Instantiating module: "openconfig-simple" | ||
| // Path from parent: "remote-container" | ||
| // Path from root: "/remote-container" | ||
| func (n *Device) RemoteContainer() *RemoteContainer { | ||
| return &RemoteContainer{ | ||
| NodePath: ygot.NewNodePath( | ||
| []string{"remote-container"}, | ||
| map[string]interface{}{}, | ||
| n, | ||
| ), | ||
| } | ||
| } |
58 changes: 58 additions & 0 deletions
58
ypathgen/testdata/splitstructs/openconfig-simple.higher-1.path-txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* | ||
| Package ocstructs is a generated package which contains definitions | ||
| of structs which generate gNMI paths for a YANG schema. The generated paths are | ||
| based on a compressed form of the schema. | ||
|
|
||
| This package was generated by pathgen-tests | ||
| using the following YANG input files: | ||
| - ../testdata/modules/openconfig-simple.yang | ||
| Imported modules were sourced from: | ||
| */ | ||
| package ocstructs | ||
|
|
||
| import ( | ||
| oc "github.com/openconfig/ygot/ypathgen/testdata/exampleoc" | ||
| "github.com/openconfig/ygot/ygot" | ||
| ) | ||
|
|
||
| // Parent represents the /openconfig-simple/parent YANG schema element. | ||
| type Parent struct { | ||
| *ygot.NodePath | ||
| } | ||
|
|
||
| // ParentAny represents the wildcard version of the /openconfig-simple/parent YANG schema element. | ||
| type ParentAny struct { | ||
| *ygot.NodePath | ||
| } | ||
|
|
||
| // Child (container): | ||
| // ---------------------------------------- | ||
| // Defining module: "openconfig-simple" | ||
| // Instantiating module: "openconfig-simple" | ||
| // Path from parent: "child" | ||
| // Path from root: "/parent/child" | ||
| func (n *Parent) Child() *Parent_Child { | ||
| return &Parent_Child{ | ||
| NodePath: ygot.NewNodePath( | ||
| []string{"child"}, | ||
| map[string]interface{}{}, | ||
| n, | ||
| ), | ||
| } | ||
| } | ||
|
|
||
| // Child (container): | ||
| // ---------------------------------------- | ||
| // Defining module: "openconfig-simple" | ||
| // Instantiating module: "openconfig-simple" | ||
| // Path from parent: "child" | ||
| // Path from root: "/parent/child" | ||
| func (n *ParentAny) Child() *Parent_ChildAny { | ||
| return &Parent_ChildAny{ | ||
| NodePath: ygot.NewNodePath( | ||
| []string{"child"}, | ||
| map[string]interface{}{}, | ||
| n, | ||
| ), | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(optional): Move line 410 to just before line 406, change if condition to
if i != 0 && (i%structsPerFile == 0 || i == structN-1) {, and you can remove the corner case after the for loop (delete line 412)