de-internalize exampleoc (#61)

* deinternalize exampleoc * gen fix
openconfig · Sep 7, 2022 · 985e5d9 · 985e5d9
1 parent 23dd370
commit 985e5d9
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 45 deletions.
diff --git a/exampleoc/README.md b/exampleoc/README.md
@@ -0,0 +1 @@
+This package MAY change without warning, and if possible SHOULD NOT be imported into your application.
diff --git a/internal/exampleoc/enum.go → exampleoc/enum.go b/internal/exampleoc/enum.go → exampleoc/enum.go
@@ -20,9 +20,9 @@ in this case).
 
 This package was generated by ygnmi version: (devel): (ygot: v0.23.0)
 using the following YANG input files:
-  - ../../pathgen/testdata/yang/openconfig-simple.yang
-  - ../../pathgen/testdata/yang/openconfig-withlistval.yang
-  - ../../pathgen/testdata/yang/openconfig-nested.yang
+  - ../pathgen/testdata/yang/openconfig-simple.yang
+  - ../pathgen/testdata/yang/openconfig-withlistval.yang
+  - ../pathgen/testdata/yang/openconfig-nested.yang
 
 Imported modules were sourced from:
 */

diff --git a/internal/exampleoc/enum_map.go → exampleoc/enum_map.go b/internal/exampleoc/enum_map.go → exampleoc/enum_map.go
@@ -20,9 +20,9 @@ in this case).
 
 This package was generated by ygnmi version: (devel): (ygot: v0.23.0)
 using the following YANG input files:
-  - ../../pathgen/testdata/yang/openconfig-simple.yang
-  - ../../pathgen/testdata/yang/openconfig-withlistval.yang
-  - ../../pathgen/testdata/yang/openconfig-nested.yang
+  - ../pathgen/testdata/yang/openconfig-simple.yang
+  - ../pathgen/testdata/yang/openconfig-withlistval.yang
+  - ../pathgen/testdata/yang/openconfig-nested.yang
 
 Imported modules were sourced from:
 */

diff --git a/.../exampleoc/exampleocpath/exampleocpath.go → exampleoc/exampleocpath/exampleocpath.go b/.../exampleoc/exampleocpath/exampleocpath.go → exampleoc/exampleocpath/exampleocpath.go
@@ -19,19 +19,19 @@ based on a compressed form of the schema.
 
 This package was generated by ygnmi version: (devel): (ygot: v0.23.0)
 using the following YANG input files:
-  - ../../pathgen/testdata/yang/openconfig-simple.yang
-  - ../../pathgen/testdata/yang/openconfig-withlistval.yang
-  - ../../pathgen/testdata/yang/openconfig-nested.yang
+  - ../pathgen/testdata/yang/openconfig-simple.yang
+  - ../pathgen/testdata/yang/openconfig-withlistval.yang
+  - ../pathgen/testdata/yang/openconfig-nested.yang
 
 Imported modules were sourced from:
 */
 package exampleocpath
 
 import (
-	oc "github.com/openconfig/ygnmi/internal/exampleoc"
-	"github.com/openconfig/ygnmi/internal/exampleoc/nested"
-	"github.com/openconfig/ygnmi/internal/exampleoc/simple"
-	"github.com/openconfig/ygnmi/internal/exampleoc/withlistval"
+	oc "github.com/openconfig/ygnmi/exampleoc"
+	"github.com/openconfig/ygnmi/exampleoc/nested"
+	"github.com/openconfig/ygnmi/exampleoc/simple"
+	"github.com/openconfig/ygnmi/exampleoc/withlistval"
 	"github.com/openconfig/ygnmi/ygnmi"
 	"github.com/openconfig/ygot/ytypes"
 )

diff --git a/internal/exampleoc/gen.go → exampleoc/gen.go b/internal/exampleoc/gen.go → exampleoc/gen.go
diff --git a/internal/exampleoc/gen.sh → exampleoc/gen.sh b/internal/exampleoc/gen.sh → exampleoc/gen.sh
@@ -17,12 +17,12 @@ set -e
 
 cd "$(dirname "$0")"
 
-go run ../../app/ygnmi generator \
+go run ../app/ygnmi generator \
   --trim_module_prefix=openconfig \
-  --base_package_path=github.com/openconfig/ygnmi/internal/exampleoc \
-  ../../pathgen/testdata/yang/openconfig-simple.yang \
-  ../../pathgen/testdata/yang/openconfig-withlistval.yang \
-  ../../pathgen/testdata/yang/openconfig-nested.yang
+  --base_package_path=github.com/openconfig/ygnmi/exampleoc \
+  ../pathgen/testdata/yang/openconfig-simple.yang \
+  ../pathgen/testdata/yang/openconfig-withlistval.yang \
+  ../pathgen/testdata/yang/openconfig-nested.yang
 
 go install golang.org/x/tools/cmd/goimports@latest
 go install github.com/google/addlicense@latest

diff --git a/internal/exampleoc/nested/nested-0.go → exampleoc/nested/nested-0.go b/internal/exampleoc/nested/nested-0.go → exampleoc/nested/nested-0.go
@@ -19,16 +19,16 @@ based on a compressed form of the schema.
 
 This package was generated by ygnmi version: (devel): (ygot: v0.23.0)
 using the following YANG input files:
-  - ../../pathgen/testdata/yang/openconfig-simple.yang
-  - ../../pathgen/testdata/yang/openconfig-withlistval.yang
-  - ../../pathgen/testdata/yang/openconfig-nested.yang
+  - ../pathgen/testdata/yang/openconfig-simple.yang
+  - ../pathgen/testdata/yang/openconfig-withlistval.yang
+  - ../pathgen/testdata/yang/openconfig-nested.yang
 
 Imported modules were sourced from:
 */
 package nested
 
 import (
-	oc "github.com/openconfig/ygnmi/internal/exampleoc"
+	oc "github.com/openconfig/ygnmi/exampleoc"
 	"github.com/openconfig/ygnmi/ygnmi"
 	"github.com/openconfig/ygot/ygot"
 	"github.com/openconfig/ygot/ytypes"

diff --git a/internal/exampleoc/schema.go → exampleoc/schema.go b/internal/exampleoc/schema.go → exampleoc/schema.go
@@ -20,9 +20,9 @@ in this case).
 
 This package was generated by ygnmi version: (devel): (ygot: v0.23.0)
 using the following YANG input files:
-  - ../../pathgen/testdata/yang/openconfig-simple.yang
-  - ../../pathgen/testdata/yang/openconfig-withlistval.yang
-  - ../../pathgen/testdata/yang/openconfig-nested.yang
+  - ../pathgen/testdata/yang/openconfig-simple.yang
+  - ../pathgen/testdata/yang/openconfig-withlistval.yang
+  - ../pathgen/testdata/yang/openconfig-nested.yang
 
 Imported modules were sourced from:
 */

diff --git a/internal/exampleoc/simple/simple-0.go → exampleoc/simple/simple-0.go b/internal/exampleoc/simple/simple-0.go → exampleoc/simple/simple-0.go
@@ -19,9 +19,9 @@ based on a compressed form of the schema.
 
 This package was generated by ygnmi version: (devel): (ygot: v0.23.0)
 using the following YANG input files:
-  - ../../pathgen/testdata/yang/openconfig-simple.yang
-  - ../../pathgen/testdata/yang/openconfig-withlistval.yang
-  - ../../pathgen/testdata/yang/openconfig-nested.yang
+  - ../pathgen/testdata/yang/openconfig-simple.yang
+  - ../pathgen/testdata/yang/openconfig-withlistval.yang
+  - ../pathgen/testdata/yang/openconfig-nested.yang
 
 Imported modules were sourced from:
 */
@@ -30,7 +30,7 @@ package simple
 import (
 	"reflect"
 
-	oc "github.com/openconfig/ygnmi/internal/exampleoc"
+	oc "github.com/openconfig/ygnmi/exampleoc"
 	"github.com/openconfig/ygnmi/ygnmi"
 	"github.com/openconfig/ygot/ygot"
 	"github.com/openconfig/ygot/ytypes"

diff --git a/internal/exampleoc/structs-0.go → exampleoc/structs-0.go b/internal/exampleoc/structs-0.go → exampleoc/structs-0.go
@@ -20,9 +20,9 @@ in this case).
 
 This package was generated by ygnmi version: (devel): (ygot: v0.23.0)
 using the following YANG input files:
