X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=models%2Fplugins%2Fyang%2Fvnfd.yang;h=dab749964782e464b2a91e23260df0b6ccb3b9be;hb=7203e6545b8957eef84f60845285b3256269637e;hp=81bb2aa7fb345e0b06f90435c7004a994f10d3ea;hpb=97b74b6a87ca8827749782653e89865d9d1108a4;p=osm%2FSO.git

diff --git a/models/plugins/yang/vnfd.yang b/models/plugins/yang/vnfd.yang
index 81bb2aa7..dab74996 100644
--- a/models/plugins/yang/vnfd.yang
+++ b/models/plugins/yang/vnfd.yang
@@ -115,14 +115,7 @@ module vnfd
     }
   }
 
-  container vnfd-catalog {
-
-    description
-        "Virtual Network Function Descriptor (VNFD).";
-
-    list vnfd {
-      key "id";
-
+  grouping vnfd-descriptor {
       leaf id {
         description "Identifier for the VNFD.";
         type string;
@@ -366,6 +359,8 @@ module vnfd
           }
         }
 
+        uses manotypes:custom-boot-data;
+
         list internal-connection-point {
           key "id";
           description
@@ -490,7 +485,7 @@ module vnfd
 
         key "name";
         uses manotypes:placement-group-info;
-        
+
         list member-vdus {
 
           description
@@ -504,7 +499,17 @@ module vnfd
           }
         }
       }
-    }
+  }
+
+  container vnfd-catalog {
+    description
+        "Virtual Network Function Descriptor (VNFD).";
+
+    list vnfd {
+      key "id";
+
+      uses vnfd-descriptor;
+     }
   }
 }