fog-kubevirt 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 349189a4486be7bf7f5566e4f81ac6068a815b8e
-  data.tar.gz: a5a758533671d33261309f766686c6625cf7220a
+  metadata.gz: 1c337ff2c2a840dbac40190eeb2f68142439c7ce
+  data.tar.gz: d1cf9a63c550417736ccccb088b2a3eab636808b
 SHA512:
-  metadata.gz: 727d5527a879251aaff589d3f0b2b0932a3d44316252329dc165d8238465ac66d069734ff68cf4f264d149745ec549656eb42670ee2dd0a73ad7235f051dc726
-  data.tar.gz: 4484d23a1894820fbaffe80b5b7d6cdf47575d23fae1852a3c9b7f6106cca6cd55006e214dfe30880af27c47ff679af5ccf534f86616cae5bc784bb5517ade45
+  metadata.gz: ad5568f12fd77a0301de97b524b3b427eb65c75bb5be393d238fd226c34b4014870236a09f985a707f4393b856d221e4b339cb33340756ae263c52bf1a06f120
+  data.tar.gz: b2101735200e5f5f2f4c69e490ed886f49d43b4723bec949e68088dc439c452cf451113c33d8a304136fe834378f47040e8d5541c4fbec85600c2b73f006257b

data/lib/fog/compute/kubevirt.rb

@@ -1,5 +1,4 @@
 require 'delegate'
-require 'logger'
 
 require "fog/core"
 
@@ -50,6 +49,30 @@ module Fog
           end
         end
 
+        class ExceptionWrapper
+          def initialize(client)
+            @client = client
+          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
+        end
+
         #
         # Label name which identifies operation system information
         #
@@ -118,7 +141,7 @@ module Fog
           @port = options[:kubevirt_port]
 
           @log = options[:kubevirt_log]
-          @log ||= Logger::Logger.new(STDOUT)
+          @log ||= ::Logger.new(STDOUT)
 
           @namespace = options[:kubevirt_namespace] || 'default'
 
@@ -306,10 +329,11 @@ module Fog
             version,
             @opts
           )
-          @clients[key] = client
+          wrapped_client = ExceptionWrapper.new(client)
+          @clients[key] = wrapped_client
 
           # Return the client:
-          client
+          wrapped_client
         end
 
         def openshift_client

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

@@ -10,7 +10,12 @@ module Fog
         model Fog::Compute::Kubevirt::Template
 
         def all(filters = {})
-          temps = service.list_templates(filters)
+          begin
+            temps = service.list_templates(filters)
+          rescue ::Fog::Kubevirt::Errors::ClientError
+            # we assume that we get 404
+            temps = []
+          end
           @kind = temps.kind
           @resource_version = temps.resource_version
           load temps

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

@@ -20,7 +20,6 @@ module Fog
         def self.parse(object)
           metadata = object[:metadata]
           status = object[:status]
-          owner = metadata[:ownerReferences][0]
           spec = object[:spec]
           domain = spec[:domain]
           {
@@ -28,9 +27,9 @@ module Fog
             :name             => metadata[:name],
             :resource_version => metadata[:resourceVersion],
             :uid              => metadata[:uid],
-            :owner_name       => owner[:name],
-            :owner_uid        => owner[:uid],
-            :cpu_cores        => domain[:cpu][:cores],
+            :owner_name       => metadata.dig(:ownerReferences, 0, :name),
+            :owner_uid        => metadata.dig(:ownerReferences, 0, :uid),
+            :cpu_cores        => domain.dig(:cpu, :cores),
             :memory           => domain[:resources][:requests][:memory],
             :disks            => domain[:devices][:disks],
             :volumes          => spec[:volumes],

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

@@ -10,7 +10,12 @@ module Fog
         model Fog::Compute::Kubevirt::Vminstance
 
         def all(filters = {})
-          vms = service.list_vminstances(filters)
+          begin
+            vms = service.list_vminstances(filters)
+          rescue ::Fog::Kubevirt::Errors::ClientError
+            # we assume that we get 404
+            vms = []
+          end
           @kind = vms.kind
           @resource_version = vms.resource_version
           load vms
@@ -23,7 +28,7 @@ module Fog
         def destroy(name, namespace)
           begin
             vm_instance = get(name)
-          rescue Kubeclient::HttpError
+          rescue ::Fog::Kubevirt::Errors::ClientError
             # the virtual machine instance doesn't exist
             vm_instance = nil
           end

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

@@ -10,7 +10,12 @@ module Fog
         model Fog::Compute::Kubevirt::Vm
 
         def all(filters = {})
-          vms = service.list_vms(filters)
+          begin
+            vms = service.list_vms(filters)
+          rescue ::Fog::Kubevirt::Errors::ClientError
+            # we assume that we get 404
+            vms = []
+          end
           @kind = vms.kind
           @resource_version = vms.resource_version
           load vms

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

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

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

@@ -4,7 +4,7 @@ module Fog
       class Real
         def create_vm(vm)
           kubevirt_client.create_virtual_machine(vm)
-        rescue Kubeclient::HttpError => err
+        rescue ::Fog::Kubevirt::Errors::ClientError => err
           log.warn(err)
           raise ::Fog::Kubevirt::Errors::AlreadyExistsError
         end

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

@@ -2,9 +2,10 @@ module Fog
   module Compute
     class Kubevirt
       class Real
+
         def create_vminstance(vm)
           kubevirt_client.create_virtual_machine_instance(vm)
-        rescue Kubeclient::HttpError => err
+        rescue ::Fog::Kubevirt::Errors::ClientError => err
           log.warn(err)
           raise ::Fog::Kubevirt::Errors::AlreadyExistsError
         end

data/lib/fog/kubevirt.rb

@@ -11,6 +11,7 @@ module Fog
     module Errors
       class ServiceError < Fog::Errors::Error; end
       class AlreadyExistsError < Fog::Errors::Error; end
+      class ClientError < Fog::Errors::Error; end
     end
 
     service(:compute, 'Compute')

data/lib/fog/kubevirt/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Kubevirt
-    VERSION = '0.1.4'
+    VERSION = '0.1.5'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-kubevirt
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Piotr Kliczewski
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-25 00:00:00.000000000 Z
+date: 2018-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler