NFVSOL(18)000323 SOL006 VDU data model

Added a Editor's node based on comments received during SOL#69

Change-Id: I8411af9c6fa032a748f904d72aace7b6a456ceac

src/yang/etsi-nfv-vnf.yang

@@ -476,12 +476,27 @@ submodule etsi-nfv-vnf {
         }
         list boot-order {
           ordered-by user;
-          key "virtual-storage-desc";
-          leaf virtual-storage-desc {
+          key "key";
+          leaf key {
+            type uint32;
+          }
+          leaf value {
             type leafref {
               path "../../nfv:virtual-storage-desc";
             }
           }
+          description
+            "The key indicates the boot index (lowest index defines
+             highest boot priority). The Value references a descriptor
+             from which a valid boot device is created e.g.
+             VirtualStorageDesc from which a VirtualStorage instance
+             is created.
+
+             Editor's note: The boot-order node requires further
+             study.";
+          reference
+            "GS NFV IFA011: Section 7.1.6.2, Vdu information
+             element.";
         }
         leaf sw-image-desc {
           type leafref {
@@ -517,22 +532,14 @@ submodule etsi-nfv-vnf {
           }
           uses common:monitoring-parameter;
         }
-        container configurable-properties {
-          description
-            "Describes the configurable properties of all VNFC
-             instances based on this VDU.";
-          reference
-            "GS NFV IFA011: Section 7.1.6.2, VDU Information
-             element.";
-          leaf auto-scalable {
-            type boolean;
-          }
-          leaf auto-healable {
-            type boolean;
+        list configurable-properties {
+          key "key";
+          leaf key {
+            type string;
           }
-
-          leaf additional-configurable-property {
+          leaf value {
             type string;
+          }
           description
             "It provides VNFC configurable properties that can be
              modified using the ModifyVnfInfo operation.";
@@ -540,6 +547,23 @@ submodule etsi-nfv-vnf {
             "GS NFV IFA011: Section 7.1.6.7,
              VnfcConfigurableProperties Information element.";
         }
+        list boot-data {
+          key "key";
+          leaf key {
+            type string;
+          }
+          leaf value {
+            type string;
+          }
+          description
+            "Contains a string or a URL to a file contained in the
+             VNF package used to customize a virtualised compute
+             resource at boot time. The bootData may contain variable
+             parts that are replaced by deployment specific values
+             before being sent to the VIM.";
+          reference
+            "GS NFV IFA011: Section 7.1.6.7,
+             VnfcConfigurableProperties Information element.";
         }
       }
 
@@ -875,8 +899,7 @@ submodule etsi-nfv-vnf {
         }
       }
 
-      list sw-image-desc {
-        key "id";
+      container sw-image-desc {
         description
           "Defines descriptors of software images to be used by the
            VNF.";
@@ -1850,8 +1873,14 @@ submodule etsi-nfv-vnf {
             "GS NFV IFA011: Section 7.1.12 VnfConfigurableProperties
              information element";
         }
-        leaf-list additional-configurable-property {
+        list additional-configurable-property {
+          key "key";
+          leaf key {
             type string;
+          }
+          leaf value {
+            type string;
+          }
           description
             "It provides VNF specific configurable properties that can
              be modified using the ModifyVnfConfiguration operation.";
@@ -1894,7 +1923,7 @@ submodule etsi-nfv-vnf {
           "GS NFV IFA011: Section 7.1.2 VNFD information element";
 
         leaf event {
-          type common:lifecycle-management-script-event;
+          type common:internal-lifecycle-management-script-event;
           description
             "Describes VNF lifecycle event(s) or an external stimulus
              detected on a VNFM reference point.";