Commit aec728bd authored by jethanandani's avatar jethanandani
Browse files

Merge branch 'master' into 'bug#186' 

# Conflicts:
#   src/yang/etsi-nfv-vnf.yang
parents d84e3787 ff2f13fa

.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

+37 −5
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>
@@ -48,14 +48,26 @@ 
    </sw-image-desc>

    </sw-image-desc>

    <ext-cpd>

    <ext-cpd>

      <id>inside</id>

      <id>inside</id>

      <int-cpd>

	<vdu-id>firewall</vdu-id>

	<cpd>inside</cpd>

      </int-cpd>

      <layer-protocol>Ethernet</layer-protocol>

      <layer-protocol>Ethernet</layer-protocol>

    </ext-cpd>

    </ext-cpd>

    <ext-cpd>

    <ext-cpd>

      <id>management</id>

      <id>management</id>

      <int-cpd>

	<vdu-id>firewall</vdu-id>

	<cpd>management</cpd>

      </int-cpd>

      <layer-protocol>Ethernet</layer-protocol>

      <layer-protocol>Ethernet</layer-protocol>

    </ext-cpd>

    </ext-cpd>

    <ext-cpd>

    <ext-cpd>

      <id>outside</id>

      <id>outside</id>

      <int-cpd>

	<vdu-id>firewall</vdu-id>

	<cpd>outside</cpd>

      </int-cpd>

      <layer-protocol>Ethernet</layer-protocol>

      <layer-protocol>Ethernet</layer-protocol>

    </ext-cpd>

    </ext-cpd>

    <df>

    <df>
@@ -131,14 +143,26 @@ 
    </sw-image-desc>

    </sw-image-desc>

    <ext-cpd>

    <ext-cpd>

      <id>left</id>

      <id>left</id>

      <int-cpd>

	<vdu-id>router</vdu-id>

	<cpd>left</cpd>

      </int-cpd>

      <layer-protocol>Ethernet</layer-protocol>

      <layer-protocol>Ethernet</layer-protocol>

    </ext-cpd>

    </ext-cpd>

    <ext-cpd>

    <ext-cpd>

      <id>management</id>

      <id>management</id>

      <int-cpd>

	<vdu-id>router</vdu-id>

	<cpd>management</cpd>

      </int-cpd>

      <layer-protocol>Ethernet</layer-protocol>

      <layer-protocol>Ethernet</layer-protocol>

    </ext-cpd>

    </ext-cpd>

    <ext-cpd>

    <ext-cpd>

      <id>right</id>

      <id>right</id>

      <int-cpd>

	<vdu-id>router</vdu-id>

	<cpd>right</cpd>

      </int-cpd>

      <layer-protocol>Ethernet</layer-protocol>

      <layer-protocol>Ethernet</layer-protocol>

    </ext-cpd>

    </ext-cpd>

    <df>

    <df>
@@ -218,7 +242,9 @@ 
    <virtual-link-desc>

    <virtual-link-desc>

      <id>fw2dpi</id>

      <id>fw2dpi</id>

      <connectivity-type>

      <connectivity-type>

        <layer-protocol>Ethernet</layer-protocol>

        <layer-protocol>

	  <protocol>Ethernet</protocol>

	</layer-protocol>

      </connectivity-type>

      </connectivity-type>

      <df>

      <df>

        <id>normal</id>

        <id>normal</id>
@@ -231,7 +257,9 @@ 
    <virtual-link-desc>

    <virtual-link-desc>

      <id>mgmt</id>

      <id>mgmt</id>

      <connectivity-type>

      <connectivity-type>

        <layer-protocol>IPv4</layer-protocol>

        <layer-protocol>

	  <protocol>IPv4</protocol>

	</layer-protocol>

      </connectivity-type>

      </connectivity-type>

      <df>

      <df>

        <id>normal</id>

        <id>normal</id>
@@ -244,7 +272,9 @@ 
    <virtual-link-desc>

    <virtual-link-desc>

      <id>r2fw</id>

      <id>r2fw</id>

      <connectivity-type>

      <connectivity-type>

        <layer-protocol>Ethernet</layer-protocol>

        <layer-protocol>

	  <protocol>Ethernet</protocol>

	</layer-protocol>

      </connectivity-type>

      </connectivity-type>

      <df>

      <df>

        <id>normal</id>

        <id>normal</id>
