fog-hyperv 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe6d782233a6722d2154ac70cec0ae338bf5bac8
-  data.tar.gz: 869248c4e4c8c92b65c1f74f22661cb501a2dbb0
+  metadata.gz: 800c08e48379e123d5b8803ea3bda44f4eddbaa8
+  data.tar.gz: df40fef67b97eeed7469c51710b12bec6b455f39
 SHA512:
-  metadata.gz: 31abe8a044296350c114cea4e1bb7a7320b224e1e42537f8d4cf36f253020f3ca89394175369f955ad2ec978812c38ca2669de92adddfe3a997e2191eb27ee9d
-  data.tar.gz: 015668191289501a9e0520f48e8e51972ef1f2fd4e4ef782e9d8b6534423e0e8f923fe7ad8753e7e618d6d13562dbcd4a4c548ac35bc4b1caa8c6e313c35336b
+  metadata.gz: 0401b571330dad19781f5c35bfbc0cce18de2fdb02266583ba4ca2255b9c4a16e3c38b93303cfde9fa655ed0e73c0abf217dea43495a243460f2328ba42cbdac
+  data.tar.gz: 718b6a478f911d0070427d486951125a2ddb8407475cbc2540c962bb90f64a45a7af4cb982c9bfd0f9bc09afab2238d71a52dd0f622a7541d27b9afc65ebf2dc

data/CHANGELOG.md

@@ -0,0 +1,14 @@
+## v0.0.3 2017-09-30
+
+- Fix handling of BIOS/Firmware
+- Skip unnecessary Hyper-V calls when checking dirty status
+- Add some possible interface improvements when dealing with clusters
+
+## v0.0.2 2017-09-28
+
+- Reduced `fog-core` dependency to 1.42
+- Disabled `status` attribute for network adapters, due to Hyper-V 6.3 issues
+
+## v0.0.1 2017-09-25
+
+- Initial release

data/lib/fog/collection.rb

@@ -7,10 +7,14 @@ module Fog
         @get_method ||= method
       end
 
-      def self.requires?
+      def self.requires
         @requires ||= []
       end
 
+      def self.requires?(req)
+        requires.include? req
+      end
+
       def search_attributes
         attributes.dup.merge(
           _return_fields: model.attributes - model.lazy_attributes,
@@ -19,7 +23,7 @@ module Fog
       end
 
       def all(filters = {})
-        requires(*self.class.requires?)
+        requires(*self.class.requires)
         data = service.send(method, search_attributes.merge(filters))
         data = [] unless data
 
@@ -27,7 +31,7 @@ module Fog
       end
 
       def get(filters = {})
-        data = self.all(filters).first
+        data = all(filters).first
         data if data
       rescue Fog::Hyperv::Errors::PSError => err
         raise Fog::Errors::NotFound, err if err.message =~ /Hyper-V was unable to find|^No .* is found|/
@@ -35,7 +39,7 @@ module Fog
       end
 
       def new(options = {})
-        requires(*self.class.requires?)
+        requires(*self.class.requires)
         super(search_attributes.merge(options))
       end
 
@@ -54,13 +58,17 @@ module Fog
 
     class ComputerCollection < Fog::Hyperv::Collection
       def self.requires_computer
-        requires? << :computer
+        requires << :computer
       end
 
+      attr_accessor :cluster
       attr_accessor :computer
 
       def search_attributes
         attrs = super
+        attrs.delete :cluster
+        attrs.delete :computer
+        attrs[:computer_name] ||= cluster.hosts.map { |n| n.name } if cluster
         attrs[:computer_name] ||= computer.name if computer
         attrs
       end
@@ -72,13 +80,14 @@ module Fog
       end
 
       def self.requires_vm
-        requires? << :vm
+        requires << :vm
       end
 
       attr_accessor :vm
 
       def search_attributes
         attrs = super
+        attrs.delete :vm
         if vm
           attrs[:computer_name] ||= vm.computer_name
           attrs[match] = vm.send(match)

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

@@ -30,6 +30,7 @@ module Fog
           )
 
           merge_attributes(data)
+          @old = dup
           self
         end
 
@@ -43,7 +44,7 @@ module Fog
             _return_fields: self.class.attributes,
             _json_depth: 1
           )
-          merge_attributes(data.attributes)
+          merge_attributes(data)
           self
         end
       end

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

@@ -9,13 +9,15 @@ module Fog
         attribute :name, type: :string
 
         def nodes
