Skip to content

Commit

Permalink
Add SchemaPath field to ParsedDirectory (#902)
Browse files Browse the repository at this point in the history
  • Loading branch information
@wenovus
wenovus authored Jul 31, 2023
1 parent 33d3dbd commit 41a4a2e
Show file tree
Hide file tree
Showing 4 changed files with 146 additions and 105 deletions.
155 changes: 89 additions & 66 deletions gogen/genir_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,10 @@ func TestGenerateIR(t *testing.T) {
wantIR: &ygen.IR{
Directories: map[string]*ygen.ParsedDirectory{
"/device": {
Name: "Device",
Type: ygen.Container,
Path: "/device",
Name: "Device",
Type: ygen.Container,
Path: "/device",
SchemaPath: "",
Fields: map[string]*ygen.NodeDetails{
"parent": {
Name: "Parent",
Expand Down Expand Up @@ -116,9 +117,10 @@ func TestGenerateIR(t *testing.T) {
IsFakeRoot: true,
},
"/openconfig-simple/parent": {
Name: "Parent",
Type: ygen.Container,
Path: "/openconfig-simple/parent",
Name: "Parent",
Type: ygen.Container,
Path: "/openconfig-simple/parent",
SchemaPath: "/parent",
Fields: map[string]*ygen.NodeDetails{
"child": {
Name: "Child",
Expand Down Expand Up @@ -146,9 +148,10 @@ func TestGenerateIR(t *testing.T) {
DefiningModule: "openconfig-simple",
},
"/openconfig-simple/parent/child": {
Name: "Parent_Child",
Type: ygen.Container,
Path: "/openconfig-simple/parent/child",
Name: "Parent_Child",
Type: ygen.Container,
Path: "/openconfig-simple/parent/child",
SchemaPath: "/parent/child",
Fields: map[string]*ygen.NodeDetails{
"zero": {
Name: "Zero",
Expand Down Expand Up @@ -287,9 +290,10 @@ func TestGenerateIR(t *testing.T) {
DefiningModule: "openconfig-simple",
},
"/openconfig-simple/remote-container": {
Name: "RemoteContainer",
Type: ygen.Container,
Path: "/openconfig-simple/remote-container",
Name: "RemoteContainer",
Type: ygen.Container,
Path: "/openconfig-simple/remote-container",
SchemaPath: "/remote-container",
Fields: map[string]*ygen.NodeDetails{
"a-leaf": {
Name: "ALeaf",
Expand Down Expand Up @@ -362,9 +366,10 @@ func TestGenerateIR(t *testing.T) {
wantIR: &ygen.IR{
Directories: map[string]*ygen.ParsedDirectory{
"/device": {
Name: "Device",
Type: ygen.Container,
Path: "/device",
Name: "Device",
Type: ygen.Container,
Path: "/device",
SchemaPath: "",
Fields: map[string]*ygen.NodeDetails{
"parent": {
Name: "Parent",
Expand Down Expand Up @@ -408,9 +413,10 @@ func TestGenerateIR(t *testing.T) {
IsFakeRoot: true,
},
"/openconfig-simple/parent": {
Name: "Parent",
Type: ygen.Container,
Path: "/openconfig-simple/parent",
Name: "Parent",
Type: ygen.Container,
Path: "/openconfig-simple/parent",
SchemaPath: "/parent",
Fields: map[string]*ygen.NodeDetails{
"child": {
Name: "Child",
Expand Down Expand Up @@ -438,9 +444,10 @@ func TestGenerateIR(t *testing.T) {
DefiningModule: "openconfig-simple",
},
"/openconfig-simple/parent/child": {
Name: "Parent_Child",
Type: ygen.Container,
Path: "/openconfig-simple/parent/child",
Name: "Parent_Child",
Type: ygen.Container,
Path: "/openconfig-simple/parent/child",
SchemaPath: "/parent/child",
Fields: map[string]*ygen.NodeDetails{
"zero": {
Name: "Zero",
Expand Down Expand Up @@ -579,9 +586,10 @@ func TestGenerateIR(t *testing.T) {
DefiningModule: "openconfig-simple",
},
"/openconfig-simple/remote-container": {
Name: "RemoteContainer",
Type: ygen.Container,
Path: "/openconfig-simple/remote-container",
Name: "RemoteContainer",
Type: ygen.Container,
Path: "/openconfig-simple/remote-container",
SchemaPath: "/remote-container",
Fields: map[string]*ygen.NodeDetails{
"a-leaf": {
Name: "ALeaf",
Expand Down Expand Up @@ -654,9 +662,10 @@ func TestGenerateIR(t *testing.T) {
wantIR: &ygen.IR{
Directories: map[string]*ygen.ParsedDirectory{
"/device": {
Name: "Device",
Type: ygen.Container,
Path: "/device",
Name: "Device",
Type: ygen.Container,
Path: "/device",
SchemaPath: "",
Fields: map[string]*ygen.NodeDetails{
"parent": {
Name: "Parent",
Expand Down Expand Up @@ -700,9 +709,10 @@ func TestGenerateIR(t *testing.T) {
IsFakeRoot: true,
},
"/openconfig-simple/parent": {
Name: "OpenconfigSimple_Parent",
Type: ygen.Container,
Path: "/openconfig-simple/parent",
Name: "OpenconfigSimple_Parent",
Type: ygen.Container,
Path: "/openconfig-simple/parent",
SchemaPath: "/parent",
Fields: map[string]*ygen.NodeDetails{
"child": {
Name: "Child",
Expand Down Expand Up @@ -730,9 +740,10 @@ func TestGenerateIR(t *testing.T) {
DefiningModule: "openconfig-simple",
},
"/openconfig-simple/parent/child": {
Name: "OpenconfigSimple_Parent_Child",
Type: ygen.Container,
Path: "/openconfig-simple/parent/child",
Name: "OpenconfigSimple_Parent_Child",
Type: ygen.Container,
Path: "/openconfig-simple/parent/child",
SchemaPath: "/parent/child",
Fields: map[string]*ygen.NodeDetails{
"config": {
Name: "Config",
Expand Down Expand Up @@ -775,9 +786,10 @@ func TestGenerateIR(t *testing.T) {
DefiningModule: "openconfig-simple",
},
"/openconfig-simple/parent/child/config": {
Name: "OpenconfigSimple_Parent_Child_Config",
Type: ygen.Container,
Path: "/openconfig-simple/parent/child/config",
Name: "OpenconfigSimple_Parent_Child_Config",
Type: ygen.Container,
Path: "/openconfig-simple/parent/child/config",
SchemaPath: "/parent/child/config",
Fields: map[string]*ygen.NodeDetails{
"four": {
Name: "Four",
Expand Down Expand Up @@ -865,9 +877,10 @@ func TestGenerateIR(t *testing.T) {
DefiningModule: "openconfig-simple",
},
"/openconfig-simple/parent/child/state": {
Name: "OpenconfigSimple_Parent_Child_State",
Type: ygen.Container,
Path: "/openconfig-simple/parent/child/state",
Name: "OpenconfigSimple_Parent_Child_State",
Type: ygen.Container,
Path: "/openconfig-simple/parent/child/state",
SchemaPath: "/parent/child/state",
Fields: map[string]*ygen.NodeDetails{
"four": {
Name: "Four",
Expand Down Expand Up @@ -1013,9 +1026,10 @@ func TestGenerateIR(t *testing.T) {
ConfigFalse: true,
},
"/openconfig-simple/remote-container": {
Name: "OpenconfigSimple_RemoteContainer",
Type: ygen.Container,
Path: "/openconfig-simple/remote-container",
Name: "OpenconfigSimple_RemoteContainer",
Type: ygen.Container,
Path: "/openconfig-simple/remote-container",
SchemaPath: "/remote-container",
Fields: map[string]*ygen.NodeDetails{
"config": {
Name: "Config",
Expand Down Expand Up @@ -1058,9 +1072,10 @@ func TestGenerateIR(t *testing.T) {
DefiningModule: "openconfig-remote",
},
"/openconfig-simple/remote-container/config": {
Name: "OpenconfigSimple_RemoteContainer_Config",
Type: ygen.Container,
Path: "/openconfig-simple/remote-container/config",
Name: "OpenconfigSimple_RemoteContainer_Config",
Type: ygen.Container,
Path: "/openconfig-simple/remote-container/config",
SchemaPath: "/remote-container/config",
Fields: map[string]*ygen.NodeDetails{
"a-leaf": {
Name: "ALeaf",
Expand Down Expand Up @@ -1094,9 +1109,10 @@ func TestGenerateIR(t *testing.T) {
DefiningModule: "openconfig-remote",
},
"/openconfig-simple/remote-container/state": {
Name: "OpenconfigSimple_RemoteContainer_State",
Type: ygen.Container,
Path: "/openconfig-simple/remote-container/state",
Name: "OpenconfigSimple_RemoteContainer_State",
Type: ygen.Container,
Path: "/openconfig-simple/remote-container/state",
SchemaPath: "/remote-container/state",
Fields: map[string]*ygen.NodeDetails{
"a-leaf": {
Name: "ALeaf",
Expand Down Expand Up @@ -1166,9 +1182,10 @@ func TestGenerateIR(t *testing.T) {
wantIR: &ygen.IR{
Directories: map[string]*ygen.ParsedDirectory{
"/device": {
Name: "Device",
Type: ygen.Container,
Path: "/device",
Name: "Device",
Type: ygen.Container,
Path: "/device",
SchemaPath: "",
Fields: map[string]*ygen.NodeDetails{
"e1": {
Name: "E1",
Expand Down Expand Up @@ -1221,9 +1238,10 @@ func TestGenerateIR(t *testing.T) {
wantIR: &ygen.IR{
Directories: map[string]*ygen.ParsedDirectory{
"/device": {
Name: "Device",
Type: ygen.Container,
Path: "/device",
Name: "Device",
Type: ygen.Container,
Path: "/device",
SchemaPath: "",
Fields: map[string]*ygen.NodeDetails{
"model": {
Name: "Model",
Expand Down Expand Up @@ -1273,6 +1291,7 @@ func TestGenerateIR(t *testing.T) {
Name: "ExamplePresence",
Type: ygen.Container,
Path: "/openconfig-complex/example-presence",
SchemaPath: "/example-presence",
Fields: map[string]*ygen.NodeDetails{},
PackageName: "",
ListKeys: nil,
Expand All @@ -1284,9 +1303,10 @@ func TestGenerateIR(t *testing.T) {
CompressedTelemetryAtomic: false,
},
"/openconfig-complex/model": {
Name: "Model",
Type: ygen.Container,
Path: "/openconfig-complex/model",
Name: "Model",
Type: ygen.Container,
Path: "/openconfig-complex/model",
SchemaPath: "/model",
Fields: map[string]*ygen.NodeDetails{
"anydata-leaf": {
Name: "AnydataLeaf",
Expand Down Expand Up @@ -1395,9 +1415,10 @@ func TestGenerateIR(t *testing.T) {
DefiningModule: "openconfig-complex",
},
"/openconfig-complex/model/a/single-key": {
Name: "Model_SingleKey",
Type: ygen.List,
Path: "/openconfig-complex/model/a/single-key",
Name: "Model_SingleKey",
Type: ygen.List,
Path: "/openconfig-complex/model/a/single-key",
SchemaPath: "/model/a/single-key",
Fields: map[string]*ygen.NodeDetails{
"dates": {
Name: "Dates",
Expand Down Expand Up @@ -1704,9 +1725,10 @@ func TestGenerateIR(t *testing.T) {
CompressedTelemetryAtomic: true,
},
"/openconfig-complex/model/b/multi-key": {
Name: "Model_MultiKey",
Type: ygen.List,
Path: "/openconfig-complex/model/b/multi-key",
Name: "Model_MultiKey",
Type: ygen.List,
Path: "/openconfig-complex/model/b/multi-key",
SchemaPath: "/model/b/multi-key",
Fields: map[string]*ygen.NodeDetails{
"key1": {
Name: "Key1",
Expand Down Expand Up @@ -1787,9 +1809,10 @@ func TestGenerateIR(t *testing.T) {
CompressedTelemetryAtomic: false,
},
"/openconfig-complex/model/c/unkeyed-list": {
Name: "Model_UnkeyedList",
Type: ygen.List,
Path: "/openconfig-complex/model/c/unkeyed-list",
Name: "Model_UnkeyedList",
Type: ygen.List,
Path: "/openconfig-complex/model/c/unkeyed-list",
SchemaPath: "/model/c/unkeyed-list",
Fields: map[string]*ygen.NodeDetails{
"field": {
Name: "Field",
Expand Down
Loading

0 comments on commit 41a4a2e

Please sign in to comment.