opennebula-cli 7.2.0 → 7.2.1

data/lib/one_helper/onesecgroup_helper.rb

@@ -18,78 +18,78 @@ require 'one_helper'
 require 'opennebula/security_group'
 require 'opennebula/security_group_pool'
 
+# Helper class for Security Group commands
 class OneSecurityGroupHelper < OpenNebulaHelper::OneHelper
+
     RECOVER = {
-        :name   => "recover",
-        :short  => "-r",
-        :large  => "--recover" ,
-        :description => "If set the commit operation will only operate on "\
-            "outdated and error VMs. This is intended for retrying updates of "\
-            "VMs or reinitialize the updating process if oned stopped or fail.",
+        :name   => 'recover',
+        :short  => '-r',
+        :large  => '--recover',
+        :description => 'If set the commit operation will only operate on '\
+            'outdated and error VMs. This is intended for retrying updates of '\
+            'VMs or reinitialize the updating process if oned stopped or fail.'
     }
 
     def self.rname
-        "SECURITY_GROUP"
+        'SECURITY_GROUP'
     end
 
     def self.conf_file
-        "onesecgroup.yaml"
+        'onesecgroup.yaml'
     end
 
     def format_pool(options)
         config_file = self.class.table_conf
 
-        table = CLIHelper::ShowTable.new(config_file, self) do
-            column :ID, "ONE identifier for the Security Group", :size=>4 do |d|
-                d["ID"]
+        CLIHelper::ShowTable.new(config_file, self) do
+            column :ID, 'ONE identifier for the Security Group', :size=>4 do |d|
+                d['ID']
             end
 
-            column :NAME, "Name of the Security Group", :left, :size=>20 do |d|
-                d["NAME"]
+            column :NAME, 'Name of the Security Group', :left, :size=>20 do |d|
+                d['NAME']
             end
 
-            column :USER, "Username of the Security Group owner", :left,
-                    :size=>15 do |d|
+            column :USER, 'Username of the Security Group owner', :left,
+                   :size=>15 do |d|
                 helper.user_name(d, options)
             end
 
-            column :GROUP, "Group of the Security Group", :left, :size=>15 do |d|
+            column :GROUP, 'Group of the Security Group', :left, :size=>15 do |d|
                 helper.group_name(d, options)
             end
 
-            column :UPDATED, "Number of VMs with updated rules", :size=>8 do |d|
-                if d["UPDATED_VMS"]["ID"].nil?
-                    "0"
+            column :UPDATED, 'Number of VMs with updated rules', :size=>8 do |d|
+                if d['UPDATED_VMS']['ID'].nil?
+                    '0'
                 else
-                    [d["UPDATED_VMS"]["ID"]].flatten.size
+                    [d['UPDATED_VMS']['ID']].flatten.size
                 end
             end
 
-            column :OUTDATED, "Number of VMs with outdated rules", :size=>8 do |d|
-                if d["OUTDATED_VMS"]["ID"].nil?
-                    "0"
+            column :OUTDATED, 'Number of VMs with outdated rules', :size=>8 do |d|
+                if d['OUTDATED_VMS']['ID'].nil?
+                    '0'
                 else
-                    [d["OUTDATED_VMS"]["ID"]].flatten.size
+                    [d['OUTDATED_VMS']['ID']].flatten.size
                 end
             end
 
-            column :ERROR, "Number of VMs that failed to update rules", :size=>8 do |d|
-                if d["ERROR_VMS"]["ID"].nil?
-                    "0"
+            column :ERROR, 'Number of VMs that failed to update rules', :size=>8 do |d|
+                if d['ERROR_VMS']['ID'].nil?
+                    '0'
                 else
-                    [d["ERROR_VMS"]["ID"]].flatten.size
+                    [d['ERROR_VMS']['ID']].flatten.size
                 end
             end
 
             default :ID, :USER, :GROUP, :NAME, :UPDATED, :OUTDATED, :ERROR
         end
-
-        table
     end
 
     private
 
-    def factory(id=nil)
+    def factory(id = nil)
         if id
             OpenNebula::SecurityGroup.new_with_id(id, @client)
         else
