Merge lp:~ack/landscape-client/ceph-message-to-ceph-usage into lp:~landscape/landscape-client/trunk

[Alberto Donato]

This reverts the message name change for ceph-usage
It preserves backwards compatibility by always sending an empty "ceph-usages" field in the message.

This reverts the message name change for ceph-usage
It preserves backwards compatibility by always sending an empty "ceph-usages" field in the message.

[Free Ekanayaka (free.ekanayaka)]

Looks good, +1!

[1]

+ "ceph-usages": List(Tuple(Int(), Int(), Int(), Int()))})

I believe this could be just:

    "ceph-usages": List(None)})

review: Approve

[lp:~ack/landscape-client/ceph-message-to-ceph-usage]

785. By Alberto Donato on 2014-05-21

Merged swift-usage into ceph-message-to-ceph-usage.

[Adam Collard (adam-collard)]

Looks good. +1

review: Approve

[lp:~ack/landscape-client/ceph-message-to-ceph-usage]

786. By Alberto Donato on 2014-05-21

Address Free's #1.

=== modified file 'landscape/message_schemas.py'
--- landscape/message_schemas.py	2014-05-21 09:02:25 +0000
+++ landscape/message_schemas.py	2014-05-21 09:02:25 +0000
@@ -123,13 +123,11 @@
     })
 
 CEPH_USAGE = Message("ceph-usage", {
-    "ceph-usages": List(Tuple(Int(), Float())),
-    "ring-id": Unicode(),
-    })
-
-CEPH = Message("ceph", {
-    "ring-id": Unicode(),
-    "usages": List(Tuple(Int(), Int(), Int(), Int()))})
+    "ring-id": Unicode(),
+    # Usage data points in the form (timestamp, size, avail, used)
+    "data-points": List(Tuple(Int(), Int(), Int(), Int())),
+    # Unused now, for backwards compatibility
+    "ceph-usages": List(None)})
 
 SWIFT_DEVICE_INFO = Message("swift-device-info", {
     "swift-device-info": List(
@@ -473,6 +471,6 @@
                CUSTOM_GRAPH, REBOOT_REQUIRED, APT_PREFERENCES, EUCALYPTUS_INFO,
                EUCALYPTUS_INFO_ERROR, NETWORK_DEVICE, NETWORK_ACTIVITY,
                REBOOT_REQUIRED_INFO, UPDATE_MANAGER_INFO, CPU_USAGE,
-               CEPH_USAGE, CEPH, SWIFT_DEVICE_INFO, KEYSTONE_TOKEN,
-               CHANGE_HA_SERVICE, JUJU_INFO, CLOUD_METADATA, SWIFT_USAGE]:
+               CEPH_USAGE, SWIFT_USAGE, SWIFT_DEVICE_INFO, KEYSTONE_TOKEN,
+               CHANGE_HA_SERVICE, JUJU_INFO, CLOUD_METADATA]:
     message_schemas[schema.type] = schema

=== modified file 'landscape/monitor/cephusage.py'
--- landscape/monitor/cephusage.py	2014-05-19 07:45:24 +0000
+++ landscape/monitor/cephusage.py	2014-05-21 09:02:25 +0000
@@ -70,25 +70,26 @@
         self.registry.reactor.call_every(
             self._monitor_interval, self._monitor.log)
         self.registry.reactor.call_on("stop", self._monitor.log, priority=2000)
-        self.call_on_accepted("ceph", self.send_message, True)
+        self.call_on_accepted("ceph-usage", self.send_message, True)
 
     def create_message(self):
         ceph_points = self._ceph_usage_points
         ring_id = self._ceph_ring_id
         self._ceph_usage_points = []
-        return {"type": "ceph",
+        return {"type": "ceph-usage",
                 "ring-id": ring_id,
-                "usages": ceph_points}
+                "ceph-usages": [],  # For backwards-compatibility
+                "data-points": ceph_points}
 
     def send_message(self, urgent=False):
         message = self.create_message()
-        if message["ring-id"] and message["usages"]:
+        if message["ring-id"] and message["data-points"]:
             self.registry.broker.send_message(
                 message, self._session_id, urgent=urgent)
 
     def exchange(self, urgent=False):
         self.registry.broker.call_if_accepted(
-            "ceph", self.send_message, urgent)
+            "ceph-usage", self.send_message, urgent)
 
     def run(self):
         if not self._should_run():