-          [service.get_cluster_node(cluster: name, _return_fields: [:description, :name, :node_name])].flatten
+          @nodes ||= [service.get_cluster_node(cluster: name, _return_fields: [:description, :name, :node_name])].flatten
+        end
+
+        def hosts
+          @hosts ||= service.hosts computer_name: nodes.map { |n| n[:name] }
         end
 
         def servers
-          @servers ||= service.servers.class.new \
-            cluster: self,
-            service: service
+          @servers ||= service.servers cluster: self
         end
 
         def reload

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

@@ -3,6 +3,7 @@ module Fog
     class Hyperv
       class DvdDrives < Fog::Hyperv::VMCollection
         model Fog::Compute::Hyperv::DvdDrive
+        requires_vm
 
         get_method :get_vm_dvd_drive
       end

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

@@ -13,16 +13,16 @@ module Fog
         attribute :vm_name
 
         def save
-          requires :computetr_name, :vm_name
+          requires :computer_name, :vm_name
 
           raise Fog::Hyperv::Errors::ServiceError, "Can't create Firmware instances" unless persisted?
 
-          data = service.set_firmware(
+          data = service.set_vm_firmware(
             computer_name: computer_name,
             vm_name: vm_name,
             passthru: true,
 
-            enable_secure_boot: changed?(:secure_boot) ? (secure_boot && 'On' || 'Off') : nil,
+            enable_secure_boot: changed!(:secure_boot),
             preferred_network_boot_protocol: changed!(:preferred_network_boot_protocol),
             console_mode: changed!(:console_mode),
 
@@ -37,13 +37,13 @@ module Fog
         def reload
           requires :computer_name, :vm_name
 
-          data = service.get_firmware(
+          data = service.get_vm_firmware(
             computer_name: computer_name,
             vm_name: vm_name,
 
-            _return_fields: self.class.attribute
+            _return_fields: self.class.attributes
           )
-          merge_attributes(data.attributes)
+          merge_attributes(data)
           self
         end
       end

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

@@ -3,6 +3,7 @@ module Fog
     class Hyperv
       class FloppyDrives < Fog::Hyperv::VMCollection
         model Fog::Compute::Hyperv::FloppyDrive
+        requires_vm
 
         get_method :get_vm_floppy_disk_drive
       end

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

@@ -14,6 +14,28 @@ module Fog
         attribute :maximum_virtual_machine_migrations
         attribute :virtual_hard_disk_path
         attribute :virtual_machine_path
+
+        def initialize(attrs = {})
+          super
+
+          @collections = {}
+          self.class.ensure_collections!
+        end
+
+        def self.ensure_collections!
+          return if @collections
+          @collections = true
+
+          Fog::Compute::Hyperv.collections.each do |coll|
+            coll_name = coll.to_s.split('_').map(&:capitalize).join
+            klass = Fog::Compute::Hyperv.const_get(coll_name)
+            next if klass.requires? :vm
+
+            define_method coll do
+              @collections[coll] ||= service.send(coll, computer: self)
+            end
+          end
+        end
       end
     end
   end

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

@@ -129,7 +129,6 @@ module Fog
 
         def save(options = {})
           requires :name
-          logger.debug "Saving server with; #{attributes}, #{options}"
 
           data = \
             if !persisted?

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

@@ -1,20 +1,11 @@
 module Fog
   module Compute
     class Hyperv
-      class Servers < Fog::Hyperv::Collection
-        attribute :cluster
-
+      class Servers < Fog::Hyperv::ComputerCollection
         model Fog::Compute::Hyperv::Server
 
         get_method :get_vm
 
-        def search_attributes
-          attrs = super
-          attrs[:computer_name] = cluster.nodes.map { |n| n[:name] } if cluster
-          attrs.delete :cluster
-          attrs
-        end
-
         def get(identity, filters = {})
           guid = identity =~ /\w{8}-\w{4}-\w{4}-\w{4}-\w{12}/
 

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

@@ -1,7 +1,7 @@
 module Fog
   module Compute
     class Hyperv
-      class Switches < Fog::Hyperv::Collection
+      class Switches < Fog::Hyperv::ComputerCollection
         model Fog::Compute::Hyperv::Switch
 
         get_method :get_vm_switch

data/lib/fog/hyperv/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Hyperv
-    VERSION = '0.0.2'.freeze
+    VERSION = '0.0.3'.freeze
   end
 end

data/lib/fog/model.rb

@@ -59,6 +59,12 @@ module Fog
     class Model < Fog::Model
       extend Fog::Hyperv::ModelExtends
       include Fog::Hyperv::ModelIncludes
+
+      def initialize(attributes = {})
+        super
+
+        @old = dup if persisted?
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-hyperv
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Alexander Olofsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-28 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -89,6 +89,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile