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

[Steffen Allner]

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

This fixes some bytes/unicode issues as well as dict mutation while iterating.

This MP considers the landscape.monitor.networkactivity module.

Fixes are an iteration over a dictview while the dict can potentially change.

Furthermore, the wire protocol requires the interface name to be bytes.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

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

review: Approve (test results)

[Adam Collard (adam-collard)]

review: Approve

[Daniel Havlik (nilo)]

+1

review: Approve

[Eric Snow (ericsnowcurrently)]

LGTM

review: Approve

=== modified file 'landscape/monitor/networkactivity.py'
--- landscape/monitor/networkactivity.py	2013-07-05 12:52:40 +0000
+++ landscape/monitor/networkactivity.py	2017-03-30 07:47:52 +0000
@@ -46,6 +46,10 @@
         items = 0
         for interface, data in list(self._network_activity.items()):
             if data:
+                # The message schema requires the interface to be bytes, so we
+                # encode it here right before the message is created as it is
+                # used as string in other places.
+                interface = interface.encode("ascii")
                 network_activity[interface] = []
                 while data and items < self.max_network_items_to_exchange:
                     item = data.pop(0)
@@ -94,7 +98,10 @@
                 yield interface, delta_out, delta_in
             self._last_activity[interface] = (
                 traffic["send_bytes"], traffic["recv_bytes"])
-        for interface in self._last_activity.keys():
+
+        # We need cast the keys to a list as the size of the dictionary changes
+        # on delete and the .keys() generator throws an error.
+        for interface in list(self._last_activity.keys()):
             if interface not in new_traffic:
                 del self._last_activity[interface]
 

=== modified file 'landscape/monitor/tests/test_networkactivity.py'
--- landscape/monitor/tests/test_networkactivity.py	2011-07-05 05:09:11 +0000
+++ landscape/monitor/tests/test_networkactivity.py	2017-03-30 07:47:52 +0000
@@ -79,9 +79,10 @@
         self.assertTrue(message)
         self.assertTrue("type" in message)
         self.assertEqual(message["type"], "network-activity")
-        self.assertEqual(message["activities"]["lo"],
+        self.assertEqual(message["activities"][b"lo"],
                          [(300, 10, 99)])
-        self.assertNotIn("eth0", message["activities"])
+        # Ensure that b"eth0" is not in activities
+        self.assertEqual(len(message["activities"]), 1)
 
     def test_proc_rollover(self):
         """
@@ -98,9 +99,10 @@
         self.assertTrue(message)
         self.assertTrue("type" in message)
         self.assertEqual(message["type"], "network-activity")
-        self.assertEqual(message["activities"]["lo"],
+        self.assertEqual(message["activities"][b"lo"],
                          [(300, 9010, 9099)])
-        self.assertNotIn("eth0", message["activities"])
+        # Ensure that b"eth0" is not in activities
+        self.assertEqual(len(message["activities"]), 1)
 
     def test_no_message_without_traffic_delta(self):
         """
@@ -182,8 +184,8 @@
         self.assertMessages(self.mstore.get_pending_messages(),
                         [{"type": "network-activity",
                           "activities": {
-                              "lo": [(step_size, 0, 1000)],
-                              "eth0": [(step_size, 0, 1000)]}}])
+                              b"lo": [(step_size, 0, 1000)],
+                              b"eth0": [(step_size, 0, 1000)]}}])
 
     def test_config(self):
         """The network activity plugin is enabled by default."""

=== modified file 'py3_ready_tests'
--- py3_ready_tests	2017-03-30 07:47:52 +0000
+++ py3_ready_tests	2017-03-30 07:47:52 +0000
@@ -13,4 +13,4 @@
 landscape.monitor.tests.test_computerinfo
 landscape.monitor.tests.test_loadaverage
 landscape.monitor.tests.test_networkdevice
-
+landscape.monitor.tests.test_networkactivity