fog 1.10.0 → 1.10.1

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

@@ -0,0 +1,48 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def add_router_interface(router_id, subnet_id, options = {})
+          data = {
+              'subnet_id' => subnet_id,
+          }
+
+          request(
+            :body     => Fog::JSON.encode(data),
+            :expects  => [200],
+            :method   => 'PUT',
+            :path     => "routers/#{router_id}/add_router_interface"
+          )
+        end
+      end
+
+      class Mock
+        def add_router_interface(router_id, subnet_id, options = {})
+          response = Excon::Response.new
+          response.status = 201
+          data = {
+            'status' => 'ACTIVE',
+            'name' => '',
+            'admin_state_up' => true,
+            'network_id' => '5307648b-e836-4658-8f1a-ff7536870c64',
+            'tenant_id' => '6b96ff0cb17a4b859e1e575d221683d3',
+            'device_owner' => 'network:router_interface',
+            'mac_address' => 'fa:16:3e:f7:d1:9c',
+            'fixed_ips' => {
+              'subnet_id' => 'a2f1f29d-571b-4533-907f-5803ab96ead1',
+              'ip_address' => '10.1.1.1'
+            },
+            'id' => '3a44f4e5-1694-493a-a1fb-393881c673a4',
+            'device_id' => '7177abc4-5ae9-4bb7-b0d4-89e94a4abf3b'
+          }
+
+          self.data[:routers][data['router_id']] = data
+          response.body = { 'router' => data }
+          response
+        end
+      end
+
+    end
+  end
+end

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

@@ -6,11 +6,45 @@ module Fog
         def create_network(options = {})
           data = { 'network' => {} }
 
-          vanilla_options = [:name, :shared, :admin_state_up, :tenant_id]
+          vanilla_options = [
+            :name, 
+            :shared, 
+            :admin_state_up, 
+            :tenant_id
+          ]
+
           vanilla_options.reject{ |o| options[o].nil? }.each do |key|
             data['network'][key] = options[key]
           end
 
+          # Advanced Features through API Extensions
+          #
+          # Not strictly required but commonly found in OpenStack
+          # installs with Quantum networking.
+          #
+          # @see http://docs.openstack.org/trunk/openstack-network/admin/content/provider_attributes.html
+          provider_options = [
+            :router_external,
+            :provider_network_type,
+            :provider_segmentation_id,
+            :provider_physical_network
+          ]
+
+          # Map Fog::Network::OpenStack::Network 
+          # model attributes to OpenStack provider attributes 
+          aliases = {
+            :provider_network_type     => 'provider:network_type',
+            # Not applicable to the "local" or "gre" network types
+            :provider_physical_network => 'provider:physical_network',
+            :provider_segmentation_id  => 'provider:segmentation_id',
+            :router_external           => 'router:external'
+          }
+
+          provider_options.reject{ |o| options[o].nil? }.each do |key|
+            aliased_key = aliases[key] || key
+            data['network'][aliased_key] = options[key]
+          end
+
           request(
             :body     => Fog::JSON.encode(data),
             :expects  => [201],
@@ -33,6 +67,27 @@ module Fog
             'admin_state_up' => options[:admin_state_up],
             'tenant_id'      => options[:tenant_id],
           }
+
+          # Add provider specific attributes when found
+          #
+          provider_options = [
+            :router_external,
+            :provider_network_type,
+            :provider_segmentation_id,
+            :provider_physical_network
+          ]
+          aliases = {
+            :provider_network_type     => 'provider:network_type',
+            # Not applicable to the "local" or "gre" network types
+            :provider_physical_network => 'provider:physical_network',
+            :provider_segmentation_id  => 'provider:segmentation_id',
+            :router_external           => 'router:external'
+          }
+          provider_options.reject{ |o| options[o].nil? }.each do |key|
+            aliased_key = aliases[key] || key
+            data[aliased_key] = options[key]
+          end
+
           self.data[:networks][data['id']] = data
           response.body = { 'network' => data }
           response
