From a2480da5d34d95860ac0a3b90a412de6dd9b536d Mon Sep 17 00:00:00 2001
From: Shu Muto <shu.mutow@gmail.com>
Date: Wed, 13 Jun 2018 11:15:59 +0900
Subject: [PATCH] Add "host" parameter for image pull

Also, this patch marks "repo" and "host" as "required".

This patch implements pull-down input for specifying host.
To compose the pull-down, this patch imlements
REST API and Angular service for retrieving host list.

Change-Id: Iba8f440f6d8339e1353bb64c26c25a493c874f63
Implements: blueprint image-host
---
 zun_ui/api/client.py                          | 11 +++++--
 zun_ui/api/rest_api.py                        | 16 +++++++++
 .../images/actions/workflow.service.js        | 33 +++++++++++++++++--
 .../static/dashboard/container/zun.service.js | 13 +++++++-
 4 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/zun_ui/api/client.py b/zun_ui/api/client.py
index b49c756..f783fe7 100644
--- a/zun_ui/api/client.py
+++ b/zun_ui/api/client.py
@@ -267,11 +267,18 @@ def availability_zone_list(request):
 
 
 def image_list(request, limit=None, marker=None, sort_key=None,
-               sort_dir=None, detail=True):
+               sort_dir=None, detail=False):
+    # FIXME(shu-mutou): change "detail" param to True, if it enabled.
     return zunclient(request).images.list(limit, marker, sort_key,
-                                          sort_dir, False)
+                                          sort_dir, detail)
 
 
 def image_create(request, **kwargs):
     args, run = _cleanup_params(IMAGE_PULL_ATTRS, True, **kwargs)
     return zunclient(request).images.create(**args)
+
+
+def host_list(request, limit=None, marker=None, sort_key=None,
+              sort_dir=None, detail=False):
+    return zunclient(request).hosts.list(limit, marker, sort_key,
+                                         sort_dir, detail)
diff --git a/zun_ui/api/rest_api.py b/zun_ui/api/rest_api.py
index cd7bdf0..3311f1a 100644
--- a/zun_ui/api/rest_api.py
+++ b/zun_ui/api/rest_api.py
@@ -188,3 +188,19 @@ class Images(generic.View):
         return rest_utils.CreatedResponse(
             '/api/zun/image/%s' % new_image.uuid,
             new_image.to_dict())
+
+
+@urls.register
+class Hosts(generic.View):
+    """API for Zun Hosts"""
+    url_regex = r'zun/hosts/$'
+
+    @rest_utils.ajax()
+    def get(self, request):
+        """Get a list of the Hosts for admin users.
+
+        The returned result is an object with property 'items' and each
+        item under this is a HOst.
+        """
+        result = client.host_list(request)
+        return {'items': [change_to_id(i.to_dict()) for i in result]}
diff --git a/zun_ui/static/dashboard/container/images/actions/workflow.service.js b/zun_ui/static/dashboard/container/images/actions/workflow.service.js
index d497884..9969a3c 100644
--- a/zun_ui/static/dashboard/container/images/actions/workflow.service.js
+++ b/zun_ui/static/dashboard/container/images/actions/workflow.service.js
@@ -26,16 +26,21 @@
     .factory('horizon.dashboard.container.images.actions.workflow', workflow);
 
   workflow.$inject = [
+    'horizon.app.core.openstack-service-api.zun',
     'horizon.framework.util.i18n.gettext'
   ];
 
-  function workflow(gettext) {
+  function workflow(zun, gettext) {
     var workflow = {
       init: init
     };
 
     function init(actionType, title, submitText) {
+      var push = Array.prototype.push;
       var schema, form, model;
+      var hosts = [
+        {value: "", name: gettext("Select host that stores the image.")}
+      ];
 
       // schema
       schema = {
@@ -44,6 +49,10 @@
           repo: {
             title: gettext('Image'),
             type: 'string'
+          },
+          host: {
+            title: gettext('Host'),
+            type: 'string'
           }
         }
       };
@@ -60,7 +69,14 @@
               items: [
                 {
                   key: 'repo',
-                  placeholder: gettext('Name of the image.')
+                  placeholder: gettext('Name of the image.'),
+                  required: true
+                },
+                {
+                  key: 'host',
+                  type: "select",
+                  titleMap: hosts,
+                  required: true
                 }
               ]
             }
@@ -69,9 +85,20 @@
       ]; // form
 
       model = {
-        repo: ''
+        repo: '',
+        host: ''
       };
 
+      // get hosts for zun
+      zun.getHosts().then(onGetZunHosts);
+      function onGetZunHosts(response) {
+        var hs = [];
+        response.data.items.forEach(function (host) {
+          hs.push({value: host.id, name: host.hostname});
+        });
+        push.apply(hosts, hs);
+      }
+
       var config = {
         title: title,
         submitText: submitText,
diff --git a/zun_ui/static/dashboard/container/zun.service.js b/zun_ui/static/dashboard/container/zun.service.js
index b9b4982..799d968 100644
--- a/zun_ui/static/dashboard/container/zun.service.js
+++ b/zun_ui/static/dashboard/container/zun.service.js
@@ -28,6 +28,7 @@
     var containersPath = '/api/zun/containers/';
     var zunAvailabilityZonesPath = '/api/zun/availability_zones/';
     var imagesPath = '/api/zun/images/';
+    var hostsPath = '/api/zun/hosts/';
     var service = {
       createContainer: createContainer,
       updateContainer: updateContainer,
@@ -52,7 +53,8 @@
       updatePortSecurityGroup: updatePortSecurityGroup,
       getZunAvailabilityZones: getZunAvailabilityZones,
       pullImage: pullImage,
-      getImages: getImages
+      getImages: getImages,
+      getHosts: getHosts
     };
 
     return service;
@@ -208,6 +210,15 @@
       return apiService.get(imagesPath).error(error(msg));
     }
 
+    ///////////
+    // Hosts //
+    ///////////
+
+    function getHosts() {
+      var msg = gettext('Unable to retrieve the Hosts.');
+      return apiService.get(hostsPath).error(error(msg));
+    }
+
     function error(message) {
       return function() {
         toastService.add('error', message);