shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-07 17:17:41 +03:00
Code Releases Wiki Activity

F #4081: Move NSX attributes (#4816)

Browse Source
This commit is contained in:
Frederick Borges 2020-05-26 17:56:31 +02:00 committed by GitHub
parent 9ffb303d96
commit 4cab35f77a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sunstone/public/app/tabs/hosts-tab/panels/info.js
View File

@ -71,6 +71,7 @@ define(function(require) {
// object to be used when the host info is updated.
that.unshownTemplate = {};
that.strippedTemplateVcenter = {};
that.strippedTemplateNSX = {};
that.strippedTemplate = {};
var unshownKeys = ["HOST", "VM", "WILDS", "ZOMBIES", "RESERVED_CPU", "RESERVED_MEM", "EC2_ACCESS", "EC2_SECRET", "CAPACITY", "REGION_NAME"];
$.each(that.element.TEMPLATE, function(key, value) {
@ -80,6 +81,9 @@ define(function(require) {
else if (!key.match(/^VCENTER_RESOURCE_POOL$/) && key.match(/^VCENTER_*/)){
that.strippedTemplateVcenter[key] = value;
}
else if (key.match(/^NSX_*/)){
that.strippedTemplateNSX[key] = value;
}
else {
that.strippedTemplate[key] = value;
}

22
src/sunstone/public/app/tabs/hosts-tab/panels/nsx.js
View File

@ -23,6 +23,7 @@ define(function(require) {
var Tips = require('utils/tips');
var Notifier = require('utils/notifier');
var Locale = require('utils/locale');
var TemplateTable = require("utils/panel/template-table");
/*
TEMPLATES
@ -49,9 +50,21 @@ define(function(require) {
*/
function Panel(info) {
var that = this;
this.title = Locale.tr("NSX");
this.icon = "fa-desktop";
this.element = info[RESOURCE.toUpperCase()];
// Hide information of the Wild VMs of the Host and the ESX Hosts
// in the template table. Unshow values are stored in the unshownTemplate
// object to be used when the host info is updated.
that.strippedTemplateNSX = {};
$.each(that.element.TEMPLATE, function(key, value) {
if (key.match(/^NSX_*/)){
that.strippedTemplateNSX[key] = value;
}
});
return this;
};
@ -71,7 +84,14 @@ define(function(require) {
if(this && this.element && this.element.IM_MAD && this.element.IM_MAD !== "vcenter"){
showForm=false;
}
return TemplateNsx();
// NSX Atributes Table
var templateTableHTML = TemplateTable.html(
this.strippedTemplateNSX,
RESOURCE,
Locale.tr("NSX Specific Attributes"));
return TemplateNsx({"templateTableHTML":templateTableHTML});
}
function _onShow(context){

3
src/sunstone/public/app/tabs/hosts-tab/panels/nsx/html.hbs
View File

@ -16,3 +16,6 @@
<div class="row" id="nsx-form">
</div>
<div class="row">
<div class="large-9 columns">{{{templateTableHTML}}}</div>
</div>