Merge branch 'pm_phase2' into v2.0. Amend change for NSD based on package_type rpc...

[osm/SO.git] / models / plugins / yang / mano-types.yang

diff --git a/models/plugins/yang/mano-types.yang b/models/plugins/yang/mano-types.yang
index 5cf74db..4ec602c 100644 (file)
--- a/models/plugins/yang/mano-types.yang
+++ b/models/plugins/yang/mano-types.yang
@@ -150,7 +150,7 @@ module mano-types
     leaf image {
       description
             "Image name for the software image.
-             If the image name is found within the VNF packaage it will
+             If the image name is found within the VNF package it will
              be uploaded to all VIM accounts during onboarding process.
              Otherwise, the image must be added to the VIM account with
              the same name as entered here.
@@ -227,7 +227,7 @@ module mano-types
 
             leaf protocol {
               description
-                  "Protocol to use for NETCONF such as ssh";
+                  "Protocol to use for NETCONF, such as ssh";
               type enumeration {
                 enum None;
                 enum ssh;
@@ -313,7 +313,7 @@ module mano-types
         leaf config-priority {
           description
               "Configuration priority - order of configuration
-               to be applied to each VNF in this NS ,A low
+               to be applied to each VNF in this NS. A low
                number takes precedence over a high number";
           type uint64;
         }
@@ -1026,7 +1026,12 @@ module mano-types
 
       leaf overlay-type {
         description
-            "Type of the overlay network.";
+            "Type of the overlay network.
+             LOCAL - Provider network implemented in a single compute node
+             FLAT - Provider network shared by all tenants 
+             VLAN - Provider network implemented using 802.1Q tagging
+             VXLAN - Provider networks implemented using RFC 7348
+             GRE - Provider networks implemented using GRE tunnels";
         type enumeration {
           enum LOCAL;
           enum FLAT;
@@ -1247,14 +1252,17 @@ module mano-types
       key id;
 
       leaf id {
+        description "Identifier for control parameter";
         type string;
       }
 
       leaf name {
+        description "Name of a control parameter";
         type string;
       }
 
       leaf description {
+        description "A description of the control parameter";
         type string;
       }