fog-openstack 0.1.25 → 0.1.26

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

@@ -0,0 +1,28 @@
+module Fog
+  module SharedFileSystem
+    class OpenStack
+      class Real
+        def add_security_service_to_share_network(security_service_id, share_network_id)
+          action = {
+            'add_security_service' => {
+              'security_service_id' => security_service_id
+            }
+          }
+          share_network_action(share_network_id, action)
+        end
+      end
+
+      class Mock
+        def add_security_service_to_share_network(_security_service_id, share_network_id)
+          response = Excon::Response.new
+          response.status = 200
+
+          share_net = data[:share_network_updated] || data[:share_networks].first
+          share_net['id'] = share_network_id
+          response.body = {'share_network' => share_net}
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,47 @@
+module Fog
+  module SharedFileSystem
+    class OpenStack
+      class Real
+        def create_security_service(type, name, options = {})
+          data = {
+            'type' => type,
+            'name' => name
+          }
+
+          vanilla_options = [
+            :description, :dns_ip, :user, :password, :domain, :server
+          ]
+
+          vanilla_options.select { |o| options[o] }.each do |key|
+            data[key] = options[key]
+          end
+
+          request(
+            :body    => Fog::JSON.encode('security_service' => data),
+            :expects => 200,
+            :method  => 'POST',
+            :path    => 'security-services'
+          )
+        end
+      end
+
+      class Mock
+        def create_security_service(type, name, options = {})
+          # stringify keys
+          options = Hash[options.map { |k, v| [k.to_s, v] }]
+
+          response = Excon::Response.new
+          response.status = 200
+
+          security_service = data[:security_services_detail].first.dup
+
+          security_service['type'] = type
+          security_service['name'] = name
+
+          response.body = {'security_service' => security_service.merge(options)}
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module Fog
+  module SharedFileSystem
+    class OpenStack
+      class Real
+        def delete_security_service(id)
+          request(
+            :expects => 202,
+            :method  => 'DELETE',
+            :path    => "security-services/#{id}"
+          )
+        end
+      end
+
+      class Mock
+        def delete_security_service(_id)
+          response = Excon::Response.new
+          response.status = 202
+
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+module Fog
+  module SharedFileSystem
+    class OpenStack
+      class Real
+        def get_security_service(id)
+          request(
+            :expects => 200,
+            :method  => 'GET',
+            :path    => "security-services/#{id}"
+          )
+        end
+      end
+
+      class Mock
+        def get_security_service(id)
+          response = Excon::Response.new
+          response.status = 200
+          security_service = data[:security_service_updated] || data[:security_services_detail].first
+          security_service['id'] = id
+          response.body = {'security_service' => security_service}
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+module Fog
+  module SharedFileSystem
+    class OpenStack
+      class Real
+        def list_security_services(options = {})
+          request(
+            :expects => 200,
+            :method  => 'GET',
+            :path    => 'security-services',
+            :query   => options
+          )
+        end
+      end
+
+      class Mock
+        def list_security_services(_options = {})
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {'security_services' => data[:security_services]}
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+module Fog
+  module SharedFileSystem
+    class OpenStack
+      class Real
+        def list_security_services_detail(options = {})
+          request(
+            :expects => 200,
+            :method  => 'GET',
+            :path    => 'security-services/detail',
+            :query   => options
+          )
+        end
+      end
+
+      class Mock
+        def list_security_services_detail(_options = {})
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {'security_services' => data[:security_services_detail]}
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module Fog
+  module SharedFileSystem
+    class OpenStack
+      class Real
+        def remove_security_service_from_share_network(security_service_id, share_network_id)
+          action = {
+            'remove_security_service' => {
+              'security_service_id' => security_service_id
+            }
+          }
+          share_network_action(share_network_id, action)
+        end
+      end
+
+      class Mock
+        def remove_security_service_from_share_network(_security_service_id, share_network_id)
+          response = Excon::Response.new
+          response.status = 200
+
+          share_net = data[:share_network_updated] || data[:share_networks].first
+          share_net['id'] = share_network_id
+          response.body = {'share_network' => share_net}
+          response
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -0,0 +1,31 @@
+module Fog
+  module SharedFileSystem
+    class OpenStack
+      class Real
+        def update_security_service(id, options = {})
+          request(
+            :body    => Fog::JSON.encode('security_service' => options),
+            :expects => 200,
+            :method  => 'PUT',
+            :path    => "security-services/#{id}"
+          )
+        end
+      end
+
+      class Mock
+        def update_security_service(id, options = {})
+          # stringify keys
+          options = Hash[options.map { |k, v| [k.to_s, v] }]
+
+          data[:security_service_updated]       = data[:security_services_detail].first.merge(options)
+          data[:security_service_updated]['id'] = id
+
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {'security_service' => data[:security_service_updated]}
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/storage/openstack/models/file.rb

