Commit a8316c63 authored by jethanandani's avatar jethanandani
Browse files

Merge branch 'bug#237' into 'v2.7.1' 

Add vnic-type that was missing

See merge request !43
parents fb9620e7 f00f5749

example-data/complex-vnfd.xml

+4 −8
Original line number Original line Diff line number Diff line
@@ -78,11 +78,11 @@ 
        <num-virtual-cpu>16</num-virtual-cpu>

        <num-virtual-cpu>16</num-virtual-cpu>

      </virtual-cpu>

      </virtual-cpu>

    </virtual-compute-desc>

    </virtual-compute-desc>

    <virtual-storage-descriptor>

    <virtual-storage-desc>

      <id>root</id>

      <id>root</id>

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

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

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

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

    </virtual-storage-descriptor>

    </virtual-storage-desc>

    <sw-image-desc>

    <sw-image-desc>

      <id>CP</id>

      <id>CP</id>

      <name>CP</name>

      <name>CP</name>
@@ -116,17 +116,13 @@ 
    <int-virtual-link-desc>

    <int-virtual-link-desc>

      <id>internal-vl</id>

      <id>internal-vl</id>

      <connectivity-type>

      <connectivity-type>

        <layer-protocol>

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

          <protocol>ipv4</protocol>

        </layer-protocol>

      </connectivity-type>

      </connectivity-type>

    </int-virtual-link-desc>

    </int-virtual-link-desc>

    <int-virtual-link-desc>

    <int-virtual-link-desc>

      <id>mgmt</id>

      <id>mgmt</id>

      <connectivity-type>

      <connectivity-type>

        <layer-protocol>

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

          <protocol>ipv4</protocol>

        </layer-protocol>

      </connectivity-type>

      </connectivity-type>

    </int-virtual-link-desc>

    </int-virtual-link-desc>

    <ext-cpd>

    <ext-cpd>

example-data/nfv-nsd.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -49,6 +49,7 @@ 
      </checksum>

      </checksum>

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

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

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

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

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

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

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

      <size>1</size>

      <size>1</size>

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

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

example-data/nfv-vnfd.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -48,6 +48,7 @@ 
    </checksum>

    </checksum>

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

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

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

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

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

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

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

    <size>1</size>

    <size>1</size>

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

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

src/yang/etsi-nfv-common.yang

+56 −0
Original line number Original line Diff line number Diff line
@@ -243,6 +243,62 @@ submodule etsi-nfv-common { 
      "Ephemeral type of storage.";

      "Ephemeral type of storage.";

  }

  }





  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.";

  }



  /*

  /*

   * Typedefs

   * Typedefs

   */

   */

src/yang/etsi-nfv-vnf.yang

+22 −1
Original line number Original line Diff line number Diff line
@@ -273,7 +273,7 @@ submodule etsi-nfv-vnf { 
             VirtualNetworkInterfaceRequirements information element";

             VirtualNetworkInterfaceRequirements information element";

        }

        }





        leaf-list order {

        leaf order {

          type uint32;

          type uint32;

          description

          description

            "The order of the NIC to be assigned on the compute

            "The order of the NIC to be assigned on the compute
@@ -292,6 +292,27 @@ submodule etsi-nfv-vnf { 
            "GS NFV IFA011: Section 7.1.6.4, VduCpd information

            "GS NFV IFA011: Section 7.1.6.4, VduCpd information

             element.";

             element.";

        }

        }



        leaf vnic-type {

	  type identityref {

	    base 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";

          reference

            "GS NFV IFA011: Section 7.1.6.4, VduCpd information

             element.";

        }

        uses cpd;

        uses cpd;





        leaf security-group-rule-id {

        leaf security-group-rule-id {