opennebula-cli 7.2.0 → 7.2.1

data/lib/one_helper/onevrouter_helper.rb

@@ -18,58 +18,57 @@ require 'one_helper'
 require 'opennebula/virtual_router'
 require 'opennebula/virtual_router_pool'
 
+# Helper class for VRouter commands
 class OneVirtualRouterHelper < OpenNebulaHelper::OneHelper
 
     ALL_TEMPLATE = {
-        :name       => "all",
-        :large      => "--all",
-        :description => "Show all template data"
+        :name       => 'all',
+        :large      => '--all',
+        :description => 'Show all template data'
     }
 
     FLOAT = {
-        :name       => "float",
-        :large      => "--float",
-        :description => "Makes this IP request a Floating one"
+        :name       => 'float',
+        :large      => '--float',
+        :description => 'Makes this IP request a Floating one'
     }
 
     def self.rname
-        "VROUTER"
+        'VROUTER'
     end
 
     def self.conf_file
-        "onevrouter.yaml"
+        'onevrouter.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 Virtual Router", :size=>4 do |d|
-                d["ID"]
+        CLIHelper::ShowTable.new(config_file, self) do
+            column :ID, 'ONE identifier for the Virtual Router', :size=>4 do |d|
+                d['ID']
             end
 
-            column :NAME, "Name of the Virtual Router", :left, :size=>27 do |d|
-                d["NAME"]
+            column :NAME, 'Name of the Virtual Router', :left, :size=>27 do |d|
+                d['NAME']
             end
 
-            column :USER, "Username of the Virtual Router owner", :left,
-                    :size=>15 do |d|
+            column :USER, 'Username of the Virtual Router owner', :left,
+                   :size=>15 do |d|
                 helper.user_name(d, options)
             end
 
-            column :GROUP, "Group of the Virtual Router", :left, :size=>15 do |d|
+            column :GROUP, 'Group of the Virtual Router', :left, :size=>15 do |d|
                 helper.group_name(d, options)
             end
 
             default :ID, :USER, :GROUP, :NAME
         end
-
-        table
     end
 
     private
 
-    def factory(id=nil)
+    def factory(id = nil)
         if id
             OpenNebula::VirtualRouter.new_with_id(id, @client)
         else
@@ -78,134 +77,134 @@ class OneVirtualRouterHelper < OpenNebulaHelper::OneHelper
         end
     end
 
-    def factory_pool(user_flag=-2)
+    def factory_pool(user_flag = -2)
         OpenNebula::VirtualRouterPool.new(@client, user_flag)
     end
 
     def format_resource(obj, options = {})
-        str="%-15s: %-20s"
-        str_h1="%-80s"
+        str='%-15s: %-20s'
+        str_h1='%-80s'
 
         CLIHelper.print_header(
-            str_h1 % "VIRTUAL ROUTER #{obj['ID']} INFORMATION")
-        puts str % ["ID", obj.id.to_s]
-        puts str % ["NAME", obj.name]
-        puts str % ["USER", obj['UNAME']]
-        puts str % ["GROUP", obj['GNAME']]
-        puts str % ["LOCK", OpenNebulaHelper.level_lock_to_str(obj['LOCK/LOCKED'])]
+            str_h1 % "VIRTUAL ROUTER #{obj['ID']} INFORMATION"
+        )
+        puts format(str, 'ID', obj.id.to_s)
+        puts format(str, 'NAME', obj.name)
+        puts format(str, 'USER', obj['UNAME'])
+        puts format(str, 'GROUP', obj['GNAME'])
+        puts format(str, 'LOCK', OpenNebulaHelper.level_lock_to_str(obj['LOCK/LOCKED']))
         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 obj["PERMISSIONS/#{e}_U"] == "1"
-            mask[1] = "m" if obj["PERMISSIONS/#{e}_M"] == "1"
-            mask[2] = "a" if obj["PERMISSIONS/#{e}_A"] == "1"
+        ['OWNER', 'GROUP', 'OTHER'].each do |e|
+            mask = '---'
+            mask[0] = 'u' if obj["PERMISSIONS/#{e}_U"] == '1'
+            mask[1] = 'm' if obj["PERMISSIONS/#{e}_M"] == '1'
+            mask[2] = 'a' if obj["PERMISSIONS/#{e}_A"] == '1'
 
