fog-kubevirt 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee0eacc3688d804fe65c3b1aad58a83598ea1464
-  data.tar.gz: 3bb93e156ebcfd91ab968472aa820bad4be79f24
+  metadata.gz: '0943d37da16b3d47be971ecd55a253508275a834'
+  data.tar.gz: f8b23b0d7c2ef8ef6769e5f9318b4efc8b80c07a
 SHA512:
-  metadata.gz: b923222a67ec3decae7a438a62ddcaf47c6f2ea9b242479e0359398a253c715300aada3ea9024a97b2ed41a8df694ca304d019d1c1f7653e91cb84f8db57adae
-  data.tar.gz: d4fac11a34371874e4c2a59983cc1168c8ae5e3a09617a63cd74eb51553951beb0f9f0d38fae5c25f58f9ccba485facee7f21b8f88d2404a6787266e7a3a2096
+  metadata.gz: 2fbdd1c0d3aaccba43a1f3270dc0fe2eeadb0b90f3dfe30df2442b16866bc2211913096b0b52d1d5022905362cb2e80cd79b2ff4f431817d2fa201eafbf9ad8e
+  data.tar.gz: 50a64408a54c66330c31e6c9b74db16eb70c16dbaf3bd45496e8fd705d85079267c7171a1370f1deeed169f3cd511ab7197aa5afb7cb370c6c12b1df0c3a28f8

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

@@ -7,7 +7,8 @@ require "fog/core"
 module Fog
   module Kubevirt
     class Compute < Fog::Service
-      recognizes :kubevirt_token, :kubevirt_hostname, :kubevirt_port, :kubevirt_namespace, :kubevirt_log
+      recognizes :kubevirt_token, :kubevirt_hostname, :kubevirt_port, :kubevirt_namespace, \
+                 :kubevirt_log, :kubevirt_verify_ssl, :kubevirt_ca_cert
 
       model_path 'fog/kubevirt/compute/models'
       model      :vminstance
@@ -191,6 +192,12 @@ module Fog
           @log ||= ::Logger.new(STDOUT)
 
           @namespace = options[:kubevirt_namespace] || 'default'
+          @opts = {
+            :ssl_options  => obtain_ssl_options(options),
+            :auth_options => {
+              :bearer_token => @kubevirt_token
+            }
+          }
 
           # Kubeclient needs different client objects for different API groups. We will keep in this hash the
           # client objects, indexed by API path/version.
@@ -211,6 +218,13 @@ module Fog
         end
 
         def valid?
+          begin
+            kube_client.get_namespace(namespace)
+          rescue => err
+            @log.warn("The namespace [#{namespace}] does not exist on the kubernetes cluster: #{err.message}")
+            raise "The namespace '#{namespace}' does not exist on the kubernetes cluster"
+          end
+
           kube_client.api_valid?
         end
 
@@ -466,6 +480,41 @@ module Fog
         def log
           @log
         end
+
+        #
+        # Prepare the TLS and authentication options that will be used for the
+        # standard Kubernetes API and also for the KubeVirt extension
+        #
+        # @param options [Hash] a hash with connection options
+        #
+        def obtain_ssl_options(options)
+          verify_ssl = options[:kubevirt_verify_ssl]
+          if verify_ssl == true
+            ca = options[:kubevirt_ca_cert] || ""
+            ca = IO.read(ca) if File.file?(ca)
+            certs = ca.split(/(?=-----BEGIN)/).reject(&:empty?).collect do |pem|
+              OpenSSL::X509::Certificate.new(pem)
+            end
+
+            cert_store = OpenSSL::X509::Store.new
+            certs.each do |cert|
+              cert_store.add_cert(cert)
+            end
+
+            ssl_options = {
+              :verify_ssl => OpenSSL::SSL::VERIFY_PEER,
+              :cert_store => cert_store
+            }
+          elsif verify_ssl == false || verify_ssl.to_s.empty?
+            ssl_options = {
+              :verify_ssl => OpenSSL::SSL::VERIFY_NONE
+            }
+          else
+            ssl_options = {
+              :verify_ssl => verify_ssl
+            }
+          end
+        end
       end
 
       class Mock

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

@@ -134,14 +134,19 @@ module Fog
           volumes
         end
 
-        class VmNic
-          attr_accessor :name,
-                        :mac_address,
-                        :type, # values: bridge, slirp
-                        :model,
-                        :ports,
-                        :boot_order
+        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

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

@@ -46,7 +46,6 @@ module Fog
           end
 
         def self.parse(object, disk)
-          byebug
           volume = parse_object(object)
           volume[:boot_order] = object[:bootOrder]
           volume

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

@@ -12,11 +12,94 @@ module Fog
       end
 
       class Mock
-        # TODO provide implementation
         def get_vm(name)
+          Vm.parse get_raw_vm(name)
         end
 
         def get_raw_vm(name)
+          {
+            :apiVersion=>"kubevirt.io/v1alpha3",
+            :kind=>"VirtualMachine",
+            :metadata=>{
+              :creationTimestamp=>"2019-04-02T13:28:47Z",
+              :generation=>1,
+              :labels=>{
+                :special=>"vm-multus-multiple-net"
+              },
+              :name=>"vm-multus-multiple-net",
+              :namespace=>"default",
+              :resourceVersion=>"24453",
+              :selfLink=>"/apis/kubevirt.io/v1alpha3/namespaces/default/virtualmachines/vm-multus-multiple-net",
+              :uid=>"3e959de9-554b-11e9-a3d6-525500d15501"
+            },
+            :spec=>{
+              :running=>false,
+              :template=>{
+                :metadata=>{
+                  :labels=>{
+                    :"kubevirt.io/vm"=>"vm-multus-multiple-net"
+                  }
+                },
+                :spec=>{
+                  :domain=>{
+                    :devices=>{
+                      :disks=>[
+                        {
+                          :disk=>{:bus=>"virtio"},
+                          :name=>"containerdisk"
+                        },
+                        {
+                          :disk=>{:bus=>"virtio"},
+                          :name=>"cloudinitdisk"
+                        }
+                      ],
+                      :interfaces=>[
+                        {
+                          :bridge=>{},
+                          :name=>"default"
+                        },
+                        {
+                          :bridge=>{},
+                          :name=>"ptp"
+                        }
+                      ]
+                    },
+                    :machine=>{
+                      :type=>""
+                    },
+                    :resources=>{
+                      :requests=>{
+                        :memory=>"1024M"
+                      }
+                    }
+                  },
+                  :networks=>[
+                    {
+                      :name=>"default",
+                      :pod=>{}
+                    },
+                    {
+                      :multus=>{
+                        :networkName=>"ptp-conf"
+                      },
+                      :name=>"ptp"
+                    }
+                  ],
+                  :terminationGracePeriodSeconds=>0,
+                  :volumes=>[
+                    {
+                      :containerDisk=>{:image=>"registry:5000/kubevirt/fedora-cloud-container-disk-demo:devel"},
+                      :name=>"containerdisk"
+                    },
+                    {
+                      :cloudInitNoCloud=>{:userData=>"#!/bin/bash\necho \"fedora\" |passwd fedora --stdin\ndhclient eth1\n"},
+                      :name=>"cloudinitdisk"
+                    }
+                  ]
+                }
+              }
+            }
+          }
         end
       end
     end

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

@@ -12,47 +12,112 @@ module Fog
 
       class Mock
         def get_vminstance(name)
