foreman_fog_proxmox 0.5.6 → 0.6.0

data/test/unit/foreman_fog_proxmox/proxmox_test_helpers.rb

@@ -27,6 +27,13 @@ module ForemanFogProxmox
       cr
     end
 
+    def mock_node_containers(cr, containers) 
+      node = mock('node')
+      node.stubs(:containers).returns(containers)
+      cr.stubs(:node).returns(node)
+      cr
+    end
+
     def mock_node_servers_containers(cr, servers, containers) 
       node = mock('node')
       node.stubs(:containers).returns(containers)
@@ -106,11 +113,14 @@ module ForemanFogProxmox
       config.stubs(:interfaces).returns(interfaces)
       vm = mock('vm')
       vm.stubs(:config).returns(config)
+      vm.stubs(:type).returns('qemu')
+      service = mock('service')
       vm_attributes = {
         vmid: 100,
         id: 'qemu/100',
-        node: 'pve',
+        node_id: 'pve',
         config: config,
+        service: service,
         name: 'test',
         type: 'qemu',
         maxdisk: 0,
@@ -206,17 +216,21 @@ module ForemanFogProxmox
         bwlimit: nil,
         unprivileged: nil,
         interfaces: interfaces,
-        mount_points: volumes
+        disks: volumes
       }
       config.stubs(:attributes).returns(config_attributes)
-      config.stubs(:mount_points).returns(volumes)
+      config.stubs(:attributes).returns(config_attributes)
+      config.stubs(:disks).returns(volumes)
       config.stubs(:interfaces).returns(interfaces)
       vm = mock('vm')
       vm.stubs(:config).returns(config)
+      vm.stubs(:type).returns('lxc')
+      service = mock('service')
       vm_attributes = {
         vmid: 100,
         id: 'lxc/100',
-        node: 'pve',
+        node_id: 'pve',
+        service: service,
         config: config,
         name: 'test',
         type: 'lxc',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_fog_proxmox
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.0
 platform: ruby
 authors:
 - Tristan Robert
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-12 00:00:00.000000000 Z
+date: 2019-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-proxmox
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
@@ -105,9 +105,8 @@ files:
 - app/helpers/proxmox_form_helper.rb
 - app/helpers/proxmox_server_helper.rb
 - app/helpers/proxmox_vm_helper.rb
-- app/models/concerns/fog_extensions/proxmox/container.rb
-- app/models/concerns/fog_extensions/proxmox/container_config.rb
 - app/models/concerns/fog_extensions/proxmox/disk.rb
+- app/models/concerns/fog_extensions/proxmox/node.rb
 - app/models/concerns/fog_extensions/proxmox/server.rb
 - app/models/concerns/fog_extensions/proxmox/server_config.rb
 - app/models/concerns/fog_extensions/proxmox/volume.rb
@@ -185,16 +184,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Foreman plugin that adds Proxmox VE compute resource using fog-proxmox
 test_files:
+- test/functional/compute_resources_controller_test.rb
 - test/factories/proxmox_factory.rb
 - test/test_plugin_helper.rb
-- test/unit/foreman_fog_proxmox/proxmox_test_helpers.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_container_helper_test.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_vm_helper_test.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_server_helper_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_test.rb
-- test/functional/compute_resources_controller_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_test_helpers.rb

data/app/models/concerns/fog_extensions/proxmox/container.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright 2018 Tristan Robert
-
-# This file is part of ForemanFogProxmox.
-
-# ForemanFogProxmox is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# ForemanFogProxmox is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
-
-module FogExtensions
-    module Proxmox
-        module Container
-            extend ActiveSupport::Concern
-            attr_accessor :ostemplate_storage, :ostemplate_file, :password
-            def to_s
-                name
-            end
-            def persisted?
-                !!identity && !!uptime
-            end
-            def identity
-                "#{type}_#{vmid}"
-            end
-            def volumes
-                config.mount_points
-            end
-            def mount_points
-                config.mount_points.collect { |mp| mp.id+': '+mp.volid }
-            end
-            def memory
-                maxmem.to_i
-            end
-            def interfaces
-                config.interfaces
-            end
-            def vm_description
-                "Name=#{name}, vmid=#{vmid}"
-            end
-            def interfaces_attributes=(attrs); end
-            def volumes_attributes=(attrs); end
-            def config_attributes=(attrs); end
-            def templated?
-                volumes.any? { |volume| volume.templated? }
-            end
-        end
-    end
-end