fog-proxmox 0.13.0 → 0.14.0

data/lib/fog/proxmox/helpers/nic_helper.rb

@@ -23,7 +23,6 @@ module Fog
   module Proxmox
     # module NicHelper mixins
     module NicHelper
-
       NICS_REGEXP = /^(net)(\d+)/
 
       def self.extract_mac_address(nic_value)
@@ -47,24 +46,24 @@ module Fog
       end
 
       def self.has_model?(nic_value)
-        nic_value.match?(self.model_regexp)
+        nic_value.match?(model_regexp)
       end
 
       def self.has_name?(nic_value)
-        nic_value.match?(self.name_regexp)
+        nic_value.match?(name_regexp)
       end
 
       def self.has_ip?(nic_value)
-        nic_value.match?(self.ip_regexp)
+        nic_value.match?(ip_regexp)
       end
 
       def self.extract_nic_id(nic_value)
-        if self.has_model?(nic_value)
-          nic_value.scan(self.model_regexp).first.first
-        elsif self.has_name?(nic_value)
-          nic_value.scan(self.name_regexp).first.first
+        if has_model?(nic_value)
+          nic_value.scan(model_regexp).first.first
+        elsif has_name?(nic_value)
+          nic_value.scan(name_regexp).first.first
         else
-          nic_value.scan(self.nic_update_regexp).first.first
+          nic_value.scan(nic_update_regexp).first.first
         end
       end
 
@@ -84,29 +83,38 @@ module Fog
         end
       end
 
-      def self.flatten(nic_hash)
-        nic_id = nic_hash[self.nic_name(nic_hash).to_sym]
-        if nic_hash.has_key?(:macaddr)
-          nic_value = nic_id + "=" + nic_hash[:macaddr]
+      def self.set_mac(nic_id, nic_hash)
+        mac_keys = [:macaddr, :hwaddr]
+        nic_value = ''
+        if (nic_hash.keys & mac_keys).empty?
+          nic_value = nic_name(nic_hash) + "=" + nic_id
         else
-          nic_value = self.nic_name(nic_hash) + "=" + nic_id
+          mac_value = nic_hash[mac_keys[0]] if nic_hash.key?(mac_keys[0])
+          mac_value ||= nic_hash[mac_keys[1]] if nic_hash.key?(mac_keys[1])
+          nic_value = nic_id + "=" + mac_value
         end
-        options = nic_hash.reject { |key, _value| [self.nic_name(nic_hash).to_sym,:id,:macaddr].include? key.to_sym }
-        nic_value += ',' unless options.empty?
-        nic_value += Fog::Proxmox::Hash.stringify(options) unless options.empty?
+        nic_value
+      end
+
+      # Convert nic attributes hash into API Proxmox parameters string
+      def self.flatten(nic_hash)
+        nic_id = nic_hash[nic_name(nic_hash).to_sym]
+        nic_value = set_mac(nic_id, nic_hash)
+        options = nic_hash.reject { |key, _value| [nic_name(nic_hash).to_sym, :id, :macaddr, :hwaddr].include? key.to_sym }
+        nic_value += ',' + Fog::Proxmox::Hash.stringify(options) unless options.empty?
         { "#{nic_hash[:id]}": nic_value }
       end
 
-      def self.collect_nics(attributes)        
+      def self.collect_nics(attributes)
         attributes.select { |key| nic?(key.to_s) }
       end
-    
+
       def self.nic?(id)
         NICS_REGEXP.match(id) ? true : false
       end
 
       def self.extract_ip(nic_value)
-        if ip = self.ip_regexp.match(nic_value)
+        ip_regexp.match(nic_value) do |ip|
           ip[2]
         end
       end

data/lib/fog/{identity/proxmox.rb → proxmox/identity.rb}

@@ -25,13 +25,15 @@ module Fog
   module Proxmox
     # Identity and authentication proxmox class
     class Identity < Fog::Service
