diff options
| author | Ludovic Ferrandis <ludovic.ferrandis@intel.com> | 2013-09-11 15:49:51 +0200 |
|---|---|---|
| committer | Ludovic Ferrandis <ludovic.ferrandis@intel.com> | 2013-10-02 19:11:52 +0200 |
| commit | 21c4ff0e1d94454915eceaef3461cb2bdf3010f7 (patch) | |
| tree | 3782d0d057c77d54bb900d51e95477febf1dfcab /test | |
| parent | 64ad1c620dec35539c97b14f3560cc8372cbe6ca (diff) | |
| download | dleyna-server-21c4ff0e1d94454915eceaef3461cb2bdf3010f7.tar.gz | |
[Network Filtering] New API and save
- Remove all WhiteListxxx API
- Add Set() to 'org.freedesktop.DBus.Properties' interface to
'com.intel.dLeynaServer.Manager' root interface
Signed-off-by: Ludovic Ferrandis <ludovic.ferrandis@intel.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/dbus/mediaconsole.py | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/test/dbus/mediaconsole.py b/test/dbus/mediaconsole.py index 45863a7..d54bb84 100644 --- a/test/dbus/mediaconsole.py +++ b/test/dbus/mediaconsole.py @@ -198,11 +198,11 @@ class UPNP(object): self._manager = dbus.Interface(bus.get_object( 'com.intel.dleyna-server', '/com/intel/dLeynaServer'), - 'com.intel.dLeynaServer.Manager') + 'com.intel.dLeynaServer.Manager') self._propsIF = dbus.Interface(bus.get_object( 'com.intel.dleyna-server', '/com/intel/dLeynaServer'), - 'org.freedesktop.DBus.Properties') + 'org.freedesktop.DBus.Properties') def get_props(self, iface = ""): return self._propsIF.GetAll(iface) @@ -210,6 +210,9 @@ class UPNP(object): def get_prop(self, prop_name, iface = ""): return self._propsIF.Get(iface, prop_name) + def set_prop(self, prop_name, val, iface = ""): + return self._propsIF.Set(iface, prop_name, val) + def print_prop(self, prop_name, iface = ""): print_properties(self._propsIF.Get(iface, prop_name)) @@ -261,13 +264,17 @@ class UPNP(object): self._manager.Rescan() def white_list_enable(self, enable): - self._manager.WhiteListEnable(enable) + self.set_prop("WhiteListEnabled", enable) def white_list_add(self, entries): - self._manager.WhiteListAddEntries(entries) + white_list = set(self.get_prop('WhiteListEntries')) + white_list = white_list | set(entries) + self.set_prop("WhiteListEntries", list(white_list)) def white_list_remove(self, entries): - self._manager.WhiteListRemoveEntries(entries) + white_list = set(self.get_prop('WhiteListEntries')) + white_list = white_list - set(entries) + self.set_prop("WhiteListEntries", list(white_list)) def white_list_clear(self): - self._manager.WhiteListClear() + self.set_prop("WhiteListEntries", ['']) |