fog-vsphere 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3104c3caaef8f008444f574b175899511cfb25ce937ab983ea7e2ca6c0973b97
-  data.tar.gz: 7272ca524f7453b3984522de5e493c7f394681f9a2a7624f88001085857240a0
+  metadata.gz: fbf8c2995fa660abf28a98251b80558313b774a1bc2e8ef3bc586d45d8064935
+  data.tar.gz: 5866c48ca90536982c801690532da58552c1eddf41152e375c2b5c5cd7c32607
 SHA512:
-  metadata.gz: 00a479bae8d9529d030289f650ddb16785ff33742e50f8059897c3189a87b9fdba401dd41b77cf8b533778d2953f665d0c7386e3d6c26b02f1a8c3cf984dfe11
-  data.tar.gz: f1185b6844ae1b427b9f4064f04ce10ab3198bca8b822e3c6bddaaf8cc78494c8ab66acfe73a7bb705e5a92b7bf7f3f8cd9a02d7499ca0628f3cdbd1b4606b69
+  metadata.gz: e0b9e971137d1514ff5d222a220da02ea4666b9bd57e51d961af17d5a797ce1d48291d6a995a1ab4791521f2021c8b7165c6612896db58be6ac3fd0904daeb4d
+  data.tar.gz: b775ee968dc815b746ed032bf499230a95fbe7ff8e34a44c12270be68be5708c88effb117462cca0a6d385335297b594fc6ad5e2a9a9aafc5c2d56837410ae73

data/.gitignore

