Commit 63d359ee authored by jethanandani's avatar jethanandani
Browse files

Merge branch 'dev-v2.8.1' into 'issue#1' 

# Conflicts:
#   example-data/complex-vnfd.xml
#   example-data/nfv-nsd.xml
#   example-data/nfv-vnfd.xml
parents e6af2d7a 6bf709ac

example-data/complex-vnfd.xml

+5 −1
Changes for example-data/complex-vnfd.xml: 5 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -80,8 +80,12 @@ 
    </virtual-compute-desc>

    <virtual-storage-desc>

      <id>root</id>

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

      <type-of-storage>block</type-of-storage>

      <block-storage-data>

	<size-of-storage>10</size-of-storage>

	<rdma-enabled>true</rdma-enabled>

	<sw-image-desc>CP</sw-image-desc>

      </block-storage-data>

    </virtual-storage-desc>

    <sw-image-desc>

      <id>CP</id>

example-data/nfv-nsd.xml

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

<?xml version="1.0" encoding="UTF-8"?>

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

  <vnfd>

    <id>ASA</id>

    <provider>My Company</provider>
@@ -36,8 +37,10 @@ 
    </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>

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

      <block-storage-data>

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

      </block-storage-data>

    </virtual-storage-desc>

    <sw-image-desc>

      <id>asa-image</id>
@@ -49,10 +52,10 @@ 
      </checksum>

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

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

      <min-disk>1</min-disk>

      <min-disk>0</min-disk>

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

      <size>1</size>

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

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

    </sw-image-desc>

    <ext-cpd>

      <id>inside</id>
@@ -133,4 +136,4 @@ 
      </ns-instantiation-level>

    </df>

  </nsd>

</nsd>
 
</nfv>

example-data/nfv-vnfd.xml

+6 −3
Changes for example-data/nfv-vnfd.xml: 6 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -35,8 +35,11 @@ 
  </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>

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

    <file-storage-data>

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

      <int-virtual-link-desc>asa-image</int-virtual-link-desc>

    </file-storage-data>

  </virtual-storage-desc>

  <sw-image-desc>

    <id>asa-image</id>
@@ -48,10 +51,10 @@ 
    </checksum>

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

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

    <min-disk>1</min-disk>

    <min-disk>0</min-disk>

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

    <size>1</size>

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

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

  </sw-image-desc>

  <ext-cpd>

    <id>inside</id>

example-data/nfv.xml

+46 −8
Changes for example-data/nfv.xml: 46 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -36,8 +36,12 @@ 
    </virtual-compute-desc>

    <virtual-storage-desc>

      <id>asa-vsd</id>

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

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

      <type-of-storage>block</type-of-storage>

      <block-storage-data>

	<size-of-storage>1</size-of-storage>

	<rdma-enabled>true</rdma-enabled>

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

      </block-storage-data>

    </virtual-storage-desc>

    <sw-image-desc>

      <id>asa-image</id>
@@ -54,12 +58,23 @@ 
      <size>1</size>

      <image>http://mycompany.images.com/asa.qcow2</image>

    </sw-image-desc>

    <int-virtual-link-desc>

      <id>inside-vl</id>

      <flavour>

	<id>1g</id>

	<qos>

	  <latency>1</latency>

	  <packet-delay-variation>1</packet-delay-variation>

	  <packet-loss-ratio>0.02</packet-loss-ratio>

	</qos>

      </flavour>

      <connectivity-type>

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

      </connectivity-type>

    </int-virtual-link-desc>

    <ext-cpd>

      <id>inside</id>

      <int-cpd>

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

	<cpd>inside</cpd>

      </int-cpd>

      <int-virtual-link-desc>inside-vl</int-virtual-link-desc>

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

    </ext-cpd>

    <ext-cpd>
@@ -85,6 +100,26 @@ 
        <min-number-of-instances>1</min-number-of-instances>

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

      </vdu-profile>

      <virtual-link-profile>

	<id>inside-vl</id>

	<flavour>1g</flavour>

	<max-bit-rate-requirements>

	  <root>10</root>

	</max-bit-rate-requirements>

	<min-bit-rate-requirements>

	  <root>1</root>

	</min-bit-rate-requirements>

	<virtual-link-protocol-data>

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

	  <l3-protocol-data>

	    <name>inside-network</name>

	    <ip-version>ipv4</ip-version>

	    <cidr>192.138.0.0/8</cidr>

	    <gateway-ip>192.138.0.1</gateway-ip>

	    <dhcp-enabled>true</dhcp-enabled>

	  </l3-protocol-data>

	</virtual-link-protocol-data>

      </virtual-link-profile>

      <instantiation-level>

        <id>double</id>

        <vdu-level>
