fog 1.31.0 → 1.32.0

data/lib/fog/openstack/requests/baremetal/list_nodes_detailed.rb

@@ -2,24 +2,18 @@ module Fog
   module Baremetal
     class OpenStack
       class Real
-        def list_nodes_detailed(parameters=nil)
-          if parameters
-            query = parameters.each { |k, v| parameters[k] = URI::encode(v) }
-          else
-            query = {}
-          end
-
+        def list_nodes_detailed(options = {})
           request(
             :expects => [200, 204],
             :method  => 'GET',
             :path    => 'nodes/detail',
-            :query   => query
+            :query   => options
           )
         end
       end # class Real
 
       class Mock
-        def list_nodes_detailed(parameters=nil)
+        def list_nodes_detailed(options = {})
           response = Excon::Response.new
           response.status = [200, 204][rand(1)]
           response.body = { "nodes" => self.data[:nodes] }

data/lib/fog/openstack/requests/baremetal/list_ports.rb

@@ -2,24 +2,18 @@ module Fog
   module Baremetal
     class OpenStack
       class Real
-        def list_ports(parameters=nil)
-          if parameters
-            query = parameters.each { |k, v| parameters[k] = URI::encode(v) }
-          else
-            query = {}
-          end
-
+        def list_ports(options = {})
           request(
             :expects => [200, 204],
             :method  => 'GET',
             :path    => 'ports',
-            :query   => query
+            :query   => options
           )
         end
       end # class Real
 
       class Mock