-            puts str % [e,  mask]
-        }
+            puts format(str, e, mask)
+        end
 
-        if obj.has_elements?("/VROUTER/TEMPLATE/NIC")
+        if obj.has_elements?('/VROUTER/TEMPLATE/NIC')
             puts
-            CLIHelper.print_header(str_h1 % "VIRTUAL ROUTER NICS",false)
+            CLIHelper.print_header(str_h1 % 'VIRTUAL ROUTER NICS', false)
 
-            nic_default = {"NETWORK" => "-",
-                           "IP" => "-"}
+            nic_default = { 'NETWORK' => '-',
+                           'IP' => '-' }
 
             array_id = 0
             vm_nics = [obj.to_hash['VROUTER']['TEMPLATE']['NIC']].flatten.compact
-            vm_nics.each {|nic|
-
-                next if nic.has_key?("CLI_DONE")
+            vm_nics.each do |nic|
+                next if nic.key?('CLI_DONE')
 
-                floating = (nic.has_key?("FLOATING_IP") && nic["FLOATING_IP"].upcase() == "YES" )
+                floating = nic.key?('FLOATING_IP') && nic['FLOATING_IP'].upcase == 'YES'
 
                 if floating
-                    if nic.has_key?("IP6_LINK")
-                        ip6_link = {"IP"           => nic.delete("IP6_LINK"),
-                                    "CLI_DONE"     => true,
-                                    "DOUBLE_ENTRY" => true}
-                        vm_nics.insert(array_id+1,ip6_link)
+                    if nic.key?('IP6_LINK')
+                        ip6_link = { 'IP'           => nic.delete('IP6_LINK'),
+                                    'CLI_DONE'     => true,
+                                    'DOUBLE_ENTRY' => true }
+                        vm_nics.insert(array_id+1, ip6_link)
 
                         array_id += 1
                     end
 
-                    if nic.has_key?("IP6_ULA")
-                        ip6_link = {"IP"           => nic.delete("IP6_ULA"),
-                                    "CLI_DONE"     => true,
-                                    "DOUBLE_ENTRY" => true}
-                        vm_nics.insert(array_id+1,ip6_link)
+                    if nic.key?('IP6_ULA')
+                        ip6_link = { 'IP'           => nic.delete('IP6_ULA'),
+                                    'CLI_DONE'     => true,
+                                    'DOUBLE_ENTRY' => true }
+                        vm_nics.insert(array_id+1, ip6_link)
 
                         array_id += 1
                     end
 
-                    if nic.has_key?("IP6_GLOBAL")
-                        ip6_link = {"IP"           => nic.delete("IP6_GLOBAL"),
-                                    "CLI_DONE"     => true,
-                                    "DOUBLE_ENTRY" => true}
-                        vm_nics.insert(array_id+1,ip6_link)
+                    if nic.key?('IP6_GLOBAL')
+                        ip6_link = { 'IP'           => nic.delete('IP6_GLOBAL'),
+                                    'CLI_DONE'     => true,
+                                    'DOUBLE_ENTRY' => true }
+                        vm_nics.insert(array_id+1, ip6_link)
 
                         array_id += 1
                     end
                 else
-                    nic.delete("IP")
+                    nic.delete('IP')
                 end
 
-                nic.merge!(nic_default) {|k,v1,v2| v1}
+                nic.merge!(nic_default) {|_k, v1, _v2| v1 }
                 array_id += 1
-            }
+            end
 
             CLIHelper::ShowTable.new(nil, self) do
-                column :ID, "", :size=>3 do |d|
-                    if d["DOUBLE_ENTRY"]
-                        ""
+                column :ID, '', :size=>3 do |d|
+                    if d['DOUBLE_ENTRY']
+                        ''
                     else
-                        d["NIC_ID"]
+                        d['NIC_ID']
                     end
                 end
 
