Merge branch 'bug#95' into 'master'

Fix for Bug#95

See merge request !12

src/yang/etsi-nfv-ns.yang

@@ -250,6 +250,7 @@ submodule etsi-nfv-ns {
           }
 
           container qos {
+	    presence "VL QoS parameters";
             description
               "The QoS information element specifies quality of
                service parameters applicable to a VL.";

src/yang/etsi-nfv-vnf.yang

@@ -827,8 +827,26 @@ submodule etsi-nfv-vnf {
             "GS NFV IFA011: Section 7.1.6.5 SwImageDesc
              information element.";
         }
-        leaf checksum {
-          type string;
+        container checksum {
+          leaf algorithm {
+            type string;
+            description
+              "Species the algorithm used to obtain the checksum
+               value.";
+            reference
+              "GS NFV IFA011: Section 7.1.6.10 ChecksumData
+               information element.";
+	  }
+	  leaf hash {
+	    type string;
+	    description
+	      "Contains the result of applying the algorithm
+               indicated by the algorithm attribute to the data to
+               which this ChecksumData refers.";
+            reference
+              "GS NFV IFA011: Section 7.1.6.10 ChecksumData
+               information element.";
+	  }
           description
             "The checksum of the software image file.";
           reference
@@ -1041,6 +1059,7 @@ submodule etsi-nfv-vnf {
                information element.";
           }
           container qos {
+	    presence "VL QoS parameters";
             description
               "QoS of the VL.";
             reference
@@ -2418,7 +2437,23 @@ submodule etsi-nfv-vnf {
         leaf-list extension {
           type string;
           description
-            "'Extension' attributes of VnfInfo that are writeable.";
+            "Additional VNF-specific attributes of VnfInfo that
+             affect the lifecycle management of a VNF instance and
+             that are writeable.
+
+             For each VNF instance, these attributes are stored
+             persistently by the VNFM and can be queried and
+             modified through the VNFM.
+
+             These attributes are intended to be consumed by the
+             VNFM or by the lifecycle management scripts during the
+             execution of VNF lifecycle management operations.
+
+             Modifying these values has no direct effect on the VNF
+             instance; however, modified values can be considered
+             during subsequent VNF lifecycle management operations,
+             which means that the modified values can indirectly
+             affect the configuration of the VNF instance.";
           reference
             "GS NFV IFA011: Section 7.1.14 VnfInfoModifiableAttributes
              information element";
@@ -2426,7 +2461,22 @@ submodule etsi-nfv-vnf {
         leaf-list metadata {
           type string;
           description
-            "'Metadata' attributes of VnfInfo that are writeable.";
+            "Additional VNF-specific attributes of VnfInfo that are
+             writeable and that provide metadata describing the VNF
+             instance.
+
+             For each VNF instance, these attributes are stored
+             persistently by the VNFM and can be queried and modified
+             through the VNFM.
+
+             These attributes are intended to provide information to
+             functional blocks external to the VNFM and will not be
+             used by the VNFM or the VNF lifecycle management
+             scripts when executing lifecycle management operations.
+
+             Modifying these attributes has no effect on the VNF
+             instance. It only affects the attribute values stored by
+             the VNFM.";
           reference
             "GS NFV IFA011: Section 7.1.14 VnfInfoModifiableAttributes
              information element";