@@ -98,107 +98,109 @@ class OneSecurityGroupHelper < OpenNebulaHelper::OneHelper
         end
     end
 
-    def factory_pool(user_flag=-2)
+    def factory_pool(user_flag = -2)
         OpenNebula::SecurityGroupPool.new(@client, user_flag)
     end
 
-    def format_resource(secgroup, options = {})
-        str="%-15s: %-20s"
-        str_h1="%-80s"
+    def format_resource(secgroup, _options = {})
+        str='%-15s: %-20s'
+        str_h1='%-80s'
 
         CLIHelper.print_header(
-            str_h1 % "SECURITY GROUP #{secgroup['ID']} INFORMATION")
-        puts str % ["ID", secgroup.id.to_s]
-        puts str % ["NAME", secgroup.name]
-        puts str % ["USER", secgroup['UNAME']]
-        puts str % ["GROUP", secgroup['GNAME']]
-
-        CLIHelper.print_header(str_h1 % "PERMISSIONS",false)
-
-        ["OWNER", "GROUP", "OTHER"].each { |e|
-            mask = "---"
-            mask[0] = "u" if secgroup["PERMISSIONS/#{e}_U"] == "1"
-            mask[1] = "m" if secgroup["PERMISSIONS/#{e}_M"] == "1"
-            mask[2] = "a" if secgroup["PERMISSIONS/#{e}_A"] == "1"
-
-            puts str % [e,  mask]
-        }
+            str_h1 % "SECURITY GROUP #{secgroup['ID']} INFORMATION"
+        )
+        puts format(str, 'ID', secgroup.id.to_s)
+        puts format(str, 'NAME', secgroup.name)
+        puts format(str, 'USER', secgroup['UNAME'])
+        puts format(str, 'GROUP', secgroup['GNAME'])
+
+        CLIHelper.print_header(str_h1 % 'PERMISSIONS', false)
+
+        ['OWNER', 'GROUP', 'OTHER'].each do |e|
+            mask = '---'
+            mask[0] = 'u' if secgroup["PERMISSIONS/#{e}_U"] == '1'
+            mask[1] = 'm' if secgroup["PERMISSIONS/#{e}_M"] == '1'
+            mask[2] = 'a' if secgroup["PERMISSIONS/#{e}_A"] == '1'
+
+            puts format(str, e, mask)
+        end
 
         puts
 
-        CLIHelper.print_header(str_h1 % "VIRTUAL MACHINES", false)
+        CLIHelper.print_header(str_h1 % 'VIRTUAL MACHINES', false)
 
         updated, outdated, error = secgroup.vm_ids
 
-        puts str % ["UPDATED", updated.join(',') ]
-        puts str % ["OUTDATED", outdated.join(',') ]
-        puts str % ["ERROR", error.join(',') ]
+        puts format(str, 'UPDATED', updated.join(','))
+        puts format(str, 'OUTDATED', outdated.join(','))
+        puts format(str, 'ERROR', error.join(','))
 
         puts
 
-        CLIHelper.print_header(str_h1 % ["RULES"], false)
+        CLIHelper.print_header(format(str_h1, 'RULES'), false)
 
         if !secgroup.to_hash['SECURITY_GROUP']['TEMPLATE']['RULE'].nil?
             rule_list = [secgroup.to_hash['SECURITY_GROUP']['TEMPLATE']['RULE']].flatten
         end
 
         CLIHelper::ShowTable.new(nil, self) do
-            column :TYPE, "", :left, :size=>8 do |d|
-                d["RULE_TYPE"]
+            column :TYPE, '', :left, :size=>8 do |d|
+                d['RULE_TYPE']
             end
 
-            column :PROTOCOL, "", :left, :size=>8 do |d|
-                d["PROTOCOL"]
+            column :PROTOCOL, '', :left, :size=>8 do |d|
+                d['PROTOCOL']
             end
 
-            column :ICMP_TYPE, "", :left, :size=>9 do |d|
-                d["ICMP_TYPE"]
+            column :ICMP_TYPE, '', :left, :size=>9 do |d|
+                d['ICMP_TYPE']
             end
 
-            column :ICMVP6_TYPE, "", :left, :size=>11 do |d|
-                d["ICMPV6_TYPE"]
+            column :ICMVP6_TYPE, '', :left, :size=>11 do |d|
+                d['ICMPV6_TYPE']
             end
 
