Commit ffd1ff0f authored by jethanandani's avatar jethanandani
Browse files

Merge branch 'bug#225' into 'master' 

Fix for bug#225

See merge request !34
parents cb62bb4c 99084012

example-data/nfv.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ 
    </virtual-compute-desc>

    </virtual-compute-desc>

    <virtual-storage-descriptor>

    <virtual-storage-descriptor>

      <id>asa-vsd</id>

      <id>asa-vsd</id>

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

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

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

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

    </virtual-storage-descriptor>

    </virtual-storage-descriptor>

    <sw-image-desc>

    <sw-image-desc>
@@ -131,7 +131,7 @@ 
    </virtual-compute-desc>

    </virtual-compute-desc>

    <virtual-storage-descriptor>

    <virtual-storage-descriptor>

      <id>csr-vsd</id>

      <id>csr-vsd</id>

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

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

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

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

    </virtual-storage-descriptor>

    </virtual-storage-descriptor>

    <sw-image-desc>

    <sw-image-desc>

src/yang/etsi-nfv-common.yang

+24 −1
Original line number Original line Diff line number Diff line
@@ -217,6 +217,29 @@ submodule etsi-nfv-common { 
      "GS NFV IFA011: Section 7.1.6.10 Checksum information element.";

      "GS NFV IFA011: Section 7.1.6.10 Checksum information element.";

  }

  }





  identity storage-type {

    description

      "Base type of storage that identities can derive from.";

  }



  identity root-storage {

    base storage-type;

    description

      "Root type of storage.";

  }



  identity swap-storage {

    base storage-type;

    description

      "Swap type of storage.";

  }



  identity ephemeral-storage {

    base storage-type;

    description

      "Ephemeral type of storage.";

  }

  

  /*

  /*

   * Typedefs

   * Typedefs

   */

   */

src/yang/etsi-nfv-vnf.yang

+4 −6
Original line number Original line Diff line number Diff line
@@ -727,12 +727,10 @@ submodule etsi-nfv-vnf { 




        leaf type-of-storage {

        leaf type-of-storage {

          // Needed to be able to onboard images

          // Needed to be able to onboard images

          type enumeration {

          default "root-storage";

            enum "root";

          type identityref {

            enum "swap";

	    base storage-type;

            enum "ephemeral";

	  }

	  }

          default "root";

          description

          description

            "Type of virtualised storage resource (e.g. volume,

            "Type of virtualised storage resource (e.g. volume,

             object).";

             object).";