From c61454f44458c6b7ddf79449152107a98ad28d45 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Tue, 6 Oct 2020 19:10:38 +0200 Subject: [PATCH] L #-: linting for rubocop 0.92.0 --- share/linters/.rubocop.yml | 77 +++++++++++++++++++ src/cli/cli_helper.rb | 2 +- src/oneprovision/lib/utils.rb | 1 + .../remotes/lib/firecracker/opennebula_vm.rb | 1 + .../lib/nsx_driver/distributed_firewall.rb | 5 -- .../remotes/lib/nsx_driver/logical_port.rb | 4 - .../remotes/lib/nsx_driver/logical_switch.rb | 6 -- .../remotes/lib/nsx_driver/transport_zone.rb | 5 -- .../virtual_machine_device/vm_disk.rb | 4 - .../virtual_machine_device/vm_nic.rb | 4 - src/vmm_mad/remotes/vcenter/vcenter_driver.rb | 1 + 11 files changed, 81 insertions(+), 29 deletions(-) diff --git a/share/linters/.rubocop.yml b/share/linters/.rubocop.yml index f67d825b76..fb42f111f8 100644 --- a/share/linters/.rubocop.yml +++ b/share/linters/.rubocop.yml @@ -573,6 +573,9 @@ Layout/SpaceAroundMethodCallOperator: Layout/EmptyLinesAroundAttributeAccessor: Enabled: true +Layout/BeginEndAlignment: + Enabled: true + ####### # STYLE ####### @@ -719,6 +722,33 @@ Style/RedundantRegexpCharacterClass: Style/RedundantRegexpEscape: Enabled: False +Style/CombinableLoops: + Enabled: false + +Style/ExplicitBlockArgument: + Enabled: true + +Style/GlobalStdStream: + Enabled: false + +Style/KeywordParametersOrder: + Enabled: true + +Style/OptionalBooleanParameter: + Enabled: false + +Style/RedundantSelfAssignment: + Enabled: true + +Style/SingleArgumentDig: + Enabled: true + +Style/SoleNestedConditional: + Enabled: false + +Style/StringConcatenation: + Enabled: false + ###### # LINT ###### @@ -777,6 +807,53 @@ Lint/DuplicateElsifCondition: Lint/MixedRegexpCaptureTypes: Enabled: True +Lint/BinaryOperatorWithIdenticalOperands: + Enabled: true + +Lint/ConstantDefinitionInBlock: + Enabled: false + +Lint/DuplicateRequire: + Enabled: true + +Lint/DuplicateRescueException: + Enabled: true + +Lint/EmptyConditionalBody: + Enabled: true + +Lint/EmptyFile: + Enabled: true + +Lint/FloatComparison: + Enabled: false + +Lint/IdentityComparison: + Enabled: true + +Lint/MissingSuper: + Enabled: true + +Lint/OutOfRangeRegexpRef: + Enabled: true + +Lint/SelfAssignment: + Enabled: true + +Lint/TopLevelReturnWithArgument: + Enabled: true +Lint/TrailingCommaInAttributeDeclaration: + Enabled: true + +Lint/UnreachableLoop: + Enabled: true + +Lint/UselessMethodDefinition: + Enabled: true + +Lint/UselessTimes: + Enabled: true + ######### # METRICS ######## diff --git a/src/cli/cli_helper.rb b/src/cli/cli_helper.rb index 7aae190ba0..fcd359efb7 100644 --- a/src/cli/cli_helper.rb +++ b/src/cli/cli_helper.rb @@ -532,7 +532,7 @@ module CLIHelper # @param data [Array] Array with data to show # @param del [Char] CSV delimiter def print_csv_data(data, del) - del ? del = del : del = ',' + del ||= ',' data.each do |l| result = [] diff --git a/src/oneprovision/lib/utils.rb b/src/oneprovision/lib/utils.rb index cccc224e9f..c5974c41b1 100644 --- a/src/oneprovision/lib/utils.rb +++ b/src/oneprovision/lib/utils.rb @@ -32,6 +32,7 @@ class OneProvisionLoopException < RuntimeError attr_reader :text def initialize(text = nil) + super @text = text end diff --git a/src/vmm_mad/remotes/lib/firecracker/opennebula_vm.rb b/src/vmm_mad/remotes/lib/firecracker/opennebula_vm.rb index fabbe7f841..5b30958b8b 100644 --- a/src/vmm_mad/remotes/lib/firecracker/opennebula_vm.rb +++ b/src/vmm_mad/remotes/lib/firecracker/opennebula_vm.rb @@ -39,6 +39,7 @@ class FirecrackerConfiguration < Hash FIRECRACKERRC = '../../etc/vmm/firecracker/firecrackerrc' def initialize + super replace(DEFAULT_CONFIGURATION) begin diff --git a/src/vmm_mad/remotes/lib/nsx_driver/distributed_firewall.rb b/src/vmm_mad/remotes/lib/nsx_driver/distributed_firewall.rb index 2416286948..9e48350c15 100644 --- a/src/vmm_mad/remotes/lib/nsx_driver/distributed_firewall.rb +++ b/src/vmm_mad/remotes/lib/nsx_driver/distributed_firewall.rb @@ -54,11 +54,6 @@ module NSXDriver # ATTRIBUTES attr_reader :one_section_name - # CONSTRUCTOR - def initialize(nsx_client) - super(nsx_client) - end - def self.new_child(nsx_client) case nsx_client when NSXTClient diff --git a/src/vmm_mad/remotes/lib/nsx_driver/logical_port.rb b/src/vmm_mad/remotes/lib/nsx_driver/logical_port.rb index 501f13e454..18c409db9d 100644 --- a/src/vmm_mad/remotes/lib/nsx_driver/logical_port.rb +++ b/src/vmm_mad/remotes/lib/nsx_driver/logical_port.rb @@ -22,10 +22,6 @@ module NSXDriver # CONSTRUCTOR - def initialize(nsx_client) - super(nsx_client) - end - def self.new_child(nsx_client, id = nil) case nsx_client.nsx_type.upcase when NSXConstants::NSXT diff --git a/src/vmm_mad/remotes/lib/nsx_driver/logical_switch.rb b/src/vmm_mad/remotes/lib/nsx_driver/logical_switch.rb index 7950624e5b..1bfe5e326d 100644 --- a/src/vmm_mad/remotes/lib/nsx_driver/logical_switch.rb +++ b/src/vmm_mad/remotes/lib/nsx_driver/logical_switch.rb @@ -25,12 +25,6 @@ module NSXDriver attr_reader :display_name attr_reader :description - # CONSTRUCTOR - - def initialize(nsx_client) - super(nsx_client) - end - def ls?; end # Get logical switch's name diff --git a/src/vmm_mad/remotes/lib/nsx_driver/transport_zone.rb b/src/vmm_mad/remotes/lib/nsx_driver/transport_zone.rb index 0d19a260b5..5ab9d43a26 100644 --- a/src/vmm_mad/remotes/lib/nsx_driver/transport_zone.rb +++ b/src/vmm_mad/remotes/lib/nsx_driver/transport_zone.rb @@ -21,11 +21,6 @@ module NSXDriver # ATTRIBUTES attr_reader :tz_id - # CONSTRUCTOR - def initialize(nsx_client) - super(nsx_client) - end - def self.new_child(nsx_client) case nsx_client.nsx_type.upcase when NSXConstants::NSXT diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine_device/vm_disk.rb b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine_device/vm_disk.rb index 8014421ceb..ddc7699382 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine_device/vm_disk.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine_device/vm_disk.rb @@ -20,10 +20,6 @@ module VirtualMachineDevice attr_reader :size - def initialize(id, one_res, vc_res) - super(id, one_res, vc_res) - end - # Create the OpenNebula disk representation # Allow us to create the class without vCenter representation # example: attached disks not synced with vCenter diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine_device/vm_nic.rb b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine_device/vm_nic.rb index 8144a79969..5b2619f95a 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine_device/vm_nic.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine_device/vm_nic.rb @@ -18,10 +18,6 @@ module VirtualMachineDevice # Nic class class Nic < Device - def initialize(id, one_res, vc_res) - super(id, one_res, vc_res) - end - # Create the OpenNebula nic representation # Allow as to create the class without vCenter representation # example: attached nics not synced with vCenter diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb index ea30c37d20..082a0dfb27 100644 --- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb +++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb @@ -58,6 +58,7 @@ class VCenterConf < Hash } def initialize + super replace(DEFAULT_CONFIGURATION) begin vcenterrc_path = "#{VAR_LOCATION}/remotes/etc/vmm/vcenter/vcenterrc"