From 312a5742ea54a2b174d054260fb48607d185b53b Mon Sep 17 00:00:00 2001
From: Hiroyuki Eguchi <h-eguchi@az.jp.nec.com>
Date: Fri, 24 Mar 2017 12:31:36 +0900
Subject: [PATCH] Change the field type of flavor

Change the field type of flavor from input to select box.
User can select flavor without specifying manually.

Change-Id: I6dfb2a567d39cf621c545ce43272a3b691029817
---
 .../templates/create/spec/spec.html            | 18 ++++++++++--------
 .../create/spec/template.spec.controller.js    | 11 +++++++++--
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/meteos_ui/static/dashboard/machine_learning/templates/create/spec/spec.html b/meteos_ui/static/dashboard/machine_learning/templates/create/spec/spec.html
index 6f467d1..0294551 100644
--- a/meteos_ui/static/dashboard/machine_learning/templates/create/spec/spec.html
+++ b/meteos_ui/static/dashboard/machine_learning/templates/create/spec/spec.html
@@ -34,10 +34,11 @@
           <translate>Master Flavor</translate>
           <span class="hz-icon-required fa fa-asterisk"></span>
         </label>
-        <input name="template-master-flavor-id" type="text" class="form-control" id="template-master-flavor-id"
-               ng-model="model.newTemplateSpec.master_flavor_id"
-               ng-required="true"
-               placeholder="{$ 'Flavor ID of Master Node.'|translate $}">
+        <select class="form-control"
+                ng-model="model.newTemplateSpec.master_flavor_id"
+                ng-required="true"
+                ng-options="flavor.id as flavor.id + ':' + flavor.name for flavor in ctrl.flavors">
+        </select>
       </div>
     </div>
     <div class="col-xs-12">
@@ -58,10 +59,11 @@
           <translate>Worker Flavor</translate>
           <span class="hz-icon-required fa fa-asterisk"></span>
         </label>
-        <input name="template-worker-flavor-id" type="text" class="form-control" id="template-worker-flavor-id"
-               ng-model="model.newTemplateSpec.worker_flavor_id"
-               ng-required="true"
-               placeholder="{$ 'Flavor ID of Worker Node.'|translate $}">
+        <select class="form-control"
+                ng-model="model.newTemplateSpec.worker_flavor_id"
+                ng-required="true"
+                ng-options="flavor.id as flavor.id + ':' + flavor.name for flavor in ctrl.flavors">
+        </select>
       </div>
     </div>
     <div class="col-xs-12">
diff --git a/meteos_ui/static/dashboard/machine_learning/templates/create/spec/template.spec.controller.js b/meteos_ui/static/dashboard/machine_learning/templates/create/spec/template.spec.controller.js
index 1ffe76b..1c96c47 100644
--- a/meteos_ui/static/dashboard/machine_learning/templates/create/spec/template.spec.controller.js
+++ b/meteos_ui/static/dashboard/machine_learning/templates/create/spec/template.spec.controller.js
@@ -29,12 +29,14 @@
   createTemplateSpecController.$inject = [
     '$scope',
     'horizon.framework.util.i18n.gettext',
-    'horizon.app.core.openstack-service-api.neutron'
+    'horizon.app.core.openstack-service-api.neutron',
+    'horizon.app.core.openstack-service-api.nova'
   ];
 
-  function createTemplateSpecController($scope, gettext, neutron) {
+  function createTemplateSpecController($scope, gettext, neutron, nova) {
     var ctrl = this;
     ctrl.networks = [];
+    ctrl.flavors = [];
 
     ctrl.templateVersionOptions = [
       { label: gettext('1.6.0'), value: '1.6.0' }
@@ -44,11 +46,16 @@
 
     function init() {
       neutron.getNetworks().success(onGetNetworks);
+      nova.getFlavors().success(onGetFlavors);
     }
 
     function onGetNetworks(response) {
       ctrl.networks = response.items;
     }
 
+    function onGetFlavors(response) {
+      ctrl.flavors = response.items;
+    }
+
   }
 })();