-        def list_ports(parameters=nil)
+        def list_ports(options = {})
           response = Excon::Response.new
           response.status = [200, 204][rand(1)]
           response.body = {

data/lib/fog/openstack/requests/baremetal/list_ports_detailed.rb

@@ -2,24 +2,18 @@ module Fog
   module Baremetal
     class OpenStack
       class Real
-        def list_ports_detailed(parameters=nil)
-          if parameters
-            query = parameters.each { |k, v| parameters[k] = URI::encode(v) }
-          else
-            query = {}
-          end
-
+        def list_ports_detailed(options = {})
           request(
             :expects => [200, 204],
             :method  => 'GET',
             :path    => 'ports/detail',
-            :query   => query
+            :query   => options
           )
         end
       end # class Real
 
       class Mock
-        def list_ports_detailed(parameters=nil)
+        def list_ports_detailed(options = {})
           response = Excon::Response.new
           response.status = [200, 204][rand(1)]
           response.body = { "ports" => self.data[:ports] }

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

@@ -0,0 +1,30 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def add_aggregate_host(uuid, host_uuid)
+          data = {'add_host' => {'host' => host_uuid}}
+          request(
+            :body    => Fog::JSON.encode(data),
+            :expects => [200],
+            :method  => 'POST',
+            :path    => "os-aggregates/#{uuid}/action"
+          )
+        end
+      end
+
+      class Mock
+        def add_aggregate_host(uuid, host_uuid)
+          response = Excon::Response.new
+          response.status = 200
+          response.headers = {
+            "Content-Type" => "text/html; charset=UTF-8",
+            "Content-Length" => "0",
+            "Date" => Date.new
+          }
+          response
+        end
+      end # mock
+    end # openstack
+  end # compute
+end # fog

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

@@ -0,0 +1,42 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def create_aggregate(name, options = {})
+          data = {
+            'aggregate' => {
+              'name'       => name
+            }
+          }
+
+          vanilla_options = ["availability_zone"]
+
+          vanilla_options.select{|o| options[o]}.each do |key|
+            data['aggregate'][key] = options[key]
+          end
+
+          request(
+            :body    => Fog::JSON.encode(data),
+            :expects => [200],
+            :method  => 'POST',
+            :path    => "os-aggregates"
+          )
+        end
+      end
+
+      class Mock
+        def create_aggregate(name, options = {})
+          response = Excon::Response.new
+          response.status = 200
+          response.headers = {
+            "Content-Type" => "text/html; charset=UTF-8",
+            "Content-Length" => "0",
+            "Date" => Date.new
+          }
+          response.body = {'aggregate' => self.data[:aggregates].first}
+          response
+        end
+      end # mock
+    end # openstack
+  end # compute
+end # fog

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

@@ -0,0 +1,28 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def delete_aggregate(uuid)
+          request(
+            :expects => [200, 202, 204],
+            :method  => 'DELETE',
+            :path    => "os-aggregates/#{uuid}"
+          )
+        end
+      end
+
+      class Mock
+        def delete_aggregate(uuid)
+          response = Excon::Response.new
+          response.status = 200
+          response.headers = {
+            "Content-Type" => "text/html; charset=UTF-8",
+            "Content-Length" => "0",
+            "Date" => Date.new
+          }
+          response
+        end
+      end # mock
+    end # openstack
+  end # compute
+end # fog

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

@@ -0,0 +1,26 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def get_aggregate(uuid)
+          request(
+            :expects => [200],
+            :method  => 'GET',
+            :path    => "os-aggregates/#{uuid}"
+          )
+        end
+      end
+
+      class Mock
+        def get_aggregate(uuid)
+          response = Excon::Response.new
+          response.status = 2040
+          response.body = {'aggregate' => self.data[:aggregates].first.merge({
+            "hosts" => []})}
+
+          response
+        end
+      end # mock
+    end # openstack
+  end # compute
+end # fog

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

@@ -0,0 +1,36 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def list_aggregates(options = {})
+          request(
+            :expects => [200, 203],
+            :method  => 'GET',
+            :path    => 'os-aggregates',
+            :query   => options
+          )
+        end
+      end
+
+      class Mock
+        def list_aggregates(options = {})
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {'aggregates' => [{
+            "availability_zone" => "nova",
+            "created_at" => "2012-11-16T06:22:23.032493",
+            "deleted" => false,
+            "deleted_at" => nil,
+            "metadata" => {
+              "availability_zone" => "nova" },
+            "id" => 1,
+            "name" => "name",
+            "updated_at" => nil
+          }]}
+
+          response
+        end
+      end # mock
+    end # openstack
+  end # compute
+end # fog

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

@@ -2,17 +2,18 @@ module Fog
   module Compute
     class OpenStack
       class Real
-        def list_all_addresses
+        def list_all_addresses(options = {})
           request(
             :expects  => [200, 203],
             :method   => 'GET',
-            :path     => "os-floating-ips.json"
+            :path     => "os-floating-ips.json",
+            :query    => options
           )
         end
       end
 
       class Mock
-        def list_all_addresses
+        def list_all_addresses(options = {})
           response = Excon::Response.new
           response.status = 200
           response.headers = {

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

@@ -2,17 +2,18 @@ module Fog
   module Compute
     class OpenStack
       class Real
-        def list_flavors
+        def list_flavors(options = {})
           request(
-            :expects  => [200, 203],
-            :method   => 'GET',
-            :path     => 'flavors.json'
+            :expects => [200, 203],
+            :method  => 'GET',
+            :path    => 'flavors.json',
+            :query   => options
           )
         end
       end
 
       class Mock
-        def list_flavors
+        def list_flavors(options = {})
           response = Excon::Response.new
           response.status = 200
           response.body = {

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

@@ -2,17 +2,18 @@ module Fog
   module Compute
     class OpenStack
       class Real
-        def list_hosts
+        def list_hosts(options = {})
           request(
             :expects  => [200, 203],
             :method   => 'GET',
-            :path     => 'os-hosts.json'
+            :path     => 'os-hosts.json',
+            :query    => options
           )
         end
       end
 
       class Mock
-        def list_hosts
+        def list_hosts(options = {})
           response = Excon::Response.new
           response.status = 200
           response.body = { "hosts" => [

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

@@ -2,17 +2,18 @@ module Fog
   module Compute
     class OpenStack
       class Real
-        def list_key_pairs
+        def list_key_pairs(options = {})
           request(
             :expects  => [200, 203],
             :method   => 'GET',
-            :path     => 'os-keypairs.json'
+            :path     => 'os-keypairs.json',
+            :query    => options
           )
         end
       end
 
       class Mock
-        def list_key_pairs
+        def list_key_pairs(options = {})
           response = Excon::Response.new
           response.status = 200
           response.headers = {

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

@@ -2,15 +2,28 @@ module Fog
   module Compute
     class OpenStack
       class Real
-        def list_security_groups(server_id = nil)
+        def list_security_groups(options = {})
           path = "os-security-groups.json"
+
+          if options.is_a?(Hash)
+            server_id = options.delete(:server_id)
+            query = options
+          else
+            # Backwards compatibility layer, only server_id was passed as first parameter previously
+            Fog::Logger.deprecation('Calling OpenStack[:compute].list_security_groups(server_id) is deprecated, use .list_security_groups(:server_id => value) instead')
+            server_id = options
+            query = {}
+          end
+
           if server_id
             path = "servers/#{server_id}/#{path}"
           end
+
           request(
             :expects  => [200],
             :method   => 'GET',
-            :path     => path
+            :path     => path,
+            :query    => query
           )
         end
       end

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

@@ -2,18 +2,32 @@ module Fog
   module Compute
     class OpenStack
       class Real
-        def list_snapshots(detailed=true)
-          path = detailed ? 'os-snapshots/detail' : 'os-snapshots'
+        def list_snapshots(options = true)
+          if options.is_a?(Hash)
+            path = 'os-snapshots'
+            query = options
+          else
+            # Backwards compatibility layer, when 'detailed' boolean was sent as first param
+            if options
+              Fog::Logger.deprecation('Calling OpenStack[:compute].list_snapshots(true) is deprecated, use .list_snapshots_detail instead')
+            else
+              Fog::Logger.deprecation('Calling OpenStack[:compute].list_snapshots(false) is deprecated, use .list_snapshots({}) instead')
+            end
+            path = options ? 'os-snapshots/detail' : 'os-snapshots'
+            query = {}
+          end
+
           request(
             :expects  => 200,
             :method   => 'GET',
-            :path     => path
+            :path     => path,
+            :query    => query
           )
         end
       end
 
       class Mock
-        def list_snapshots(detailed=true)
+        def list_snapshots(options = true)
           response = Excon::Response.new
           response.status = 200
           response.body = {

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

@@ -0,0 +1,27 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def list_snapshots_detail(options = {})
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => 'os-snapshots/detail',
+            :query    => options
+          )
+        end
+      end
+
+      class Mock
+        def list_snapshots_detail(options = {})
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'snapshots' => [get_snapshot_details.body["snapshot"]]
+          }
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -2,18 +2,32 @@ module Fog
   module Compute
     class OpenStack
       class Real
-        def list_volumes(detailed=true)
-          path = detailed ? 'os-volumes/detail' : 'os-volumes'
+        def list_volumes(options = true)
+          if options.is_a?(Hash)
+            path = 'os-volumes'
+            query = options
+          else
+            # Backwards compatibility layer, when 'detailed' boolean was sent as first param
+            if options
+              Fog::Logger.deprecation('Calling OpenStack[:compute].list_volumes(true) is deprecated, use .list_volumes_detail instead')
+            else
+              Fog::Logger.deprecation('Calling OpenStack[:compute].list_volumes(false) is deprecated, use .list_volumes({}) instead')
+            end
+            path = options ? 'os-volumes/detail' : 'os-volumes'
+            query = {}
+          end
+
           request(
             :expects  => 200,
             :method   => 'GET',
-            :path     => path
+            :path     => path,
+            :query    => query
           )
         end
       end
 
       class Mock
-        def list_volumes(detailed=true)
+        def list_volumes(options = true)
           Excon::Response.new(
             :body   => { 'volumes' => self.data[:volumes].values },
             :status => 200