-                column :NETWORK, "", :left, :size=>20 do |d|
-                    if d["DOUBLE_ENTRY"]
-                        ""
+                column :NETWORK, '', :left, :size=>20 do |d|
+                    if d['DOUBLE_ENTRY']
+                        ''
                     else
-                        d["NETWORK"]
+                        d['NETWORK']
                     end
                 end
 
-                column :MANAGEMENT, "", :left, :size=>10 do |d|
-                    if d["DOUBLE_ENTRY"]
-                        ""
+                column :MANAGEMENT, '', :left, :size=>10 do |d|
+                    if d['DOUBLE_ENTRY']
+                        ''
                     else
-                        if !d["VROUTER_MANAGEMENT"].nil?
-                            d["VROUTER_MANAGEMENT"]
+                        if !d['VROUTER_MANAGEMENT'].nil?
+                            d['VROUTER_MANAGEMENT']
                         else
-                            "NO"
+                            'NO'
                         end
                     end
                 end
 
-
-                column :IP, "",:left, :adjust, :size=>15 do |d|
-                    d["IP"]
+                column :IP, '', :left, :adjust, :size=>15 do |d|
+                    d['IP']
                 end
-            end.show(vm_nics,{})
+            end.show(vm_nics, {})
         end
 
-        while obj.has_elements?("/VROUTER/TEMPLATE/NIC")
-            obj.delete_element("/VROUTER/TEMPLATE/NIC")
-        end if !options[:all]
+        while obj.has_elements?('/VROUTER/TEMPLATE/NIC')
+            obj.delete_element('/VROUTER/TEMPLATE/NIC')
+        end unless options[:all]
 
         puts
 
-        CLIHelper.print_header(str_h1 % "TEMPLATE CONTENTS",false)
+        CLIHelper.print_header(str_h1 % 'TEMPLATE CONTENTS', false)
         puts obj.template_str
 
         puts
 
-        CLIHelper.print_header("%-15s" % "VIRTUAL MACHINES")
+        CLIHelper.print_header(format('%-15s', 'VIRTUAL MACHINES'))
         obj.vm_ids.each do |id|
-            puts "%-15s" % [id]
+            puts format('%-15s', id)
         end
     end
+
 end

data/lib/one_helper/onezone_helper.rb

@@ -28,7 +28,7 @@ class Replicator
 
     SSH_OPTIONS = '-o stricthostkeychecking=no -o passwordauthentication=no'
     ONE_AUTH    = '/var/lib/one/.one/one_auth'
-    FED_ATTRS   = %w[MODE ZONE_ID SERVER_ID MASTER_ONED]
+    FED_ATTRS   = ['MODE', 'ZONE_ID', 'SERVER_ID', 'MASTER_ONED']
 
     FILES = [
         { :name    => 'monitord.conf',
@@ -64,7 +64,7 @@ class Replicator
         @l_fed_elements    = { :raw => @l_config }
 
         if OpenNebula.is_error?(@l_config)
-            STDERR.puts 'Unable to read OpenNebula configuration. ' \
+            STDERR.puts 'Unable to read local OpenNebula configuration. ' \
                         'Is OpenNebula running?'
             exit(-1)
         end
@@ -81,6 +81,12 @@ class Replicator
         @r_config_elements = { :raw => @r_config }
         @r_fed_elements    = { :raw => @r_config }
 
+        if OpenNebula.is_error?(@r_config)
+            STDERR.puts 'Unable to read remote OpenNebula configuration. ' \
+                        "Is OpenNebula running on #{@remote_server}?"
+            exit(-1)
+        end
+
         fetch_db_config(@r_config_elements)
         fetch_fed_config(@r_fed_elements)
 
@@ -185,14 +191,12 @@ class Replicator
             "/etc/one/#{folder}/"
         )
 
-        unless rc
-            rc = run_command(
-                "rsync -ai\
+        rc ||= run_command(
+            "rsync -ai\
                 -e \"ssh #{SSH_OPTIONS} -i #{@oneadmin_identity_file}\" " \
-                "oneadmin@#{@remote_server}:/etc/one/#{folder}/ " \
-                "/etc/one/#{folder}/"
-            )
-        end
+            "oneadmin@#{@remote_server}:/etc/one/#{folder}/ " \
+            "/etc/one/#{folder}/"
+        )
 
         unless rc
             STDERR.puts 'ERROR'
