diff --git a/src/vnm/VirtualNetwork.cc b/src/vnm/VirtualNetwork.cc index 39a7015ba1..867269e3d3 100644 --- a/src/vnm/VirtualNetwork.cc +++ b/src/vnm/VirtualNetwork.cc @@ -254,11 +254,23 @@ int VirtualNetwork::insert(SqlDB * db) { ostringstream ose; int rc; + + string public_attr; if ( vn_template.id == -1 ) { vn_template.id = oid; } + + // ------------ PUBLIC -------------------- + + get_template_attribute("PUBLIC", public_attr); + + transform (public_attr.begin(), public_attr.end(), public_attr.begin(), + (int(*)(int))toupper); + + public_vnet = (public_attr == "YES"); + vn_template.erase("PUBLIC"); // Insert the template first rc = vn_template.insert(db); diff --git a/src/vnm/VirtualNetworkPool.cc b/src/vnm/VirtualNetworkPool.cc index 2ffdeab91c..2f4cd094a9 100644 --- a/src/vnm/VirtualNetworkPool.cc +++ b/src/vnm/VirtualNetworkPool.cc @@ -72,7 +72,6 @@ int VirtualNetworkPool::allocate ( string name; string bridge; - string public_attr; string s_type; @@ -122,16 +121,6 @@ int VirtualNetworkPool::allocate ( vn->get_template_attribute("BRIDGE",bridge); vn->bridge = bridge; - // ------------ PUBLIC -------------------- - - vn->get_template_attribute("PUBLIC", public_attr); - - transform (public_attr.begin(), public_attr.end(), public_attr.begin(), - (int(*)(int))toupper); - - vn->public_vnet = (public_attr == "YES"); - vn->vn_template.erase("PUBLIC"); - // Insert the VN in the pool so we have a valid OID *oid = PoolSQL::allocate(vn);