X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=models%2Fplugins%2Fyang%2Fvnfr.yang;fp=models%2Fplugins%2Fyang%2Fvnfr.yang;h=14a2d814f1154acbc9fecb1083ffac1ed499a92f;hb=2d3f1023ac94d9c19115c0b63ce85ae7a8598517;hp=8f739f47801a768deb0ba7c02bf8c19b0b57eeca;hpb=97b74b6a87ca8827749782653e89865d9d1108a4;p=osm%2FSO.git

diff --git a/models/plugins/yang/vnfr.yang b/models/plugins/yang/vnfr.yang
index 8f739f47..14a2d814 100644
--- a/models/plugins/yang/vnfr.yang
+++ b/models/plugins/yang/vnfr.yang
@@ -207,11 +207,9 @@ module vnfr
         type uint32;
       }
 
-      leaf vnfd-ref {
-        description "Reference to VNFD";
-        type leafref {
-          path "/vnfd:vnfd-catalog/vnfd:vnfd/vnfd:id";
-        }
+      container vnfd {
+        description "VNF descriptor used to instantiate this VNF";
+        uses vnfd:vnfd-descriptor;
       }
 
       // Use parameters provided here to configure this VNF
@@ -296,9 +294,7 @@ module vnfr
 
         leaf vdu-id-ref {
           type leafref {
-            path "/vnfd:vnfd-catalog/vnfd:vnfd" 
-               + "[vnfd:id = current()/../../vnfr:vnfd-ref]"
-               + "/vnfd:vdu/vnfd:id";
+            path "../../vnfd/vdu/id";
           }
         }