From: hoban <adrian.hoban@intel.com>
Date: Fri, 2 Mar 2018 14:40:40 +0000 (+0100)
Subject: Merge "Feature 1417: support of PDUs in a VNF"
X-Git-Tag: v3.1.0~6
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FIM.git;a=commitdiff_plain;h=3c54356532c00ff3cdf1c90e58145dbb43609d49;hp=-c

Merge "Feature 1417: support of PDUs in a VNF"
---

3c54356532c00ff3cdf1c90e58145dbb43609d49
diff --combined models/yang/vnfd-base.yang
index acb5b28,1407016..cd2061b
--- a/models/yang/vnfd-base.yang
+++ b/models/yang/vnfd-base.yang
@@@ -62,9 -62,8 +62,9 @@@ module vnfd-bas
      }
  
      leaf port-security-enabled {
-       description "Enables the port security for the port";
+       description "Enables the port security for the port.";
        type boolean;
 +      default true;
      }
    }
  
@@@ -299,11 -298,12 +299,12 @@@
            key "id-ref";
            description "List of internal connection points in this VLD";
            leaf id-ref {
-             description "reference to the internal connection point id";
+             description "Reference to the internal connection point id";
              type leafref {
                path "../../../vdu/internal-connection-point/id";
              }
            }
+ 
            leaf ip-address {
              description "IP address of the internal connection point";
              type inet:ip-address;
@@@ -381,6 -381,16 +382,16 @@@
              type string;
          }
  
+         leaf pdu-type {
+           description
+             "Type of PDU. If this field exists, the deployment unit must be
+             understood as a PDU, not as a VDU. This field is used to identify
+             the category of PDU instances to be used at instantiation time. For
+             the instantiation to be successful, there must be available
+             PDU instances of this type in the selected datacenter.";
+           type string;
+         }
+ 
          leaf count {
            description "Number of instances of VDU";
            type uint64;