fog 1.8.0 → 1.9.0

data/lib/fog/openstack/models/network/floating_ip.rb

@@ -0,0 +1,52 @@
+require 'fog/core/model'
+
+module Fog
+  module Network
+    class OpenStack
+      class FloatingIp < Fog::Model
+        identity :id
+
+        attribute :floating_network_id
+        attribute :port_id
+        attribute :tenant_id
+        attribute :fixed_ip_address
+
+
+
+
+
+
+
+        def initialize(attributes)
+          @connection = attributes[:connection]
+          super
+        end
+
+        def save
+          requires :floating_network_id
+          identity ? update : create
+        end
+
+        def create
+          requires :floating_network_id
+          merge_attributes(connection.create_floating_ip(self.floating_network_id,
+
+
+                                                    self.attributes).body['floating_ip'])
+          self
+        end
+
+        def update
+          self
+        end
+
+        def destroy
+          requires :id
+          connection.delete_floating_ip(self.id)
+          true
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/network/floating_ips.rb

@@ -0,0 +1,34 @@
+require 'fog/core/collection'
+require 'fog/openstack/models/network/floating_ip'
+
+module Fog
+  module Network
+    class OpenStack
+      class FloatingIps < Fog::Collection
+
+        attribute :filters
+
+        model Fog::Network::OpenStack::FloatingIp
+
+        def initialize(attributes)
+          self.filters ||= {}
+          super
+        end
+
+        def all(filters = filters)
+          self.filters = filters
+          load(connection.list_floating_ips(filters).body['floating_ips'])
+        end
+
+        def get(floating_network_id)
+          if floating_ip = connection.get_floating_ip(floating_network_id).body['floating_ip']
+            new(floating_ip)
+          end
+        rescue Fog::Network::OpenStack::NotFound
+          nil
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/network/network.rb

@@ -14,7 +14,8 @@ module Fog
         attribute :tenant_id
 
         def initialize(attributes)
-          @connection = attributes[:connection]
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
           super
         end
 
@@ -23,24 +24,24 @@ module Fog
         end
 
         def create
-          merge_attributes(connection.create_network(self.attributes).body['network'])
+          merge_attributes(service.create_network(self.attributes).body['network'])
           self
         end
 
         def update
           requires :id
