fog-proxmox 0.6.0 → 0.7.0

data/lib/fog/network/proxmox/requests/list_networks.rb

@@ -19,8 +19,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Network
-    class Proxmox
+  module Proxmox
+    class Network
       # class Real list_networks request
       class Real
         def list_networks(path_params, query_params)

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

@@ -19,8 +19,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Network
-    class Proxmox
+  module Proxmox
+    class Network
       # class Real list_nodes request
       class Real
         def list_nodes

data/lib/fog/network/proxmox/requests/power_node.rb

@@ -19,8 +19,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Network
-    class Proxmox
+  module Proxmox
+    class Network
       # class Real power_node request
       class Real
         def power_node(path_params, body_params)

data/lib/fog/network/proxmox/requests/update_network.rb

@@ -18,8 +18,8 @@
 # along with Fog::Proxmox. If not, see <http://www.gnu.org/licenses/>.
 
 module Fog
-  module Network
-    class Proxmox
+  module Proxmox
+    class Network
       # class Real update_network request
       class Real
         def update_network(path_params, body_params)

data/lib/fog/proxmox.rb

@@ -25,26 +25,13 @@ require 'fog/core'
 require 'fog/json'
 
 module Fog
-  # Identity module
-  module Identity
-    autoload :Proxmox, File.expand_path('identity/proxmox', __dir__)
-  end
-  # Compute module
-  module Compute
-    autoload :Proxmox, File.expand_path('compute/proxmox', __dir__)
-  end
-  # Storage module
-  module Storage
-    autoload :Proxmox, File.expand_path('storage/proxmox', __dir__)
-  end
-  # Network module
-  module Network
-    autoload :Proxmox, File.expand_path('network/proxmox', __dir__)
-  end
-
   # Proxmox module
   module Proxmox
     extend Fog::Provider
+    autoload :Identity, File.expand_path('identity/proxmox', __dir__)
+    autoload :Compute, File.expand_path('compute/proxmox', __dir__)
+    autoload :Storage, File.expand_path('storage/proxmox', __dir__)
+    autoload :Network, File.expand_path('network/proxmox', __dir__)
     service(:identity, 'Identity')
     service(:compute, 'Compute')
     service(:storage, 'Storage')

data/lib/fog/proxmox/core.rb

@@ -33,7 +33,7 @@ module Fog
 
       # fallback
       def self.not_found_class
-        Fog::Compute::Proxmox::NotFound
+        Fog::Proxmox::Compute::NotFound
       end
 
       def initialize_identity(options)

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

@@ -23,16 +23,15 @@ module Fog
     module ControllerHelper
 
       CONTROLLERS = %w[ide sata scsi virtio mp rootfs].freeze
-
       def self.extract(name, controller_value)
