diff options
| author | Patrik Flykt <patrik.flykt@linux.intel.com> | 2011-10-31 15:31:44 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-11-07 17:40:08 +0100 |
| commit | d131079698d74ffde3bc75d0cd3d1e441dcbadff (patch) | |
| tree | 92ce381efe4bb41985c8f62ee33499e0f1024273 /test | |
| parent | 0dec9ae6d61c72ed04a7b6c817f315769c70b673 (diff) | |
| download | connman-d131079698d74ffde3bc75d0cd3d1e441dcbadff.tar.gz connman-d131079698d74ffde3bc75d0cd3d1e441dcbadff.tar.bz2 connman-d131079698d74ffde3bc75d0cd3d1e441dcbadff.zip | |
test: Connecting a saved provider does not need all arguments
Diffstat (limited to 'test')
| -rwxr-xr-x | test/connect-vpn | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/test/connect-vpn b/test/connect-vpn index a43c4cdb..4e1fc7cf 100755 --- a/test/connect-vpn +++ b/test/connect-vpn @@ -8,7 +8,7 @@ if (len(sys.argv) < 4): print " type: openconnect" print " <name> <host> <domain> <cookie> [servercert]" print " type: openvpn" - print " <name> <host> <domain> <cafile> <certfile> <keyfile>" + print " <name> <host> <domain> [<cafile> <certfile> <keyfile>]" sys.exit(1) bus = dbus.SystemBus() @@ -33,13 +33,20 @@ if sys.argv[1] == "openconnect": "VPN.Domain": sys.argv[4], "OpenConnect.Cookie": sys.argv[5]})) elif sys.argv[1] == "openvpn": - path = manager.ConnectProvider(({ "Type": "openvpn", - "Name": sys.argv[2], - "Host": sys.argv[3], - "VPN.Domain": sys.argv[4], - "OpenVPN.CACert": sys.argv[5], - "OpenVPN.Cert": sys.argv[6], - "OpenVPN.Key": sys.argv[7]})) + if (len(sys.argv) < 6): + path = manager.ConnectProvider(({ "Type": "openvpn", + "Name": sys.argv[2], + "Host": sys.argv[3], + "VPN.Domain": sys.argv[4] })) + else: + path = manager.ConnectProvider(({ "Type": "openvpn", + "Name": sys.argv[2], + "Host": sys.argv[3], + "VPN.Domain": sys.argv[4], + "OpenVPN.CACert": sys.argv[5], + "OpenVPN.Cert": sys.argv[6], + "OpenVPN.Key": sys.argv[7]})) + else: print "Unknown VPN type" sys.exit(1) |