Merge lp:~mpontillo/maas/remove-batch-key-for-discovery-websocket--bug-1627362 into lp:~maas-committers/maas/trunk

[Mike Pontillo]

Fix batch_key handling for Discovery websocket.

 * Drive-by fix to add missed batch key field to JavaScript side.
   (it was using the default)
 * Use ISO8601 date format in the web socket, so that dates from
   the websocket are in a standard format understood by SQL.
 * Add unit test for batch-listing discoveries.

Wow, just realized this is a poorly named branch, since I didn't end up removing it.

[Gavin Panella (allenap)]

I'm concerned about date+time handling and have some rambling questions, but I don't think they're a blocker for this branch.

review: Approve

=== modified file 'src/maasserver/static/js/angular/factories/discoveries.js'
--- src/maasserver/static/js/angular/factories/discoveries.js	2016-09-22 15:05:38 +0000
+++ src/maasserver/static/js/angular/factories/discoveries.js	2016-10-05 14:33:56 +0000
@@ -22,6 +22,7 @@
             PollingManager.call(this);
 
             this._pk = "discovery_id";
+            this._batchKey = "first_seen";
             this._handler = "discovery";
 
             // Poll every 10 seconds when its empty as its okay for

=== modified file 'src/maasserver/websockets/base.py'
--- src/maasserver/websockets/base.py	2016-09-27 00:47:54 +0000
+++ src/maasserver/websockets/base.py	2016-10-05 14:33:56 +0000
@@ -28,6 +28,7 @@
 
 
 DATETIME_FORMAT = "%a, %d %b. %Y %H:%M:%S"
+DATETIME_FORMAT_ISO8601 = "%Y-%m-%d %H:%M:%S.%f"
 
 
 def dehydrate_datetime(datetime):
@@ -35,6 +36,11 @@
     return datetime.strftime(DATETIME_FORMAT)
 
 
+def dehydrate_datetime_iso(datetime):
+    """Convert the `datetime` to string with `DATETIME_FORMAT`."""
+    return datetime.strftime(DATETIME_FORMAT_ISO8601)
+
+
 class HandlerError(Exception):
     """Generic exception a handler can raise."""
 

=== modified file 'src/maasserver/websockets/handlers/discovery.py'
--- src/maasserver/websockets/handlers/discovery.py	2016-09-06 20:31:47 +0000
+++ src/maasserver/websockets/handlers/discovery.py	2016-10-05 14:33:56 +0000
@@ -8,7 +8,7 @@
     ]
 
 from maasserver.models import Discovery
-from maasserver.websockets.base import dehydrate_datetime
+from maasserver.websockets.base import dehydrate_datetime_iso
 from maasserver.websockets.handlers.viewmodel import ViewModelHandler
 from provisioningserver.logger import get_maas_logger
 
@@ -39,7 +39,7 @@
         return data
 
     def dehydrate_last_seen(self, datetime):
-        return dehydrate_datetime(datetime)
+        return dehydrate_datetime_iso(datetime)
 
     def dehydrate_first_seen(self, datetime):
-        return dehydrate_datetime(datetime)
+        return dehydrate_datetime_iso(datetime)

=== modified file 'src/maasserver/websockets/handlers/tests/test_discovery.py'
--- src/maasserver/websockets/handlers/tests/test_discovery.py	2016-09-30 18:07:10 +0000
+++ src/maasserver/websockets/handlers/tests/test_discovery.py	2016-10-05 14:33:56 +0000
@@ -14,7 +14,7 @@
 from maasserver.models.discovery import Discovery
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
-from maasserver.websockets.base import dehydrate_datetime
+from maasserver.websockets.base import dehydrate_datetime_iso
 from maasserver.websockets.handlers.discovery import DiscoveryHandler
 
 
@@ -46,8 +46,8 @@
             "subnet_cidr": discovery.subnet_cidr,
             "vid": discovery.vid,
             "vlan": discovery.vlan_id,
-            "first_seen": dehydrate_datetime(discovery.first_seen),
-            "last_seen": dehydrate_datetime(discovery.last_seen)
+            "first_seen": dehydrate_datetime_iso(discovery.first_seen),
+            "last_seen": dehydrate_datetime_iso(discovery.last_seen)
         }
         return data
 
@@ -72,6 +72,29 @@
             expected_discoveries,
             handler.list({}))
 
+    def test_list_with_batch_limit(self):
+        user = factory.make_User()
+        handler = DiscoveryHandler(user, {})
+        rack = factory.make_RegionRackController()
+        rackif = rack.interface_set.first()
+        for i in range(101):
+            # Need to vary the creation times, otherwise using the first_seen
+            # time as the batch key won't work, since they'll all be created
+            # at the same time. (This won't happen on a production MAAS.)
+            factory.make_Discovery(
+                interface=rackif,
+                created="2016-01-01 00:%02d:%02d" % (i % 60, i / 60))
+        expected_discoveries = [
+            self.dehydrate_discovery(discovery, for_list=True)
+            for discovery in Discovery.objects.all()
+            ]
+        batch_key = DiscoveryHandler.Meta.batch_key
+        first_50 = handler.list({'limit': 50})
+        next_50 = handler.list({'limit': 50, 'start': first_50[-1][batch_key]})
+        last_one = handler.list({'limit': 50, 'start': next_50[-1][batch_key]})
+        self.assertItemsEqual(
+            expected_discoveries, first_50 + next_50 + last_one)
+
     def test_list_orders_by_creation_date(self):
         user = factory.make_User()
         handler = DiscoveryHandler(user, {})