Bug#227 NFVSOL(18)000772 Comment 1

jethanandanirequested to merge
bug#227 into master

This commit is to split the VNF package module from the NSD module.

Edited by jethanandani

Merge request reports

example-data/nfv-nsd.xml

0 → 100644
+135 −0
Changes for example-data/nfv-nsd.xml: 135 added lines, 0 removed lines.
Original line number Diff line number Diff line 
<nsd xmlns="urn:etsi:nfv:yang:etsi-nfv-nsd">

  <vnfd>

    <id>ASA</id>

    <provider>My Company</provider>

    <product-name>My Company ASAv</product-name>

    <software-version>9.8</software-version>

    <version>9.8</version>

    <vnfm-info>My Company Vnfm</vnfm-info>

    <vdu>

      <id>firewall</id>

      <name>Firewall VDU</name>

      <int-cpd>

        <id>inside</id>

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

      </int-cpd>

      <int-cpd>

        <id>management</id>

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

      </int-cpd>

      <int-cpd>

        <id>outside</id>

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

      </int-cpd>

      <virtual-compute-desc>asa-vcd</virtual-compute-desc>

      <virtual-storage-desc>asa-vsd</virtual-storage-desc>

      <sw-image-desc>asa-image</sw-image-desc>

    </vdu>

    <virtual-compute-desc>

      <id>asa-vcd</id>

      <virtual-memory>

        <size>4.0</size>

      </virtual-memory>

      <virtual-cpu>

        <num-virtual-cpu>2</num-virtual-cpu>

      </virtual-cpu>

    </virtual-compute-desc>

    <virtual-storage-desc>

      <id>asa-vsd</id>

    <type-of-storage xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:root-storage</type-of-storage>

      <size-of-storage>0</size-of-storage>

    </virtual-storage-desc>

    <sw-image-desc>

      <id>asa-image</id>

      <name>ASA image</name>

      <version>1.1</version>

      <checksum>

	<algorithm xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:sha-224</algorithm>

	<hash>deadbeef</hash>

      </checksum>

      <container-format>bare</container-format>

      <disk-format>qcow2</disk-format>

      <min-ram>2.0</min-ram>

      <size>1</size>

      <image>http://www.cisco.com/asa.qcow2</image>

    </sw-image-desc>

    <ext-cpd>

      <id>inside</id>

      <int-cpd>

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

	<cpd>inside</cpd>

      </int-cpd>

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

    </ext-cpd>

    <ext-cpd>

      <id>management</id>

      <int-cpd>

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

	<cpd>management</cpd>

      </int-cpd>

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

    </ext-cpd>

    <ext-cpd>

      <id>outside</id>

      <int-cpd>

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

	<cpd>outside</cpd>

      </int-cpd>

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

    </ext-cpd>

    <df>

      <id>normal</id>

      <vdu-profile>

        <id>firewall</id>

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

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

      </vdu-profile>

      <instantiation-level>

        <id>double</id>

        <vdu-level>

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

          <number-of-instances>2</number-of-instances>

        </vdu-level>

      </instantiation-level>

      <instantiation-level>

        <id>single</id>

        <vdu-level>

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

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

        </vdu-level>

      </instantiation-level>

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

    </df>

  </vnfd>

  <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
Changes for example-data/nfv-pnfd.xml: 8 added lines, 0 removed lines.
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-vnfd.xml

0 → 100644
+90 −0
Changes for example-data/nfv-vnfd.xml: 90 added lines, 0 removed lines.
Original line number Diff line number Diff line 
<vnfd xmlns="urn:etsi:nfv:yang:etsi-nfv-vnfd">

  <id>ASA</id>

  <provider>My Company</provider>

  <product-name>My Company ASAv</product-name>

  <software-version>9.8</software-version>

  <version>9.8</version>

  <vnfm-info>My Company Vnfm</vnfm-info>

  <vdu>

    <id>firewall</id>

    <name>Firewall VDU</name>

    <int-cpd>

      <id>inside</id>

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

    </int-cpd>

    <int-cpd>

      <id>management</id>

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

    </int-cpd>

    <int-cpd>

      <id>outside</id>

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

    </int-cpd>

    <virtual-compute-desc>asa-vcd</virtual-compute-desc>

    <virtual-storage-desc>asa-vsd</virtual-storage-desc>

    <sw-image-desc>asa-image</sw-image-desc>

  </vdu>

  <virtual-compute-desc>

    <id>asa-vcd</id>

    <virtual-memory>

      <size>4.0</size>

    </virtual-memory>

    <virtual-cpu>

      <num-virtual-cpu>2</num-virtual-cpu>

    </virtual-cpu>

  </virtual-compute-desc>

  <virtual-storage-desc>

    <id>asa-vsd</id>

    <type-of-storage xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:root-storage</type-of-storage>

    <size-of-storage>0</size-of-storage>

  </virtual-storage-desc>

  <sw-image-desc>

    <id>asa-image</id>

    <name>ASA image</name>

    <version>1.1</version>

    <checksum>

      <algorithm xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:sha-224</algorithm>

      <hash>deadbeef</hash>

    </checksum>

    <container-format>bare</container-format>

    <disk-format>qcow2</disk-format>

    <min-ram>2.0</min-ram>

    <size>1</size>

    <image>http://www.cisco.com/asa.qcow2</image>

  </sw-image-desc>

  <ext-cpd>

    <id>inside</id>

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

  </ext-cpd>

  <ext-cpd>

    <id>management</id>

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

  </ext-cpd>

  <ext-cpd>

    <id>outside</id>

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

  </ext-cpd>

  <df>

    <id>normal</id>

    <vdu-profile>

      <id>firewall</id>

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

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

    </vdu-profile>

    <instantiation-level>

      <id>double</id>

      <vdu-level>

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

        <number-of-instances>2</number-of-instances>

      </vdu-level>

    </instantiation-level>

    <instantiation-level>

      <id>single</id>

      <vdu-level>

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

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

      </vdu-level>

    </instantiation-level>

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

  </df>

