Commit ffa3a5cd authored by Mahesh Jethanandani's avatar Mahesh Jethanandani
Browse files

Added module and test cases for PNFD and NSD

parent ad98fe5e

example-data/nfv-nsd.xml

0 → 100644
+33 −0
Original line number Diff line number Diff line 
<nsd xmlns="urn:etsi:nfv:yang:etsi-nfv-nsd">

    <nsd>

      <id>firewall-nsd</id>

      <vnfd-id>ASA</vnfd-id>

      <sapd>

	<id>inside</id>

      </sapd>

      <sapd>

	<id>management</id>

      </sapd>

      <sapd>

	<id>outside</id>

      </sapd>

      <df>

	<id>firewall</id>

	<vnf-profile>

          <id>firewall</id>

          <vnfd-id>ASA</vnfd-id>

          <flavour-id>normal</flavour-id>

          <instantiation-level>single</instantiation-level>

          <min-number-of-instances>1</min-number-of-instances>

          <max-number-of-instances>1</max-number-of-instances>

	</vnf-profile>

	<ns-instantiation-level>

          <id>single</id>

          <vnf-to-level-mapping>

            <vnf-profile-id>firewall</vnf-profile-id>

            <number-of-instances>1</number-of-instances>

          </vnf-to-level-mapping>

	</ns-instantiation-level>

      </df>

    </nsd>

</nsd>

example-data/nfv-pnfd.xml

0 → 100644
+8 −0
Original line number Diff line number Diff line 
<pnfd xmlns="urn:etsi:nfv:yang:etsi-nfv-pnfd">

  <id>physical-dpi</id>

  <version>1.0</version>

  <ext-cpd>

    <id>outside</id>

      <layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>

  </ext-cpd>

</pnfd>

example-data/nfv.xml

+12 −12
Original line number Diff line number Diff line 
<nfv xmlns="urn:etsi:nfv:yang:etsi-nfv-descriptors">

  <vnfds>

  <vnfd>

    <id>ASA</id>

    <provider>My Company</provider>

    <product-name>My Company ASAv</product-name>
@@ -100,8 +100,8 @@ 
      </instantiation-level>

      <default-instantiation-level>single</default-instantiation-level>

    </df>

  </vnfds>

  <vnfds>

  </vnfd>

  <vnfd>

    <id>CSR</id>

    <provider>My Company</provider>

    <product-name>My Company CSR 1000v</product-name>
@@ -202,8 +202,8 @@ 
      </instantiation-level>

      <default-instantiation-level>single</default-instantiation-level>

    </df>

  </vnfds>

  <nsds>

  </vnfd>

  <nsd>

    <id>firewall-nsd</id>

    <vnfd-id>ASA</vnfd-id>

    <sapd>
@@ -233,8 +233,8 @@ 
        </vnf-to-level-mapping>

      </ns-instantiation-level>

    </df>

  </nsds>

  <nsds>

  </nsd>

  <nsd>

    <id>service-chain-1</id>

    <vnfd-id>ASA</vnfd-id>

    <vnfd-id>CSR</vnfd-id>
@@ -483,8 +483,8 @@ 
        </vnf-to-level-mapping>

      </ns-instantiation-level>

    </df>

  </nsds>

  <nsds>

  </nsd>

  <nsd>

    <id>service-chain-2</id>

    <nested-nsd-id>firewall-nsd</nested-nsd-id>

    <vnfd-id>CSR</vnfd-id>
@@ -570,13 +570,13 @@ 
        </virtual-link-connectivity>

      </ns-profile>

    </df>

  </nsds>

  <pnfds>

  </nsd>

  <pnfd>

    <id>physical-dpi</id>

    <version>1.0</version>

    <ext-cpd>

      <id>outside</id>

      <layer-protocol>ethernet</layer-protocol>

    </ext-cpd>

  </pnfds>

  </pnfd>

</nfv>

run-test.sh

+12 −2
Original line number Diff line number Diff line
@@ -10,17 +10,27 @@ cd src 
CONFD_OPTS="--fail-on-warnings"

CONFD_OPTS=""



echo "Testing compilations of pkg."

echo "Testing compilations of VNFD."

confdc -c $CONFD_OPTS -o /opt/confd/etc/confd/etsi-nfv-vnfd.fxs etsi-nfv-vnfd.yang

echo "Testing compilations of PNFD."

confdc -c $CONFD_OPTS -o /opt/confd/etc/confd/etsi-nfv-pnfd.fxs etsi-nfv-pnfd.yang

echo "Testing compilations of NSD."

confdc -c $CONFD_OPTS -o /opt/confd/etc/confd/etsi-nfv-nsd.fxs etsi-nfv-nsd.yang

echo "Testing compilations of descriptors."

confdc -c $CONFD_OPTS -o /opt/confd/etc/confd/etsi-nfv-descriptors.fxs etsi-nfv-descriptors.yang



echo "Starting ConfD"

confd



echo "Loading Data for pkg"

echo "Loading Data for VNFD"

confd_load -l -m nfv-vnfd.xml



echo "Loading Data for PNFD"

confd_load -l -m nfv-pnfd.xml



echo "Loading Data for NSD"

confd_load -l -m nfv-nsd.xml



echo "Loading Data for descriptors"

confd_load -l -m nfv.xml

src/yang/etsi-nfv-common.yang

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ submodule etsi-nfv-common { 
  description

    "Common data types for ETSI data models.";



  revision 2019-03-18 {

  revision 2019-04-25 {

    description

      "Initial revision