fog-kubevirt 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1de135b0b0723b41c540c9bc1247b67d1f8176ef
-  data.tar.gz: 8845f174d0923e0224e0683c710d0a5219608c7b
+  metadata.gz: aa2d9409a7b3472593ad9f4851e75b1e702d6be9
+  data.tar.gz: bb3258447667e18c78273407587d4adbf25ff308
 SHA512:
-  metadata.gz: ea3d49cf4931797629028d01cea8332d78f57c90b130e8d362e0bd1002d19e539ceee45280f2a6d16c2da45fa11e40da14da12cdb31a9bc2da2af6038bd3560f
-  data.tar.gz: 06ad5911dc8b3c7f110f33992ee61e19403f4643b0d97607000dff270e20036ad6b2414f54b72a545f606c927d15c93237d25915aebcdf176fb5327c13549218
+  metadata.gz: a866f0a383c98f3f08e913374d9b0d4d7a57059423848ce96628119ff20bf122d2d459cb5ed5888793a11e4a6ff2044604ca7f531a1c004a28b167468c4b7b07
+  data.tar.gz: 4c972287cffa8afcc7b81730115daf8bbe5052124dda86d62c92fa95b3abfc04074812b9ce9bae29c863687712577a26bee539896c9757191a057b73b6890a36

data/lib/fog/compute/kubevirt.rb

@@ -7,8 +7,7 @@ require "fog/core"
 module Fog
   module Compute
     class Kubevirt < Fog::Service
-      requires   :kubevirt_token
-      recognizes :kubevirt_hostname, :kubevirt_port, :kubevirt_namespace, \
+      recognizes :kubevirt_token, :kubevirt_hostname, :kubevirt_port, :kubevirt_namespace, \
                  :kubevirt_log, :kubevirt_verify_ssl, :kubevirt_ca_cert
 
       model_path 'fog/compute/kubevirt/models'
@@ -278,7 +277,7 @@ module Fog
             populate_notice_attributes(vminstance, notice)
             vminstance
           end
-          watch = kubevirt_client.watch_virtual_machines(opts)
+          watch = kubevirt_client.watch_virtual_machine_instances(opts)
 
           WatchWrapper.new(watch, mapper)
         end
@@ -352,9 +351,28 @@ module Fog
             :path   => path
           )
 
+          if @kubevirt_token.to_s.empty?
+            create_client_from_config(path)
+          else
+            create_client_from_token(url)
+          end          
+        end
+
+        def create_client_from_token(url)
+          # Prepare the TLS and authentication options that will be used for the standard Kubernetes API
+          # and also for the KubeVirt extension:
+          @opts = {
+            :ssl_options  => {
+              :verify_ssl => OpenSSL::SSL::VERIFY_NONE,
+            },
+            :auth_options => {
+              :bearer_token => @kubevirt_token
+            }
+          }
           version = detect_version(url.to_s, @opts[:ssl_options])
-          key = path + '/' + version
-          client = @clients[key]
+          key = url.path + '/' + version
+
+          client = check_client(key)
           return client if client
 
           client = Kubeclient::Client.new(
@@ -362,10 +380,38 @@ module Fog
             version,
             @opts
           )
+
+          wrap_client(client, version, key)
+        end
+
+        def create_client_from_config(path)
+          config = Kubeclient::Config.read(ENV['KUBECONFIG'] || ENV['HOME']+'/.kube/config')
+          context = config.context
+          url = context.api_endpoint
+          version = detect_version(url + path, context.ssl_options)
+          key = path + '/' + version
+
+          client = check_client(key)
+          return client if client
+
+          client = Kubeclient::Client.new(
+            url + path,
+            version,
+            ssl_options: context.ssl_options,
+            auth_options: context.auth_options
+          )
+
+          wrap_client(client, version, key)
+        end
+
+        def check_client(key)
+          @clients[key]
+        end
+
+        def wrap_client(client, version, key)
           wrapped_client = ExceptionWrapper.new(client, version)
           @clients[key] = wrapped_client
 
-          # Return the client:
           wrapped_client
         end
 

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

@@ -27,7 +27,7 @@ module Fog
 
         def self.parse(object)
           server = parse_object(object)
-          server[:status] = object[:phase]
+          server[:state] = object[:phase]
           server[:node_name] = object[:node_name]
           server[:ip_address] = object[:ip_address]
           server

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

@@ -43,7 +43,7 @@ module Fog
             :volumes          => parse_volumes(spec[:volumes]),
             :interfaces       => parse_interfaces(domain[:devices][:interfaces]),
             :networks         => parse_networks(spec[:networks]),
-            :state            => object[:spec][:running].to_s == "true" ? "running" : "stopped",
+            :status           => object[:spec][:running].to_s == "true" ? "running" : "stopped",
             :machine_type     => domain.dig(:machine, :type)
           }
           vm[:owner_reference] = owner unless owner.nil?
@@ -56,6 +56,8 @@ module Fog
       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.

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

@@ -150,13 +150,19 @@ module Fog
                         :readonly
         end
 
-        class VmVolume
-          attr_accessor :name,
-                        # values: containerDisk, persistentVolumeClaim, emptyDisk,
-                        #         ephemeral, cloudInitNoCloud, hostDisk, secret,
-                        #         dataVolume, serviceAccount, configMap
-                        :type,
-                        :info # specific piece of information per volume type
+        class VmVolume < Fog::Model
+          identity :name
+          attribute :id
+          # values: containerDisk, persistentVolumeClaim, emptyDisk,
+          #         ephemeral, cloudInitNoCloud, hostDisk, secret,
+          #         dataVolume, serviceAccount, configMap
+          attribute :type
+
+          attribute :info # specific piece of information per volume type
+
+          def persisted?
+            !name.nil?
+          end
         end
       end
     end

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

@@ -59,8 +59,8 @@ module Fog
           image = args.fetch(:image, nil)
           pvc = args.fetch(:pvc, nil)
           init = args.fetch(:cloudinit, {})
-          networks = args.fetch(:networks)
-          interfaces = args.fetch(:interfaces)
+          networks = args.fetch(:networks, nil)
+          interfaces = args.fetch(:interfaces, nil)
 
           if image.nil? && pvc.nil?
             raise ::Fog::Kubevirt::Errors::ValidationError
@@ -103,7 +103,7 @@ module Fog
                         {:disk => {
                            :bus => "virtio"
                          },
-                         :name => vm_name,
+                         :name => volume_name,
                         }
                       ]
                     },
@@ -141,8 +141,7 @@ module Fog
             :disk => {
               :bus => "virtio"
             },
-            :name => "cloudinitdisk",
-            :volumeName => "cloudinitvolume"
+            :name => "cloudinitvolume",
           ) unless init.empty?
 
           vm = deep_merge!(vm,

data/lib/fog/kubevirt/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Kubevirt
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-kubevirt
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Piotr Kliczewski
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-23 00:00:00.000000000 Z
+date: 2019-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest