From 878e969eba479864d6a632bff6af7e5f5d2452c1 Mon Sep 17 00:00:00 2001
From: Frederick Borges <fborges@opennebula.io>
Date: Mon, 24 Oct 2022 15:09:41 +0200
Subject: [PATCH] F #5931: Remove all trace of ebtables (#2320)

(cherry picked from commit 8bbc9ff8016b57919343b092427a18525f62f970)
---
 .../public/app/tabs/vnets-tab/form-panels/create.js    |  7 -------
 .../app/tabs/vnets-tab/form-panels/create/wizard.hbs   | 10 +++-------
 .../app/tabs/vnets-templates-tab/form-panels/create.js |  7 -------
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/src/sunstone/public/app/tabs/vnets-tab/form-panels/create.js b/src/sunstone/public/app/tabs/vnets-tab/form-panels/create.js
index f8167d184b..b087378b59 100644
--- a/src/sunstone/public/app/tabs/vnets-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/vnets-tab/form-panels/create.js
@@ -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();
diff --git a/src/sunstone/public/app/tabs/vnets-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/vnets-tab/form-panels/create/wizard.hbs
index b06e5c6465..149c6c908b 100644
--- a/src/sunstone/public/app/tabs/vnets-tab/form-panels/create/wizard.hbs
+++ b/src/sunstone/public/app/tabs/vnets-tab/form-panels/create/wizard.hbs
@@ -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">
diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/create.js b/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/create.js
index 2b824f108a..2a3b4a58fd 100644
--- a/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/create.js
@@ -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();