From da39b2f424ec4c5ada125d9ff34d69dadd2363af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Mon, 1 Feb 2016 17:03:30 +0100 Subject: [PATCH] Feature #4215: Reverse NETWORK and NETWORK_ID priority in auth For consistency with commit:7410c78 --- src/image/ImagePool.cc | 20 ++++++++++---------- src/vnm/VirtualNetworkPool.cc | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/image/ImagePool.cc b/src/image/ImagePool.cc index c79584f4cd..3e2dd72426 100644 --- a/src/image/ImagePool.cc +++ b/src/image/ImagePool.cc @@ -494,16 +494,7 @@ void ImagePool::disk_attribute( Nebula& nd = Nebula::instance(); DatastorePool * ds_pool = nd.get_dspool(); - if (!(source = disk->vector_value("IMAGE")).empty()) - { - int uiid = get_disk_uid(disk,uid); - - if ( uiid != -1) - { - img = get(source, uiid, true); - } - } - else if (!(source = disk->vector_value("IMAGE_ID")).empty()) + if (!(source = disk->vector_value("IMAGE_ID")).empty()) { int iid = get_disk_id(source); @@ -512,6 +503,15 @@ void ImagePool::disk_attribute( img = get(iid, true); } } + else if (!(source = disk->vector_value("IMAGE")).empty()) + { + int uiid = get_disk_uid(disk,uid); + + if ( uiid != -1) + { + img = get(source, uiid, true); + } + } if ( img != 0 ) { diff --git a/src/vnm/VirtualNetworkPool.cc b/src/vnm/VirtualNetworkPool.cc index 6746925803..4441a8bd27 100644 --- a/src/vnm/VirtualNetworkPool.cc +++ b/src/vnm/VirtualNetworkPool.cc @@ -310,7 +310,11 @@ void VirtualNetworkPool::authorize_nic(VectorAttribute * nic, PoolObjectAuth perm; string error; - if (!(network = nic->vector_value("NETWORK")).empty()) + if (!(network = nic->vector_value("NETWORK_ID")).empty()) + { + vnet = get_nic_by_id(network, error); + } + else if (!(network = nic->vector_value("NETWORK")).empty()) { vnet = get_nic_by_name (nic, network, uid, error); @@ -319,10 +323,6 @@ void VirtualNetworkPool::authorize_nic(VectorAttribute * nic, nic->replace("NETWORK_ID", vnet->get_oid()); } } - else if (!(network = nic->vector_value("NETWORK_ID")).empty()) - { - vnet = get_nic_by_id(network, error); - } else //Not using a pre-defined network { return;