fog-proxmox 0.5.5 → 0.6.0

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

@@ -1,12 +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.
@@ -26,22 +17,18 @@
 
 # frozen_string_literal: true
 
-require 'fog/proxmox/models/model'
-
 module Fog
   module Identity
     class Proxmox
       # class Role model authentication
-      class Role < Fog::Proxmox::Model
+      class Role < Fog::Model
         identity :roleid
         attribute :privs
-        attribute :append
-        def to_s
-          roleid
-        end
+        attribute :special
 
-        def create(new_attributes = {})
-          service.create_role(attributes.merge(new_attributes))
+        def save(options = {})
+          service.create_role(attributes.merge(options))
+          reload
         end
 
         def destroy
@@ -52,8 +39,8 @@ module Fog
 
         def update
           requires :roleid
-          attr = attributes.reject { |key, _value| key == :roleid }
-          service.update_role(roleid, attr)
+          service.update_role(roleid, attributes.reject { |attribute| [:roleid, :special].include? attribute })
+          reload
         end
       end
     end

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

@@ -17,32 +17,25 @@
 # 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/identity/proxmox/models/role'
 
 module Fog
   module Identity
     class Proxmox
       # class Roles model collection authentication
-      class Roles < Fog::Proxmox::Collection
+      class Roles < Fog::Collection
         model Fog::Identity::Proxmox::Role
 
-        def all(_options = {})
-          # special attibute is volatile in role
-          load_response(service.list_roles, 'roles', ['special'])
+        def all
+          load service.list_roles
         end
 
-        def find_by_id(id)
-          cached_role = find { |role| role.roleid == id }
-          return cached_role if cached_role
-          role_hash = service.get_role(id)
-          Fog::Identity::Proxmox::Role.new(
-            role_hash.merge(service: service)
-          )
+        def get(id)
+          all.find { |role| role.identity === id }
         end
 
         def destroy(id)
-          role = find_by_id(id)
+          role = get(id)
           role.destroy
         end
       end

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

@@ -1,12 +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.
@@ -26,13 +17,11 @@
 
 # frozen_string_literal: true
 
-require 'fog/proxmox/models/model'
-
 module Fog
   module Identity
     class Proxmox
       # class User model
-      class User < Fog::Proxmox::Model
+      class User < Fog::Model
         identity :userid
         attribute :firstname
         attribute :lastname
@@ -43,12 +32,10 @@ module Fog
         attribute :enable
         attribute :groups
         attribute :keys
-        def to_s
-          userid
-        end
 
-        def create(new_attributes = {})
-          service.create_user(attributes.merge(new_attributes))
+        def save(options = {})
+          service.create_user(attributes.merge(options))
+          reload
         end
 
         def destroy
@@ -59,13 +46,12 @@ module Fog
 
         def update
           requires :userid
-          attr = attributes.reject { |key, _value| key == :userid }
-          service.update_user(userid, attr)
+          service.update_user(userid, attributes.reject { |attribute| [:userid].include? attribute })
+          reload
         end
 
         def change_password
-          requires :userid
-          requires :password
+          requires :userid, :password
           service.change_password(userid, password)
         end
       end

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

@@ -17,31 +17,25 @@
 # 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/identity/proxmox/models/user'
 
 module Fog
   module Identity
     class Proxmox
       # class Users model collection
-      class Users < Fog::Proxmox::Collection
+      class Users < Fog::Collection
         model Fog::Identity::Proxmox::User
 
-        def all(options = {})
-          load_response(service.list_users(options), 'users')
+        def all(filters = {})
+          load service.list_users(filters)
         end
 
-        def find_by_id(id)
-          cached_user = find { |user| user.userid == id }
-          return cached_user if cached_user
-          user_hash = service.get_user(id)
-          Fog::Identity::Proxmox::User.new(
-            user_hash.merge(service: service)
-          )
+        def get(id)
+          all.find { |user| user.identity === id }
         end
 
         def destroy(id)
-          user = find_by_id(id)
+          user = get(id)
           user.destroy
         end
       end

data/lib/fog/identity/proxmox/requests/check_permissions.rb

@@ -24,15 +24,12 @@ module Fog
       # class Real check_permissions request
       class Real
         def check_permissions(principal)
