fog-kubevirt 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40e231b4d296140ac0ca47ba87e7e505045a175b
-  data.tar.gz: 544172769894bdd6ae6500ddf13bc4c8664844e8
+  metadata.gz: 394dc624c69b8bf42ce40a4bbc01215739f02af9
+  data.tar.gz: 6b8b0f38edf9f2c82717752e11a4fb50666110a6
 SHA512:
-  metadata.gz: e24894d4f40469c4e607aa35cfa88a09809001d70e264ad8673f858e7e3a9862f07556b4c8672a1c5d283d7cbc0d2b004d2b66419414149fdd16102f5e443e3e
-  data.tar.gz: 802ab241d152f50068b3a0d2379e423d2d41307f07fa32cf67f86ba40cd0d5e5af8bbde631175b14f3121d6a1c4c5862f636d2818082c9195c04d876b4d516d6
+  metadata.gz: e4e382201cf05aed39177df9b0eb83007361ef195bb900819e2b15e415df21459b69dd75a604b337359b5153b3111dd5ff1ca3edb151c9b58a131ee07a4cb6ff
+  data.tar.gz: 2f4b6871e21d29ef6cf75f051850cb7dfd22956153e5976806f81f1ad7ea7cb5b5b040e758ef1c458deec2543bd41c85ada9232d5f7db6141edaf37217b5cef3

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

@@ -1,5 +1,6 @@
 require 'fog/compute/models/server'
 require 'fog/kubevirt/compute/models/vm_base'
+require 'fog/kubevirt/compute/models/vm_action'
 
 module Fog
   module Kubevirt

data/lib/fog/kubevirt/compute/models/vm.rb

@@ -1,4 +1,5 @@
 require 'fog/kubevirt/compute/models/vm_base'
+require 'fog/kubevirt/compute/models/vm_action'
 
 module Fog
   module Kubevirt

data/lib/fog/kubevirt/compute/models/vm_action.rb

@@ -0,0 +1,29 @@
+module Fog
+  module Kubevirt
+    class Compute
+      module VmAction
+        def start(options = {})
+          # Change the `running` attribute to `true` so that the virtual machine controller will take it and
+          # create the virtual machine instance.
+          vm = service.get_raw_vm(name)
+          vm = deep_merge!(vm,
+            :spec => {
+              :running => true
+            }
+          )
+          service.update_vm(vm)
+        end
+
+        def stop(options = {})
+          vm = service.get_raw_vm(name)
+          vm = deep_merge!(vm,
+            :spec => {
+              :running => false
+            }
+          )
+          service.update_vm(vm)
+        end
+      end
+    end
+  end
+end

data/lib/fog/kubevirt/compute/models/vm_base.rb

@@ -1,10 +1,10 @@
-require 'fog/kubevirt/compute/models/vm_data'
+require 'fog/kubevirt/compute/models/vm_parser'
 
 module Fog
   module Kubevirt
     class Compute
       module VmBase
-        include VmData
+        include VmParser
 
         def define_properties
           identity :name
@@ -17,11 +17,11 @@ module Fog
           attribute :annotations,      :aliases => 'metadata_annotations'
           attribute :cpu_cores,        :aliases => 'spec_cpu_cores'
           attribute :memory,           :aliases => 'spec_memory'
-          attribute :disks,            :aliases => 'spec_disks'
-          attribute :volumes,          :aliases => 'spec_volumes'
+          attribute :disks,            :aliases => 'spec_disks',               :default => []
+          attribute :volumes,          :aliases => 'spec_volumes',             :default => []
           attribute :status,           :aliases => 'spec_running'
-          attribute :interfaces,       :aliases => 'spec_interfaces'
-          attribute :networks,         :aliases => 'spec_networks'
+          attribute :interfaces,       :aliases => 'spec_interfaces',          :default => []
+          attribute :networks,         :aliases => 'spec_networks',            :default => []
           attribute :machine_type,     :aliases => 'spec_machine_type'
         end
 
@@ -55,32 +55,6 @@ module Fog
           vm
         end
       end
