From 3c7c2275b2d4660b83db9495c5f6ece5c6557b43 Mon Sep 17 00:00:00 2001
From: Jordan Augé <jordan.auge+fdio@cisco.com>
Date: Sat, 25 Mar 2017 02:00:42 +0100
Subject: Misc. improvements to vICN codebase detailed below.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- vICN core
 . Added python setup script (allowing package installation)
 . Better error handling
- Resources
 . LXD : better handling of certificate generation
 . Physical : generation of SSH keypair within vICN
 . Link : code simplification
 . EmulatedLteChannel: fixed typo in netmask configuration of emu-radio (missing /)
- Examples
 . Added json file for tutorial #2 - Dumbell
 . New tutorial #03 - Load balancing in WiFi/LTE hetnet
- Other minor changes incl. code cleanup (trailing spaces, etc.)

Change-Id: Id306ca71e27d9859aa72760f63a2bc364bfe8159
Signed-off-by: Jordan Augé <jordan.auge+fdio@cisco.com>
---
 vicn/resource/linux/physical.py | 40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

(limited to 'vicn/resource/linux/physical.py')

diff --git a/vicn/resource/linux/physical.py b/vicn/resource/linux/physical.py
index e5eba2d3..8decb517 100644
--- a/vicn/resource/linux/physical.py
+++ b/vicn/resource/linux/physical.py
@@ -22,16 +22,17 @@ import logging
 import subprocess
 import shlex
 
-from netmodel.model.type    import String, Integer
-from netmodel.util.misc     import is_local_host
-from netmodel.util.socket   import check_port
-from vicn.core.attribute    import Attribute
-from vicn.core.commands     import Command, ReturnValue
-from vicn.core.exception    import ResourceNotFound
-from vicn.core.task         import Task, task
-from vicn.resource.node     import Node, DEFAULT_USERNAME
-from vicn.resource.node     import DEFAULT_SSH_PUBLIC_KEY
-from vicn.resource.node     import DEFAULT_SSH_PRIVATE_KEY
+from netmodel.model.type            import String, Integer
+from netmodel.util.misc             import is_local_host
+from netmodel.util.socket           import check_port
+from vicn.core.attribute            import Attribute
+from vicn.core.commands             import Command, ReturnValue
+from vicn.core.exception            import ResourceNotFound, VICNException
+from vicn.core.task                 import Task, task
+from vicn.resource.linux.keypair    import Keypair
+from vicn.resource.node             import Node, DEFAULT_USERNAME
+from vicn.resource.node             import DEFAULT_SSH_PUBLIC_KEY
+from vicn.resource.node             import DEFAULT_SSH_PRIVATE_KEY
 
 log = logging.getLogger(__name__)
 
@@ -42,6 +43,9 @@ CMD_SSH = 'ssh {ssh_options} -i {private_key} -p {port} ' \
 CMD_SSH_NF = 'ssh -n -f {ssh_options} -i {private_key} -p {port} ' \
              '{user}@{host} {command}'
 
+FN_KEY = os.path.expanduser(os.path.join(
+            '~', '.vicn', 'ssh_client_cert', 'ssh_client_key'))
+
 class Physical(Node):
     """
     Resource: Physical
@@ -67,12 +71,20 @@ class Physical(Node):
     # Resource lifecycle
     #--------------------------------------------------------------------------
 
-    @task
-    def __get__(self, attributes=None):
+    def __subresources__(self):
+        """
+        Require a SSH keypair to be present for authentication on nodes
+        """
+        return Keypair(node = None, key = FN_KEY)
+
+    def __initialize__(self):
+        """
+        Initialization require the ssh port to be open on the node, and the ssh
+        public key to be copied on the remote node.
+        """
         if not check_port(self.hostname, self.ssh_port):
-            raise ResourceNotFound
+            raise VICNException
 
-    def __create__(self):
         tasks = list()
         modes = (True, False) if DEFAULT_USERNAME != 'root' else (True,) 
         for as_root in modes:
-- 
cgit 1.2.3-korg