Transformer phase1

Makefile

@@ -107,15 +107,26 @@ cp $(TOPDIR)/ygot-modified-files/schema.go $(BUILD_GOPATH)/src/github.com/openco
 cp $(TOPDIR)/ygot-modified-files/unmarshal.go $(BUILD_GOPATH)/src/github.com/openconfig/ygot/ytypes/unmarshal.go; \
 cp $(TOPDIR)/ygot-modified-files/validate.go $(BUILD_GOPATH)/src/github.com/openconfig/ygot/ytypes/validate.go; \
 cp $(TOPDIR)/ygot-modified-files/reflect.go $(BUILD_GOPATH)/src/github.com/openconfig/ygot/ytypes/../util/reflect.go; \
-$(GO) install -v -gcflags "-N -l" $(BUILD_GOPATH)/src/github.com/openconfig/ygot/ygot
+cp $(TOPDIR)/goyang-modified-files/README.md $(BUILD_GOPATH)/src/github.com/openconfig/goyang/README.md; \
+cp $(TOPDIR)/goyang-modified-files/yang.go $(BUILD_GOPATH)/src/github.com/openconfig/goyang/yang.go; \
+cp $(TOPDIR)/goyang-modified-files/annotate.go $(BUILD_GOPATH)/src/github.com/openconfig/goyang/annotate.go; \
+cp $(TOPDIR)/goyang-modified-files/entry.go $(BUILD_GOPATH)/src/github.com/openconfig/goyang/pkg/yang/entry.go; \
+$(GO) install -v -gcflags "-N -l" $(BUILD_GOPATH)/src/github.com/openconfig/ygot/ygot; \
+$(GO) install -v -gcflags "-N -l" $(BUILD_GOPATH)/src/github.com/openconfig/goyang
 
 install:
 	$(INSTALL) -D $(REST_BIN) $(DESTDIR)/usr/sbin/rest_server
 	$(INSTALL) -D $(CERTGEN_BIN) $(DESTDIR)/usr/sbin/generate_cert
 	$(INSTALL) -d $(DESTDIR)/usr/sbin/schema/
 	$(INSTALL) -d $(DESTDIR)/usr/sbin/lib/