@@ -150,8 +185,11 @@ 
    </virtual-compute-desc>

    <virtual-storage-desc>

      <id>csr-vsd</id>

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

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

      <type-of-storage>file</type-of-storage>

      <file-storage-data>

	<size-of-storage>1</size-of-storage>

	<int-virtual-link-desc>csr-image</int-virtual-link-desc>

      </file-storage-data>

    </virtual-storage-desc>

    <sw-image-desc>

      <id>csr-image</id>

src/yang/etsi-nfv-common.yang

+110 −9
Changes for src/yang/etsi-nfv-common.yang: 110 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -9,6 +9,14 @@ submodule etsi-nfv-common { 
  description

    "Common data types for ETSI data models.";



  revision 2019-10-01 {

    description

      "Version 2.7.1.



       Common data structures to support VNFD and NSD according to:

       ETSI GS NFV-IFA 014 Ed271v264

       ETSI GS NFV-IFA 011 Ed271v264";

  }

  revision 2019-04-25 {

    description

      "Initial revision
@@ -225,22 +233,115 @@ submodule etsi-nfv-common { 
      "Base type of storage that identities can derive from.";

  }



  identity root-storage {

  identity block {

    base storage-type;

    description

      "Root type of storage.";

      "Block type of storage.";

  }



  identity swap-storage {

  identity object {

    base storage-type;

    description

      "Swap type of storage.";

      "Object type of storage.";

  }



  identity ephemeral-storage {

  identity file {

    base storage-type;

    description

      "Ephemeral type of storage.";

      "File type of storage.";

  }



  identity forwarding-behaviour {

    description

      "Base identity for forwarding behaviour.";

  }



  identity all {

    base forwarding-behaviour;

    description

      "Traffic flows shall be forwarded simultaneously to all CP

       or SAP instances created from the referenced CP profile(s).";

  }



  identity lb {

    base forwarding-behaviour;

    description

      "Traffic flows shall be forwarded to one CP or SAP instance

       created from the referenced CP profile(s) selected based on

       a load-balancing algorithm.";

  }



  identity vip-function {

    description

      "Indicates the function the virtual IP address is used for.";

  }



  identity high-availability {

    base vip-function;

    description

      "High availability function.";

  }



  identity load-balancing {

    base vip-function;

    description

      "Load balancing function.";

  }



  identity vnic-type {

    description

      "Describes the type of the virtual network interface realizing

       the CPs instantiated from this CPD. This is used to determine

       which mechanism driver(s) to be used to bind the port. Value:

       • NORMAL

       • VIRTIO

       • DIRECT

       • BAREMETAL

       • VIRTIO-FORWARDER

       • DIRECT-PHYSICAL

       • SMART-NIC";

  }



  identity normal {

    base vnic-type;

    description

      "Normal NIC.";

  }



  identity virtio {

    base vnic-type;

    description

      "VirtIO NIC.";

  }



  identity direct {

    base vnic-type;

    description

      "Direct NIC type.";

  }



  identity bare-metal {

    base vnic-type;

    description

      "Bare metal NIC type.";

  }



  identity virtio-forwarder {

    base vnic-type;

    description

      "VirtIO Forwarder NIC type.";

  }



  identity direct-physical {

    base vnic-type;

    description

      "Direct physical NIC type.";

  }



  identity smart-nic {

    base vnic-type;

    description

      "SmartNIC or Smart NIC type.";

  }



  /*
@@ -307,8 +408,8 @@ submodule etsi-nfv-common { 


  grouping local-affinity-or-anti-affinity-rule {

    list local-affinity-or-anti-affinity-rule {

      key "affinity-type affinity-scope";

      leaf affinity-type {

      key "type scope";

      leaf type {

        type affinity-type;

        description

          "Specifies whether the rule is an affinity rule or an
@@ -318,7 +419,7 @@ submodule etsi-nfv-common { 
           LocalAffinityOrAntiAffinityRule information element.";

      }



      leaf affinity-scope {

      leaf scope {

        type affinity-scope;

        description

          "Specifies the scope of the rule, possible values are