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=4a09d8e4013dab10c0f6d8c5e74216e87cb4e1c9

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

diff --git a/models/yang/vnfd-base.yang b/models/yang/vnfd-base.yang
index acb5b28..cd2061b 100644
--- a/models/yang/vnfd-base.yang
+++ b/models/yang/vnfd-base.yang
@@ -62,7 +62,7 @@ module vnfd-base
     }
 
     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 +299,12 @@ module vnfd-base
           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 +382,16 @@ module vnfd-base
             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;
diff --git a/models/yang/vnfd.yang b/models/yang/vnfd.yang
index 4816166..f1229e7 100644
--- a/models/yang/vnfd.yang
+++ b/models/yang/vnfd.yang
@@ -52,7 +52,7 @@ module vnfd
     list vnfd {
       key "id";
 
-        uses vnfd-base:vnfd-descriptor;
+      uses vnfd-base:vnfd-descriptor;
     }
   }
 }
diff --git a/models/yang/vnfr.yang b/models/yang/vnfr.yang
index 6d23065..aff7af4 100644
--- a/models/yang/vnfr.yang
+++ b/models/yang/vnfr.yang
@@ -289,9 +289,9 @@ module vnfr
         }
 
         // Use parameters provided here to configure this VNF
-      container vnf-configuration {
-        uses manotypes:vca-configuration;
-      }
+        container vnf-configuration {
+          uses manotypes:vca-configuration;
+        }
 
         // Mainly used by Mon-params & dashboard url
         container mgmt-interface {
@@ -443,9 +443,9 @@ module vnfr
 
           uses manotypes:supplemental-boot-data;
 
-        container vdu-configuration {
-          uses manotypes:vca-configuration;
-        }
+          container vdu-configuration {
+            uses manotypes:vca-configuration;
+          }
 
           list volumes {
             key "name";
@@ -495,56 +495,56 @@ module vnfr
             uses associated-virtual-cps;
           }
 
-        list interface {
-          description
-              "List of interfaces (internal and external) for the VNF";
-          key name;
-
-          leaf name {
+          list interface {
             description
-                "Name of the interface. Note that this
-                name has only local significance to the VDU.";
-            type string;
-          }
+                "List of interfaces (internal and external) for the VNF";
+            key name;
 
-          leaf position {
-            description
-                "Explicit Position of the interface within the list";
-            type uint32;
-          }
+            leaf name {
+              description
+                  "Name of the interface. Note that this
+                  name has only local significance to the VDU.";
+              type string;
+            }
 
-          leaf type {
-            description
-                "Type of the Interface";
+            leaf position {
+              description
+                  "Explicit Position of the interface within the list";
+              type uint32;
+            }
 
-            type vnfd-base:interface-type;
+            leaf type {
+              description
+                  "Type of the Interface";
 
-            default "EXTERNAL";
-          }
-          choice connection-point-type {
-            case internal {
-              leaf internal-connection-point-ref {
-                description
-                    "Leaf Ref to the particular internal connection point";
-                type leafref {
-                  path "../../internal-connection-point/id";
+              type vnfd-base:interface-type;
+
+              default "EXTERNAL";
+            }
+            choice connection-point-type {
+              case internal {
+                leaf internal-connection-point-ref {
+                  description
+                      "Leaf Ref to the particular internal connection point";
+                  type leafref {
+                    path "../../internal-connection-point/id";
+                  }
                 }
               }
-            }
-            case external {
-              leaf external-connection-point-ref {
-                description
-                    "Leaf Ref to the particular external connection point";
-                type leafref {
-                  path "../../../connection-point/name";
+              case external {
+                leaf external-connection-point-ref {
+                  description
+                      "Leaf Ref to the particular external connection point";
+                  type leafref {
+                    path "../../../connection-point/name";
+                  }
                 }
               }
             }
+            uses virtual-interface;
           }
-          uses virtual-interface;
-        }
 
-         leaf operational-status {
+          leaf operational-status {
             description
               "The operational status of the VDU
                 init                : The VDU has just started.
@@ -558,7 +558,7 @@ module vnfr
                 failed              : The VDU  instantiation failed.
               ";
             type vdu-operational-status;
-         }
+          }
 
           uses placement-group-info;
         }