fog-openstack 0.1.7 → 0.1.8

data/lib/fog/openstack/requests/workflow_v2/list_workflows.rb

@@ -0,0 +1,30 @@
+module Fog
+  module Workflow
+    class OpenStack
+      class V2
+        class Real
+          def list_workflows(params = {})
+            body = Fog::JSON.encode(params)
+            request(
+              :body    => body,
+              :expects => 200,
+              :method  => "GET",
+              :path    => "workflows"
+            )
+          end
+        end
+
+        class Mock
+          def list_workflows(_params = {})
+            response = Excon::Response.new
+            response.status = 200
+            response.body = { "workflows" =>
+                              [{ "name" => "workflow1", "description" => "d1" },
+                               { "name" => "workflow2", "description" => "d2" }] }
+            response
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/workflow_v2/rerun_task.rb

@@ -0,0 +1,33 @@
+module Fog
+  module Workflow
+    class OpenStack
+      class V2
+        class Real
+          def rerun_task(task_ex_id)
+            rerun_payload = {
+              :id    => task_ex_id,
+              :state => 'RUNNING',
+              :reset => true
+            }
+            body = Fog::JSON.encode(rerun_payload)
+            request(
+              :body    => body,
+              :expects => 200,
+              :method  => "PUT",
+              :path    => "tasks/#{task_ex_id}"
+            )
+          end
+        end
+
+        class Mock
+          def update_action(_task_ex_id)
+            response = Excon::Response.new
+            response.status = 200
+            response.body = ""
+            response
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/workflow_v2/update_action.rb

@@ -0,0 +1,28 @@
+module Fog
+  module Workflow
+    class OpenStack
+      class V2
+        class Real
+          def update_action(definition)
+            body = Fog::JSON.encode(definition)
+            request(
+              :body    => body,
+              :expects => 200,
+              :method  => "PUT",
+              :path    => "actions"
+            )
+          end
+        end
+
+        class Mock
+          def update_action(_definition)
+            response = Excon::Response.new
+            response.status = 200
+            response.body = ""
+            response
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/workflow_v2/update_action_execution.rb

@@ -0,0 +1,33 @@
+module Fog
+  module Workflow
+    class OpenStack
+      class V2
+        class Real
+          def update_action_execution(id, name, value)
+            # valid values for name are:
+            # state, output
+            # https://github.com/openstack/python-mistralclient/blob/master/mistralclient/commands/v2/action_executions.py
+            data = { :id => id }
+            data[name] = Fog::JSON.encode(value)
+            body = Fog::JSON.encode(data)
+            request(
+              :body    => body,
+              :expects => 200,
+              :method  => "PUT",
+              :path    => "action_executions"
+            )
+          end
+        end
+
+        class Mock
+          def update_action_execution(_id, _name, _value)
+            response = Excon::Response.new
+            response.status = 200
+            response.body = ""
+            response
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/workflow_v2/update_environment.rb

@@ -0,0 +1,31 @@
+module Fog
+  module Workflow
+    class OpenStack
+      class V2
+        class Real
+          def update_environment(definition)
+            unless definition["variables"].nil?
+              definition["variables"] = Fog::JSON.encode(definition["variables"])
+            end
+            body = Fog::JSON.encode(definition)
+            request(
+              :body    => body,
+              :expects => 200,
+              :method  => "PUT",
+              :path    => "environments"
+            )
+          end
+        end
+
+        class Mock
+          def update_environment(_definition)
+            response = Excon::Response.new
+            response.status = 200
+            response.body = ""
+            response
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/workflow_v2/update_execution.rb

@@ -0,0 +1,33 @@
+module Fog
+  module Workflow
+    class OpenStack
+      class V2
+        class Real
+          def update_execution(id, name, value)
+            # valid values for name are:
+            # state, description, env
+            # https://github.com/openstack/python-mistralclient/blob/master/mistralclient/commands/v2/executions.py
+            data = { :id => id }
+            data[name] = Fog::JSON.encode(value)
+            body = Fog::JSON.encode(data)
+            request(
+              :body    => body,
+              :expects => 200,
+              :method  => "PUT",
+              :path    => "executions"
+            )
+          end
+        end
+
+        class Mock
+          def update_execution(_id, _name, _value)
+            response = Excon::Response.new
+            response.status = 200
+            response.body = ""
+            response
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/workflow_v2/update_workbook.rb

@@ -0,0 +1,28 @@
+module Fog
+  module Workflow
+    class OpenStack
+      class V2
+        class Real
+          def update_workbook(definition)
+            body = Fog::JSON.encode(definition)
+            request(
+              :body    => body,
+              :expects => 200,
+              :method  => "PUT",
+              :path    => "workbooks"
+            )
+          end
+        end
+
+        class Mock
+          def update_workbook(_definition)
+            response = Excon::Response.new
+            response.status = 200
+            response.body = ""
+            response
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/workflow_v2/update_workflow.rb

@@ -0,0 +1,28 @@
+module Fog
+  module Workflow
+    class OpenStack
+      class V2
+        class Real
+          def update_workflow(definition)
+            body = Fog::JSON.encode(definition)
+            request(
+              :body    => body,
+              :expects => 200,
+              :method  => "PUT",
+              :path    => "workflows"
+            )
+          end
+        end
+
+        class Mock
+          def update_workflow(_definition)
+            response = Excon::Response.new
+            response.status = 200
+            response.body = ""
+            response
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/workflow_v2/validate_action.rb