-          vm = { :apiVersion => "kubevirt.io/v1alpha2",
-                 :kind       => "VirtualMachineInstance",
-                 :metadata   => { :clusterName       => "",
-                                  :creationTimestamp => "2018-02-23T10:12:47Z",
-                                  :name              => "demo",
-                                  :namespace         => "default",
-                                  :ownerReferences   => [{ :apiVersion      => "kubevirt.io/v1alpha2",
-                                                           :kind            => "VirtualMachine",
-                                                           :name            => "demo",
-                                                           :uid             => "57e279c1-17ee-11e8-a9f9-525400a7f647"
-                                                         }
-                                                        ],
-                                  :resourceVersion   => "84873",
-                                  :selfLink          => "/apis/kubevirt.io/v1alpha2/namespaces/default/virtualmachineinstances/demo",
-                                  :uid               => "1906421f-1882-11e8-b539-525400a7f647"
-                                },
-                 :spec       => { :domain => { :cpu     => { :cores => "4" },
-                                               :devices => { :disks => [{ :disk       => { :dev => "vda" },
-                                                                          :name       => "containerDisk",
-                                                                          :volumeName => "containervolume"
-                                                                        },
-                                                                        { :disk       => { :dev => "vdb" },
-                                                                          :name       => "cloudinitdisk",
-                                                                          :volumeName => "cloudinitvolume"
-                                                                        }
-                                                                       ]
-                                                           },
-                                               :machine    => { :type => "q35" },
-                                               :resources  => { :requests => { :memory => "512Mi" }}
-                                             },
-                                  :volumes => [ { :name         => "containervolume",
-                                                  :containerDisk => { :image => "kubevirt/fedora-cloud-registry-disk-demo:latest" }
-                                                },
-                                                { :cloudInitNoCloud => { :userDataBase64 => "I2Nsb3VkLWNvbmZpZwpwYXNzd29yZDogYXRvbWljCnNzaF9wd2F1dGg6IFRydWUKY2hwYXNzd2Q6IHsgZXhwaXJlOiBGYWxzZSB9Cg==" },
-                                                  :name             => "cloudinitvolume"
-                                                }
-                                              ]
-                                  }
-               }
-          object = RecursiveOpenStruct.new(vm, recurse_over_arrays: true)
-          Vminstance.parse object_to_hash(object)
+          vm = {
+            :apiVersion=>"kubevirt.io/v1alpha3",
+            :kind=>"VirtualMachineInstance",
+            :metadata=>{
+              :creationTimestamp=>"2019-04-02T13:46:08Z",
+              :finalizers=>["foregroundDeleteVirtualMachine"],
+              :generation=>7,
+              :labels=>{
+                :"kubevirt.io/nodeName"=>"node02",
+                :special=>"vmi-multus-multiple-net"
+              },
+              :name=>"vmi-multus-multiple-net",
+              :namespace=>"default",
+              :resourceVersion=>"27047",
+              :selfLink=>"/apis/kubevirt.io/v1alpha3/namespaces/default/virtualmachineinstances/vmi-multus-multiple-net",
+              :uid=>"ab5e450c-554d-11e9-a3d6-525500d15501"
+            },
+            :spec=>{
+              :domain=>{
+                :devices=>{
+                  :disks=>[
+                    {
+                      :disk=>{:bus=>"virtio"},
+                      :name=>"containerdisk"
+                    },
+                    {
+                      :disk=>{:bus=>"virtio"},
+                      :name=>"cloudinitdisk"
+                    }
+                  ],
+                  :interfaces=>[
+                    {
+                      :bridge=>{},
+                      :name=>"default"
+                    },
+                    {
+                      :bridge=>{},
+                      :name=>"ptp"
+                    }
+                  ]
+                },
+                :features=>{
+                  :acpi=>{:enabled=>true}
+                },
+                :firmware=>{:uuid=>"ff1ff019-c799-400f-9be1-375c3cee8b59"},
+                :machine=>{:type=>"q35"},
+                :resources=>{
+                  :requests=>{
+                    :memory=>"1024M"
+                  }
+                }
+              },
+              :networks=>[
+                {
+                  :name=>"default",
+                  :pod=>{}
+                },
+                {
+                  :multus=>{:networkName=>"ptp-conf"},
+                  :name=>"ptp"
+                }
+              ],
+              :terminationGracePeriodSeconds=>0,
+              :volumes=>[
+                {
+                  :containerDisk=>{:image=>"registry:5000/kubevirt/fedora-cloud-container-disk-demo:devel"},
+                  :name=>"containerdisk"
+                },
+                {
+                  :cloudInitNoCloud=>{:userData=>"#!/bin/bash\necho \"fedora\" |passwd fedora --stdin\ndhclient eth1\n"},
+                  :name=>"cloudinitdisk"
+                }
+              ]
+            },
+            :status=>{
+              :conditions=>[
+                {
+                  :lastProbeTime=>nil,
+                  :lastTransitionTime=>nil,
+                  :status=>"True",
+                  :type=>"LiveMigratable"
+                },
+                {
+                  :lastProbeTime=>nil,
+                  :lastTransitionTime=>"2019-04-02T13:46:24Z",
+                  :status=>"True",
+                  :type=>"Ready"
+                }
+              ],
+              :interfaces=>[
+                {
+                  :ipAddress=>"10.244.1.14",
+                  :mac=>"0e:fc:6c:c3:20:ec",
+                  :name=>"default"
+                },
+                {
+                  :mac=>"4a:90:1c:2e:fe:d7",
+                  :name=>"ptp"
+                }
+              ],
+              :migrationMethod=>"BlockMigration",
+              :nodeName=>"node02",
+              :phase=>"Running"
+            }
+          }
+          Vminstance.parse object_to_hash(vm)
         end
       end
     end

data/lib/fog/kubevirt/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Kubevirt
-    VERSION = '1.1.0'
+    VERSION = '1.1.1'
   end
 end

metadata

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