fog 1.33.0 → 1.34.0

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

@@ -212,7 +212,7 @@ module Fog
         def security_groups
           requires :id
 
-          groups = service.list_security_groups(id).body['security_groups']
+          groups = service.list_security_groups(:server_id => id).body['security_groups']
 
           groups.map do |group|
             Fog::Compute::OpenStack::SecurityGroup.new group.merge({:service => service})

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

@@ -1,3 +1,4 @@
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/orchestration/event'
 
 module Fog

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

@@ -1,3 +1,4 @@
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/orchestration/resource'
 
 module Fog

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

@@ -45,7 +45,7 @@ module Fog
         end
 
         def resources(options={})
-          @resources ||= service.resources.all(self, options)
+          @resources ||= service.resources.all({:stack => self}.merge(options))
         end
 
         def events(options={})

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

@@ -1,3 +1,4 @@
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/orchestration/stack'
 
 module Fog

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

@@ -1,3 +1,4 @@
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/orchestration/template'
 
 module Fog

data/lib/fog/openstack/network.rb

@@ -6,13 +6,15 @@ module Fog
       SUPPORTED_VERSIONS = /v2(\.0)*/
 
       requires :openstack_auth_url
-      recognizes :openstack_auth_token, :openstack_management_url, :persistent,
-                 :openstack_service_type, :openstack_service_name, :openstack_tenant,
-                 :openstack_tenant_id,
-                 :openstack_api_key, :openstack_username, :openstack_endpoint_type,
+      recognizes :openstack_auth_token, :openstack_management_url,
+                 :persistent, :openstack_service_type, :openstack_service_name,
+                 :openstack_tenant, :openstack_tenant_id,
+                 :openstack_api_key, :openstack_username, :openstack_identity_endpoint,
                  :current_user, :current_tenant, :openstack_region,
-                 :openstack_project_name,
-                 :openstack_project_domain, :openstack_user_domain
+                 :openstack_endpoint_type,
+                 :openstack_project_name, :openstack_project_id,
+                 :openstack_project_domain, :openstack_user_domain, :openstack_domain_name,
+                 :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id
 
       ## MODELS
       #
@@ -228,31 +230,20 @@ module Fog
         include Fog::OpenStack::Core
 
         def initialize(options={})
-
           initialize_identity options
 
-          @openstack_service_type         = options[:openstack_service_type] || ['network']
-          @openstack_service_name         = options[:openstack_service_name]
+          @openstack_service_type = options[:openstack_service_type] || ['network']
+          @openstack_service_name = options[:openstack_service_name]
 
-          @connection_options = options[:connection_options] || {}
+          @connection_options     = options[:connection_options] || {}
 
           authenticate
-
-          @path.sub!(/\/$/, '')
-          unless @path.match(SUPPORTED_VERSIONS)
-            @path = "/" + Fog::OpenStack.get_supported_version(SUPPORTED_VERSIONS,
-                                                               @openstack_management_uri,
-                                                               @auth_token,
-                                                               @connection_options)
-          end
+          set_api_path
 
           @persistent = options[:persistent] || false
           @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
 
-        def reload
-          @connection.reset
-        end
 
         def request(params)
           begin
@@ -286,6 +277,15 @@ module Fog
           response
         end
 
+        def set_api_path
+          @path.sub!(/\/$/, '')
+          unless @path.match(SUPPORTED_VERSIONS)
+            @path = "/" + Fog::OpenStack.get_supported_version(SUPPORTED_VERSIONS,
+                                                               @openstack_management_uri,
+                                                               @auth_token,
+                                                               @connection_options)
+          end
+        end
       end
     end
   end

data/lib/fog/openstack/orchestration.rb

@@ -6,10 +6,13 @@ module Fog
       requires :openstack_auth_url
       recognizes :openstack_auth_token, :openstack_management_url,
                  :persistent, :openstack_service_type, :openstack_service_name,
-                 :openstack_tenant,
+                 :openstack_tenant, :openstack_tenant_id,
                  :openstack_api_key, :openstack_username, :openstack_identity_endpoint,
                  :current_user, :current_tenant, :openstack_region,
-                 :openstack_endpoint_type
+                 :openstack_endpoint_type,
+                 :openstack_project_name, :openstack_project_id,
+                 :openstack_project_domain, :openstack_user_domain, :openstack_domain_name,
+                 :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id
 
       model_path 'fog/openstack/models/orchestration'
       model       :stack
