fog-kubevirt 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e1ad47434b4be227ffa7e32f9435021980784c0
-  data.tar.gz: 78189c5ee24ea2f3a3314c1c32e242a2dc66a764
+  metadata.gz: e1f90a753f99bae70fdb0f9ef3a560b939a25472
+  data.tar.gz: 693cd23e1eb336c338fcbe2440f7de92a9e2cce3
 SHA512:
-  metadata.gz: 6d128816adb81bb5e438348537003b6893305cf3df4c9ebac3a611db2ebb974bfbfa360fb6937e0ccaff0292ca68d2f410107fd3d02b440842d61619d2a064d3
-  data.tar.gz: 34b7f11414b8dec2720386485e25e2d0746579566828d5e2cebf85f75d2d27de9b9dce2774122b4674f7e65c9319b4c135ca5ef3affebd7e8ac0ed3a4f15f06d
+  metadata.gz: fca88f74721f9ff8d272a522fb44edb4366c6763ec510c9f20e01bf9c309c5d6a34885b9e8fa26d19d8afa84539f565ad04d89da36a9b07bb227d5bda7c03858
+  data.tar.gz: '068448c16b963a7c9df4814733cb80ccd03494ce007a2c4c78c1b963b99fc483cf112cb4494e32ae9d3676829720857b6f857e1fa64155e83bbf14bb38e2cef2'

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

@@ -21,6 +21,15 @@ module Fog
           new service.get_server(id)
         end
 
+        def new(attributes = {})
+          server = super
+          server.disks = [] unless server.disks
+          server.volumes = [] unless server.volumes
+          server.interfaces = [] unless server.interfaces
+          server.networks = [] unless server.networks
+          server
+        end
+
         def bootstrap(new_attributes = {})
           server = create(new_attributes)
           server.wait_for { stopped? }

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

@@ -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',               :default => []
-          attribute :volumes,          :aliases => 'spec_volumes',             :default => []
+          attribute :disks,            :aliases => 'spec_disks'
+          attribute :volumes,          :aliases => 'spec_volumes'
           attribute :status,           :aliases => 'spec_running'
-          attribute :interfaces,       :aliases => 'spec_interfaces',          :default => []
-          attribute :networks,         :aliases => 'spec_networks',            :default => []
+          attribute :interfaces,       :aliases => 'spec_interfaces'
+          attribute :networks,         :aliases => 'spec_networks'
           attribute :machine_type,     :aliases => 'spec_machine_type'
         end
 

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

@@ -13,7 +13,7 @@ module Fog
         # @param object [Hash] A hash with raw interfaces data.
         #
         def parse_interfaces(object, object_status, networks)
-          return {} if object.nil?
+          return [] if object.nil?
           nics = []
           object.each do |iface|
             nic = VmNic.new
@@ -42,7 +42,7 @@ module Fog
         # @param object [Hash] A hash with raw networks data.
         #
         def parse_networks(object)
-          return {} if object.nil?
+          return [] if object.nil?
           networks = []
           object.each do |net|
             network = VmData::VmNetwork.new
@@ -65,7 +65,7 @@ module Fog
         # @param object [Hash] A hash with raw disks data.
         #
         def parse_disks(object)
-          return {} if object.nil?
+          return [] if object.nil?
           disks = []
           object.each do |d|
             disk = VmData::VmDisk.new
@@ -100,7 +100,7 @@ module Fog
         # @param disks [Array] the disks of the vm associated to the volumes
         #
         def parse_volumes(object, disks)
-          return {} if object.nil?
+          return [] if object.nil?
           volumes = []
           object.each do |v|
             volume = Volume.new

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

@@ -23,6 +23,15 @@ module Fog
           load vms
         end
 
+        def new(attributes = {})
+          vm = super
+          vm.disks = [] unless vm.disks
+          vm.volumes = [] unless vm.volumes
+          vm.interfaces = [] unless vm.interfaces
+          vm.networks = [] unless vm.networks
+          vm
+        end
+
         def get(name)
           new service.get_vm(name)
         end

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

@@ -26,6 +26,12 @@ module Fog
           # holds the pvc entity if its type is persistentVolumeClaim
           attribute :pvc
 
+          # the capacity of the volume, when supported
+          attribute :capacity
+
+          # the storage class used for the volume, i.e. when type is persistentVolumeClaim
+          attribute :storage_class
+
           # Hash that holds volume type specific configurations, used for adding volume for a vm
           # The set of config properties may change from type to type, see documentation for the supported
           # keys of each volume type:
@@ -44,12 +50,6 @@ module Fog
           def persisted?
             !name.nil?
           end
-
-        def self.parse(object, disk)
-          volume = parse_object(object)
-          volume[:boot_order] = object[:bootOrder]
-          volume
-        end
       end
     end
   end

data/lib/fog/kubevirt/compute/requests/get_vm.rb

@@ -10,12 +10,24 @@ module Fog
 
         def populate_pvcs_for_vm(vm)
           vm[:volumes].each do |vol|
+            set_volume_pvc_attributes(vol)
+          end
+        end
+
+        def set_volume_pvc_attributes(volume, pvc = nil)
+          return unless volume.type == 'persistentVolumeClaim'
+          if pvc.nil?
             begin
-              vol.pvc = pvcs.get(vol.info) if vol.type == 'persistentVolumeClaim'
+              pvc = pvcs.get(volume.info)
             rescue
               # there is an option that the PVC does not exist
+              return
             end
           end
+
+          volume.pvc = pvc
+          volume.capacity = pvc&.requests[:storage]
+          volume.storage_class = pvc.storage_class
         end
 
         def get_raw_vm(name)

data/lib/fog/kubevirt/compute/requests/list_volumes.rb

@@ -10,7 +10,7 @@ module Fog
               volume = Volume.new
               volume.name = pvc.name
               volume.type = 'persistentVolumeClaim'
-              volume.pvc = pvc
+              set_volume_pvc_attributes(volume, pvc)
               volume
             end
             EntityCollection.new('Volume', pvcs.resource_version, entities)

data/lib/fog/kubevirt/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Kubevirt
-    VERSION = '1.2.3'
+    VERSION = '1.2.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-kubevirt
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Piotr Kliczewski
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-15 00:00:00.000000000 Z
+date: 2019-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest