fog 1.27.0 → 1.28.0

data/lib/fog/openstack/models/orchestration/resource.rb

@@ -0,0 +1,32 @@
+require 'fog/core/model'
+
+module Fog
+  module Orchestration
+    class OpenStack
+      class Resource < Fog::Model
+
+        include Reflectable
+
+        identity :id
+
+        %w{resource_name description links logical_resource_id resource_status
+            updated_time required_by resource_status_reason resource_type}.each do |a|
+          attribute a.to_sym
+        end
+
+        def events(options={})
+          @events ||= service.events.all(self, options)
+        end
+
+        def metadata
+          @metadata ||= service.show_resource_metadata(stack, self.resource_name).body['metadata']
+        end
+
+        def template
+          @template ||= service.templates.get(self)
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/orchestration/resource_schemas.rb

@@ -0,0 +1,17 @@
+require 'fog/core/collection'
+
+module Fog
+  module Orchestration
+    class OpenStack
+      class ResourceSchemas < Fog::Collection
+
+        def get(resource_type)
+          service.show_resource_schema(resource_type).body
+        rescue Fog::Compute::OpenStack::NotFound
+          nil
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/orchestration/resources.rb

@@ -0,0 +1,35 @@
+require 'fog/openstack/models/orchestration/resource'
+
+module Fog
+  module Orchestration
+    class OpenStack
+      class Resources < Fog::Collection
+        model Fog::Orchestration::OpenStack::Resource
+
+        def types
+          service.list_resource_types.body['resource_types'].sort
+        end
+
+        def all(stack, options={})
+          data = service.list_resources(stack, options).body['resources']
+          load(data)
+        end
+
+        def get(resource_name, stack=nil)
+          stack = self.first.stack if stack.nil?
+          data  = service.show_resource_data(stack.stack_name, stack.id, resource_name).body['resource']
+          new(data)
+        rescue Fog::Compute::OpenStack::NotFound
+          nil
+        end
+
+        def metadata(stack_name, stack_id, resource_name)
+          service.show_resource_metadata(stack_name, stack_id, resource_name).body['resource']
+        rescue Fog::Compute::OpenStack::NotFound
+          nil
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/orchestration/stack.rb

@@ -1,22 +1,15 @@
-require 'fog/core/model'
-
 module Fog
   module Orchestration
     class OpenStack
       class Stack < Fog::Model
-        identity :id
 
-        attribute :stack_name
-        attribute :stack_status
-        attribute :stack_status_reason
-        attribute :creation_time
-        attribute :updated_time
-        attribute :id
+        identity :id
 
-        attribute :template_url
-        attribute :template
-        attribute :parameters
-        attribute :timeout_in_minutes
+        %w{capabilities description disable_rollback links notification_topics outputs parameters
+            stack_name stack_status stack_status_reason template_description timeout_mins
+            creation_time updated_time}.each do |a|
+          attribute a.to_sym
+        end
 
         def initialize(attributes)
           # Old 'connection' is renamed as service and should be used instead
@@ -24,28 +17,102 @@ module Fog
           super
         end
 
-        def save
-          requires :stack_name
-          identity ? update : create
+        def save(options={})
+          if persisted?
+            service.update_stack(self, default_options.merge(options)).body['stack']
+          else
+            service.stacks.create(default_options.merge(options))
+          end
         end
 
+        # Deprecated
         def create
+          Fog::Logger.deprecation("#create is deprecated, use #save(options) instead [light_black](#{caller.first})[/]")
           requires :stack_name
-          service.create_stack(stack_name, self.attributes)
-          self
+          service.stacks.create(default_options)
         end
 
+        # Deprecated
         def update
+          Fog::Logger.deprecation("#update is deprecated, use #save(options) instead [light_black](#{caller.first})[/]")
           requires :stack_name
