From 2d985fb58109316dd1b04f8012d85f154ca80d05 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Thu, 8 Oct 2020 18:58:42 +0200
Subject: [PATCH] Revert "B #5095: Custom NIC attributes overrides VNET (#282)"

This reverts commit 353ac3863d03f2c6357cbcf3987ddcc82c0b5d4d.
---
 share/etc/oned.conf       |  2 --
 src/image/Image.cc        |  3 +--
 src/vnm/AddressRange.cc   |  3 +--
 src/vnm/VirtualNetwork.cc | 21 ++++++++++-----------
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/share/etc/oned.conf b/share/etc/oned.conf
index d018e628d2..be941640cf 100644
--- a/share/etc/oned.conf
+++ b/share/etc/oned.conf
@@ -854,8 +854,6 @@ VM_RESTRICTED_ATTR = "NIC/MAC"
 VM_RESTRICTED_ATTR = "NIC/VLAN_ID"
 VM_RESTRICTED_ATTR = "NIC/BRIDGE"
 VM_RESTRICTED_ATTR = "NIC/FILTER"
-VM_RESTRICTED_ATTR = "NIC/FILTER_IP_SPOOFING"
-VM_RESTRICTED_ATTR = "NIC/FILTER_MAC_SPOOFING"
 VM_RESTRICTED_ATTR = "NIC/INBOUND_AVG_BW"
 VM_RESTRICTED_ATTR = "NIC/INBOUND_PEAK_BW"
 VM_RESTRICTED_ATTR = "NIC/INBOUND_PEAK_KB"
diff --git a/src/image/Image.cc b/src/image/Image.cc
index 6cb575286a..c1f57cf426 100644
--- a/src/image/Image.cc
+++ b/src/image/Image.cc
@@ -658,10 +658,9 @@ void Image::disk_attribute(VirtualMachineDisk *    disk,
 
     for (it = inherit_attrs.begin(); it != inherit_attrs.end(); it++)
     {
-        string current_val = disk->vector_value(*it);
         get_template_attribute(*it, inherit_val);
 
-        if (current_val.empty() && !inherit_val.empty())
+        if (!inherit_val.empty())
         {
             disk->replace(*it, inherit_val);
         }
diff --git a/src/vnm/AddressRange.cc b/src/vnm/AddressRange.cc
index 7c49066dbd..227c787e87 100644
--- a/src/vnm/AddressRange.cc
+++ b/src/vnm/AddressRange.cc
@@ -1266,10 +1266,9 @@ void AddressRange::set_vnet(VectorAttribute *nic, const vector<string> &inherit)
 
     for (it = inherit.begin(); it != inherit.end(); it++)
     {
-        string current_val = nic->vector_value(*it);
         string inherit_val = attr->vector_value(*it);
 
-        if (current_val.empty() && !inherit_val.empty())
+        if (!inherit_val.empty())
         {
             nic->replace((*it).c_str(), inherit_val);
         }
diff --git a/src/vnm/VirtualNetwork.cc b/src/vnm/VirtualNetwork.cc
index 82a304bcca..70bcea6fbf 100644
--- a/src/vnm/VirtualNetwork.cc
+++ b/src/vnm/VirtualNetwork.cc
@@ -850,6 +850,16 @@ int VirtualNetwork::nic_attribute(
         nic->replace("BRIDGE_TYPE", bridge_type);
     }
 
+    for (it = inherit_attrs.begin(); it != inherit_attrs.end(); it++)
+    {
+        PoolObjectSQL::get_template_attribute(*it, inherit_val);
+
+        if (!inherit_val.empty())
+        {
+            nic->replace(*it, inherit_val);
+        }
+    }
+
     //--------------------------------------------------------------------------
     //  Get the lease from the Virtual Network
     //--------------------------------------------------------------------------
@@ -889,17 +899,6 @@ int VirtualNetwork::nic_attribute(
                 inherit_attrs);
     }
 
-    for (it = inherit_attrs.begin(); it != inherit_attrs.end(); it++)
-    {
-        string current_val = nic->vector_value(*it);
-        PoolObjectSQL::get_template_attribute(*it, inherit_val);
-
-        if (current_val.empty() && !inherit_val.empty())
-        {
-            nic->replace(*it, inherit_val);
-        }
-    }
-
     //--------------------------------------------------------------------------
     //  Copy the security group IDs
     //--------------------------------------------------------------------------