From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Sat, 5 May 2018 20:55:25 +0000 (+0200)
Subject: ssh key injection enabled with ns-create in sol005 client
X-Git-Tag: v4.0.0~15
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fosmclient.git;a=commitdiff_plain;h=4f9d2874c732a12776c3723e9862a7c81e901d68

ssh key injection enabled with ns-create in sol005 client

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

diff --git a/osmclient/sol005/ns.py b/osmclient/sol005/ns.py
index 99fb83e..cdb6bd8 100644
--- a/osmclient/sol005/ns.py
+++ b/osmclient/sol005/ns.py
@@ -111,7 +111,7 @@ class Ns(object):
         #ns['userdata'] = {}
         #ns['userdata']['key1']='value1'
         #ns['userdata']['key2']='value2'
-        
+
         if ssh_keys is not None:
             # ssh_keys is comma separate list
             # ssh_keys_format = []
@@ -119,7 +119,10 @@ class Ns(object):
             #     ssh_keys_format.append({'key-pair-ref': key})
             #
             # ns['ssh-authorized-key'] = ssh_keys_format
-            ns['ssh-authorized-key'] = ssh_keys.split(',')
+            ns['ssh-authorized-key'] = []
+            for pubkeyfile in ssh_keys.split(','):
+                with open(pubkeyfile, 'r') as f:
+                    ns['ssh-authorized-key'].append(f.read())
         if config:
             ns_config = yaml.load(config)
             if "vim-network-name" in ns_config: