fog-openstack 0.1.19 → 0.1.20

data/lib/fog/openstack/version.rb

@@ -1,6 +1,6 @@
 module Fog
   module Openstack
-    VERSION = "0.1.19"
+    VERSION = "0.1.20"
 
     def self.included(base)
       if RUBY_VERSION < "2"

data/lib/fog/shared_file_system/openstack.rb

@@ -2,6 +2,7 @@ module Fog
   module SharedFileSystem
     class OpenStack < Fog::Service
       SUPPORTED_VERSIONS = /v2(\.0)*/
+      SUPPORTED_MICROVERSION = '2.15'.freeze
 
       requires :openstack_auth_url
       recognizes :openstack_auth_token, :openstack_management_url,
@@ -13,7 +14,7 @@ module Fog
                  :openstack_project_name, :openstack_project_id,
                  :openstack_project_domain, :openstack_user_domain, :openstack_domain_name,
                  :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id,
-                 :openstack_identity_prefix
+                 :openstack_identity_prefix, :openstack_shared_file_system_microversion
 
       model_path 'fog/shared_file_system/openstack/models'
       model       :network
@@ -22,6 +23,8 @@ module Fog
       collection  :shares
       model       :snapshot
       collection  :snapshots
+      model       :share_access_rule
+      collection  :share_access_rules
 
       request_path 'fog/shared_file_system/openstack/requests'
       # share networks
@@ -39,6 +42,12 @@ module Fog
       request :create_share
       request :update_share
       request :delete_share
+      request :share_action
+      request :grant_share_access
+      request :revoke_share_access
+      request :list_share_access_rules
+      request :extend_share
+      request :shrink_share
 
       # snapshots
       request :list_snapshots
@@ -48,6 +57,11 @@ module Fog
       request :update_snapshot
       request :delete_snapshot
 
+      # quota + limits
+      request :get_limits
+      request :get_quota
+      request :update_quota
+
       # rubocop:disable LineLength, Metrics/MethodLength, Metrics/ClassLength, Metrics/AbcSize
       class Mock
         def self.data
@@ -189,7 +203,27 @@ module Fog
                   "id"          => "086a1aa6-c425-4ecd-9612-391a3b1b9375",
                   "size"        => 1
                 }
-              ]
+              ],
+              :access_rules          => [
+                {
+                  "share_id"     => "406ea93b-32e9-4907-a117-148b3945749f",
+                  "created_at"   => "2015-09-07T09:14:48.000000",
+                  "updated_at"   => '',
+                  "access_type"  => "ip",
+                  "access_to"    => "0.0.0.0/0",
+                  "access_level" => "rw",
+                  "access_key"   => '',
+                  "id"           => "a25b2df3-90bd-4add-afa6-5f0dbbd50452"
+                }
+              ],
+              :quota                 => {
+                "gigabytes"          => 1000,
+                "shares"             => 50,
+                "snapshot_gigabytes" => 1000,
+                "snapshots"          => 50,
+                "share_networks"     => 10,
+                "id"                 => "16e1ab15c35a457e9c2b2aa189f544e1"
+              }
             }
           end
         end
@@ -250,28 +284,37 @@ module Fog
         end
 
         def initialize(options = {})
-          initialize_identity options
+          @supported_versions     = SUPPORTED_VERSIONS
+          @supported_microversion = SUPPORTED_MICROVERSION
+          @fixed_microversion     = options[:openstack_shared_file_system_microversion]
+          @microversion_key       = 'X-Openstack-Manila-Api-Version'.freeze
 
-          @openstack_service_type           = options[:openstack_service_type] || ['sharev2']
-          @openstack_service_name           = options[:openstack_service_name]
+          initialize_identity options
 
-          @connection_options               = options[:connection_options] || {}
+          @openstack_service_type  = options[:openstack_service_type] || ['sharev2']
+          @openstack_service_name  = options[:openstack_service_name]
+          @connection_options      = options[:connection_options] || {}
 
           authenticate
           set_api_path
+          set_microversion
 
           @persistent = options[:persistent] || false
           @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
 
         def set_api_path
