fog-openstack 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c387f1e8f0cd35e7874025d2f11ff0ad70c4dea
-  data.tar.gz: ad86278d35068d29b19931d4e9833a26bb05da65
+  metadata.gz: 562236470fef48eeb59f994f20b39968991a886b
+  data.tar.gz: 01ae0328e668f1f71851b6bfb8a90e60ace343c1
 SHA512:
-  metadata.gz: 6386fea77004cdec7969178a3646d784b15512795c6f69ac8b9e48a591d302fa4aad9587ff09f275c09361765552cbac608e24d6a7af371ca7c563566df05555
-  data.tar.gz: 3ab984e99befeee71444cb79c77ed109a877b5c9baa943b963fcd9db8d793b77ab9ab502b0b42682e4c664952c0892cd8ebb9d2067fd9a22689e4efce8f47e3d
+  metadata.gz: c4d4cbed29e2fa54a229dff53bcdf9902ced680f9dd59c9fa78ed097b79ac1a9db4638ce888e3151ba510705415cbfd66fb6f1235961348263526851aa7581e6
+  data.tar.gz: 17e26ef37b2e5e5d1b2704c76d2a02de1168cbb60eec3885cf1e9069f56e1d800f77cecc4e586b8926add7d6329882757c681c2af80128952a2d3112deaca045

data/examples/volume/backups.rb

@@ -0,0 +1,41 @@
+require 'fog/openstack'
+require 'fog/workflow/openstack/v2'
+
+auth_url = "http://192.0.2.1:5000/v3/auth/tokens"
+username = "admin"
+password = "1b1d81f7e25b53e497246b168971823c5754f395"
+project  = "admin"
+
+@connection_params = {
+  :openstack_auth_url     => auth_url,
+  :openstack_username     => username,
+  :openstack_api_key      => password,
+  :openstack_project_name => project,
+  :openstack_domain_id    => "default",
+}
+
+cinder = Fog::Volume::OpenStack.new(@connection_params)
+
+puts "INFO: create backup of existing volume named test"
+
+response = cinder.create_backup({:name => 'test-backup',
+                                 :volume_id => '82fe2ad5-43a3-4c2b-8464-e57b138ea81c'})
+puts response.body
+
+puts "INFO: list backups"
+
+backups = cinder.backups
+
+puts "INFO: get details of existing backup"
+
+backup_id = backups[0].id
+backup = cinder.backups.get(backup_id)
+
+puts "INFO: restore backup"
+
+response = backup.restore('82fe2ad5-43a3-4c2b-8464-e57b138ea81c')
+puts response.body
+
+puts "INFO: delete backup"
+
+backup.destroy

data/lib/fog/compute/openstack/models/server.rb

@@ -147,7 +147,11 @@ module Fog
 
         def public_ip_addresses
           if floating_ip_addresses.empty?
-            addresses.select { |s| s[0] =~ /public/i }.collect { |a| a[1][0]['addr'] }
+            if addresses
+              addresses.select { |s| s[0] =~ /public/i }.collect { |a| a[1][0]['addr'] }
+            else
+              []
+            end
           else
             floating_ip_addresses
           end

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

@@ -21,6 +21,16 @@ module Fog
         request_path 'fog/dns/openstack/v2/requests'
 
         request :list_zones
+        request :get_zone
+        request :create_zone
+        request :update_zone
+        request :delete_zone
+
+        request :list_recordsets
+        request :get_recordset
+        request :create_recordset
+        request :update_recordset
+        request :delete_recordset
 
         request :get_quota
         request :update_quota
