fog-maestrodev 1.15.0.20130829165835 → 1.15.0.20130927082724

data/lib/fog/openstack/models/compute/images.rb

@@ -7,12 +7,20 @@ module Fog
 
       class Images < Fog::Collection
 
+        attribute :filters
+
         model Fog::Compute::OpenStack::Image
 
         attribute :server
 
-        def all
-          data = service.list_images_detail.body['images']
+        def initialize(attributes)
+          self.filters ||= {}
+          super
+        end
+
+        def all(filters = filters)
+          self.filters = filters
+          data = service.list_images_detail(filters).body['images']
           images = load(data)
           if server
             self.replace(self.select {|image| image.server_id == server.id})

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

@@ -31,6 +31,7 @@ module Fog
         attribute :user_id
         attribute :key_name
         attribute :fault
+        attribute :config_drive
         attribute :os_dcf_disk_config, :aliases => 'OS-DCF:diskConfig'
         attribute :os_ext_srv_attr_host, :aliases => 'OS-EXT-SRV-ATTR:host'
         attribute :os_ext_srv_attr_hypervisor_hostname, :aliases => 'OS-EXT-SRV-ATTR:hypervisor_hostname'
@@ -280,6 +281,7 @@ module Fog
             'availability_zone' => availability_zone,
             'user_data' => user_data_encoded,
             'key_name'    => key_name,
+            'config_drive' => config_drive,
             'security_groups' => @security_groups,
             'min_count'   => @min_count,
             'max_count'   => @max_count,

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

@@ -0,0 +1,52 @@
+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
+
+        attribute :template_url
+        attribute :template
+        attribute :parameters
+        attribute :timeout_in_minutes
+
+        def initialize(attributes)
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
+          super
+        end
+
+        def save
+          requires :stack_name
+          identity ? update : create
+        end
+
+        def create
+          requires :stack_name
+          service.create_stack(stack_name, self.attributes)
+          self
+        end
+
+        def update
+          requires :stack_name
+          service.update_stack(stack_name, self.attributes)
+          self
+        end
+
+        def destroy
+          requires :id
+          service.delete_stack(self.stack_name, self.id)
+          true
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+require 'fog/core/collection'
+require 'fog/openstack/models/orchestration/stack'
+
+module Fog
+  module Orchestration
+    class OpenStack
+      class Stacks < Fog::Collection
+        model Fog::Orchestration::OpenStack::Stack
+
+        def all
+          load(service.list_stacks.body['stacks'])
+        end
+
+        def find_by_id(id)
+          self.find {|stack| stack.id == id}
+        end
+        alias_method :get, :find_by_id
+      end
+    end
+  end
+end

data/lib/fog/openstack/orchestration.rb

