fog-hyperv 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f66bbfe9d046bb995a0ad3ae1ce65bdfd1576953
-  data.tar.gz: e074ab919089ff977deb7acfc711bd5f5c38788b
+SHA256:
+  metadata.gz: e0d0573b3cef41610d0b6fbc09d680a35273ad86aa2fa67344e3a576a77572ff
+  data.tar.gz: 01f53dafc9163356e4d6b6d1ffd820bc6b2566637b0943b2481fbf38a26531a2
 SHA512:
-  metadata.gz: 0f7eacd330a94baa6438555a38ed8ad8ef2c887c8f57d9b1fa543a26b0b5340c1368f703e1e89205dfd8730df3372374eb2f9685ad8a092aa906fd5c0e2bc9e9
-  data.tar.gz: 2058a3bcaa548732a4509b6af58653cafe1692f0ce1b10e12f869d5ca72a2983d24c331a44a88ca09dd3ce4c426eeea1c6acf1e354fa93eee9ce21c97dcf1369
+  metadata.gz: fdf47eb11f71bc887e3d2597c445ddb38ac40fc7b4628cd0d24a484efd8bfe0f2dbade04b5cb10bec3a1078d778676336d0e47059373c1c7f039262db9b947be
+  data.tar.gz: 6b8ba989fb728271572e79b645130159d17a5d2263d8f39b98ba3180ab6875c0121530d10537f1bdf79f948bc9034e653afcc2319eda1d606878f2ff277f8bcb

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## v0.0.8 2018-04-06
+
+- Fix issues due to a lost `to_s` call
+- Fix enum handling
+- Improve Ruby 2.4 support
+- Add support for baking PS option maps in commands
+- Default to using the cluster if one, and only one, is available
+- Support adding legacy network adapters
+
 ## v0.0.7 2018-01-22
 
 - Add a temporary VM-wide VLAN assignment method

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Alexander Olofsson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,6 +1,6 @@
 # Fog Hyper-V
 