-          unless @path.match(SUPPORTED_VERSIONS)
-            @path = Fog::OpenStack.get_supported_version_path(SUPPORTED_VERSIONS,
+          unless @path.match(@supported_versions)
+            @path = Fog::OpenStack.get_supported_version_path(@supported_versions,
                                                               @openstack_management_uri,
                                                               @auth_token,
                                                               @connection_options)
           end
         end
+
+        def action_prefix
+          microversion_newer_than?('2.6') ? '' : 'os-'
+        end
       end
     end
   end

data/lib/fog/shared_file_system/openstack/models/share.rb

@@ -57,6 +57,34 @@ module Fog
         def ready?
           status == 'available'
         end
+
+        def extend(size)
+          requires :id
+          service.extend_share(id, size)
+          true
+        end
+
+        def shrink(size)
+          requires :id
+          service.shrink_share(id, size)
+          true
+        end
+
+        def grant_access(access_to, access_type, access_level)
+          requires :id
+          service.grant_share_access(id, access_to, access_type, access_level)
+          true
+        end
+
+        def revoke_access(access_id)
+          requires :id
+          service.revoke_share_access(id, access_id)
+          true
+        end
+
+        def access_rules
+          service.share_access_rules(:share => self)
+        end
       end
     end
   end

data/lib/fog/shared_file_system/openstack/models/share_access_rule.rb

@@ -0,0 +1,35 @@
+require 'fog/openstack/models/model'
+
+module Fog
+  module SharedFileSystem
+    class OpenStack
+      class ShareAccessRule < Fog::OpenStack::Model
+        attr_accessor :share
+
+        identity :id
+
+        attribute :access_level
+        attribute :access_type
+        attribute :access_to
+        attribute :state
+
+        def save
+          requires :share, :access_level, :access_type, :access_to
+          raise Fog::Errors::Error, 'Resaving an existing object may create a duplicate' if persisted?
+          merge_attributes(service.grant_share_access(@share.id, access_to, access_type, access_level).body['access'])
+          true
+        end
+
+        def destroy
+          requires :id, :share
+          service.revoke_share_access(@share.id, id)
+          true
+        end
+
+        def ready?
+          state == 'active'
+        end
+      end
+    end
+  end
+end

data/lib/fog/shared_file_system/openstack/models/share_access_rules.rb

@@ -0,0 +1,30 @@
+require 'fog/openstack/models/collection'
+require 'fog/shared_file_system/openstack/models/share_access_rule'
+
+module Fog
+  module SharedFileSystem
+    class OpenStack
+      class ShareAccessRules < Fog::OpenStack::Collection
+        model Fog::SharedFileSystem::OpenStack::ShareAccessRule
+
+        attr_accessor :share
+
+        def all
+          requires :share
+          load_response(service.list_share_access_rules(@share.id), 'access_list')
+        end
+
+        def find_by_id(id)
+          all.find { |rule| rule.id == id }
+        end
+
+        alias get find_by_id
+
+        def new(attributes = {})
+          requires :share
+          super({:share => @share}.merge!(attributes))
+        end
+      end
+    end
+  end
+end

data/lib/fog/shared_file_system/openstack/requests/extend_share.rb

@@ -0,0 +1,24 @@
+module Fog
+  module SharedFileSystem
+    class OpenStack
+      class Real
+        def extend_share(share_id, new_size)
+          action = {
+            "#{action_prefix}extend" => {
+              'new_size' => new_size
+            }
+          }
+          share_action(share_id, action)
+        end
+      end
+
+      class Mock
+        def extend_share(_share_id, _new_size)
+          response = Excon::Response.new
+          response.status = 202
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/shared_file_system/openstack/requests/get_limits.rb

@@ -0,0 +1,45 @@
+module Fog
+  module SharedFileSystem
+    class OpenStack
+      class Real
+        def get_limits
+          request(
+            :expects => 200,
+            :method  => 'GET',
+            :path    => 'limits'
+          )
+        end
+      end
+
+      class Mock
+        def get_limits
+          absolute_limits = {
+            # Max
+            'maxTotalShareGigabytes'     => 1000,
+            'maxTotalShareNetworks'      => 10,
+            'maxTotalShares'             => 50,
+            'maxTotalSnapshotGigabytes'  => 1000,
+            'maxTotalShareSnapshots'     => 50,
+
+            # Used
+            'totalShareNetworksUsed'     => 0,
+            'totalSharesUsed'            => 0,
+            'totalShareGigabytesUsed'    => 0,
+            'totalShareSnapshotsUsed'    => 0,
+            'totalSnapshotGigabytesUsed' => 0
+          }
+
+          Excon::Response.new(
+            :status => 200,
+            :body   => {
+              'limits' => {
+                'rate'     => [],
+                'absolute' => absolute_limits
+              }
+            }
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/shared_file_system/openstack/requests/get_quota.rb

@@ -0,0 +1,26 @@
+module Fog
+  module SharedFileSystem
+    class OpenStack
+      class Real
+        def get_quota(project_id)
+          request(
+            :expects => 200,
+            :method  => 'GET',
+            :path    => "#{action_prefix}quota-sets/#{project_id}"
+          )
+        end
+      end
+
+      class Mock
+        def get_quota(project_id)
+          response = Excon::Response.new
+          response.status = 200
+          quota_data = data[:quota_updated] || data[:quota]
+          quota_data['id'] = project_id
+          response.body = {'quota_set' => quota_data}
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/shared_file_system/openstack/requests/grant_share_access.rb

@@ -0,0 +1,34 @@
+module Fog
+  module SharedFileSystem
+    class OpenStack
+      class Real
+        def grant_share_access(share_id, access_to = '0.0.0.0/0', access_type = 'ip', access_level = 'rw')
+          action = {
+            "#{action_prefix}allow_access" => {
+              'access_to'    => access_to,
+              'access_type'  => access_type,
+              'access_level' => access_level
+            }
+          }
+          share_action(share_id, action, 200)
+        end
+      end
+
+      class Mock
+        def grant_share_access(share_id, access_to, access_type, access_level)
+          response = Excon::Response.new
+          response.status = 200
+
+          access                = data[:access_rules].first
+          access[:share_id]     = share_id
+          access[:access_level] = access_level
+          access[:access_type]  = access_type
+          access[:access_to]    = access_to
+
+          response.body = {'access' => access}
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/shared_file_system/openstack/requests/list_share_access_rules.rb

@@ -0,0 +1,29 @@
+module Fog
+  module SharedFileSystem
+    class OpenStack
+      class Real
+        def list_share_access_rules(share_id)
+          action = {
+            "#{action_prefix}access_list" => nil
+          }
+          share_action(share_id, action, 200)
+        end
+      end
+
+      class Mock
+        def list_share_access_rules(share_id)
+          response = Excon::Response.new
+          response.status = 200
+
+          rules = data[:access_rules]
+          rules.each do |rule|
+            rule[:share_id] = share_id
+          end
+
+          response.body = {'access_list' => rules}
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/shared_file_system/openstack/requests/revoke_share_access.rb

@@ -0,0 +1,24 @@
+module Fog
+  module SharedFileSystem
+    class OpenStack
+      class Real
+        def revoke_share_access(share_id, access_id)
+          action = {
+            "#{action_prefix}deny_access" => {
+              'access_id' => access_id
+            }
+          }
+          share_action(share_id, action)
+        end
+      end
+
+      class Mock
+        def revoke_share_access(_share_id, _access_id)
+          response = Excon::Response.new
+          response.status = 202
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/shared_file_system/openstack/requests/share_action.rb

@@ -0,0 +1,16 @@
+module Fog
+  module SharedFileSystem
+    class OpenStack
+      class Real
+        def share_action(id, options = {}, expects_status = 202)
+          request(
+            :body    => Fog::JSON.encode(options),
+            :expects => expects_status,
+            :method  => 'POST',
+            :path    => "shares/#{id}/action"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/shared_file_system/openstack/requests/shrink_share.rb

@@ -0,0 +1,24 @@
+module Fog
+  module SharedFileSystem
+    class OpenStack
+      class Real
+        def shrink_share(share_id, new_size)
+          action = {
+            "#{action_prefix}shrink" => {
+              'new_size' => new_size
+            }
+          }
+          share_action(share_id, action)
+        end
+      end
+
+      class Mock
+        def shrink_share(_share_id, _new_size)
+          response = Excon::Response.new
+          response.status = 202
+          response
+        end
+      end
+    end
+  end
+end