all: changes from python 2 syntax to python3 and removing dead code
There were python 2 methods that are not used anymore so now it's in python 3. Added helper fuctions so that the code is more clear https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/540
This commit is contained in:

committed by
Thomas Haller

parent
4d878d7012
commit
7baf615eaa
@@ -50,22 +50,15 @@ def usage():
|
||||
|
||||
|
||||
bus = dbus.SystemBus()
|
||||
service_name = "org.freedesktop.NetworkManager"
|
||||
proxy = bus.get_object(service_name, "/org/freedesktop/NetworkManager/Settings")
|
||||
proxy = bus.get_object(
|
||||
"org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager/Settings"
|
||||
)
|
||||
settings = dbus.Interface(proxy, "org.freedesktop.NetworkManager.Settings")
|
||||
|
||||
if len(sys.argv) != 3:
|
||||
usage()
|
||||
|
||||
iface = sys.argv[1]
|
||||
proxy = bus.get_object(service_name, "/org/freedesktop/NetworkManager")
|
||||
nm = dbus.Interface(proxy, "org.freedesktop.NetworkManager")
|
||||
devpath = nm.GetDeviceByIpIface(iface)
|
||||
|
||||
# Find our existing hotspot connection
|
||||
connection_path = None
|
||||
for path in settings.ListConnections():
|
||||
proxy = bus.get_object(service_name, path)
|
||||
proxy = bus.get_object("org.freedesktop.NetworkManager", path)
|
||||
settings_connection = dbus.Interface(
|
||||
proxy, "org.freedesktop.NetworkManager.Settings.Connection"
|
||||
)
|
||||
@@ -78,13 +71,25 @@ for path in settings.ListConnections():
|
||||
if not connection_path:
|
||||
connection_path = settings.AddConnection(con)
|
||||
|
||||
|
||||
if len(sys.argv) != 3:
|
||||
usage()
|
||||
|
||||
# Get device using iface
|
||||
iface = sys.argv[1]
|
||||
proxy = bus.get_object(
|
||||
"org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager"
|
||||
)
|
||||
nm = dbus.Interface(proxy, "org.freedesktop.NetworkManager")
|
||||
devpath = nm.GetDeviceByIpIface(iface)
|
||||
|
||||
# Now start or stop the hotspot on the requested device
|
||||
proxy = bus.get_object(service_name, devpath)
|
||||
proxy = bus.get_object("org.freedesktop.NetworkManager", devpath)
|
||||
device = dbus.Interface(proxy, "org.freedesktop.NetworkManager.Device")
|
||||
operation = sys.argv[2]
|
||||
if operation == "up":
|
||||
acpath = nm.ActivateConnection(connection_path, devpath, "/")
|
||||
proxy = bus.get_object(service_name, acpath)
|
||||
proxy = bus.get_object("org.freedesktop.NetworkManager", acpath)
|
||||
active_props = dbus.Interface(proxy, "org.freedesktop.DBus.Properties")
|
||||
|
||||
# Wait for the hotspot to start up
|
||||
|
Reference in New Issue
Block a user