aboutsummaryrefslogtreecommitdiff
path: root/rumba/model.py
diff options
context:
space:
mode:
Diffstat (limited to 'rumba/model.py')
-rw-r--r--rumba/model.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/rumba/model.py b/rumba/model.py
index faf353c..5ec36cc 100644
--- a/rumba/model.py
+++ b/rumba/model.py
@@ -125,6 +125,13 @@ class NormalDIF(DIF):
s += "\n Component %s has policy %s" % (comp, pol)
return s
+# SSH Configuration
+#
+class SSHConfig:
+ def __init__(self, hostname, port=22):
+ self.hostname = hostname
+ self.port = port
+
# A node in the experiment
#
# @difs: DIFs the node will have an IPCP in
@@ -150,7 +157,7 @@ class Node:
if bindings is None:
bindings = dict()
self.bindings = bindings
- self.full_name = name
+ self.ssh_config = SSHConfig(name)
self.ipcps = []
self._validate()
@@ -313,10 +320,10 @@ class Experiment:
@staticmethod
def from_config_file(testbed, filename='demo.conf'):
"""
- :type testbed: Testbed
+ :type testbed: Testbed
:rtype: Experiment
:param testbed: the testbed for the experiment
- :param filename: name of the .conf file
+ :param filename: name of the .conf file
:return: an Experiment object
"""
@@ -624,4 +631,3 @@ class Experiment:
finally:
# No matter what happens, undo the testbed (testbed-specific)
self.testbed.swap_out(self)
-