fog-kubevirt 1.2.5 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a757bb97341858b22dcbce97ae84899d67851f64
-  data.tar.gz: 2d92ed31781d8c7331a76dbb6111875222baf5ce
+  metadata.gz: b8646bec0df5d890b6c7aca5738a39596c982146
+  data.tar.gz: aa9d02efd6cd353248becb936f2365b25765ea03
 SHA512:
-  metadata.gz: dc6973eb073d9abfa2bb8016820d7e62a51ed5a08725b9238dcd86fd847ddc0873196c05536433133581c732cfdd63df2414dc034c30c48e0313d4bbf907ba05
-  data.tar.gz: 2262f37fe3e69f0c66856c17722dbd4ff88160ee32c11d736eddb29ebd29b53948fc71312e473e28c3c3be6d01ca32db2f4c95da2a016c9c73ce9cbf4fc3be1d
+  metadata.gz: 8bbe31efac532a38857e420fd847d878c0653eb64b75266506b03c7bd5b8fe918a908d99a71a391bf44e8b16d2ca3d5f157bc7a9787170fadb8bde99751eae3c
+  data.tar.gz: d72fa662e0dbf84869a8e66e7f30ea96062bc8365415733c4eef0fb7ea6c55851440b27cd94b27e1482cbea5f25a8b8b10fe4d0662f45ac0bd72c7445dcbdd69

data/lib/fog/kubevirt.rb

@@ -7,9 +7,10 @@ module Fog
 
     module Errors
       class ServiceError < Fog::Errors::Error; end
-      class AlreadyExistsError < Fog::Errors::Error; end
       class ClientError < Fog::Errors::Error; end
-      class ValidationError < Fog::Errors::Error; end
+      class AlreadyExistsError < ClientError; end
+      class NotFoundError < ClientError; end
+      class ValidationError < ClientError; end
     end
 
     service(:compute, 'Compute')

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

@@ -2,7 +2,8 @@ require 'delegate'
 require 'json'
 require 'rest-client'
 
-require "fog/core"
+require 'fog/core'
+require 'fog/kubevirt/compute/utils/exception_wrapper'
 
 module Fog
   module Kubevirt
@@ -84,150 +85,6 @@ module Fog
           end
         end
 
-        class ExceptionWrapper
-          def initialize(client, version)
-            @client = client
-            @version = version
-          end
-
-          def method_missing(symbol, *args)
-            super unless @client.respond_to?(symbol)
-
-            if block_given?
-              @client.__send__(symbol, *args) do |*block_args|
-                yield(*block_args)
-              end
-            else
-              @client.__send__(symbol, *args)
-            end
-          rescue KubeException => e
-            raise ::Fog::Kubevirt::Errors::ClientError, e
-          end
-
-          def respond_to_missing?(method_name, include_private = false)
-            @client.respond_to?(symbol, include_all) || super
-          end
-
-          def version
-            @version
-          end
-        end
-
-        #
-        # This class contains functions performing unit calculations.
-        # Originally implemented for manageiq-providers-kubevirt project
-        #
-        class UnitConverter
-          #
-          # Converts a value containing an optional unit to another unit. For example, if the value is
-          # `2 MiB` and the unit is `KiB` the result will be 2048.
-          #
-          # @param value [String] The value to convert, with an optional unit suffix.
-          # @param to [Symbol] (:b) The name of the unit to convert to, for example `:gib`.
-          # @return [BigDecimal] The converted value.
-          #
-          def self.convert(value, to)
-            # Return nil if no value is given:
-            return nil unless value
-
-            match = validate(value)
-            value = match[:value]
-            from = match[:suffix]
-
-            # Convert the value from string to big decimal to make sure that we don't loose precission:
-            value = BigDecimal(value)
-
-            # Do the conversion:
-            from_factor = scale_factor(from)
-            to_factor = scale_factor(to)
-            value * from_factor / to_factor
-          end
-
-          #
-          # Validates and extracts the numeric value and the unit
-          #
-          # @param value [String] The value to validate with optional unit suffix.
-          # @return [MatchData] describing the match, or ValidationError is raised if no match.
-          #
-          def self.validate(value)
-            match = VALUE_RE.match(value)
-            raise ::Fog::Kubevirt::Errors::ValidationError, "The value '#{value}' isn't a valid unit" unless match
-
-            match
-          end
-
-          #
-          # Regular expression used to match values and to separate them into the numeric value and the
-          # optional unit suffix.
-          #
-          VALUE_RE = /^\s*(?<value>[[:digit:]]+)\s*(?<suffix>[[:alpha:]]+)?\s*$/i
-          private_constant :VALUE_RE
-
-          #
-          # Scale factors associated to the different unit suffixes.
-          #
-          SCALE_FACTORS = {
-            :b   => 1,
-
-            :k   => 10**3,
-            :m   => 10**6,
-            :g   => 10**9,
-            :t   => 10**12,
-            :p   => 10**15,
-            :e   => 10**18,
-            :z   => 10**21,
-            :y   => 10**24,
-
-            :kb  => 10**3,
-            :mb  => 10**6,
-            :gb  => 10**9,
-            :tb  => 10**12,
-            :pb  => 10**15,
-            :eb  => 10**18,
-            :zb  => 10**21,
-            :yb  => 10**24,
-
-            :ki  => 2**10,
-            :mi  => 2**20,
-            :gi  => 2**30,
-            :ti  => 2**40,
-            :pi  => 2**50,
-            :ei  => 2**60,
-            :zi  => 2**70,
-            :yi  => 2**80,
-
-            :kib => 2**10,
-            :mib => 2**20,
-            :gib => 2**30,
-            :tib => 2**40,
-            :pib => 2**50,
-            :eib => 2**60,
-            :zib => 2**70,
-            :yib => 2**80
-          }.freeze
-          private_constant :SCALE_FACTORS
-
-          #
-          # Finds the scale factor that matches the given unit suffix.
-          #
-          # @param sufix [Symbol, String] The unit suffix, as symbol or string. For example `MiB` or `:mib`.
-          # @return [Integer] The scale factor corresponding to that unit.
-          #
-          def self.scale_factor(suffix)
-            suffix = suffix.downcase.to_sym if suffix.kind_of?(String)
-            factor = SCALE_FACTORS[suffix]
-            raise ::Fog::Kubevirt::Errors::ValidationError, "The value '#{suffix}' isn't a valid unit suffix" unless factor
-            factor
-          end
-          private_class_method :scale_factor
-        end
-
-        #
-        # Label name which identifies operation system information
-        #
-        OS_LABEL = 'kubevirt.io/os'.freeze
-        OS_LABEL_SYMBOL = :'kubevirt.io/os'
-
         # converts kubeclient objects into hash for fog to consume
         def object_to_hash(object)
           result = object