@@ -361,13 +365,11 @@ class Replicator
         )
 
         # if default users doesn't work, try with oneadmin
-        unless rc
-            rc = run_command(
-                "ssh -i #{@oneadmin_identity_file} " \
-                "#{SSH_OPTIONS} oneadmin@#{@remote_server} " \
-                "#{cmd}"
-            )
-        end
+        rc ||= run_command(
+            "ssh -i #{@oneadmin_identity_file} " \
+            "#{SSH_OPTIONS} oneadmin@#{@remote_server} " \
+            "#{cmd}"
+        )
 
         # if oneadmin doesn't work neither, fail
         unless rc
@@ -390,12 +392,10 @@ class Replicator
         )
 
         # if default users doesn't work, try with oneadmin
-        unless rc
-            rc = run_command(
-                "scp -i #{@oneadmin_identity_file} " \
-                "#{SSH_OPTIONS} oneadmin@#{@remote_server}:#{src} #{dest}"
-            )
-        end
+        rc ||= run_command(
+            "scp -i #{@oneadmin_identity_file} " \
+            "#{SSH_OPTIONS} oneadmin@#{@remote_server}:#{src} #{dest}"
+        )
 
         # if oneadmin doesn't work neither, fail
         unless rc
@@ -438,30 +438,31 @@ class Replicator
 
 end
 
+# Helper class for Zone commands
 class OneZoneHelper < OpenNebulaHelper::OneHelper
 
     SERVER_NAME={
-        :name => "server_name",
-        :short => "-n server_name",
-        :large => "--name",
+        :name => 'server_name',
+        :short => '-n server_name',
+        :large => '--name',
         :format => String,
-        :description => "Zone server name"
+        :description => 'Zone server name'
     }
 
     SERVER_ENDPOINT={
-        :name => "server_rpc",
-        :short => "-r xml-rpc endpoint",
-        :large => "--rpc",
+        :name => 'server_rpc',
+        :short => '-r xml-rpc endpoint',
+        :large => '--rpc',
         :format => String,
-        :description => "Zone server XML-RPC endpoint"
+        :description => 'Zone server XML-RPC endpoint'
     }
 
     SERVER_ENDPOINT_GRPC={
-        :name => "server_grpc",
-        :short => "-g gRPC endpoint",
-        :large => "--grpc-endpoint",
+        :name => 'server_grpc',
+        :short => '-g gRPC endpoint',
+        :large => '--grpc-endpoint',
         :format => String,
-        :description => "Zone server gRPC endpoint"
+        :description => 'Zone server gRPC endpoint'
     }
 
     def show_resource(id, options)
@@ -490,11 +491,11 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper
     end
 
     def self.rname
-        "ZONE"
+        'ZONE'
     end
 
     def self.conf_file
-        "onezone.yaml"
+        'onezone.yaml'
     end
 
     def self.state_to_str(id)
@@ -520,29 +521,29 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper
         [0, ids[0].to_i]
     end
 
-    def format_pool(options)
+    def format_pool(_options)
         config_file = self.class.table_conf
 
-        table = CLIHelper::ShowTable.new(config_file, self) do
-            column :CURRENT, "Active Zone", :size=>1 do |d|
-                "*" if helper.client.one_endpoint.strip ==
-                       d["TEMPLATE"]['ENDPOINT'].strip
+        CLIHelper::ShowTable.new(config_file, self) do
+            column :CURRENT, 'Active Zone', :size=>1 do |d|
+                '*' if helper.client.one_endpoint.strip ==
+                       d['TEMPLATE']['ENDPOINT'].strip
             end
 
-            column :ID, "ONE identifier for the Zone", :size=>5 do |d|
-                d["ID"]
+            column :ID, 'ONE identifier for the Zone', :size=>5 do |d|
+                d['ID']
             end
 
