fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

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
 
@@ -107,7 +107,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 +179,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 +233,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -29,6 +29,7 @@ module Fog
               'id' => attributes[:flavor_id],
               'swap' => attributes[:swap],
               'OS-FLV-EXT-DATA:ephemeral' => attributes[:ephemeral],
+              'os-flavor-access:is_public' => attributes[:is_public],
               'rxtx_factor' => attributes[:rxtx_factor]
             }
           }
@@ -67,8 +68,10 @@ module Fog
                   "rel" => "bookmark"
                 }
               ],
-              "rxtx_factor" => attributes[:rxtx_factor] || 1,
+              "rxtx_factor" => attributes[:rxtx_factor] || 1.0,
               "OS-FLV-EXT-DATA:ephemeral" => attributes[:ephemeral] || 0,
+              "os-flavor-access:is_public" => attributes[:is_public] || false,
+              "OS-FLV-DISABLED:disabled" => attributes[:disabled] || false,
               "ram" => attributes[:ram],
               "id" => "11",
               "swap" => attributes[:swap] || ""

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,
@@ -41,7 +42,7 @@ module Fog
             'Content-Length' => Fog::Mock.random_numbers(3).to_s,
             'Date'           => Date.new}
           response.body = {
-            'security_group' => self.data[:security_groups].values
+            'security_group' => self.data[:security_groups][security_group_id]
           }
           response
         end

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
 

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

@@ -15,6 +15,8 @@ module Fog
 
       class Mock
         def delete_security_group(security_group_id)
+          self.data[:security_groups].delete security_group_id
+
           response = Excon::Response.new
           response.status = 202
           response.headers = {

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

@@ -0,0 +1,93 @@
+module Fog
+  module Compute
+    class OpenStack
+
+      # http://docs.openstack.org/api/openstack-compute/2/content/ProgramaticLimits.html
+      #
+      class Real
+        def get_limits
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => '/limits.json'
+          )
+        end
+      end
+
+
+      class Mock
+        def get_limits
+          rate_limits = [
+            { 'regex' => '.*',
+              'limit' => [
+                { 'next-available' => '2012-11-22T16:13:44Z',
+                  'unit'           => 'MINUTE',
+                  'verb'           => 'POST',
+                  'remaining'      => 9,
+                  'value'          => 10 },
+                { 'next-available' => '2012-11-23T00:46:14Z',
+                  'unit'           => 'MINUTE',
+                  'verb'           => 'PUT',
+                  'remaining'      => 10,
+                  'value' => 10 },
+                { 'next-available' => '2012-11-22T16:14:30Z',
+                  'unit'           => 'MINUTE',
+                  'verb'           => 'DELETE',
+                  'remaining'      => 99,
+                  'value'          => 100 } ],
+                'uri' => '*' },
+            { 'regex' => '^/servers',
+              'limit' => [
+                { 'next-available' => '2012-11-23T00:46:14Z',
+                  'unit'           => 'DAY',
+                  'verb'           => 'POST',
+                  'remaining'      => 50,
+                  'value'          => 50} ],
+              'uri'=>'*/servers' },
+            { 'regex' => '.*changes-since.*',
+              'limit' => [
+                { 'next-available' => '2012-11-23T00:46:14Z',
+                  'unit'           => 'MINUTE',
+                  'verb'           => 'GET',
+                  'remaining'      => 3,
+                  'value'          => 3 } ],
+              'uri' => '*changes-since*' }
+          ]
+
+          absolute_limits = {
+            # Max
+            'maxServerMeta'            => 128,
+            'maxTotalInstances'        => 10,
+            'maxPersonality'           => 5,
+            'maxImageMeta'             => 128,
+            'maxPersonalitySize'       => 10240,
+            'maxSecurityGroupRules'    => 20,
+            'maxTotalKeypairs'         => 100,
+            'maxSecurityGroups'        => 10,
+            'maxTotalCores'            => 20,
+            'maxTotalFloatingIps'      => 10,
+            'maxTotalRAMSize'          => 51200,
+
+            # Used
+            'totalCoresUsed'           => -1,
+            'totalRAMUsed'             => -2048,
+            'totalInstancesUsed'       => -1,
+            'totalSecurityGroupsUsed'  => 0,
+            'totalKeyPairsUsed'        => 0
+          }
+
+
+          Excon::Response.new(
+            :status => 200,
+            :body => {
+              'limits' => {
+                'rate'     => rate_limits,
+                'absolute' => absolute_limits }
+            }
+          )
+        end
+      end
+
+    end
+  end
+end

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

@@ -18,48 +18,24 @@ module Fog
       end
 
       class Mock
-        def list_security_groups
-          self.data[:security_groups] ||= [
-            { "rules" => [
-              { "from_port" => 44,
-                "group" => {},
-                "ip_protocol" => "tcp",
-                "to_port" => 55,
-                "parent_group_id" => 1,
-                "ip_range" => {"cidr"=>"10.10.10.10/24"},
-                "id" => Fog::Mock.random_numbers(2).to_i
-              },
-              { "from_port" => 2,
-                "group" => {},
-                "ip_protocol" => "tcp",
-                "to_port" => 3,
-                "parent_group_id" => 1,
-                "ip_range" => {"cidr"=>"10.10.10.10/24"},
-                "id" => Fog::Mock.random_numbers(2).to_i
-              } ],
-              "tenant_id" => @openstack_tenant,
-              "id" => Fog::Mock.random_numbers(2).to_i,
-              "name" => "default",
-              "description" => "default"
-            },
-            {
-              "rules" => [
-              { "from_port" => 44,
-                "group" => {},
-                "ip_protocol" => "tcp",
-                "to_port" => 55,
-                "parent_group_id" => 2,
-                "ip_range" => { "cidr"=>"10.10.10.10/24" },
-                "id"=> Fog::Mock.random_numbers(2).to_i
-              } ],
-            "tenant_id" => @openstack_tenant,
-            "id" => Fog::Mock.random_numbers(2).to_i,
-            "name" => "test",
-            "description" => "this is a test"
-            }
-          ]
+        def list_security_groups(server_id = nil)
+          security_groups = self.data[:security_groups].values
+
+          groups = if server_id then
+                     server_group_names =
+                       self.data[:server_security_group_map][server_id]
+
+                     server_group_names.map do |name|
+                       security_groups.find do |sg|
+                         sg['name'] == name
+                       end
+                     end.compact
+                   else
+                     security_groups
+                   end
+
           Excon::Response.new(
-            :body     => { 'security_groups' => self.data[:security_groups].values },
+            :body     => { 'security_groups' => groups },
             :headers  => {
               "X-Compute-Request-Id" => "req-#{Fog::Mock.random_base64(36)}",
               "Content-Type" => "application/json",