fog 1.32.0 → 1.33.0

data/lib/fog/openstack/requests/compute/list_zones.rb

@@ -2,17 +2,18 @@ module Fog
   module Compute
     class OpenStack
       class Real
-        def list_zones(*args)
+        def list_zones(options = {})
           request(
-            :expects  => 200,
-            :method   => 'GET',
-            :path     => 'os-availability-zone.json'
+            :expects => 200,
+            :method  => 'GET',
+            :path    => 'os-availability-zone.json',
+            :query   => options
           )
         end
       end
 
       class Mock
-        def list_zones(*args)
+        def list_zones(options = {})
           Excon::Response.new(
             :body   => { "availabilityZoneInfo" => [
                   {

data/lib/fog/openstack/requests/compute/list_zones_detailed.rb

@@ -0,0 +1,55 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def list_zones_detailed(options = {})
+          request(
+            :expects => 200,
+            :method  => 'GET',
+            :path    => 'os-availability-zone/detail.json',
+            :query   => options
+          )
+        end
+      end
+
+      class Mock
+        def list_zones_detailed(options = {})
+          Excon::Response.new(
+            :body   => {
+              "availabilityZoneInfo" => [
+                {
+                  "zoneState" => {
+                    "available" => true},
+                  "hosts" => {
+                    "instack.localdomain" => {
+                      "nova-conductor" => {
+                        "available" => true,
+                        "active" => true,
+                        "updated_at" => "2015-07-22T07:40:08.000000"},
+                      "nova-scheduler" => {
+                        "available" => true,
+                        "active" => true,
+                        "updated_at" => "2015-07-22T07:40:04.000000"},
+                      "nova-consoleauth" => {
+                        "available" => true,
+                        "active" => true,
+                        "updated_at" => "2015-07-22T07:40:09.000000"}}},
+                  "zoneName" => "internal"
+                },
+                {
+                  "zoneState" => {
+                    "available" => true},
+                  "hosts" => {
+                    "instack.localdomain" => {
+                      "nova-compute" => {
+                        "available" => true,
+                        "active" => true,
+                        "updated_at" => "2015-07-22T07:40:04.000000"}}},
+                  "zoneName" => "nova"}]},
+            :status => 200
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/compute/shelve_offload_server.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        # Shelve Off load the server. Data and resource associations are deleted.
+        #
+        # === Parameters
+        # * server_id <~String> - The ID of the server to be shelve off loaded
+        # === Returns
+        # * success <~Boolean>
+        def shelve_offload_server(server_id)
+          body = { 'shelveOffload' => nil }
+          server_action(server_id, body).status == 202
+        end # def shelve_off_load_server
+      end # class Real
+
+      class Mock
+        def shelve_offload_server(server_id)
+          true
+        end # def shelve_off_load_server
+      end # class Mock
+    end # class OpenStack
+  end # module Compute
+end # module Fog

data/lib/fog/openstack/requests/compute/shelve_server.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        # Shelve the server.
+        #
+        # === Parameters
+        # * server_id <~String> - The ID of the server to be shelved
+        # === Returns
+        # * success <~Boolean>
+        def shelve_server(server_id)
+          body = { 'shelve' => nil }
+          server_action(server_id, body).status == 202
+        end # def shelve_server
+      end # class Real
+
+      class Mock
+        def shelve_server(server_id)
+          true
+        end # def shelve_server
+      end # class Mock
+    end # class OpenStack
+  end # module Compute
+end # module Fog

data/lib/fog/openstack/requests/compute/unshelve_server.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        # Unshelve the server.
+        #
+        # === Parameters
+        # * server_id <~String> - The ID of the server to be unshelved
+        # === Returns
+        # * success <~Boolean>
+        def unshelve_server(server_id)
+          body = { 'unshelve' => nil }
+          server_action(server_id, body).status == 202
+        end # def unshelve_server
+      end # class Real
+
+      class Mock
+        def unshelve_server(server_id)
+          true
+        end # def unshelve_server
+      end # class Mock
+    end # class OpenStack
+  end # module Compute
+end # module Fog

data/lib/fog/openstack/requests/identity_v3/get_project.rb

@@ -3,11 +3,11 @@ module Fog
     class OpenStack
       class V3
         class Real
-          def get_project(id)
+          def get_project(id, options=[])
             request(
                 :expects => [200],
                 :method => 'GET',
-                :path => "projects/#{id}"
+                :path => "projects/#{id}?#{options.join '&'}"
             )
           end
         end

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

@@ -14,7 +14,7 @@ module Fog
           vanilla_options = [:name, :gateway_ip, :allocation_pools,
                              :dns_nameservers, :host_routes, :enable_dhcp,
                              :tenant_id]
-          vanilla_options.each do |key|
+          vanilla_options.select{ |o| options.key?(o) }.each do |key|
             data['subnet'][key] = options[key]
           end
 

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

@@ -5,8 +5,8 @@ module Fog
         def update_subnet(subnet_id, options = {})
           data = { 'subnet' => {} }
 
-          vanilla_options = [:name, :gateway_ip, :dns_nameservers,
-                             :host_routes, :enable_dhcp]
+          vanilla_options = [:name, :gateway_ip, :allocation_pools,
+                             :dns_nameservers, :host_routes, :enable_dhcp]
           vanilla_options.select{ |o| options.key?(o) }.each do |key|
             data['subnet'][key] = options[key]
           end
@@ -24,11 +24,12 @@ module Fog
         def update_subnet(subnet_id, options = {})
           response = Excon::Response.new
           if subnet = list_subnets.body['subnets'].find { |_| _['id'] == subnet_id }
-            subnet['name']            = options[:name]
-            subnet['gateway_ip']      = options[:gateway_ip]
-            subnet['dns_nameservers'] = options[:dns_nameservers]
-            subnet['host_routes']     = options[:host_routes]
-            subnet['enable_dhcp']     = options[:enable_dhcp]
+            subnet['name']              = options[:name]
+            subnet['gateway_ip']        = options[:gateway_ip]
+            subnet['dns_nameservers']   = options[:dns_nameservers]   || []
+            subnet['host_routes']       = options[:host_routes]       || []
+            subnet['allocation_pools']  = options[:allocation_pools]  || []
+            subnet['enable_dhcp']       = options[:enable_dhcp]
             response.body = { 'subnet' => subnet }
             response.status = 200
             response

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

@@ -0,0 +1,24 @@
+module Fog
+  module Volume
+    class OpenStack
+      # no Mock needed, test coverage in RSpec
+
+      class Real
+        def accept_transfer(transfer_id, auth_key)
+          data = {
+            'accept' => {
+              'auth_key' => auth_key
+            }
+          }
+
+          request(
+            :body    => Fog::JSON.encode(data),
+            :expects => [200, 202],
+            :method  => 'POST',
+            :path    => "os-volume-transfer/#{transfer_id}/accept"
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+module Fog
+  module Volume
+    class OpenStack
+      # no Mock needed, test coverage in RSpec
+
+      class Real
+        def create_transfer(volume_id, options={})
+          data = {
+            'transfer' => {
+              'volume_id' => volume_id
+            }
+          }
+          if options[:name]
+            data['transfer']['name'] = options[:name]
+          end
+
+          request(
+            :body     => Fog::JSON.encode(data),
+            :expects  => [200, 202],
+            :method   => 'POST',
+            :path     => 'os-volume-transfer'
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module Fog
+  module Volume
+    class OpenStack
+      # no Mock needed, test coverage in RSpec
+
+      class Real
+        def delete_transfer(transfer_id)
+          request(
+            :expects => 202,
+            :method  => 'DELETE',
+            :path    => "os-volume-transfer/#{transfer_id}"
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+module Fog
+  module Volume
+    class OpenStack
+      class Real
+        def extend_volume(volume_id, size)
+          body = { 'os-extend' => { 'new_size' => size } }
+          request(
+            :expects  => 202,
+            :method   => 'POST',
+            :path     => "volumes/#{volume_id}/action",
+            :body     => Fog::JSON.encode(body)
+          )
+        end
+      end
+
+      class Mock
+        def extend_volume(volume_id, size)
+          response = Excon::Response.new
+          response.status = 202
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module Fog
+  module Volume
+    class OpenStack
+      # no Mock needed, test coverage in RSpec
+
+      class Real
+        def get_transfer_details(transfer_id)
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "os-volume-transfer/#{transfer_id}"
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Fog
+  module Volume
+    class OpenStack
+      # no Mock needed, test coverage in RSpec
+
+      class Real
+        def list_transfers(options = {})
+          request(
+            :expects => 200,
+            :method  => 'GET',
+            :path    => 'os-volume-transfer',
+            :query   => options
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Fog
+  module Volume
+    class OpenStack
+      # no Mock needed, test coverage in RSpec
+
+      class Real
+        def list_transfers_detailed(options = {})
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => 'os-volume-transfer/detail',
+            :query    => options
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+module Fog
+  module Volume
+    class OpenStack
+      class Real
+        def list_zones(options = {})
+          request(
+            :expects => 200,
+            :method  => 'GET',
+            :path    => 'os-availability-zone.json',
+            :query   => options
+          )
+        end
+      end
+
+      class Mock
+        def list_zones(options = {})
+          Excon::Response.new(
+            :body   => {
+              "availabilityZoneInfo" => [
+                {
+                  "zoneState" => { "available" => true },
+                  "zoneName"  => "nova"
+                }
+              ]
+            },
+            :status => 200
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/storage.rb

@@ -8,7 +8,8 @@ module Fog
       recognizes :persistent, :openstack_service_name,
                  :openstack_service_type, :openstack_tenant,
                  :openstack_region, :openstack_temp_url_key,
-                 :openstack_endpoint_type
+                 :openstack_endpoint_type, :openstack_auth_token,
+                 :openstack_management_url
 
       model_path 'fog/openstack/models/storage'
       model       :directory
@@ -89,6 +90,7 @@ module Fog
           @connection_options     = options[:connection_options] || {}
           @openstack_temp_url_key = options[:openstack_temp_url_key]
           @openstack_endpoint_type = options[:openstack_endpoint_type] || 'publicURL'
+          @openstack_management_url = options[:openstack_management_url]
           authenticate
           @persistent = options[:persistent] || false
           @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)

data/lib/fog/openstack/volume.rb

@@ -15,9 +15,15 @@ module Fog
       model       :volume
       collection  :volumes
 
+      model       :availability_zone
+      collection  :availability_zones
+
       model       :volume_type
       collection  :volume_types
 
+      model       :transfer
+      collection  :transfers
+
       request_path 'fog/openstack/requests/volume'
 
        # Volume
@@ -25,8 +31,11 @@ module Fog
       request :list_volumes_detailed
       request :create_volume
       request :get_volume_details
+      request :extend_volume
       request :delete_volume
 
+      request :list_zones
+
       request :list_volume_types
       request :get_volume_type_details
 
@@ -35,6 +44,13 @@ module Fog
       request :get_snapshot_details
       request :delete_snapshot
 
+      request :list_transfers
+      request :list_transfers_detailed
+      request :create_transfer
+      request :get_transfer_details
+      request :accept_transfer
+      request :delete_transfer
+
       request :update_quota
       request :get_quota
       request :get_quota_defaults