-            column :NAME, "Name of the Zone", :left, :size=>25 do |d|
-                d["NAME"]
+            column :NAME, 'Name of the Zone', :left, :size=>25 do |d|
+                d['NAME']
             end
 
-            column :ENDPOINT, "Endpoint of the Zone", :left, :size=>45 do |d|
-                d["TEMPLATE"]['ENDPOINT']
+            column :ENDPOINT, 'Endpoint of the Zone', :left, :size=>45 do |d|
+                d['TEMPLATE']['ENDPOINT']
             end
 
-            column :FED_INDEX, "Federation index", :left, :size=>10 do |d|
-                helper.get_fed_index(d["TEMPLATE"]['ENDPOINT'])
+            column :FED_INDEX, 'Federation index', :left, :size=>10 do |d|
+                helper.get_fed_index(d['TEMPLATE']['ENDPOINT'])
             end
 
             column :STAT, 'Zone status', :left, :size => 6 do |d|
@@ -551,8 +552,6 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper
 
             default :CURRENT, :ID, :NAME, :ENDPOINT, :FED_INDEX, :STAT
         end
-
-        table
     end
 
     def get_fed_index(endpoint)
@@ -585,11 +584,11 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper
         if temporary_zone
             puts "Type: export ONE_XMLRPC=#{zone['TEMPLATE/ENDPOINT']}"
         else
-            File.open(ENV['HOME']+"/.one/one_endpoint", 'w'){|f|
+            File.open(Dir.home+'/.one/one_endpoint', 'w') do |f|
                 f.puts zone['TEMPLATE/ENDPOINT']
-            }
+            end
             puts "Endpoint changed to \"#{zone['TEMPLATE/ENDPOINT']}\" in " <<
-                "#{ENV['HOME']}/.one/one_endpoint"
+                "#{Dir.home}/.one/one_endpoint"
         end
 
         return 0 unless zone['TEMPLATE/ONEFLOW_ENDPOINT']
@@ -598,13 +597,13 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper
         if temporary_zone
             puts "Type: export ONEFLOW_URL=#{zone['TEMPLATE/ONEFLOW_ENDPOINT']}"
         else
-            File.open(ENV['HOME'] + '/.one/oneflow_endpoint', 'w') do |f|
+            File.open(Dir.home + '/.one/oneflow_endpoint', 'w') do |f|
                 f.puts zone['TEMPLATE/ONEFLOW_ENDPOINT']
             end
 
             puts 'OneFlow Endpoint changed to ' \
                  "\"#{zone['TEMPLATE/ONEFLOW_ENDPOINT']}\" in " <<
-                 "#{ENV['HOME']}/.one/oneflow_endpoint"
+                 "#{Dir.home}/.one/oneflow_endpoint"
         end
 
         0
@@ -612,7 +611,7 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper
 
     private
 
-    def factory(id=nil)
+    def factory(id = nil)
         if id
             OpenNebula::Zone.new_with_id(id, @client)
         else
@@ -621,92 +620,90 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper
         end
     end
 
-    def factory_pool(user_flag=-2)
+    def factory_pool(_user_flag = -2)
         OpenNebula::ZonePool.new(@client)
     end
 
-    def format_resource(zone, options = {})
-        str="%-18s: %-20s"
-        str_h1="%-80s"
+    def format_resource(zone, _options = {})
+        str='%-18s: %-20s'
+        str_h1='%-80s'
 
         CLIHelper.print_header(str_h1 % "ZONE #{zone['ID']} INFORMATION")
-        puts str % ["ID",   zone.id.to_s]
-        puts str % ["NAME", zone.name]
-        puts str % ["STATE",zone.state_str]
+        puts format(str, 'ID', zone.id.to_s)
+        puts format(str, 'NAME', zone.name)
+        puts format(str, 'STATE', zone.state_str)
         puts
 
         zone_hash=zone.to_hash
 
-        if zone.has_elements?("/ZONE/SERVER_POOL/SERVER")
+        if zone.has_elements?('/ZONE/SERVER_POOL/SERVER')
 
             puts