@@ -22,3 +22,4 @@ tmp
 mkmf.log
 gemfiles/*.lock
 .*.swp
+tests/vsphere_config.yml

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## v3.1.0
+
+* Adds vcr webmock testing basics (#208)
+* Allow changes for HotAdd memory and CPU (#207)
+* Fix NoMethodError `blank?` without Rails (#206)
+* Fix VM interfaces updates (#205)
+* Network lookup by ID (#204)
+* Allow add disk on storageClusters on VM clone (#202)
+* Make `boot_order` an attribute of VM (#194)
+
 ## v3.0.0
 
 * Change module namespace to Fog::Vsphere::Compute (#192)

data/CONTRIBUTING.md

@@ -1,18 +1,55 @@
 # Getting Involved
 
-New contributors are always welcome, when it doubt please ask questions. We strive to be an open and welcoming community. Please be nice to one another.
+:+1::tada: First off, thanks for taking the time to contribute! :tada::+1:
+
+New contributors are always welcome, when it doubt please ask questions.
+We strive to be an open and welcoming community. Please be nice to one another.
+
+## Non-Coding
+
+- Offer feedback on open [issues](https://github.com/fog/fog-vsphere/issues).
+- Organize or volunteer at events.
 
 ## Coding
 
 - Pick a task:
-- Offer feedback on open [pull requests](https://github.com/fog/fog-vsphere/pulls).
 - Review open [issues](https://github.com/fog/fog-vsphere/issues) for things to help on.
 - [Create an issue](https://github.com/fog/fog-vsphere/issues/new) to start a discussion on additions or features.
 - Fork the project, add your changes and tests to cover them in a topic branch.
 - Commit your changes and rebase against `fog/fog-vsphere` to ensure everything is up to date.
 - [Submit a pull request](https://github.com/fog/fog-vsphere/compare/)
 
-## Non-Coding
+### Testing
 
-- Offer feedback on open [issues](https://github.com/fog/fog-vsphere/issues).
-- Organize or volunteer at events.
+We are in a process of a covering the functionality by integrational tests.
+We would like to cover all the requests made towards the vSphere instance.
+Doing so should give us more confidence and make the development easier.
+We will appreciate if you are able to help. Following steps will guide you
+through a process of covering new/changed funcionality.
+
+1. First of all you will need vSphere instance.
+2. You need to add your vSphere instance login info in `tests/vsphere_config.yml` file.
+```yaml
+server: example.com
+username: '<UserName>'
+password: '<password>'
+rev: '6.7' # optional revision of the vsphere
+expected_pubkey_hash: <expected_pubkey_hash>
+```
+*This file is gitignored to ensure you won't accidently commit it.*
+*We are making sure, that the login request is not recorded, but you may want to reasure it in a newly written cassette.*
+
+3. write your test like this:
+```ruby
+# tests/requests/compute/<your_request>
+it 'parses the mocked request' do
+  recording_webmock_cassette('unique_mocked_request') do
+    #stuff I want to get tested
+  end
+end
+```
+*But be aware, we do not mock the names of your datacenters and/or clusters, please be aware, you will need to take care not to commit any private server names/IP addresses.*
+
+4. Run the test
+5. Change the `recording_webmock_cassette` to a `with_webmock_cassette`
+6. Commit, open a PR :tada:

data/README.md

@@ -87,6 +87,7 @@ There is a lot more you can do as well! We are working on providing better docum
 ## Contributing
 
 To contribute to this project, add an issue or pull request. For more info on what that means or how to do it, see [this guide](https://guides.github.com/activities/contributing-to-open-source/#contributing) from GitHub.
+For more details see [CONTRIBUTING.md file](CONTRIBUTING.md)
 
 [climate-image]: https://codeclimate.com/github/fog/fog-vsphere.svg
 [climate-url]: https://codeclimate.com/github/fog/fog-vsphere

data/fog-vsphere.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/fog/fog-vsphere'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(tests?|spec|features)/}) }
   spec.test_files    = spec.files.grep(%r{^tests\/})
 
   spec.require_paths = ['lib']
@@ -31,4 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop', '~> 0.50.0'
   spec.add_development_dependency 'mocha', '~> 1.8'
   spec.add_development_dependency 'shindo', '~> 0.3'
+  spec.add_development_dependency 'webmock', '~> 3.5'
+  spec.add_development_dependency 'vcr', '~> 4.0'
 end

data/lib/fog/vsphere/compute.rb

@@ -164,6 +164,7 @@ module Fog
           cpuHotAddEnabled: 'config.cpuHotAddEnabled',
           memoryHotAddEnabled: 'config.memoryHotAddEnabled',
           firmware: 'config.firmware',
+          boot_order: 'config.bootOptions.bootOrder',
           annotation: 'config.annotation'
         }.freeze
 
@@ -198,6 +199,8 @@ module Fog
             attrs['mo_ref'] = vm_mob_ref._ref
             # The name method "magically" appears after a VM is ready and
             # finished cloning.
+            attrs['boot_order'] = parse_boot_order(attrs['boot_order'])
+
             if attrs['hypervisor'].is_a?(RbVmomi::VIM::HostSystem)
               host = attrs['hypervisor']
 
@@ -284,6 +287,24 @@ module Fog
           nil
         end
 
+        # Maps RbVmomi boot order values to fog understandable strings.
+        # Result is uniqued, what effectively means that the order is defined by the first occurence.
+        def parse_boot_order(vm_boot_devs)
+          return unless vm_boot_devs.is_a?(Array)
+          vm_boot_devs.map do |vm_boot_dev|
+            case vm_boot_dev
+            when RbVmomi::VIM::VirtualMachineBootOptionsBootableEthernetDevice
+              'network'
+            when RbVmomi::VIM::VirtualMachineBootOptionsBootableDiskDevice
+              'disk'
+            when RbVmomi::VIM::VirtualMachineBootOptionsBootableCdromDevice
+              'cdrom'
+            when RbVmomi::VIM::VirtualMachineBootOptionsBootableFloppyDevice
+              'floppy'
+            end
+          end.compact.uniq
+        end
+
         # returns vmware managed obj id string
         def managed_obj_id(obj)
           obj.to_s.match(/\("([^"]+)"\)/)[1]

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

@@ -50,6 +50,7 @@ module Fog
         attribute :cpuHotAddEnabled
         attribute :memoryHotAddEnabled
         attribute :firmware
+        attribute :boot_order
         attribute :annotation
 
         def initialize(attributes = {})

data/lib/fog/vsphere/requests/compute/create_vm.rb

@@ -178,7 +178,7 @@ module Fog
             )
 
           else
-            RbVmomi::VIM.VirtualEthernetCardNetworkBackingInfo(deviceName: nic.network)
+            RbVmomi::VIM.VirtualEthernetCardNetworkBackingInfo(deviceName: raw_network.name)
           end
         end
 

data/lib/fog/vsphere/requests/compute/get_network.rb

@@ -2,18 +2,27 @@ module Fog
   module Vsphere
     class Compute
       class Real
-        def get_network(name, datacenter_name)
-          network = get_raw_network(name, datacenter_name)
+        def get_network(ref_or_name, datacenter_name)
+          network = get_raw_network(ref_or_name, datacenter_name)
           raise(Fog::Vsphere::Compute::NotFound) unless network
           network_attributes(network, datacenter_name)
         end
 
         protected
 
-        def get_raw_network(name, datacenter_name, distributedswitch = nil)
-          finder = choose_finder(name, distributedswitch)
+        def get_raw_network(ref_or_name, datacenter_name, distributedswitch = nil)
+          finder = choose_finder(ref_or_name, distributedswitch)
           get_all_raw_networks(datacenter_name).find { |n| finder.call(n) }
         end
+
+        def network_attributes(network, datacenter_name)
+          {
+            id: managed_obj_id(network),
+            name: network.name,
+            datacenter: datacenter_name,
+            vlanid: nil
+          }
+        end
       end
 
       module Shared
@@ -23,20 +32,26 @@ module Fog
           list_container_view(datacenter_name, 'Network', :networkFolder)
         end
 
-        def choose_finder(name, distributedswitch)
+        def choose_finder(ref_or_name, distributedswitch)
           case distributedswitch
           when String
             # only the one will do
             proc do |n|
-              n.is_a?(RbVmomi::VIM::DistributedVirtualPortgroup) && (n.name == name || n.key == name) &&
+              n._ref == ref_or_name || (
+                n.is_a?(RbVmomi::VIM::DistributedVirtualPortgroup) && (n.name == ref_or_name || n.key == ref_or_name) &&
                 (n.config.distributedVirtualSwitch.name == distributedswitch)
+              )
             end
           when :dvs
             # the first distributed virtual switch will do - selected by network - gives control to vsphere
-            proc { |n| n.is_a?(RbVmomi::VIM::DistributedVirtualPortgroup) && (n.name == name || n.key == name) }
+            proc do |n|
+              n._ref == ref_or_name || (
+                n.is_a?(RbVmomi::VIM::DistributedVirtualPortgroup) && (n.name == ref_or_name || n.key == ref_or_name)
+              )
+            end
           else
             # the first matching network will do, seems like the non-distributed networks come first
-            proc { |n| (n.name == name || (n.is_a?(RbVmomi::VIM::DistributedVirtualPortgroup) && n.key == name)) }
+            proc { |n| n._ref == ref_or_name || n.name == ref_or_name || (n.is_a?(RbVmomi::VIM::DistributedVirtualPortgroup) && n.key == ref_or_name) }
           end
         end
       end

data/lib/fog/vsphere/requests/compute/list_networks.rb

@@ -31,7 +31,7 @@ module Fog
               )
             else
               map_attrs_to_hash(network, network_attribute_mapping).merge(
-                id: managed_obj_id(network.obj)
+                id: network.obj._ref
               )
             end.merge(
               datacenter: datacenter_name,

data/lib/fog/vsphere/requests/compute/update_vm.rb

@@ -20,6 +20,10 @@ module Fog
           # Memory
           spec[:memoryMB] = attributes[:memory_mb]
 
+          # HotAdd
+          spec[:cpuHotAddEnabled] = attributes[:cpuHotAddEnabled]
+          spec[:memoryHotAddEnabled] = attributes[:memoryHotAddEnabled]
+
           # Volumes
           device_change.concat(update_vm_volumes_specs(vm_mob_ref, server.volumes))
 
@@ -92,11 +96,14 @@ module Fog
         def nic_backing_different?(one, two)
           return true if one.class != two.class
 
-          return true if one.is_a?(RbVmomi::VIM::VirtualEthernetCardDistributedVirtualPortBackingInfo) && (one.port.portgroupKey != two.port.portgroupKey || one.port.switchUuid != two.port.switchUuid)
-
-          return true if one.is_a?(RbVmomi::VIM::VirtualEthernetCardNetworkBackingInfo) && one.deviceName != two.deviceName && one.deviceType != twp.device
-
-          false
+          case one
+          when RbVmomi::VIM::VirtualEthernetCardDistributedVirtualPortBackingInfo
+            one.port.portgroupKey != two.port.portgroupKey || one.port.switchUuid != two.port.switchUuid
+          when RbVmomi::VIM::VirtualEthernetCardNetworkBackingInfo
+            one.deviceName != two.deviceName
+          else
+            false
+          end
         end
       end
 

data/lib/fog/vsphere/requests/compute/vm_clone.rb

@@ -164,7 +164,7 @@ module Fog
             device_change << modify_template_nics_simple_spec(options['network_label'], options['nic_type'], options['network_adapter_device_key'], options['datacenter'])
           end
           if disks = options['volumes']
-            device_change.concat(modify_template_volumes_specs(vm_mob_ref, options['volumes']))
+            device_change.concat(modify_template_volumes_specs(vm_mob_ref, options['volumes'], default_storage_pod: options['storage_pod']))
           end
           virtual_machine_config_spec.deviceChange = device_change if device_change.any?
           # Options['numCPUs'] or Options['memoryMB']
@@ -634,8 +634,8 @@ module Fog
             end
           end
           # relocate templates is not supported by fog-vsphere when vm is cloned on a storage pod
-          unless options.key?('storage_pod')
-            unless options['volumes'].blank?
+          unless options.key?('storage_pod') || !options['volumes']
+            unless options['volumes'].empty?
               relocation_spec[:disk] = relocate_template_volumes_specs(vm_mob_ref, options['volumes'], options['datacenter'])
             end
           end
@@ -789,7 +789,7 @@ module Fog
           specs
         end
 
-        def modify_template_volumes_specs(vm_mob_ref, volumes)
+        def modify_template_volumes_specs(vm_mob_ref, volumes, default_storage_pod: nil)
           template_volumes = vm_mob_ref.config.hardware.device.grep(RbVmomi::VIM::VirtualDisk)
           modified_volumes = volumes.take(template_volumes.size)
           new_volumes      = volumes.drop(template_volumes.size)
@@ -797,6 +797,9 @@ module Fog
           specs = []
           template_volumes.zip(modified_volumes).each do |template_volume, new_volume|
             if new_volume
+              # copy identifiers to fog device to mark them as used
+              new_volume.unit_number = template_volume.unitNumber
+              new_volume.key = template_volume.key
               # updated the attribtues on the existing volume
               # it's not allowed to reduce the size of the volume when cloning
               if new_volume.size > template_volume.capacityInKB
@@ -811,8 +814,7 @@ module Fog
                          device: template_volume }
             end
           end
-          new_volumes.map { |volume| volume.unit_number = volumes.index(volume) < 7 ? volumes.index(volume) : volumes.index(volume) + 1 }
-          specs.concat(new_volumes.map { |volume| create_disk(volume) })
+          specs.concat(new_volumes.map { |volume| create_disk(volume, :add, storage_pod: default_storage_pod) })
           specs
         end
 

data/lib/fog/vsphere/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Vsphere
-    VERSION = '3.0.0'.freeze
+    VERSION = '3.1.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-vsphere
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - J.R. Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-20 00:00:00.000000000 Z
+date: 2019-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -142,6 +142,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: This library can be used as a module for `fog` or as standalone provider
   to use vSphere in applications.
 email:
@@ -287,48 +315,6 @@ files:
 - lib/fog/vsphere/requests/compute/vm_suspend.rb
 - lib/fog/vsphere/requests/compute/vm_take_snapshot.rb
 - lib/fog/vsphere/version.rb
-- tests/class_from_string_tests.rb
-- tests/compute_tests.rb
-- tests/helper.rb
-- tests/helpers/mock_helper.rb
-- tests/helpers/succeeds_helper.rb
-- tests/models/compute/cluster_tests.rb
-- tests/models/compute/hosts_tests.rb
-- tests/models/compute/rules_tests.rb
-- tests/models/compute/server_tests.rb
-- tests/models/compute/server_unit_tests.rb
-- tests/models/compute/servers_tests.rb
-- tests/models/compute/ticket_tests.rb
-- tests/models/compute/tickets_tests.rb
-- tests/requests/compute/current_time_tests.rb
-- tests/requests/compute/folder_destroy_tests.rb
-- tests/requests/compute/get_network_tests.rb
-- tests/requests/compute/list_child_snapshots_tests.rb
-- tests/requests/compute/list_clusters_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_storage_pods_test.rb
-- tests/requests/compute/list_virtual_machines_tests.rb
-- tests/requests/compute/list_vm_cdroms_tests.rb
-- tests/requests/compute/list_vm_snapshots_tests.rb
-- tests/requests/compute/modify_vm_cdrom_tests.rb
-- tests/requests/compute/revert_to_snapshot_tests.rb
-- tests/requests/compute/set_vm_customvalue_tests.rb
-- tests/requests/compute/update_vm_tests.rb
-- tests/requests/compute/vm_clone_tests.rb
-- tests/requests/compute/vm_config_vnc_tests.rb
-- tests/requests/compute/vm_destroy_tests.rb
-- tests/requests/compute/vm_migrate_tests.rb
-- tests/requests/compute/vm_power_off_tests.rb
-- tests/requests/compute/vm_power_on_tests.rb
-- tests/requests/compute/vm_reboot_tests.rb
-- tests/requests/compute/vm_reconfig_cdrom_tests.rb
-- tests/requests/compute/vm_reconfig_cpus_tests.rb
-- tests/requests/compute/vm_reconfig_hardware_tests.rb
-- tests/requests/compute/vm_reconfig_memory_tests.rb
-- tests/requests/compute/vm_suspend_tests.rb
-- tests/requests/compute/vm_take_snapshot_tests.rb
 homepage: https://github.com/fog/fog-vsphere
 licenses:
 - MIT
@@ -349,50 +335,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support VMware vSphere.
-test_files:
-- tests/class_from_string_tests.rb
-- tests/compute_tests.rb
-- tests/helper.rb
-- tests/helpers/mock_helper.rb
-- tests/helpers/succeeds_helper.rb
-- tests/models/compute/cluster_tests.rb
-- tests/models/compute/hosts_tests.rb
-- tests/models/compute/rules_tests.rb
-- tests/models/compute/server_tests.rb
-- tests/models/compute/server_unit_tests.rb
-- tests/models/compute/servers_tests.rb
-- tests/models/compute/ticket_tests.rb
-- tests/models/compute/tickets_tests.rb
-- tests/requests/compute/current_time_tests.rb
-- tests/requests/compute/folder_destroy_tests.rb
-- tests/requests/compute/get_network_tests.rb
-- tests/requests/compute/list_child_snapshots_tests.rb
-- tests/requests/compute/list_clusters_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_storage_pods_test.rb
-- tests/requests/compute/list_virtual_machines_tests.rb
-- tests/requests/compute/list_vm_cdroms_tests.rb
-- tests/requests/compute/list_vm_snapshots_tests.rb
-- tests/requests/compute/modify_vm_cdrom_tests.rb
-- tests/requests/compute/revert_to_snapshot_tests.rb
-- tests/requests/compute/set_vm_customvalue_tests.rb
-- tests/requests/compute/update_vm_tests.rb
-- tests/requests/compute/vm_clone_tests.rb
-- tests/requests/compute/vm_config_vnc_tests.rb
-- tests/requests/compute/vm_destroy_tests.rb
-- tests/requests/compute/vm_migrate_tests.rb
-- tests/requests/compute/vm_power_off_tests.rb
-- tests/requests/compute/vm_power_on_tests.rb
-- tests/requests/compute/vm_reboot_tests.rb
-- tests/requests/compute/vm_reconfig_cdrom_tests.rb
-- tests/requests/compute/vm_reconfig_cpus_tests.rb
-- tests/requests/compute/vm_reconfig_hardware_tests.rb
-- tests/requests/compute/vm_reconfig_memory_tests.rb
-- tests/requests/compute/vm_suspend_tests.rb
-- tests/requests/compute/vm_take_snapshot_tests.rb
+test_files: []