aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincenzo Maffione <v.maffione@gmail.com>2017-04-12 12:12:26 +0200
committerVincenzo Maffione <v.maffione@gmail.com>2017-04-12 12:12:26 +0200
commitc5471a128e2164abe113f4b0bf1276673e6c01d0 (patch)
treee59e7513e5ede9ce509f6ef2b1b7b4b7be7b6edf
parent9202aadd1f2c635f2bf0ccfba8ea1d8d1eeab923 (diff)
downloadrumba-c5471a128e2164abe113f4b0bf1276673e6c01d0.tar.gz
rumba-c5471a128e2164abe113f4b0bf1276673e6c01d0.zip
examples: minor changes to use "root" user and password
-rwxr-xr-xexamples/example.py3
-rwxr-xr-xexamples/two-layers.py3
-rw-r--r--rumba/prototypes/rlite.py1
-rw-r--r--rumba/ssh_support.py2
4 files changed, 6 insertions, 3 deletions
diff --git a/examples/example.py b/examples/example.py
index 0d8fcd9..54ecd37 100755
--- a/examples/example.py
+++ b/examples/example.py
@@ -31,7 +31,8 @@ b = Node("b",
dif_registrations = {n1 : [e1]})
tb = qemu.Testbed(exp_name = "example1",
- username = "vmaffione",
+ username = "root",
+ password = "root",
bzimage = '/home/vmaffione/git/rlite/demo/buildroot/bzImage',
initramfs = '/home/vmaffione/git/rlite/demo/buildroot/rootfs.cpio')
diff --git a/examples/two-layers.py b/examples/two-layers.py
index 687c99f..9032588 100755
--- a/examples/two-layers.py
+++ b/examples/two-layers.py
@@ -43,7 +43,8 @@ d = Node("d",
dif_registrations = {n3: [n2], n2 : [e3]})
tb = qemu.Testbed(exp_name = "twolayers",
- username = "vmaffione",
+ username = "root",
+ password = "root",
bzimage = '/home/vmaffione/git/rlite/demo/buildroot/bzImage',
initramfs = '/home/vmaffione/git/rlite/demo/buildroot/rootfs.cpio')
diff --git a/rumba/prototypes/rlite.py b/rumba/prototypes/rlite.py
index ed6db88..d8bfc1e 100644
--- a/rumba/prototypes/rlite.py
+++ b/rumba/prototypes/rlite.py
@@ -47,5 +47,4 @@ class Experiment(mod.Experiment):
print("[RLITE experiment] start")
print("Setting up rlite on the nodes...")
self.setup()
- time.sleep(20)
print("[RLITE experiment] end")
diff --git a/rumba/ssh_support.py b/rumba/ssh_support.py
index ca4893c..137c58b 100644
--- a/rumba/ssh_support.py
+++ b/rumba/ssh_support.py
@@ -42,6 +42,8 @@ def execute_commands(testbed, ssh_config, commands, time_out=3):
ssh_client = get_ssh_client()
try:
+ #print("Connecting to %s@%s:%s (pwd=%s)" % (testbed.username,
+ # ssh_config.hostname, ssh_config.port, testbed.password))
ssh_client.connect(ssh_config.hostname, ssh_config.port,
testbed.username, testbed.password,
look_for_keys=True, timeout=time_out)