-            column :NETWORK, "", :left, :adjust, :size=>35 do |d|
-                network = ""
-                if(!d["NETWORK_ID"].nil? && d["NETWORK_ID"] != "")
-                    network += "VNet " + d["NETWORK_ID"]
+            column :NETWORK, '', :left, :adjust, :size=>35 do |d|
+                network = ''
+                if(!d['NETWORK_ID'].nil? && d['NETWORK_ID'] != '')
+                    network += 'VNet ' + d['NETWORK_ID']
                 end
 
-                if(!d["SIZE"].nil? && d["SIZE"] != "")
-                    if(network != "")
-                        network += ": "
+                if(!d['SIZE'].nil? && d['SIZE'] != '')
+                    if(network != '')
+                        network += ': '
                     end
 
-                    if(!d["IP"].nil? && d["IP"] != "")
-                        network += "Start: " + d["IP"] + ", "
-                    elsif(!d["MAC"] != undefined && d["MAC"] != "")
-                        network += "Start: " + d["MAC"] + ", "
+                    if(!d['IP'].nil? && d['IP'] != '')
+                        network += 'Start: ' + d['IP'] + ', '
+                    elsif(!d['MAC'] != undefined && d['MAC'] != '')
+                        network += 'Start: ' + d['MAC'] + ', '
                     end
 
-                    network += "Size: " + d["SIZE"]
+                    network += 'Size: ' + d['SIZE']
                 end
 
-                if(network == "")
-                    network = "Any"
+                if(network == '')
+                    network = 'Any'
                 end
 
-                network += " "
+                network += ' '
                 network
             end
 
-            column :RANGE, "", :left, :adjust, :size=>16 do |d|
-                d["RANGE"]
+            column :RANGE, '', :left, :adjust, :size=>16 do |d|
+                d['RANGE']
             end
         end.show(rule_list, {})
 
-        while secgroup.has_elements?("/SECURITY_GROUP/TEMPLATE/RULE")
-            secgroup.delete_element("/SECURITY_GROUP/TEMPLATE/RULE")
+        while secgroup.has_elements?('/SECURITY_GROUP/TEMPLATE/RULE')
+            secgroup.delete_element('/SECURITY_GROUP/TEMPLATE/RULE')
         end
 
         puts
 
-        CLIHelper.print_header(str_h1 % "TEMPLATE CONTENTS",false)
+        CLIHelper.print_header(str_h1 % 'TEMPLATE CONTENTS', false)
         puts secgroup.template_str
     end
+
 end

data/lib/one_helper/onetemplate_helper.rb

@@ -18,57 +18,58 @@ require 'one_helper'
 require 'opennebula/template'
 require 'opennebula/template_pool'
 
+# Helper class for Template commands
 class OneTemplateHelper < OpenNebulaHelper::OneHelper
+
     VM_NAME={
-        :name  => "name",
-        :large => "--name name",
+        :name  => 'name',
+        :large => '--name name',
         :format => String,
-        :description =>  <<-EOT.strip
-Name of the new VM or TEMPLATE. When instantiating
-                               multiple VMs you can use the \"%i\" wildcard to produce
-                               different names such as vm-0, vm-1...
-EOT
+        :description =>  <<~EOT.strip
+            Name of the new VM or TEMPLATE. When instantiating
+                                           multiple VMs you can use the \"%i\" wildcard to produce
+                                           different names such as vm-0, vm-1...
+        EOT
     }
 
     MULTIPLE={
-        :name  => "multiple",
-        :short => "-m x",
-        :large => "--multiple x",
+        :name  => 'multiple',
+        :short => '-m x',
+        :large => '--multiple x',
         :format => Integer,
-        :description => "Instance multiple VMs"
+        :description => 'Instance multiple VMs'
     }
 
     EXTENDED={
-        :name => "extended",
-        :large => "--extended",
-        :description => "Process the template and included extended "+
-                        "information, such as the SIZE for each DISK"
+        :name => 'extended',
+        :large => '--extended',
+        :description => 'Process the template and included extended '+
+                        'information, such as the SIZE for each DISK'
     }
 
     RECURSIVE={
-        :name => "recursive",
-        :short => "-R",
-        :large => "--recursive",
-        :description => "Applies the action to the template plus any "+
-        "image defined in DISK"
+        :name => 'recursive',
+        :short => '-R',
+        :large => '--recursive',
+        :description => 'Applies the action to the template plus any '+
+        'image defined in DISK'
     }
 
     PERSISTENT={
-        :name => "persistent",
-        :large => "--persistent",
-        :description => "Creates a private persistent copy of the template "+
-        "plus any image defined in DISK, and instantiates that copy"
+        :name => 'persistent',
+        :large => '--persistent',
+        :description => 'Creates a private persistent copy of the template '+
+        'plus any image defined in DISK, and instantiates that copy'
     }
 
     def self.rname
