commit c900490e2342643eff668a8e93fcba0cfcdcbfb6
author garciadeblas <gerardo.garciadeblas@telefonica.com> Fri May 24 15:56:30 2019 +0200
committer garciadeblas <gerardo.garciadeblas@telefonica.com> Wed May 29 12:47:03 2019 +0200
tree 4efc9e71621a0d6fe7f02dbe5479650f0be5c0f2
parent 8550fa7315eee96872969c644a4343213698a8d7

vca-config-access container for vnf/vdu configuration

This change implements the required changes in the IM
for features 1429 (secure key management) and 5669
(full charm support) so that OSM can know from the descriptor
whether or not the VNF/VDU requires SSH and what is the
default ssh user, so that OSM can inject an SSH public key
to make possible the configuration from VCA.

Change-Id: Ief9971a780f427c3d8de98d9d88fd0eae9493e5a
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

models/yang/mano-types.yang

diff --git a/models/yang/mano-types.yang b/models/yang/mano-types.yang
index 1b9e141..a734822 100644
--- a/models/yang/mano-types.yang
+++ b/models/yang/mano-types.yang
@@ -297,6 +297,34 @@
     }
   }
 
+  grouping vca-config-access {
+
+    container config-access {
+
+      description
+        "Indicates the way to access to the xNF or xDU for VCA configuration.
+         For the moment there is a single way (ssh-access).";
+
+      container ssh-access {
+
+        description
+          "If the xNF requires ssh and this parameter is set, SSH keys
+          will be injected so that VCA can configure the xNF or xDU via ssh.";
+
+        leaf required  {
+          description "whether ssh access is needed or not";
+          type boolean;
+          default false;
+        }
+
+        leaf default-user {
+          description "Default user for ssh";
+          type string;
+        }
+      }
+    }
+  } // END - grouping vca-config-access
+
   grouping vca-configuration {
     description
         "Common information in the descriptors for NS, VNF or VDU configuration.

models/yang/vnfd-base.yang

diff --git a/models/yang/vnfd-base.yang b/models/yang/vnfd-base.yang
index 0cd8e45..eb81021 100644
--- a/models/yang/vnfd-base.yang
+++ b/models/yang/vnfd-base.yang
@@ -176,6 +176,7 @@
 
       container vnf-configuration {
         uses manotypes:vca-configuration;
+        uses manotypes:vca-config-access;
       }
 
       leaf operational-status {
@@ -460,6 +461,7 @@
 
         container vdu-configuration {
           uses manotypes:vca-configuration;
+          uses manotypes:vca-config-access;
         }
 
         list monitoring-param {