fog 1.27.0 → 1.28.0

data/lib/fog/openstack/requests/orchestration/list_resource_types.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Orchestration
+    class OpenStack
+      class Real
+        def list_resource_types
+          request(
+            :method  => 'GET',
+            :path    => "resource_types",
+            :expects => 200
+          )
+        end
+      end
+
+      class Mock
+        def list_resource_types
+          resources = self.data[:resource_types].values
+
+          Excon::Response.new(
+            :body   => { 'resource_types' => resources },
+            :status => 200
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/orchestration/list_resources.rb

@@ -0,0 +1,23 @@
+module Fog
+  module Orchestration
+    class OpenStack
+      class Real
+        def list_resources(stack, options={})
+          uri = "stacks/#{stack.stack_name}/#{stack.id}/resources"
+          request(:method => 'GET', :path => uri, :expects => 200, :query => options)
+        end
+      end
+
+      class Mock
+        def list_resources(stack)
+          resources = self.data[:resources].values
+
+          Excon::Response.new(
+            :body   => { 'resources' => resources },
+            :status => 200
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/orchestration/list_stack_data.rb

@@ -0,0 +1,27 @@
+module Fog
+  module Orchestration
+    class OpenStack
+      class Real
+        def list_stack_data(options={})
+          request(
+            :method  => 'GET',
+            :path    => 'stacks',
+            :expects => 200,
+            :query   => options
+          )
+        end
+      end
+
+      class Mock
+        def list_stack_data
+          stacks = self.data[:stacks].values
+
+          Excon::Response.new(
+            :body   => { 'stacks' => stacks },
+            :status => 200
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/orchestration/list_stack_events.rb

@@ -0,0 +1,23 @@
+module Fog
+  module Orchestration
+    class OpenStack
+      class Real
+        def list_stack_events(stack, options={})
+          uri = "stacks/#{stack.stack_name}/#{stack.id}/events"
+          request(:method => 'GET', :path => uri, :expects => 200, :query => options )
+        end
+      end
+
+      class Mock
+        def list_stack_events
+          events = self.data[:events].values
+
+          Excon::Response.new(
+            :body   => { 'events' => events },
+            :status => 200
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/orchestration/preview_stack.rb

@@ -0,0 +1,16 @@
+module Fog
+  module Orchestration
+    class OpenStack
+      class Real
+        def preview_stack(options = {})
+          request(
+            :body     => Fog::JSON.encode(options),
+            :expects  => [200],
+            :method   => 'POST',
+            :path     => 'stacks/preview'
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/orchestration/show_event_details.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Orchestration
+    class OpenStack
+      class Real
+        def show_event_details(stack, resource, event_id)
+          request(
+            :method  => 'GET',
+            :path    => "stacks/#{stack.stack_name}/#{stack.id}/resources/#{resource.resource_name}/events/#{event_id}",
+            :expects => 200
+          )
+        end
+      end
+
+      class Mock
+        def show_event_details(stack, event)
+          events = self.data[:events].values
+
+          Excon::Response.new(
+            :body   => { 'events' => events },
+            :status => 200
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/orchestration/show_resource_data.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Orchestration
+    class OpenStack
+      class Real
+        def show_resource_data(stack_name, stack_id, resource_name)
+          request(
+            :method  => 'GET',
+            :path    => "stacks/#{stack_name}/#{stack_id}/resources/#{resource_name}",
+            :expects => 200
+          )
+        end
+      end
+
+      class Mock
+        def show_resource_data(stack_name, stack_id, resource_name)
+          resources = self.data[:resources].values
+
+          Excon::Response.new(
+            :body   => { 'resources' => resources },
+            :status => 200
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/orchestration/show_resource_metadata.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Orchestration
+    class OpenStack
+      class Real
+        def show_resource_metadata(stack, resource_name)
+          request(
+            :method  => 'GET',
+            :path    => "stacks/#{stack.stack_name}/#{stack.id}/resources/#{resource_name}/metadata",
+            :expects => 200
+          )
+        end
+      end
+
+      class Mock
+        def show_resource_metadata(stack, resource_name)
+          resources = self.data[:resources].values
+
+          Excon::Response.new(
+            :body   => { 'resources' => resources },
+            :status => 200
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/orchestration/show_resource_schema.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Orchestration
+    class OpenStack
+      class Real
+        def show_resource_schema(name)
+          request(
+            :method  => 'GET',
+            :path    => "resource_types/#{name}",
+            :expects => 200
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/orchestration/show_resource_template.rb

@@ -0,0 +1,20 @@
+module Fog
+  module Orchestration
+    class OpenStack
+      class Real
+        def show_resource_template(name)
+          request(
+            :method  => 'GET',
+            :path    => "resource_types/#{name}/template",
+            :expects => 200
+          )
+        end
+      end
+
+      class Mock
+        def show_resource_template(name)
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/orchestration/show_stack_details.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Orchestration
+    class OpenStack
+      class Real
+        def show_stack_details(name, id)
+          request(
+            :method  => 'GET',
+            :path    => "stacks/#{name}/#{id}",
+            :expects => 200
+          )
+        end
+      end
+
+      class Mock
+        def show_stack_details(name, id)
+          stack = self.data[:stack].values
+
+          Excon::Response.new(
+            :body   => { 'stack' => stack },
+            :status => 200
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/orchestration/update_stack.rb

@@ -4,18 +4,29 @@ module Fog
       class Real
         # Update a stack.
         #
-        # @param [String] stack_id ID of the stack to update.
-        # @param [String] stack_name Name of the stack to update.
+        # @param [Fog::Orchestration::OpenStack::Stack] the stack to update.
         # @param [Hash] options
         #   * :template [String] Structure containing the template body.
         #   or (one of the two Template parameters is required)
         #   * :template_url [String] URL of file containing the template body.
         #   * :parameters [Hash] Hash of providers to supply to template.
         #
-        def update_stack(stack_id, stack_name, options = {})
-          params = {
-            :stack_name => stack_name
-          }.merge(options)
+        def update_stack(arg1, arg2 = nil, arg3 = nil)
+          if arg1.is_a?(Stack)
+            # Normal use, update_stack(stack, options = {})
+            stack = arg1
+            stack_name = stack.stack_name
+            stack_id = stack.id
+            params = arg2.nil? ? {} : arg2
+          else
+            # Deprecated, update_stack(stack_id, stack_name, options = {})
+            Fog::Logger.deprecation("#update_stack(stack_id, stack_name, options) is deprecated, use #update_stack(stack, options) instead [light_black](#{caller.first})[/]")
+            stack_id = arg1
+            stack_name = arg2
+            params = {
+              :stack_name => stack_name
+            }.merge(arg3.nil? ? {} : arg3)
+          end
 
           request(
             :expects  => 202,
@@ -27,7 +38,23 @@ module Fog
       end
 
       class Mock
-        def update_stack(stack_name, options = {})
+        def update_stack(arg1, arg2 = nil, arg3 = nil)
+          if arg1.is_a?(Stack)
+            # Normal use, update_stack(stack, options = {})
+            stack = arg1
+            stack_name = stack.stack_name
+            stack_id = stack.id
+            params = arg2.nil? ? {} : arg2
+          else
+            # Deprecated, update_stack(stack_id, stack_name, options = {})
+            Fog::Logger.deprecation("#update_stack(stack_id, stack_name, options) is deprecated, use #update_stack(stack, options) instead [light_black](#{caller.first})[/]")
+            stack_id = arg1
+            stack_name = arg2
+            params = {
+              :stack_name => stack_name
+            }.merge(arg3.nil? ? {} : arg3)
+          end
+
           response = Excon::Response.new
           response.status = 202
           response.body = {}

data/lib/fog/openstack/requests/orchestration/validate_template.rb

@@ -0,0 +1,16 @@
+module Fog
+  module Orchestration
+    class OpenStack
+      class Real
+        def validate_template(options = {})
+          request(
+            :body     => Fog::JSON.encode(options),
+            :expects  => [200],
+            :method   => 'POST',
+            :path     => 'validate'
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/volume.rb

@@ -193,7 +193,6 @@ module Fog
               :openstack_api_key  => @openstack_api_key,
               :openstack_username => @openstack_username,
               :openstack_auth_uri => @openstack_auth_uri,
-              :openstack_region   => @openstack_region,
               :openstack_auth_token => @openstack_must_reauthenticate ? nil : @openstack_auth_token,
               :openstack_service_type => @openstack_service_type,
               :openstack_service_name => @openstack_service_name,

data/lib/fog/ovirt/compute.rb

@@ -45,9 +45,12 @@ module Fog
       request :vm_ticket
       request :list_vm_volumes
       request :list_template_volumes
+      request :list_volumes
       request :add_volume
       request :destroy_volume
       request :update_volume
+      request :attach_volume
+      request :detach_volume
       request :get_api_version
       request :list_quotas
       request :get_quota
@@ -65,6 +68,8 @@ module Fog
             opts[key] = case value
                         when OVIRT::Link
                           value.id
+                        when OVIRT::TemplateVersion
+                          value
                         when Array
                           value
                         when Hash
@@ -114,6 +119,7 @@ module Fog
           connection_opts[:ca_cert_store] = options[:ovirt_ca_cert_store]
           connection_opts[:ca_cert_file]  = options[:ovirt_ca_cert_file]
           connection_opts[:ca_no_verify]  = options[:ovirt_ca_no_verify]
+          connection_opts[:filtered_api]  = options[:ovirt_filtered_api]
 
           @client = OVIRT::Client.new(username, password, url, connection_opts)
         end

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

@@ -89,6 +89,16 @@ module Fog
           service.update_volume(id, attrs)
         end
 
+        def attach_volume(attrs)
+          wait_for { stopped? } if attrs[:blocking]
+          service.attach_volume(id, attrs)
+        end
+
+        def detach_volume(attrs)
+          wait_for { stopped? } if attrs[:blocking]
+          service.detach_volume(id, attrs)
+        end
+
         def start(options = {})
           wait_for { !locked? } if options[:blocking]
           service.vm_action(:id =>id, :action => :start)

data/lib/fog/ovirt/models/compute/template.rb

@@ -19,6 +19,7 @@ module Fog
         attribute :cluster
         attribute :interfaces
         attribute :volumes
+        attribute :version
 
         def interfaces
           attributes[:interfaces] ||= id.nil? ? [] : Fog::Compute::Ovirt::Interfaces.new(

data/lib/fog/ovirt/models/compute/volumes.rb

@@ -10,13 +10,12 @@ module Fog
         attr_accessor :vm
 
         def all(filters = {})
-          requires :vm
           if vm.is_a? Fog::Compute::Ovirt::Server
             load service.list_vm_volumes(vm.id)
           elsif vm.is_a? Fog::Compute::Ovirt::Template
             load service.list_template_volumes(vm.id)
           else
-            raise 'volumes should have vm or template'
+            load service.list_volumes
           end
         end
 

data/lib/fog/ovirt/requests/compute/attach_volume.rb

@@ -0,0 +1,22 @@
+module Fog
+  module Compute
+    class Ovirt
+      class Real
+        def attach_volume(id, options)
+          raise ArgumentError, "instance id is a required parameter" unless id
+          raise ArgumentError, "volume id is a required parameter for attach-volume" unless options.key? :id
+
+          client.attach_volume(id, options[:id])
+        end
+      end
+
+      class Mock
+        def attach_volume(id, options)
+          raise ArgumentError, "instance id is a required parameter" unless id
+          raise ArgumentError, "volume id is a required parameter for attach-volume" unless options.key? :id
+          true
+        end
+      end
+    end
+  end
+end