-
-      module VmAction
-        include Shared
-
-        def start(options = {})
-          # Change the `running` attribute to `true` so that the virtual machine controller will take it and
-          # create the virtual machine instance.
-          vm = service.get_raw_vm(name)
-          vm = deep_merge!(vm,
-            :spec => {
-              :running => true
-            }
-          )
-          service.update_vm(vm)
-        end
-
-        def stop(options = {})
-          vm = service.get_raw_vm(name)
-          vm = deep_merge!(vm,
-            :spec => {
-              :running => false
-            }
-          )
-          service.update_vm(vm)
-        end
-      end
     end
   end
 end

data/lib/fog/kubevirt/compute/models/vm_data.rb

@@ -1,154 +1,8 @@
-require 'fog/kubevirt/compute/models/volume'
-
 module Fog
   module Kubevirt
     class Compute
       module VmData
 
-        #
-        # Returns an array of parsed network interfaces
-        #
-        # @param object [Hash] A hash with raw interfaces data.
-        #
-        def parse_interfaces(object)
-          return {} if object.nil?
-          nics = []
-          object.each do |iface|
-            nic = VmNic.new
-            nic.name = iface[:name]
-            nic.mac_address = iface[:macAddress]
-            nic.type = 'bridge' if iface.keys.include?(:bridge)
-            nic.type = 'slirp' if iface.keys.include?(:slirp)
-            nics << nic
-          end
-
-          nics
-        end
-
-        #
-        # Returns an array of parsed networks
-        #
-        # @param object [Hash] A hash with raw networks data.
-        #
-        def parse_networks(object)
-          return {} if object.nil?
-          networks = []
-          object.each do |net|
-            network = VmNetwork.new
-            network.name = net[:name]
-            network.type = 'pod' if net.keys.include?(:pod)
-            network.type = 'multus' if net.keys.include?(:multus)
-            network.type = 'genie' if net.keys.include?(:genie)
-            networks << network
-          end
-
-          networks
-        end
-
-        #
-        # Returns an array of parsed disks
-        #
-        # @param object [Hash] A hash with raw disks data.
-        #
-        def parse_disks(object)
-          return {} if object.nil?
-          disks = []
-          object.each do |d|
-            disk = VmDisk.new
-            disk.name = d[:name]
-            disk.boot_order = d[:bootOrder]
-
-            if d.keys.include?(:cdrom)
-              disk.type = 'cdrom'
-              disk.bus = d.dig(:cdrom, :bus)
-              disk.readonly = d.dig(:cdrom, :readonly)
-            elsif d.keys.include?(:disk)
-              disk.type = 'disk'
-              disk.bus = d.dig(:disk, :bus)
-              disk.readonly = d.dig(:disk, :readonly)
-            elsif d.keys.include?(:floppy)
-              disk.type = 'floppy'
-              disk.readonly = d.dig(:floppy, :readonly)
-            elsif d.keys.include?(:lun)
-              disk.type = 'lun'
-              disk.readonly = d.dig(:lun, :readonly)
-            end
-            disks << disk
-          end
-
-          disks
-        end
-
-        #
-        # Returns an array of parsed volumes
-        #
-        # @param object [Hash] A hash with raw volumes data.
-        # @param disks [Array] the disks of the vm associated to the volumes
-        #
-        def parse_volumes(object, disks)
-          return {} if object.nil?
-          volumes = []
-          object.each do |v|
-            volume = Volume.new
-            volume.name = v[:name]
-            if v.keys.include?(:containerDisk)
-              volume.type = 'containerDisk'
-              volume.info = v.dig(:containerDisk, :image)
-            elsif v.keys.include?(:persistentVolumeClaim)
-              volume.type = 'persistentVolumeClaim'
-              volume.info = v.dig(:persistentVolumeClaim, :claimName)
-            elsif v.keys.include?(:emptyDisk)
-              volume.type = 'emptyDisk'
-              volume.info = v.dig(:emptyDisk, :capacity)
-            elsif v.keys.include?(:ephemeral)
-              volume.type = 'ephemeral'
-              volume.info = v.dig(:ephemeral, :persistentVolumeClaim, :claimName)
-            elsif v.keys.include?(:cloudInitNoCloud)
-              volume.type = 'cloudInitNoCloud'
-              volume.info = v.dig(:cloudInitNoCloud, :userDataBase64)
-            elsif v.keys.include?(:hostDisk)
-              volume.type = 'hostDisk'
-              volume.info = v.dig(:hostDisk, :path)
-            elsif v.keys.include?(:secret)
-              volume.type = 'secret'
-              volume.info = v.dig(:secret, :secretName)
-            elsif v.keys.include?(:dataVolume)
-              volume.type = 'dataVolume'
-              volume.info = v.dig(:dataVolume, :name)
-            elsif v.keys.include?(:serviceAccount)
-              volume.type = 'serviceAccount'
-              volume.info = v.dig(:serviceAccount, :serviceAccountName)
-            elsif v.keys.include?(:configMap)
-              volume.type = 'configMap'
-              volume.info = v.dig(:configMap, :name)
-            end
-
-            volume.config = v[volume.type.to_sym]
-            disk = disks.select { |d| d.name == volume.name }.first
-            volume.boot_order = disk.boot_order
-            volume.bus = disk.bus if disk.respond_to?(:bus)
-
-            volumes << volume
-          end
-
-          volumes
-        end
-
-        class VmNic < Fog::Model
-          attr_accessor :name
-
-          attribute :mac_address
-          attribute :type # values: bridge, slirp
-          attribute :model
-          attribute :ports
-          attribute :boot_order
-          alias :mac :mac_address
-
-          def persisted?
-            !name.nil?
-          end
-        end
-
         class VmNetwork
           attr_accessor :name,
                         :type # values: multus, pod, genie

