shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-30 22:50:10 +03:00
Code Releases Wiki Activity

B #5659: Remove NIC external attribute (#1939)

Browse Source
This commit is contained in:
Frederick Borges 2022-04-13 13:19:06 +02:00 committed by GitHub
parent 49a5f62c47
commit 451d2e7983
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 3 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network.js
View File

@ -204,7 +204,7 @@ define(function(require) {
nicTab.fill(nicContext, nicJSON);
if (nicJSON.PARENT) {
nicTab.fill_alias(nicJSON.PARENT, nicJSON.EXTERNAL);
nicTab.fill_alias(nicJSON.PARENT);
}
});

4
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/nic-tab.js
View File

@ -427,10 +427,6 @@ define(function(require) {
delete nicJSON["PARENT"];
} else {
nicJSON["PARENT"] = $("#" + this.nicTabId + "_alias_parent", context).val();
if ($("#" + this.nicTabId + "_alias_external", context).is(':checked')) {
nicJSON["EXTERNAL"] = 'YES';
}
}
if($("input#" + this.nicTabId + "_rdp", context).prop("checked")) {

12
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/nic-tab/html.hbs
View File

@ -35,18 +35,6 @@
</span>
<select id="{{nicTabId}}_alias_parent" style="width: 200px; margin-left: 5px"></select>
</div>
<div id="{{nicTabId}}_alias_external_wrapper" style="min-height: 40px;">
<div class="switch left">
<input class="switch-input" id="{{nicTabId}}_alias_external" type="checkbox">
<label class="switch-paddle" for="{{nicTabId}}_alias_external">
</label>
</div>
<label class="left">
&nbsp;&nbsp;
{{tr "External"}}
{{{tip (tr "The NIC will be attached as an external alias of the VM")}}}
</label>
</div>
</fieldset>
<fieldset class="small-12 large-6 columns">
<legend style="margin:0px;">{{tr "Network selection"}}</legend>

4
src/sunstone/public/app/tabs/vms-tab/dialogs/attach-nic.js
View File

@ -96,10 +96,6 @@ define(function(require) {
if($("#cb_attach_alias", context).prop("checked")) {
templateJSON.PARENT = $("#parent").val();
if ($('#cb_external').is(':checked')) {
templateJSON.EXTERNAL = 'YES'
}
var obj = {
"NIC_ALIAS": templateJSON

5
src/sunstone/public/app/tabs/vms-tab/dialogs/attach-nic/html.hbs
View File

@ -35,11 +35,6 @@
<select id="parent" style="width: 200px; margin-bottom: 0;"></select>
<br>
</div>
<div class="attach_external" style="min-height: 50px;">
<label>
<input type="checkbox" id="cb_external" style="margin-left: 15px"> {{tr "External"}}
</label>
</div>
{{{nicTabHTML}}}
<div class="reveal-footer">
<div class="form_buttons">

14
src/sunstone/public/app/utils/nics-section.js
View File

@ -171,17 +171,11 @@ define(function(require) {
if($("input#" + that.id + "_interface_type", context).prop("checked")) {
if ($("#" + that.id + "_alias_parent", context).val() != "INVALID") {
nic["PARENT"] = $("#" + that.id + "_alias_parent", context).val();
if ($("#" + that.id + "_alias_external", context).is(':checked')) {
nic["EXTERNAL"] = 'YES';
}
} else {
delete nic["PARENT"];
delete nic["EXTERNAL"];
}
} else {
delete nic["PARENT"];
delete nic["EXTERNAL"];
}
(Boolean($("input#" + that.id + "_rdp", context).prop("checked")))
@ -561,7 +555,7 @@ define(function(require) {
Foundation.reInit(context);
if(options.nic && options.nic.PARENT) {
_fill_alias(options.nic.PARENT, options.nic.EXTERNAL);
_fill_alias(options.nic.PARENT);
}
// fill rdp connection
@ -728,7 +722,7 @@ define(function(require) {
}
}
function _fill_alias(nicParentName, isExternal) {
function _fill_alias(nicParentName) {
$.each(_nics, function(_, value) {
if (value.NAME === ("NIC" + nicId)) {
value.ALIAS = nicParentName;
@ -740,10 +734,6 @@ define(function(require) {
$("#provision_accordion_dd_" + provision_nic_accordion_dd_id + "_alias_parent", this.context).click();
$("#provision_accordion_dd_" + provision_nic_accordion_dd_id + "_interface_type", this.context).click();
$("#provision_accordion_dd_" + provision_nic_accordion_dd_id + "_alias_parent", this.context).val(nicParentName);
if (isExternal && String(isExternal).toLowerCase() === 'yes') {
$("#provision_accordion_dd_" + provision_nic_accordion_dd_id + "_alias_external", this.context).prop('checked', 'checked');
}
}
function _hide_remove() {

12
src/sunstone/public/app/utils/nics-section/dd.hbs
View File

@ -43,18 +43,6 @@
</span>
<select id="provision_accordion_dd_{{provision_nic_accordion_dd_id}}_alias_parent" style="width: 200px; margin-left: 5px"></select>
</div>
<div id="provision_accordion_dd_{{provision_nic_accordion_dd_id}}_alias_external_wrapper" style="min-height: 40px;">
<div class="switch left">
<input class="switch-input" id="provision_accordion_dd_{{provision_nic_accordion_dd_id}}_alias_external" type="checkbox">
<label class="switch-paddle" for="provision_accordion_dd_{{provision_nic_accordion_dd_id}}_alias_external">
</label>
</div>
<label class="left">
&nbsp;&nbsp;
{{tr "External"}}
{{{tip (tr "The NIC will be attached as an external alias of the VM")}}}
</label>
</div>
</fieldset>
{{/if}}
{{#if displaySelection}}