From 73fb50184d525c15763157f8eb18e1aa4df4eea8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Mon, 8 Sep 2014 12:01:37 +0200 Subject: [PATCH] Feature #3175: Add secgroup acl resource to CLI --- src/cli/etc/oneacl.yaml | 6 +++--- src/cli/one_helper/oneacl_helper.rb | 10 ++++++---- src/oca/ruby/opennebula/acl.rb | 4 +++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/cli/etc/oneacl.yaml b/src/cli/etc/oneacl.yaml index 8f2003579e..42e09fbe30 100644 --- a/src/cli/etc/oneacl.yaml +++ b/src/cli/etc/oneacl.yaml @@ -9,9 +9,9 @@ :size: 8 :right: true -:RES_VHNIUTGDCOZ: +:RES_VHNIUTGDCOZS: :desc: Which resource the rule applies to - :size: 15 + :size: 16 :RID: :desc: Resource ID @@ -31,7 +31,7 @@ :default: - :ID - :USER -- :RES_VHNIUTGDCOZ +- :RES_VHNIUTGDCOZS - :RID - :OPE_UMAC - :ZONE diff --git a/src/cli/one_helper/oneacl_helper.rb b/src/cli/one_helper/oneacl_helper.rb index 8411687d2d..01e5c0f82e 100644 --- a/src/cli/one_helper/oneacl_helper.rb +++ b/src/cli/one_helper/oneacl_helper.rb @@ -44,7 +44,7 @@ private def self.resource_mask(str) resource_type=str.split("/")[0] - mask = "-----------" + mask = "------------" resource_type.split("+").each{|type| case type @@ -70,6 +70,8 @@ private mask[9] = "O" when "ZONE" mask[10] = "Z" + when "SECGROUP" + mask[11] = "S" end } mask @@ -109,8 +111,8 @@ private d['STRING'].split(" ")[0] end - column :RES_VHNIUTGDCOZ, "Resource to which the rule applies", - :size => 15 do |d| + column :RES_VHNIUTGDCOZS, "Resource to which the rule applies", + :size => 16 do |d| OneAclHelper::resource_mask d['STRING'].split(" ")[1] end @@ -127,7 +129,7 @@ private OneAclHelper::right_mask d['STRING'].split(" ")[2] end - default :ID, :USER, :RES_VHNIUTGDCOZ, :RID, :OPE_UMAC, :ZONE + default :ID, :USER, :RES_VHNIUTGDCOZS, :RID, :OPE_UMAC, :ZONE end table diff --git a/src/oca/ruby/opennebula/acl.rb b/src/oca/ruby/opennebula/acl.rb index e49cdec15c..67ab0398fa 100644 --- a/src/oca/ruby/opennebula/acl.rb +++ b/src/oca/ruby/opennebula/acl.rb @@ -31,6 +31,7 @@ module OpenNebula # TEMPLATE # GROUP # ACL + # SECGROUP # RIGHTS -> + separated list # USE # MANAGE @@ -57,7 +58,8 @@ module OpenNebula "DATASTORE" => 0x100000000000, "CLUSTER" => 0x200000000000, "DOCUMENT" => 0x400000000000, - "ZONE" => 0x800000000000 + "ZONE" => 0x800000000000, + "SECGROUP" => 0x1000000000000 } RIGHTS =