-      requires :pve_url
-      recognizes :pve_ticket, :pve_path, :pve_ticket_expires, :pve_csrftoken, :persistent, :current_user, :pve_username, :pve_password, :pve_deadline
+      requires :proxmox_url, :proxmox_auth_method
+      recognizes :proxmox_token, :proxmox_tokenid, :proxmox_userid, :persistent, :proxmox_username, :proxmox_password
 
-      model_path 'fog/identity/proxmox/models'
+      model_path 'fog/proxmox/identity/models'
       model :principal
       model :user
       collection :users
+      model :token
+      collection :tokens
       model :group
       collection :groups
       model :pool
@@ -44,11 +46,12 @@ module Fog
       model :permission
       collection :permissions
 
-      request_path 'fog/identity/proxmox/requests'
+      request_path 'fog/proxmox/identity/requests'
 
       # Manage permissions
       request :check_permissions
       request :list_permissions
+      request :list_user_permissions
       request :update_permissions
       request :read_version
 
@@ -60,6 +63,13 @@ module Fog
       request :delete_user
       request :change_password
 
+      # Manage user tokens
+      request :list_tokens
+      request :get_token_info
+      request :create_token
+      request :update_token
+      request :delete_token
+
       # CRUD groups
       request :list_groups
       request :get_group
@@ -93,8 +103,14 @@ module Fog
         attr_reader :config
 
         def initialize(options = {})
-          @pve_uri = URI.parse(options[:pve_url])
-          @pve_path = @pve_uri.path
+          @proxmox_uri = URI.parse(options[:proxmox_url])
+          @proxmox_auth_method = options[:proxmox_auth_method]
+          @proxmox_tokenid = options[:proxmox_tokenid]
+          @proxmox_userid = options[:proxmox_userid]
+          @proxmox_username = options[:proxmox_username]
+          @proxmox_password = options[:proxmox_password]
+          @proxmox_token = options[:proxmox_token]
+          @proxmox_path = @proxmox_uri.path
           @config = options
         end
       end
@@ -102,23 +118,21 @@ module Fog
       # Real class
       class Real
         include Fog::Proxmox::Core
-        def initialize(options = {})
-          initialize_identity(options)
-          @connection_options = options[:connection_options] || {}
-          @path_prefix = URI.parse(options[:pve_url]).path
-          authenticate
-          @persistent = options[:persistent] || false
-          url = "#{@scheme}://#{@host}:#{@port}"
-          if ENV.has_key?('SSL_VERIFY_PEER')
-            Excon.defaults[:ssl_verify_peer] = Fog::Proxmox::String.to_boolean(ENV['SSL_VERIFY_PEER'])
-          end
-          @connection = Fog::Core::Connection.new(url, @persistent, @connection_options.merge(path_prefix: @path_prefix))
+
+        def self.not_found_class
+          Fog::Proxmox::Identity::NotFound
         end
 
         def config
           self
         end
 
+        def config_service?
+          true
+        end
+
+        private
+
         def configure(source)
           source.instance_variables.each do |v|
             instance_variable_set(v, source.instance_variable_get(v))

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

@@ -17,7 +17,7 @@
 # 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/identity/proxmox/models/domain'
+require 'fog/proxmox/identity/models/domain'
 
 module Fog
   module Proxmox

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

@@ -24,9 +24,11 @@ module Fog
       class Group < Fog::Model
         identity  :groupid
         attribute :comment
+        attribute :users
+        attribute :members
 
         def save(options = {})
-          service.create_group(attributes.merge(options))
+          service.create_group((attributes.reject { |attribute| [:users, :members].include? attribute }).merge(options))
           reload
         end
 
@@ -38,7 +40,7 @@ module Fog
 
         def update
           requires :groupid
-          service.update_group(identity, attributes.reject { |attribute| [:groupid].include? attribute })
+          service.update_group(identity, attributes.reject { |attribute| [:groupid, :users, :members].include? attribute })
           reload
         end
       end

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

