From a48444848ae27b933d15b14ee3f057e9a05f5431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Tue, 1 Mar 2016 11:41:17 +0100 Subject: [PATCH] Feature #4317 #4215: Allow group admins to create VRouters --- src/oca/ruby/opennebula/group.rb | 2 +- .../public/app/tabs/groups-tab/form-panels/create.js | 1 - src/vnm/VirtualNetworkPool.cc | 9 +-------- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/oca/ruby/opennebula/group.rb b/src/oca/ruby/opennebula/group.rb index 895eca303f..a272b6b2fe 100644 --- a/src/oca/ruby/opennebula/group.rb +++ b/src/oca/ruby/opennebula/group.rb @@ -37,7 +37,7 @@ module OpenNebula SELF = -1 # Default resource ACL's for group users (create) - GROUP_DEFAULT_ACLS = "VM+IMAGE+TEMPLATE+DOCUMENT+SECGROUP" + GROUP_DEFAULT_ACLS = "VM+IMAGE+TEMPLATE+DOCUMENT+SECGROUP+VROUTER" # The default view for group and group admins, must be defined in # sunstone_views.yaml diff --git a/src/sunstone/public/app/tabs/groups-tab/form-panels/create.js b/src/sunstone/public/app/tabs/groups-tab/form-panels/create.js index f469146f4a..acf6127872 100644 --- a/src/sunstone/public/app/tabs/groups-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/groups-tab/form-panels/create.js @@ -171,7 +171,6 @@ define(function(require) { }); $("#group_res_net", context).prop("checked", false); - $("#group_res_vr", context).prop("checked", false); $(context).off("change", ".admin_view_input"); $(context).on("change", ".admin_view_input", function(){ diff --git a/src/vnm/VirtualNetworkPool.cc b/src/vnm/VirtualNetworkPool.cc index 4bcd840f42..b88b3950c1 100644 --- a/src/vnm/VirtualNetworkPool.cc +++ b/src/vnm/VirtualNetworkPool.cc @@ -336,12 +336,5 @@ void VirtualNetworkPool::authorize_nic( vnet->unlock(); - if (ot == PoolObjectSQL::VM) - { - ar->add_auth(AuthRequest::USE, perm); - } - else // (ot == PoolObjectSQL::VROUTER) - { - ar->add_auth(AuthRequest::MANAGE, perm); - } + ar->add_auth(AuthRequest::USE, perm); }