@@ -7,6 +7,7 @@ module Fog
         identity  :key,             :aliases => 'name'
 
         attribute :access_control_allow_origin, :aliases => ['Access-Control-Allow-Origin']
+        attribute :cache_control,   :aliases => ['Cache-Control']
         attribute :content_length,  :aliases => ['bytes', 'Content-Length'], :type => :integer
         attribute :content_type,    :aliases => ['content_type', 'Content-Type']
         attribute :content_disposition, :aliases => ['content_disposition', 'Content-Disposition']
@@ -108,6 +109,7 @@ module Fog
 
         def save(options = {})
           requires :directory, :key
+          options['Cache-Control'] = cache_control if cache_control
           options['Content-Type'] = content_type if content_type
           options['Content-Disposition'] = content_disposition if content_disposition
           options['Access-Control-Allow-Origin'] = access_control_allow_origin if access_control_allow_origin

data/lib/fog/volume/openstack.rb

@@ -3,6 +3,9 @@
 module Fog
   module Volume
     class OpenStack < Fog::Service
+      autoload :V1, 'fog/volume/openstack/v1'
+      autoload :V2, 'fog/volume/openstack/v2'
+
       @@recognizes = [:openstack_auth_token, :openstack_management_url,
                       :persistent, :openstack_service_type, :openstack_service_name,
                       :openstack_tenant, :openstack_tenant_id,

data/lib/fog/volume/openstack/requests/set_tenant.rb

@@ -14,6 +14,6 @@ module Fog
           true
         end
       end
-    end # class OpenStack
-  end # module Volume
-end # module Fog
+    end
+  end
+end

data/playbooks/fog-openstack-unittest-spec/run.yaml

@@ -0,0 +1,57 @@
+- hosts: all
+  become: yes
+  tasks:
+    - name: Run unittest spec tests
+      shell:
+        cmd: |
+          set -e
+          set -o pipefail
+          set -x
+          apt-get install ruby ruby-dev -y
+          for key in 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB; do
+              gpg --keyserver keys.gnupg.net --keyserver-options timeout=5 --recv-keys "$key" || \
+              gpg --keyserver pgp.mit.edu --keyserver-options timeout=5 --recv-keys "$key" || \
+              gpg --keyserver keyserver.pgp.com --keyserver-options timeout=5 --recv-keys "$key" || \
+              gpg --keyserver ha.pool.sks-keyservers.net --keyserver-options timeout=5 --recv-keys "$key"
+          done
+          curl -L https://get.rvm.io | bash -s stable
+          source /usr/local/rvm/scripts/rvm > /dev/null 2>&1
+          for version in {{ rvm }}; do
+              if [ "$version" == "jruby-head" ]; then
+                  continue
+              fi
+              rvm install ${version} --disable-binary > /dev/null 2>&1
+              rvm use ${version} > /dev/null 2>&1
+              echo "Running tests based on Ruby ${version}..."
+              ruby --version
+              gem install bundler
+              gem update bundler
+              bundle install --jobs=3 --retry=3
+              bundle exec rake spec TESTOPTS="--verbose"
+          done
+        executable: /bin/bash
+        chdir: '{{ zuul.project.src_dir }}'
+      environment:
+        JRUBY_OPTS: '--debug'
+        ANSIBLE_PYTHON_INTERPRETER: /usr/bin/python3
+
+    - name: Run unittest spec tests for jruby-head
+      shell:
+        cmd: |
+          set -e
+          set -o pipefail
+          set -x
+          rvm install jruby-head --disable-binary
+          rvm use jruby-head
+          echo "Running tests based on Ruby jruby-head...
+          ruby --version
+          gem install bundler
+          gem update bundler
+          bundle install --jobs=3 --retry=3
+          bundle exec rake spec TESTOPTS="--verbose"
+        executable: /bin/bash
+        chdir: '{{ zuul.project.src_dir }}'
+      environment:
+        JRUBY_OPTS: '--debug'
+        ANSIBLE_PYTHON_INTERPRETER: /usr/bin/python3
+      ignore_errors: true

data/playbooks/fog-openstack-unittest-test/run.yaml

@@ -0,0 +1,57 @@
+- hosts: all
+  become: yes
+  tasks:
+    - name: Run unittest tests
+      shell:
+        cmd: |
+          set -e
+          set -o pipefail
+          set -x
+          apt-get install ruby ruby-dev -y
+          for key in 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB; do
+              gpg --keyserver keys.gnupg.net --keyserver-options timeout=5 --recv-keys "$key" || \
+              gpg --keyserver pgp.mit.edu --keyserver-options timeout=5 --recv-keys "$key" || \
+              gpg --keyserver keyserver.pgp.com --keyserver-options timeout=5 --recv-keys "$key" || \
+              gpg --keyserver ha.pool.sks-keyservers.net --keyserver-options timeout=5 --recv-keys "$key"
+          done
+          curl -L https://get.rvm.io | bash -s stable
+          source /usr/local/rvm/scripts/rvm > /dev/null 2>&1
+          for version in {{ rvm }}; do
+              if [ "$version" == "jruby-head" ]; then
+                  continue
+              fi
+              rvm install ${version} --disable-binary > /dev/null 2>&1
+              rvm use ${version} > /dev/null 2>&1
+              echo "Running tests based on Ruby ${version}..."
+              ruby --version
+              gem install bundler
+              gem update bundler
+              bundle install --jobs=3 --retry=3
+              bundle exec rake test TESTOPTS="--verbose"
+          done
+        executable: /bin/bash
+        chdir: '{{ zuul.project.src_dir }}'
+      environment:
+        JRUBY_OPTS: '--debug'
+        ANSIBLE_PYTHON_INTERPRETER: /usr/bin/python3
+
+    - name: Run unittest tests for jruby-head
+      shell:
+        cmd: |
+          set -e
+          set -o pipefail
+          set -x
+          rvm install jruby-head --disable-binary
+          rvm use jruby-head
+          echo "Running tests based on Ruby jruby-head...
+          ruby --version
+          gem install bundler
+          gem update bundler
+          bundle install --jobs=3 --retry=3
+          bundle exec rake test TESTOPTS="--verbose"
+        executable: /bin/bash
+        chdir: '{{ zuul.project.src_dir }}'
+      environment:
+        JRUBY_OPTS: '--debug'
+        ANSIBLE_PYTHON_INTERPRETER: /usr/bin/python3
+      ignore_errors: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-openstack
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.26
 platform: ruby
 authors:
 - Matt Darby
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-20 00:00:00.000000000 Z
+date: 2018-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.40'
+        version: 1.45.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.40'
+        version: 1.45.0
 - !ruby/object:Gem::Dependency
   name: fog-json
   requirement: !ruby/object:Gem::Requirement
@@ -203,8 +203,8 @@ files:
 - ".hound.yml"
 - ".rubocop.yml"
 - ".ruby-gemset"
-- ".ruby-version"
 - ".travis.yml"
+- ".zuul.yaml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -1071,21 +1071,27 @@ files:
 - lib/fog/shared_file_system/openstack/models/shares.rb
 - lib/fog/shared_file_system/openstack/models/snapshot.rb
 - lib/fog/shared_file_system/openstack/models/snapshots.rb
+- lib/fog/shared_file_system/openstack/requests/add_security_service_to_share_network.rb
+- lib/fog/shared_file_system/openstack/requests/create_security_service.rb
 - lib/fog/shared_file_system/openstack/requests/create_share.rb
 - lib/fog/shared_file_system/openstack/requests/create_share_network.rb
 - lib/fog/shared_file_system/openstack/requests/create_snapshot.rb
+- lib/fog/shared_file_system/openstack/requests/delete_security_service.rb
 - lib/fog/shared_file_system/openstack/requests/delete_share.rb
 - lib/fog/shared_file_system/openstack/requests/delete_share_network.rb
 - lib/fog/shared_file_system/openstack/requests/delete_snapshot.rb
 - lib/fog/shared_file_system/openstack/requests/extend_share.rb
 - lib/fog/shared_file_system/openstack/requests/get_limits.rb
 - lib/fog/shared_file_system/openstack/requests/get_quota.rb
+- lib/fog/shared_file_system/openstack/requests/get_security_service.rb
 - lib/fog/shared_file_system/openstack/requests/get_share.rb
 - lib/fog/shared_file_system/openstack/requests/get_share_export_location.rb
 - lib/fog/shared_file_system/openstack/requests/get_share_network.rb
 - lib/fog/shared_file_system/openstack/requests/get_snapshot.rb
 - lib/fog/shared_file_system/openstack/requests/grant_share_access.rb
 - lib/fog/shared_file_system/openstack/requests/list_availability_zones.rb
+- lib/fog/shared_file_system/openstack/requests/list_security_services.rb
+- lib/fog/shared_file_system/openstack/requests/list_security_services_detail.rb
 - lib/fog/shared_file_system/openstack/requests/list_share_access_rules.rb
 - lib/fog/shared_file_system/openstack/requests/list_share_export_locations.rb
 - lib/fog/shared_file_system/openstack/requests/list_share_networks.rb
@@ -1094,10 +1100,13 @@ files:
 - lib/fog/shared_file_system/openstack/requests/list_shares_detail.rb
 - lib/fog/shared_file_system/openstack/requests/list_snapshots.rb
 - lib/fog/shared_file_system/openstack/requests/list_snapshots_detail.rb
+- lib/fog/shared_file_system/openstack/requests/remove_security_service_from_share_network.rb
 - lib/fog/shared_file_system/openstack/requests/revoke_share_access.rb
 - lib/fog/shared_file_system/openstack/requests/share_action.rb
+- lib/fog/shared_file_system/openstack/requests/share_network_action.rb
 - lib/fog/shared_file_system/openstack/requests/shrink_share.rb
 - lib/fog/shared_file_system/openstack/requests/update_quota.rb
+- lib/fog/shared_file_system/openstack/requests/update_security_service.rb
 - lib/fog/shared_file_system/openstack/requests/update_share.rb
 - lib/fog/shared_file_system/openstack/requests/update_share_network.rb
 - lib/fog/shared_file_system/openstack/requests/update_snapshot.rb
@@ -1340,6 +1349,9 @@ files:
 - lib/fog/workflow/openstack/v2/requests/validate_action.rb
 - lib/fog/workflow/openstack/v2/requests/validate_workbook.rb
 - lib/fog/workflow/openstack/v2/requests/validate_workflow.rb
+- playbooks/.gitkeep
+- playbooks/fog-openstack-unittest-spec/run.yaml
+- playbooks/fog-openstack-unittest-test/run.yaml
 - supported.md
 homepage: https://github.com/fog/fog-openstack
 licenses:
@@ -1353,7 +1365,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="