@@ -382,7 +239,7 @@ module Fog
         #
         def watch_vms(opts = {})
           mapper = Proc.new do |notice|
-            vm = OpenStruct.new(Vm.parse(notice.object)) if notice.object.kind == 'VirtualMachine'
+            vm = OpenStruct.new(Vm.parse(object_to_hash(notice.object))) if notice.object.kind == 'VirtualMachine'
             vm ||= OpenStruct.new
 
             populate_notice_attributes(vm, notice)
@@ -401,7 +258,7 @@ module Fog
         #
         def watch_vminstances(opts = {})
           mapper = Proc.new do |notice|
-            vminstance = OpenStruct.new(Vminstance.parse(notice.object)) if notice.object.kind == 'VirtualMachineInstance'
+            vminstance = OpenStruct.new(Vminstance.parse(object_to_hash(notice.object))) if notice.object.kind == 'VirtualMachineInstance'
             vminstance ||= OpenStruct.new
 
             populate_notice_attributes(vminstance, notice)
@@ -538,7 +395,7 @@ module Fog
         end
 
         def wrap_client(client, version, key)
-          wrapped_client = ExceptionWrapper.new(client, version)
+          wrapped_client = ::Fog::Kubevirt::Utils::ExceptionWrapper.new(client, version, @log)
           @clients[key] = wrapped_client
 
           wrapped_client

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

@@ -8,17 +8,17 @@ module Fog
         attribute :uid,              :aliases => 'metadata_uid'
         attribute :annotations,      :aliases => 'metadata_annotations'
         attribute :labels,           :aliases => 'metadata_labels'
-		attribute :access_modes,	 :aliases => 'spec_access_modes'
-		attribute :mount_options,	 :aliases => 'spec_mount_options'
-		attribute :reclaim_policy,   :aliases => 'spec_reclaim_policy'
-		attribute :storage_class,    :aliases => 'spec_storage_class'
+        attribute :access_modes,     :aliases => 'spec_access_modes'
+        attribute :mount_options,    :aliases => 'spec_mount_options'
+        attribute :reclaim_policy,   :aliases => 'spec_reclaim_policy'
+        attribute :storage_class,    :aliases => 'spec_storage_class'
         attribute :capacity,         :aliases => 'spec_capacity'
         attribute :claim_ref,        :aliases => 'spec_claim_ref'
-        attribute :type,			 :aliases => 'spec_type'
-        attribute :config,			 :aliases => 'spec_config'
+        attribute :type,             :aliases => 'spec_type'
+        attribute :config,           :aliases => 'spec_config'
         attribute :phase,            :aliases => 'status_phase'
-        attribute :reason,            :aliases => 'status_reason'
-        attribute :message,            :aliases => 'status_message'
+        attribute :reason,           :aliases => 'status_reason'
+        attribute :message,          :aliases => 'status_message'
 
         def self.parse(object)
           metadata = object[:metadata]
@@ -35,7 +35,7 @@ module Fog
             :access_modes     => spec[:accessModes],
             :mount_options    => spec[:mountOptions],
             :reclaim_policy   => spec[:persistentVolumeReclaimPolicy],
-			:storage_class    => spec[:storageClassName],
+            :storage_class    => spec[:storageClassName],
             :capacity         => spec.dig(:capacity, :storage),
             :claim_ref        => spec[:claimRef],
             :type             => type,

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

@@ -35,6 +35,11 @@ module Fog
           name = args[:name]
           labels = args[:labels]
 
+          # type is required
+          if args[:type].nil? || args[:type].empty?
+            raise ::Fog::Kubevirt::Errors::ValidationError "Type of storage can not be empty"
+          end
+
           volume = {
             :apiVersion => "v1",
             :kind => "PersistentVolume",
@@ -52,7 +57,7 @@ module Fog
           } if args[:capacity]
 
           volume[:spec][:accessModes] = args[:access_modes] if args[:access_modes]
-          volume[:spec][args[:type].to_sym] = args[:config] if args[:type]
+          volume[:spec][args[:type].to_sym] = args[:config]
 
           service.create_persistentvolume(volume)
         end

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

@@ -1,10 +1,12 @@
 require 'fog/core/collection'
 require 'fog/kubevirt/compute/models/pvc'
+require 'fog/kubevirt/compute/utils/unit_converter'
 
 module Fog
   module Kubevirt
     class Compute
       class Pvcs < Fog::Collection
+
         attr_reader :kind, :resource_version
 
         model Fog::Kubevirt::Compute::Pvc
@@ -82,7 +84,7 @@ module Fog
         private
 
         def check_size(value)
-          ::Fog::Kubevirt::Compute::Shared::UnitConverter.validate(value[:storage])
+          ::Fog::Kubevirt::Utils::UnitConverter.validate(value[:storage])
         end
       end
     end

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

@@ -2,10 +2,13 @@ module Fog
   module Kubevirt
     class Compute
       class Storageclass < Fog::Model
+        IS_DEFAULT = 'storageclass.kubernetes.io/is-default-class'.freeze
+
         # Metadata
         identity :name
         attribute :resource_version,  :aliases => 'metadata_resource_version'
         attribute :uid,               :aliases => 'metadata_uid'
+        attribute :default
 
         attribute :mount_options
         attribute :parameters
@@ -15,17 +18,20 @@ module Fog
 
         def self.parse(object)
           metadata = object[:metadata]
-          {
+          annotations = metadata[:annotations]
+          sc = {
             :name                => metadata[:name],
             :resource_version    => metadata[:resourceVersion],
             :uid                 => metadata[:uid],
-
             :parameters          => object[:parameters],
             :mount_options       => object[:mountOptions],
             :provisioner         => object[:provisioner],
             :reclaim_policy      => object[:reclaimPolicy],
             :volume_binding_mode => object[:volumeBindingMode]
           }
+
+          sc[:default] = annotations[IS_DEFAULT.to_sym] unless annotations.nil?
+          sc
         end
       end
     end

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

@@ -15,6 +15,12 @@ module Fog
         attribute :objects
         attribute :parameters
 
+        #
+        # Label name which identifies operation system information
+        #
+        OS_LABEL = 'kubevirt.io/os'.freeze
+        OS_LABEL_SYMBOL = :'kubevirt.io/os'
+
         def clone(options = {})
           params = values(options)
 

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

@@ -6,6 +6,7 @@ module Fog
     class Compute
       class Vm < Fog::Model
         include VmAction
+        include Shared
         extend VmBase
         define_properties
 

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

@@ -37,7 +37,7 @@ module Fog
           service.delete_vm(name, namespace)
 
           # delete vm instance
-          service.delete_vminstance(name, namespace) unless vm_instance.nil?
+          service.delete_vminstance(name) unless vm_instance.nil?
         end
       end
     end

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

@@ -44,6 +44,7 @@ module Fog
         # :vm_name [String] - name of a vm
         # :cpus [String] - number of cpus
         # :memory_size [String] - amount of memory
+        # :memory_unit [String] - memory unit to use, default to 'M'
         # :image [String] - name of a container disk
         # :pvc [String] - name of a persistent volume claim
         # :cloudinit [Hash] - number of items needed to configure cloud-init
@@ -71,6 +72,7 @@ module Fog
           vm_name = args.fetch(:vm_name)
           cpus = args.fetch(:cpus, nil)
           memory_size = args.fetch(:memory_size)
+          memory_unit = args.fetch(:memory_unit, "M")
           init = args.fetch(:cloudinit, {})
           networks = args.fetch(:networks, nil)
           interfaces = args.fetch(:interfaces, nil)
@@ -80,6 +82,8 @@ module Fog
             raise ::Fog::Kubevirt::Errors::ValidationError
           end
 
+          memory = "#{memory_size}#{memory_unit}"
+          ::Fog::Kubevirt::Utils::UnitConverter.validate(memory)
           volumes, disks = add_vm_storage(vm_name, vm_volumes)
 
           unless init.empty?
@@ -114,7 +118,7 @@ module Fog
                     },
                     :resources => {
                       :requests => {
-                        :memory => "#{memory_size}M"
+                        :memory => memory
                       }
                     }
                   },
