F #5356: add CLI chmod support /u/g/o (#2054)

src/cli/one_helper.rb

@@ -2305,4 +2305,46 @@ EOT
         end
     end
 
+    # Convert u=rwx,g=rx,o=r to octet
+    #
+    # @param perm [String] Permissions in human readbale format
+    #
+    # @return [String] Permissions in octet format
+    def OpenNebulaHelper.to_octet(perm)
+        begin
+            Integer(perm).to_s
+        rescue StandardError
+            perm = perm.split(',')
+            ret  = 0
+
+            perm.each do |p|
+                p = p.split('=')
+
+                next unless p.size == 2
+
+                r = p[1].count('r')
+                w = p[1].count('w')
+                x = p[1].count('x')
+
+                rwx = (2 ** 0) * x + (2 ** 1) * w + (2 ** 2) * r
+
+                case p[0]
+                when 'u'
+                    ret += rwx * 100
+                when 'g'
+                    ret += rwx * 10
+                else
+                    ret += rwx * 1
+                end
+            end
+
+            if ret == 0
+                STDERR.puts 'Error in permissions format'
+                exit(-1)
+            else
+                ret.to_s
+            end
+        end
+    end
+
 end

src/cli/onedatastore

@@ -158,7 +158,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :chmod, chmod_desc, [:range, :datastoreid_list], :octet do
         helper.perform_actions(args[0], options, 'Permissions changed') do |obj|
-            obj.chmod_octet(args[1])
+            obj.chmod_octet(OpenNebulaHelper.to_octet(args[1]))
         end
     end
 

src/cli/oneflow

@@ -285,7 +285,7 @@ CommandParser::CmdParser.new(ARGV) do
 
         Service.perform_actions(args[0]) do |service_id|
             params = {}
-            params['octet'] = args[1]
+            params['octet'] = OpenNebulaHelper.to_octet(args[1])
 
             json = Service.build_json_action('chmod', params)
 

src/cli/oneflow-template

@@ -346,7 +346,7 @@ CommandParser::CmdParser.new(ARGV) do
 
         Service.perform_actions(args[0]) do |service_id|
             params = {}
-            params['octet'] = args[1]
+            params['octet'] = OpenNebulaHelper.to_octet(args[1])
 
             json = Service.build_json_action('chmod', params)
 

src/cli/oneimage

@@ -363,7 +363,7 @@ CommandParser::CmdParser.new(ARGV) do
     command :chmod, chmod_desc, [:range, :imageid_list], :octet do
         helper.perform_actions(args[0], options,
                                'Permissions changed') do |image|
-            image.chmod_octet(args[1])
+            image.chmod_octet(OpenNebulaHelper.to_octet(args[1]))
         end
     end
 

src/cli/onemarket

@@ -151,7 +151,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :chmod, chmod_desc, [:range, :marketplaceid_list], :octet do
         helper.perform_actions(args[0], options, 'Permissions changed') do |obj|
-            obj.chmod_octet(args[1])
+            obj.chmod_octet(OpenNebulaHelper.to_octet(args[1]))
         end
     end
 

src/cli/onemarketapp

@@ -388,7 +388,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :chmod, chmod_desc, [:range, :appid_list], :octet do
         helper.perform_actions(args[0], options, 'Permissions changed') do |app|
-            app.chmod_octet(args[1])
+            app.chmod_octet(OpenNebulaHelper.to_octet(args[1]))
         end
     end
 

src/cli/oneprovider

@@ -220,7 +220,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :chmod, chmod_desc, [:range, :providerid_list], :octet do
         helper.perform_actions(args[0], options, 'Permissions changed') do |p|
-            p.chmod_octet(args[1])
+            p.chmod_octet(OpenNebulaHelper.to_octet(args[1]))
         end
     end
 end

src/cli/onesecgroup

@@ -174,7 +174,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :chmod, chmod_desc, [:range, :secgroupid_list], :octet do
         helper.perform_actions(args[0], options, 'Permissions changed') do |t|
-            t.chmod_octet(args[1])
+            t.chmod_octet(OpenNebulaHelper.to_octet(args[1]))
         end
     end
 

src/cli/onetemplate

@@ -378,7 +378,7 @@ CommandParser::CmdParser.new(ARGV) do
         recursive = (options[:recursive] == true)
 
         helper.perform_actions(args[0], options, 'Permissions changed') do |t|
-            t.chmod_octet(args[1], recursive)
+            t.chmod_octet(OpenNebulaHelper.to_octet(args[1]), recursive)
         end
     end
 

src/cli/onevm

@@ -981,7 +981,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :chmod, chmod_desc, [:range, :vmid_list], :octet do
         helper.perform_actions(args[0], options, 'Permissions changed') do |vm|
-            vm.chmod_octet(args[1])
+            vm.chmod_octet(OpenNebulaHelper.to_octet(args[1]))
         end
     end
 

src/cli/onevmgroup

@@ -197,7 +197,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :chmod, chmod_desc, [:range, :vmgroupid_list], :octet do
         helper.perform_actions(args[0], options, 'Permissions changed') do |t|
-            t.chmod_octet(args[1])
+            t.chmod_octet(OpenNebulaHelper.to_octet(args[1]))
         end
     end
 

src/cli/onevnet

@@ -335,7 +335,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :chmod, chmod_desc, [:range, :vnetid_list], :octet do
         helper.perform_actions(args[0], options, 'Permissions changed') do |vn|
-            vn.chmod_octet(args[1])
+            vn.chmod_octet(OpenNebulaHelper.to_octet(args[1]))
         end
     end
 

src/cli/onevntemplate

@@ -314,7 +314,7 @@ CommandParser::CmdParser.new(ARGV) do
         recursive = (options[:recursive] == true)
 
         helper.perform_actions(args[0], options, 'Permissions changed') do |t|
-            t.chmod_octet(args[1], recursive)
+            t.chmod_octet(OpenNebulaHelper.to_octet(args[1]), recursive)
         end
     end
 

src/cli/onevrouter

@@ -251,7 +251,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :chmod, chmod_desc, [:range, :vrouterid_list], :octet do
         helper.perform_actions(args[0], options, 'Permissions changed') do |obj|
-            obj.chmod_octet(args[1])
+            obj.chmod_octet(OpenNebulaHelper.to_octet(args[1]))
         end
     end