fog-openstack 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 562236470fef48eeb59f994f20b39968991a886b
-  data.tar.gz: 01ae0328e668f1f71851b6bfb8a90e60ace343c1
+  metadata.gz: b2e12b17ba616a2d5b1d1290312ff5d1cd489c62
+  data.tar.gz: b81c3f55d47899d6f5ecc77b25065ad77f3df5d0
 SHA512:
-  metadata.gz: c4d4cbed29e2fa54a229dff53bcdf9902ced680f9dd59c9fa78ed097b79ac1a9db4638ce888e3151ba510705415cbfd66fb6f1235961348263526851aa7581e6
-  data.tar.gz: 17e26ef37b2e5e5d1b2704c76d2a02de1168cbb60eec3885cf1e9069f56e1d800f77cecc4e586b8926add7d6329882757c681c2af80128952a2d3112deaca045
+  metadata.gz: 7b0cc3dfc3872a6cf24819aa45831807d5cbfec03cc9e992aced62f3576218befdb1e67502029e6b708b7a6d3fd3228924b09873e510ffa68304570b99003b5a
+  data.tar.gz: f3d442b936d042cdbdc13c3c446fc6f3af09a5c9e602152b154dd61abe18c3b71bd219ce93156df38d220520e7a45d0bdc3dc9c826be1d3e488e3bc211636d76

data/.travis.yml

@@ -2,7 +2,6 @@ language: ruby
 sudo: false
 script:
   - bundle exec rake test
-  - bundle exec rake minitest
   - bundle exec rake spec
 env:
   - JRUBY_OPTS=--debug

data/README.md

@@ -59,7 +59,7 @@ If you're using Keystone V2, you don't need to supply domain details but ensure
 
 ```ruby
 @connection_params = {
-  openstack_auth_url:     "http://devstack.test:5000/v2.0/tokens"
+  openstack_auth_url:     "http://devstack.test:5000/v2.0/tokens",
   openstack_username:     "admin",
   openstack_api_key:      "password",
   openstack_project_name: "admin"
@@ -514,7 +514,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/fog-openstack. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/fog/fog-openstack. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 
 ## License

data/Rakefile

@@ -6,15 +6,8 @@ RuboCop::RakeTask.new
 
 task :default => :test
 
-# To be removed once after Minitest migration
-desc 'Run fog-openstack unit tests with Shindo'
-task :test do
-  mock = ENV['FOG_MOCK'] || 'true'
-  sh("export FOG_MOCK=#{mock} && bundle exec shindont")
-end
-
 desc 'Run fog-openstack unit tests with Minitest'
-task :minitest do
+task :test do
   mock = ENV['FOG_MOCK'] || 'true'
   sh("export FOG_MOCK=#{mock} && bundle exec rake tests:unit")
 end

data/docs/orchestration.md

@@ -316,3 +316,22 @@ service.templates.validate(:template => content)
     content=nil
   >
 ```
+
+## Cancel Update
+When the stack is updating, you can cancel the update:
+
+```ruby
+# stack.stack_status == 'UPDATE_IN_PROGRESS'
+stack.cancel_update
+=> nil
+```
+
+Then you can see the status changed to ROLLBACK_IN_PROGRESS:
+
+```ruby
+stack = service.stacks.get(stack.stack_name, stack.id)
+stack.stack_status
+=> "ROLLBACK_IN_PROGRESS"
+```
+
+

data/fog-openstack.gemspec

@@ -24,7 +24,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'ipaddress', '>= 0.8'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'coveralls'
+# TODO: remove when https://github.com/fog/fog-openstack/issues/202 is fixed
+#  spec.add_development_dependency 'coveralls'
   spec.add_development_dependency "mime-types"
   spec.add_development_dependency "mime-types-data"
   spec.add_development_dependency 'rake',    '~> 10.0'

data/gemfiles/Gemfile-1.9

@@ -15,5 +15,6 @@ group :development, :test do
   gem "vcr"
   gem "webmock",         "~> 1.24.6"
   gem "json",            "< 2.0"
-  gem "coveralls",       "< 0.8.15"
+# TODO: remove when https://github.com/fog/fog-openstack/issues/202 is fixed
+#  gem "coveralls",       "< 0.8.15"
 end

data/lib/fog/dns/openstack/v2.rb

@@ -18,6 +18,12 @@ module Fog
                    :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id,
                    :openstack_identity_prefix, :openstack_temp_url_key, :openstack_cache_ttl
 
+        model_path 'fog/dns/openstack/v2/models'
+        model       :zone
+        collection  :zones
+        model       :recordset
+        collection  :recordsets
+
         request_path 'fog/dns/openstack/v2/requests'
 
         request :list_zones
@@ -35,6 +41,20 @@ module Fog
         request :get_quota
         request :update_quota
 
