test: Add test script support for pptp/l2tp

Modify connect-vpn script to handle pptp/l2tp connection.

diff --git a/test/connect-vpn b/test/connect-vpn
index 4e1fc7c..15128c8 100755 (executable)
--- a/test/connect-vpn
+++ b/test/connect-vpn
@@ -9,6 +9,10 @@ if (len(sys.argv) < 4):
        print "      <name> <host> <domain> <cookie> [servercert]"
        print "  type: openvpn"
        print "      <name> <host> <domain> [<cafile> <certfile> <keyfile>]"
+       print "  type: pptp"
+       print "      <name> <host> <domain> <user> <password>"
+       print "  type: l2tp"
+       print "      <name> <host> <domain> <user> <password>"
        sys.exit(1)
 
 bus = dbus.SystemBus()
@@ -47,6 +51,21 @@ elif sys.argv[1] == "openvpn":
                                                  "OpenVPN.Cert": sys.argv[6],
                                                  "OpenVPN.Key": sys.argv[7]}))
 
+elif sys.argv[1] == "pptp":
+       path = manager.ConnectProvider(({ "Type": "pptp",
+                                       "Name": sys.argv[2],
+                                       "Host": sys.argv[3],
+                                       "VPN.Domain": sys.argv[4],
+                                       "PPTP.User": sys.argv[5],
+                                       "PPTP.Password": sys.argv[6]}))
+elif sys.argv[1] == "l2tp":
+       path = manager.ConnectProvider(({ "Type": "l2tp",
+                                       "Name": sys.argv[2],
+                                       "Host": sys.argv[3],
+                                       "VPN.Domain": sys.argv[4],
+                                       "L2TP.User": sys.argv[5],
+                                       "L2TP.Password": sys.argv[6]}))
+
 else:
        print "Unknown VPN type"
        sys.exit(1)