@@ -467,7 +497,9 @@ 
    <virtual-link-desc>

    <virtual-link-desc>

      <id>r2fw</id>

      <id>r2fw</id>

      <connectivity-type>

      <connectivity-type>

        <layer-protocol>IPv4</layer-protocol>

        <layer-protocol>

	  <protocol>IPv4</protocol>

	</layer-protocol>

      </connectivity-type>

      </connectivity-type>

      <df>

      <df>

        <id>r2fw</id>

        <id>r2fw</id>

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

+57 −11
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

    "Common data types for ETSI data models.";

    "Common data types for ETSI data models.";





  revision 2018-06-19 {

  revision 2019-03-18 {

    description

    description

      "Initial revision

      "Initial revision





       Common data structures to support VNFD and NSD according to:

       Common data structures to support VNFD and NSD according to:

       ETSI GS NFV-IFA 014 Ed251v244

       ETSI GS NFV-IFA 014 Ed261v252

       ETSI GS NFV-IFA 011 Ed251v243";

       ETSI GS NFV-IFA 011 Ed261v254";

  }

  }





  /*

  /*
@@ -177,6 +177,46 @@ submodule etsi-nfv-common { 
    base cp-role;

    base cp-role;

  }

  }





  identity checksum-algorithm {

    description

      "Identifies the algorithms supported for the purpose of

       calculating the checksum.";

    reference

      "GS NFV IFA011: Section 7.1.6.10 Checksum information element.";

  }



  identity sha-224 {

    base checksum-algorithm;

    description

      "SHA-224.";

    reference

      "GS NFV IFA011: Section 7.1.6.10 Checksum information element.";

  }



  identity sha-256 {

    base checksum-algorithm;

    description

      "SHA-256.";

    reference

      "GS NFV IFA011: Section 7.1.6.10 Checksum information element.";

  }



  identity sha-384 {

    base checksum-algorithm;

    description

      "SHA-384.";

    reference

      "GS NFV IFA011: Section 7.1.6.10 Checksum information element.";

  }



  identity sha-512 {

    base checksum-algorithm;

    description

      "SHA-512.";

    reference

      "GS NFV IFA011: Section 7.1.6.10 Checksum information element.";

  }

      

  /*

  /*

   * Typedefs

   * Typedefs

   */

   */
@@ -253,14 +293,20 @@ submodule etsi-nfv-common { 




  grouping connectivity-type {

  grouping connectivity-type {

    container connectivity-type {

    container connectivity-type {

      leaf layer-protocol {

      list layer-protocol {

        mandatory true;

	key "protocol";



	leaf protocol {

          type identityref {

          type identityref {

            base layer-protocol;

            base layer-protocol;

          }

          }

	}

        description

        description

          "Identifies the protocol this VL gives access to (Ethernet,

          "Identifies the protocols that the VL uses (Ethernet,

           MPLS, ODU2, IPV4, IPV6, Pseudo-Wire).";

           MPLS, ODU2, IPV4, IPV6, Pseudo-Wire). The top layer

           protocol of the VL protocol stack shall always be provided.

           The lower layer protocols may be included when there are

           specific requirements on these layers.";

        reference

        reference

          "GS NFV IFA011: Section 7.1.7.3, ConnectivityType

          "GS NFV IFA011: Section 7.1.7.3, ConnectivityType

           information element.";

           information element.";

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

+5 −5
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;
@@ -14,11 +14,11 @@ module etsi-nfv { 
  description

  description

    "Network Function Virtualization Descriptors";

    "Network Function Virtualization Descriptors";





  revision 2018-06-13 {

  revision 2019-03-18 {

    description

    description

      "Initial revision.

      "Initial revision.

       NSD and PNFD according to ETSI GS NFV-IFA 014 Ed251v244

       NSD and PNFD according to ETSI GS NFV-IFA 014 Ed261v252

       VNFD according to ETSI GS NFV-IFA 011 Ed251v243";

       VNFD according to ETSI GS NFV-IFA 011 Ed261v254";

  }

  }





  container nfv {

  container nfv {