-          service.update_stack(stack_name, self.attributes)
-          self
+          service.update_stack(self, default_options).body['stack']
+        end
+
+        def delete
+          service.delete_stack(self)
+        end
+        alias_method :destroy, :delete
+
+        def details
+          @details ||= service.stacks.get(self.stack_name, self.id)
+        end
+
+        def resources(options={})
+          @resources ||= service.resources.all(self, options)
+        end
+
+        def events(options={})
+          @events ||= service.events.all(self, options)
+        end
+
+        def template
+          @template ||= service.templates.get(self)
         end
 
-        def destroy
-          requires :id
-          service.delete_stack(self.stack_name, self.id)
-          true
+        def abandon
+          service.abandon_stack(self)
+        end
+
+
+        # Deprecated
+        def template_url
+          Fog::Logger.deprecation("#template_url is deprecated, use it in options for #save(options) instead [light_black](#{caller.first})[/]")
+          @template_url
+        end
+
+        # Deprecated
+        def template_url=(url)
+          Fog::Logger.deprecation("#template_url= is deprecated, use it in options for #save(options) instead [light_black](#{caller.first})[/]")
+          @template_url = url
+        end
+
+        # Deprecated
+        def template=(content)
+          Fog::Logger.deprecation("#template=(content) is deprecated, use it in options for #save(options) instead [light_black](#{caller.first})[/]")
+          @template = content
+        end
+
+        # Deprecated
+        def timeout_in_minutes
+          Fog::Logger.deprecation("#timeout_in_minutes is deprecated, set timeout_mins in options for save(options) instead [light_black](#{caller.first})[/]")
+          timeout_mins
+        end
+
+        # Deprecated
+        def timeout_in_minutes=(minutes)
+          Fog::Logger.deprecation("#timeout_in_minutes=(minutes) is deprecated, set timeout_mins in options for save(options) instead [light_black](#{caller.first})[/]")
+          timeout_mins = minutes
+        end
+
+        # build options to create or update stack
+        def default_options
+          template_content =
+            if template && template.is_a?(Fog::Orchestration::OpenStack::Template)
+              template.content
+            else
+              template
+            end
+
+          {
+            :stack_name       => stack_name,
+            :disable_rollback => disable_rollback,
+            :template_url     => @template_url,
+            :template         => template_content,
+            :timeout_mins     => timeout_mins
+          }
         end
+        private :default_options
       end
     end
   end

data/lib/fog/openstack/models/orchestration/stacks.rb

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/openstack/models/orchestration/stack'
 
 module Fog
@@ -7,14 +6,49 @@ module Fog
       class Stacks < Fog::Collection
         model Fog::Orchestration::OpenStack::Stack
 
-        def all
-          load(service.list_stacks.body['stacks'])
+        def all(options={})
+          data = service.list_stack_data(options).body['stacks']
+          load(data)
         end
 
+        # Deprecated
         def find_by_id(id)
+          Fog::Logger.deprecation("#find_by_id(id) is deprecated, use #get(name, id) instead [light_black](#{caller.first})[/]")
           self.find {|stack| stack.id == id}
         end
-        alias_method :get, :find_by_id
+
+        def get(arg1, arg2 = nil)
+          if arg2.nil?
+            # Deprecated: get(id)
+            Fog::Logger.deprecation("#get(id) is deprecated, use #get(name, id) instead [light_black](#{caller.first})[/]")
+            return find_by_id(arg1)
+          end
+
+          # Normal use: get(name, id)
+          name = arg1
+          id = arg2
+          data = service.show_stack_details(name, id).body['stack']
+          new(data)
+        rescue Fog::Compute::OpenStack::NotFound
+          nil
+        end
+
+        def adopt(options={})
+          service.create_stack(options)
+        end
+
+        def create(options={})
+          service.create_stack(options).body['stack']
+        end
+
+        def preview(options={})
+          data = service.preview_stack(options).body['stack']
+          new(data)
+        end
+
+        def build_info
+          service.build_info.body
+        end
       end
     end
   end

data/lib/fog/openstack/models/orchestration/template.rb

@@ -0,0 +1,15 @@
+require 'fog/core/model'
+
+module Fog
+  module Orchestration
+    class OpenStack
+      class Template < Fog::Model
+
+        %w{format description template_version parameters resources content}.each do |a|
+          attribute a.to_sym
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/orchestration/templates.rb