-          response = request(
+          request(
             expects: [200],
             method: 'POST',
             path: 'access/ticket',
             body: URI.encode_www_form(principal)
           )
-          body = JSON.decode(response.body)
-          data = body['data']
-          data
         end
       end
 

data/lib/fog/identity/proxmox/requests/list_roles.rb

@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 # Copyright 2018 Tristan Robert
 
 # This file is part of Fog::Proxmox.

data/lib/fog/identity/proxmox/requests/read_version.rb

@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 # Copyright 2018 Tristan Robert
 
 # This file is part of Fog::Proxmox.
@@ -24,14 +23,11 @@ module Fog
       # class Real read_version request
       class Real
         def read_version
-          response = request(
+          request(
             expects: [200],
             method: 'GET',
             path: 'version'
           )
-          body = JSON.decode(response.body)
-          data = body['data']
-          data
         end
       end
 

data/lib/fog/identity/proxmox/requests/update_group.rb

@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 # Copyright 2018 Tristan Robert
 
 # This file is part of Fog::Proxmox.
@@ -23,12 +22,12 @@ module Fog
     class Proxmox
       # class Real update_group request
       class Real
-        def update_group(groupid, attributes)
+        def update_group(groupid, options)
           request(
             expects: [200],
             method: 'PUT',
             path: "access/groups/#{groupid}",
-            body: URI.encode_www_form(attributes)
+            body: URI.encode_www_form(options)
           )
         end
       end

data/lib/fog/identity/proxmox/requests/{add_permission.rb → update_permissions.rb}

@@ -21,19 +21,19 @@
 module Fog
   module Identity
     class Proxmox
-      # class Real add_permission request
+      # class Real update_permissions request
       class Real
-        def add_permission(permission)
+        def update_permissions(body_params)
           request(
             expects: [200],
             method: 'PUT',
             path: 'access/acl',
-            body: URI.encode_www_form(permission)
+            body: URI.encode_www_form(body_params)
           )
         end
       end
 
-      # class Mock add_permission request
+      # class Mock update_permissions request
       class Mock
       end
     end

data/lib/fog/network/proxmox/models/network.rb

@@ -26,15 +26,13 @@
 
 # frozen_string_literal: true
 
-require 'fog/proxmox/models/model'
-
 module Fog
   module Network
     class Proxmox
       # class Network model
-      class Network < Fog::Proxmox::Model
+      class Network < Fog::Model
         identity  :iface
-        attribute :node
+        attribute :node_id
         attribute :comments
         attribute :active
         attribute :autostart
@@ -53,27 +51,23 @@ module Fog
 
         TYPES = %w[bridge bond eth alias vlan OVSBridge OVSBond OVSPort OVSIntPort any_bridge].freeze
 
-        def to_s
-          identity
-        end
-
-        def create(attributes = {})
-          requires :node
-          path_params = { node: node }
-          body_params = attributes
+        def save(options = {})
+          requires :node_id
+          path_params = { node: node_id }
+          body_params = options.merge(attributes.reject { |attribute| [:node_id].include? attribute })
           service.create_network(path_params, body_params)
         end
 
-        def update(attributes = {})
-          requires :node, :iface, :type
-          path_params = { node: node, iface: iface }
-          body_params = attributes.merge(type: type)
+        def update(options = {})
+          requires :node_id, :iface, :type
+          path_params = { node: node_id, iface: iface }
+          body_params = options.merge(type: type)
           service.update_network(path_params, body_params)
         end
 
         def destroy
-          requires :node, :iface
-          path_params = { node: node, iface: iface }
+          requires :node_id, :iface
+          path_params = { node: node_id, iface: iface }
           service.delete_network(path_params)
         end
       end

data/lib/fog/network/proxmox/models/networks.rb

@@ -17,36 +17,30 @@
 # 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/network/proxmox/models/node'
 
 module Fog
   module Network
     class Proxmox
       # class Networks Collection of nodes of cluster
-      class Networks < Fog::Proxmox::Collection
+      class Networks < Fog::Collection
         model Fog::Network::Proxmox::Network
-        attribute :node
+        attribute :node_id
 
         def new(attributes = {})
-          requires :node
-          super({ node: node }.merge(attributes))
+          requires :node_id
+          super({ node_id: node_id }.merge(attributes))
         end
 
-        def all(options = {})
-          requires :node
-          path_params = { node: node }
-          query_params = options
-          load_response(service.list_networks(path_params, query_params), 'networks')
+        def all(filters = {})
+          requires :node_id
+          path_params = { node: node_id }
+          query_params = filters
+          load service.list_networks(path_params, query_params)
         end
 
-        def find_by_id(id)
-          cached_network = find { |network| network.iface == id }
-          return cached_network if cached_network
-          network_hash = service.get_network(id)
-          Fog::Network::Proxmox::Network.new(
-            network_hash.merge(service: service, node: node, iface: id)
-          )
+        def get(id)
+          all.find { |network| network.identity === id }
         end
       end
     end

data/lib/fog/network/proxmox/models/node.rb

@@ -26,13 +26,11 @@
 
 # frozen_string_literal: true
 
-require 'fog/proxmox/models/model'
-
 module Fog
   module Network
     class Proxmox
       # class Node model of VMs
-      class Node < Fog::Proxmox::Model
+      class Node < Fog::Model
         identity  :node
         attribute :status
         attribute :wait
@@ -49,13 +47,13 @@ module Fog
         attribute :swap
         attribute :networks
 
-        def to_s
-          node
-        end
-
-        def networks
-          @networks ||= Fog::Network::Proxmox::Networks.new(service: service,
-                                                            node: self)
+        def initialize(new_attributes = {})
+          prepare_service_value(new_attributes)
+          attributes[:node] = new_attributes['node'] unless new_attributes['node'].nil?
+          attributes[:node] = new_attributes[:node] unless new_attributes[:node].nil?
+          requires :node
+          initialize_networks
+          super(new_attributes)
         end
 
         def power(action)
@@ -64,6 +62,12 @@ module Fog
           raise Fog::Errors::Error, message unless action_known
           service.power_node({ node: node }, command: action)
         end
+
+        private
+
+        def initialize_networks
+          attributes[:networks] = Fog::Network::Proxmox::Networks.new(service: service, node_id: node)
+        end
       end
     end
   end

data/lib/fog/network/proxmox/models/nodes.rb

@@ -17,27 +17,21 @@
 # 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/network/proxmox/models/node'
 
 module Fog
   module Network
     class Proxmox
       # class Nodes Collection of nodes of cluster
-      class Nodes < Fog::Proxmox::Collection
+      class Nodes < Fog::Collection
         model Fog::Network::Proxmox::Node
 
-        def all(_options = {})
-          load_response(service.list_nodes, 'nodes')
+        def all
+          load service.list_nodes
         end
 
-        def find_by_id(id)
-          cached_node = find { |node| node.node == id }
-          return cached_node if cached_node
-          node_hash = service.get_node(id)
-          Fog::Network::Proxmox::Node.new(
-            node_hash.merge(service: service, node: id)
-          )
+        def get(id)
+          all.find { |node| node.identity === id }
         end
       end
     end