fog-proxmox 0.5.5 → 0.6.0

data/spec/network_spec.rb

@@ -44,7 +44,7 @@ describe Fog::Network::Proxmox do
       # Create 1st time
       node.networks.create(net_hash)
       # Find by id
-      network = node.networks.find_by_id net_hash[:iface]
+      network = node.networks.get net_hash[:iface]
       network.wont_be_nil
       # Create 2nd time
       proc do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-proxmox
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - Tristan Robert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-02 00:00:00.000000000 Z
+date: 2019-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: debase
   requirement: !ruby/object:Gem::Requirement
@@ -319,9 +319,6 @@ files:
 - fog-proxmox.gemspec
 - fogproxmox.png
 - lib/fog/compute/proxmox.rb
-- lib/fog/compute/proxmox/models/container.rb
-- lib/fog/compute/proxmox/models/container_config.rb
-- lib/fog/compute/proxmox/models/containers.rb
 - lib/fog/compute/proxmox/models/disk.rb
 - lib/fog/compute/proxmox/models/disks.rb
 - lib/fog/compute/proxmox/models/interface.rb
@@ -340,7 +337,6 @@ files:
 - lib/fog/compute/proxmox/models/volume.rb
 - lib/fog/compute/proxmox/models/volumes.rb
 - lib/fog/compute/proxmox/requests/action_server.rb
-- lib/fog/compute/proxmox/requests/check_vmid.rb
 - lib/fog/compute/proxmox/requests/clone_server.rb
 - lib/fog/compute/proxmox/requests/create_backup.rb
 - lib/fog/compute/proxmox/requests/create_server.rb
@@ -351,12 +347,10 @@ files:
 - lib/fog/compute/proxmox/requests/delete_server.rb
 - lib/fog/compute/proxmox/requests/delete_snapshot.rb
 - lib/fog/compute/proxmox/requests/delete_volume.rb
-- lib/fog/compute/proxmox/requests/get_node.rb
 - lib/fog/compute/proxmox/requests/get_node_statistics.rb
 - lib/fog/compute/proxmox/requests/get_server_config.rb
 - lib/fog/compute/proxmox/requests/get_server_status.rb
-- lib/fog/compute/proxmox/requests/get_snapshot.rb
-- lib/fog/compute/proxmox/requests/get_storage.rb
+- lib/fog/compute/proxmox/requests/get_snapshot_config.rb
 - lib/fog/compute/proxmox/requests/get_task.rb
 - lib/fog/compute/proxmox/requests/get_vnc.rb
 - lib/fog/compute/proxmox/requests/get_volume.rb
@@ -380,26 +374,20 @@ files:
 - lib/fog/compute/proxmox/requests/update_server.rb
 - lib/fog/compute/proxmox/requests/update_snapshot.rb
 - lib/fog/identity/proxmox.rb
-- lib/fog/identity/proxmox/models/activedirectory.rb
 - lib/fog/identity/proxmox/models/domain.rb
+- lib/fog/identity/proxmox/models/domain_type.rb
 - lib/fog/identity/proxmox/models/domains.rb
 - lib/fog/identity/proxmox/models/group.rb
 - lib/fog/identity/proxmox/models/groups.rb
-- lib/fog/identity/proxmox/models/ldap.rb
-- lib/fog/identity/proxmox/models/oath.rb
-- lib/fog/identity/proxmox/models/pam.rb
 - lib/fog/identity/proxmox/models/permission.rb
 - lib/fog/identity/proxmox/models/permissions.rb
 - lib/fog/identity/proxmox/models/pool.rb
 - lib/fog/identity/proxmox/models/pools.rb
 - lib/fog/identity/proxmox/models/principal.rb
-- lib/fog/identity/proxmox/models/pve.rb
 - lib/fog/identity/proxmox/models/role.rb
 - lib/fog/identity/proxmox/models/roles.rb
 - lib/fog/identity/proxmox/models/user.rb
 - lib/fog/identity/proxmox/models/users.rb
-- lib/fog/identity/proxmox/models/yubico.rb
-- lib/fog/identity/proxmox/requests/add_permission.rb
 - lib/fog/identity/proxmox/requests/change_password.rb
 - lib/fog/identity/proxmox/requests/check_permissions.rb
 - lib/fog/identity/proxmox/requests/create_domain.rb
@@ -424,9 +412,9 @@ files:
 - lib/fog/identity/proxmox/requests/list_roles.rb
 - lib/fog/identity/proxmox/requests/list_users.rb
 - lib/fog/identity/proxmox/requests/read_version.rb
-- lib/fog/identity/proxmox/requests/remove_permission.rb
 - lib/fog/identity/proxmox/requests/update_domain.rb
 - lib/fog/identity/proxmox/requests/update_group.rb
