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

F #5931: Remove all trace of ebtables (#2320)

Browse Source 
(cherry picked from commit 8bbc9ff8016b57919343b092427a18525f62f970)
This commit is contained in:
Frederick Borges 2022-10-24 15:09:41 +02:00 committed by Tino Vázquez
parent c77f6f7f2d
commit 878e969eba
3 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/sunstone/public/app/tabs/vnets-tab/form-panels/create.js
View File

@ -188,12 +188,6 @@ define(function(require) {
$("#automatic_vlan_id option[value='NO']", context).hide();
$("#phydev", context).attr("required", "");
break;
case "ebtables":
$("div.mode_param.ebtables", context).show();
$("div.mode_param.ebtables [wizard_field]", context).prop("wizard_field_disabled", false);
$("input#bridge", context).removeAttr("required");
break;
case "ovswitch":
$("div.mode_param.ovswitch", context).show();
$("#vnetCreateSecurityTab-label").hide();
@ -305,7 +299,6 @@ define(function(require) {
} else if (config["mode"] === "vcenter"){
$("#network_mode option[value=\"bridge\"]", context).hide();
$("#network_mode option[value=\"fw\"]", context).hide();
$("#network_mode option[value=\"ebtables\"]", context).hide();
$("#network_mode option[value=\"802.1Q\"]", context).hide();
$("#network_mode option[value=\"vxlan\"]", context).hide();
$("#network_mode option[value=\"ovswitch\"]", context).hide();

10
src/sunstone/public/app/tabs/vnets-tab/form-panels/create/wizard.hbs
View File

@ -93,7 +93,6 @@
<select wizard_field="VN_MAD" name="network_mode" id="network_mode">
<option value="bridge" data-form="bridge">{{tr "Bridged"}}</option>
<option value="fw" data-form="fw">{{tr "Bridged & Security Groups"}}</option>
<option value="ebtables" data-form="ebtables">{{tr "Bridged & ebtables VLAN"}}</option>
<option value="802.1Q" data-form="802.1Q">{{tr "802.1Q"}}</option>
<option value="vxlan" data-form="vxlan">{{tr "VXLAN"}}</option>
<option value="ovswitch" data-form="ovswitch">{{tr "Open vSwitch"}}</option>
@ -157,9 +156,6 @@
<div class="network_mode_description" value="fw">
{{tr "Bridged & Security Groups, bridged network with Security Group rules."}}
</div>
<div class="network_mode_description" value="ebtables">
{{tr "Bridged & ebtables VLAN, restrict network access through ebtables rules. Security Group rules are applied."}}
</div>
<div class="network_mode_description" value="802.1Q">
{{tr "802.1Q, restrict network access through VLAN tagging. Security Group rules are applied."}}
</div>
@ -182,7 +178,7 @@
</div>
<br>
<div class="row">
<div class="large-6 columns mode_param ebtables 8021Q vxlan fw ovswitch ovswitch_vxlan custom">
<div class="large-6 columns mode_param 8021Q vxlan fw ovswitch ovswitch_vxlan custom">
<label for="mac_spoofing">
<input type="checkbox" wizard_field="FILTER_MAC_SPOOFING" value="YES" name="mac_spoofing" id="mac_spoofing" />
{{tr "MAC spoofing filter"}}
@ -190,7 +186,7 @@
</div>
</div>
<div class="row">
<div class="large-6 columns mode_param ebtables 8021Q vxlan fw ovswitch ovswitch_vxlan custom">
<div class="large-6 columns mode_param 8021Q vxlan fw ovswitch ovswitch_vxlan custom">
<label for="ip_spoofing">
<input type="checkbox" wizard_field="FILTER_IP_SPOOFING" value="YES" name="ip_spoofing" id="ip_spoofing" />
{{tr "IP spoofing filter"}}
@ -210,7 +206,7 @@
<input id="manual_id" type="number" wizard_field="VLAN_ID"/>
</label>
</div>
<div class="medium-3 columns left mode_param bridge fw ebtables 8021Q vxlan ovswitch ovswitch_vxlan custom">
<div class="medium-3 columns left mode_param bridge fw 8021Q vxlan ovswitch ovswitch_vxlan custom">
<label for="phydev">
{{tr "Physical device"}}
<span class="tip">

7
src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/create.js
View File

@ -180,12 +180,6 @@ define(function(require) {
$("#automatic_vlan_id option[value='NO']", context).hide();
$("#phydev", context).attr("required", "");
break;
case "ebtables":
$("div.mode_param.ebtables", context).show();
$("div.mode_param.ebtables [wizard_field]", context).prop("wizard_field_disabled", false);
$("input#bridge", context).removeAttr("required");
break;
case "ovswitch":
$("div.mode_param.ovswitch", context).show();
$("#vntemplateCreateSecurityTab-label").hide();
@ -286,7 +280,6 @@ define(function(require) {
} else if (config["mode"] === "vcenter"){
$("#network_mode option[value=\"bridge\"]", context).hide();
$("#network_mode option[value=\"fw\"]", context).hide();
$("#network_mode option[value=\"ebtables\"]", context).hide();
$("#network_mode option[value=\"802.1Q\"]", context).hide();
$("#network_mode option[value=\"vxlan\"]", context).hide();
$("#network_mode option[value=\"ovswitch\"]", context).hide();