From 76f275119b5005f6d6348d327db49e9f361f501a Mon Sep 17 00:00:00 2001
From: Mahesh Jethanandani <mjethanandani@gmail.com>
Date: Mon, 28 Oct 2019 18:50:34 -0700
Subject: [PATCH 1/2] Issue#1

---
 example-data/complex-vnfd.xml | 12 ++++--------
 example-data/nfv-nsd.xml      |  1 +
 example-data/nfv-vnfd.xml     |  1 +
 src/yang/etsi-nfv-common.yang | 22 ++++++++++++++++++++++
 src/yang/etsi-nfv-vnf.yang    | 19 +++++++++++++++++--
 5 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/example-data/complex-vnfd.xml b/example-data/complex-vnfd.xml
index b10ec9f..39bbbaf 100644
--- a/example-data/complex-vnfd.xml
+++ b/example-data/complex-vnfd.xml
@@ -78,11 +78,11 @@
         <num-virtual-cpu>16</num-virtual-cpu>
       </virtual-cpu>
     </virtual-compute-desc>
-    <virtual-storage-descriptor>
+    <virtual-storage-desc>
       <id>root</id>
       <type-of-storage>root-storage</type-of-storage>
       <size-of-storage>10</size-of-storage>
-    </virtual-storage-descriptor>
+    </virtual-storage-desc>
     <sw-image-desc>
       <id>CP</id>
       <name>CP</name>
@@ -116,17 +116,13 @@
     <int-virtual-link-desc>
       <id>internal-vl</id>
       <connectivity-type>
-        <layer-protocol>
-          <protocol>ipv4</protocol>
-        </layer-protocol>
+        <layer-protocol>ipv4</layer-protocol>
       </connectivity-type>
     </int-virtual-link-desc>
     <int-virtual-link-desc>
       <id>mgmt</id>
       <connectivity-type>
-        <layer-protocol>
-          <protocol>ipv4</protocol>
-        </layer-protocol>
+        <layer-protocol>ipv4</layer-protocol>
       </connectivity-type>
     </int-virtual-link-desc>
     <ext-cpd>
diff --git a/example-data/nfv-nsd.xml b/example-data/nfv-nsd.xml
index ba4ec2d..03423e6 100644
--- a/example-data/nfv-nsd.xml
+++ b/example-data/nfv-nsd.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://www.cisco.com/asa.qcow2</image>
diff --git a/example-data/nfv-vnfd.xml b/example-data/nfv-vnfd.xml
index 7587240..6b76c43 100644
--- a/example-data/nfv-vnfd.xml
+++ b/example-data/nfv-vnfd.xml
@@ -48,6 +48,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://www.cisco.com/asa.qcow2</image>
diff --git a/src/yang/etsi-nfv-common.yang b/src/yang/etsi-nfv-common.yang
index 0a1c361..6ab9ea1 100644
--- a/src/yang/etsi-nfv-common.yang
+++ b/src/yang/etsi-nfv-common.yang
@@ -289,6 +289,28 @@ submodule etsi-nfv-common {
       enum "end-vnf-ext-conn-change";
       enum "start-vnfinfo-modification";
       enum "end-vnfinfo-modification";
+      enum "start-vnf-snapshot-creation";
+      enum "end-vnf-snapshot-creation";
+      enum "start-vnf-snapshot-reverting-to";
+      enum "end-vnf-snapshot-reverting-to";
+      enum "start-change-current-vnf-package";
+      enum "end-change-current-vnf-package";
+    }
+  }
+
+  typedef external-lifecycle-management-script-event {
+    type enumeration {
+      enum "instantiation";
+      enum "scaling";
+      enum "healing";
+      enum "termination";
+      enum "vnf-flavour-change";
+      enum "vnf-operation-change";
+      enum "vnf-ext-conn-change";
+      enum "vnfinfo-modification";
+      enum "vnf-snapshot-creation";
+      enum "vnf-snapshot-reverting-to";
+      enum "change-current-vnf-package";
     }
   }
 
diff --git a/src/yang/etsi-nfv-vnf.yang b/src/yang/etsi-nfv-vnf.yang
index 43c1109..6fb6653 100755
--- a/src/yang/etsi-nfv-vnf.yang
+++ b/src/yang/etsi-nfv-vnf.yang
@@ -2600,10 +2600,25 @@ submodule etsi-nfv-vnf {
       }
 
       leaf-list event {
-        type internal-lifecycle-management-script-event;
+        type union {
+          type internal-lifecycle-management-script-event;
+          type external-lifecycle-management-script-event;
+        }
         description
           "Describes VNF lifecycle event(s) or an external stimulus
-           detected on a VNFM reference point.";
+           detected on a VNFM reference point.
+
+           If the event is of type 
+           internal-lifecycle-management-script-event, then depending
+           on whether the event is of type start-* or end-*, the
+           script associated with the VNF LCM operation needs to be 
+           executed before the event, or after the event,
+           respectively.
+
+           On the other hand, if the event is of type
+           external-lifecycle-management-script-event, then the
+           script associated with the event needs to be executed
+           for the given VNF LCM operation.";
         reference
           "GS NFV IFA011: Section 7.1.13 LifeCycleManagementScript
            information element";
-- 
GitLab


From e6af2d7a2510655297d743394520b9a88511d22a Mon Sep 17 00:00:00 2001
From: Mahesh Jethanandani <mjethanandani@gmail.com>
Date: Wed, 4 Dec 2019 17:03:53 +0900
Subject: [PATCH 2/2] Remove events that are not part of 2.7.1

---
 src/yang/etsi-nfv-common.yang | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/yang/etsi-nfv-common.yang b/src/yang/etsi-nfv-common.yang
index 6ab9ea1..a0359f0 100644
--- a/src/yang/etsi-nfv-common.yang
+++ b/src/yang/etsi-nfv-common.yang
@@ -289,12 +289,6 @@ submodule etsi-nfv-common {
       enum "end-vnf-ext-conn-change";
       enum "start-vnfinfo-modification";
       enum "end-vnfinfo-modification";
-      enum "start-vnf-snapshot-creation";
-      enum "end-vnf-snapshot-creation";
-      enum "start-vnf-snapshot-reverting-to";
-      enum "end-vnf-snapshot-reverting-to";
-      enum "start-change-current-vnf-package";
-      enum "end-change-current-vnf-package";
     }
   }
 
@@ -308,9 +302,6 @@ submodule etsi-nfv-common {
       enum "vnf-operation-change";
       enum "vnf-ext-conn-change";
       enum "vnfinfo-modification";
-      enum "vnf-snapshot-creation";
-      enum "vnf-snapshot-reverting-to";
-      enum "change-current-vnf-package";
     }
   }
 
-- 
GitLab