Add links to MP and resolve minor fixes

appengine/swarming/handlers_endpoints.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.
 
 """This module defines Swarming Server endpoints handlers."""
 
 import datetime
 import logging
 import os
 
 from google.appengine.api import datastore_errors
 from google.appengine.ext import ndb
 import endpoints
 import gae_ts_mon
 from protorpc import messages
 from protorpc import message_types
 from protorpc import protojson
 from protorpc import remote
 
 from components import auth
 from components import datastore_utils
 from components import endpoints_webapp2
+from components import machine_provider
 from components import utils
 
 import message_conversion
 import swarming_rpcs
 from server import acl
 from server import bot_code
 from server import bot_management
 from server import config
 from server import task_pack
 from server import task_request
@@ skipping 95 matching lines @@
 @swarming_api.api_class(resource_name='server', path='server')
 class SwarmingServerService(remote.Service):
   @gae_ts_mon.instrument_endpoint()
   @auth.endpoints_method(
       message_types.VoidMessage, swarming_rpcs.ServerDetails,
       http_method='GET')
   @auth.require(acl.is_bot_or_user)
   def details(self, _request):
     """Returns information about the server."""
     host = 'https://' + os.environ['HTTP_HOST']
+
+    mpp = ''
+    if config.settings().mp and config.settings().mp.server:
+      mpp = config.settings().mp.server
+    # as a fallback, try pulling from datastore
+    if not mpp:
+      mpp = machine_provider.MachineProviderConfiguration.get_instance_url()
+    if mpp:
+      mpp = mpp + '/leases/%s'
+
     return swarming_rpcs.ServerDetails(
         bot_version = bot_code.get_bot_version(host),
-        server_version = utils.get_app_version())
+        server_version = utils.get_app_version(),
+        machine_provider_template = mpp,
+        display_server_url_template =
+            config.settings().display_server_url_template)
 
   @gae_ts_mon.instrument_endpoint()
   @auth.endpoints_method(
       message_types.VoidMessage, swarming_rpcs.BootstrapToken)
   @auth.require(acl.is_bootstrapper)
   def token(self, _request):
     """Returns a token to bootstrap a new bot."""
     return swarming_rpcs.BootstrapToken(
         bootstrap_token = bot_code.generate_bootstrap_token(),
       )
@@ skipping 578 matching lines @@
 def get_routes():
   return (
     endpoints_webapp2.api_routes(SwarmingServerService) +
     endpoints_webapp2.api_routes(SwarmingTaskService) +
     endpoints_webapp2.api_routes(SwarmingTasksService) +
     endpoints_webapp2.api_routes(SwarmingBotService) +
     endpoints_webapp2.api_routes(SwarmingBotsService) +
     # components.config endpoints for validation and configuring of luci-config
     # service URL.
     endpoints_webapp2.api_routes(config.ConfigApi))