Commit 27a33fd7 authored by jethanandani's avatar jethanandani
Browse files

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

# Conflicts:
#   example-data/nfv-nsd.xml
parents 4444296c cf804034

example-data/complex-vnfd.xml

+6 −2
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

+6 −3
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

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

  <vnfd>

    <id>ASA</id>
@@ -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,7 +52,7 @@ 
      </checksum>

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

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

      <min-disk>20</min-disk>

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

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

      <size>1</size>

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

example-data/nfv-vnfd.xml

+6 −3
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,7 +51,7 @@ 
    </checksum>

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

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

    <min-disk>20</min-disk>

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

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

    <size>1</size>

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

example-data/nfv.xml

+11 −4
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>
@@ -181,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

+20 −6
Original line number Diff line number Diff line
@@ -233,22 +233,22 @@ 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 {
@@ -393,6 +393,19 @@ submodule etsi-nfv-common { 
    }

  }



  typedef external-lifecycle-management-script-event {

    type enumeration {

      enum "instantiation";

      enum "scaling";

      enum "healing";

      enum "termination";

      enum "vnf-flavour-change";

      enum "vnf-operation-change";

      enum "vnf-ext-conn-change";

      enum "vnfinfo-modification";

    }

  }



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

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

      key "type scope";
@@ -424,6 +437,7 @@ submodule etsi-nfv-common { 
        type identityref {

          base layer-protocol;

        }

	min-elements 1;

        description

          "Identifies the protocols that the VL uses (Ethernet,

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