Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(823)

Unified Diff: server/site_linux_server.py

Issue 6765030: Add automated StrongSwan test (Closed) Base URL: ssh://gitrw.chromium.org:9222/autotest.git@master
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: server/site_linux_server.py
diff --git a/server/site_linux_server.py b/server/site_linux_server.py
index 7e4c1bc1888512a3a123e198f9e14d538036ae5a..8a9b42fe41332bd6f6604ecec5d48f99cd6486de 100644
--- a/server/site_linux_server.py
+++ b/server/site_linux_server.py
@@ -12,9 +12,14 @@ class LinuxServer(object):
"""
def __init__(self, server, params):
- self.server = server # Server host.
- self.vpn_kind = None
- self.conf = {}
+ self.server = server # Server host.
+ self.vpn_kind = None
+ self.openvpn_config = {}
+ self.strongswan_config_templates = {}
+
+ def vpn_strongswan_config_templates(self, params):
+ for k, v in params.iteritems():
+ self.strongswan_config_templates[k] = v
def vpn_server_config(self, params):
""" Configure & launch the server side of the VPN.
@@ -29,6 +34,7 @@ class LinuxServer(object):
Valid values:
openvpn
+ l2tpipsec (StrongSwan PSK or certificates)
config: required
@@ -42,28 +48,37 @@ class LinuxServer(object):
supported by the specified VPN kind.
"""
self.vpn_server_kill({}) # Must be first. Relies on self.vpn_kind.
-
self.vpn_kind = params.get('kind', None)
- # Read configuration information & create server configuration file.
- #
- # As VPN kinds other than 'openvpn' are supported, and
- # since 'self.conf' is cummulative, perhaps there should be
- # a method which will clear 'self.conf'; different types of
- # VPN will likely not have the same configuration
- # parameters. This is only really needed if a test is
- # written to switch between two differents kinds of VPN.
- for k, v in params.get('config', {}).iteritems():
- self.conf[k] = v
- self.server.run("cat <<EOF >%s\n%s\nEOF\n" %
- ('/tmp/vpn-server.conf', '\n'.join(
- "%s %s" % kv for kv in self.conf.iteritems())))
-
# Launch specified VPN server.
if self.vpn_kind is None:
- raise error.TestFail('No VPN kind specified for this test.');
+ raise error.TestFail('No VPN kind specified for this test.')
elif self.vpn_kind == 'openvpn':
- self.server.run("/usr/sbin/openvpn --config /tmp/vpn-server.conf &")
+ # Read config information & create server configuration file.
+ for k, v in params.get('config', {}).iteritems():
+ self.openvpn_config[k] = v
+ self.server.run("cat <<EOF >/tmp/vpn-server.conf\n%s\nEOF\n" %
+ ('\n'.join( "%s %s" % kv for kv in
+ self.openvpn_config.iteritems())))
+ self.server.run("/usr/sbin/openvpn "
+ "--config /tmp/vpn-server.conf &")
+ elif self.vpn_kind == 'l2tpipsec': # aka 'strongswan'
+ # The replacement values in 'replacements' must match the
+ # template set with vpn_strongswan_config_templates().
+ replacements = params.get("replacements", None)
+ if replacements is not None:
+ replacements["@ipsecrets-ip@"] = self.server.ip
+ for cfg, template in self.strongswan_config_templates.iteritems():
+ contents = template
+ if replacements is not None:
+ for k, v in replacements.iteritems():
+ contents = contents.replace(k, v)
+ self.server.run("cat <<EOF >%s\n%s\nEOF\n" % (cfg, contents))
+
+ self.server.run("/usr/sbin/ipsec start")
+
+ # Restart xl2tpd to ensure use of newly-created config files.
+ self.server.run("sh /etc/init.d/xl2tpd restart")
else:
raise error.TestFail('(internal error): No config case '
'for VPN kind (%s)' % self.vpn_kind)
@@ -73,7 +88,11 @@ class LinuxServer(object):
if self.vpn_kind is not None:
if self.vpn_kind == 'openvpn':
self.server.run("pkill /usr/sbin/openvpn")
+ elif self.vpn_kind == 'l2tpipsec': # aka 'strongswan'
+ self.server.run("pkill /usr/sbin/ipsec")
+ self.server.run("pkill /usr/lib/ipsec/charon")
+ self.server.run("pkill /usr/lib/ipsec/pluto")
else:
raise error.TestFail('(internal error): No kill case '
'for VPN kind (%s)' % self.vpn_kind)
- self.vpn_kind = None;
+ self.vpn_kind = None
« no previous file with comments | « no previous file | server/site_tests/network_VPN/000VPNGenesis » ('j') | server/site_tests/network_VPN/000VPNGenesis » ('J')

Powered by Google App Engine
This is Rietveld 408576698