@@ -41,4 +96,4 @@ module Fog
 
     end
   end
-end
+end

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

@@ -0,0 +1,57 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def create_router(name, options = {})
+          data = {
+            'router' => {
+              'name' => name,
+            }
+          }
+
+          vanilla_options = [
+            :admin_state_up, 
+            :tenant_id,
+            :network_id,
+            :external_gateway_info,
+            :status,
+            :subnet_id
+          ]
+
+          vanilla_options.reject{ |o| options[o].nil? }.each do |key|
+            data['router'][key] = options[key]
+          end
+
+          request(
+            :body     => Fog::JSON.encode(data),
+            :expects  => [201],
+            :method   => 'POST',
+            :path     => 'routers'
+          )
+        end
+      end
+
+      class Mock
+        def create_router(name, options = {})
+          response = Excon::Response.new
+          response.status = 201
+          data = {
+            'router' => {
+              'id'     => Fog::Mock.random_numbers(6).to_s,
+              'status' => options[:status] || 'ACTIVE',
+              'external_gateway_info' => options[:external_gateway_info],
+              'name' => name,
+              'admin_state_up' => options[:admin_state_up],
+              'tenant_id' => '6b96ff0cb17a4b859e1e575d221683d3'
+            }
+          }
+          self.data[:routers][data['router']['id']] = data['router']
+          response.body = data
+          response
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def delete_router(router_id)
+          request(
+            :expects  => 204,
+            :method   => 'DELETE',
+            :path     => "routers/#{router_id}"
+          )
+        end
+      end
+
+      class Mock
+        def delete_router(router_id)
+          response = Excon::Response.new
+          if list_routers.body['routers'].map { |r| r['id'] }.include? router_id
+            self.data[:routers].delete(router_id)
+            response.status = 204
+            response
+          else
+            raise Fog::Network::OpenStack::NotFound
+          end
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def get_router(router_id)
+          request(
+            :expects => [200],
+            :method  => 'GET',
+            :path    => "routers/#{router_id}"
+          )
+        end
+      end
+
+      class Mock
+        def get_router(router_id)
+          response = Excon::Response.new
+          if data = (self.data[:routers].find { |id,value| id == router_id })
+            response.status = 200
+            response.body = {
+              'router' => data[1],
+            }
+            response
+          else
+            raise Fog::Network::OpenStack::NotFound
+          end
+        end
+      end
+
+    end
+  end
+end

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

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

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