data/lib/fog/kubevirt/compute/models/vm_parser.rb

@@ -0,0 +1,141 @@
+require 'fog/kubevirt/compute/models/volume'
+require 'fog/kubevirt/compute/models/vmnic'
+require 'fog/kubevirt/compute/models/vm_data'
+
+module Fog
+  module Kubevirt
+    class Compute
+      module VmParser
+
+        #
+        # Returns an array of parsed network interfaces
+        #
+        # @param object [Hash] A hash with raw interfaces data.
+        #
+        def parse_interfaces(object)
+          return {} if object.nil?
+          nics = []
+          object.each do |iface|
+            nic = VmNic.new
+            nic.name = iface[:name]
+            nic.mac_address = iface[:macAddress]
+            nic.type = 'bridge' if iface.keys.include?(:bridge)
+            nic.type = 'slirp' if iface.keys.include?(:slirp)
+            nics << nic
+          end
+
+          nics
+        end
+
+        #
+        # Returns an array of parsed networks
+        #
+        # @param object [Hash] A hash with raw networks data.
+        #
+        def parse_networks(object)
+          return {} if object.nil?
+          networks = []
+          object.each do |net|
+            network = VmData::VmNetwork.new
+            network.name = net[:name]
+            network.type = 'pod' if net.keys.include?(:pod)
+            network.type = 'multus' if net.keys.include?(:multus)
+            network.type = 'genie' if net.keys.include?(:genie)
+            networks << network
+          end
+
+          networks
+        end
+
+        #
+        # Returns an array of parsed disks
+        #
+        # @param object [Hash] A hash with raw disks data.
+        #
+        def parse_disks(object)
+          return {} if object.nil?
+          disks = []
+          object.each do |d|
+            disk = VmData::VmDisk.new
+            disk.name = d[:name]
+            disk.boot_order = d[:bootOrder]
+
+            if d.keys.include?(:cdrom)
+              disk.type = 'cdrom'
+              disk.bus = d.dig(:cdrom, :bus)
+              disk.readonly = d.dig(:cdrom, :readonly)
+            elsif d.keys.include?(:disk)
+              disk.type = 'disk'
+              disk.bus = d.dig(:disk, :bus)
+              disk.readonly = d.dig(:disk, :readonly)
+            elsif d.keys.include?(:floppy)
+              disk.type = 'floppy'
+              disk.readonly = d.dig(:floppy, :readonly)
+            elsif d.keys.include?(:lun)
+              disk.type = 'lun'
+              disk.readonly = d.dig(:lun, :readonly)
+            end
+            disks << disk
+          end
+
+          disks
+        end
+
+        #
+        # Returns an array of parsed volumes
+        #
+        # @param object [Hash] A hash with raw volumes data.
+        # @param disks [Array] the disks of the vm associated to the volumes
+        #
+        def parse_volumes(object, disks)
+          return {} if object.nil?
+          volumes = []
+          object.each do |v|
+            volume = Volume.new
+            volume.name = v[:name]
+            if v.keys.include?(:containerDisk)
+              volume.type = 'containerDisk'
+              volume.info = v.dig(:containerDisk, :image)
+            elsif v.keys.include?(:persistentVolumeClaim)
+              volume.type = 'persistentVolumeClaim'
+              volume.info = v.dig(:persistentVolumeClaim, :claimName)
+            elsif v.keys.include?(:emptyDisk)
+              volume.type = 'emptyDisk'
+              volume.info = v.dig(:emptyDisk, :capacity)
+            elsif v.keys.include?(:ephemeral)
+              volume.type = 'ephemeral'
+              volume.info = v.dig(:ephemeral, :persistentVolumeClaim, :claimName)
+            elsif v.keys.include?(:cloudInitNoCloud)
+              volume.type = 'cloudInitNoCloud'
+              volume.info = v.dig(:cloudInitNoCloud, :userDataBase64)
+            elsif v.keys.include?(:hostDisk)
+              volume.type = 'hostDisk'
+              volume.info = v.dig(:hostDisk, :path)
+            elsif v.keys.include?(:secret)
+              volume.type = 'secret'
+              volume.info = v.dig(:secret, :secretName)
+            elsif v.keys.include?(:dataVolume)
+              volume.type = 'dataVolume'
+              volume.info = v.dig(:dataVolume, :name)
+            elsif v.keys.include?(:serviceAccount)
+              volume.type = 'serviceAccount'
+              volume.info = v.dig(:serviceAccount, :serviceAccountName)
+            elsif v.keys.include?(:configMap)
+              volume.type = 'configMap'
+              volume.info = v.dig(:configMap, :name)
+            end
+
+            volume.config = v[volume.type.to_sym]
+            disk = disks.select { |d| d.name == volume.name }.first
+            volume.boot_order = disk.boot_order
+            volume.bus = disk.bus if disk.respond_to?(:bus)
+
+            volumes << volume
+          end
+
+          volumes
+        end
+      end
+    end
+  end
+end

