Merge pull request #152 from project-arlo/transformer-phase2

Include unique namespace, Use the prefix of the including module
project-arlo · Oct 3, 2019 · c1239f3 · c1239f3
2 parents 3446cf7 + f246081
commit c1239f3
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/goyang-modified-files/annotate.go b/goyang-modified-files/annotate.go
@@ -53,7 +53,8 @@ func genAnnotate(w io.Writer, entries []*yang.Entry) {
     for _, e := range entries {
         if _, ok := modules[e.Name]; ok {
             var path string = ""
-            generate(w, e, path)
+            var prefix string = ""
+            generate(w, e, path, prefix)
             // { Add closing brace for each module 
             fmt.Fprintln(w, "}")
             fmt.Fprintln(w)
@@ -62,14 +63,14 @@ func genAnnotate(w io.Writer, entries []*yang.Entry) {
 }
 
 // generate writes to stdoutput a template annotation file entry for the selected modules.
-func generate(w io.Writer, e *yang.Entry, path string) {
+func generate(w io.Writer, e *yang.Entry, path string, prefix 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")
+            fmt.Fprintf(w, "    namespace \"http://openconfig.net/yang/annotation/%s-annot\";\n", e.Prefix.Name)
             if e.Prefix != nil {
                 fmt.Fprintf(w, "    prefix \"%s-annot\";\n", e.Prefix.Name)
             }
@@ -90,9 +91,10 @@ func generate(w io.Writer, e *yang.Entry, path string) {
     }
 
     name := e.Name
-    if e.Prefix != nil {
-	name = e.Prefix.Name + ":" + name
+    if prefix == "" && e.Prefix != nil {
+	prefix = e.Prefix.Name
     }
+    name = prefix + ":" + name
 
     if (e.Node.Kind() != "module") {
         path = path + "/" + name
@@ -122,7 +124,7 @@ func generate(w io.Writer, e *yang.Entry, path string) {
     }
 
     for _, k := range names {
-        generate(w, e.Dir[k], path)
+        generate(w, e.Dir[k], path, prefix)
     }
 
 }