+	$(INSTALL) -d $(DESTDIR)/usr/models/yang/
 	$(INSTALL) -D $(TOPDIR)/src/cvl/schema/*.yin $(DESTDIR)/usr/sbin/schema/
 	$(INSTALL) -D $(TOPDIR)/src/cvl/testdata/schema/*.yin $(DESTDIR)/usr/sbin/schema/
+	$(INSTALL) -D $(TOPDIR)/src/cvl/schema/*.yang $(DESTDIR)/usr/models/yang/
+	$(INSTALL) -D $(TOPDIR)/models/yang/*.yang $(DESTDIR)/usr/models/yang/
+	$(INSTALL) -D $(TOPDIR)/config/transformer/models_list $(DESTDIR)/usr/models/yang/
+	$(INSTALL) -D $(TOPDIR)/models/yang/common/*.yang $(DESTDIR)/usr/models/yang/
+	$(INSTALL) -D $(TOPDIR)/models/yang/annotations/*.yang $(DESTDIR)/usr/models/yang/
 	cp -rf $(TOPDIR)/build/rest_server/dist/ui/ $(DESTDIR)/rest_ui/
 	cp -rf $(TOPDIR)/build/cli $(DESTDIR)/usr/sbin/
 	cp -rf $(TOPDIR)/build/swagger_client_py/ $(DESTDIR)/usr/sbin/lib/

config/transformer/models_list

@@ -0,0 +1,4 @@
+#List yang models transformer need to load
+
+openconfig-acl.yang
+openconfig-acl-annot.yang

goyang-modified-files/README.md

@@ -0,0 +1,50 @@
+# goyang
+YANG parser and compiler for Go programs.
+
+The yang package (pkg/yang) is used to convert a YANG schema into either an
+in memory abstract syntax trees (ast) or more fully resolved, in memory, "Entry"
+trees.  An Entry tree consists only of Entry structures and has had
+augmentation, imports, and includes all applied.
+
+goyang is a sample program that uses the yang (pkg/yang) package.
+
+goyang uses the yang package to create an in-memory tree representation of
+schemas defined in YANG and then dumps out the contents in several forms.
+The forms include:
+
+*  tree - a simple tree representation
+*  types - list understood types extracted from the schema
+*  annotate - a template file to annotate the yang modules
+
+The yang package, and the goyang program, are not complete and are a work in
+progress.
+
+For more complex output types, such as Go structs, and protobuf messages
+please use the [openconfig/ygot](https://github.com/openconfig/ygot) package,
+which uses this package as its backend.
+
+### Getting started
+
+To build goyang, ensure you have go language tools installed
+(available at [golang.org](https://golang.org/dl)) and that the `GOPATH`
+environment variable is set to your Go workspace.
+
+1. `go get github.com/openconfig/goyang`
+    * This will download goyang code and dependencies into the src
+subdirectory in your workspace.
+
+2. `cd <workspace>/src/github.com/openconfig/goyang`
+
+3. `go build`
+
+   * This will build the goyang binary and place it in the bin
+subdirectory in your workspace.
+
+### Contributing to goyang
+
+goyang is still a work-in-progress and we welcome contributions.  Please see
+the `CONTRIBUTING` file for information about how to contribute to the codebase.
+
+### Disclaimer
+
+This is not an official Google product.

goyang-modified-files/annotate.go

@@ -0,0 +1,143 @@
+// Copyright 2015 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+	"io"
+	"strings"
+
+	"github.com/openconfig/goyang/pkg/yang"
+)
+
+var allimports = make(map[string]string)
+var modules = make(map[string]*yang.Module)
+
+func init() {
+	register(&formatter{
+		name: "annotate",
+		f:     genAnnotate,
+		utilf: getFile,
+		help: "generate template file for yang annotations",
+	})
+}
+
+// Get the modules for which annotation file needs to be generated
+func getFile(files []string, mods map[string]*yang.Module) {
+    for _, name := range files {
+        slash := strings.Split(name, "/")
+        if strings.HasSuffix(name, ".yang") {
+            modname := slash[len(slash)-1]
+	    modname = strings.TrimSuffix(modname, ".yang");
+	    /* Save the yang.Module entries we are interested in */
+	    modules[modname] = mods[modname]
+        }
+    }
+}
+
+func genAnnotate(w io.Writer, entries []*yang.Entry) {
+    /* Get all the imported modules in the entries */
+    GetAllImports(entries)
+    for _, e := range entries {
+        if _, ok := modules[e.Name]; ok {
+            var path string = ""
+            generate(w, e, path)
+            // { Add closing brace for each module 
+            fmt.Fprintln(w, "}")
+            fmt.Fprintln(w)
+        }
+    }
+}
+
+// generate writes to stdoutput a template annotation file entry for the selected modules.
+func generate(w io.Writer, e *yang.Entry, path string) {
+    if e.Parent == nil {
+        if e.Name != "" {
+            fmt.Fprintf(w, "module %s-annot {\n", e.Name) //}
+            fmt.Fprintln(w)
+            fmt.Fprintf(w, "    yang-version \"%s\"\n", getYangVersion(e.Name, modules))
+            fmt.Fprintln(w)
+            fmt.Fprintf(w, "    namespace \"http://openconfig.net/yang/annotation\";\n")
+            if e.Prefix != nil {
+                fmt.Fprintf(w, "    prefix \"%s-annot\" \n", e.Prefix.Name)
+            }
+            fmt.Fprintln(w)
+
+	    var imports = make(map[string]string)
+            imports = getImportModules(e.Name, modules)
+	    for k := range imports {
+		if e.Name != k {
+                    fmt.Fprintf(w, "    import %s { prefix %s }\n", k, allimports[k])
+	        }
+            }
+
+            fmt.Fprintln(w)
+        }
+    }
+
+    name := e.Name
+    if e.Prefix != nil {
+	name = e.Prefix.Name + ":" + name
+    }
+
+    delim := ""
+    if path != "" {
+	delim = "/"
+    }
+    path = path + delim + name
+
+    fmt.Fprintf(w, "    deviation %s {\n", path)
+    fmt.Fprintf(w, "      deviate add {\n")
+    fmt.Fprintf(w, "      }\n")
+    fmt.Fprintf(w, "    }\n")
+    fmt.Fprintln(w)
+
+    var names []string
+    for k := range e.Dir {
+	names = append(names, k)
+    }
+
+    for _, k := range names {
+        generate(w, e.Dir[k], path)
+    }
+
+}
+
+// Save to map all imported modules
+func GetAllImports(entries []*yang.Entry) {
+    for _, e := range entries {
+        allimports[e.Name] = e.Prefix.Name
+    }
+}
+
+//Get Yang version from the yang.Modules
+func getYangVersion(modname string, mods map[string]*yang.Module) string {
+    if (mods[modname].YangVersion != nil) {
+	    return mods[modname].YangVersion.Name
+    }
+    return ""
+
+}
+
+// Get imported modules for a given module from yang.Module
+func getImportModules(modname string, mods map[string]*yang.Module) map[string]string {
+    imports := map[string]string{}
+    if (mods[modname].Import != nil) {
+        for _, imp := range mods[modname].Import {
+	    imports[imp.Name] = imp.Prefix.Name
+        }
+    }
+    return imports
+}