@@ -0,0 +1,36 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def remove_router_interface(router_id, subnet_id, options = {})
+          data = {
+              'subnet_id' => subnet_id,
+          }
+
+          request(
+            :body     => Fog::JSON.encode(data),
+            :expects  => [200],
+            :method   => 'PUT',
+            :path     => "routers/#{router_id}/remove_router_interface"
+          )
+        end
+      end
+
+      class Mock
+        def remove_router_interface(router_id, subnet_id, options = {})
+          response = Excon::Response.new
+          response.status = 201
+          data = {
+            'subnet_id' => 'a2f1f29d-571b-4533-907f-5803ab96ead1'
+          }
+
+          self.data[:routers][data['router_id']] = data
+          response.body = { 'router' => data }
+          response
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,85 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+
+        # Update Router
+        #
+        # Beyond the name and the administrative state, the only 
+        # parameter which can be updated with this operation is 
+        # the external gateway.
+        #
+        #     router = Fog::Network[:openstack].routers.first
+        #     net = Fog::Network[:openstack].networks.first
+        #
+        #     # :external_gateway_info can be either a
+        #     # Fog::Network::OpenStack::Network or a Hash
+        #     # like { 'network_id' => network.id }
+        #     Fog::Network[:openstack].update_router router.id,
+        #                                            :name => 'foo',
+        #                                            :external_gateway_info => net,
+        #                                            :admin_state_up => true
+        #
+        # @see http://docs.openstack.org/api/openstack-network/2.0/content/router_update.html
+        def update_router(router_id, options = {})
+          data = { 'router' => {} }
+          
+          vanilla_options = [:name, :admin_state_up]
+
+          egi = options[:external_gateway_info]
+          if egi
+            if egi.is_a?(Fog::Network::OpenStack::Network)
+              data['router']['external_gateway_info'] = { 'network_id' => egi.id }
+            elsif egi.is_a?(Hash) and egi['network_id']
+              data['router']['external_gateway_info'] = egi
+            else
+              raise ArgumentError.new('Invalid external_gateway_info attribute')
+            end
+          end
+
+          vanilla_options.reject{ |o| options[o].nil? }.each do |key|
+            data['router'][key] = options[key]
+          end
+
+          request(
+            :body     => Fog::JSON.encode(data),
+            :expects  => 200,
+            :method   => 'PUT',
+            :path     => "routers/#{router_id}.json"
+          )
+        end
+      end
+
+      class Mock
+        def update_router(router_id, options = {})
+          response = Excon::Response.new
+          router = list_routers.body['routers'].detect do |_| 
+            _['id'] == router_id
+          end
+          if router
+            egi = options[:external_gateway_info]
+            if egi
+              if egi.is_a?(Fog::Network::OpenStack::Network)
+                router['external_gateway_info'] = { 'network_id' => egi.id }
+              elsif egi.is_a?(Hash) and egi['network_id']
+                router['external_gateway_info'] = egi
+              else
+                raise ArgumentError.new('Invalid external_gateway_info attribute')
+              end
+            end
+            options.keys.each do |k|
+              router[k.to_s] = options[k]
+            end
+            response.body = { 'router' => router }
+            response.status = 200
+            response
+          else
+            raise Fog::Network::OpenStack::NotFound
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/openstack/storage.rb

@@ -48,6 +48,7 @@ module Fog
           require 'mime/types'
           @openstack_api_key = options[:openstack_api_key]
           @openstack_username = options[:openstack_username]
+          @path = '/v1/AUTH_1234'
         end
 
         def data
@@ -57,6 +58,16 @@ module Fog
         def reset_data
           self.class.data.delete(@openstack_username)
         end
+        
+        def change_account(account)
+          @original_path ||= @path
+          version_string = @original_path.split('/')[1]
+          @path = "/#{version_string}/#{account}"
+        end
+
+        def reset_account_name
+          @path = @original_path
+        end
 
       end
 
@@ -84,6 +95,52 @@ module Fog
           @connection.reset
         end
 
+        # Change the current account while re-using the auth token.
+        #
+        # This is usefull when you have an admin role and you're able
+        # to HEAD other user accounts, set quotas, list files, etc.
+        #
+        # For example:
+        #
+        #     # List current user account details
+        #     service = Fog::Storage[:openstack]
+        #     service.request :method => 'HEAD'
+        #     
+        # Would return something like:
+        #
+        #     Account:                      AUTH_1234
+        #     Date:                         Tue, 05 Mar 2013 16:50:52 GMT
+        #     X-Account-Bytes-Used:         0 (0.00 Bytes)
+        #     X-Account-Container-Count:    0
+        #     X-Account-Object-Count:       0
+        #
+        # Now let's change the account
+        #
+        #     service.change_account('AUTH_3333')
+        #     service.request :method => 'HEAD'
+        # 
+        # Would return something like:
+        #     
+        #     Account:                      AUTH_3333
+        #     Date:                         Tue, 05 Mar 2013 16:51:53 GMT
+        #     X-Account-Bytes-Used:         23423433
+        #     X-Account-Container-Count:    2
+        #     X-Account-Object-Count:       10
+        #
+        # If we wan't to go back to our original admin account:
+        #
+        #     service.reset_account_name
+        # 
+        def change_account(account)
+          @original_path ||= @path 
+          version_string = @path.split('/')[1]
+          @path = "/#{version_string}/#{account}"
+        end
+
+        def reset_account_name
+          @path = @original_path
+        end
+
         def request(params, parse_json = true, &block)
           begin
             response = @connection.request(params.merge({