-            CLIHelper.print_header(str_h1 % "ZONE SERVERS",false)
+            CLIHelper.print_header(str_h1 % 'ZONE SERVERS', false)
 
             CLIHelper::ShowTable.new(nil, self) do
-
-                column :"ID", "", :size=>2 do |d|
-                    d["ID"] if !d.nil?
+                column :ID, '', :size=>2 do |d|
+                    d['ID'] unless d.nil?
                 end
 
-                column :"NAME", "", :left, :size=>15 do |d|
-                    d["NAME"] if !d.nil?
+                column :NAME, '', :left, :size=>15 do |d|
+                    d['NAME'] unless d.nil?
                 end
 
-                column :"ENDPOINT", "", :left, :size=>63 do |d|
-                    d["ENDPOINT"] if !d.nil?
+                column :ENDPOINT, '', :left, :size=>63 do |d|
+                    d['ENDPOINT'] unless d.nil?
                 end
             end.show([zone_hash['ZONE']['SERVER_POOL']['SERVER']].flatten, {})
 
             puts
-            CLIHelper.print_header(str_h1 % "HA & FEDERATION SYNC STATUS",false)
+            CLIHelper.print_header(str_h1 % 'HA & FEDERATION SYNC STATUS', false)
 
             CLIHelper::ShowTable.new(nil, self) do
-
-                column :"ID", "", :size=>2 do |d|
-                    d["ID"] if !d.nil?
+                column :ID, '', :size=>2 do |d|
+                    d['ID'] unless d.nil?
                 end
 
-                column :"NAME", "", :left, :size=>15 do |d|
-                    d["NAME"] if !d.nil?
+                column :NAME, '', :left, :size=>15 do |d|
+                    d['NAME'] unless d.nil?
                 end
 
-                column :"STATE", "", :left, :size=>10 do |d|
-                    d["STATE"] = case d["STATE"]
-                        when "0" then "solo"
-                        when "1" then "candidate"
-                        when "2" then "follower"
-                        when "3" then "leader"
-                        else "error"
-                    end
-                    d["STATE"] if !d.nil?
+                column :STATE, '', :left, :size=>10 do |d|
+                    d['STATE'] = case d['STATE']
+                                 when '0' then 'solo'
+                                 when '1' then 'candidate'
+                                 when '2' then 'follower'
+                                 when '3' then 'leader'
+                                 else 'error'
+                                 end
+                    d['STATE'] unless d.nil?
                 end
 
-                column :"TERM", "", :left, :size=>10 do |d|
-                    d["TERM"] if !d.nil?
+                column :TERM, '', :left, :size=>10 do |d|
+                    d['TERM'] unless d.nil?
                 end
 
-                column :"INDEX", "", :left, :size=>10 do |d|
-                    d["LOG_INDEX"] if !d.nil?
+                column :INDEX, '', :left, :size=>10 do |d|
+                    d['LOG_INDEX'] unless d.nil?
                 end
 
-                column :"COMMIT", "", :left, :size=>10 do |d|
-                    d["COMMIT"] if !d.nil?
+                column :COMMIT, '', :left, :size=>10 do |d|
+                    d['COMMIT'] unless d.nil?
                 end
 
-                column :"VOTE", "", :left, :size=>5 do |d|
-                    d["VOTEDFOR"] if !d.nil?
+                column :VOTE, '', :left, :size=>5 do |d|
+                    d['VOTEDFOR'] unless d.nil?
                 end
 
-                column :"FED_INDEX", "", :left, :size=>10 do |d|
-                    d["FEDLOG_INDEX"] if !d.nil?
+                column :FED_INDEX, '', :left, :size=>10 do |d|
+                    d['FEDLOG_INDEX'] unless d.nil?
                 end
-
             end.show([zone_hash['ZONE']['SERVER_POOL']['SERVER']].flatten, {})
         end
 
         puts
 
-        CLIHelper.print_header(str_h1 % "ZONE TEMPLATE", false)
+        CLIHelper.print_header(str_h1 % 'ZONE TEMPLATE', false)
         puts zone.template_str
     end
+
 end