fog-proxmox 0.5.5 → 0.6.0

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

@@ -17,98 +17,28 @@
 # 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/domain'
 
 module Fog
   module Identity
     class Proxmox
       # class Domains collection authentication
-      class Domains < Fog::Proxmox::Collection
+      class Domains < Fog::Collection
         model Fog::Identity::Proxmox::Domain
 
-        def to_domain(hash)
-          realm = hash['realm']
-          type_value = hash['type']
-          tfa_value = hash['tfa']
-          type_hash = hash.reject { |k, _v| %w[realm type tfa].include? k }
-          type = to_type(type_value, type_hash)
-          tfa = to_tfa(tfa_value)
-          type.tfa = tfa if tfa
-          new(realm: realm, type: type)
+        def all
+          load service.list_domains
         end
 
-        def all(_options = {})
-          load_response(service.list_domains, 'domains')
-        end
-
-        def find_by_id(id)
-          response = service.get_domain(id)
-          body = JSON.decode(response.body)
-          data = body['data']
-          data.store('realm', id)
-          data.delete_if { |k, _v| k == 'digest' }
-          to_domain(data)
+        def get(id)
+          all.find { |domain| domain.identity === id }
         end
 
         def destroy(id)
-          domain = find_by_id(id)
+          domain = get(id)
           domain.destroy
         end
 
-        def create(attributes = {})
-          domain = new(realm: attributes[:realm])
-          type_s = attributes[:type]
-          tfa_s = attributes[:tfa]
-          attr = attributes.reject { |k, _v| %i[realm type tfa].include? k }
-          domain.type = to_type(type_s, attr)
-          tfa = to_tfa(tfa_s)
-          domain.type.tfa = tfa if tfa
-          domain.create
-        end
-
-        def to_type(type, attributes)
-          type_class(type).new(attributes)
-        end
-
-        def to_tfa(tfa_s)
-          oath_rxp = /type=oath,step=(?<step>\d+),digits=(?<digits>\d+)/
-          yubico_rxp = /type=yubico,id=(?<id>\w+),key=(?<key>\w+),url=(?<url>.+)/
-          if oath_rxp.match(tfa_s)
-            attributes = oath_rxp.named_captures
-            type = 'oath'
-          elsif yubico_rxp.match(tfa_s)
-            attributes = yubico_rxp.named_captures
-            type = 'yubico'
-          end
-          tfa_class(type).new(attributes) if type && attributes
-        end
-
-        def type_class(type)
-          if type == 'pam'
-            type_class = Fog::Identity::Proxmox::Pam
-          elsif type == 'pve'
-            type_class = Fog::Identity::Proxmox::Pve
-          elsif type == 'ldap'
-            type_class = Fog::Identity::Proxmox::Ldap
-          elsif type == 'ad'
-            type_class = Fog::Identity::Proxmox::Activedirectory
-          else
-            raise Fog::Proxmox::Errors::NotFound, 'domain type unknown'
-          end
-          type_class
-        end
-
-        def tfa_class(tfa)
-          if tfa == 'oath'
-            tfa_class = Fog::Identity::Proxmox::Oath
-          elsif tfa == 'yubico'
-            tfa_class = Fog::Identity::Proxmox::Yubico
-          else
-            raise Fog::Proxmox::Errors::NotFound, 'domain tfa unknown'
-          end
-          tfa_class
-        end
       end
     end
   end

data/lib/fog/identity/proxmox/models/group.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,21 +17,17 @@
 
 # frozen_string_literal: true
 
-require 'fog/proxmox/models/model'
-
 module Fog
   module Identity
     class Proxmox
       # class Group model authentication
-      class Group < Fog::Proxmox::Model
+      class Group < Fog::Model
         identity  :groupid
         attribute :comment
-        def to_s
-          groupid
-        end
 
-        def create(new_attributes = {})
-          service.create_group(attributes.merge(new_attributes))
+        def save(options = {})
+          service.create_group(attributes.merge(options))
+          reload
         end
 
         def destroy
@@ -51,8 +38,8 @@ module Fog
 
         def update
           requires :groupid
-          attr = attributes.reject { |key, _value| key == :groupid }
-          service.update_group(groupid, attr)
+          service.update_group(identity, attributes.reject { |attribute| [:groupid].include? attribute })
+          reload
         end
       end
     end

data/lib/fog/identity/proxmox/models/groups.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/group'
 
 module Fog
   module Identity
     class Proxmox
       # class Groups authentication
-      class Groups < Fog::Proxmox::Collection
+      class Groups < Fog::Collection
         model Fog::Identity::Proxmox::Group
 
-        def all(_options = {})
-          load_response(service.list_groups, 'groups')
+        def all
+          load service.list_groups
         end
 
-        def find_by_id(id)
-          cached_group = find { |group| group.groupid == id }
-          return cached_group if cached_group
-          group_hash = service.get_group(id)
-          Fog::Identity::Proxmox::Group.new(
-            group_hash.merge(service: service)
-          )
+        def get(id)
+          all.find { |group| group.identity === id }
         end
 
         def destroy(id)
-          group = find_by_id(id)
+          group = get(id)
           group.destroy
         end
       end

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

@@ -4,14 +4,6 @@
 
 # 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.
-
 # 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
@@ -25,43 +17,47 @@
 # 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 Permission