-        "VMTEMPLATE"
+        'VMTEMPLATE'
     end
 
     def self.conf_file
-        "onetemplate.yaml"
+        'onetemplate.yaml'
     end
 
-
     def show_resource(id, options)
         resource = retrieve_resource(id)
 
@@ -102,33 +103,31 @@ EOT
     def format_pool(options)
         config_file = self.class.table_conf
 
-        table = CLIHelper::ShowTable.new(config_file, self) do
-            column :ID, "ONE identifier for the Template", :size=>4 do |d|
-                d["ID"]
+        CLIHelper::ShowTable.new(config_file, self) do
+            column :ID, 'ONE identifier for the Template', :size=>4 do |d|
+                d['ID']
             end
 
-            column :NAME, "Name of the Template", :left, :size=>27 do |d|
-                d["NAME"]
+            column :NAME, 'Name of the Template', :left, :size=>27 do |d|
+                d['NAME']
             end
 
-            column :USER, "Username of the Template owner", :left,
-                    :size=>15 do |d|
+            column :USER, 'Username of the Template owner', :left,
+                   :size=>15 do |d|
                 helper.user_name(d, options)
             end
 
-            column :GROUP, "Group of the Template", :left, :size=>15 do |d|
+            column :GROUP, 'Group of the Template', :left, :size=>15 do |d|
                 helper.group_name(d, options)
             end
 
-            column :REGTIME, "Registration time of the Template",
-                    :size=>15 do |d|
-                OpenNebulaHelper.time_to_str(d["REGTIME"])
+            column :REGTIME, 'Registration time of the Template',
+                   :size=>15 do |d|
+                OpenNebulaHelper.time_to_str(d['REGTIME'])
             end
 
             default :ID, :USER, :GROUP, :NAME, :REGTIME
         end
-
-        table
     end
 
     INT_EXP = /^-?\d+$/
@@ -153,7 +152,7 @@ EOT
             # template. Useful for cpu, mem, vcpu
             if key != template['VMTEMPLATE']['TEMPLATE'][key]
                 answers_s << "#{key} = \""
-                answers_s << val.gsub('"', "\\\"") << "\"\n"
+                answers_s << val.gsub('"', '\"') << "\"\n"
             end
         end
 
@@ -162,7 +161,7 @@ EOT
 
     private
 
-    def factory(id=nil)
+    def factory(id = nil)
         if id
             OpenNebula::Template.new_with_id(id, @client)
         else
@@ -171,38 +170,39 @@ EOT
         end
     end
 
-    def factory_pool(user_flag=-2)
+    def factory_pool(user_flag = -2)
         OpenNebula::TemplatePool.new(@client, user_flag)
     end
 
-    def format_resource(template, options = {})
-        str="%-15s: %-20s"
-        str_h1="%-80s"
+    def format_resource(template, _options = {})
+        str='%-15s: %-20s'
+        str_h1='%-80s'
 
         CLIHelper.print_header(
-            str_h1 % "TEMPLATE #{template['ID']} INFORMATION")
-        puts str % ["ID", template.id.to_s]
-        puts str % ["NAME", template.name]
-        puts str % ["USER", template['UNAME']]
-        puts str % ["GROUP", template['GNAME']]
-        puts str % ["LOCK", OpenNebulaHelper.level_lock_to_str(template['LOCK/LOCKED'])]
-        puts str % ["REGISTER TIME",
-            OpenNebulaHelper.time_to_str(template['REGTIME'])]
+            str_h1 % "TEMPLATE #{template['ID']} INFORMATION"
+        )
+        puts format(str, 'ID', template.id.to_s)
+        puts format(str, 'NAME', template.name)
+        puts format(str, 'USER', template['UNAME'])
+        puts format(str, 'GROUP', template['GNAME'])
+        puts format(str, 'LOCK', OpenNebulaHelper.level_lock_to_str(template['LOCK/LOCKED']))
+        puts format(str, 'REGISTER TIME', OpenNebulaHelper.time_to_str(template['REGTIME']))
         puts
 
