Merge "Path for nesting: external CP in VNFD and NSD can refer to internal VLDs and...

[osm/IM.git] / models / yang / vnfd-base.yang

diff --git a/models/yang/vnfd-base.yang b/models/yang/vnfd-base.yang
index 8e4333a..acb5b28 100644 (file)
--- a/models/yang/vnfd-base.yang
+++ b/models/yang/vnfd-base.yang
@@ -64,6 +64,7 @@ module vnfd-base
     leaf port-security-enabled {
       description "Enables the port security for the port";
       type boolean;
     leaf port-security-enabled {
       description "Enables the port security for the port";
       type boolean;

+      default true;

     }
   }
 
     }
   }
 


@@ -303,6 +304,10 @@ module vnfd-base
               path "../../../vdu/internal-connection-point/id";
             }
           }
               path "../../../vdu/internal-connection-point/id";
             }
           }

+          leaf ip-address {
+            description "IP address of the internal connection point";
+            type inet:ip-address;
+          }

         }
 
         uses manotypes:provider-network;
         }
 
         uses manotypes:provider-network;


@@ -342,6 +347,19 @@ module vnfd-base
           at the network service level to construct network services.";
 
         uses common-connection-point;
           at the network service level to construct network services.";
 
         uses common-connection-point;

+
+        leaf internal-vld-ref {
+          description
+            "Reference to an internal VLD of the VNF. This field is
+            optional. It allows exposing an internal VLD through a
+            connection point. When building a NS, this VNF CP might be
+            connected to a NS VLD, then both VLDs (the i-VLD of the VNF and the
+            VLD of the NS) will become the same network and the IP profile will
+            be the one configured at NS level.";
+          type leafref {
+            path "../../internal-vld/id";
+          }
+        }

       }
 
       list vdu {
       }
 
       list vdu {