@@ -17,7 +17,7 @@
 # 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/identity/proxmox/models/group'
+require 'fog/proxmox/identity/models/group'
 
 module Fog
   module Proxmox

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

@@ -17,7 +17,7 @@
 # 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/identity/proxmox/models/permission'
+require 'fog/proxmox/identity/models/permission'
 
 module Fog
   module Proxmox

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

@@ -17,7 +17,7 @@
 # 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/identity/proxmox/models/pool'
+require 'fog/proxmox/identity/models/pool'
 
 module Fog
   module Proxmox

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

@@ -17,7 +17,7 @@
 # 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/identity/proxmox/models/role'
+require 'fog/proxmox/identity/models/role'
 
 module Fog
   module Proxmox

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

@@ -0,0 +1,71 @@
+# 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/identity/models/token_info'
+
+module Fog
+  module Proxmox
+    class Identity
+      # class Token model
+      class Token < Fog::Model
+        identity  :tokenid
+        identity  :userid
+        attribute :privsep
+        attribute :comment
+        attribute :expire
+        attribute :info
+
+        def initialize(new_attributes = {})
+          prepare_service_value(new_attributes)
+          Fog::Proxmox::Attributes.set_attr_and_sym('tokenid', attributes, new_attributes)
+          Fog::Proxmox::Attributes.set_attr_and_sym('userid', attributes, new_attributes)
+          requires :userid, :tokenid
+          initialize_info
+          super(new_attributes)
+        end
+
+
+        def save(options = {})
+          requires :tokenid, :userid
+          token_hash = (attributes.reject { |attribute| [:userid, :tokenid, :info].include? attribute }).merge(options)
+          service.create_token(userid, tokenid, token_hash)
+          reload
+        end
+
+        def destroy
+          requires :tokenid, :userid
+          service.delete_token(userid, tokenid)
+          true
+        end
+
+        def update
+          requires :tokenid, :userid
+          service.update_token(userid, tokenid, attributes.reject { |attribute| [:userid, :tokenid, :info].include? attribute })
+          reload
+        end
+
+        private
+
+        def initialize_info
+          attributes[:info] = Fog::Proxmox::Identity::TokenInfo.new(service: service, tokenid: tokenid, userid: userid)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+# 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
+
+module Fog
+  module Proxmox
+    class Identity
+      # class TokenInfo model
+      class TokenInfo < Fog::Model
+        identity  :tokenid
+        identity  :userid
+        attribute  :fulltokenid
+        attribute :info
+        attribute :value        
+
+        def initialize(new_attributes = {})
+          prepare_service_value(new_attributes)
+          Fog::Proxmox::Attributes.set_attr_and_sym('tokenid', attributes, new_attributes)
+          Fog::Proxmox::Attributes.set_attr_and_sym('userid', attributes, new_attributes)
+          requires :userid, :tokenid
+          super(new_attributes)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,58 @@
+# 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/identity/models/user'
+
+module Fog
+  module Proxmox
+    class Identity
+      # class Tokens model collection
+      class Tokens < Fog::Collection
+        model Fog::Proxmox::Identity::Token
+        attribute :userid
+
+        def new(new_attributes = {})
+          super({ userid: userid }.merge(new_attributes))
+        end
+
+        def get(tokenid)
+          all.find { |token| token.tokenid === tokenid && token.userid == userid }
+        end
+
+        def all(options = {})
+          begin
+            load service.list_tokens(userid)
+          rescue Excon::Error::InternalServerError => error
+            if error.response.status_line.include? "no such user"
+              return []
+            else
+              raise error
+            end
+          end
+        end
+
+        def create(new_attributes = {})
+          object = new(new_attributes.select { |key, _value| [:userid, :tokenid].include? key.to_sym })
+          object.save(new_attributes.reject { |key, _value| [:userid, :tokenid].include? key.to_sym })
+          object
+        end
+      end
+    end
+  end
+end