From 3fae844b7fa9fafba811a1eb58a9c558dbfedd72 Mon Sep 17 00:00:00 2001
From: Mahesh Jethanandani <mjethanandani@gmail.com>
Date: Tue, 5 Feb 2019 17:23:13 -0800
Subject: [PATCH] Fix for bug#132

---
 .jenkins.sh                                           | 2 +-
 example-data/nfv.xml                                  | 2 +-
 run-test.sh                                           | 2 +-
 src/yang/etsi-nfv-common.yang                         | 2 +-
 src/yang/{etsi-nfv.yang => etsi-nfv-descriptors.yang} | 4 ++--
 src/yang/etsi-nfv-ns.yang                             | 2 +-
 src/yang/etsi-nfv-pnf.yang                            | 2 +-
 src/yang/etsi-nfv-vnf.yang                            | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)
 rename src/yang/{etsi-nfv.yang => etsi-nfv-descriptors.yang} (86%)

diff --git a/.jenkins.sh b/.jenkins.sh
index 3193dce..2292aca 100644
--- a/.jenkins.sh
+++ b/.jenkins.sh
@@ -6,7 +6,7 @@
 # https://forge.etsi.org/etsi-software-license
 
 YANG_MODULES="yang/yang/*"
-OUTPUT="etsi-nfv.html"
+OUTPUT="etsi-nfv-descriptors.html"
 IMG_NAME="sol006"
 VERSION=latest
 IMG="$IMG_NAME:$VERSION"
diff --git a/example-data/nfv.xml b/example-data/nfv.xml
index 24ed998..fd415c0 100644
--- a/example-data/nfv.xml
+++ b/example-data/nfv.xml
@@ -1,4 +1,4 @@
-<nfv xmlns="urn:etsi:params:xml:ns:yang:etsi-nfv">
+<nfv xmlns="urn:etsi:nfv:yang:etsi-nfv-descriptors">
   <vnfd>
     <id>ASA</id>
     <provider>My Company</provider>
diff --git a/run-test.sh b/run-test.sh
index 36bc6ec..1360199 100755
--- a/run-test.sh
+++ b/run-test.sh
@@ -10,7 +10,7 @@ cd src
 echo "Testing compilation"
 CONFD_OPTS="--fail-on-warnings"
 CONFD_OPTS=""
-confdc -c $CONFD_OPTS -o /opt/confd/etc/confd/etsi-nfv.fxs etsi-nfv.yang
+confdc -c $CONFD_OPTS -o /opt/confd/etc/confd/etsi-nfv-descriptors.fxs etsi-nfv-descriptors.yang
 
 echo "Starting ConfD"
 confd
diff --git a/src/yang/etsi-nfv-common.yang b/src/yang/etsi-nfv-common.yang
index 9fc55dc..f2edb41 100644
--- a/src/yang/etsi-nfv-common.yang
+++ b/src/yang/etsi-nfv-common.yang
@@ -1,6 +1,6 @@
 submodule etsi-nfv-common {
   yang-version 1.1;
-  belongs-to etsi-nfv {
+  belongs-to etsi-nfv-descriptors {
     prefix nfv;
   }
   description
diff --git a/src/yang/etsi-nfv.yang b/src/yang/etsi-nfv-descriptors.yang
similarity index 86%
rename from src/yang/etsi-nfv.yang
rename to src/yang/etsi-nfv-descriptors.yang
index 96d0db1..d642129 100644
--- a/src/yang/etsi-nfv.yang
+++ b/src/yang/etsi-nfv-descriptors.yang
@@ -1,6 +1,6 @@
-module etsi-nfv {
+module etsi-nfv-descriptors {
   yang-version 1.1;
-  namespace "urn:etsi:params:xml:ns:yang:etsi-nfv";
+  namespace "urn:etsi:nfv:yang:etsi-nfv-descriptors";
   prefix nfv;
 
   include etsi-nfv-common;
diff --git a/src/yang/etsi-nfv-ns.yang b/src/yang/etsi-nfv-ns.yang
index 8e77ebe..ee44935 100644
--- a/src/yang/etsi-nfv-ns.yang
+++ b/src/yang/etsi-nfv-ns.yang
@@ -1,6 +1,6 @@
 submodule etsi-nfv-ns {
   yang-version 1.1;
-  belongs-to etsi-nfv {
+  belongs-to etsi-nfv-descriptors {
     prefix nfv;
   }
 
diff --git a/src/yang/etsi-nfv-pnf.yang b/src/yang/etsi-nfv-pnf.yang
index c7a8ff0..e4fb7d3 100644
--- a/src/yang/etsi-nfv-pnf.yang
+++ b/src/yang/etsi-nfv-pnf.yang
@@ -1,6 +1,6 @@
 submodule etsi-nfv-pnf {
   yang-version 1.1;
-  belongs-to etsi-nfv {
+  belongs-to etsi-nfv-descriptors {
     prefix nfv;
   }
 
diff --git a/src/yang/etsi-nfv-vnf.yang b/src/yang/etsi-nfv-vnf.yang
index ab3319e..db7b360 100755
--- a/src/yang/etsi-nfv-vnf.yang
+++ b/src/yang/etsi-nfv-vnf.yang
@@ -1,6 +1,6 @@
 submodule etsi-nfv-vnf {
   yang-version 1.1;
-  belongs-to etsi-nfv {
+  belongs-to etsi-nfv-descriptors {
     prefix nfv;
   }
 
-- 
GitLab