@@ -0,0 +1,28 @@
+module Fog
+  module Workflow
+    class OpenStack
+      class V2
+        class Real
+          def validate_action(definition)
+            body = Fog::JSON.encode(definition)
+            request(
+              :body    => body,
+              :expects => 200,
+              :method  => "POST",
+              :path    => "actions/validate"
+            )
+          end
+        end
+
+        class Mock
+          def validate_action(_definition)
+            response = Excon::Response.new
+            response.status = 200
+            response.body = "{\"valid\": true}"
+            response
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/workflow_v2/validate_workbook.rb

@@ -0,0 +1,28 @@
+module Fog
+  module Workflow
+    class OpenStack
+      class V2
+        class Real
+          def validate_workbook(definition)
+            body = Fog::JSON.encode(definition)
+            request(
+              :body    => body,
+              :expects => 200,
+              :method  => "POST",
+              :path    => "workbooks/validate"
+            )
+          end
+        end
+
+        class Mock
+          def validate_workbook(_definition)
+            response = Excon::Response.new
+            response.status = 200
+            response.body = "{\"valid\": true}"
+            response
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/workflow_v2/validate_workflow.rb

@@ -0,0 +1,28 @@
+module Fog
+  module Workflow
+    class OpenStack
+      class V2
+        class Real
+          def validate_workflow(definition)
+            body = Fog::JSON.encode(definition)
+            request(
+              :body    => body,
+              :expects => 200,
+              :method  => "POST",
+              :path    => "workflows/validate"
+            )
+          end
+        end
+
+        class Mock
+          def validate_workflow(_definition)
+            response = Excon::Response.new
+            response.status = 200
+            response.body = "{\"valid\": true}"
+            response
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/storage.rb

@@ -82,6 +82,10 @@ module Fog
       class Real
         include Fog::OpenStack::Core
 
+        def self.not_found_class
+          Fog::Storage::OpenStack::NotFound
+        end
+
         def initialize(options={})
           initialize_identity options
 
@@ -140,41 +144,6 @@ module Fog
         def reset_account_name
           @path = @original_path
         end
-
-        def request(params, parse_json = true)
-          begin
-            response = @connection.request(params.merge({
-              :headers  => {
-                'Content-Type' => 'application/json',
-                'Accept' => 'application/json',
-                'X-Auth-Token' => @auth_token
-              }.merge!(params[:headers] || {}),
-              :path     => "#{@path}/#{params[:path]}",
-            }))
-          rescue Excon::Errors::Unauthorized => error
-            if error.response.body != 'Bad username or password' # token expiration
-              @openstack_must_reauthenticate = true
-              authenticate
-              retry
-            else # bad credentials
-              raise error
-            end
-          rescue Excon::Errors::HTTPStatusError => error
-            raise case error
-            when Excon::Errors::NotFound
-              Fog::Storage::OpenStack::NotFound.slurp(error)
-            else
-              error
-            end
-          end
-          if !response.body.empty? && parse_json && response.get_header('Content-Type') =~ %r{application/json}
-            response.body = Fog::JSON.decode(response.body)
-          end
-          response
-        end
-
-        private
-
       end
     end
   end

data/lib/fog/openstack/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Openstack
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
   end
 end

data/lib/fog/openstack/volume_v1.rb

@@ -1,5 +1,4 @@
 require 'fog/openstack/core'
-require 'fog/openstack/common'
 require 'fog/openstack/volume'
 
 module Fog
@@ -138,10 +137,10 @@ module Fog
 
         class Real
           include Fog::OpenStack::Core
+
           def self.not_found_class
             Fog::Volume::OpenStack::NotFound
           end
-          include Fog::OpenStack::Common
 
           def initialize(options = {})
             initialize_identity options
@@ -153,16 +152,19 @@ module Fog
             @connection_options = options[:connection_options] || {}
 
             authenticate
+            set_api_path
+
+            @persistent = options[:persistent] || false
+            @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          end
 
+          def set_api_path
             unless @path.match(SUPPORTED_VERSIONS)
               @path = Fog::OpenStack.get_supported_version_path(SUPPORTED_VERSIONS,
                                                                 @openstack_management_uri,
                                                                 @auth_token,
                                                                 @connection_options)
             end
-
-            @persistent = options[:persistent] || false
-            @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
           end
         end
       end

data/lib/fog/openstack/volume_v2.rb

@@ -1,5 +1,4 @@
 require 'fog/openstack/core'
-require 'fog/openstack/common'
 require 'fog/openstack/volume'
 
 module Fog
@@ -139,10 +138,10 @@ module Fog
 
         class Real
           include Fog::OpenStack::Core
+
           def self.not_found_class
             Fog::Volume::OpenStack::NotFound
           end
-          include Fog::OpenStack::Common
 
           def initialize(options = {})
             initialize_identity options
@@ -154,16 +153,19 @@ module Fog
             @connection_options = options[:connection_options] || {}
 
             authenticate
+            set_api_path
+
+            @persistent = options[:persistent] || false
+            @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          end
 
+          def set_api_path
             unless @path.match(SUPPORTED_VERSIONS)
               @path = Fog::OpenStack.get_supported_version_path(SUPPORTED_VERSIONS,
                                                                 @openstack_management_uri,
                                                                 @auth_token,
                                                                 @connection_options)
             end
-
-            @persistent = options[:persistent] || false
-            @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
           end
         end
       end