-      class Permission < Fog::Proxmox::Model
-        attribute :type
-        attribute :ugid
-        attribute :roleid
-        attribute :path
+      class Permission < Fog::Model
+        identity :type
+        identity :roleid
+        identity :path
+        identity :ugid
         attribute :propagate
 
-        def to_s
-          "path=#{path},roleid=#{roleid},type=#{type},ugid=#{ugid}"
+        def save
+          service.update_permissions(to_update)
         end
 
-        def ==(other)
-          to_s.eql? other.to_s if other
+        def destroy
+          service.update_permissions(to_update.merge(delete: 1))
         end
 
-        def add
-          service.add_permission(to_request)
-        end
+        private
 
-        def remove
-          service.remove_permission(to_request)
+        def initialize_roles(new_attributes = {})
+          roles = new_attributes.delete(:roleid)
+          new_attributes.store(:roles, roles)       
         end
 
-        def to_request
-          request = { roles: roleid, path: path, propagate: propagate }
-          if type == 'group'
-            request.store(:groups, ugid)
-          elsif type == 'user'
-            request.store(:users, ugid)
+        def initialize_ugid(new_attributes = {})
+          ugs = new_attributes.delete(:ugid)
+          if type === 'user'
+            new_attributes.store(:users, ugs)
+          elsif type === 'group'
+            new_attributes.store(:groups, ugs)
           end
-          request
+          new_attributes.delete(:type)          
+        end
+
+        def to_update
+          new_attributes = attributes.clone
+          initialize_roles(new_attributes)
+          initialize_ugid(new_attributes)
+          new_attributes
         end
       end
     end

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

@@ -17,43 +17,26 @@
 # 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/permission'
 
 module Fog
   module Identity
     class Proxmox
       # class Permissions authentication
-      class Permissions < Fog::Proxmox::Collection
+      class Permissions < Fog::Collection
         model Fog::Identity::Proxmox::Permission
 
-        def all(_options = {})
-          load_response(service.list_permissions, 'permissions')
+        def all
+          load service.list_permissions
         end
 
-        def create(permission_hash)
-          groups = permission_hash[:groups]
-          users = permission_hash[:users]
-          roles = permission_hash[:roles]
-          path = permission_hash[:path]
-          propagate ||= 1
-          permission = new(path: path, propagate: propagate, roleid: roles)
-          if groups
-            permission.type = 'group'
-            permission.ugid = groups
-          elsif users
-            permission.type = 'user'
-            permission.ugid = users
-          end
-          permission
+        def get(type, path, roleid, ugid)
+          all.find { |permission| permission.type === type && permission.path === path && permission.roleid === roleid && permission.ugid === ugid }
         end
 
-        def add(permission)
-          create(permission).add
-        end
-
-        def remove(permission)
-          create(permission).remove
+        def destroy(permission_hash)
+          permission = new(permission_hash)
+          permission.destroy
         end
       end
     end

data/lib/fog/identity/proxmox/models/pool.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,23 +17,18 @@
 
 # frozen_string_literal: true
 
-require 'fog/proxmox/models/model'
-
 module Fog
   module Identity
     class Proxmox
       # class Pool model of VMs
-      class Pool < Fog::Proxmox::Model
+      class Pool < Fog::Model
         identity  :poolid
         attribute :comment
         attribute :members
 
-        def to_s
-          poolid
-        end
-
-        def create(new_attributes = {})
-          service.create_pool(attributes.merge(new_attributes))
+        def save(options = {})
+          service.create_pool(attributes.merge(options))
+          reload
         end
 
         def destroy
@@ -69,10 +55,11 @@ module Fog
 
         def update_with_member(member_name, member_id, delete = false)
           requires :poolid
-          attr = attributes.reject { |key, _value| %i[poolid members].include? key }
-          attr.store(member_name, member_id) if member_name
-          attr.store('delete', 1) if delete
-          service.update_pool(poolid, attr)
+          otpions = attributes.reject { |attribute| %i[poolid members].include? attribute }
+          otpions.store(member_name, member_id) if member_name
+          otpions.store('delete', 1) if delete
+          service.update_pool(poolid, otpions)
+          reload
         end
 
         def update

data/lib/fog/identity/proxmox/models/pools.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/pool'
 
 module Fog
   module Identity
     class Proxmox
       # class Pools Collection of pools of VMs
-      class Pools < Fog::Proxmox::Collection
+      class Pools < Fog::Collection
         model Fog::Identity::Proxmox::Pool
 
-        def all(_options = {})
-          load_response(service.list_pools, 'pools')
+        def all
+          load service.list_pools
         end
-
-        def find_by_id(id)
-          cached_pool = find { |pool| pool.poolid == id }
-          return cached_pool if cached_pool
-          pool_hash = service.get_pool(id)
-          Fog::Identity::Proxmox::Pool.new(
-            pool_hash.merge(service: service)
-          )
+   
+        def get(id)
+          all.find { |pool| pool.identity === id }
         end
 
         def destroy(id)
-          pool = find_by_id(id)
+          pool = get(id)
           pool.destroy
         end
       end

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

@@ -25,22 +25,17 @@
 # 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 Principal current user authenticated
-      class Principal < Fog::Proxmox::Model
+      class Principal < Fog::Model
         identity :username
         attribute :password
         attribute :privs
         attribute :path
         attribute :otp
         attribute :realm
-        def to_s
-          username
-        end
       end
     end
   end