@@ -0,0 +1,44 @@
+require 'fog/openstack/models/orchestration/template'
+
+module Fog
+  module Orchestration
+    class OpenStack
+      class Templates < Fog::Collection
+        model Fog::Orchestration::OpenStack::Template
+
+        def get(obj)
+          data = if obj.is_a?(Stack)
+            service.get_stack_template(obj).body
+          else
+            service.show_resource_template(obj.resource_name).body
+          end
+
+          if data.has_key?('AWSTemplateFormatVersion')
+            data['content'] = data.to_json
+            data['format'] = 'CFN'
+            data['template_version'] = data.delete('AWSTemplateFormatVersion')
+            data['description'] = data.delete('Description')
+            data['parameter'] = data.delete('Parameters')
+            data['resources'] = data.delete('Resources')
+          else
+            data['content'] = data.to_yaml
+            data['format'] = 'HOT'
+            data['template_version'] = data.delete('heat_template_version')
+          end
+
+          new(data)
+        rescue Fog::Compute::OpenStack::NotFound
+          nil
+        end
+
+        def validate(options={})
+          data = service.validate_template(options).body
+          temp = new
+          temp.parameters  = data['Parameters']
+          temp.description = data['Description']
+          temp
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/orchestration.rb

@@ -15,11 +15,57 @@ module Fog
       model       :stack
       collection  :stacks
 
+      model :resource
+      collection :resources
+
+      collection :resource_schemas
+
+      model :event
+      collection :events
+
+      model :template
+      collection :templates
+
       request_path 'fog/openstack/requests/orchestration'
+      request :abandon_stack
+      request :build_info
       request :create_stack
-      request :update_stack
       request :delete_stack
-      request :list_stacks
+      request :get_stack_template
+      request :list_resource_events
+      request :list_resource_types
+      request :list_resources
+      request :list_stack_data
+      request :list_stack_events
+      request :preview_stack
+      request :show_event_details
+      request :show_resource_data
+      request :show_resource_metadata
+      request :show_resource_schema
+      request :show_resource_template
+      request :show_stack_details
+      request :update_stack
+      request :validate_template
+
+      module Reflectable
+
+        REFLECTION_REGEX = /\/stacks\/(\w+)\/([\w|-]+)\/resources\/(\w+)/
+
+        def resource
+          @resource ||= service.resources.get(r[3], stack)
+        end
+
+        def stack
+          @stack ||= service.stacks.get(r[1], r[2])
+        end
+
+        private
+
+        def reflection
+          @reflection ||= REFLECTION_REGEX.match(self.links[0]['href'])
+        end
+        alias :r :reflection
+      end
 
       class Mock
         attr_reader :auth_token

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

@@ -0,0 +1,44 @@
+module Fog
+  module Baremetal
+    class OpenStack
+      class Real
+        # Create a new chassis
+        #
+        # === Attributes ===
+        # description  = Free text description of the chassis
+        # extra        = Record arbitrary key/value metadata. Can be specified multiple times
+        def create_chassis(attributes)
+          desired_options = [
+            :description,
+            :extra
+          ]
+
+          # Filter only allowed creation attributes
+          data = attributes.select { |key, value| desired_options.include?(key.to_sym) }
+
+          request(
+            :body => Fog::JSON.encode(data),
+            :expects => [200,201],
+            :method => 'POST',
+            :path => 'chassis'
+          )
+        end
+      end
+
+      class Mock
+        def create_chassis(attributes)
+          response = Excon::Response.new
+          response.status = 200
+          response.headers = {
+            "X-Compute-Request-Id" => "req-fdc6f99e-55a2-4ab1-8904-0892753828cf",
+            "Content-Type" => "application/json",
+            "Content-Length" => "356",
+            "Date" => Date.new
+          }
+          response.body =  self.data[:chassis_collection].first
+          response
+        end
+      end # mock
+    end # openstack
+  end # baremetal
+end # fog