fog-proxmox 0.5.5 → 0.6.0

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

@@ -17,35 +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/models/collection'
 require 'fog/compute/proxmox/models/task'
 
 module Fog
   module Compute
     class Proxmox
       # class Tasks Collection of node
-      class Tasks < Fog::Proxmox::Collection
+      class Tasks < Fog::Collection
         model Fog::Compute::Proxmox::Task
-        attribute :node
+        attribute :node_id
 
-        def new(attributes = {})
-          requires :node
-          super({ node: node }.merge(attributes))
+        def new(new_attributes = {})
+          super({ node_id: node_id }.merge(new_attributes))
         end
 
-        def search(options = {})
-          requires :node
-          load_response(service.list_tasks(node.node, options), 'tasks')
-        end
-
-        def all
-          search
+        def all(filters = {})
+          load service.list_tasks(node_id, filters)
         end
 
         def log(id)
-          requires :node
           log = ''
-          log_array = service.log_task(node.node, id, {})
+          log_array = service.log_task(node_id, id, {})
           log_array.each do |line_hash|
             log += line_hash['t'].to_s + "\n"
           end
@@ -53,10 +45,9 @@ module Fog
         end
 
         def get(id)
-          requires :node
-          status_details = service.status_task(node.node, id)
+          status_details = service.status_task(node_id, id)
           task_hash = status_details.merge(log: log(id))
-          task_data = task_hash.merge(node: node, upid: id)
+          task_data = task_hash.merge(node_id: node_id, upid: id)
           new(task_data)
         end
 

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

@@ -26,34 +26,34 @@
 
 # frozen_string_literal: true
 
-require 'fog/proxmox/models/model'
-
 module Fog
   module Compute
     class Proxmox
       # class Volume model
-      class Volume < Fog::Proxmox::Model
+      class Volume < Fog::Model
         identity  :volid
         attribute :content
         attribute :size
         attribute :format
-        attribute :node
-        attribute :storage
+        attribute :node_id
+        attribute :storage_id
         attribute :vmid
 
-        def new(attributes = {})
-          requires :node, :storage
-          super({ node: node, storage: storage }.merge(attributes))
+        def initialize(new_attributes = {})
+          prepare_service_value(new_attributes)
+          attributes[:node_id] = new_attributes[:node_id] unless new_attributes[:node_id].nil?
+          attributes[:storage_id] = new_attributes[:storage_id] unless new_attributes[:storage_id].nil?
+          attributes[:volid] = new_attributes['volid'] unless new_attributes['volid'].nil?
+          requires :node_id, :storage_id, :volid
+          super(new_attributes)
         end
 
         def destroy
-          requires :node, :volid, :storage
-          service.delete_volume(node, storage, volid)
+          service.delete_volume(node_id, storage_id, volid)
         end
 
         def restore(vmid, options = {})
-          requires :node, :volid, :storage
-          service.create_server(node, options.merge(archive: volid, storage: storage, vmid: vmid))
+          service.create_server(node_id, options.merge(archive: volid, storage: storage_id, vmid: vmid))
         end
       end
     end

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

@@ -17,44 +17,35 @@
 # 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/collection'
 require 'fog/compute/proxmox/models/volume'
 
 module Fog
   module Compute
     class Proxmox
       # class Volumes Collection of volumes
-      class Volumes < Fog::Proxmox::Collection
+      class Volumes < Fog::Collection
         model Fog::Compute::Proxmox::Volume
-        attribute :node
-        attribute :storage
+        attribute :node_id
+        attribute :storage_id
 
-        def new(attributes = {})
-          requires :node, :storage
-          super({ node: node, storage: storage }.merge(attributes))
+        def new(new_attributes = {})
+          super({ node_id: node_id, storage_id: storage_id }.merge(new_attributes))
         end
 
-        def all
-          search
-        end
-
-        def search(options = {})
-          requires :node, :storage
-          load_response(service.list_volumes(node, storage, options), 'volumes')
+        def all(filters = {})
+          load service.list_volumes(node_id, storage_id, filters)
         end
 
         def list_by_content_type(content)
-          search(content: content)
+          all.select { |volume| volume.content.include? content}
         end
 
         def list_by_content_type_and_by_server(content, vmid)
-          search(content: content, vmid: vmid)
+          all(vmid: vmid)
         end
 
         def get(id)
-          all
-          cached_volume = find { |volume| volume.id == id }
-          return cached_volume if cached_volume
+          new service.get_volume(node: node_id, storage: storage_id, volume: id)
         end
 
         def destroy(id)

