F #2593: Inherit IPAM_MAD from vnet to ar (#450)

OpenNebula · Nov 19, 2020 · c9c08f0 · c9c08f0
1 parent d4037ec
commit c9c08f0
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/src/vnm/VirtualNetwork.cc b/src/vnm/VirtualNetwork.cc
@@ -997,10 +997,18 @@ void VirtualNetwork::process_security_rule(
 
 int VirtualNetwork::add_var(vector<VectorAttribute *> &var, string& error_msg)
 {
+    string ipam_mad;
+    PoolObjectSQL::get_template_attribute("IPAM_MAD", ipam_mad);
+
     for (auto vattr : var)
     {
         VectorAttribute * ar = vattr->clone();
 
+        if (!ipam_mad.empty() && ar->vector_value("IPAM_MAD").empty())
+        {
+            ar->replace("IPAM_MAD", ipam_mad);
+        }
+
         if (ar_pool.from_vattr(ar, error_msg) != 0)
         {
             delete ar;
@@ -1025,6 +1033,16 @@ int VirtualNetwork::add_ar(VirtualNetworkTemplate * ars_tmpl, string& error_msg)
 
     VectorAttribute * nar = ar->clone();
 
+    string ipam_mad_vnet;
+    string ipam_mad_ar = nar->vector_value("IPAM_MAD");
+
+    if (ipam_mad_ar.empty() &&
+        PoolObjectSQL::get_template_attribute("IPAM_MAD", ipam_mad_vnet) &&
+        !ipam_mad_vnet.empty())
+    {
+        nar->replace("IPAM_MAD", ipam_mad_vnet);
+    }
+
     if (ar_pool.from_vattr(nar, error_msg) != 0)
     {
         delete nar;