+- lib/fog/identity/proxmox/requests/update_permissions.rb
 - lib/fog/identity/proxmox/requests/update_pool.rb
 - lib/fog/identity/proxmox/requests/update_role.rb
 - lib/fog/identity/proxmox/requests/update_user.rb
@@ -444,6 +432,7 @@ files:
 - lib/fog/network/proxmox/requests/power_node.rb
 - lib/fog/network/proxmox/requests/update_network.rb
 - lib/fog/proxmox.rb
+- lib/fog/proxmox/attributes.rb
 - lib/fog/proxmox/core.rb
 - lib/fog/proxmox/errors.rb
 - lib/fog/proxmox/hash.rb
@@ -452,8 +441,6 @@ files:
 - lib/fog/proxmox/helpers/disk_helper.rb
 - lib/fog/proxmox/helpers/nic_helper.rb
 - lib/fog/proxmox/json.rb
-- lib/fog/proxmox/models/collection.rb
-- lib/fog/proxmox/models/model.rb
 - lib/fog/proxmox/variables.rb
 - lib/fog/proxmox/version.rb
 - lib/fog/storage/proxmox.rb
@@ -503,8 +490,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Module for the 'Fog' gem to support Proxmox VE

data/lib/fog/compute/proxmox/models/container.rb

@@ -1,86 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright 2018 Tristan Robert
-
-# This file is part of Fog::Proxmox.
-
-# Fog::Proxmox 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.
-
-# Fog::Proxmox 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 Fog::Proxmox. If not, see <http://www.gnu.org/licenses/>.
-
-require 'fog/compute/proxmox/models/server'
-require 'fog/compute/proxmox/models/container_config'
-
-module Fog
-  module Compute
-    class Proxmox
-      # Container model
-      class Container < Fog::Compute::Proxmox::Server
-        identity  :vmid
-        attribute :lock
-        attribute :maxswap
-        attribute :swap
-        attribute :config
-
-        def restore(backup, options = {})
-          requires :node, :vmid
-          path_params = { node: node, type: type }
-          body_params = options.merge(vmid: vmid, ostemplate: backup.volid, force: 1, restore: 1)
-          task_upid = service.create_server(path_params, body_params)
-          tasks.wait_for(task_upid)
-        end
-
-        def move(volume, storage, options = {})
-          requires :vmid, :node
-          path_params = { node: node, vmid: vmid }
-          body_params = options.merge(volume: volume, storage: storage)
-          task_upid = service.move_volume(path_params, body_params)
-          tasks.wait_for(task_upid)
-        end
-
-        def update(config = {})
-          requires :node, :vmid
-          path_params = { node: node, type: type, vmid: vmid }
-          body_params = config
-          service.update_server(path_params, body_params)
-        end
-
-        def set_config(attributes = {})
-          @config = Fog::Compute::Proxmox::ContainerConfig.new({ service: service, vmid: vmid }.merge(attributes))
-        end
-
-        def config
-          path_params = { node: node, type: type, vmid: vmid }
-          set_config(service.get_server_config(path_params)) if uptime
-          @config
-        end
-
-        def detach(mpid)
-          update(delete: mpid)
-        end
-
-        def extend(disk, size, options = {})
-          requires :vmid, :node
-          path_params = { node: node, vmid: vmid }
-          body_params = options.merge(disk: disk, size: size)
-          task_upid = service.resize_container(path_params, body_params)
-          tasks.wait_for(task_upid)
-        end
-
-        def action(action, options = {})
-          raise Fog::Errors::Error, "Action #{action} not implemented" unless %w[start stop shutdown].include? action
-          super
-        end
-      end
-    end
-  end
-end

data/lib/fog/compute/proxmox/models/container_config.rb