@@ -0,0 +1,227 @@
+require 'fog/aws/cloud_formation'
+
+module Fog
+  module Orchestration
+    class OpenStack < Fog::Service
+      requires :openstack_auth_url
+      recognizes :openstack_auth_token, :openstack_management_url,
+                 :persistent, :openstack_service_type, :openstack_service_name,
+                 :openstack_tenant,
+                 :openstack_api_key, :openstack_username, :openstack_identity_endpoint,
+                 :current_user, :current_tenant, :openstack_region,
+                 :openstack_endpoint_type
+
+      model_path 'fog/openstack/models/orchestration'
+      model       :stack
+      collection  :stacks
+
+      request_path 'fog/openstack/requests/orchestration'
+      request :create_stack
+      request :update_stack
+      request :delete_stack
+      request :list_stacks
+
+      class Mock
+        attr_reader :auth_token
+        attr_reader :auth_token_expiration
+        attr_reader :current_user
+        attr_reader :current_tenant
+
+        def self.data
+          @data ||= Hash.new do |hash, key|
+            hash[key] = {
+              :stacks => {}
+            }
+          end
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        def initialize(options={})
+          @openstack_username = options[:openstack_username]
+          @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
+
+          @current_tenant = options[:openstack_tenant]
+
+          @auth_token = Fog::Mock.random_base64(64)
+          @auth_token_expiration = (Time.now.utc + 86400).iso8601
+
+          management_url = URI.parse(options[:openstack_auth_url])
+          management_url.port = 8774
+          management_url.path = '/v1'
+          @openstack_management_url = management_url.to_s
+
+          identity_public_endpoint = URI.parse(options[:openstack_auth_url])
+          identity_public_endpoint.port = 5000
+          @openstack_identity_public_endpoint = identity_public_endpoint.to_s
+        end
+
+        def data
+          self.class.data["#{@openstack_username}-#{@current_tenant}"]
+        end
+
+        def reset_data
+          self.class.data.delete("#{@openstack_username}-#{@current_tenant}")
+        end
+
+        def credentials
+          { :provider                 => 'openstack',
+            :openstack_auth_url       => @openstack_auth_uri.to_s,
+            :openstack_auth_token     => @auth_token,
+            :openstack_management_url => @openstack_management_url,
+            :openstack_identity_endpoint => @openstack_identity_public_endpoint }
+        end
+      end
+
+      class Real
+        attr_reader :auth_token
+        attr_reader :auth_token_expiration
+        attr_reader :current_user
+        attr_reader :current_tenant
+
+        def initialize(options={})
+          @openstack_auth_token = options[:openstack_auth_token]
+          @auth_token        = options[:openstack_auth_token]
+          @openstack_identity_public_endpoint = options[:openstack_identity_endpoint]
+
+          unless @auth_token
+            missing_credentials = Array.new
+            @openstack_api_key  = options[:openstack_api_key]
+            @openstack_username = options[:openstack_username]
+
+            missing_credentials << :openstack_api_key  unless @openstack_api_key
+            missing_credentials << :openstack_username unless @openstack_username
+            raise ArgumentError, "Missing required arguments: #{missing_credentials.join(', ')}" unless missing_credentials.empty?
+          end
+
+          @openstack_tenant     = options[:openstack_tenant]
+          @openstack_auth_uri   = URI.parse(options[:openstack_auth_url])
+          @openstack_management_url       = options[:openstack_management_url]
+          @openstack_must_reauthenticate  = false
+          @openstack_service_type = options[:openstack_service_type] || ['orchestration']
+          @openstack_service_name = options[:openstack_service_name]
+          @openstack_identity_service_type = options[:openstack_identity_service_type] || 'identity'
+          @openstack_endpoint_type = options[:openstack_endpoint_type] || 'publicURL'
+          @openstack_region      = options[:openstack_region]
+
+          @connection_options = options[:connection_options] || {}
+
+          @current_user = options[:current_user]
+          @current_tenant = options[:current_tenant]
+
+          authenticate
+
+          @persistent = options[:persistent] || false
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+        end
+
+        def credentials
+          { :provider                 => 'openstack',
+            :openstack_auth_url       => @openstack_auth_uri.to_s,
+            :openstack_auth_token     => @auth_token,
+            :openstack_management_url => @openstack_management_url,
+            :openstack_identity_endpoint => @openstack_identity_public_endpoint,
+            :openstack_region         => @openstack_region,
+            :current_user             => @current_user,
+            :current_tenant           => @current_tenant }
+        end
+
+        def reload
+          @connection.reset
+        end
+
+        def request(params)
+          begin
+            response = @connection.request(params.merge({
+              :headers  => {
+                'Content-Type' => 'application/json',
+                'Accept' => 'application/json',
+                'X-Auth-Token' => @auth_token
+              }.merge!(params[:headers] || {}),
+              :host     => @host,
+              :path     => "#{@path}/#{@tenant_id}/#{params[:path]}",
+              :query    => params[:query]
+            }))
+          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::Compute::OpenStack::NotFound.slurp(error)
+              else
+                error
+              end
+          end
+
+          if response.status == 200 && !response.body.empty?
+            response.body = Fog::JSON.decode(response.body)
+          end
+
+          response
+        end
+
+        private
+
+        def authenticate
+          if !@openstack_management_url || @openstack_must_reauthenticate
+            options = {
+              :openstack_api_key    => @openstack_api_key,
+              :openstack_username   => @openstack_username,
+              :openstack_auth_token => @auth_token,
+              :openstack_auth_uri   => @openstack_auth_uri,
+              :openstack_region     => @openstack_region,
+              :openstack_tenant     => @openstack_tenant,
+              :openstack_service_type => @openstack_service_type,
+              :openstack_service_name => @openstack_service_name,
+              :openstack_identity_service_type => @openstack_identity_service_type,
+              :openstack_endpoint_type => @openstack_endpoint_type
+            }
+
+            if @openstack_auth_uri.path =~ /\/v2.0\//
+
+              credentials = Fog::OpenStack.authenticate_v2(options, @connection_options)
+            else
+              credentials = Fog::OpenStack.authenticate_v1(options, @connection_options)
+            end
+
+            @current_user = credentials[:user]
+            @current_tenant = credentials[:tenant]
+
+            @openstack_must_reauthenticate = false
+            @auth_token               = credentials[:token]
+            @auth_token_expiration    = credentials[:expires]
+            @openstack_management_url = credentials[:server_management_url]
+            @openstack_identity_public_endpoint  = credentials[:identity_public_endpoint]
+          end
+
+          uri = URI.parse(@openstack_management_url)
+          @host   = uri.host
+          @path, @tenant_id = uri.path.scan(/(\/.*)\/(.*)/).flatten
+
+          @path.sub!(/\/$/, '')
+
+          @port   = uri.port
+          @scheme = uri.scheme
+
+          # Not all implementations have identity service in the catalog
+          if @openstack_identity_public_endpoint || @openstack_management_url
+            @identity_connection = Fog::Connection.new(
+              @openstack_identity_public_endpoint || @openstack_management_url,
+              false, @connection_options)
+          end
+
+          true
+        end
+
+      end
+    end
+  end
+end

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