@@ -173,10 +177,9 @@ module Fog
         end
 
         def add_vm_storage(vm_name, vm_volumes)
-          normalized_vm_name = vm_name.gsub(/[._]+/,'-')
           volumes, disks = [], []
           vm_volumes.each_with_index do |v, idx|
-            volume_name = v.name || normalized_vm_name + "-disk-0" + idx.to_s
+            volume_name = v.name.nil? ? normalized_name(vm_name) + "-disk-0" + idx.to_s : normalized_name(v.name)
             disk = {
               :name => volume_name,
               :disk => {}
@@ -209,6 +212,12 @@ module Fog
 
           return volumes, disks
         end
+
+        private
+
+        def normalized_name(name)
+          name.gsub(/[._]+/,'-')
+        end
       end
     end
   end

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

@@ -22,9 +22,6 @@ module Fog
             net_att = deep_merge!(net_att, metadata: { namespace: @namespace })
           end
           kube_net_client.create_network_attachment_definition(net_att)
-        rescue ::Fog::Kubevirt::Errors::ClientError => err
-          log.warn(err)
-          raise ::Fog::Kubevirt::Errors::AlreadyExistsError
         end
       end
 

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

@@ -4,9 +4,6 @@ module Fog
       class Real
         def create_persistentvolume(volume)
           kube_client.create_persistent_volume(volume)
-        rescue ::Fog::Kubevirt::Errors::ClientError => err
-          log.warn(err)
-          raise ::Fog::Kubevirt::Errors::AlreadyExistsError
         end
       end
 

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

@@ -4,9 +4,6 @@ module Fog
       class Real
         def create_pvc(pvc)
           kube_client.create_persistent_volume_claim(pvc)
-        rescue ::Fog::Kubevirt::Errors::ClientError => err
-          log.warn(err)
-          raise ::Fog::Kubevirt::Errors::AlreadyExistsError
         end
       end
 

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

@@ -4,9 +4,6 @@ module Fog
       class Real
         def create_service(srv)
           kube_client.create_service(srv)
-        rescue ::Fog::Kubevirt::Errors::ClientError => err
-          log.warn(err)
-          raise ::Fog::Kubevirt::Errors::AlreadyExistsError
         end
       end
 

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

@@ -4,9 +4,6 @@ module Fog
       class Real
         def create_storageclass(storageclass)
           kube_storage_client.create_storage_class(storageclass)
-        rescue ::Fog::Kubevirt::Errors::ClientError => err
-          log.warn(err)
-          raise ::Fog::Kubevirt::Errors::AlreadyExistsError
         end
       end
 

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

@@ -6,9 +6,6 @@ module Fog
           vm[:apiVersion] = kubevirt_client.version
 
           kubevirt_client.create_virtual_machine(vm)
-        rescue ::Fog::Kubevirt::Errors::ClientError => err
-          log.warn(err)
-          raise ::Fog::Kubevirt::Errors::AlreadyExistsError
         end
       end
 

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

@@ -5,9 +5,6 @@ module Fog
 
         def create_vminstance(vm)
           kubevirt_client.create_virtual_machine_instance(vm)
-        rescue ::Fog::Kubevirt::Errors::ClientError => err
-          log.warn(err)
-          raise ::Fog::Kubevirt::Errors::AlreadyExistsError
         end
       end
 

data/lib/fog/kubevirt/compute/utils/exception_wrapper.rb

@@ -0,0 +1,43 @@
+module Fog
+  module Kubevirt
+    module Utils
+      class ExceptionWrapper
+        def initialize(client, version, log)
+          @client = client
+          @version = version
+          @log = log
+        end
+
+        def method_missing(symbol, *args)
+          super unless @client.respond_to?(symbol)
+
+          if block_given?
+            @client.__send__(symbol, *args) do |*block_args|
+              yield(*block_args)
+            end
+          else
+            @client.__send__(symbol, *args)
+          end
+        rescue KubeException => e
+          if e.error_code == 409
+            @log.warn(e)
+            raise ::Fog::Kubevirt::Errors::AlreadyExistsError, e
+          elsif e.error_code == 404
+            raise ::Fog::Kubevirt::Errors::NotFoundError, e
+          else
+            @log.warn(e)
+            raise ::Fog::Kubevirt::Errors::ClientError, e
+          end
+        end
+
+        def respond_to_missing?(method_name, include_private = false)
+          @client.respond_to?(method_name, include_private) || super
+        end
+
+        def version
+          @version
+        end
+      end
+    end
+  end
+end

data/lib/fog/kubevirt/compute/utils/unit_converter.rb

@@ -0,0 +1,115 @@
+module Fog
+  module Kubevirt
+    module Utils
+      #
+      # This class contains functions performing unit calculations.
+      # Originally implemented for manageiq-providers-kubevirt project
+      #
+      class UnitConverter
+
+        #
+        # Converts a value containing an optional unit to another unit. For example, if the value is
+        # `2 MiB` and the unit is `KiB` the result will be 2048.
+        #
+        # @param value [String] The value to convert, with an optional unit suffix.
+        # @param to [Symbol] (:b) The name of the unit to convert to, for example `:gib`.
+        # @return [BigDecimal] The converted value.
+        #
+        def self.convert(value, to)
+          # Return nil if no value is given:
+          return nil unless value
+  
+          match = validate(value)
+          value = match[:value]
+          from = match[:suffix]
+  
+          # Convert the value from string to big decimal to make sure that we don't loose precission:
+          value = BigDecimal(value)
+  
+          # Do the conversion:
+          from_factor = scale_factor(from)
+          to_factor = scale_factor(to)
+          value * from_factor / to_factor
+        end
+  
+        #
+        # Validates and extracts the numeric value and the unit
+        #
+        # @param value [String] The value to validate with optional unit suffix.
+        # @return [MatchData] describing the match, or ValidationError is raised if no match.
+        #
+        def self.validate(value)
+          match = VALUE_RE.match(value)
+          raise ::Fog::Kubevirt::Errors::ValidationError, "The value '#{value}' isn't a valid unit" unless match
+  
+          match
+        end
+  
+        #
+        # Regular expression used to match values and to separate them into the numeric value and the
+        # optional unit suffix.
+        #
+        VALUE_RE = /^\s*(?<value>[[:digit:]]+)\s*(?<suffix>[[:alpha:]]+)?\s*$/i
+        private_constant :VALUE_RE
+  
+        #
+        # Scale factors associated to the different unit suffixes.
+        #
+        SCALE_FACTORS = {
+          :b   => 1,
+  
+          :k   => 10**3,
+          :m   => 10**6,
+          :g   => 10**9,
+          :t   => 10**12,
+          :p   => 10**15,
+          :e   => 10**18,
+          :z   => 10**21,
+          :y   => 10**24,
+  
+          :kb  => 10**3,
+          :mb  => 10**6,
+          :gb  => 10**9,
+          :tb  => 10**12,
+          :pb  => 10**15,
+          :eb  => 10**18,
+          :zb  => 10**21,
+          :yb  => 10**24,
+  
+          :ki  => 2**10,
+          :mi  => 2**20,
+          :gi  => 2**30,
+          :ti  => 2**40,
+          :pi  => 2**50,
+          :ei  => 2**60,
+          :zi  => 2**70,
+          :yi  => 2**80,
+  
+          :kib => 2**10,
+          :mib => 2**20,
+          :gib => 2**30,
+          :tib => 2**40,
+          :pib => 2**50,
+          :eib => 2**60,
+          :zib => 2**70,
+          :yib => 2**80
+        }.freeze
+        private_constant :SCALE_FACTORS
+  
+        #
+        # Finds the scale factor that matches the given unit suffix.
+        #
+        # @param sufix [Symbol, String] The unit suffix, as symbol or string. For example `MiB` or `:mib`.
+        # @return [Integer] The scale factor corresponding to that unit.
+        #
+        def self.scale_factor(suffix)
+          suffix = suffix.downcase.to_sym if suffix.kind_of?(String)
+          factor = SCALE_FACTORS[suffix]
+          raise ::Fog::Kubevirt::Errors::ValidationError, "The value '#{suffix}' isn't a valid unit suffix" unless factor
+          factor
+        end
+        private_class_method :scale_factor
+      end  
+    end
+  end
+end

data/lib/fog/kubevirt/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Kubevirt
-    VERSION = '1.2.5'
+    VERSION = '1.3.0'
   end
 end

data/spec/integration/mac_vmi_spec.rb

@@ -0,0 +1,135 @@
+require_relative './shared_context'
+
+describe Fog::Kubevirt::Compute do
+  before :all do
+    conn = KubevirtConnection.new()
+    @client = conn.client
+    @watch = nil
+  end
+
+  it 'creates VMI and checks MAC' do
+    vm_name = 'test'
+    cpus = 1
+    memory_size = 64
+
+    volume = Fog::Kubevirt::Compute::Volume.new
+    volume.type = 'containerDisk'
+    volume.name = 'test-disk-01'
+    volume.info = 'registry:5000/kubevirt/cirros-container-disk-demo:devel'
+
+    @client.vms.create(vm_name: vm_name, cpus: cpus, memory_size: memory_size, volumes: [volume])
+
+    vm = @client.vms.get(vm_name)
+    assert_equal(vm.cpu_cores, cpus)
+    assert_equal(vm.memory, "#{memory_size}M")
+
+    vm.start()
+
+    # check whether vmi to be created if not it will raise ClientError
+    @client.vminstances.get(vm_name)
+
+    vmis = @client.vminstances.all()
+    @watch = @client.watch_vminstances(:resource_version => vmis.resource_version)
+
+    thread = Thread.new do
+      @watch.each do |notice|
+        break if notice.type == 'MODIFIED' && notice.status == 'Running'
+      end
+    end
+
+    if thread.join(60).nil?
+      fail('VMI did not start')
+    end
+    @watch.finish
+    @watch = nil
+
+    vmi = @client.vminstances.get(vm_name)
+
+    assert_equal(vm.cpu_cores, cpus)
+    assert_equal(vm.memory, "#{memory_size}M")
+
+    vmi.interfaces do |iface|
+      assert !iface.mac_address.nil?
+    end
+
+    vmis = @client.vminstances.all()
+    @watch = @client.watch_vminstances(:resource_version => vmis.resource_version)
+
+    @client.vminstances.destroy(vm_name, @client.namespace)
+
+    thread = Thread.new do
+      @watch.each do |notice|
+        break if notice.type == 'DELETED'
+      end
+    end
+
+    if thread.join(60).nil?
+      fail('VMI was not removed')
+    end
+    @watch.finish
+    @watch = nil
+  end
+
+  it 'creates VMI and checks MAC using server' do
+    vm_name = 'test-server'
+    cpus = 1
+    memory_size = 64
+
+    volume = Fog::Kubevirt::Compute::Volume.new
+    volume.type = 'containerDisk'
+    volume.name = 'test.disk.01'
+    volume.info = 'registry:5000/kubevirt/cirros-container-disk-demo:devel'
+
+    @client.vms.create(vm_name: vm_name, cpus: cpus, memory_size: memory_size, volumes: [volume])
+
+    server_vm = @client.servers.get(vm_name)
+    assert_equal(server_vm.cpu_cores, cpus)
+    assert_equal(server_vm.memory, "#{memory_size}M")
+
+    server_vm.start()
+
+    # check whether vmi to be created if not it will raise ClientError
+    @client.servers.get(vm_name)
+
+    vmis = @client.vminstances.all()
+    @watch = @client.watch_vminstances(:resource_version => vmis.resource_version)
+
+    thread = Thread.new do
+      @watch.each do |notice|
+        break if notice.type == 'MODIFIED' && notice.status == 'Running'
+      end
+    end
+
+    if thread.join(60).nil?
+      fail('Server did not start')
+    end
+    @watch.finish
+    @watch = nil
+
+    server = @client.servers.get(vm_name)
+
+    assert_equal(server.cpu_cores, cpus)
+    assert_equal(server.memory, "#{memory_size}M")
+
+    server.interfaces do |iface|
+      assert !iface.mac_address.nil?
+    end
+
+    vmis = @client.vminstances.all()
+    @watch = @client.watch_vminstances(:resource_version => vmis.resource_version)
+
+    server.destroy
+
+    thread = Thread.new do
+        @watch.each do |notice|
+          break if notice.type == 'DELETED'
+        end
+      end
+  
+      if thread.join(60).nil?
+        fail('Server was not removed')
+      end
+      @watch.finish
+      @watch = nil
+  end
+end

data/spec/integration/net-attach-def_spec.rb

@@ -0,0 +1,43 @@
+require_relative './shared_context'
+
+describe Fog::Kubevirt::Compute do
+  before :all do
+    conn = KubevirtConnection.new()
+    @client = conn.client.networkattachmentdefs
+  end
+
+  it 'CRD network attachements' do
+    name = 'ovs-red'
+    config = '{ cni_version: "0.3.1", type: "ovs", bridge: "red" }'
+
+    @client.create(name: name, config: config)
+
+    net_att_def = @client.get(name)
+    assert_equal(net_att_def.config, config)
+
+    @client.delete(name)
+
+    begin
+      @client.get(name)
+      fail "net_attach_def should not exist"
+    rescue ::Fog::Kubevirt::Errors::ClientError
+      # expected
+    end
+  end
+
+  it 'creates empty config' do
+    begin
+      @client.create(name: 'aaa')
+      fail "empty config can not be nil"
+    rescue ::Fog::Kubevirt::Errors::ClientError
+      # expected
+    end
+
+    begin
+      @client.create(name: 'aaa', config: '{}')
+      fail "empty config can not be nil"
+    rescue ::Fog::Kubevirt::Errors::ClientError
+      # expected
+    end  
+  end
+end

data/spec/integration/pvcs_spec.rb

@@ -3,13 +3,14 @@ require_relative './shared_context'
 describe Fog::Kubevirt::Compute do
   before :all do
     conn = KubevirtConnection.new()
+    @namespace = conn.client.namespace
     @client = conn.client.pvcs
   end
 
   it 'CRD pvc' do
     pvc = {
       :name => 'test-pvc',
-      :namespace => 'default',
+      :namespace => @namespace,
       :storage_class => '',
       :access_modes => ['ReadWriteOnce'],
       :requests => { storage: "1Gi" }
@@ -42,7 +43,7 @@ describe Fog::Kubevirt::Compute do
   it 'fails with wrong size format' do
     pvc = {
       :name => 'test-pvc',
-      :namespace => 'default',
+      :namespace => @namespace,
       :storage_class => '',
       :access_modes => ['ReadWriteOnce'],
       :requests => { storage: "X" }

data/spec/integration/shared_context.rb

@@ -8,15 +8,22 @@ class KubevirtConnection
     @host = ENV.key?('KUBE_HOST') ? ENV['KUBE_HOST'] : options[:host]
     @port = ENV.key?('KUBE_PORT') ? ENV['KUBE_PORT'] : options[:port]
     @token = ENV.key?('KUBE_TOKEN') ? ENV['KUBE_TOKEN'] : options[:token]
+    @namespace = ENV.key?('KUBE_NAMESPACE') ? ENV['KUBE_NAMESPACE'] : options[:namespace]
   end
 
   def client
     if !ENV.key?('KUBECONFIG') 
-      return Fog::Kubevirt::Compute.new(:kubevirt_hostname => @host,
-        :kubevirt_port     => @port,
-        :kubevirt_token    => @token)
+      return Fog::Kubevirt::Compute.new(
+        :kubevirt_hostname  => @host,
+        :kubevirt_port      => @port,
+        :kubevirt_token     => @token,
+        :kubevirt_namespace => @namespace
+      )
     else
-      return Fog::Kubevirt::Compute.new(:kubevirt_token => nil)
+      return Fog::Kubevirt::Compute.new(
+        :kubevirt_token     => nil,
+        :kubevirt_namespace => @namespace
+      )
     end
   end
 end

data/spec/integration/volumes_spec.rb

@@ -0,0 +1,45 @@
+require_relative './shared_context'
+
+require 'fileutils'
+
+describe Fog::Kubevirt::Compute do
+  before :all do
+    conn = KubevirtConnection.new()
+    @client = conn.client
+  end
+
+  it 'creates volumes' do
+    scs = @client.storageclasses.all()
+    default_sc = scs.find { | sc | sc.default }
+
+    dir = Dir.mktmpdir
+
+    name = 'my-local-storage'
+    access_modes = [ 'ReadWriteOnce' ]
+    capacity = '1Gi'
+    type = 'hostPath'
+    config = { path: dir, type: "Directory" }
+
+    @client.persistentvolumes.create(name: name,
+                                     access_modes: access_modes,
+                                     capacity: capacity,
+                                     storage_class: default_sc.name,
+                                     type: type,
+                                     config: config)
+
+    pv = @client.persistentvolumes.get(name)
+    assert_equal(pv.storage_class, default_sc.name)
+    assert_equal(pv.capacity, capacity)
+    assert_equal(pv.access_modes, access_modes)
+
+    @client.persistentvolumes.delete(name)
+    FileUtils.remove_entry dir
+
+    begin
+      @client.persistentvolumes.get(name)
+      fail "pv should not exist"
+    rescue ::Fog::Kubevirt::Errors::ClientError
+      # expected
+    end    
+  end
+end

data/spec/unit/create_vm_spec.rb

@@ -18,7 +18,7 @@ describe Fog::Compute do
       begin
         vm_name = 'test'
         cpus = 1
-        memory_size = 64
+        memory_size = '64'
         pvc1 = 'mypvc1'
         pvc2 = 'mypvc2'
 
@@ -104,12 +104,13 @@ describe Fog::Compute do
       begin
         vm_name = 'test2'
         cpus = 1
-        memory_size = 64
+        memory_size = '64'
+        memory_unit = 'M'
 
         volume = Fog::Kubevirt::Compute::Volume.new
         volume.type = 'persistentVolumeClaim'
         volume.info = 'mypvc3'
-        @service.vms.create(vm_name: vm_name, cpus: cpus, memory_size: memory_size, volumes: [volume])
+        @service.vms.create(vm_name: vm_name, cpus: cpus, memory_size: memory_size, memory_unit: memory_unit, volumes: [volume])
 
         vm = @service.vms.get(vm_name)
 

data/spec/unit/unit_converter_spec.rb

@@ -1,8 +1,10 @@
 require_relative './spec_helper'
 
-describe Fog::Kubevirt::Compute::Shared::UnitConverter do
+require 'fog/kubevirt/compute/utils/unit_converter'
 
-  described_class = Fog::Kubevirt::Compute::Shared::UnitConverter
+describe Fog::Kubevirt::Utils::UnitConverter do
+
+  described_class = Fog::Kubevirt::Utils::UnitConverter
 
   describe '.convert' do
     it 'converts correctly units that correspond to powers of 10' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-kubevirt
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.3.0
 platform: ruby
 authors:
 - Piotr Kliczewski
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-24 00:00:00.000000000 Z
+date: 2019-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -209,6 +209,8 @@ files:
 - lib/fog/kubevirt/compute/requests/list_vms.rb
 - lib/fog/kubevirt/compute/requests/list_volumes.rb
 - lib/fog/kubevirt/compute/requests/update_vm.rb
+- lib/fog/kubevirt/compute/utils/exception_wrapper.rb
+- lib/fog/kubevirt/compute/utils/unit_converter.rb
 - lib/fog/kubevirt/version.rb
 - spec/fixtures/kubevirt/networkattachmentdefinition/networkattachmentdefinitions_crud.yml
 - spec/fixtures/kubevirt/persistentvolume/persistent_volumes_crud.yml
@@ -219,8 +221,11 @@ files:
 - spec/fixtures/kubevirt/storageclass/storageclasses_crud.yml
 - spec/fixtures/kubevirt/vm/vm_create_multi.yml
 - spec/fixtures/kubevirt/vm/vm_create_single.yml
+- spec/integration/mac_vmi_spec.rb
+- spec/integration/net-attach-def_spec.rb
 - spec/integration/pvcs_spec.rb
 - spec/integration/shared_context.rb
+- spec/integration/volumes_spec.rb
 - spec/unit/compute_v1alpha2_spec.rb
 - spec/unit/create_vm_spec.rb
 - spec/unit/network_attachment_definition_v1alpha2_spec.rb
@@ -266,8 +271,11 @@ test_files:
 - spec/fixtures/kubevirt/storageclass/storageclasses_crud.yml
 - spec/fixtures/kubevirt/vm/vm_create_multi.yml
 - spec/fixtures/kubevirt/vm/vm_create_single.yml
+- spec/integration/mac_vmi_spec.rb
+- spec/integration/net-attach-def_spec.rb
 - spec/integration/pvcs_spec.rb
 - spec/integration/shared_context.rb
+- spec/integration/volumes_spec.rb
 - spec/unit/compute_v1alpha2_spec.rb
 - spec/unit/create_vm_spec.rb
 - spec/unit/network_attachment_definition_v1alpha2_spec.rb