</vnfd>

example-data/nfv.xml

+8 −16
Changes for example-data/nfv.xml: 8 added lines, 16 removed lines.
Original line number Diff line number Diff line
@@ -34,11 +34,11 @@ 
        <num-virtual-cpu>2</num-virtual-cpu>

      </virtual-cpu>

    </virtual-compute-desc>

    <virtual-storage-descriptor>

    <virtual-storage-desc>

      <id>asa-vsd</id>

      <type-of-storage>root-storage</type-of-storage>

      <size-of-storage>0</size-of-storage>

    </virtual-storage-descriptor>

    </virtual-storage-desc>

    <sw-image-desc>

      <id>asa-image</id>

      <name>ASA image</name>
@@ -148,11 +148,11 @@ 
        <num-virtual-cpu>2</num-virtual-cpu>

      </virtual-cpu>

    </virtual-compute-desc>

    <virtual-storage-descriptor>

    <virtual-storage-desc>

      <id>csr-vsd</id>

      <type-of-storage>root-storage</type-of-storage>

      <size-of-storage>0</size-of-storage>

    </virtual-storage-descriptor>

    </virtual-storage-desc>

    <sw-image-desc>

      <id>csr-image</id>

      <name>CSR image</name>
@@ -280,9 +280,7 @@ 
    <virtual-link-desc>

      <id>fw2dpi</id>

      <connectivity-type>

        <layer-protocol>

	  <protocol>ethernet</protocol>

	</layer-protocol>

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

      </connectivity-type>

      <df>

        <id>normal</id>
@@ -295,9 +293,7 @@ 
    <virtual-link-desc>

      <id>mgmt</id>

      <connectivity-type>

        <layer-protocol>

	  <protocol>ipv4</protocol>

	</layer-protocol>

        <layer-protocol>ipv4</layer-protocol>

      </connectivity-type>

      <df>

        <id>normal</id>
@@ -310,9 +306,7 @@ 
    <virtual-link-desc>

      <id>r2fw</id>

      <connectivity-type>

        <layer-protocol>

	  <protocol>ethernet</protocol>

	</layer-protocol>

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

      </connectivity-type>

      <df>

        <id>normal</id>
@@ -535,9 +529,7 @@ 
    <virtual-link-desc>

      <id>r2fw</id>

      <connectivity-type>

        <layer-protocol>

	  <protocol>ipv4</protocol>

	</layer-protocol>

        <layer-protocol>ipv4</layer-protocol>

      </connectivity-type>

      <df>

        <id>r2fw</id>

src/yang/etsi-nfv-common.yang

+5 −17
Changes for src/yang/etsi-nfv-common.yang: 5 added lines, 17 removed lines.
Original line number Diff line number Diff line
@@ -3,10 +3,13 @@ submodule etsi-nfv-common { 
  belongs-to etsi-nfv-descriptors {

    prefix nfv;

  }

  organization

    "European Telecommunications Standards Institute (ETSI)";



  description

    "Common data types for ETSI data models.";



  revision 2019-03-18 {

  revision 2019-04-25 {

    description

      "Initial revision
@@ -316,14 +319,10 @@ submodule etsi-nfv-common { 


  grouping connectivity-type {

    container connectivity-type {

      list layer-protocol {

	key "protocol";



	leaf protocol {

      leaf-list layer-protocol {

        type identityref {

          base layer-protocol;

        }

	}

        description

          "Identifies the protocols that the VL uses (Ethernet,

           MPLS, ODU2, IPV4, IPV6, Pseudo-Wire). The top layer
@@ -634,17 +633,6 @@ submodule etsi-nfv-common { 
      reference

        "GS NFV IFA011: Section 7.1.6.3 Cpd information element";

    }



    leaf security-group-rule-id {

      type leafref {

        path "/nfv/vnfd/security-group-rule/id";

      }

      description

        "Reference of the security group rules bound to this

         CPD.";

      reference

        "GS NFV IFA011: Section 7.1.6.3 Cpd information element";

    }

  }



  grouping security-group-rule {