-        CLIHelper.print_header(str_h1 % "PERMISSIONS",false)
+        CLIHelper.print_header(str_h1 % 'PERMISSIONS', false)
 
-        ["OWNER", "GROUP", "OTHER"].each { |e|
-            mask = "---"
-            mask[0] = "u" if template["PERMISSIONS/#{e}_U"] == "1"
-            mask[1] = "m" if template["PERMISSIONS/#{e}_M"] == "1"
-            mask[2] = "a" if template["PERMISSIONS/#{e}_A"] == "1"
+        ['OWNER', 'GROUP', 'OTHER'].each do |e|
+            mask = '---'
+            mask[0] = 'u' if template["PERMISSIONS/#{e}_U"] == '1'
+            mask[1] = 'm' if template["PERMISSIONS/#{e}_M"] == '1'
+            mask[2] = 'a' if template["PERMISSIONS/#{e}_A"] == '1'
 
-            puts str % [e,  mask]
-        }
+            puts format(str, e, mask)
+        end
         puts
 
-        CLIHelper.print_header(str_h1 % "TEMPLATE CONTENTS",false)
+        CLIHelper.print_header(str_h1 % 'TEMPLATE CONTENTS', false)
         puts template.template_str
     end
+
 end

data/lib/one_helper/onevdc_helper.rb

@@ -18,14 +18,15 @@ require 'one_helper'
 require 'opennebula/vdc'
 require 'opennebula/vdc_pool'
 
+# Helper class for VDC commands
 class OneVdcHelper < OpenNebulaHelper::OneHelper
 
     def self.rname
-        "VDC"
+        'VDC'
     end
 
     def self.conf_file
-        "onevdc.yaml"
+        'onevdc.yaml'
     end
 
     def id_list_size(list, resource)
@@ -39,20 +40,20 @@ class OneVdcHelper < OpenNebulaHelper::OneHelper
         end
     end
 
-    def format_pool(options)
+    def format_pool(_options)
         config_file = self.class.table_conf
 
-        table = CLIHelper::ShowTable.new(config_file, self) do
-            column :ID, "ONE identifier for the VDC", :size=>5 do |d|
-                d["ID"]
+        CLIHelper::ShowTable.new(config_file, self) do
+            column :ID, 'ONE identifier for the VDC', :size=>5 do |d|
+                d['ID']
             end
 
-            column :NAME, "Name of the VDC", :left, :size=>30 do |d|
-                d["NAME"]
+            column :NAME, 'Name of the VDC', :left, :size=>30 do |d|
+                d['NAME']
             end
 
-            column :GROUPS, "Number of Groups", :size=>6 do |d|
-                ids = d["GROUPS"]["ID"]
+            column :GROUPS, 'Number of Groups', :size=>6 do |d|
+                ids = d['GROUPS']['ID']
                 case ids
                 when String
                     1
@@ -63,31 +64,29 @@ class OneVdcHelper < OpenNebulaHelper::OneHelper
                 end
             end
 
-            column :CLUSTERS, "Number of Clusters", :size=>8 do |d|
-                @ext.id_list_size(d["CLUSTERS"]["CLUSTER"], "CLUSTER") rescue "-"
+            column :CLUSTERS, 'Number of Clusters', :size=>8 do |d|
+                @ext.id_list_size(d['CLUSTERS']['CLUSTER'], 'CLUSTER') rescue '-'
             end
 
