fog-proxmox 0.5.5 → 0.6.0

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

@@ -17,8 +17,6 @@
 # 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
@@ -28,12 +26,11 @@ module Fog
           node = path_params[:node]
           type = path_params[:type]
           vmid = path_params[:vmid]
-          response = request(
+          request(
             expects: [200],
             method: 'GET',
             path: "nodes/#{node}/#{type}/#{vmid}/status/current"
           )
-          Fog::Proxmox::Json.get_data(response)
         end
       end
 

data/lib/fog/compute/proxmox/requests/{get_snapshot.rb → get_snapshot_config.rb}

@@ -17,30 +17,27 @@
 # 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_snapshot request
+      # class Real get_snapshot_config request
       class Real
-        def get_snapshot(path_params)
+        def get_snapshot_config(path_params)
           node = path_params[:node]
           type = path_params[:type]
           vmid = path_params[:vmid]
           snapname = path_params[:snapname]
-          response = request(
+          request(
             expects: [200],
             method: 'GET',
             path: "nodes/#{node}/#{type}/#{vmid}/snapshot/#{snapname}/config"
           )
-          Fog::Proxmox::Json.get_data(response)
         end
       end
 
-      # class Mock get_snapshot request
+      # class Mock get_snapshot_config request
       class Mock
-        def get_snapshot; end
+        def get_snapshot_config; end
       end
     end
   end

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

@@ -18,20 +18,17 @@
 
 # frozen_string_literal: true
 
-require 'fog/proxmox/json'
-
 module Fog
   module Compute
     class Proxmox
       # class Real get_task collection
       class Real
         def get_task(node, upid)
-          response = request(
+          request(
             expects: [200],
             method: 'GET',
             path: "nodes/#{node}/tasks/#{upid}"
           )
-          Fog::Proxmox::Json.get_data(response)
         end
       end
 

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

@@ -17,8 +17,6 @@
 # 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
@@ -28,13 +26,12 @@ module Fog
           node = path_params[:node]
           type = path_params[:type]
           vmid = path_params[:vmid]
-          response = request(
+          request(
             expects: [101, 200],
             method: 'GET',
             path: "nodes/#{node}/#{type}/#{vmid}/vncwebsocket",
             query: URI.encode_www_form(query_params)
           )
-          Fog::Proxmox::Json.get_data(response)
         end
       end
 

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

@@ -27,8 +27,7 @@ module Fog
           request(
             expects: [200],
             method: 'GET',
-            path: 'cluster/resources',
-            query: 'type=node'
+            path: 'nodes'
           )
         end
       end

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

@@ -18,12 +18,14 @@
 
 # frozen_string_literal: true
 
+require 'fog/proxmox/json'
+
 module Fog
   module Compute
     class Proxmox
       # class Real list_storages request
       class Real
-        def list_storages(node, options)
+        def list_storages(node, options = {})
           request(
             expects: [200],
             method: 'GET',

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

@@ -18,21 +18,18 @@
 
 # frozen_string_literal: true
 
-require 'fog/proxmox/json'
-
 module Fog
   module Compute
     class Proxmox
       # class Real log_task
       class Real
         def log_task(node, upid, options)
-          response = request(
+          request(
             expects: [200],
             method: 'GET',
             path: "nodes/#{node}/tasks/#{upid}/log",
             query: URI.encode_www_form(options)
           )
-          Fog::Proxmox::Json.get_data(response)
         end
       end
 

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

@@ -17,8 +17,6 @@
 # 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
@@ -27,13 +25,12 @@ module Fog
         def move_disk(path_params, body_params)
           node = path_params[:node]
           vmid = path_params[:vmid]
-          response = request(
+          request(
             expects: [200],
             method: 'POST',
             path: "nodes/#{node}/qemu/#{vmid}/move_disk",
             body: URI.encode_www_form(body_params)
           )
-          Fog::Proxmox::Json.get_data(response)
         end
       end
 

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

@@ -17,8 +17,6 @@
 # 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
@@ -27,13 +25,12 @@ module Fog
         def move_volume(path_params, body_params)
           node = path_params[:node]
           vmid = path_params[:vmid]
-          response = request(
+          request(
             expects: [200],
             method: 'POST',
             path: "nodes/#{node}/lxc/#{vmid}/move_volume",
             body: URI.encode_www_form(body_params)
           )
-          Fog::Proxmox::Json.get_data(response)
         end
       end
 

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 # Copyright 2018 Tristan Robert
 
 # This file is part of Fog::Proxmox.
@@ -17,16 +16,19 @@
 # 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
+
 module Fog
   module Compute
     class Proxmox
       # class Real next_vmid collection
       class Real
-        def next_vmid
+        def next_vmid(options = {})
           request(
             expects: [200],
             method: 'GET',
-            path: 'cluster/nextid'
+            path: 'cluster/nextid',
+            query: URI.encode_www_form(options)
           )
         end
       end

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

@@ -17,8 +17,6 @@
 # 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
@@ -27,13 +25,12 @@ module Fog
         def resize_container(path_params, body_params)
           node = path_params[:node]
           vmid = path_params[:vmid]
-          response = request(
+          request(
             expects: [200],
             method: 'PUT',
             path: "nodes/#{node}/lxc/#{vmid}/resize",
             body: URI.encode_www_form(body_params)
           )
-          Fog::Proxmox::Json.get_data(response)
         end
       end
 

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

@@ -18,20 +18,17 @@
 
 # frozen_string_literal: true
 
-require 'fog/proxmox/json'
-
 module Fog
   module Compute
     class Proxmox
       # class Real status_task
       class Real
         def status_task(node, upid)
-          response = request(
+          request(
             expects: [200],
             method: 'GET',
             path: "nodes/#{node}/tasks/#{upid}/status"
           )
-          Fog::Proxmox::Json.get_data(response)
         end
       end
 

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

@@ -17,8 +17,6 @@
 # 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
@@ -28,13 +26,12 @@ module Fog
           node = path_params[:node]
           type = path_params[:type]
           vmid = path_params[:vmid]
-          response = request(
+          request(
             expects: [200],
             method: type == 'qemu' ? 'POST' : 'PUT',
             path: "nodes/#{node}/#{type}/#{vmid}/config",
             body: URI.encode_www_form(body_params)
           )
-          Fog::Proxmox::Json.get_data(response)
         end
       end
 

data/lib/fog/identity/proxmox.rb

@@ -38,12 +38,7 @@ module Fog
       model :role
       collection :roles
       model :domain
-      model :pam
-      model :pve
-      model :ldap
-      model :activedirectory
-      model :oath
-      model :yubico
+      model :domain_type
       collection :domains
       model :permission
       collection :permissions
@@ -53,8 +48,7 @@ module Fog
       # Manage permissions
       request :check_permissions
       request :list_permissions
-      request :add_permission
-      request :remove_permission
+      request :update_permissions
       request :read_version
 
       # Manage users

data/lib/fog/identity/proxmox/models/domain.rb

@@ -1,13 +1,3 @@
-# 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.
 # Copyright 2018 Tristan Robert
 
 # This file is part of Fog::Proxmox.
@@ -25,22 +15,24 @@
 # 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/models/model'
-
 module Fog
   module Identity
     class Proxmox
       # class Domain model authentication
-      class Domain < Fog::Proxmox::Model
+      class Domain < Fog::Model
         identity :realm
+        attribute :comment
+        attribute :tfa
         attribute :type
-        def to_s
-          realm
+
+        def initialize(new_attributes = {})
+          initialize_type(new_attributes)
+          super(new_attributes)
         end
 
-        def create(new_attributes = {})
-          attr = type.attributes.merge(new_attributes).merge(realm: realm)
-          service.create_domain(attr)
+        def save(new_attributes = {})
+          service.create_domain(type.attributes.merge(new_attributes).merge(attributes.reject { |attribute| [:type].include? attribute }))
+          reload
         end
 
         def destroy
@@ -51,9 +43,21 @@ module Fog
 
         def update
           requires :realm
-          attr = type.attributes
-          attr.delete_if { |key, _value| key == :type }
-          service.update_domain(realm, attr)
+          service.update_domain(realm, type.attributes.merge(attributes).reject { |attribute| [:type, :realm].include? attribute })
+          reload
+        end
+
+        private
+
+        def initialize_type(new_attributes = {})
+          if new_attributes.has_key? :realm
+            realm = new_attributes.delete(:realm)
+          elsif new_attributes.has_key? 'realm'              
+            realm = new_attributes.delete('realm')
+          end
+          attributes[:type] = Fog::Identity::Proxmox::DomainType.new(new_attributes)
+          new_attributes.delete_if { |new_attribute| attributes[:type].attributes.has_key? new_attribute.to_sym }
+          new_attributes.store(:realm, realm)
         end
       end
     end

data/lib/fog/identity/proxmox/models/{ldap.rb → domain_type.rb}

@@ -1,13 +1,3 @@
-# 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.
 # Copyright 2018 Tristan Robert
 
 # This file is part of Fog::Proxmox.
@@ -25,14 +15,15 @@
 # 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/models/model'
-
 module Fog
   module Identity
     class Proxmox
-      # class LDAP authentication
-      class Ldap < Fog::Proxmox::Model
+      # class Domain type model authentication
+      class DomainType < Fog::Model
         identity :type
+        attribute :id
+        attribute :key
+        attribute :url
         attribute :base_dn
         attribute :bind_dn
         attribute :capath
@@ -40,6 +31,7 @@ module Fog
         attribute :certkey
         attribute :comment
         attribute :default
+        attribute :domain
         attribute :port
         attribute :secure
         attribute :server1
@@ -47,10 +39,9 @@ module Fog
         attribute :tfa
         attribute :user_attr
         attribute :verify
-        def initialize(attributes)
-          self.type = 'ldap'
-          super
-        end
+        attribute :step
+        attribute :digits
+
       end
     end
   end