Merge branch 'bug#225' into 'master'

Fix for bug#225

See merge request !34

example-data/nfv.xml

@@ -36,7 +36,7 @@
     </virtual-compute-desc>
     <virtual-storage-descriptor>
       <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>
     </virtual-storage-descriptor>
     <sw-image-desc>
@@ -131,7 +131,7 @@
     </virtual-compute-desc>
     <virtual-storage-descriptor>
       <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>
     </virtual-storage-descriptor>
     <sw-image-desc>

src/yang/etsi-nfv-common.yang

@@ -216,7 +216,30 @@ submodule etsi-nfv-common {
     reference
       "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
    */

src/yang/etsi-nfv-vnf.yang

@@ -727,12 +727,10 @@ submodule etsi-nfv-vnf {
 
         leaf type-of-storage {
           // Needed to be able to onboard images
-          type enumeration {
-            enum "root";
-            enum "swap";
-            enum "ephemeral";
-          }
-          default "root";
+          default "root-storage";
+          type identityref {
+	    base storage-type;
+	  }
           description
             "Type of virtualised storage resource (e.g. volume,
              object).";