From b79a08b84e52871b1e1254f65ff774a6f0857608 Mon Sep 17 00:00:00 2001 From: kali Date: Thu, 30 Aug 2012 05:37:44 +0900 Subject: move extra options from config template to cl opts --- src/leap/eip/tests/test_config.py | 51 +++++++++++++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 5 deletions(-) (limited to 'src/leap/eip/tests/test_config.py') diff --git a/src/leap/eip/tests/test_config.py b/src/leap/eip/tests/test_config.py index 16219648..c3a8075e 100644 --- a/src/leap/eip/tests/test_config.py +++ b/src/leap/eip/tests/test_config.py @@ -48,6 +48,23 @@ class EIPConfigTest(BaseLeapTest): username = self.get_username() groupname = self.get_groupname() + args.append('--mode') + args.append('client') + args.append('--dev') + #does this have to be tap for win?? + args.append('tun') + args.append('--persist-tun') + args.append('--persist-key') + args.append('--remote') + args.append('testprovider.example.org') + # XXX get port!? + args.append('1194') + # XXX get proto + args.append('udp') + args.append('--tls-client') + args.append('--remote-cert-tls') + args.append('server') + args.append('--user') args.append(username) args.append('--group') @@ -55,16 +72,40 @@ class EIPConfigTest(BaseLeapTest): args.append('--management-client-user') args.append(username) args.append('--management-signal') - args.append('--management') + args.append('--management') #XXX hey! #get platform switches here! args.append('/tmp/.eip.sock') args.append('unix') - args.append('--config') - args.append(os.path.expanduser( - '~/.config/leap/providers/%s/openvpn.conf' - % constants.DEFAULT_TEST_PROVIDER)) + + # certs + # XXX get values from specs? + args.append('--cert') + args.append(os.path.join( + self.home, + '.config', 'leap', 'providers', + 'testprovider.example.org', + 'keys', 'client', + 'openvpn.pem')) + args.append('--key') + args.append(os.path.join( + self.home, + '.config', 'leap', 'providers', + 'testprovider.example.org', + 'keys', 'client', + 'openvpn.pem')) + args.append('--ca') + args.append(os.path.join( + self.home, + '.config', 'leap', 'providers', + 'testprovider.example.org', + 'keys', 'ca', + 'testprovider-ca-cert.pem')) + #args.append('--config') + #args.append(os.path.expanduser( + #'~/.config/leap/providers/%s/openvpn.conf' + #% constants.DEFAULT_TEST_PROVIDER)) return args # build command string -- cgit v1.2.3 From 396d815e318d03df4e21269aa8c3e6c0e6f7fad0 Mon Sep 17 00:00:00 2001 From: kali Date: Thu, 30 Aug 2012 06:00:03 +0900 Subject: working with options only from cli --- src/leap/eip/tests/test_config.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/leap/eip/tests/test_config.py') diff --git a/src/leap/eip/tests/test_config.py b/src/leap/eip/tests/test_config.py index c3a8075e..87ef33ef 100644 --- a/src/leap/eip/tests/test_config.py +++ b/src/leap/eip/tests/test_config.py @@ -48,8 +48,7 @@ class EIPConfigTest(BaseLeapTest): username = self.get_username() groupname = self.get_groupname() - args.append('--mode') - args.append('client') + args.append('--client') args.append('--dev') #does this have to be tap for win?? args.append('tun') @@ -102,10 +101,6 @@ class EIPConfigTest(BaseLeapTest): 'testprovider.example.org', 'keys', 'ca', 'testprovider-ca-cert.pem')) - #args.append('--config') - #args.append(os.path.expanduser( - #'~/.config/leap/providers/%s/openvpn.conf' - #% constants.DEFAULT_TEST_PROVIDER)) return args # build command string -- cgit v1.2.3