-        values = controller_value.scan(/#{name}=(\w+)/)
-        name_value = values.first if values
-        name_value&.first
+        matches = controller_value.match(/[,]{0,1}#{name}[=]{1}(?<name_value>[\w\/]+)/)
+        matches ? matches[:name_value] : matches
       end
 
       def self.extract_index(name, key)
-        idx_a = key.to_s.scan(/#{name}(\d+)/).first
-        idx_a.first.to_i if idx_a
+        matches = key.to_s.match(/#{name}(?<index>\d+)/)
+        index = matches ? matches[:index] : matches
+        index ? index.to_i : -1
       end
 
       def self.valid?(name, key)

data/lib/fog/proxmox/version.rb

@@ -19,6 +19,6 @@
 
 module Fog
   module Proxmox
-    VERSION = '0.6.0'
+    VERSION = '0.7.0'
   end
 end

data/lib/fog/storage/proxmox.rb

@@ -19,9 +19,9 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
+  module Proxmox
     # Procmox storage service
-    class Proxmox < Fog::Service
+    class Storage < Fog::Service
       # Models
       model_path 'fog/storage/proxmox'
     end

data/spec/compute_spec.rb

@@ -20,11 +20,11 @@
 require 'spec_helper'
 require_relative './proxmox_vcr'
 
-describe Fog::Compute::Proxmox do
+describe Fog::Proxmox::Compute do
   before :all do
     @proxmox_vcr = ProxmoxVCR.new(
       vcr_directory: 'spec/fixtures/proxmox/compute',
-      service_class: Fog::Compute::Proxmox
+      service_class: Fog::Proxmox::Compute
     )
     @service = @proxmox_vcr.service
     @pve_url = @proxmox_vcr.url

data/spec/helpers/controller_helper_spec.rb

@@ -23,7 +23,7 @@ require 'fog/proxmox/helpers/controller_helper'
     describe Fog::Proxmox::ControllerHelper do
             
         let(:net) do 
-            { net0: 'virtio=66:89:C5:59:AA:96,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1' }
+            { net0: 'virtio=66:89:C5:59:AA:96,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1,mp=/opt/path' }
         end
         let(:net_no_options) do 
             { net0: 'virtio=66:89:C5:59:AA:96' }
@@ -35,7 +35,7 @@ require 'fog/proxmox/helpers/controller_helper'
             { ide2: 'none,media=cdrom' }
         end
         let(:mp) do 
-            { mp0: 'local-lvm:1' }
+            { mp0: 'local-lvm:1,mp=/opt/path' }
         end        
         let(:rootfs) do 
             { rootfs: 'local-lvm:1' }
@@ -58,6 +58,21 @@ require 'fog/proxmox/helpers/controller_helper'
                 cache = Fog::Proxmox::ControllerHelper.extract('cache',scsi[:scsi10])
                 assert_equal 'none', cache
             end
+            it "returns mp" do
+                path = Fog::Proxmox::ControllerHelper.extract('mp',mp[:mp0])
+                assert_equal '/opt/path', path
+            end
+        end
+
+        describe '#extract_index' do
+            it "net0 returns 0" do
+                index = Fog::Proxmox::ControllerHelper.extract_index('net',:net0)
+                assert index == 0
+            end
+            it "scsi10 returns 10" do
+                index = Fog::Proxmox::ControllerHelper.extract_index('scsi',:scsi10)
+                assert index == 10
+            end
         end
 
         describe '#last_index' do

data/spec/identity_spec.rb

@@ -20,11 +20,11 @@
 require 'spec_helper'
 require_relative './proxmox_vcr'
 
-describe Fog::Identity::Proxmox do
+describe Fog::Proxmox::Identity do
   before :all do
     @proxmox_vcr = ProxmoxVCR.new(
       vcr_directory: 'spec/fixtures/proxmox/identity',
-      service_class: Fog::Identity::Proxmox
+      service_class: Fog::Proxmox::Identity
     )
     @service = @proxmox_vcr.service
     @pve_url = @proxmox_vcr.url
@@ -36,7 +36,7 @@ describe Fog::Identity::Proxmox do
 
   it 'authenticates with username and password' do
     VCR.use_cassette('auth') do
-      identity = Fog::Identity::Proxmox.new(
+      identity = Fog::Proxmox::Identity.new(
         pve_username: @username,
         pve_password: @password,
         pve_url: @pve_url.to_s

data/spec/network_spec.rb

@@ -20,11 +20,11 @@
 require 'spec_helper'
 require_relative './proxmox_vcr'
 
-describe Fog::Network::Proxmox do
+describe Fog::Proxmox::Network do
   before :all do
     @proxmox_vcr = ProxmoxVCR.new(
       vcr_directory: 'spec/fixtures/proxmox/network',
-      service_class: Fog::Network::Proxmox
+      service_class: Fog::Proxmox::Network
     )
     @service = @proxmox_vcr.service
     @pve_url = @proxmox_vcr.url

data/spec/spec_helper.rb

@@ -25,6 +25,7 @@ SimpleCov.start do
   add_group 'Core', 'lib/fog/proxmox'
   add_group 'Identity', 'lib/fog/identity'
   add_group 'Compute', 'lib/fog/compute'
+  add_group 'Network', 'lib/fog/network'
 end
 
 require 'minitest/autorun'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-proxmox
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Tristan Robert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-16 00:00:00.000000000 Z
+date: 2019-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -212,56 +212,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: fog-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.45'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.45'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: fog-json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: ipaddress
   requirement: !ruby/object:Gem::Requirement