-[![Build Status](https://travis-ci.org/ace13/fog-hyperv.svg?branch=master)](https://travis-ci.org/ace13/fog-hyperv) [![Gem Version](https://badge.fury.io/rb/fog-hyperv.svg)](https://badge.fury.io/rb/fog-hyperv)
+[![Build Status](https://travis-ci.org/ananace/fog-hyperv.svg?branch=master)](https://travis-ci.org/ananace/fog-hyperv) [![Gem Version](https://badge.fury.io/rb/fog-hyperv.svg)](https://badge.fury.io/rb/fog-hyperv)
 
 Manage your Hyper-V instance with the help of the Fog cloud service abstractions.
 
@@ -49,5 +49,5 @@ After checking out the repo, run `bundle install` to install dependencies. Then,
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/ace13/fog-hyperv.
+Bug reports and pull requests are welcome on GitHub at https://github.com/ananace/fog-hyperv.
 

data/lib/fog/hyperv.rb

@@ -63,6 +63,7 @@ module Fog
               .gsub(/\n/, '`n') 
               .gsub(/\r/, '`r') 
               .inspect
+              .gsub(/\\"/, '`"')
               .gsub(/\\\\/, '\\')
         else
           data

data/lib/fog/hyperv/compute.rb

@@ -2,26 +2,26 @@ module Fog
   module Compute
     class Hyperv < Fog::Service
       STATUS_ENUM_VALUES = [
-        :Unknown,              # 0
-        :Other,                # 1
-        :Ok,                   # 2
-        :Degraded,             # 3
-        :Stressed,             # 4
-        :PredictiveFailure,    # 5
-        :Error,                # 6
-        :NonRecoverableError,  # 7
-        :Starting,             # 8
-        :Stopping,             # 9
-        :Stopped,              # 10
-        :InService,            # 11
-        :NoContact,            # 12
-        :LostCommunication,    # 13
-        :Aborted,              # 14
-        :Dormant,              # 15
-        :SupportingEntity,     # 16
-        :Completed,            # 17
-        :PowerMode             # 18
-        # :ProtocolVersion     # 32775
+        Unknown: 0,
+        Other: 1,
+        Ok: 2,
+        Degraded: 3,
+        Stressed: 4,
+        PredictiveFailure: 5,
+        Error: 6,
+        NonRecoverableError: 7,
+        Starting: 8,
+        Stopping: 9,
+        Stopped: 0,
+        InService: 1,
+        NoContact: 2,
+        LostCommunication: 3,
+        Aborted: 4,
+        Dormant: 5,
+        SupportingEntity: 6,
+        Completed: 7,
+        PowerMode: 8,
+        ProtocolVersion: 32775,
       ].freeze
 
       requires :hyperv_username
@@ -135,6 +135,8 @@ module Fog
       class Real < Shared
         attr_reader :logger
 
+        attr_accessor :bake_optmap, :bake_json
+
         def initialize(options = {})
           # require 'ostruct'
           require 'fog/json'
@@ -189,13 +191,31 @@ module Fog
             run_shell("$VMMS = if ([environment]::Is64BitProcess) { \"$($env:SystemRoot)\\System32\\vmms.exe\" } else { \"$($env:SystemRoot)\\Sysnative\\vmms.exe\" }\n(Get-Item $VMMS).VersionInfo.ProductVersion", _skip_json: true).stdout.strip
         end
 
+        def ps_version
+          @ps_version ||= run_shell('$PSVersionTable.PSVersion', _bake_optmap: false, _bake_json: false)
+        end
+
         private
 
         def hash_to_optmap(options = {})
-          args = options.reject { |k, v| v.nil? || v.is_a?(FalseClass) || k.to_s.start_with?('_') }.map do |k, v|
-            "'#{k}'=#{Fog::Hyperv.shell_quoted(v, true)}"
+          bake_json = options.delete :_bake_json
+          if bake_json
+            if ps_version[:major] >= 6
+              "$Args = ConvertFrom-Json -AsHashtable '#{Fog::JSON.encode options}'"
+            else
+              <<-EOS
+              $JsonObject = '#{Fog::JSON.encode options}'
+              $JsonParameters = ConvertFrom-Json -InputObject $JsonObject
+              $Args = $JsonParameters.psobject.properties | foreach -begin {$h=@{}} -process {$h."$($_.Name)" = $_.Value} -end {$h}
+              EOS
+            end
+          else
+            args = options.reject { |k, v| v.nil? || v.is_a?(FalseClass) || k.to_s.start_with?('_') }.map do |k, v|
+              "'#{k}'=#{Fog::Hyperv.shell_quoted(v, true)}"
+            end
+
+            "$Args = @{#{args.join ';'}}"
           end
-          "@{#{args.join ';'}}"
         end
 
         def run_shell_with_vm(command, vm_options, options = {})
@@ -235,9 +255,14 @@ module Fog
           skip_json = options.delete :_skip_json
           skip_camelize = options.delete :_skip_camelize
           skip_uncamelize = options.delete :_skip_uncamelize
+          always_include = options.delete(:_always_include) {|_| []}
+          bake_optmap = options.delete(:_bake_optmap) {|_| @bake_optmap }
+          bake_json = options.delete(:_bake_json) {|_| @bake_json }
           computer = options.delete(:_target_computer) || '.'
           computers = [options.delete(:computer_name)].flatten.compact
-          options.delete_if { |o| o.start_with? '_' }
+          options.delete_if { |o| o.to_s.start_with?('_') }
+
+          always_include = Fog::Hyperv.camelize(always_include) unless skip_camelize
           options = Fog::Hyperv.camelize(options) unless skip_camelize
 
           if supports_multihop?
@@ -258,19 +283,19 @@ module Fog
             return ret
           end
 
-          # commandline = "$Args = #{hash_to_optmap options}\n$Ret = #{command} @Args#{"\n$Ret #{return_fields} | ConvertTo-Json -Compress #{"-Depth #{json_depth}" if json_depth}" unless skip_json}"
-          # puts " > #{commandline.split("\n").join "\n > "}" if @hyperv_debug
-          args = options.reject { |k, v| v.nil? || v.is_a?(FalseClass) || k.to_s.start_with?('_') || (v.is_a?(String) && v.empty?) }.map do |k, v|
-            "-#{k} #{Fog::Hyperv.shell_quoted v unless v.is_a?(TrueClass)}"
+          args = options.reject { |k, v| !always_include.include?(k) && (v.nil? || v.is_a?(FalseClass) || k.to_s.start_with?('_') || (v.is_a?(String) && v.empty?)) }.map do |k, v|
+            "-#{k} #{Fog::Hyperv.shell_quoted v if !v.is_a?(TrueClass) || always_include.include?(k)}"
+          end
+
+          if bake_optmap
+            command_args = "#{hash_to_optmap options.merge(_bake_json: bake_json)}\n#{command} @Args"
+          else
+            command_args = "#{command} #{args.join ' ' unless args.empty?}"
           end
-          command_args = "#{command} #{args.join ' ' unless args.empty?}"
           commandline = "#{command_args} #{suffix} #{return_fields} #{"| ConvertTo-Json -Compress #{"-Depth #{json_depth}" if json_depth}" unless skip_json}"
           logger.debug "PS; >>> #{commandline}"
 
-          out = nil # OpenStruct.new stdout: '',
-          #                          stderr: '',
-          #                          exitcode: -1
-
+          out = nil
           if local?
             commanddata = [
               'powershell',
@@ -280,6 +305,9 @@ module Fog
               commandline
             ]
             begin
+              out = OpenStruct.new stdout: '',
+                                   stderr: '',
+                                   exitcode: -1
               out.stdout, out.stderr, out.exitcode = Open3.capture3(*commanddata)
               out.exitcode = out.exitcode.exitstatus
             rescue StandardError => ex
@@ -288,6 +316,8 @@ module Fog
             end
           else
             connection(computer).shell(:powershell) do |shell|
+              # TODO: Reuse shell?
+              # XXX   Multiple commands in one invokation?
               out = shell.run(commandline)
             end
           end
@@ -339,6 +369,7 @@ module Fog
           return c[1] if c
 
           # TODO: Support non-standard endpoints for additional hosts
+          # TODO: Get Windows to provide FQDN for all other hosts
           unless host.include? '.'
             host = "#{host}.#{URI.parse(@hyperv_endpoint).host.split('.').drop(1).join('.')}"
           end

data/lib/fog/hyperv/fog_extensions/enum.rb

@@ -5,12 +5,18 @@ module Fog
 
       def initialize(model, name, options)
         @values = options.fetch(:values, [])
+
+        raise Fog::Hyperv::Errors::ServiceError, "#{values} is not a valid array or hash" \
+          unless values.class.to_s == 'Array' || values.class.to_s == 'Hash'
+
         super
       end
 
       def ensure_value_getter
-        return if model.methods.include?("#{name}_values".to_sym)
+        return if model.private_methods.include?("#{name}_values".to_sym)
+
         model.class_eval <<-EOS, __FILE__, __LINE__
+            private
             def #{name}_values
               #{values}.freeze
             end
@@ -19,24 +25,31 @@ module Fog
 
       def create_setter
         ensure_value_getter
+
+        # Add a setter that always stores a symbol value
         model.class_eval <<-EOS, __FILE__, __LINE__
-            def #{name}=(new_#{name})
+            def #{name}=(new_value)
               _values = #{name}_values
-              # FIXME: Prepare a key comparison array in advance
-              if new_#{name}.is_a?(Fixnum)
-                if _values.class.to_s == 'Array' # TODO: Better way to do class comparison in generated code
-                  raise Fog::Hyperv::Errors::ServiceError, "\#{new_#{name}} is not in the range (0..\#{_values.length - 1})" unless new_#{name} >= 0 && new_#{name} < _values.length
-                else
-                  raise Fog::Hyperv::Errors::ServiceError, "\#{new_#{name}} is not one of \#{_values.is_a?(Hash) ? _values.values : _values})" unless (_values.is_a?(Hash) ? _values.values : _values).include? new_#{name}
+              if new_value.is_a?(Numeric)
+                # TODO: Better way to do class comparison in generated code
+                if _values.class.to_s == 'Array'
+                  raise Fog::Hyperv::Errors::ServiceError, "\#{new_value} is not in the range (0..\#{_values.length - 1})" \
+                    unless new_value >= 0 && new_value < _values.length
+                  attributes[:#{name}] = _values[new_value]
+                elsif _values.class.to_s == 'Hash'
+                  raise Fog::Hyperv::Errors::ServiceError, "\#{new_value} is not one of \#{_values.values})" \
+                    unless _values.values.include? new_value
+                  attributes[:#{name}] = _values.key(new_value)
                 end
-
-                attributes[:#{name}] = _values[new_#{name}]
-              elsif new_#{name}.nil?
+              elsif new_value.nil?
                 attributes[:#{name}] = nil
               else
-                new_#{name} = new_#{name}.to_s.to_sym unless new_#{name}.is_a? Symbol
-                raise Fog::Hyperv::Errors::ServiceError, "\#{new_#{name}} is not one of \#{_values.is_a?(Hash) ? _values.keys : _values})" unless (_values.is_a?(Hash) ? _values.keys : _values).include? new_#{name}
-                attributes[:#{name}] = new_#{name}
+                new_value = new_value.to_s.to_sym unless new_value.is_a? Symbol
+                # Ensure values is the array of enum symbols
+                _values = (_values.is_a?(Hash) ? _values.keys : _values)
+                raise Fog::Hyperv::Errors::ServiceError, "\#{new_value.inspect} is not one of \#{_values})" \
+                  unless _values.include? new_value
+                attributes[:#{name}] = new_value
               end
             end
         EOS
@@ -44,21 +57,27 @@ module Fog
 
       def create_getter
         ensure_value_getter
+
+        # Add a getter for <enum>_num to get the numeric value
         model.class_eval <<-EOS, __FILE__, __LINE__
             def #{name}_num
               _values = #{name}_values
-              return nil if self.#{name}.nil?
-              if self.#{name}.is_a?(Fixnum)
-                self.#{name}
+              _value = attributes[:#{name}]
+
+              return nil if _value.nil?
+              if _value.is_a?(Numeric)
+                _value
               else
                 if _values.is_a?(Hash)
-                  _values.key(self.#{name})
+                  _values.send(:[], _value)
                 else
-                  _values.index(self.#{name})
+                  _values.index(_value)
                 end
               end
             end
         EOS
+        
+        # Add the default getter for the symbol value
         super
       end
     end

data/lib/fog/hyperv/models/compute/cluster.rb

@@ -33,6 +33,10 @@ module Fog
             _return_fields: self.class.attributes,
             _json_depth: 1
           )
+
+          @nodes = nil
+          @hosts = nil
+
           merge_attributes(data.attributes)
           self
         end
@@ -44,6 +48,7 @@ module Fog
           Fog::Compute::Hyperv.collections.each do |coll|
             # Don't recurse on hosts
             next if coll == :hosts
+
             coll_name = coll.to_s.split('_').map(&:capitalize).join
             klass = Fog::Compute::Hyperv.const_get(coll_name)
             next if klass.requires?(:vm)

data/lib/fog/hyperv/models/compute/firmware.rb

@@ -6,10 +6,10 @@ module Fog
 
         attribute :boot_order
         attribute :computer_name
-        attribute :console_mode, type: :enum, values: [ :Default, :COM1, :COM2, :None ]
+        attribute :console_mode, type: :enum, values: %i[Default COM1 COM2 None]
         # attribute :is_deleted
-        attribute :preferred_network_boot_protocol, type: :enum, values: [ :IPv4, :IPv6 ]
-        attribute :secure_boot, type: :enum, values: [ :On, :Off ]
+        attribute :preferred_network_boot_protocol, type: :enum, values: %i[IPv4 IPv6]
+        attribute :secure_boot, type: :enum, values: %i[On Off]
         attribute :vm_name
 
         def save

data/lib/fog/hyperv/models/compute/host.rb

@@ -27,6 +27,9 @@ module Fog
           @collections = true
 
           Fog::Compute::Hyperv.collections.each do |coll|
+            # Hosts don't have host collections
+            next if coll == :hosts
+
             coll_name = coll.to_s.split('_').map(&:capitalize).join
             klass = Fog::Compute::Hyperv.const_get(coll_name)
             next if klass.requires?(:vm)

data/lib/fog/hyperv/models/compute/network_adapter.rb

@@ -69,6 +69,7 @@ module Fog
                 passthru: true,
 
                 dynamic_mac_address: dynamic_mac_address_enabled,
+                is_legacy: !!is_legacy,
                 static_mac_address: !dynamic_mac_address_enabled && mac_address,
                 switch_name: switch_name,
 
@@ -131,7 +132,8 @@ module Fog
           data = collection.get(
             name,
             computer_name: computer_name,
-            vm_name: vm_name
+            vm_name: vm_name,
+            _suffix: "| Where Id -Eq '#{id}'"
           )
           merge_attributes(data.attributes)
           @old = data

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

@@ -8,33 +8,33 @@ module Fog
         include Fog::Hyperv::ModelIncludes
 
         VM_STATUS_ENUM_VALUES = {
-          :Unknown => 1,
-          :Running => 2,
-          :Off => 3,
-          :Stopping => 4,
-          :Saved => 6,
-          :Paused => 9,
-          :Starting => 10,
-          :Reset => 11,
-          :Saving => 32773,
-          :Pausing => 32776,
-          :Resuming => 32777,
-          :FastSaved => 32779,
-          :FastSaving => 32780,
-          :ForceShutdown => 32781,
-          :ForceReboot => 32782,
-          :RunningCritical => 32783,
-          :OffCritical => 32784,
-          :StoppingCritical => 32785,
-          :SavedCritical => 32786,
-          :PausedCritical => 32787,
-          :StartingCritical => 32788,
-          :ResetCritical => 32789,
-          :SavingCritical => 32790,
-          :PausingCritical => 32791,
-          :ResumingCritical => 32792,
-          :FastSavedCritical => 32793,
-          :FastSavingCritical => 32794,
+          Unknown: 1,
+          Running: 2,
+          Off: 3,
+          Stopping: 4,
+          Saved: 6,
+          Paused: 9,
+          Starting: 10,
+          Reset: 11,
+          Saving: 32773,
+          Pausing: 32776,
+          Resuming: 32777,
+          FastSaved: 32779,
+          FastSaving: 32780,
+          ForceShutdown: 32781,
+          ForceReboot: 32782,
+          RunningCritical: 32783,
+          OffCritical: 32784,
+          StoppingCritical: 32785,
+          SavedCritical: 32786,
+          PausedCritical: 32787,
+          StartingCritical: 32788,
+          ResetCritical: 32789,
+          SavingCritical: 32790,
+          PausingCritical: 32791,
+          ResumingCritical: 32792,
+          FastSavedCritical: 32793,
+          FastSavingCritical: 32794,
         }.freeze
 
         identity :id, type: :string
@@ -49,7 +49,7 @@ module Fog
         attribute :state, type: :enum, values: VM_STATUS_ENUM_VALUES
         attribute :status, type: :string
         attribute :memory_assigned, type: :integer
-        attribute :memory_maximum, type: :integer, default: 171_798_691_84
+        attribute :memory_maximum, type: :integer, default: 17_179_869_184
         attribute :memory_minimum, type: :integer, default: 536_870_912
         attribute :memory_startup, type: :integer, default: 536_870_912
         attribute :notes, type: :string
@@ -163,25 +163,25 @@ module Fog
                 attributes.select { |k, _v| usable.include? k }
                 .merge(options)
                 .merge(_return_fields: self.class.attributes, _json_depth: 1)
-          else
-            service.set_vm options.merge(
-              computer_name: old.computer_name,
-              name: old.name,
-              passthru: true,
-
-              processor_count: changed!(:processor_count),
-              dynamic_memory: changed?(:dynamic_memory_enabled) && dynamic_memory_enabled,
-              static_memory: changed?(:dynamic_memory_enabled) && !dynamic_memory_enabled,
-              memory_minimum_bytes: changed?(:memory_minimum) && dynamic_memory_enabled && memory_minimum,
-              memory_maximum_bytes: changed?(:memory_maximum) && dynamic_memory_enabled && memory_maximum,
-              memory_startup_bytes: changed!(:memory_startup),
-              notes: changed!(:notes),
-              new_name: changed!(:name),
-
-              _return_fields: self.class.attributes,
-              _json_depth: 1
-            )
-          end
+            else
+              service.set_vm options.merge(
+                computer_name: old.computer_name,
+                name: old.name,
+                passthru: true,
+
+                processor_count: changed!(:processor_count),
+                dynamic_memory: changed?(:dynamic_memory_enabled) && dynamic_memory_enabled,
+                static_memory: changed?(:dynamic_memory_enabled) && !dynamic_memory_enabled,
+                memory_minimum_bytes: changed?(:memory_minimum) && dynamic_memory_enabled && memory_minimum,
+                memory_maximum_bytes: changed?(:memory_maximum) && dynamic_memory_enabled && memory_maximum,
+                memory_startup_bytes: changed!(:memory_startup),
+                notes: changed!(:notes),
+                new_name: changed!(:name),
+
+                _return_fields: self.class.attributes,
+                _json_depth: 1
+              )
+            end
 
           merge_attributes(data)
           @old = dup

data/lib/fog/hyperv/requests/compute/add_vm_network_adapter.rb

@@ -4,7 +4,7 @@ module Fog
       class Real
         def add_vm_network_adapter(options = {})
           requires_one options, :vm_name, :management_os
-          run_shell('Add-VMNetworkAdapter', options)
+          run_shell('Add-VMNetworkAdapter', options.merge(_always_include: [:is_legacy]))
         end
       end
     end

data/lib/fog/hyperv/requests/compute/get_vm_firmware.rb

@@ -9,9 +9,7 @@ module Fog
       end
 
       class Mock
-        def get_vm_firmware(options = {})
-          requires options, :vm_name
-
+        def get_vm_firmware(args = {})
           handle_mock_response(args).find { |b| b[:vm_name].casecmp(args[:vm_name]).zero? }
         end
       end

data/lib/fog/hyperv/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Hyperv
-    VERSION = '0.0.7'.freeze
+    VERSION = '0.0.8'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-hyperv
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Alexander Olofsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-22 00:00:00.000000000 Z
+date: 2018-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -91,6 +91,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - fog-hyperv.gemspec
@@ -194,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Module for the `fog` gem to support Microsoft Hyper-V.