data/lib/fog/compute/proxmox/requests/action_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
@@ -29,13 +27,12 @@ module Fog
           type = path_params[:type]
           action = path_params[:action]
           vmid = path_params[:vmid]
-          response = request(
+          request(
             expects: [200],
             method: 'POST',
             path: "nodes/#{node}/#{type}/#{vmid}/status/#{action}",
             body: URI.encode_www_form(body_params)
           )
-          Fog::Proxmox::Json.get_data(response)
         end
       end
 

data/lib/fog/compute/proxmox/requests/clone_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: 'POST',
             path: "nodes/#{node}/#{type}/#{vmid}/clone",
             body: URI.encode_www_form(body_params)
           )
-          Fog::Proxmox::Json.get_data(response)
         end
       end
 

data/lib/fog/compute/proxmox/requests/create_backup.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
@@ -26,13 +24,12 @@ module Fog
       class Real
         def create_backup(path_params, body_params)
           node = path_params[:node]
-          response = request(
+          request(
             expects: [200],
             method: 'POST',
             path: "nodes/#{node}/vzdump",
             body: URI.encode_www_form(body_params)
           )
-          Fog::Proxmox::Json.get_data(response)
         end
       end
 

data/lib/fog/compute/proxmox/requests/create_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
@@ -27,13 +25,12 @@ module Fog
         def create_server(path_params, body_params)
           node = path_params[:node]
           type = path_params[:type]
-          response = request(
+          request(
             expects: [200],
             method: 'POST',
             path: "nodes/#{node}/#{type}",
             body: URI.encode_www_form(body_params)
           )
-          Fog::Proxmox::Json.get_data(response)
         end
       end
 

data/lib/fog/compute/proxmox/requests/create_snapshot.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: 'POST',
             path: "nodes/#{node}/#{type}/#{vmid}/snapshot",
             body: URI.encode_www_form(body_params)
           )
-          Fog::Proxmox::Json.get_data(response)
         end
       end
 

data/lib/fog/compute/proxmox/requests/create_spice.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: 'POST',
             path: "nodes/#{node}/#{type}/#{vmid}/spiceproxy",
             body: URI.encode_www_form(body_params)
           )
-          Fog::Proxmox::Json.get_data(response)
         end
       end
 

data/lib/fog/compute/proxmox/requests/create_term.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: 'POST',
             path: "nodes/#{node}/#{type}/#{vmid}/termproxy",
             body: URI.encode_www_form(body_params)
           )
-          Fog::Proxmox::Json.get_data(response)
         end
       end
 

data/lib/fog/compute/proxmox/requests/create_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: [200],
             method: 'POST',
             path: "nodes/#{node}/#{type}/#{vmid}/vncproxy",
             body: URI.encode_www_form(body_params)
           )
-          Fog::Proxmox::Json.get_data(response)
         end
       end
 

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

@@ -18,8 +18,6 @@
 
 # frozen_string_literal: true
 
-require 'fog/proxmox/json'
-
 module Fog
   module Compute
     class Proxmox
@@ -29,13 +27,12 @@ module Fog
           node = path_params[:node]
           type = path_params[:type]
           vmid = path_params[:vmid]
-          response = request(
+          request(
             expects: [200],
             method: 'DELETE',
             path: "nodes/#{node}/#{type}/#{vmid}",
             body: URI.encode_www_form(body_params)
           )
-          Fog::Proxmox::Json.get_data(response)
         end
       end
 

data/lib/fog/compute/proxmox/requests/delete_snapshot.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
@@ -29,13 +27,12 @@ module Fog
           type = path_params[:type]
           vmid = path_params[:vmid]
           snapname = path_params[:snapname]
-          response = request(
+          request(
             expects: [200],
             method: 'DELETE',
             path: "nodes/#{node}/#{type}/#{vmid}/snapshot/#{snapname}",
             query: URI.encode_www_form(query_params)
           )
-          Fog::Proxmox::Json.get_data(response)
         end
       end
 

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

@@ -18,8 +18,6 @@
 
 # frozen_string_literal: true
 
-require 'fog/proxmox/json'
-
 module Fog
   module Compute
     class Proxmox
@@ -28,13 +26,12 @@ module Fog
         def get_node_statistics(path_params,query_params)
           node = path_params[:node]
           output = path_params[:output]
-          response = request(
+          request(
             expects: [200],
             method: 'GET',
             path: "nodes/#{node}/#{output}",
             query: URI.encode_www_form(query_params)
           )
-          Fog::Proxmox::Json.get_data(response)
         end
       end
 

data/lib/fog/compute/proxmox/requests/get_server_config.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}/config"
           )
-          Fog::Proxmox::Json.get_data(response)
         end
       end