@@ -13,7 +13,10 @@ module Fog
           }
 
           vanilla_options = ['metadata', 'accessIPv4', 'accessIPv6',
-                             'availability_zone', 'user_data', 'key_name', 'adminPass']
+                             'availability_zone', 'user_data', 'key_name', 
+                             'adminPass', 'config_drive', 'min_count', 'max_count',
+                             'return_reservation_id'
+                            ]
           vanilla_options.select{|o| options[o]}.each do |key|
             data['server'][key] = options[key]
           end
@@ -107,32 +110,37 @@ module Fog
 
 
           mock_data = {
-            'addresses'  => {},
-            'flavor'     => {"id" => flavor_ref, "links"=>[{"href"=>"http://nova1:8774/admin/flavors/1", "rel"=>"bookmark"}]},
-            'id'         => server_id,
-            'image'      => {"id" => image_ref, "links"=>[{"href"=>"http://nova1:8774/admin/images/#{image_ref}", "rel"=>"bookmark"}]},
-            'links'      => [{"href"=>"http://nova1:8774/v1.1/admin/servers/5", "rel"=>"self"}, {"href"=>"http://nova1:8774/admin/servers/5", "rel"=>"bookmark"}],
-            'hostId'     => "123456789ABCDEF01234567890ABCDEF",
-            'metadata'   => options['metadata'] || {},
-            'name'       => name || "server_#{rand(999)}",
-            'accessIPv4' => options['accessIPv4'] || "",
-            'accessIPv6' => options['accessIPv6'] || "",
-            'progress'   => 0,
-            'status'     => 'BUILD',
-            'created'    => '2012-09-27T00:04:18Z',
-            'updated'    => '2012-09-27T00:04:27Z',
-            'user_id'    => @openstack_username,
+            'addresses'    => {},
+            'flavor'       => {"id" => flavor_ref, "links"=>[{"href"=>"http://nova1:8774/admin/flavors/1", "rel"=>"bookmark"}]},
+            'id'           => server_id,
+            'image'        => {"id" => image_ref, "links"=>[{"href"=>"http://nova1:8774/admin/images/#{image_ref}", "rel"=>"bookmark"}]},
+            'links'        => [{"href"=>"http://nova1:8774/v1.1/admin/servers/5", "rel"=>"self"}, {"href"=>"http://nova1:8774/admin/servers/5", "rel"=>"bookmark"}],
+            'hostId'       => "123456789ABCDEF01234567890ABCDEF",
+            'metadata'     => options['metadata'] || {},
+            'name'         => name || "server_#{rand(999)}",
+            'accessIPv4'   => options['accessIPv4'] || "",
+            'accessIPv6'   => options['accessIPv6'] || "",
+            'progress'     => 0,
+            'status'       => 'BUILD',
+            'created'      => '2012-09-27T00:04:18Z',
+            'updated'      => '2012-09-27T00:04:27Z',
+            'user_id'      => @openstack_username,
+            'config_drive' => options['config_drive'] || '',
           }
 
-          response_data = {
-            'adminPass'       => 'password',
-            'id'              => server_id,
-            'links'           => mock_data['links'],
-          }
+          response_data = {}
+          if options['return_reservation_id'] == 'True' then
+            response_data = { 'reservation_id' => "r-#{Fog::Mock.random_numbers(6).to_s}" }
+          else   
+            response_data = {
+              'adminPass'       => 'password',
+              'id'              => server_id,
+              'links'           => mock_data['links'],
+            }
+          end
 
           self.data[:last_modified][:servers][server_id] = Time.now
           self.data[:servers][server_id] = mock_data
-
           if security_groups = options['security_groups'] then
             groups = Array(options['security_groups']).map do |sg|
               if sg.is_a?(Fog::Compute::OpenStack::SecurityGroup) then
@@ -148,10 +156,13 @@ module Fog
 
           self.data[:last_modified][:servers][server_id] = Time.now
           self.data[:servers][server_id] = mock_data
-          response.body = { 'server' => response_data }
+          if options['return_reservation_id'] == 'True' then
+            response.body = response_data 
+          else
+            response.body = { 'server' => response_data }
+          end
           response
-        end
-
+        end      
       end
     end
   end

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

@@ -3,11 +3,12 @@ module Fog
     class OpenStack
       class Real
 
-        def list_images_detail
+        def list_images_detail(filters = {})
           request(
             :expects  => [200, 203],
             :method   => 'GET',
-            :path     => 'images/detail.json'
+            :path     => 'images/detail.json',
+            :query    => filters
           )
         end
 
@@ -15,7 +16,7 @@ module Fog
 
       class Mock
 
-        def list_images_detail
+        def list_images_detail(filters = {})
           response = Excon::Response.new
 
           images = self.data[:images].values