fog-kubevirt 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 445aff4c53478ed34bda932d25161a63a5c3626a
-  data.tar.gz: e2ad2b37177c59c61f1d57b20c7294f028ccad28
+  metadata.gz: 4e1ad47434b4be227ffa7e32f9435021980784c0
+  data.tar.gz: 78189c5ee24ea2f3a3314c1c32e242a2dc66a764
 SHA512:
-  metadata.gz: 7fb2a57dc4d902e140442981ff5aa1f3acd0e6fda538f615f6be12e890eb9b825ed6879a0b4d96abcf9a313ab418aec0396e10c032fc19ad34a5c12f6221c786
-  data.tar.gz: 32866fcaea0020147cb2688993fb3b3050c9b4eebe97945c0aa6ae2683eec6a419543c80f216d7527bb9b7fa9396e0414aa04c85f8552847e4527eed9193e655
+  metadata.gz: 6d128816adb81bb5e438348537003b6893305cf3df4c9ebac3a611db2ebb974bfbfa360fb6937e0ccaff0292ca68d2f410107fd3d02b440842d61619d2a064d3
+  data.tar.gz: 34b7f11414b8dec2720386485e25e2d0746579566828d5e2cebf85f75d2d27de9b9dce2774122b4674f7e65c9319b4c135ca5ef3affebd7e8ac0ed3a4f15f06d

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

@@ -34,6 +34,7 @@ module Fog
           cpu = domain[:cpu]
           mem = domain.dig(:resources, :requests, :memory)
           disks = parse_disks(domain[:devices][:disks])
+          networks = parse_networks(spec[:networks])
           vm = {
             :namespace        => metadata[:namespace],
             :name             => metadata[:name],
@@ -43,8 +44,8 @@ module Fog
             :disks            => disks,
             :volumes          => parse_volumes(spec[:volumes], disks),
             :status           => object[:spec][:running].to_s == "true" ? "running" : "stopped",
-            :interfaces       => parse_interfaces(domain[:devices][:interfaces], object[:status].nil? ? [] : object[:status][:interfaces]),
-            :networks         => parse_networks(spec[:networks]),
+            :interfaces       => parse_interfaces(domain[:devices][:interfaces], object[:status].nil? ? [] : object[:status][:interfaces], networks),
+            :networks         => networks,
             :machine_type     => domain.dig(:machine, :type)
           }
           vm[:owner_reference] = owner unless owner.nil?

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

@@ -4,8 +4,9 @@ module Fog
       module VmData
 
         class VmNetwork
-          attr_accessor :name,
-                        :type # values: multus, pod, genie
+          attr_accessor :name, # inner name used to map to interface
+                        :type, # values: multus, pod, genie
+                        :network_name # name of network attachment definition
         end
 
         class VmDisk

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

@@ -12,7 +12,7 @@ module Fog
         #
         # @param object [Hash] A hash with raw interfaces data.
         #
-        def parse_interfaces(object, object_status)
+        def parse_interfaces(object, object_status, networks)
           return {} if object.nil?
           nics = []
           object.each do |iface|
@@ -23,6 +23,13 @@ module Fog
             nic.mac_address = !status_iface.nil? && status_iface.key?(:mac) ? status_iface[:mac] : iface[:macAddress]
             nic.type = 'bridge' if iface.keys.include?(:bridge)
             nic.type = 'slirp' if iface.keys.include?(:slirp)
+
+            net = networks.detect { |n| n.name == iface[:name] }
+            if net
+              nic.cni_provider = net.type
+              nic.network = net.network_name
+            end
+
             nics << nic
           end
 
@@ -41,7 +48,10 @@ module Fog
             network = VmData::VmNetwork.new
             network.name = net[:name]
             network.type = 'pod' if net.keys.include?(:pod)
-            network.type = 'multus' if net.keys.include?(:multus)
+            if net.keys.include?(:multus)
+              network.type = 'multus'
+              network.network_name = net[:multus][:networkName]
+            end
             network.type = 'genie' if net.keys.include?(:genie)
             networks << network
           end
