fog-vsphere 1.7.0 → 1.7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f885f4027de3c28c90d0d9909bd13c7c9ec8b339
-  data.tar.gz: afc80dbe162913b73794220d69ca791ea2829ef0
+SHA256:
+  metadata.gz: 95375060abd33bf28937dfdc793ecbfcefb1a612d4a639456c0a304ac7641a25
+  data.tar.gz: 7550cbe2aee4325dafaff388c2546470a82cd893aad7818f52302f4005f5df2f
 SHA512:
-  metadata.gz: 6ee93b2bb15102f94be2510f384651452b6a973626dfc8efef770091c2e58856de199b39c043d1c8316d79f921732b2846ea027f17b3cf03042c2dab2ef087f5
-  data.tar.gz: 7144e530d128aeb69042ec2dfdbf7935eb4130e46f2ef7e5a9bd8097f2385b5bd82715b056558aac00347269017701932756dce6fc3d7b20e08e30096848397c
+  metadata.gz: 032576f8e9d1c11dee28a26625d72f23c4c50c60fce93480b3cacb97c0ad13c98c182357acbcf2106138eaa6edf39a83dfd70fa86939f367cf32d017ab44fc8c
+  data.tar.gz: 215eb88241d55311ecfcd45f2e85a2fd3a6b52ed9806418d8bfc7767e82559390f0f5e71b623a5a8ffe62272f304d7c1fae5fec261ad43cab0fb5bebcc1514de

data/.gitignore

@@ -20,4 +20,5 @@ tmp
 *.o
 *.a
 mkmf.log