data/lib/fog/kubevirt/compute/models/vminstance.rb

@@ -1,10 +1,10 @@
-require 'fog/kubevirt/compute/models/vm_data'
+require 'fog/kubevirt/compute/models/vm_parser'
 
 module Fog
   module Kubevirt
     class Compute
       class Vminstance < Fog::Model
-        extend VmData
+        extend VmParser
 
         identity :name
 

data/lib/fog/kubevirt/compute/models/vmnic.rb

@@ -0,0 +1,20 @@
+module Fog
+  module Kubevirt
+    class Compute
+      class VmNic < Fog::Model
+        identity :mac_address
+        attr_accessor :name
+
+        attribute :type # values: bridge, slirp
+        attribute :model
+        attribute :ports
+        attribute :boot_order
+        alias :mac :mac_address
+
+        def persisted?
+          !name.nil?
+        end
+      end
+    end
+  end
+end

data/lib/fog/kubevirt/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Kubevirt
-    VERSION = '1.1.2'
+    VERSION = '1.1.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-kubevirt
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Piotr Kliczewski
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2019-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -161,10 +161,13 @@ files:
 - lib/fog/kubevirt/compute/models/template.rb
 - lib/fog/kubevirt/compute/models/templates.rb
 - lib/fog/kubevirt/compute/models/vm.rb
+- lib/fog/kubevirt/compute/models/vm_action.rb
 - lib/fog/kubevirt/compute/models/vm_base.rb
 - lib/fog/kubevirt/compute/models/vm_data.rb
+- lib/fog/kubevirt/compute/models/vm_parser.rb
 - lib/fog/kubevirt/compute/models/vminstance.rb
 - lib/fog/kubevirt/compute/models/vminstances.rb
+- lib/fog/kubevirt/compute/models/vmnic.rb
 - lib/fog/kubevirt/compute/models/vms.rb
 - lib/fog/kubevirt/compute/models/volume.rb
 - lib/fog/kubevirt/compute/models/volumes.rb