-          merge_attributes(connection.update_network(self.id,
+          merge_attributes(service.update_network(self.id,
                                                      self.attributes).body['network'])
           self
         end
 
         def destroy
           requires :id
-          connection.delete_network(self.id)
+          service.delete_network(self.id)
           true
         end
 
       end
     end
   end
-end
+end

data/lib/fog/openstack/models/network/networks.rb

@@ -17,11 +17,11 @@ module Fog
 
         def all(filters = filters)
           self.filters = filters
-          load(connection.list_networks(filters).body['networks'])
+          load(service.list_networks(filters).body['networks'])
         end
 
         def get(network_id)
-          if network = connection.get_network(network_id).body['network']
+          if network = service.get_network(network_id).body['network']
             new(network)
           end
         rescue Fog::Network::OpenStack::NotFound
@@ -31,4 +31,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/openstack/models/network/port.rb

@@ -17,7 +17,8 @@ module Fog
         attribute :tenant_id
 
         def initialize(attributes)
-          @connection = attributes[:connection]
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
           super
         end
 
@@ -28,25 +29,25 @@ module Fog
 
         def create
           requires :network_id
-          merge_attributes(connection.create_port(self.network_id,
+          merge_attributes(service.create_port(self.network_id,
                                                   self.attributes).body['port'])
           self
         end
 
         def update
           requires :id, :network_id
-          merge_attributes(connection.update_port(self.id,
+          merge_attributes(service.update_port(self.id,
                                                   self.attributes).body['port'])
           self
         end
 
         def destroy
           requires :id
-          connection.delete_port(self.id)
+          service.delete_port(self.id)
           true
         end
 
       end
     end
   end
-end
+end

data/lib/fog/openstack/models/network/ports.rb

@@ -17,11 +17,11 @@ module Fog
 
         def all(filters = filters)
           self.filters = filters
-          load(connection.list_ports(filters).body['ports'])
+          load(service.list_ports(filters).body['ports'])
         end
 
         def get(port_id)
-          if port = connection.get_port(port_id).body['port']
+          if port = service.get_port(port_id).body['port']
             new(port)
           end
         rescue Fog::Network::OpenStack::NotFound
@@ -31,4 +31,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/openstack/models/network/subnet.rb

@@ -18,7 +18,8 @@ module Fog
         attribute :tenant_id
 
         def initialize(attributes)
-          @connection = attributes[:connection]
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
           super
         end
 
@@ -29,7 +30,7 @@ module Fog
 
         def create
           requires :network_id, :cidr, :ip_version
-          merge_attributes(connection.create_subnet(self.network_id,
+          merge_attributes(service.create_subnet(self.network_id,
                                                     self.cidr,
                                                     self.ip_version,
                                                     self.attributes).body['subnet'])
@@ -38,18 +39,18 @@ module Fog
 
         def update
           requires :id, :network_id, :cidr, :ip_version
-          merge_attributes(connection.update_subnet(self.id,
+          merge_attributes(service.update_subnet(self.id,
                                                     self.attributes).body['subnet'])
           self
         end
 
         def destroy
           requires :id
-          connection.delete_subnet(self.id)
+          service.delete_subnet(self.id)
           true
         end
 
       end
     end
   end
-end
+end

data/lib/fog/openstack/models/network/subnets.rb

@@ -17,11 +17,11 @@ module Fog
 
         def all(filters = filters)
           self.filters = filters
-          load(connection.list_subnets(filters).body['subnets'])
+          load(service.list_subnets(filters).body['subnets'])
         end
 
         def get(subnet_id)
-          if subnet = connection.get_subnet(subnet_id).body['subnet']
+          if subnet = service.get_subnet(subnet_id).body['subnet']
             new(subnet)
           end
         rescue Fog::Network::OpenStack::NotFound
@@ -31,4 +31,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/openstack/models/volume/volume.rb

@@ -20,20 +20,21 @@ module Fog
 
 
         def initialize(attributes)
-          @connection = attributes[:connection]
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
           super
         end
 
         def save
           requires :display_name, :size
-          data = connection.create_volume(display_name, display_description, size, attributes)
+          data = service.create_volume(display_name, display_description, size, attributes)
           merge_attributes(data.body['volume'])
           true
         end
 
         def destroy
           requires :id
-          connection.delete_volume(id)
+          service.delete_volume(id)
           true
         end
 

data/lib/fog/openstack/models/volume/volumes.rb

@@ -9,11 +9,11 @@ module Fog
         model Fog::Volume::OpenStack::Volume
 
         def all(detailed=true)
-          load(connection.list_volumes(detailed).body['volumes'])
+          load(service.list_volumes(detailed).body['volumes'])
         end
 
         def find_by_id(volume_id)
-          if volume = connection.get_volume_details(volume_id).body['volume']
+          if volume = service.get_volume_details(volume_id).body['volume']
             new(volume)
           end
         rescue Fog::Volume::OpenStack::NotFound

data/lib/fog/openstack/network.rb

@@ -6,7 +6,7 @@ module Fog
 
       requires :openstack_auth_url
       recognizes :openstack_auth_token, :openstack_management_url, :persistent,
-                 :openstack_service_name, :openstack_tenant,
+                 :openstack_service_type, :openstack_service_name, :openstack_tenant,
                  :openstack_api_key, :openstack_username,
                  :current_user, :current_tenant
 
@@ -19,6 +19,8 @@ module Fog
       collection  :ports
       model       :subnet
       collection  :subnets
+      model       :floating_ip
+      collection  :floating_ips
 
       ## REQUESTS
       #
@@ -45,6 +47,14 @@ module Fog
       request :get_subnet
       request :update_subnet
 
+      # FloatingIp CRUD
+      request :list_floating_ips
+      request :create_floating_ip
+      request :delete_floating_ip
+      request :get_floating_ip
+      request :associate_floating_ip
+      request :disassociate_floating_ip
+
       # Tenant
       request :set_tenant
 
@@ -55,6 +65,7 @@ module Fog
               :networks => {},
               :ports => {},
               :subnets => {},
+              :floating_ips => {},
             }
           end
         end
@@ -107,7 +118,8 @@ module Fog
           @openstack_auth_uri             = URI.parse(options[:openstack_auth_url])
           @openstack_management_url       = options[:openstack_management_url]
           @openstack_must_reauthenticate  = false
-          @openstack_service_name         = options[:openstack_service_name] || ['network']
+          @openstack_service_type         = options[:openstack_service_type] || ['network']
+          @openstack_service_name         = options[:openstack_service_name]
 
           @connection_options = options[:connection_options] || {}
 
@@ -178,6 +190,7 @@ module Fog
               :openstack_username => @openstack_username,
               :openstack_auth_uri => @openstack_auth_uri,
               :openstack_auth_token => @openstack_auth_token,
+              :openstack_service_type => @openstack_service_type,
               :openstack_service_name => @openstack_service_name,
               :openstack_endpoint_type => 'adminURL'
             }
@@ -231,4 +244,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -23,7 +23,8 @@ module Fog
 
       class Mock
         def create_security_group(name, description)
-          tenant_id = Fog::Identity.new(:provider => 'OpenStack').current_tenant['id']
+          Fog::Identity.new(:provider => 'OpenStack')
+          tenant_id = Fog::Identity::OpenStack::Mock.data[current_tenant][:tenants].keys.first
           security_group_id = Fog::Mock.random_numbers(2).to_i
           self.data[:security_groups][security_group_id] = {
             'tenant_id' => tenant_id,

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

@@ -27,6 +27,7 @@ module Fog
 
       class Mock
         def create_security_group_rule(parent_group_id, ip_protocol, from_port, to_port, cidr, group_id=nil)
+          parent_group_id = parent_group_id.to_i
           response = Excon::Response.new
           response.status = 200
           response.headers = {

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

@@ -20,8 +20,14 @@ module Fog
 
           if options['security_groups']
             # security names requires a hash with a name prefix
-            data['server']['security_groups'] = [options['security_groups']].flatten.map do |sg|
-              { :name => sg.is_a?(Fog::Compute::OpenStack::SecurityGroup) ? sg.name : sg }
+            data['server']['security_groups'] =
+              Array(options['security_groups']).map do |sg|
+              name = if sg.is_a?(Fog::Compute::OpenStack::SecurityGroup) then
+                       sg.name
+                     else
+                       sg
+                     end
+              { :name => name }
             end
           end
 
@@ -55,10 +61,28 @@ module Fog
           response = Excon::Response.new
           response.status = 202
 
-          data = {
+          server_id = Fog::Mock.random_numbers(6).to_s
+          identity = Fog::Identity[:openstack]
+          user = identity.users.find { |u|
+            u.name == @openstack_username
+          }
+
+          user_id = if user then
+                      user.id
+                    else
+                      identity.user.create(:name     => @openstack_username,
+                                           :password => 'password',
+                                           :email =>
+                                             "#{@openstack_username}@example",
+                                           :tenant_id => @openstack_tenant,
+                                           :enabled => true).id
+                    end
+
+
+          mock_data = {
             'addresses'  => {},
             'flavor'     => {"id" => flavor_ref, "links"=>[{"href"=>"http://nova1:8774/admin/flavors/1", "rel"=>"bookmark"}]},
-            'id'         => Fog::Mock.random_numbers(6).to_s,
+            '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",
@@ -70,11 +94,34 @@ module Fog
             'status'     => 'BUILD',
             'created'    => '2012-09-27T00:04:18Z',
             'updated'    => '2012-09-27T00:04:27Z',
+            'user_id'    => @openstack_username,
+          }
+
+          response_data = {
+            'adminPass'       => 'password',
+            'id'              => server_id,
+            'links'           => mock_data['links'],
           }
 
-          self.data[:last_modified][:servers][data['id']] = Time.now
-          self.data[:servers][data['id']] = data
-          response.body = { 'server' => data.merge({'adminPass' => 'password'}) }
+          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
+                sg.name
+              else
+                sg
+              end
+            end
+
+            self.data[:server_security_group_map][server_id] = groups
+            response_data['security_groups'] = groups
+          end
+
+          self.data[:last_modified][:servers][server_id] = Time.now
+          self.data[:servers][server_id] = mock_data
+          response.body = { 'server' => response_data }
           response
         end