From 9528a0fe360cf2320d75e2f4e9ea590e0d424379 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Mon, 18 Jan 2016 16:22:32 +0100 Subject: [PATCH] feature #4273: Add IM_MAD and VM_MAD info --- src/sunstone/public/app/sunstone-config.js | 12 +++++++ .../app/tabs/hosts-tab/form-panels/create.js | 21 ++++++++++- .../hosts-tab/form-panels/create/wizard.hbs | 35 ++++++------------- src/sunstone/sunstone-server.rb | 4 ++- 4 files changed, 45 insertions(+), 27 deletions(-) diff --git a/src/sunstone/public/app/sunstone-config.js b/src/sunstone/public/app/sunstone-config.js index 03da60bfd9..04000a5579 100644 --- a/src/sunstone/public/app/sunstone-config.js +++ b/src/sunstone/public/app/sunstone-config.js @@ -28,6 +28,8 @@ define(function(require) { }; var _dsMadConf = {}; + var _imMadConf = {}; + var _vmMadConf = {}; var Config = { 'isTabEnabled': function(tabName) { @@ -155,6 +157,8 @@ define(function(require) { 'enabledTabs': _config['view']['enabled_tabs'], "defaultCost" : _defaultCost, 'dsMadConf' : _dsMadConf, + 'imMadConf' : _imMadConf, + 'vmMadConf' : _vmMadConf, "initOnedConf" : function() { OpenNebulaSystem.onedconf({ data : {}, @@ -175,6 +179,14 @@ define(function(require) { if (onedconf.DS_MAD_CONF != undefined){ $.extend(true, _dsMadConf, onedconf.DS_MAD_CONF); } + + if (onedconf.IM_MAD != undefined){ + $.extend(true, _imMadConf, onedconf.IM_MAD); + } + + if (onedconf.VM_MAD != undefined){ + $.extend(true, _vmMadConf, onedconf.VM_MAD); + } }, error: function(request, error_json){ console.error("There was an error requesting oned.conf: "+ diff --git a/src/sunstone/public/app/tabs/hosts-tab/form-panels/create.js b/src/sunstone/public/app/tabs/hosts-tab/form-panels/create.js index 7aeab92ea3..84a9e429c9 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/hosts-tab/form-panels/create.js @@ -28,6 +28,7 @@ define(function(require) { var VCenterClusters = require('utils/vcenter/clusters'); var VCenterTemplates = require('utils/vcenter/templates'); var VCenterNetworks = require('utils/vcenter/networks'); + var Config = require('sunstone-config'); /* TEMPLATES @@ -61,6 +62,22 @@ define(function(require) { this.vCenterNetworks = new VCenterNetworks(); this.vCenterTemplates = new VCenterTemplates(); + var that = this; + + that.vmMadNameList = []; + if (Config.vmMadConf !== undefined) { + $.each(Config.vmMadConf, function(index, vmMad) { + that.vmMadNameList.push(vmMad["NAME"]); + }); + } + + that.imMadNameList = []; + if (Config.imMadConf !== undefined) { + $.each(Config.imMadConf, function(index, imMad) { + that.imMadNameList.push(imMad["NAME"]); + }); + } + BaseFormPanel.call(this); }; @@ -83,7 +100,9 @@ define(function(require) { 'formPanelId': this.formPanelId, 'vCenterClustersHTML': this.vCenterClusters.html(), 'vCenterTemplatesHTML': this.vCenterTemplates.html(), - 'vCenterNetworksHTML': this.vCenterNetworks.html() + 'vCenterNetworksHTML': this.vCenterNetworks.html(), + 'vmMadNameList': this.vmMadNameList, + 'imMadNameList': this.imMadNameList }); } diff --git a/src/sunstone/public/app/tabs/hosts-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/hosts-tab/form-panels/create/wizard.hbs index 98b1fde6f2..85268ffacc 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/form-panels/create/wizard.hbs +++ b/src/sunstone/public/app/tabs/hosts-tab/form-panels/create/wizard.hbs @@ -19,14 +19,9 @@
@@ -71,14 +66,9 @@
@@ -92,15 +82,10 @@
- + {{#each imMadNameList}} + + {{/each}}
diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb index ea3ebcb6c5..d19609a054 100755 --- a/src/sunstone/sunstone-server.rb +++ b/src/sunstone/sunstone-server.rb @@ -527,7 +527,9 @@ get '/onedconf' do keys = [ :DEFAULT_COST, - :DS_MAD_CONF + :DS_MAD_CONF, + :VM_MAD, + :IM_MAD ] onedconf = {}