From 26e3e22cd6ca6676b7b99624764f8e6f1ae1479d Mon Sep 17 00:00:00 2001
From: Marco Capitani <m.capitani@nextworks.it>
Date: Fri, 21 Apr 2017 15:58:56 +0200
Subject: rumba: log: Added logging support, migrated from print to logging.

+ Added logging, migrated, default logging configuration is to stdout.
+ Minor PEP8 adjustments all-around
---
 rumba/testbeds/jfed.py | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

(limited to 'rumba/testbeds/jfed.py')

diff --git a/rumba/testbeds/jfed.py b/rumba/testbeds/jfed.py
index f51081c..1c0f992 100644
--- a/rumba/testbeds/jfed.py
+++ b/rumba/testbeds/jfed.py
@@ -26,8 +26,14 @@ import wget
 import tarfile
 
 import rumba.model as mod
+import rumba.log as log
+
+
+logger = log.get_logger(__name__)
+
 
 class Testbed(mod.Testbed):
+
     def __init__(self, exp_name, username, cert_file, exp_hours="2",
                  proj_name="ARCFIRE", authority="wall2.ilabt.iminds.be",
                  image=None):
@@ -47,18 +53,17 @@ class Testbed(mod.Testbed):
         else:
             self.image = None
 
-        if os.path.exists(self.jfed_jar) == False:
-            print("Couldn't find jFed CLI. Downloading.")
+        if not os.path.exists(self.jfed_jar):
+            logger.warning("Couldn't find jFed CLI. Downloading.")
             tarball = "jfed_cli.tar.gz"
             url = "http://jfed.iminds.be/downloads/stable/jar/" + tarball
             wget.download(url)
             tar = tarfile.open(tarball)
             tar.extractall()
             tar.close()
-            print("Extracted in current directory")
+            logger.info("Extracted in current directory")
             os.remove(tarball)
 
-
     def create_rspec(self, experiment):
         impl = xml.getDOMImplementation()
         doc = impl.createDocument(None, "rspec", None)
@@ -137,22 +142,23 @@ class Testbed(mod.Testbed):
 
         for node in experiment.nodes:
             auth_name_r = self.auth_name.replace(".", "-")
-            node.ssh_config.hostname = node.name + "." + self.exp_name + "." + \
-                                       auth_name_r + "." + self.auth_name
+            node.ssh_config.hostname = \
+                node.name + "." + self.exp_name + "." + \
+                auth_name_r + "." + self.auth_name
             node.ssh_config.proxycommand = "ssh -i '" + self.cert_file + \
                                            "' -o StrictHostKeyChecking=no " + \
                                            self.username + \
                                            "@bastion.test.iminds.be nc " + \
                                            node.ssh_config.hostname + " 22"
 
-        subprocess.call(["java", "-jar", self.jfed_jar, "create", "-S", \
-                         self.proj_name, "--rspec", \
-                         self.rspec, "-s", \
-                         self.exp_name, "-p", self.cert_file, "-k", \
-                         "usercert,userkeys,shareduserallkeys", \
-                         "--create-slice",\
+        subprocess.call(["java", "-jar", self.jfed_jar, "create", "-S",
+                         self.proj_name, "--rspec",
+                         self.rspec, "-s",
+                         self.exp_name, "-p", self.cert_file, "-k",
+                         "usercert,userkeys,shareduserallkeys",
+                         "--create-slice",
                          "--manifest", self.manifest,
-                         "-P", self.password, \
+                         "-P", self.password,
                          "-e", self.exp_hours])
 
         rspec = xml.parse(self.manifest)
@@ -175,5 +181,8 @@ class Testbed(mod.Testbed):
                             comp_id = intf.getAttribute("component_id")
                             comp_arr = comp_id.split(":")
                             ipcp.ifname = comp_arr[-1]
-                            #xml_ip = intf.getElementsByTagName("ip")
-                            #interface.ip = xml_ip[0].getAttribute("address")
+                            # xml_ip = intf.getElementsByTagName("ip")
+                            # interface.ip = xml_ip[0].getAttribute("address")
+
+    def swap_out(self, experiment):
+        pass
-- 
cgit v1.2.3