-            column :HOSTS, "Number of Hosts", :size=>5 do |d|
-                @ext.id_list_size(d["HOSTS"]["HOST"], "HOST") rescue "-"
+            column :HOSTS, 'Number of Hosts', :size=>5 do |d|
+                @ext.id_list_size(d['HOSTS']['HOST'], 'HOST') rescue '-'
             end
 
-            column :VNETS, "Number of Networks", :size=>5 do |d|
-                @ext.id_list_size(d["VNETS"]["VNET"], "VNET") rescue "-"
+            column :VNETS, 'Number of Networks', :size=>5 do |d|
+                @ext.id_list_size(d['VNETS']['VNET'], 'VNET') rescue '-'
             end
 
-            column :DATASTORES, "Number of Datastores", :size=>10 do |d|
-                @ext.id_list_size(d["DATASTORES"]["DATASTORE"], "DATASTORE") rescue "-"
+            column :DATASTORES, 'Number of Datastores', :size=>10 do |d|
+                @ext.id_list_size(d['DATASTORES']['DATASTORE'], 'DATASTORE') rescue '-'
             end
 
             default :ID, :NAME, :GROUPS, :CLUSTERS, :HOSTS, :VNETS, :DATASTORES
         end
-
-        table
     end
 
     private
 
-    def factory(id=nil)
+    def factory(id = nil)
         if id
             OpenNebula::Vdc.new_with_id(id, @client)
         else
@@ -96,26 +95,26 @@ class OneVdcHelper < OpenNebulaHelper::OneHelper
         end
     end
 
-    def factory_pool(user_flag=-2)
+    def factory_pool(_user_flag = -2)
         OpenNebula::VdcPool.new(@client)
     end
 
-    def format_resource(vdc, options = {})
-        str="%-18s: %-20s"
-        str_h1="%-80s"
+    def format_resource(vdc, _options = {})
+        str='%-18s: %-20s'
+        str_h1='%-80s'
 
         CLIHelper.print_header(str_h1 % "VDC #{vdc['ID']} INFORMATION")
-        puts str % ["ID",   vdc.id.to_s]
-        puts str % ["NAME", vdc.name]
+        puts format(str, 'ID', vdc.id.to_s)
+        puts format(str, 'NAME', vdc.name)
 
         vdc_hash = vdc.to_hash
 
         groups = vdc_hash['VDC']['GROUPS']['ID']
-        if(groups != nil)
+        if(!groups.nil?)
             puts
 
             CLIHelper::ShowTable.new(nil, self) do
-                column :"GROUPS", "", :right, :size=>7 do |d|
+                column :GROUPS, '', :right, :size=>7 do |d|
                     d
                 end
             end.show([groups].flatten, {})
@@ -123,24 +122,25 @@ class OneVdcHelper < OpenNebulaHelper::OneHelper
 
         ['CLUSTER', 'HOST', 'DATASTORE', 'VNET'].each do |resource|
             res_array = vdc_hash['VDC']["#{resource}S"][resource]
-            if(res_array != nil)
-                puts
-                CLIHelper.print_header(str_h1 % "#{resource}S", false)
-
-                CLIHelper::ShowTable.new(nil, self) do
-                    column :"ZONE", "", :right, :size=>7 do |d|
-                        d['ZONE_ID']
-                    end
-
-                    column :"#{resource}", "", :right, :size=>9 do |d|
-                        d["#{resource}_ID"] == Vdc::ALL_RESOURCES ? 'ALL' : d["#{resource}_ID"]
-                    end
-                end.show([res_array].flatten, {})
-            end
+            next if res_array.nil?
+
+            puts
+            CLIHelper.print_header(str_h1 % "#{resource}S", false)
+
+            CLIHelper::ShowTable.new(nil, self) do
+                column :ZONE, '', :right, :size=>7 do |d|
+                    d['ZONE_ID']
+                end
+
+                column :"#{resource}", '', :right, :size=>9 do |d|
+                    d["#{resource}_ID"] == Vdc::ALL_RESOURCES ? 'ALL' : d["#{resource}_ID"]
+                end
+            end.show([res_array].flatten, {})
         end
 
         puts
-        CLIHelper.print_header(str_h1 % "VDC TEMPLATE", false)
+        CLIHelper.print_header(str_h1 % 'VDC TEMPLATE', false)
         puts vdc.template_str
     end
+
 end