Commit 3fae844b authored by Mahesh Jethanandani's avatar Mahesh Jethanandani
Browse files

Fix for bug#132

parent c04eafec

.jenkins.sh

+1 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ 
# https://forge.etsi.org/etsi-software-license

# https://forge.etsi.org/etsi-software-license





YANG_MODULES="yang/yang/*"

YANG_MODULES="yang/yang/*"

OUTPUT="etsi-nfv.html"

OUTPUT="etsi-nfv-descriptors.html"

IMG_NAME="sol006"

IMG_NAME="sol006"

VERSION=latest

VERSION=latest

IMG="$IMG_NAME:$VERSION"

IMG="$IMG_NAME:$VERSION"

example-data/nfv.xml

+1 −1
Original line number Original line Diff line number Diff line 
<nfv xmlns="urn:etsi:params:xml:ns:yang:etsi-nfv">

<nfv xmlns="urn:etsi:nfv:yang:etsi-nfv-descriptors">

  <vnfd>

  <vnfd>

    <id>ASA</id>

    <id>ASA</id>

    <provider>My Company</provider>

    <provider>My Company</provider>

run-test.sh

+1 −1
Original line number Original line Diff line number Diff line
@@ -10,7 +10,7 @@ cd src 
echo "Testing compilation"

echo "Testing compilation"

CONFD_OPTS="--fail-on-warnings"

CONFD_OPTS="--fail-on-warnings"

CONFD_OPTS=""

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"

echo "Starting ConfD"

confd

confd

src/yang/etsi-nfv-common.yang

+1 −1
Original line number Original line Diff line number Diff line 
submodule etsi-nfv-common {

submodule etsi-nfv-common {

  yang-version 1.1;

  yang-version 1.1;

  belongs-to etsi-nfv {

  belongs-to etsi-nfv-descriptors {

    prefix nfv;

    prefix nfv;

  }

  }

  description

  description

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

+2 −2
Original line number Original line Diff line number Diff line 
module etsi-nfv {

module etsi-nfv-descriptors {

  yang-version 1.1;

  yang-version 1.1;

  namespace "urn:etsi:params:xml:ns:yang:etsi-nfv";

  namespace "urn:etsi:nfv:yang:etsi-nfv-descriptors";

  prefix nfv;

  prefix nfv;





  include etsi-nfv-common;

  include etsi-nfv-common;