aboutsummaryrefslogtreecommitdiff
path: root/rumba/elements
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@ugent.be>2018-06-28 11:49:55 +0200
committerSander Vrijders <sander.vrijders@ugent.be>2018-06-28 13:08:10 +0200
commit7c02fbc57439f5ab850b3f605df84e549174b11b (patch)
treea4c752c8be66cf0e2ffa4b19cf1023f7be7bb136 /rumba/elements
parentd6b62e3d1c0653b50443ab91062127a60c0bbfdc (diff)
downloadrumba-7c02fbc57439f5ab850b3f605df84e549174b11b.tar.gz
rumba-7c02fbc57439f5ab850b3f605df84e549174b11b.zip
testbeds: Abstract away use of http proxy server
Certain testbeds use a proxy to access the outside world. Due to recent changes this was not working anymore. This takes a different approach to re-enable this. It simply adds the lines to /etc/profile after swap-in so that the proxy is added to every shell upon execution.
Diffstat (limited to 'rumba/elements')
-rw-r--r--rumba/elements/experimentation.py3
-rw-r--r--rumba/elements/topology.py4
2 files changed, 0 insertions, 7 deletions
diff --git a/rumba/elements/experimentation.py b/rumba/elements/experimentation.py
index d0910a6..5a86b6f 100644
--- a/rumba/elements/experimentation.py
+++ b/rumba/elements/experimentation.py
@@ -47,14 +47,12 @@ class Testbed(object):
username,
password,
proj_name,
- http_proxy=None,
system_logs=None):
"""
:param exp_name: The experiment name.
:param username: The username.
:param password: The password.
:param proj_name: The project name.
- :param http_proxy: HTTP proxy used by the testbed.
:param system_logs: Location of the system logs of
images of the testbed.
"""
@@ -62,7 +60,6 @@ class Testbed(object):
self.password = password
self.proj_name = proj_name
self.exp_name = exp_name
- self.http_proxy = http_proxy
self.flags = {'no_vlan_offload': False}
self.executor = None
if system_logs is None:
diff --git a/rumba/elements/topology.py b/rumba/elements/topology.py
index 46f24c2..5a3ad17 100644
--- a/rumba/elements/topology.py
+++ b/rumba/elements/topology.py
@@ -550,7 +550,6 @@ class SSHConfig(object):
self.proxy_server = proxy_server
self.client = None
self.proxy_client = None
- self.http_proxy = None
def set_username(self, username):
self.username = username
@@ -558,9 +557,6 @@ class SSHConfig(object):
def set_password(self, password):
self.password = password
- def set_http_proxy(self, proxy):
- self.http_proxy = proxy
-
class Node(object):
"""