-  - ../../pathgen/testdata/yang/openconfig-simple.yang
-  - ../../pathgen/testdata/yang/openconfig-withlistval.yang
-  - ../../pathgen/testdata/yang/openconfig-nested.yang
+  - ../pathgen/testdata/yang/openconfig-simple.yang
+  - ../pathgen/testdata/yang/openconfig-withlistval.yang
+  - ../pathgen/testdata/yang/openconfig-nested.yang
 
 Imported modules were sourced from:
 */

diff --git a/internal/exampleoc/union.go → exampleoc/union.go b/internal/exampleoc/union.go → exampleoc/union.go
@@ -20,9 +20,9 @@ in this case).
 
 This package was generated by ygnmi version: (devel): (ygot: v0.23.0)
 using the following YANG input files:
-  - ../../pathgen/testdata/yang/openconfig-simple.yang
-  - ../../pathgen/testdata/yang/openconfig-withlistval.yang
-  - ../../pathgen/testdata/yang/openconfig-nested.yang
+  - ../pathgen/testdata/yang/openconfig-simple.yang
+  - ../pathgen/testdata/yang/openconfig-withlistval.yang
+  - ../pathgen/testdata/yang/openconfig-nested.yang
 
 Imported modules were sourced from:
 */

diff --git a/...al/exampleoc/withlistval/withlistval-0.go → exampleoc/withlistval/withlistval-0.go b/...al/exampleoc/withlistval/withlistval-0.go → exampleoc/withlistval/withlistval-0.go
@@ -19,16 +19,16 @@ based on a compressed form of the schema.
 
 This package was generated by ygnmi version: (devel): (ygot: v0.23.0)
 using the following YANG input files:
-  - ../../pathgen/testdata/yang/openconfig-simple.yang
-  - ../../pathgen/testdata/yang/openconfig-withlistval.yang
-  - ../../pathgen/testdata/yang/openconfig-nested.yang
+  - ../pathgen/testdata/yang/openconfig-simple.yang
+  - ../pathgen/testdata/yang/openconfig-withlistval.yang
+  - ../pathgen/testdata/yang/openconfig-nested.yang
 
 Imported modules were sourced from:
 */
 package withlistval
 
 import (
-	oc "github.com/openconfig/ygnmi/internal/exampleoc"
+	oc "github.com/openconfig/ygnmi/exampleoc"
 	"github.com/openconfig/ygnmi/ygnmi"
 	"github.com/openconfig/ygot/ygot"
 	"github.com/openconfig/ygot/ytypes"

diff --git a/ygnmi/bench_test.go b/ygnmi/bench_test.go
@@ -20,8 +20,8 @@ import (
 	"io"
 	"testing"
 
-	"github.com/openconfig/ygnmi/internal/exampleoc"
-	"github.com/openconfig/ygnmi/internal/exampleoc/exampleocpath"
+	"github.com/openconfig/ygnmi/exampleoc"
+	"github.com/openconfig/ygnmi/exampleoc/exampleocpath"
 	"github.com/openconfig/ygnmi/internal/testutil"
 	"github.com/openconfig/ygnmi/ygnmi"
 	"google.golang.org/grpc"

diff --git a/ygnmi/example_test.go b/ygnmi/example_test.go
@@ -20,8 +20,8 @@ import (
 	"log"
 	"time"
 
-	"github.com/openconfig/ygnmi/internal/exampleoc"
-	"github.com/openconfig/ygnmi/internal/exampleoc/exampleocpath"
+	"github.com/openconfig/ygnmi/exampleoc"
+	"github.com/openconfig/ygnmi/exampleoc/exampleocpath"
 	"github.com/openconfig/ygnmi/ygnmi"
 	"github.com/openconfig/ygot/ygot"
 )

diff --git a/ygnmi/ygnmi_test.go b/ygnmi/ygnmi_test.go
@@ -23,8 +23,8 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/openconfig/gnmi/errdiff"
-	"github.com/openconfig/ygnmi/internal/exampleoc"
-	"github.com/openconfig/ygnmi/internal/exampleoc/exampleocpath"
+	"github.com/openconfig/ygnmi/exampleoc"
+	"github.com/openconfig/ygnmi/exampleoc/exampleocpath"
 	"github.com/openconfig/ygnmi/internal/testutil"
 	"github.com/openconfig/ygnmi/ygnmi"
 	"github.com/openconfig/ygot/util"