@@ -124,40 +127,17 @@ module Fog
       end
 
       class Real
-        attr_reader :auth_token
-        attr_reader :auth_token_expiration
-        attr_reader :current_user
-        attr_reader :current_tenant
+        include Fog::OpenStack::Core
 
         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
+          initialize_identity options
 
-          @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] || {}
+          @openstack_service_type           = options[:openstack_service_type] || ['orchestration']
+          @openstack_service_name           = options[:openstack_service_name]
 
-          @current_user = options[:current_user]
-          @current_tenant = options[:current_tenant]
+          @connection_options               = options[:connection_options] || {}
 
           authenticate
 
@@ -165,21 +145,6 @@ module Fog
           @connection = Fog::Core::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({
@@ -190,7 +155,7 @@ module Fog
                 'X-Auth-User'  => @openstack_username,
                 'X-Auth-Key'   => @openstack_api_key
               }.merge!(params[:headers] || {}),
-              :path     => "#{@path}/#{@tenant_id}/#{params[:path]}",
+              :path     => "#{@path}/#{params[:path]}",
               :query    => params[:query]
             }))
           rescue Excon::Errors::Unauthorized => error
@@ -219,51 +184,6 @@ module Fog
 
         private
 
-        def authenticate
-          if !@openstack_management_url || @openstack_must_reauthenticate
-            options = {
-              :openstack_api_key    => @openstack_api_key,
-              :openstack_username   => @openstack_username,
-              :openstack_auth_token => @openstack_must_reauthenticate ? nil : @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
-            }
-
-            credentials = Fog::OpenStack.authenticate(options, @connection_options)
-
-            @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::Core::Connection.new(
-              @openstack_identity_public_endpoint || @openstack_management_url,
-              false, @connection_options)
-          end
-
-          true
-        end
       end
     end
   end

data/lib/fog/openstack/planning.rb

@@ -6,10 +6,15 @@ module Fog
       SUPPORTED_VERSIONS = /v2/
 
       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,
-                 :current_user, :current_tenant, :openstack_endpoint_type, :openstack_region
+      recognizes :openstack_auth_token, :openstack_management_url,
+                 :persistent, :openstack_service_type, :openstack_service_name,
+                 :openstack_tenant, :openstack_tenant_id,
+                 :openstack_api_key, :openstack_username, :openstack_identity_endpoint,
+                 :current_user, :current_tenant, :openstack_region,
+                 :openstack_endpoint_type,
+                 :openstack_project_name, :openstack_project_id,
+                 :openstack_project_domain, :openstack_user_domain, :openstack_domain_name,
+                 :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id
 
       ## MODELS
       #
@@ -89,55 +94,27 @@ module Fog
       end
 
       class Real
-        attr_reader :current_user
-        attr_reader :current_tenant
+        include Fog::OpenStack::Core
 
         def initialize(options={})
-          @openstack_auth_token = options[:openstack_auth_token]
+          initialize_identity options
 
-          unless @openstack_auth_token
-            missing_credentials = Array.new
-            @openstack_api_key  = options[:openstack_api_key]
-            @openstack_username = options[:openstack_username]
+          @openstack_service_type           = options[:openstack_service_type] || ['management'] # currently Tuskar is configured as 'management' service in Keystone
+          @openstack_service_name           = options[:openstack_service_name]
+          @openstack_endpoint_type          = options[:openstack_endpoint_type] || 'adminURL'
 
-            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] || ['management'] # currently Tuskar is configured as 'management' service in Keystone
-          @openstack_service_name         = options[:openstack_service_name]
-          @openstack_endpoint_type        = options[:openstack_endpoint_type] || 'adminURL'
-          @openstack_region               = options[:openstack_region]
-
-          @connection_options = options[:connection_options] || {}
-
-          @current_user = options[:current_user]
-          @current_tenant = options[:current_tenant]
+          @connection_options               = options[:connection_options] || {}
 
           authenticate
 
+          unless @path.match(SUPPORTED_VERSIONS)
+            @path = "/v2"
+          end
+
           @persistent = options[:persistent] || false
           @connection = Fog::Core::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,