@@ -128,7 +138,7 @@ module Fog
             end
 
             volume.config = v[volume.type.to_sym]
-            disk = disks.select { |d| d.name == volume.name }.first
+            disk = disks.detect { |d| d.name == volume.name }
             volume.boot_order = disk.boot_order
             volume.bus = disk.bus if disk.respond_to?(:bus)
 

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

@@ -29,6 +29,7 @@ module Fog
           spec = object[:spec]
           domain = spec[:domain]
           disks = parse_disks(domain[:devices][:disks])
+          networks = parse_networks(spec[:networks])
           {
             :namespace        => metadata[:namespace],
             :name             => metadata[:name],
@@ -40,8 +41,8 @@ module Fog
             :memory           => domain[:resources][:requests][:memory],
             :disks            => disks,
             :volumes          => parse_volumes(spec[:volumes], disks),
-            :interfaces       => parse_interfaces(domain[:devices][:interfaces], status[:interfaces]),
-            :networks         => parse_networks(spec[:networks]),
+            :interfaces       => parse_interfaces(domain[:devices][:interfaces], status[:interfaces], networks),
+            :networks         => networks,
             :ip_address       => status.dig(:interfaces, 0, :ipAddress),
             :node_name        => status[:nodeName],
             :status           => status[:phase]

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

@@ -9,6 +9,8 @@ module Fog
         attribute :model
         attribute :ports
         attribute :boot_order
+        attribute :network
+        attribute :cni_provider
         alias :mac :mac_address
 
         def persisted?

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

@@ -47,13 +47,15 @@ module Fog
           disk
         end
 
-        def vm_nic(mac_address: "")
+        def vm_nic(mac_address: "", network: "ovs-foreman")
           vm_nic = Fog::Kubevirt::Compute::VmNic.new
           vm_nic.mac_address = mac_address
           vm_nic.type = "bridge"
+          vm_nic.network = network
           vm_nic.model = nil
           vm_nic.ports = nil
           vm_nic.boot_order = nil
+          vm_nic
         end
 
         def get_server(name)
@@ -69,6 +71,7 @@ module Fog
             vm_network = Fog::Kubevirt::Compute::VmData::VmNetwork.new
             vm_network.name="ovs-foreman"
             vm_network.type="multus"
+            vm_network.network_name="ovs-foreman"
 
             interfaces = name != 'no_interfaces' ? [vm_nic(mac_address: "a2:b4:a2:b6:a2:a8")] : nil
 

data/lib/fog/kubevirt/version.rb

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

data/spec/create_vm_spec.rb

@@ -58,7 +58,7 @@ describe Fog::Compute do
         assert_equal(volumes.count, 3)
 
         # verify first claim values
-        volume = volumes.select { |v| v.name == 'test-disk-01' }.first
+        volume = volumes.detect { |v| v.name == 'test-disk-01' }
         refute_nil(volume)
         refute_nil(volume.pvc)
         assert_equal(volume.name, 'test-disk-01')
@@ -66,7 +66,7 @@ describe Fog::Compute do
         assert_equal(volume.type, 'persistentVolumeClaim')
 
         # verify second claim values
-        volume = volumes.select { |v| v.name == 'test-disk-02' }.first
+        volume = volumes.detect { |v| v.name == 'test-disk-02' }
         refute_nil(volume)
         refute_nil(volume.pvc)
         assert_equal(volume.pvc.name, pvc2)
@@ -74,7 +74,7 @@ describe Fog::Compute do
         assert_equal(volume.type, 'persistentVolumeClaim')
 
         # verify third claim values
-        volume = volumes.select { |v| v.name == 'test-disk-03' }.first
+        volume = volumes.detect { |v| v.name == 'test-disk-03' }
         refute_nil(volume)
         assert_equal(volume.name, 'test-disk-03')
         assert_equal(volume.type, 'hostDisk')

data/spec/pvcs_v1alpha2_spec.rb

@@ -49,7 +49,7 @@ require 'spec_helper'
 
           # test all volumes based on PVCs
           volumes = @service.volumes.all
-          volume = volumes.select { |v| v.name == name }.first
+          volume = volumes.detect { |v| v.name == name }
           refute_nil(volume)
           assert_equal(volume.name, 'my-local-storage-pvc')
           assert_equal(volume.type, 'persistentVolumeClaim')
@@ -90,7 +90,7 @@ require 'spec_helper'
 
           # test all volumes based on PVCs
           volumes = @service.volumes.all
-          volume = volumes.select { |v| v.name == name }.first
+          volume = volumes.detect { |v| v.name == name }
           refute_nil(volume)
           assert_equal(volume.name, 'my-local-storage-pvc')
           assert_equal(volume.type, 'persistentVolumeClaim')

data/spec/vm_parse_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe Fog::Kubevirt::Compute do
+  it 'parses vm' do
+    Fog.mock!
+    mock = Fog::Kubevirt::Compute.new
+    vm = mock.get_vm('test')
+
+    assert_nil(vm[:interfaces][0].mac_address)
+    assert_nil(vm[:interfaces][1].mac_address)
+    Fog.unmock!
+  end
+
+  it 'parses vmi' do
+    Fog.mock!
+    mock = Fog::Kubevirt::Compute.new
+    vm = mock.get_vminstance('test')
+
+    assert_equal(vm[:interfaces][0].mac_address, '0e:fc:6c:c3:20:ec')
+    assert_equal(vm[:interfaces][1].mac_address, '4a:90:1c:2e:fe:d7')
+    Fog.unmock!
+  end
+
+  it 'parses not ready server' do
+    Fog.mock!
+    mock = Fog::Kubevirt::Compute.new
+    server = mock.get_server('no_interfaces')
+
+    assert_nil(server[:interfaces])
+    Fog.unmock!
+  end
+
+  it 'parses vm interface of pod network' do
+    Fog.mock!
+    mock = Fog::Kubevirt::Compute.new
+    vm = mock.get_vm('robin-rykert.example.com')
+
+    assert_nil(vm[:interfaces][0].network)
+    assert_equal(vm[:interfaces][0].cni_provider, "pod")
+
+    assert_equal(vm[:interfaces][1].network, "ptp-conf")
+    assert_equal(vm[:interfaces][1].cni_provider, "multus")
+    Fog.unmock!
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-kubevirt
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Piotr Kliczewski
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-12 00:00:00.000000000 Z
+date: 2019-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -226,7 +226,7 @@ files:
 - spec/shared_context.rb
 - spec/spec_helper.rb
 - spec/storage_classes_v1_spec.rb
-- spec/vm_parse.rb
+- spec/vm_parse_spec.rb
 homepage: https://github.com/pkliczewski/fog-kubevirt
 licenses:
 - Apache-2.0
@@ -268,4 +268,4 @@ test_files:
 - spec/shared_context.rb
 - spec/spec_helper.rb
 - spec/storage_classes_v1_spec.rb
-- spec/vm_parse.rb
+- spec/vm_parse_spec.rb

data/spec/vm_parse.rb

@@ -1,24 +0,0 @@
-describe Fog::Kubevirt::Compute do
-  it 'parses vm' do
-    mock = Fog::Kubevirt::Compute::Mock.new
-    vm = mock.get_vm('test')
-
-    assert_nil(vm[:interfaces][0].mac_address)
-    assert_nil(vm[:interfaces][1].mac_address)
-  end
-
-  it 'parses vmi' do
-    mock = Fog::Kubevirt::Compute::Mock.new
-    vm = mock.get_vminstance('test')
-
-    assert_equal(vm[:interfaces][0].mac_address, '0e:fc:6c:c3:20:ec')
-    assert_equal(vm[:interfaces][1].mac_address, '4a:90:1c:2e:fe:d7')
-  end
-
-  it 'parses not ready server' do
-    mock = Fog::Kubevirt::Compute::Mock.new
-    server = mock.get_server('no_interfaces')
-
-    assert_nil(server[:interfaces])
-  end
-end