@@ -140,7 +141,7 @@
 
         step_values = []
         for name, key in names_map:
-            value = cluster_stats[key] * 1024  # Report usages in bytes
+            value = cluster_stats[key] * 1024  # Report usage in bytes
             step_value = self._accumulate(timestamp, value, "usage.%s" % name)
             step_values.append(step_value)
 

=== modified file 'landscape/monitor/tests/test_cephusage.py'
--- landscape/monitor/tests/test_cephusage.py	2014-05-19 07:45:24 +0000
+++ landscape/monitor/tests/test_cephusage.py	2014-05-21 09:02:25 +0000
@@ -14,11 +14,11 @@
 
     def test_never_exchange_empty_messages(self):
         """
-        The plugin will create a message with an empty C{usages} list when no
-        previous data is available.  If an empty message is created during
-        exchange, it should not be queued.
+        The plugin will create a message with an empty C{data-points} list
+        when no previous data is available.  If an empty message is created
+        during exchange, it should not be queued.
         """
-        self.mstore.set_accepted_types(["ceph"])
+        self.mstore.set_accepted_types(["ceph-usage"])
         self.monitor.add(self.plugin)
 
         self.monitor.exchange()
@@ -30,7 +30,7 @@
         is called.
         """
         ring_id = "whatever"
-        self.mstore.set_accepted_types(["ceph"])
+        self.mstore.set_accepted_types(["ceph-usage"])
 
         point = (60, 100000, 80000, 20000)
         self.plugin._ceph_usage_points = [point]
@@ -40,9 +40,10 @@
         self.monitor.exchange()
         self.assertMessages(
             self.mstore.get_pending_messages(),
-            [{"type": "ceph",
+            [{"type": "ceph-usage",
               "ring-id": ring_id,
-              "usages": [point]}])
+              "ceph-usages": [],
+              "data-points": [point]}])
 
     def test_create_message(self):
         """
@@ -54,22 +55,22 @@
         message = self.plugin.create_message()
 
         self.assertIn("type", message)
-        self.assertEqual(message["type"], "ceph")
-        self.assertIn("usages", message)
+        self.assertEqual(message["type"], "ceph-usage")
+        self.assertIn("data-points", message)
         self.assertEqual(ring_id, message["ring-id"])
-        ceph_usages = message["usages"]
-        self.assertEqual(len(ceph_usages), 0)
+        data_points = message["data-points"]
+        self.assertEqual(len(data_points), 0)
 
         point = (60, 100000, 80000, 20000)
         self.plugin._ceph_usage_points = [point]
         message = self.plugin.create_message()
         self.assertIn("type", message)
-        self.assertEqual(message["type"], "ceph")
-        self.assertIn("usages", message)
+        self.assertEqual(message["type"], "ceph-usage")
+        self.assertIn("data-points", message)
         self.assertEqual(ring_id, message["ring-id"])
-        ceph_usages = message["usages"]
-        self.assertEqual(len(ceph_usages), 1)
-        self.assertEqual([point], ceph_usages)
+        data_points = message["data-points"]
+        self.assertEqual(len(data_points), 1)
+        self.assertEqual([point], data_points)
 
     def test_no_message_if_not_accepted(self):
         """
@@ -88,7 +89,7 @@
         self.reactor.advance(monitor_interval * 2)
         self.monitor.exchange()
 
-        self.mstore.set_accepted_types(["ceph"])
+        self.mstore.set_accepted_types(["ceph-usage"])
         self.assertMessages(list(self.mstore.get_pending_messages()), [])
 
     def test_wb_should_run_inactive(self):