@@ -29,7 +39,7 @@ module Fog
           def self.data
             @data ||= Hash.new do |hash, key|
               hash[key] = {
-                :zones => [{
+                :zones      => [{
                   "id"             => "a86dba58-0043-4cc6-a1bb-69d5e86f3ca3",
                   "pool_id"        => "572ba08c-d929-4c70-8e42-03824bb24ca2",
                   "project_id"     => "4335d1f0-f793-11e2-b778-0800200c9a66",
@@ -38,7 +48,7 @@ module Fog
                   "ttl"            => 7200,
                   "serial"         => 1_404_757_531,
                   "status"         => "ACTIVE",
-                  "action"         => "CREATE",
+                  "action"         => "NONE",
                   "description"    => "This is an example zone.",
                   "masters"        => [],
                   "type"           => "PRIMARY",
@@ -50,12 +60,42 @@ module Fog
                     "self" => "https://127.0.0.1:9001/v2/zones/a86dba58-0043-4cc6-a1bb-69d5e86f3ca3"
                   }
                 }],
-                :quota => {
+                :quota      => {
                   "api_export_size"   => 1000,
                   "recordset_records" => 20,
                   "zone_records"      => 500,
                   "zone_recordsets"   => 500,
                   "zones"             => 100
+                },
+                :recordsets => {
+                  "recordsets" => [{
+                    "description" => "This is an example record set.",
+                    "links"       => {
+                      "self" => "https://127.0.0.1:9001/v2/zones/2150b1bf-dee2-4221-9d85-11f7886fb15f/recordsets/f7b10e9b-0cae-4a91-b162-562bc6096648"
+                    },
+                    "updated_at"  => '',
+                    "records"     => [
+                      "10.1.0.2"
+                    ],
+                    "ttl"         => 3600,
+                    "id"          => "f7b10e9b-0cae-4a91-b162-562bc6096648",
+                    "name"        => "example.org.",
+                    "project_id"  => "4335d1f0-f793-11e2-b778-0800200c9a66",
+                    "zone_id"     => "2150b1bf-dee2-4221-9d85-11f7886fb15f",
+                    "zone_name"   => "example.com.",
+                    "created_at"  => "2014-10-24T19:59:44.000000",
+                    "version"     => 1,
+                    "type"        => "A",
+                    "status"      => "ACTIVE",
+                    "action"      => "NONE"
+                  }],
+                  "links"      => {
+                    "self" => "http://127.0.0.1:9001/v2/recordsets?limit=1",
+                    "next" => "http://127.0.0.1:9001/v2/recordsets?limit=1&marker=45fd892d-7a67-4f65-9df0-87273f228d6c"
+                  },
+                  "metadata"   => {
+                    "total_count" => 2
+                  }
                 }
               }
             end

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

@@ -0,0 +1,54 @@
+module Fog
+  module DNS
+    class OpenStack
+      class V2
+        class Real
+          def create_recordset(zone_id, name, type, records, options = {})
+            data = {
+              'name'    => name,
+              'type'    => type,
+              'records' => records
+            }
+
+            vanilla_options = [:ttl, :description]
+
+            vanilla_options.select { |o| options[o] }.each do |key|
+              data[key] = options[key]
+            end
+
+            request(
+              :body    => Fog::JSON.encode(data),
+              :expects => 202,
+              :method  => 'POST',
+              :path    => "zones/#{zone_id}/recordsets"
+            )
+          end
+        end
+
+        class Mock
+          def create_recordset(zone_id, name, type, records, options = {})
+            # stringify keys
+            options = Hash[options.map { |k, v| [k.to_s, v] }]
+
+            response = Excon::Response.new
+            response.status = 202
+
+            recordset = data[:recordsets]["recordsets"].first.dup
+            recordset_id = recordset["id"]
+
+            recordset["zone_id"]       = zone_id
+            recordset["name"]          = name
+            recordset["type"]          = type
+            recordset["records"]       = records
+            recordset["status"]        = "PENDING"
+            recordset["action"]        = "CREATE"
+            recordset["links"]["self"] = "https://127.0.0.1:9001/v2/zones/#{zone_id}/recordsets/#{recordset_id}"
+
+            response.body = recordset.merge(options)
+            response
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+module Fog
+  module DNS
+    class OpenStack
+      class V2
+        class Real
+          def create_zone(name, email, options = {})
+            data = {
+              'name'  => name,
+              'email' => email
+            }
+
+            vanilla_options = [:ttl, :description, :type, :masters]
+
+            vanilla_options.select { |o| options[o] }.each do |key|
+              data[key] = options[key]
+            end
+
+            request(
+              :body    => Fog::JSON.encode(data),
+              :expects => 202,
+              :method  => 'POST',
+              :path    => "zones"
+            )
+          end
+        end
+
+        class Mock
+          def create_zone(name, email, options = {})
+            # stringify keys
+            options = Hash[options.map { |k, v| [k.to_s, v] }]
+
+            response = Excon::Response.new
+            response.status = 202
+
+            zone = data[:zones].first.dup
+
+            zone["name"]          = name
+            zone["email"]         = email
+            zone["status"]        = "PENDING"
+            zone["action"]        = "CREATE"
+
+            response.body = zone.merge(options)
+            response
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+module Fog
+  module DNS
+    class OpenStack
+      class V2
+        class Real
+          def delete_recordset(zone_id, id)
+            request(
+              :expects => 202,
+              :method  => 'DELETE',
+              :path    => "zones/#{zone_id}/recordsets/#{id}"
+            )
+          end
+        end
+
+        class Mock
+          def delete_recordset(zone_id, id)
+            response = Excon::Response.new
+            response.status = 202
+
+            recordset                  = data[:recordset_updated] || data[:recordsets]["recordsets"].first.dup
+            recordset["zone_id"]       = zone_id
+            recordset["id"]            = id
+            recordset["status"]        = "PENDING"
+            recordset["action"]        = "DELETE"
+            recordset["links"]["self"] = "https://127.0.0.1:9001/v2/zones/#{zone_id}/recordsets/#{id}"
+
+            response.body = recordset
+            response
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+module Fog
+  module DNS
+    class OpenStack
+      class V2
+        class Real
+          def delete_zone(id)
+            request(
+              :expects => 202,
+              :method  => 'DELETE',
+              :path    => "zones/#{id}"
+            )
+          end
+        end
+
+        class Mock
+          def delete_zone(id)
+            response = Excon::Response.new
+            response.status = 202
+
+            zone                  = data[:zone_updated] || data[:zones].first.dup
+            zone["id"]            = id
+            zone["status"]        = "PENDING"
+            zone["action"]        = "DELETE"
+            zone["links"]["self"] = "https://127.0.0.1:9001/v2/zones/#{id}"
+
+            response.body = zone
+            response
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+module Fog
+  module DNS
+    class OpenStack
+      class V2
+        class Real
+          def get_recordset(zone_id, id)
+            request(
+              :expects => 200,
+              :method  => 'GET',
+              :path    => "zones/#{zone_id}/recordsets/#{id}"
+            )
+          end
+        end
+
+        class Mock
+          def get_recordset(zone_id, id)
+            response = Excon::Response.new
+            response.status = 200
+
+            recordset                  = data[:recordset_updated] || data[:recordsets]["recordsets"].first
+            recordset["zone_id"]       = zone_id
+            recordset["id"]            = id
+            recordset["action"]        = "NONE"
+            recordset["status"]        = "ACTIVE"
+            recordset["links"]["self"] = "https://127.0.0.1:9001/v2/zones/#{zone_id}/recordsets/#{id}"
+
+            response.body = recordset
+            response
+          end
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -0,0 +1,30 @@
+module Fog
+  module DNS
+    class OpenStack
+      class V2
+        class Real
+          def list_recordsets(zone_id, options = {})
+            request(
+              :expects => 200,
+              :method  => 'GET',
+              :path    => "zones/#{zone_id}/recordsets",
+              :query   => options
+            )
+          end
+        end
+
+        class Mock
+          def list_recordsets(zone_id, _options = {})
+            response = Excon::Response.new
+            response.status = 200
+            data[:recordsets]["recordsets"].each do |rs|
+              rs["zone_id"] = zone_id
+            end
+            response.body = data[:recordsets]
+            response
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+module Fog
+  module DNS
+    class OpenStack
+      class V2
+        class Real
+          def update_recordset(zone_id, id, options = {})
+            request(
+              :body    => Fog::JSON.encode(options),
+              :expects => 202,
+              :method  => 'PUT',
+              :path    => "zones/#{zone_id}/recordsets/#{id}"
+            )
+          end
+        end
+
+        class Mock
+          def update_recordset(zone_id, id, options = {})
+            # stringify keys
+            options = Hash[options.map { |k, v| [k.to_s, v] }]
+
+            data[:recordset_updated]                  = data[:recordsets]["recordsets"].first.merge(options)
+            data[:recordset_updated]["zone_id"]       = zone_id
+            data[:recordset_updated]["id"]            = id
+            data[:recordset_updated]["status"]        = "PENDING"
+            data[:recordset_updated]["action"]        = "UPDATE"
+            data[:recordset_updated]["links"]["self"] = "https://127.0.0.1:9001/v2/zones/#{zone_id}/recordsets/#{id}"
+
+            response = Excon::Response.new
+            response.status = 202
+            response.body = data[:recordset_updated]
+            response
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+module Fog
+  module DNS
+    class OpenStack
+      class V2
+        class Real
+          def update_zone(id, options = {})
+            request(
+              :body    => Fog::JSON.encode(options),
+              :expects => 202,
+              :method  => 'PATCH',
+              :path    => "zones/#{id}"
+            )
+          end
+        end
+
+        class Mock
+          def update_zone(id, options = {})
+            # stringify keys
+            options = Hash[options.map { |k, v| [k.to_s, v] }]
+
+            data[:zone_updated]                  = data[:zones].first.merge(options)
+            data[:zone_updated]["id"]            = id
+            data[:zone_updated]["status"]        = "PENDING"
+            data[:zone_updated]["action"]        = "UPDATE"
+            data[:zone_updated]["links"]["self"] = "https://127.0.0.1:9001/v2/zones/#{id}"
+
+            response = Excon::Response.new
+            response.status = 202
+            response.body = data[:zone_updated]
+            response
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/network/openstack/requests/update_router.rb

@@ -11,7 +11,7 @@ module Fog
         def update_router(router_id, options = {})
           data = {'router' => {}}
 
-          [:name, :admin_state_up].each do |key|
+          [:name, :admin_state_up, :routes].each do |key|
             data['router'][key] = options[key] if options[key]
           end
 
@@ -53,9 +53,11 @@ module Fog
             if egi.kind_of?(Fog::Network::OpenStack::Network)
               Fog::Logger.deprecation "Passing a model objects into options[:external_gateway_info] is deprecated. \
               Please pass  external external gateway as follows options[:external_gateway_info] = { :network_id => NETWORK_ID }]"
-              router[:external_gateway_info] = {:network_id => egi.id}
-            else egi.kind_of?(Hash) && egi[:network_id]
-                 router[:external_gateway_info] = egi
+              router[:external_gateway_info] = { :network_id => egi.id }
+            elsif egi.is_a?(Hash)
+              router[:external_gateway_info] = egi
+            else
+              raise ArgumentError.new('Invalid external_gateway_info attribute')
             end
           end
 

data/lib/fog/openstack/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Openstack
-    VERSION = "0.1.11"
+    VERSION = "0.1.12"
   end
 end

data/lib/fog/volume/openstack/models/backup.rb

@@ -0,0 +1,46 @@
+require 'fog/openstack/models/model'
+
+module Fog
+  module Volume
+    class OpenStack
+      class Backup < Fog::OpenStack::Model
+        attribute :availability_zone
+        attribute :container
+        attribute :created_at
+        attribute :description
+        attribute :fail_reason
+        attribute :name
+        attribute :object_count
+        attribute :size
+        attribute :status
+        attribute :volume_id
+        attribute :is_incremental
+        attribute :has_dependent_backups
+
+        def create
+          requires :name, :volume_id
+          data = service.create_backup(attributes)
+          merge_attributes(data.body['backup'])
+          true
+        end
+
+        def destroy
+          requires :id
+          service.delete_backup(id)
+          true
+        end
+
+        def restore(volume_id)
+          requires :id
+          service.restore_backup(id, volume_id)
+          true
+        end
+
+        def volume
+          requires :id
+          service.get_volume_details(volume_id).body['volume']
+        end
+      end
+    end
+  end
+end

data/lib/fog/volume/openstack/models/backups.rb

@@ -0,0 +1,26 @@
+require 'fog/openstack/models/collection'
+
+module Fog
+  module Volume
+    class OpenStack
+      module Backups
+        def all(options = {})
+          load_response(service.list_backups_detailed(options), 'backups')
+        end
+
+        def summary(options = {})
+          load_response(service.list_backups(options), 'backups')
+        end
+
+        def get(backup_id)
+          backup = service.get_backup_details(backup_id).body['backup']
+          if backup
+            new(backup)
+          end
+        rescue Fog::Volume::OpenStack::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+module Fog
+  module Volume
+    class OpenStack
+      module Real
+        def create_backup(attributes)
+          desired_options = [
+            :container,
+            :name,
+            :description,
+            :volume_id,
+            :incremental,
+            :force,
+          ]
+
+          # Filter only allowed creation attributes
+          data = {
+            :backup => attributes.select { |key, _value| desired_options.include?(key.to_sym) }
+          }
+
+          request(
+            :body => Fog::JSON.encode(data),
+            :expects => [200, 202],
+            :method => 'POST',
+            :path => 'backups'
+          )
+        end
+      end
+
+      module Mock
+        def create_backup(_options = {})
+          response = Excon::Response.new
+          response.status = 202
+          response.body = {
+            "backup" => {
+              "id" => "1",
+              "volume_id" => "2",
+              "name" => "backup 1",
+              "status" => "available",
+              "size" => 1,
+              "object_count" => 16,
+              "container" => "testcontainer",
+            }
+          }
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+module Fog
+  module Volume
+    class OpenStack
+      module Real
+        def delete_backup(backup_id)
+          request(
+            :expects => 202,
+            :method  => 'DELETE',
+            :path    => "backups/#{backup_id}"
+          )
+        end
+      end
+
+      module Mock
+        def delete_backup(_backup_id)
+          response = Excon::Response.new
+          response.status = 204
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+module Fog
+  module Volume
+    class OpenStack
+      module Real
+        def get_backup_details(backup_id)
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "backups/#{backup_id}"
+          )
+        end
+      end
+
+      module Mock
+        def get_backup_details(_backup_id)
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            "backup" => {
+              "id" => "1",
+              "volume_id" => "2",
+              "name" => "backup 1",
+              "status" => "available",
+              "size" => 1,
+              "object_count" => 16,
+              "container" => "testcontainer",
+            }
+          }
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Fog
+  module Volume
+    class OpenStack
+      module Real
+        def list_backups(options = {})
+          request(
+            :expects => 200,
+            :method  => 'GET',
+            :path    => 'backups',
+            :query   => options
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+module Fog
+  module Volume
+    class OpenStack
+      module Real
+        def list_backups_detailed(options = {})
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => 'backups/detail',
+            :query    => options
+          )
+        end
+      end
+
+      module Mock
+        def list_backups_detailed(_options = {})
+          response = Excon::Response.new
+          response.status = 200
+          data[:backups] ||= [
+            {
+              "id" => "1",
+              "volume_id" => "2",
+              "name" => "backup 1",
+              "status" => "available",
+              "size" => 1,
+              "object_count" => 16,
+              "container" => "testcontainer",
+            },
+            {
+              "id" => "2",
+              "volume_id" => "2",
+              "name" => "backup 2",
+              "status" => "available",
+              "size" => 1,
+              "object_count" => 16,
+              "container" => "testcontainer",
+            }
+          ]
+          response.body = { 'backups' => data[:backups] }
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module Fog
+  module Volume
+    class OpenStack
+      module Real
+        def restore_backup(backup_id, volume_id)
+          data = { 'restore' => { 'volume_id' => volume_id } }
+          request(
+            :expects  => 202,
+            :method   => 'POST',
+            :path     => "backups/#{backup_id}/restore",
+            :body     => Fog::JSON.encode(data)
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/volume/openstack/v1.rb

@@ -28,6 +28,9 @@ module Fog
         model :transfer
         collection :transfers
 
+        model :backup
+        collection :backups
+
         request_path 'fog/volume/openstack/v1/requests'
 
         # Volume
@@ -62,6 +65,13 @@ module Fog
         request :accept_transfer
         request :delete_transfer
 
+        request :list_backups
+        request :list_backups_detailed
+        request :create_backup
+        request :get_backup_details
+        request :restore_backup
+        request :delete_backup
+
         request :update_quota
         request :get_quota
         request :get_quota_defaults

data/lib/fog/volume/openstack/v1/models/backup.rb

@@ -0,0 +1,15 @@
+require 'fog/volume/openstack/models/backup'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V1
+        class Backup < Fog::Volume::OpenStack::Backup
+          identity :id
+
+          superclass.attributes.each { |attrib| attribute attrib }
+        end
+      end
+    end
+  end
+end

data/lib/fog/volume/openstack/v1/models/backups.rb

@@ -0,0 +1,16 @@
+require 'fog/openstack/models/collection'
+require 'fog/volume/openstack/v1/models/backup'
+require 'fog/volume/openstack/models/backups'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V1
+        class Backups < Fog::OpenStack::Collection
+          model Fog::Volume::OpenStack::V1::Backup
+          include Fog::Volume::OpenStack::Backups
+        end
+      end
+    end
+  end
+end

data/lib/fog/volume/openstack/v1/requests/create_backup.rb

@@ -0,0 +1,2 @@
+require 'fog/volume/openstack/requests/create_backup'
+require 'fog/volume/openstack/v1/requests/real'

data/lib/fog/volume/openstack/v1/requests/delete_backup.rb

@@ -0,0 +1,2 @@
+require 'fog/volume/openstack/requests/delete_backup'
+require 'fog/volume/openstack/v1/requests/real'

data/lib/fog/volume/openstack/v1/requests/get_backup_details.rb

@@ -0,0 +1,2 @@
+require 'fog/volume/openstack/requests/get_backup_details'
+require 'fog/volume/openstack/v1/requests/real'

data/lib/fog/volume/openstack/v1/requests/list_backups.rb

@@ -0,0 +1,2 @@
+require 'fog/volume/openstack/requests/list_backups'
+require 'fog/volume/openstack/v1/requests/real'

data/lib/fog/volume/openstack/v1/requests/list_backups_detailed.rb

@@ -0,0 +1,2 @@
+require 'fog/volume/openstack/requests/list_backups_detailed'
+require 'fog/volume/openstack/v1/requests/real'

data/lib/fog/volume/openstack/v1/requests/restore_backup.rb

@@ -0,0 +1,2 @@
+require 'fog/volume/openstack/requests/restore_backup'
+require 'fog/volume/openstack/v1/requests/real'

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

@@ -28,6 +28,9 @@ module Fog
         model :transfer
         collection :transfers
 
+        model :backup
+        collection :backups
+
         request_path 'fog/volume/openstack/v2/requests'
 
         # Volume
@@ -63,6 +66,13 @@ module Fog
         request :accept_transfer
         request :delete_transfer
 
+        request :list_backups
+        request :list_backups_detailed
+        request :create_backup
+        request :get_backup_details
+        request :restore_backup
+        request :delete_backup
+
         request :update_quota
         request :get_quota
         request :get_quota_defaults

data/lib/fog/volume/openstack/v2/models/backup.rb

@@ -0,0 +1,15 @@
+require 'fog/volume/openstack/models/backup'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V2
+        class Backup < Fog::Volume::OpenStack::Backup
+          identity :id
+
+          superclass.attributes.each { |attrib| attribute attrib }
+        end
+      end
+    end
+  end
+end

data/lib/fog/volume/openstack/v2/models/backups.rb

@@ -0,0 +1,16 @@
+require 'fog/openstack/models/collection'
+require 'fog/volume/openstack/v2/models/backup'
+require 'fog/volume/openstack/models/backups'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V2
+        class Backups < Fog::OpenStack::Collection
+          model Fog::Volume::OpenStack::V2::Backup
+          include Fog::Volume::OpenStack::Backups
+        end
+      end
+    end
+  end
+end

data/lib/fog/volume/openstack/v2/requests/create_backup.rb

@@ -0,0 +1,2 @@
+require 'fog/volume/openstack/requests/create_backup'
+require 'fog/volume/openstack/v2/requests/real'

data/lib/fog/volume/openstack/v2/requests/delete_backup.rb

@@ -0,0 +1,2 @@
+require 'fog/volume/openstack/requests/delete_backup'
+require 'fog/volume/openstack/v2/requests/real'

data/lib/fog/volume/openstack/v2/requests/get_backup_details.rb

@@ -0,0 +1,2 @@
+require 'fog/volume/openstack/requests/get_backup_details'
+require 'fog/volume/openstack/v2/requests/real'

data/lib/fog/volume/openstack/v2/requests/list_backups.rb

@@ -0,0 +1,2 @@
+require 'fog/volume/openstack/requests/list_backups'
+require 'fog/volume/openstack/v2/requests/real'

data/lib/fog/volume/openstack/v2/requests/list_backups_detailed.rb

@@ -0,0 +1,2 @@
+require 'fog/volume/openstack/requests/list_backups_detailed'
+require 'fog/volume/openstack/v2/requests/real'

data/lib/fog/volume/openstack/v2/requests/restore_backup.rb

@@ -0,0 +1,2 @@
+require 'fog/volume/openstack/requests/restore_backup'
+require 'fog/volume/openstack/v2/requests/real'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-openstack
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Matt Darby
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -249,6 +249,7 @@ files:
 - examples/network/network_subnets_routers.rb
 - examples/planning/basics.rb
 - examples/storage/set-account-quota.rb
+- examples/volume/backups.rb
 - examples/workflow/workflow-examples.rb
 - fog-openstack.gemspec
 - gemfiles/Gemfile-1.9
@@ -456,9 +457,18 @@ files:
 - lib/fog/dns/openstack/v1/requests/list_domains.rb
 - lib/fog/dns/openstack/v1/requests/update_quota.rb
 - lib/fog/dns/openstack/v2.rb
+- lib/fog/dns/openstack/v2/requests/create_recordset.rb
+- lib/fog/dns/openstack/v2/requests/create_zone.rb
+- lib/fog/dns/openstack/v2/requests/delete_recordset.rb
+- lib/fog/dns/openstack/v2/requests/delete_zone.rb
 - lib/fog/dns/openstack/v2/requests/get_quota.rb
+- lib/fog/dns/openstack/v2/requests/get_recordset.rb
+- lib/fog/dns/openstack/v2/requests/get_zone.rb
+- lib/fog/dns/openstack/v2/requests/list_recordsets.rb
 - lib/fog/dns/openstack/v2/requests/list_zones.rb
 - lib/fog/dns/openstack/v2/requests/update_quota.rb
+- lib/fog/dns/openstack/v2/requests/update_recordset.rb
+- lib/fog/dns/openstack/v2/requests/update_zone.rb
 - lib/fog/identity/openstack.rb
 - lib/fog/identity/openstack/v2.rb
 - lib/fog/identity/openstack/v2/models/ec2_credential.rb
@@ -921,6 +931,8 @@ files:
 - lib/fog/volume/openstack.rb
 - lib/fog/volume/openstack/models/availability_zone.rb
 - lib/fog/volume/openstack/models/availability_zones.rb
+- lib/fog/volume/openstack/models/backup.rb
+- lib/fog/volume/openstack/models/backups.rb
 - lib/fog/volume/openstack/models/snapshot.rb
 - lib/fog/volume/openstack/models/snapshots.rb
 - lib/fog/volume/openstack/models/transfer.rb
@@ -931,10 +943,12 @@ files:
 - lib/fog/volume/openstack/models/volumes.rb
 - lib/fog/volume/openstack/requests/accept_transfer.rb
 - lib/fog/volume/openstack/requests/action.rb
+- lib/fog/volume/openstack/requests/create_backup.rb
 - lib/fog/volume/openstack/requests/create_snapshot.rb
 - lib/fog/volume/openstack/requests/create_transfer.rb
 - lib/fog/volume/openstack/requests/create_volume.rb
 - lib/fog/volume/openstack/requests/create_volume_type.rb
+- lib/fog/volume/openstack/requests/delete_backup.rb
 - lib/fog/volume/openstack/requests/delete_metadata.rb
 - lib/fog/volume/openstack/requests/delete_snapshot.rb
 - lib/fog/volume/openstack/requests/delete_snapshot_metadata.rb
@@ -942,6 +956,7 @@ files:
 - lib/fog/volume/openstack/requests/delete_volume.rb
 - lib/fog/volume/openstack/requests/delete_volume_type.rb
 - lib/fog/volume/openstack/requests/extend_volume.rb
+- lib/fog/volume/openstack/requests/get_backup_details.rb
 - lib/fog/volume/openstack/requests/get_quota.rb
 - lib/fog/volume/openstack/requests/get_quota_defaults.rb
 - lib/fog/volume/openstack/requests/get_quota_usage.rb
@@ -949,6 +964,8 @@ files:
 - lib/fog/volume/openstack/requests/get_transfer_details.rb
 - lib/fog/volume/openstack/requests/get_volume_details.rb
 - lib/fog/volume/openstack/requests/get_volume_type_details.rb
+- lib/fog/volume/openstack/requests/list_backups.rb
+- lib/fog/volume/openstack/requests/list_backups_detailed.rb
 - lib/fog/volume/openstack/requests/list_snapshots.rb
 - lib/fog/volume/openstack/requests/list_snapshots_detailed.rb
 - lib/fog/volume/openstack/requests/list_transfers.rb
@@ -958,6 +975,7 @@ files:
 - lib/fog/volume/openstack/requests/list_volumes_detailed.rb
 - lib/fog/volume/openstack/requests/list_zones.rb
 - lib/fog/volume/openstack/requests/replace_metadata.rb
+- lib/fog/volume/openstack/requests/restore_backup.rb
 - lib/fog/volume/openstack/requests/set_tenant.rb
 - lib/fog/volume/openstack/requests/update_metadata.rb
 - lib/fog/volume/openstack/requests/update_quota.rb
@@ -968,6 +986,8 @@ files:
 - lib/fog/volume/openstack/v1.rb
 - lib/fog/volume/openstack/v1/models/availability_zone.rb
 - lib/fog/volume/openstack/v1/models/availability_zones.rb
+- lib/fog/volume/openstack/v1/models/backup.rb
+- lib/fog/volume/openstack/v1/models/backups.rb
 - lib/fog/volume/openstack/v1/models/snapshot.rb
 - lib/fog/volume/openstack/v1/models/snapshots.rb
 - lib/fog/volume/openstack/v1/models/transfer.rb
@@ -978,10 +998,12 @@ files:
 - lib/fog/volume/openstack/v1/models/volumes.rb
 - lib/fog/volume/openstack/v1/requests/accept_transfer.rb
 - lib/fog/volume/openstack/v1/requests/action.rb
+- lib/fog/volume/openstack/v1/requests/create_backup.rb
 - lib/fog/volume/openstack/v1/requests/create_snapshot.rb
 - lib/fog/volume/openstack/v1/requests/create_transfer.rb
 - lib/fog/volume/openstack/v1/requests/create_volume.rb
 - lib/fog/volume/openstack/v1/requests/create_volume_type.rb
+- lib/fog/volume/openstack/v1/requests/delete_backup.rb
 - lib/fog/volume/openstack/v1/requests/delete_metadata.rb
 - lib/fog/volume/openstack/v1/requests/delete_snapshot.rb
 - lib/fog/volume/openstack/v1/requests/delete_snapshot_metadata.rb
@@ -989,6 +1011,7 @@ files:
 - lib/fog/volume/openstack/v1/requests/delete_volume.rb
 - lib/fog/volume/openstack/v1/requests/delete_volume_type.rb
 - lib/fog/volume/openstack/v1/requests/extend_volume.rb
+- lib/fog/volume/openstack/v1/requests/get_backup_details.rb
 - lib/fog/volume/openstack/v1/requests/get_quota.rb
 - lib/fog/volume/openstack/v1/requests/get_quota_defaults.rb
 - lib/fog/volume/openstack/v1/requests/get_quota_usage.rb
@@ -996,6 +1019,8 @@ files:
 - lib/fog/volume/openstack/v1/requests/get_transfer_details.rb
 - lib/fog/volume/openstack/v1/requests/get_volume_details.rb
 - lib/fog/volume/openstack/v1/requests/get_volume_type_details.rb
+- lib/fog/volume/openstack/v1/requests/list_backups.rb
+- lib/fog/volume/openstack/v1/requests/list_backups_detailed.rb
 - lib/fog/volume/openstack/v1/requests/list_snapshots.rb
 - lib/fog/volume/openstack/v1/requests/list_snapshots_detailed.rb
 - lib/fog/volume/openstack/v1/requests/list_transfers.rb
@@ -1007,6 +1032,7 @@ files:
 - lib/fog/volume/openstack/v1/requests/real.rb
 - lib/fog/volume/openstack/v1/requests/real_mock.rb
 - lib/fog/volume/openstack/v1/requests/replace_metadata.rb
+- lib/fog/volume/openstack/v1/requests/restore_backup.rb
 - lib/fog/volume/openstack/v1/requests/set_tenant.rb
 - lib/fog/volume/openstack/v1/requests/update_metadata.rb
 - lib/fog/volume/openstack/v1/requests/update_quota.rb
@@ -1016,6 +1042,8 @@ files:
 - lib/fog/volume/openstack/v2.rb
 - lib/fog/volume/openstack/v2/models/availability_zone.rb
 - lib/fog/volume/openstack/v2/models/availability_zones.rb
+- lib/fog/volume/openstack/v2/models/backup.rb
+- lib/fog/volume/openstack/v2/models/backups.rb
 - lib/fog/volume/openstack/v2/models/snapshot.rb
 - lib/fog/volume/openstack/v2/models/snapshots.rb
 - lib/fog/volume/openstack/v2/models/transfer.rb
@@ -1026,10 +1054,12 @@ files:
 - lib/fog/volume/openstack/v2/models/volumes.rb
 - lib/fog/volume/openstack/v2/requests/accept_transfer.rb
 - lib/fog/volume/openstack/v2/requests/action.rb
+- lib/fog/volume/openstack/v2/requests/create_backup.rb
 - lib/fog/volume/openstack/v2/requests/create_snapshot.rb
 - lib/fog/volume/openstack/v2/requests/create_transfer.rb
 - lib/fog/volume/openstack/v2/requests/create_volume.rb
 - lib/fog/volume/openstack/v2/requests/create_volume_type.rb
+- lib/fog/volume/openstack/v2/requests/delete_backup.rb
 - lib/fog/volume/openstack/v2/requests/delete_metadata.rb
 - lib/fog/volume/openstack/v2/requests/delete_snapshot.rb
 - lib/fog/volume/openstack/v2/requests/delete_snapshot_metadata.rb
@@ -1037,6 +1067,7 @@ files:
 - lib/fog/volume/openstack/v2/requests/delete_volume.rb
 - lib/fog/volume/openstack/v2/requests/delete_volume_type.rb
 - lib/fog/volume/openstack/v2/requests/extend_volume.rb
+- lib/fog/volume/openstack/v2/requests/get_backup_details.rb
 - lib/fog/volume/openstack/v2/requests/get_quota.rb
 - lib/fog/volume/openstack/v2/requests/get_quota_defaults.rb
 - lib/fog/volume/openstack/v2/requests/get_quota_usage.rb
@@ -1044,6 +1075,8 @@ files:
 - lib/fog/volume/openstack/v2/requests/get_transfer_details.rb
 - lib/fog/volume/openstack/v2/requests/get_volume_details.rb
 - lib/fog/volume/openstack/v2/requests/get_volume_type_details.rb
+- lib/fog/volume/openstack/v2/requests/list_backups.rb
+- lib/fog/volume/openstack/v2/requests/list_backups_detailed.rb
 - lib/fog/volume/openstack/v2/requests/list_snapshots.rb
 - lib/fog/volume/openstack/v2/requests/list_snapshots_detailed.rb
 - lib/fog/volume/openstack/v2/requests/list_transfers.rb
@@ -1055,6 +1088,7 @@ files:
 - lib/fog/volume/openstack/v2/requests/real.rb
 - lib/fog/volume/openstack/v2/requests/real_mock.rb
 - lib/fog/volume/openstack/v2/requests/replace_metadata.rb
+- lib/fog/volume/openstack/v2/requests/restore_backup.rb
 - lib/fog/volume/openstack/v2/requests/set_tenant.rb
 - lib/fog/volume/openstack/v2/requests/update_metadata.rb
 - lib/fog/volume/openstack/v2/requests/update_quota.rb