Add basic Machine Provider UI

appengine/machine_provider/models.py

 # Copyright 2015 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """Datastore models for the Machine Provider messages."""
 
 import hashlib
 
 from google.appengine.ext import ndb
 from google.appengine.ext.ndb import msgprop
@@ skipping 21 matching lines @@
   Key:
     id: Hash of the client + client-generated request ID which issued the
       original rpc_messages.LeaseRequest instance. Used for easy deduplication.
     kind: LeaseRequest. This root entity does not reference any parents.
   """
   # DateTime indicating original datastore write time.
   created_ts = ndb.DateTimeProperty(auto_now_add=True)
   # Checksum of the rpc_messages.LeaseRequest instance. Used to compare incoming
   # LeaseRequets for deduplication.
   deduplication_checksum = ndb.StringProperty(required=True, indexed=False)
+  # DateTime indicating the last modification time.
+  last_modified_ts = ndb.DateTimeProperty(auto_now=True)

[M-A Ruel, 2016/07/30 01:41:58]

FYI only. auto_now is impossible to work around when one has to do a map reduce
to update a schema, that's why I prefer to update the timestamp manually but
it's more work.

[smut, 2016/08/02 23:26:33]

Acknowledged.

   # ID of the CatalogMachineEntry provided for this lease.
   machine_id = ndb.StringProperty()
   # auth.model.Identity of the issuer of the original request.
   owner = auth.IdentityProperty(required=True)
   # Whether this lease request has been released voluntarily by the owner.
   released = ndb.BooleanProperty()
   # rpc_messages.LeaseRequest instance representing the original request.
   request = msgprop.MessageProperty(rpc_messages.LeaseRequest, required=True)
   # rpc_messages.LeaseResponse instance representing the current response.
   # This field will be updated as the request is being processed.
@@ skipping 44 matching lines @@
 
 class CatalogEntry(ndb.Model):
   """Datastore representation of an entry in the catalog."""
   # rpc_messages.Dimensions describing this machine.
   dimensions = msgprop.MessageProperty(
       rpc_messages.Dimensions,
       indexed_fields=[
           field.name for field in rpc_messages.Dimensions.all_fields()
       ],
   )
+  # DateTime indicating the last modified time.
+  last_modified_ts = ndb.DateTimeProperty(auto_now=True)
 
 
 class CatalogCapacityEntry(CatalogEntry):
   """Datastore representation of machine capacity in the catalog.
 
   Key:
     id: Hash of the non-None dimensions, where backend is the only required
       dimension. Used to enforce per-backend dimension uniqueness.
     kind: CatalogCapacityEntry. This root entity does not reference any parents.
   """
@@ skipping 67 matching lines @@
   # rpc_messages.Policies governing this machine.
   policies = msgprop.MessageProperty(rpc_messages.Policies)
   # Cloud Pub/Sub subscription the machine must listen to for instructions.
   pubsub_subscription = ndb.StringProperty(indexed=False)
   # Project the Cloud Pub/Sub subscription exists in.
   pubsub_subscription_project = ndb.StringProperty(indexed=False)
   # Cloud Pub/Sub topic the machine must be subscribed to.
   pubsub_topic = ndb.StringProperty(indexed=False)
   # Project the Cloud Pub/Sub topic exists in.
   pubsub_topic_project = ndb.StringProperty(indexed=False)
+  # Determines sorted order relative to other CatalogMachineEntries.
+  sort_ordering = ndb.ComputedProperty(lambda self: '%s:%s' % (
+      self.dimensions.backend, self.dimensions.hostname))
   # Element of CatalogMachineEntryStates giving the state of this entry.
   state = ndb.StringProperty(
       choices=CatalogMachineEntryStates,
       default=CatalogMachineEntryStates.AVAILABLE,
       indexed=True,
       required=True,
   )
 
   @classmethod
   def create_and_put(cls, dimensions, policies, state):
@@ skipping 37 matching lines @@
 
     Args:
       *filters: Any additional filters to include in the query.
 
     Yields:
       CatalogMachineEntry keys in no guaranteed order.
     """
     available = cls.state == CatalogMachineEntryStates.AVAILABLE
     for machine in cls.query(available, *filters).fetch(keys_only=True):
       yield machine