From d131079698d74ffde3bc75d0cd3d1e441dcbadff Mon Sep 17 00:00:00 2001
From: Patrik Flykt <patrik.flykt@linux.intel.com>
Date: Mon, 31 Oct 2011 15:31:44 +0200
Subject: test: Connecting a saved provider does not need all arguments

---
 test/connect-vpn | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'test')

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)
-- 
cgit v1.2.3