Merge branch 'bug#132' into 'master'

Proposed fix for Bug#132

See merge request !18

.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"

example-data/nfv.xml

-<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>

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

src/yang/etsi-nfv-common.yang

 submodule etsi-nfv-common {
   yang-version 1.1;
-  belongs-to etsi-nfv {
+  belongs-to etsi-nfv-descriptors {
     prefix nfv;
   }
   description

src/yang/etsi-nfv.yang → src/yang/etsi-nfv-descriptors.yang

-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;

src/yang/etsi-nfv-ns.yang

 submodule etsi-nfv-ns {
   yang-version 1.1;
-  belongs-to etsi-nfv {
+  belongs-to etsi-nfv-descriptors {
     prefix nfv;
   }
 

src/yang/etsi-nfv-pnf.yang

 submodule etsi-nfv-pnf {
   yang-version 1.1;
-  belongs-to etsi-nfv {
+  belongs-to etsi-nfv-descriptors {
     prefix nfv;
   }
 

src/yang/etsi-nfv-vnf.yang

 submodule etsi-nfv-vnf {
   yang-version 1.1;
-  belongs-to etsi-nfv {
+  belongs-to etsi-nfv-descriptors {
     prefix nfv;
   }