@@ -1,114 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright 2018 Tristan Robert
-
-# This file is part of Fog::Proxmox.
-
-# Fog::Proxmox 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.
-
-# Fog::Proxmox 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 Fog::Proxmox. If not, see <http://www.gnu.org/licenses/>.
-
-require 'fog/proxmox/variables'
-require 'fog/proxmox/helpers/nic_helper'
-require 'fog/proxmox/helpers/controller_helper'
-
-module Fog
-  module Compute
-    class Proxmox
-      # ContainerConfig model
-      class ContainerConfig < Fog::Proxmox::Model
-        identity  :vmid
-        attribute :digest
-        attribute :ostype
-        attribute :storage
-        attribute :template
-        attribute :arch
-        attribute :memory
-        attribute :swap
-        attribute :hostname
-        attribute :nameserver
-        attribute :searchdomain
-        attribute :password
-        attribute :onboot
-        attribute :startup
-        attribute :rootfs
-        attribute :cores
-        attribute :cpuunits
-        attribute :cpulimit
-        attribute :description
-        attribute :console
-        attribute :cmode
-        attribute :tty
-        attribute :force
-        attribute :lock
-        attribute :pool
-        attribute :bwlimit
-        attribute :unprivileged
-        attribute :interfaces
-        attribute :mount_points
-
-        def initialize(attributes = {})
-          prepare_service_value(attributes)
-          compute_nets(attributes)
-          compute_mps(attributes)
-          super(attributes)
-        end
-
-        attr_reader :interfaces
-
-        attr_reader :mount_points
-
-        def mac_addresses
-          Fog::Proxmox::NicHelper.to_mac_adresses_array(interfaces)
-        end
-
-        def type_console
-          'vnc' # by default. term is available too
-        end
-
-        private
-
-        def compute_nets(attributes)
-          nets = Fog::Proxmox::NicHelper.collect_nics(attributes)
-          @interfaces ||= Fog::Compute::Proxmox::Interfaces.new
-          nets.each do |key, value|
-            nic_hash = {
-              id: key.to_s,
-              name: Fog::Proxmox::NicHelper.extract_name(value),
-              mac: Fog::Proxmox::NicHelper.extract_mac_address(value)
-            }
-            names = Fog::Compute::Proxmox::Interface.attributes.reject { |key, _value| %i[id mac name].include? key }
-            names.each { |name| nic_hash.store(name.to_sym, Fog::Proxmox::ControllerHelper.extract(name, value)) }
-            @interfaces << Fog::Compute::Proxmox::Interface.new(nic_hash)
-          end
-        end
-
-        def compute_mps(attributes)
-          controllers = Fog::Proxmox::ControllerHelper.collect_controllers(attributes)
-          @mount_points ||= Fog::Compute::Proxmox::Disks.new
-          controllers.each do |key, value|
-            storage, volid, size = Fog::Proxmox::DiskHelper.extract_storage_volid_size(value)
-            disk_hash = {
-              id: key.to_s,
-              storage: storage,
-              volid: volid,
-              size: size
-            }
-            names = Fog::Compute::Proxmox::Disk.attributes.reject { |key, _value| %i[id size storage volid].include? key }
-            names.each { |name| disk_hash.store(name.to_sym, Fog::Proxmox::ControllerHelper.extract(name, value)) }
-            @mount_points << Fog::Compute::Proxmox::Disk.new(disk_hash)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/fog/compute/proxmox/models/containers.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright 2018 Tristan Robert
-
-# This file is part of Fog::Proxmox.
-
-# Fog::Proxmox 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.
-
-# Fog::Proxmox 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 Fog::Proxmox. If not, see <http://www.gnu.org/licenses/>.
-
-require 'fog/compute/proxmox/models/server'
-
-module Fog
-  module Compute
-    class Proxmox
-      # Containers Collection
-      class Containers < Fog::Compute::Proxmox::Servers
-        model Fog::Compute::Proxmox::Container
-
-        def initialize(attributes = {})
-          super(attributes)
-        end
-
-        def type
-          'lxc'
-        end
-
-        def new(attributes = {})
-          super({ node: node, type: type }.merge(attributes))
-        end
-      end
-    end
-  end
-end

data/lib/fog/compute/proxmox/requests/get_node.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-# Copyright 2018 Tristan Robert
-
-# This file is part of Fog::Proxmox.
-
-# Fog::Proxmox 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.
-
-# Fog::Proxmox 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 Fog::Proxmox. If not, see <http://www.gnu.org/licenses/>.
-
-# frozen_string_literal: true
-
-require 'fog/proxmox/json'
-
-module Fog
-  module Compute
-    class Proxmox
-      # class Real get_node request
-      class Real
-        def get_node(node)
-          response = request(
-            expects: [200],
-            method: 'GET',
-            path: "nodes/#{node}/status"
-          )
-          Fog::Proxmox::Json.get_data(response)
-        end
-      end
-
-      # class Mock get_node request
-      class Mock
-        def get_node; end
-      end
-    end
-  end
-end

data/lib/fog/compute/proxmox/requests/get_storage.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright 2018 Tristan Robert
-
-# This file is part of Fog::Proxmox.
-
-# Fog::Proxmox 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.
-
-# Fog::Proxmox 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 Fog::Proxmox. If not, see <http://www.gnu.org/licenses/>.
-
-require 'fog/proxmox/json'
-
-module Fog
-  module Compute
-    class Proxmox
-      # class Real get_storage request
-      class Real
-        def get_storage(node, storage, options)
-          response = request(
-            expects: [200],
-            method: 'GET',
-            path: "nodes/#{node}/storage/#{storage}/status",
-            query: URI.encode_www_form(options)
-          )
-          Fog::Proxmox::Json.get_data(response)
-        end
-      end
-
-      # class Mock get_storage request
-      class Mock
-        def get_storage; end
-      end
-    end
-  end
-end