Release tizen_2.0_beta

[framework/connectivity/connman.git] / test / simple-agent

diff --git a/test/simple-agent b/test/simple-agent
index 5c73599..d3bb315 100755 (executable)
--- a/test/simple-agent
+++ b/test/simple-agent
@@ -11,8 +11,11 @@ class Canceled(dbus.DBusException):
        _dbus_error_name = "net.connman.Error.Canceled"
 
 class Agent(dbus.service.Object):
+       identity = None
        passphrase = None
        wpspin = None
+       username = None
+       password = None
 
        @dbus.service.method("net.connman.Agent",
                                        in_signature='', out_signature='')
@@ -20,32 +23,69 @@ class Agent(dbus.service.Object):
                print("Release")
                mainloop.quit()
 
-       @dbus.service.method("net.connman.Agent",
-                                       in_signature='oa{sv}',
-                                       out_signature='a{sv}')
-       def RequestInput(self, path, fields):
-               print "RequestInput (%s,%s)" % (path, fields)
+       def input_passphrase(self):
+               response = {}
 
-               if not self.passphrase and not self.wpspin:
+               if not self.identity and not self.passphrase and not self.wpspin:
                        args = raw_input('Answer: ')
 
-                       response = {}
-
                        for arg in args.split():
+                               if arg.startswith("Identity="):
+                                       identity = arg.replace("Identity=", "", 1)
+                                       response["Identity"] = identity
                                if arg.startswith("Passphrase="):
                                        passphrase = arg.replace("Passphrase=", "", 1)
                                        response["Passphrase"] = passphrase
-                                       break
                                if arg.startswith("WPS="):
                                        wpspin = arg.replace("WPS=", "", 1)
                                        response["WPS"] = wpspin
                                        break
                else:
+                       if self.identity:
+                               response["Identity"] = self.identity
                        if self.passphrase:
                                response["Passphrase"] = self.passphrase
-                       else:
+                       if self.wpspin:
                                response["WPS"] = self.wpspin
 
+               return response
+
+       def input_username(self):
+               response = {}
+
+               if not self.username and not self.password:
+                       args = raw_input('Answer: ')
+
+                       for arg in args.split():
+                               if arg.startswith("Username="):
+                                       username = arg.replace("Username=", "", 1)
+                                       response["Username"] = username
+                               if arg.startswith("Password="):
+                                       password = arg.replace("Password=", "", 1)
+                                       response["Password"] = password
+               else:
+                       if self.username:
+                               response["Username"] = self.username
+                       if self.password:
+                               response["Password"] = self.password
+
+               return response
+
+       @dbus.service.method("net.connman.Agent",
+                                       in_signature='oa{sv}',
+                                       out_signature='a{sv}')
+       def RequestInput(self, path, fields):
+               print "RequestInput (%s,%s)" % (path, fields)
+
+               response = None
+
+               if fields.has_key("Passphrase"):
+                       response = self.input_passphrase()
+               elif fields.has_key("Username"):
+                       response = self.input_username()
+               else:
+                       print "No method to answer the input request"
+
                print "returning (%s)" % (response)
 
                return response
@@ -71,8 +111,12 @@ class Agent(dbus.service.Object):
                print "Cancel"
 
 def print_usage():
-       print "Usage: %s Passphrase=<passphrase> WPS=<wpspin>" % (sys.argv[0])
-       print "Help: %s help" % (sys.ar[0])
+       print "Usage:"
+       print "For EAP/WPA input:"
+       print "%s Identity=<identity> Passphrase=<passphrase> WPS=<wpspin>" % (sys.argv[0])
+       print "For WISPr login input:"
+       print "%s Username=<username> Password=<password>" % (sys.argv[0])
+       print "Help: %s help" % (sys.argv[0])
        sys.exit(1)
 
 if __name__ == '__main__':
@@ -90,10 +134,16 @@ if __name__ == '__main__':
 
        if len(sys.argv) >= 2:
                for arg in sys.argv[1:]:
-                       if arg.startswith("Passphrase="):
+                       if arg.startswith("Identity="):
+                               object.identity = arg.replace("Identity=", "", 1)
+                       elif arg.startswith("Passphrase="):
                                object.passphrase = arg.replace("Passphrase=", "", 1)
                        elif arg.startswith("WPS="):
                                object.wpspin = arg.replace("WPS=", "", 1)
+                       elif arg.startswith("Username="):
+                               object.username = arg.replace("Username=", "", 1)
+                       elif arg.startswith("Password="):
+                               object.password = arg.replace("Password=", "", 1)
                        else:
                                print_usage()