Merge branch 'bug#89' into 'master'

Fix for bug#89

See merge request !27

example-data/complex-vnfd.xml

@@ -93,6 +93,7 @@
       </checksum>
       <container-format>bare</container-format>
       <disk-format>qcow2</disk-format>
+      <min-disk>1</min-disk>
       <min-ram>2.0</min-ram>
       <size>1</size>
       <image>http://mycompany.images.com/control-plane.qcow2</image>
@@ -107,6 +108,7 @@
       </checksum>
       <container-format>bare</container-format>
       <disk-format>qcow2</disk-format>
+      <min-disk>1</min-disk>
       <min-ram>2.0</min-ram>
       <size>1</size>
       <image>http://mycompany.images.com/data-plane.qcow2</image>
@@ -202,6 +204,17 @@
         </vdu-level>
       </instantiation-level>
       <default-instantiation-level>il-1</default-instantiation-level>
+      <lcm-operations-configuration>
+	<scale-vnf-to-level-op-config>
+	  <arbitrary-target-levels-supported>true</arbitrary-target-levels-supported>
+	</scale-vnf-to-level-op-config>
+	<terminate-vnf-op-config>
+	  <min-graceful-termination>1</min-graceful-termination>
+	</terminate-vnf-op-config>
+	<operate-vnf-op-config>
+	  <min-graceful-stop-timeout>1</min-graceful-stop-timeout>
+	</operate-vnf-op-config>
+      </lcm-operations-configuration>
       <affinity-or-anti-affinity-group>
         <id>control-plane</id>
         <type>anti-affinity</type>
@@ -262,6 +275,17 @@
         </vdu-level>
       </instantiation-level>
       <default-instantiation-level>il-1</default-instantiation-level>
+      <lcm-operations-configuration>
+	<scale-vnf-to-level-op-config>
+	  <arbitrary-target-levels-supported>true</arbitrary-target-levels-supported>
+	</scale-vnf-to-level-op-config>
+	<terminate-vnf-op-config>
+	  <min-graceful-termination>1</min-graceful-termination>
+	</terminate-vnf-op-config>
+	<operate-vnf-op-config>
+	  <min-graceful-stop-timeout>1</min-graceful-stop-timeout>
+	</operate-vnf-op-config>
+      </lcm-operations-configuration>
       <affinity-or-anti-affinity-group>
         <id>control-plane</id>
         <type>anti-affinity</type>

example-data/nfv.xml

@@ -49,6 +49,7 @@
       </checksum>
       <container-format>bare</container-format>
       <disk-format>qcow2</disk-format>
+      <min-disk>1</min-disk>
       <min-ram>2.0</min-ram>
       <size>1</size>
       <image>http://mycompany.images.com/asa.qcow2</image>
@@ -99,6 +100,17 @@
         </vdu-level>
       </instantiation-level>
       <default-instantiation-level>single</default-instantiation-level>
+      <lcm-operations-configuration>
+	<scale-vnf-to-level-op-config>
+	  <arbitrary-target-levels-supported>true</arbitrary-target-levels-supported>
+	</scale-vnf-to-level-op-config>
+	<terminate-vnf-op-config>
+	  <min-graceful-termination>1</min-graceful-termination>
+	</terminate-vnf-op-config>
+	<operate-vnf-op-config>
+	  <min-graceful-stop-timeout>1</min-graceful-stop-timeout>
+	</operate-vnf-op-config>
+      </lcm-operations-configuration>
     </df>
   </vnfd>
   <vnfd>
@@ -151,6 +163,7 @@
       </checksum>
       <container-format>bare</container-format>
       <disk-format>qcow2</disk-format>
+      <min-disk>1</min-disk>
       <min-ram>2.0</min-ram>
       <size>1</size>
       <image>http://mycompany.images.com/csr.qcow2</image>
@@ -201,6 +214,17 @@
         </vdu-level>
       </instantiation-level>
       <default-instantiation-level>single</default-instantiation-level>
+      <lcm-operations-configuration>
+	<scale-vnf-to-level-op-config>
+	  <arbitrary-target-levels-supported>true</arbitrary-target-levels-supported>
+	</scale-vnf-to-level-op-config>
+	<terminate-vnf-op-config>
+	  <min-graceful-termination>1</min-graceful-termination>
+	</terminate-vnf-op-config>
+	<operate-vnf-op-config>
+	  <min-graceful-stop-timeout>1</min-graceful-stop-timeout>
+	</operate-vnf-op-config>
+      </lcm-operations-configuration>
     </df>
   </vnfd>
   <nsd>

src/yang/etsi-nfv-common.yang

@@ -532,7 +532,7 @@ submodule etsi-nfv-common {
           when "../type='mac-address'";
           leaf mac-address-assignment {
             type boolean;
-            default true;
+            mandatory true;
             description
               "Specify if the MAC address assignment is the
                responsibility of management and orchestration function
@@ -558,7 +558,7 @@ submodule etsi-nfv-common {
           when "../type='ip-address'";
           leaf ip-address-assignment {
             type boolean;
-            default "true";
+            mandatory true;
             description
               "Specify if the address assignment is the responsibility
                of management and orchestration function or not. If it
@@ -571,7 +571,7 @@ submodule etsi-nfv-common {
 
           leaf floating-ip-activated {
             type boolean;
-            default "true";
+            mandatory true;
             description
               "Specify if the floating IP scheme is activated on the CP
                or not.";

src/yang/etsi-nfv-ns.yang

@@ -1345,6 +1345,7 @@ submodule etsi-nfv-ns {
               "GS NFV IFA014: Section 6.3.11.2 NsProfile information
                element";
           }
+
           leaf min-number-of-instances {
             type uint16;
             default 1;

src/yang/etsi-nfv-vnf.yang

@@ -545,7 +545,7 @@ submodule etsi-nfv-vnf {
               range "0..max";
             }
             units "GB";
-            default 1;
+            mandatory true;
             description
               "Amount of virtual memory in GB.";
             reference
@@ -741,7 +741,7 @@ submodule etsi-nfv-vnf {
         leaf size-of-storage {
           type uint64;
           units "GB";
-          default 0;
+          mandatory true;
           description
             "Size of virtualised storage resource (e.g. size of
              volume, in GB)";
@@ -959,7 +959,7 @@ submodule etsi-nfv-vnf {
         leaf min-disk {
           type uint64;
           units "GB";
-          default 0;
+          mandatory true;
           description
             "The minimal disk size requirement for this software
              image. The value of the 'size of storage' attribute
@@ -1477,7 +1477,7 @@ submodule etsi-nfv-vnf {
                   enum ipv4;
                   enum ipv6;
                 }
-                default "ipv4";
+                mandatory true;
                 description
                   "Specifies IP version of this L3 protocol.
                    Value:
@@ -1796,7 +1796,7 @@ submodule etsi-nfv-vnf {
 
             leaf arbitrary-target-levels-supported {
               type boolean;
-              default "false";
+              mandatory true;
               description
                 "Signals whether scaling according to the parameter
                  'scaleInfo' is supported by this VNF.";
@@ -1851,7 +1851,7 @@ submodule etsi-nfv-vnf {
 
             leaf min-graceful-termination {
               type yang:timeticks;
-              default "1";
+              mandatory true;
               description
                 "Minimum timeout value for graceful termination of
                  a VNF instance.";
@@ -1903,7 +1903,7 @@ submodule etsi-nfv-vnf {
 
             leaf min-graceful-stop-timeout {
               type yang:timeticks;
-              default "1";
+              mandatory true;
               description
                 "Minimum timeout value for graceful stop of a VNF
                  instance.";