Merge lp:~gocept/landscape-client/py3-monitor-networkdevice into lp:~landscape/landscape-client/trunk

[Steffen Allner]

This is the Py3 port of landscape.monitor.networkdevice.

It involves bytes/unicode fixes.

To fulfill the message schema we have to encode some device data in landscape.monitor.networkdevice

Side note: We could have used the already removed encode_dict_if_needed() from [0].

[0] http://bazaar.launchpad.net/~gocept/landscape-client/py3-manager-usermanager/revision/983

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make ci-check
Result: Success
Revno: 994
Branch: lp:~gocept/landscape-client/py3-monitor-networkdevice
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3817/

review: Approve (test results)

[Eric Snow (ericsnowcurrently)]

LGTM

review: Approve

[Daniel Havlik (nilo)]

+1

review: Approve

=== modified file 'landscape/monitor/networkdevice.py'
--- landscape/monitor/networkdevice.py	2013-07-05 12:52:40 +0000
+++ landscape/monitor/networkdevice.py	2017-03-29 14:44:04 +0000
@@ -4,6 +4,7 @@
 
 from landscape.monitor.plugin import DataWatcher
 from landscape.lib.network import get_active_device_info
+from landscape.lib.encoding import encode_if_needed
 
 
 class NetworkDevice(DataWatcher):
@@ -29,10 +30,17 @@
             # We need to split the message in two top-level keys (see bug)
             device_speeds = []
             for device in device_data:
-                speed_entry = {"interface": device["interface"]}
+                speed_entry = {
+                    "interface": encode_if_needed(device["interface"])}
                 speed_entry["speed"] = device.pop("speed")
                 speed_entry["duplex"] = device.pop("duplex")
                 device_speeds.append(speed_entry)
+                device["interface"] = encode_if_needed(device["interface"])
+                device["ip_address"] = encode_if_needed(device["ip_address"])
+                device["mac_address"] = encode_if_needed(device["mac_address"])
+                device["broadcast_address"] = encode_if_needed(
+                    device["broadcast_address"])
+                device["netmask"] = encode_if_needed(device["netmask"])
 
             return {"type": self.message_type,
                     "devices": device_data,

=== modified file 'py3_ready_tests'
--- py3_ready_tests	2017-03-29 14:44:04 +0000
+++ py3_ready_tests	2017-03-29 14:44:04 +0000
@@ -12,5 +12,5 @@
 landscape.monitor.tests.test_mountinfo
 landscape.monitor.tests.test_computerinfo
 landscape.monitor.tests.test_loadaverage
-
+landscape.monitor.tests.test_networkdevice