feature #4273: Add IM_MAD and VM_MAD info

This commit is contained in:
Daniel Molina committed 2016-01-18 16:22:32 +01:00
1 parent eabc88b83f
commit 9528a0fe36
4 files changed
+45 -27

No files matched your search

@@ -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: "+
@@ -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
});
}
@@ -19,14 +19,9 @@
<div class="medium-6 columns">
<label for="host_type">{{tr "Type"}}</label>
<select id="host_type_mad" name="host_type">
<option value="kvm">{{tr "KVM"}}</option>
<option value="xen">{{tr "XEN"}}</option>
<option value="vmware">{{tr "VMware"}}</option>
<option value="vcenter">{{tr "vCenter"}}</option>
<option value="az">{{tr "Microsoft Azure"}}</option>
<option value="ec2">{{tr "Amazon EC2"}}</option>
<option value="sl">{{tr "IBM Softlayer"}}</option>
<option value="dummy">{{tr "Dummy"}}</option>
{{#each vmMadNameList}}
<option value="{{this}}">{{this}}</option>
{{/each}}
<option value="custom">{{tr "Custom"}}</option>
</select>
</div>
@@ -71,14 +66,9 @@
<div class="large-12 columns">
<label for="vmm">{{tr "Virtualization"}}</label>
<select id="vmm_mad" name="vmm">
<option value="kvm">{{tr "KVM"}}</option>
<option value="xen">{{tr "XEN"}}</option>
<option value="vmware">{{tr "VMware"}}</option>
<option value="vcenter">{{tr "vCenter"}}</option>
<option value="az">{{tr "Microsoft Azure"}}</option>
<option value="ec2">{{tr "Amazon EC2"}}</option>
<option value="sl">{{tr "IBM Softlayer"}}</option>
<option value="dummy">{{tr "Dummy"}}</option>
{{#each vmMadNameList}}
<option value="{{this}}">{{this}}</option>
{{/each}}
<option value="custom">{{tr "Custom"}}</option>
</select>
</div>
@@ -92,15 +82,10 @@
<div class="manager clear row" id="im_mads">
<div class="large-12 columns">
<label for="im">{{tr "Information"}}</label>
<select id="im_mad" name="im">
<option value="kvm">{{tr "KVM"}}</option>
<option value="xen">{{tr "XEN"}}</option>
<option value="vmware">{{tr "VMware"}}</option>
<option value="vcenter">{{tr "vCenter"}}</option>
<option value="az">{{tr "Microsoft Azure"}}</option>
<option value="ec2">{{tr "Amazon EC2"}}</option>
<option value="sl">{{tr "IBM Softlayer"}}</option>
<option value="dummy">{{tr "Dummy"}}</option>
<select id="im_mad" name="im">
{{#each imMadNameList}}
<option value="{{this}}">{{this}}</option>
{{/each}}
<option value="custom">{{tr "Custom"}}</option>
</select>
</div>
+3 -1
View File
@@ -527,7 +527,9 @@ get '/onedconf' do
keys = [
:DEFAULT_COST,
:DS_MAD_CONF
:DS_MAD_CONF,
:VM_MAD,
:IM_MAD
]
onedconf = {}