X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=models%2Fplugins%2Fyang%2Fvnfd.yang;h=d968bc804800ede491b06ccfcf038cf2aa5213a4;hb=0f4d8618e4d273cc93848b41fa1492599f038c74;hp=0e779c51b8cc050de80a30dc601d47463dbe180e;hpb=af804410b4063fe28658e38d23e3108b1d88a799;p=osm%2FSO.git

diff --git a/models/plugins/yang/vnfd.yang b/models/plugins/yang/vnfd.yang
index 0e779c51..d968bc80 100644
--- a/models/plugins/yang/vnfd.yang
+++ b/models/plugins/yang/vnfd.yang
@@ -70,7 +70,6 @@ module vnfd
     leaf port-security-enabled {
       description "Enables the port security for the port";
       type boolean;
-      default true;
     }
   }
 
@@ -181,7 +180,7 @@ module vnfd
                 "Use the default management interface on this VDU.";
             leaf vdu-id {
               type leafref {
-                path "/vnfd:vnfd-catalog/vnfd:vnfd/vnfd:vdu/vnfd:id";
+                path "../../vdu/id";
               }
             }
           }
@@ -191,7 +190,7 @@ module vnfd
                 "Use the ip address associated with this connection point.";
             leaf cp {
               type leafref {
-                path "/vnfd:vnfd-catalog/vnfd:vnfd/vnfd:connection-point/vnfd:name";
+                path "../../connection-point/name";
               }
             }
           }
@@ -277,8 +276,30 @@ module vnfd
           }
         }
         uses manotypes:provider-network;
+        choice init-params {
+          description "Extra parameters for VLD instantiation";
+
+          case vim-network-ref {
+            leaf vim-network-name {
+              description
+                  "Name of network in VIM account. This is used to indicate
+                    pre-provisioned network name in cloud account.";
+              type string;
+            }
+          }
+
+          case vim-network-profile {
+            leaf ip-profile-ref {
+              description "Named reference to IP-profile object";
+              type string;
+            }
+          }
+
+        }
       }
 
+      uses manotypes:ip-profile-list;
+
       list connection-point {
         key "name";
         description
@@ -377,12 +398,6 @@ module vnfd
               connection points.";
 
           uses common-connection-point;
-
-          leaf internal-vld-ref {
-            type leafref {
-              path "../../../internal-vld/id";
-            }
-          }
         }
 
         list internal-interface {