-gemfiles/*.lock
+gemfiles/*.lock
+.*.swp

data/.rubocop.yml

@@ -0,0 +1,8 @@
+inherit_from:
+  - .rubocop_todo.yml
+
+AllCops:
+  TargetRubyVersion: 2.0
+
+Style/Documentation:
+  Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,217 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2018-04-18 16:02:28 +0200 using RuboCop version 0.50.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 4
+# Configuration parameters: AllowSafeAssignment.
+Lint/AssignmentInCondition:
+  Exclude:
+    - 'lib/fog/vsphere/requests/compute/create_vm.rb'
+    - 'lib/fog/vsphere/requests/compute/vm_clone.rb'
+
+# Offense count: 7
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyleAlignWith, SupportedStylesAlignWith, AutoCorrect.
+# SupportedStylesAlignWith: keyword, variable, start_of_line
+Lint/EndAlignment:
+  Exclude:
+    - 'lib/fog/vsphere/models/compute/customfields.rb'
+    - 'lib/fog/vsphere/models/compute/customvalues.rb'
+    - 'lib/fog/vsphere/models/compute/tickets.rb'
+    - 'lib/fog/vsphere/models/compute/volumes.rb'
+    - 'lib/fog/vsphere/requests/compute/create_vm.rb'
+    - 'lib/fog/vsphere/requests/compute/host_start_maintenance.rb'
+
+# Offense count: 2
+Lint/InterpolationCheck:
+  Exclude:
+    - 'tests/requests/compute/vm_power_off_tests.rb'
+    - 'tests/requests/compute/vm_suspend_tests.rb'
+
+# Offense count: 13
+Lint/RescueWithoutErrorClass:
+  Exclude:
+    - 'lib/fog/vsphere/compute.rb'
+    - 'lib/fog/vsphere/requests/compute/list_hosts.rb'
+    - 'lib/fog/vsphere/requests/compute/list_vm_cdroms.rb'
+    - 'lib/fog/vsphere/requests/compute/list_vm_volumes.rb'
+
+# Offense count: 3
+Lint/ShadowingOuterLocalVariable:
+  Exclude:
+    - 'lib/fog/vsphere/requests/compute/create_vm.rb'
+    - 'lib/fog/vsphere/requests/compute/destroy_rule.rb'
+    - 'lib/fog/vsphere/requests/compute/get_vm_first_scsi_controller.rb'
+
+# Offense count: 9
+Lint/UselessAssignment:
+  Exclude:
+    - 'lib/fog/vsphere/compute.rb'
+    - 'lib/fog/vsphere/models/compute/interfaces.rb'
+    - 'lib/fog/vsphere/models/compute/volumes.rb'
+    - 'lib/fog/vsphere/requests/compute/create_rule.rb'
+    - 'lib/fog/vsphere/requests/compute/create_vm.rb'
+    - 'lib/fog/vsphere/requests/compute/get_interface_type.rb'
+    - 'lib/fog/vsphere/requests/compute/vm_clone.rb'
+    - 'lib/fog/vsphere/requests/compute/vm_migrate.rb'
+    - 'tests/requests/compute/vm_clone_tests.rb'
+
+# Offense count: 57
+Metrics/AbcSize:
+  Max: 633
+
+# Offense count: 12
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/BlockLength:
+  Max: 263
+
+# Offense count: 21
+# Configuration parameters: CountBlocks.
+Metrics/BlockNesting:
+  Max: 5
+
+# Offense count: 6
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 452
+
+# Offense count: 15
+Metrics/CyclomaticComplexity:
+  Max: 150
+
+# Offense count: 16
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 317
+
+# Offense count: 72
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 356
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ModuleLength:
+  Max: 109
+
+# Offense count: 2
+# Configuration parameters: CountKeywordArgs.
+Metrics/ParameterLists:
+  Max: 6
+
+# Offense count: 16
+Metrics/PerceivedComplexity:
+  Max: 158
+
+# Offense count: 1
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
+# NamePrefix: is_, has_, have_
+# NamePrefixBlacklist: is_, has_, have_
+# NameWhitelist: is_a?
+Naming/PredicateName:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/fog/vsphere/compute.rb'
+
+# Offense count: 15
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: snake_case, camelCase
+Naming/VariableName:
+  Exclude:
+    - 'lib/fog/vsphere/requests/compute/create_vm.rb'
+    - 'lib/fog/vsphere/requests/compute/list_datacenters.rb'
+    - 'lib/fog/vsphere/requests/compute/list_resource_pools.rb'
+    - 'lib/fog/vsphere/requests/compute/list_server_types.rb'
+    - 'lib/fog/vsphere/requests/compute/vm_clone.rb'
+    - 'tests/compute_tests.rb'
+
+# Offense count: 10
+Style/CaseEquality:
+  Exclude:
+    - 'lib/fog/vsphere/requests/compute/list_child_snapshots.rb'
+    - 'lib/fog/vsphere/requests/compute/revert_to_snapshot.rb'
+    - 'tests/requests/compute/list_child_snapshots_tests.rb'
+    - 'tests/requests/compute/list_datastores_tests.rb'
+    - 'tests/requests/compute/list_hosts_tests.rb'
+    - 'tests/requests/compute/list_networks_tests.rb'
+    - 'tests/requests/compute/list_vm_cdroms_tests.rb'
+    - 'tests/requests/compute/list_vm_snapshots_tests.rb'
+
+# Offense count: 1
+Style/ClassVars:
+  Exclude:
+    - 'lib/fog/bin/vsphere.rb'
+
+# Offense count: 1
+Style/DoubleNegation:
+  Exclude:
+    - 'tests/helpers/succeeds_helper.rb'
+
+# Offense count: 12
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/fog/vsphere/compute.rb'
+    - 'lib/fog/vsphere/models/compute/interfaces.rb'
+    - 'lib/fog/vsphere/models/compute/rule.rb'
+    - 'lib/fog/vsphere/models/compute/server.rb'
+    - 'lib/fog/vsphere/requests/compute/create_group.rb'
+    - 'lib/fog/vsphere/requests/compute/create_rule.rb'
+    - 'lib/fog/vsphere/requests/compute/create_vm.rb'
+    - 'lib/fog/vsphere/requests/compute/list_resource_pools.rb'
+    - 'lib/fog/vsphere/requests/compute/list_server_types.rb'
+
+# Offense count: 2
+Style/IfInsideElse:
+  Exclude:
+    - 'lib/fog/vsphere/models/compute/cdrom.rb'
+    - 'lib/fog/vsphere/models/compute/volume.rb'
+
+# Offense count: 2
+Style/MultilineBlockChain:
+  Exclude:
+    - 'lib/fog/vsphere/requests/compute/vm_clone.rb'
+
+# Offense count: 4
+Style/MultilineTernaryOperator:
+  Exclude:
+    - 'lib/fog/vsphere/models/compute/cluster.rb'
+    - 'lib/fog/vsphere/requests/compute/list_child_snapshots.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle, SupportedStyles.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/fog/vsphere/requests/compute/list_compute_resources.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Exclude:
+    - 'Rakefile'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
+# SupportedStyles: slashes, percent_r, mixed
+Style/RegexpLiteral:
+  Exclude:
+    - 'lib/fog/vsphere/requests/compute/create_folder.rb'
+    - 'lib/fog/vsphere/requests/compute/get_folder.rb'
+    - 'lib/fog/vsphere/requests/compute/list_resource_pools.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowAsExpressionSeparator.
+Style/Semicolon:
+  Exclude:
+    - 'tests/models/compute/rules_tests.rb'

data/.travis.yml

@@ -6,20 +6,19 @@ matrix:
     - rvm: jruby-head
   fast_finish: true
   include:
-    - rvm: 1.9.3
-      gemfile: gemfiles/Gemfile.1.9.2+
     - rvm: 2.0.0
       gemfile: Gemfile
-    - rvm: 2.1.0
+    - rvm: 2.1.10
       gemfile: Gemfile
-    - rvm: 2.1.1
+    - rvm: 2.2.6
       gemfile: Gemfile
-    - rvm: 2.2.0
+    - rvm: 2.3.3
+      gemfile: Gemfile
+    - rvm: 2.4.0
       gemfile: Gemfile
-    - rvm: jruby-19mode
-      gemfile: gemfiles/Gemfile.1.9.2+
     - rvm: jruby-head
       gemfile: Gemfile
+script: bundle exec rake travis:ci
 notifications:
   email: false
 addons:

data/CHANGELOG.md

@@ -1,7 +1,5 @@
 ## v1.7.0
 
-* Update volumes when `save` is called on Server
-* Add the ability to update the size of attached virtual disks
 * Improve mocks for folders and networks
 
 ## v1.6.0
@@ -14,17 +12,15 @@
 
 ## v1.5.1
 
-* Move volume key generation to volume model
-* Set defaults more reliably for SCSI
+* Removed for hotfix
 
 ## v1.5.0
 
 * Rename the get_spec method in create_rule to get_group_spec
-* Change modify_vm_controller to follow changes made to create_controller
 
 ## v1.4.0
 
-* Add ability for VMs to have multiple SCSI controllers
+* Removed for hotfix
 
 ## v1.3.0
 

data/CONTRIBUTORS.md

@@ -4,11 +4,13 @@
 * Ben Talbot - btalbot <ben_t48@hotmail.com>
 * Carl Caum <carl@carlcaum.com>
 * Carlos Sanchez <csanchez@maestrodev.com>
+* Chris Roberts <chrobert@redhat.com>
 * Chris Thompson <chris.thompson@govdelivery.com>
 * Chris Thompson <teaforthecat@gmail.com>
 * Christopher Oliver <coliver@datapipe.com>
 * Cyrus Team <cyrusteam@cyruslists.com>
 * Darren Foo <stonith@users.noreply.github.com>
+* Derek Wright <derekmwright@users.noreply.github.com>
 * Dominic Cleal <dcleal@redhat.com>
 * Eric Stonfer <ericstonfer@yahoo.com>
 * Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
@@ -36,6 +38,7 @@
 * Lukas Zapletal <lzap+git@redhat.com>
 * Marc Grimme <grimme@atix.de>
 * Marc Grimme <marc.grimme@googlemail.com>
+* Marek Hulan <mhulan@redhat.com>
 * Martin Matuska <martin@matuska.org>
 * Matt Darby <matt.darby@rackspace.com>
 * Matthew Black <matthew.black@sap.com>
@@ -56,11 +59,14 @@
 * Rich Daley <rdaley@williamhill.co.uk>
 * Rich Lane <rlane@club.cc.cmu.edu>
 * Samuel Keeley <samuel@dropbox.com>
+* Sergio Cambra <sergio@programatica.es>
 * Shlomi Zadok <shlomi@ben-hanna.com>
 * Simon Josi <me@yokto.net>
 * Tejas Ravindra Mandke <tejas@identified.com>
+* Timo Goebel <mail@timogoebel.name>
 * Timo Goebel <timo.goebel@dm.de>
 * Timur Alperovich <timur@maginatics.com>
+* Tyler Gregory <01100010011001010110010101110000@users.noreply.github.com>
 * Wesley Beary <geemus+github@gmail.com>
 * Wesley Beary <geemus@gmail.com>
 * Xavier Fontrodona <xavier.fontrodona@safelayer.com>
@@ -70,5 +76,9 @@
 * geemus <geemus@gmail.com>
 * karmab <karimboumedhel@gmail.com>
 * karimb <karimboumedhel@gmail.com>
+* milo_cheung <milo.cheung@appcara.com>
+* scottd018 <scottd018@users.noreply.github.com>
 * slivik <jakub.sliva@gmail.com>
+* theOpenBit <theopenbit@users.noreply.github.com>
 * tipt0e <topo-2@charter.net>
+* wiad <adam.winberg@gmail.com>

data/Rakefile

@@ -1,8 +1,17 @@
 require 'bundler/gem_tasks'
+require 'rubocop/rake_task'
+
+desc 'Run Ruby style checks'
+RuboCop::RakeTask.new(:style)
+
+namespace :travis do
+  desc 'Run tests on Travis'
+  task ci: %w(style test)
+end
 
 mock = ENV['FOG_MOCK'] || 'true'
 task :test do
   sh("export FOG_MOCK=#{mock} && bundle exec shindont")
 end
 
-task(:default => [:test])
+task(default: [:test])

data/lib/fog/vsphere/compute.rb

@@ -89,7 +89,6 @@ module Fog
       request :get_virtual_machine
       request :vm_reconfig_hardware
       request :vm_reconfig_memory
-      request :vm_reconfig_volumes
       request :vm_reconfig_cpus
       request :vm_reconfig_cdrom
       request :vm_config_vnc
@@ -101,7 +100,6 @@ module Fog
       request :list_vm_customvalues
       request :list_customfields
       request :get_vm_first_scsi_controller
-      request :list_vm_scsi_controllers
       request :set_vm_customvalue
       request :vm_take_snapshot
       request :list_vm_snapshots

data/lib/fog/vsphere/models/compute/scsicontroller.rb

@@ -5,14 +5,9 @@ module Fog
         attribute :shared_bus
         attribute :type
         attribute :unit_number
-        attribute :key, :type => :integer
+        attribute :key
         attribute :server_id
 
-        def initialize(attributes = {})
-          super
-          self.key ||= 1000
-        end
-
         def to_s
           "#{type} ##{key}: shared: #{shared_bus}, unit_number: #{unit_number}"
         end

data/lib/fog/vsphere/models/compute/server.rb

@@ -6,7 +6,6 @@ module Fog
       class Server < Fog::Compute::Server
         extend Fog::Deprecation
         deprecate(:ipaddress, :public_ip_address)
-        deprecate(:scsi_controller, :scsi_controllers)
 
         # This will be the instance uuid which is globally unique across
         # a vSphere deployment.
@@ -46,7 +45,7 @@ module Fog
         attribute :instance_uuid # move this --> id
         attribute :guest_id
         attribute :hardware_version
-        attribute :scsi_controllers, :type => :array
+        attribute :scsi_controller # this is the first scsi controller. Right now no more of them can be used.
         attribute :cpuHotAddEnabled
         attribute :memoryHotAddEnabled
         attribute :firmware
@@ -58,7 +57,7 @@ module Fog
           initialize_interfaces
           initialize_volumes
           initialize_customvalues
-          initialize_scsi_controllers
+          initialize_scsi_controller
         end
 
         # Lazy Loaded Attributes
@@ -80,11 +79,6 @@ module Fog
           service.vm_reconfig_cpus('instance_uuid' => instance_uuid, 'cpus' => cpus, 'corespersocket' => corespersocket)
         end
 
-        def vm_reconfig_volumes(options = {})
-          requires :instance_uuid, :volumes
-          service.vm_reconfig_volumes('instance_uuid' => instance_uuid, 'volumes' => volumes)
-        end
-
         def vm_reconfig_hardware(hardware_spec, options = {})
           requires :instance_uuid
           service.vm_reconfig_hardware('instance_uuid' => instance_uuid, 'hardware_spec' => hardware_spec)
@@ -261,12 +255,8 @@ module Fog
           attributes[:customvalues] ||= id.nil? ? [] : service.customvalues( :vm => self )
         end
 
-        def scsi_controllers
-          self.attributes[:scsi_controllers] ||= service.list_vm_scsi_controllers(id)
-        end
-
         def scsi_controller
-          scsi_controllers.first
+          self.attributes[:scsi_controller] ||= service.get_vm_first_scsi_controller(id)
         end
 
         def folder
@@ -279,7 +269,6 @@ module Fog
           if persisted?
            vm_reconfig_cpus if attribute_changed?(:cpus) || attribute_changed?(:corespersocket)
            vm_reconfig_memory if attribute_changed?(:memory_mb)
-           vm_reconfig_volumes if attribute_changed?(:volumes)
           else
             self.id = service.create_vm(attributes)
           end
@@ -325,7 +314,7 @@ module Fog
 
         def initialize_volumes
           if attributes[:volumes] and attributes[:volumes].is_a?(Array)
-            self.attributes[:volumes].map! { |vol| vol.is_a?(Hash) ? service.volumes.new({:server => self}.merge(vol)) : vol }
+            self.attributes[:volumes].map! { |vol| vol.is_a?(Hash) ? service.volumes.new(vol) : vol }
           end
         end
 
@@ -335,20 +324,9 @@ module Fog
           end
         end
 
-        def initialize_scsi_controllers
-          if attributes[:scsi_controllers] && attributes[:scsi_controllers].is_a?(Array)
-            self.attributes[:scsi_controllers].map! do |controller|
-              controller.is_a?(Hash) ? Fog::Compute::Vsphere::SCSIController.new(controller) : controller
-            end
-          elsif attributes[:scsi_controller] && attributes[:scsi_controller].is_a?(Hash)
-            self.attributes[:scsi_controllers] = [
-              Fog::Compute::Vsphere::SCSIController.new(self.attributes[:scsi_controller])
-            ]
-          elsif attributes[:volumes] && attributes[:volumes].is_a?(Array) && !attributes[:volumes].empty?
-            # Create a default scsi controller if there are any disks but no controller defined
-            self.attributes[:scsi_controllers] = [
-              Fog::Compute::Vsphere::SCSIController.new
-            ]
+        def initialize_scsi_controller
+          if attributes[:scsi_controller] and attributes[:scsi_controller].is_a?(Hash)
+            Fog::Compute::Vsphere::SCSIController.new(self.attributes[:scsi_controller])
           end
         end