-            :current_user             => @current_user,
-            :current_tenant           => @current_tenant }
-        end
-
-        def reload
-          @connection.reset
-        end
-
         def request(params)
           begin
             response = @connection.request(params.merge({
@@ -171,44 +148,6 @@ module Fog
 
         private
 
-        def authenticate
-          if !@openstack_management_url || @openstack_must_reauthenticate
-            options = {
-              :openstack_tenant   => @openstack_tenant,
-              :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,
-              :openstack_endpoint_type => @openstack_endpoint_type
-            }
-
-            credentials = Fog::OpenStack.authenticate(options, @connection_options)
-
-            @current_user = credentials[:user]
-            @current_tenant = credentials[:tenant]
-
-            @openstack_must_reauthenticate = false
-            @auth_token = credentials[:token]
-            @openstack_management_url = credentials[:server_management_url]
-            uri = URI.parse(@openstack_management_url)
-          else
-            @auth_token = @openstack_auth_token
-            uri = URI.parse(@openstack_management_url)
-          end
-
-          @host   = uri.host
-          @path   = uri.path
-          @path.sub!(/\/$/, '')
-          unless @path.match(SUPPORTED_VERSIONS)
-            @path = "/v2"
-          end
-          @port   = uri.port
-          @scheme = uri.scheme
-          true
-        end
       end
     end
 
@@ -232,4 +171,3 @@ module Fog
     end
   end
 end
-

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

@@ -29,7 +29,15 @@ module Fog
       end
 
       class Mock
-        def list_security_groups(server_id = nil)
+        def list_security_groups(options = {})
+          if options.is_a?(Hash)
+            server_id = options.delete(:server_id)
+            query = options
+          else
+            server_id = options
+            query = {}
+          end
+
           security_groups = self.data[:security_groups].values
 
           groups = if server_id then

data/lib/fog/openstack/requests/network/add_router_interface.rb

@@ -2,10 +2,18 @@ module Fog
   module Network
     class OpenStack
       class Real
-        def add_router_interface(router_id, subnet_id, options = {})
-          data = {
-              'subnet_id' => subnet_id,
-          }
+        def add_router_interface(router_id, subnet_id_or_options)
+
+          if(subnet_id_or_options.is_a? String)
+            data = {
+                'subnet_id' => subnet_id_or_options,
+            }
+          elsif subnet_id_or_options.is_a? Hash
+            data = subnet_id_or_options
+          else
+            raise ArgumentError,'Please pass a subnet id or hash {subnet_id:xxx,port_id:xxx}'
+          end
+
 
           request(
             :body     => Fog::JSON.encode(data),

data/lib/fog/openstack/requests/network/create_port.rb

@@ -10,7 +10,8 @@ module Fog
           }
 
           vanilla_options = [:name, :fixed_ips, :mac_address, :admin_state_up,
-                             :device_owner, :device_id, :tenant_id, :security_groups]
+                             :device_owner, :device_id, :tenant_id, :security_groups,
+                             :allowed_address_pairs]
           vanilla_options.reject{ |o| options[o].nil? }.each do |key|
             data['port'][key] = options[key]
           end
@@ -29,17 +30,18 @@ module Fog
           response = Excon::Response.new
           response.status = 201
           data = {
-            'id'              => Fog::Mock.random_numbers(6).to_s,
-            'name'            => options[:name],
-            'network_id'      => network_id,
-            'fixed_ips'       => options[:fixed_ips],
-            'mac_address'     => options[:mac_address],
-            'status'          => 'ACTIVE',
-            'admin_state_up'  => options[:admin_state_up],
-            'device_owner'    => options[:device_owner],
-            'device_id'       => options[:device_id],
-            'tenant_id'       => options[:tenant_id],
-            'security_groups' => options[:security_groups],
+            'id'                    => Fog::Mock.random_numbers(6).to_s,
+            'name'                  => options[:name],
+            'network_id'            => network_id,
+            'fixed_ips'             => options[:fixed_ips],
+            'mac_address'           => options[:mac_address],
+            'status'                => 'ACTIVE',
+            'admin_state_up'        => options[:admin_state_up],
+            'device_owner'          => options[:device_owner],
+            'device_id'             => options[:device_id],
+            'tenant_id'             => options[:tenant_id],
+            'security_groups'       => options[:security_groups],
+            'allowed_address_pairs' => options[:allowed_address_pairs],
           }
           self.data[:ports][data['id']] = data
           response.body = { 'port' => data }