diff --git a/src/vnm/AddressRangePool.cc b/src/vnm/AddressRangePool.cc index 0aad359b0f..74f3eb82f8 100644 --- a/src/vnm/AddressRangePool.cc +++ b/src/vnm/AddressRangePool.cc @@ -90,7 +90,7 @@ void AddressRangePool::update_ar(vector ars) for (it = ars.begin(); it != ars.end(); it++) { - VectorAttribute * va = static_cast(*it); + VectorAttribute * va = dynamic_cast(*it); if (va == 0) { @@ -191,7 +191,7 @@ int AddressRangePool::rm_ar(unsigned int ar_id, string& error_msg) for (it_ar=ars.begin(); it_ar!=ars.end(); it_ar++) { - VectorAttribute *ar = static_cast(*it_ar); + VectorAttribute *ar = dynamic_cast(*it_ar); if (ar == 0) { diff --git a/src/vnm/VirtualNetwork.cc b/src/vnm/VirtualNetwork.cc index 2b591d42cb..5212c8b08a 100644 --- a/src/vnm/VirtualNetwork.cc +++ b/src/vnm/VirtualNetwork.cc @@ -591,7 +591,7 @@ int VirtualNetwork::add_var(vector &var, string& error_msg) { for (vector::iterator it=var.begin(); it!=var.end(); it++) { - VectorAttribute * oar = static_cast(*it); + VectorAttribute * oar = dynamic_cast(*it); if (oar == 0) { @@ -617,9 +617,25 @@ int VirtualNetwork::add_ar(VirtualNetworkTemplate * ars_tmpl, string& error_msg) { vector var; - if (ars_tmpl->get("AR", var) > 0) + if (ars_tmpl->get("AR", var) <= 0) { - return add_var(var, error_msg); + return 0; + } + + const VectorAttribute * ar = dynamic_cast(var[0]); + + if (ar == 0) + { + error_msg = "Wrong AR definition"; + return -1; + } + + VectorAttribute * nar = ar->clone(); + + if (ar_pool.from_vattr(nar, error_msg) != 0) + { + delete nar; + return -1; } return 0;