+        def self.setup_headers(options)
+          # user needs to have admin privileges to ask for all projects
+          all_projects = options.delete(:all_projects) || false
+
+          # user needs to have admin privileges to impersonate another project
+          # don't ask for all and one project at the same time
+          project_id = options.delete(:project_id) unless all_projects
+
+          headers = {'X-Auth-All-Projects' => all_projects}
+          headers['X-Auth-Sudo-Project-Id'] = project_id unless project_id.nil?
+
+          [headers, options]
+        end
+
         class Mock
           def self.data
             @data ||= Hash.new do |hash, key|

data/lib/fog/dns/openstack/v2/models/recordset.rb

@@ -0,0 +1,55 @@
+require 'fog/openstack/models/model'
+
+module Fog
+  module DNS
+    class OpenStack
+      class V2
+        class Recordset < Fog::OpenStack::Model
+          identity :id
+
+          attribute :name
+          attribute :project_id
+          attribute :status
+          attribute :action
+          attribute :zone_id
+          attribute :zone_name
+          attribute :type
+          attribute :records
+          attribute :version
+          attribute :created_at
+          attribute :links
+
+          attribute :ttl
+          attribute :description
+          attribute :updated_at
+
+          def save
+            raise Fog::Errors::Error, 'Resaving an existing object may create a duplicate' if persisted?
+            requires :zone_id, :name, :type, :records
+            merge_attributes(service.create_recordset(zone_id, name, type, records, attributes).body)
+            true
+          end
+
+          # overwritten because zone_id is needed for get
+          def reload(options = {})
+            requires :zone_id, :id
+            merge_attributes(collection.get(zone_id, id, options).attributes)
+            self
+          end
+
+          def update(options = nil)
+            requires :zone_id, :id
+            merge_attributes(service.update_recordset(zone_id, id, options || attributes).body)
+            self
+          end
+
+          def destroy(options = {})
+            requires :zone_id, :id
+            service.delete_recordset(zone_id, id, options)
+            true
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/dns/openstack/v2/models/recordsets.rb

@@ -0,0 +1,30 @@
+require 'fog/openstack/models/collection'
+require 'fog/dns/openstack/v2/models/recordset'
+
+module Fog
+  module DNS
+    class OpenStack
+      class V2
+        class Recordsets < Fog::OpenStack::Collection
+          model Fog::DNS::OpenStack::V2::Recordset
+
+          def all(options = {})
+            load_response(service.list_recordsets(options), 'recordsets')
+          end
+
+          def find_by_id(zone_id, id, options = {})
+            recordset_hash = service.get_recordset(zone_id, id, options).body
+            new(recordset_hash.merge(:service => service))
+          end
+
+          alias get find_by_id
+
+          def destroy(zone_id, id, options = {})
+            recordset = find_by_id(zone_id, id, options)
+            recordset.destroy
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/dns/openstack/v2/models/zone.rb

@@ -0,0 +1,50 @@
+require 'fog/openstack/models/model'
+
+module Fog
+  module DNS
+    class OpenStack
+      class V2
+        class Zone < Fog::OpenStack::Model
+          identity :id
+
+          attribute :name
+          attribute :email
+          attribute :pool_id
+          attribute :project_id
+          attribute :serial
+          attribute :status
+          attribute :action
+          attribute :masters
+          attribute :version
+          attribute :links
+          attribute :created_at
+          attribute :transfered_at
+
+          attribute :ttl
+          attribute :description
+          attribute :type
+          attribute :updated_at
+
+          def save
+            raise Fog::Errors::Error, 'Resaving an existing object may create a duplicate' if persisted?
+            requires :name, :email
+            merge_attributes(service.create_zone(name, email, attributes).body)
+            true
+          end
+
+          def update(options = nil)
+            requires :id
+            merge_attributes(service.update_zone(id, options || attributes).body)
+            self
+          end
+
+          def destroy(options = {})
+            requires :id
+            service.delete_zone(id, options)
+            true
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/dns/openstack/v2/models/zones.rb

@@ -0,0 +1,30 @@
+require 'fog/openstack/models/collection'
+require 'fog/dns/openstack/v2/models/zone'
+
+module Fog
+  module DNS
+    class OpenStack
+      class V2
+        class Zones < Fog::OpenStack::Collection
+          model Fog::DNS::OpenStack::V2::Zone
+
+          def all(options = {})
+            load_response(service.list_zones(options), 'zones')
+          end
+
+          def find_by_id(id, options = {})
+            zone_hash = service.get_zone(id, options).body
+            new(zone_hash.merge(:service => service))
+          end
+
+          alias get find_by_id
+
+          def destroy(id, options = {})
+            zone = find_by_id(id, options)
+            zone.destroy
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/dns/openstack/v2/requests/delete_recordset.rb

@@ -3,17 +3,19 @@ module Fog
     class OpenStack
       class V2
         class Real
