test: Connecting a saved provider does not need all arguments
authorPatrik Flykt <patrik.flykt@linux.intel.com>
Mon, 31 Oct 2011 13:31:44 +0000 (15:31 +0200)
committerSamuel Ortiz <sameo@linux.intel.com>
Mon, 7 Nov 2011 16:40:08 +0000 (17:40 +0100)
test/connect-vpn

index a43c4cd..4e1fc7c 100755 (executable)
@@ -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)