From: hoban <adrian.hoban@intel.com>
Date: Fri, 2 Mar 2018 14:39:14 +0000 (+0100)
Subject: Merge "Path for nesting: external CP in VNFD and NSD can refer to internal VLDs and... 
X-Git-Tag: v3.1.0~7
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FIM.git;a=commitdiff_plain;h=4a09d8e4013dab10c0f6d8c5e74216e87cb4e1c9;hp=-c

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

4a09d8e4013dab10c0f6d8c5e74216e87cb4e1c9
diff --combined models/yang/vnfd-base.yang
index 3ab3eab,75dcadc..acb5b28
--- a/models/yang/vnfd-base.yang
+++ b/models/yang/vnfd-base.yang
@@@ -64,7 -64,6 +64,7 @@@ module vnfd-bas
      leaf port-security-enabled {
        description "Enables the port security for the port";
        type boolean;
 +      default true;
      }
    }
  
@@@ -347,6 -346,19 +347,19 @@@
            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 {