-          def delete_recordset(zone_id, id)
+          def delete_recordset(zone_id, id, options = {})
+            headers, _options = Fog::DNS::OpenStack::V2.setup_headers(options)
             request(
               :expects => 202,
               :method  => 'DELETE',
-              :path    => "zones/#{zone_id}/recordsets/#{id}"
+              :path    => "zones/#{zone_id}/recordsets/#{id}",
+              :headers => headers
             )
           end
         end
 
         class Mock
-          def delete_recordset(zone_id, id)
+          def delete_recordset(zone_id, id, _options = {})
             response = Excon::Response.new
             response.status = 202
 

data/lib/fog/dns/openstack/v2/requests/delete_zone.rb

@@ -3,17 +3,19 @@ module Fog
     class OpenStack
       class V2
         class Real
-          def delete_zone(id)
+          def delete_zone(id, options = {})
+            headers, _options = Fog::DNS::OpenStack::V2.setup_headers(options)
             request(
               :expects => 202,
               :method  => 'DELETE',
-              :path    => "zones/#{id}"
+              :path    => "zones/#{id}",
+              :headers => headers
             )
           end
         end
 
         class Mock
-          def delete_zone(id)
+          def delete_zone(id, _options = {})
             response = Excon::Response.new
             response.status = 202
 

data/lib/fog/dns/openstack/v2/requests/get_quota.rb

@@ -4,11 +4,13 @@ module Fog
       class V2
         class Real
           def get_quota(project_id = nil)
+            headers, _options = Fog::DNS::OpenStack::V2.setup_headers(:all_projects => !project_id.nil?)
+
             request(
-              :headers => {"X-Auth-All-Projects" => !project_id.nil?},
               :expects => 200,
               :method  => 'GET',
-              :path    => "quotas/#{project_id}"
+              :path    => "quotas/#{project_id}",
+              :headers => headers
             )
           end
         end

data/lib/fog/dns/openstack/v2/requests/get_recordset.rb

@@ -3,11 +3,13 @@ module Fog
     class OpenStack
       class V2
         class Real
-          def get_recordset(zone_id, id)
+          def get_recordset(zone_id, id, options = {})
+            headers, _options = Fog::DNS::OpenStack::V2.setup_headers(options)
             request(
               :expects => 200,
               :method  => 'GET',
-              :path    => "zones/#{zone_id}/recordsets/#{id}"
+              :path    => "zones/#{zone_id}/recordsets/#{id}",
+              :headers => headers
             )
           end
         end

data/lib/fog/dns/openstack/v2/requests/get_zone.rb

@@ -3,17 +3,19 @@ module Fog
     class OpenStack
       class V2
         class Real
-          def get_zone(id)
+          def get_zone(id, options = {})
+            headers, _options = Fog::DNS::OpenStack::V2.setup_headers(options)
             request(
               :expects => 200,
               :method  => 'GET',
-              :path    => "zones/#{id}"
+              :path    => "zones/#{id}",
+              :headers => headers
             )
           end
         end
 
         class Mock
-          def get_zone(id)
+          def get_zone(id, _options = {})
             response = Excon::Response.new
             response.status = 200
             zone = data[:zone_updated] || data[:zones].first

data/lib/fog/dns/openstack/v2/requests/list_recordsets.rb

@@ -3,22 +3,46 @@ module Fog
     class OpenStack
       class V2
         class Real
-          def list_recordsets(zone_id, options = {})
+          def list_recordsets(zone_id = nil, options = {})
+            # for backward compatability: consider removing the zone_id param (breaking change)
+            unless zone_id.nil?
+              if zone_id.kind_of?(Hash)
+                options = zone_id
+                zone_id = nil
+              else
+                Fog::Logger.deprecation(
+                  'Calling list_recordsets(zone_id) is deprecated, use .list_recordsets(zone_id: value) instead'
+                )
+              end
+            end
+
+            zone_id = options.delete(:zone_id) if zone_id.nil?
+            path = zone_id.nil? ? 'recordsets' : "zones/#{zone_id}/recordsets"
+
+            headers, options = Fog::DNS::OpenStack::V2.setup_headers(options)
+
             request(
               :expects => 200,
               :method  => 'GET',
-              :path    => "zones/#{zone_id}/recordsets",
-              :query   => options
+              :path    => path,
+              :query   => options,
+              :headers => headers
             )
           end
         end
 
         class Mock
-          def list_recordsets(zone_id, _options = {})
+          def list_recordsets(zone_id = nil, options = {})
+            if zone_id.kind_of?(Hash)
+              options = zone_id
+              zone_id = nil
+            end
+            zone_id = options.delete(:zone_id) if zone_id.nil?
+
             response = Excon::Response.new
             response.status = 200
             data[:recordsets]["recordsets"].each do |rs|
-              rs["zone_id"] = zone_id
+              rs["zone_id"] = zone_id unless zone_id.nil?
             end
             response.body = data[:recordsets]
             response