fog-maestrodev 1.8.0.20130114204828 → 1.14.0.20130806165225

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

@@ -0,0 +1,31 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def add_flavor_access(flavor_ref, tenant_id)
+          request(
+            :body => MultiJson.encode({
+              "addTenantAccess" => {
+                "tenant" => tenant_id
+              }
+            }),
+            :expects  => [200, 203],
+            :method   => 'POST',
+            :path     => "flavors/#{flavor_ref}/action.json"
+          )
+        end
+      end
+
+      class Mock
+        def add_flavor_access(flavor_ref, tenant_id)
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            "flavor_access" => [{ "tenant_id" => tenant_id, "flavor_id" => flavor_ref }]
+          }
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -16,7 +16,7 @@ module Fog
       end
 
       class Mock
-        def allocate_address
+        def allocate_address(pool = nil)
           response = Excon::Response.new
           response.status = 200
           response.headers = {

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

@@ -21,16 +21,21 @@ module Fog
       end
 
       class Mock
+
         def attach_volume(volume_id, server_id, device)
           response = Excon::Response.new
           response.status = 200
-          response.body ={ "volumeAttachment" => {
-                             "id"       => volume_id,
-                             "volumeId" => volume_id
-                            }
-                         }
+          data = {
+             'id'       => volume_id,
+             'volumeId' => volume_id,
+             'serverId' => server_id,
+             'device'   => device
+          }
+          self.data[:volumes][volume_id]['attachments'] << data
+          response.body = { 'volumeAttachment' => data }
           response
         end
+
       end
 
     end

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

@@ -12,7 +12,7 @@ module Fog
         def create_flavor(attributes)
           # Get last flavor id
           flavor_ids = Array.new
-          flavors = list_flavors_detail.body['flavors']
+          flavors = list_flavors_detail.body['flavors'] + list_flavors_detail(:is_public => false).body['flavors']
           flavors.each do |flavor|
             flavor_ids << flavor['id'].to_i
           end

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

@@ -41,15 +41,44 @@ module Fog
             end
           end
 
+          if options['nics']
+            data['server']['networks'] =
+            Array(options['nics']).map do |nic|
+              {
+                'uuid' => nic['net_id'],
+                'fixed_ip' => nic['v4_fixed_ip'],
+                'port' => nic['port_id']
+              }
+            end
+          end
+
           if options['os:scheduler_hints']
             data['os:scheduler_hints'] = options['os:scheduler_hints']
           end
 
+          if options['block_device_mapping']
+            data['server']['block_device_mapping'] =
+            [options['block_device_mapping']].flatten.map do |mapping|
+              {
+                'volume_size' => mapping[:volume_size],
+                'volume_id' => mapping[:volume_id],
+                'delete_on_termination' => mapping[:delete_on_termination],
+                'device_name' => mapping[:device_name]
+              }
+            end
+          end
+
+          path = if data['server']['block_device_mapping']
+                   'os-volumes_boot.json'
+                 else
+                   'servers.json'
+                 end
+
           request(
             :body     => Fog::JSON.encode(data),
             :expects  => [200, 202],
             :method   => 'POST',
-            :path     => 'servers.json'
+            :path     => path
           )
         end
 
@@ -70,12 +99,10 @@ module Fog
           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
+                       response = identity.create_user(@openstack_username,
+                         'password',
+                         "#{@openstack_username}@example.com")
+                       response.body["user"]["id"]
                     end
 
 

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

@@ -31,22 +31,23 @@ module Fog
         def create_volume(name, description, size, options={})
           response = Excon::Response.new
           response.status = 202
-          response.body = {
-            'volume' => {
-              'id'                  => Fog::Mock.random_numbers(2),
-              'display_name'        => name,
-              'display_description' => description,
-              'size'                => size,
-              'status'              => 'creating',
-              'snapshot_id'         => '4',
-              'volume_type'         => nil,
-              'availability_zone'   => 'nova',
-              'created_at'          => Time.now,
-              'attachments'          => []
-            }
+          data = {
+            'id'                  => Fog::Mock.random_numbers(2),
+            'name'                => name,
+            'description'         => description,
+            'size'                => size,
+            'status'              => 'creating',
+            'snapshot_id'         => '4',
+            'volume_type'         => nil,
+            'availability_zone'   => 'nova',
+            'created_at'          => Time.now,
+            'attachments'         => []
           }
+          self.data[:volumes][data['id']] = data
+          response.body = { 'volume' => data }
           response
         end
+
       end
 
     end

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

@@ -0,0 +1,43 @@
+module Fog
+  module Compute
+    class OpenStack
+
+      class Real
+
+        def delete_meta(collection_name, parent_id, key)
+          request(
+            :expects  => 204,
+            :method   => 'DELETE',
+            :path     => "#{collection_name}/#{parent_id}/metadata/#{key}"
+          )
+        end
+
+      end
+
+      class Mock
+
+        def delete_meta(collection_name, parent_id, key)
+
+          if collection_name == "images" then
+            if not list_images_detail.body['images'].detect {|_| _['id'] == parent_id}
+              raise Fog::Compute::OpenStack::NotFound
+            end
+          end
+
+          if collection_name == "servers" then
+            if not list_servers_detail.body['servers'].detect {|_| _['id'] == parent_id}
+              raise Fog::Compute::OpenStack::NotFound
+            end
+          end
+
+          response = Excon::Response.new
+          response.status = 204
+          response
+
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -14,11 +14,18 @@ module Fog
       end
 
       class Mock
+
         def delete_volume(volume_id)
           response = Excon::Response.new
-          response.status = 204
-          response
+          if list_volumes.body['volumes'].map { |v| v['id'] }.include? volume_id
+            self.data[:volumes].delete(volume_id)
+            response.status = 204
+            response
+          else
+            raise Fog::Compute::OpenStack::NotFound
+          end
         end
+
       end
 
     end

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

@@ -14,10 +14,16 @@ module Fog
       end
 
       class Mock
+
         def detach_volume(server_id, attachment_id)
           response = Excon::Response.new
-          response.status = 202
-          response
+          if self.data[:volumes][attachment_id] &&
+             self.data[:volumes][attachment_id]['attachments'].reject! { |attachment| attachment['serverId'] == server_id }
+            response.status = 202
+            response
+          else
+            raise Fog::Compute::OpenStack::NotFound
+          end
         end
       end
 

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

@@ -73,7 +73,7 @@ module Fog
             'totalRAMUsed'             => -2048,
             'totalInstancesUsed'       => -1,
             'totalSecurityGroupsUsed'  => 0,
-            'totalKeyPairsUsed'        => 0
+            'totalFloatingIpsUsed'     => 0
           }
 
 

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

@@ -16,6 +16,16 @@ module Fog
 
       class Mock
 
+        def get_server_volumes(server_id)
+          response = Excon::Response.new
+          response.status = 200
+          data = self.data[:volumes].values.find_all do |vol|
+            vol['attachments'].find { |attachment| attachment["serverId"] == server_id }
+          end
+          response.body = { 'volumeAttachments' => data.collect! { |vol| vol['attachments'] }.flatten(1) }
+          response
+        end
+
       end
 
     end

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

@@ -16,7 +16,7 @@ module Fog
 
       class Mock
 
-        def get_snapshot_details(detailed=true)
+        def get_snapshot_details(snapshot_id)
           response = Excon::Response.new
           response.status = 200
           response.body = {

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

@@ -16,24 +16,15 @@ module Fog
 
       class Mock
 
-        def get_volume_details(detailed=true)
+        def get_volume_details(volume_id)
           response = Excon::Response.new
-          response.status = 200
-          response.body = {
-            'volume' => {
-              'id'                  => '1',
-              'display_name'        => Fog::Mock.random_letters(rand(8) + 5),
-              'display_description' => Fog::Mock.random_letters(rand(12) + 10),
-              'size'                => 3,
-              'volume_type'         => nil,
-              'snapshot_id'         => '4',
-              'status'              => 'online',
-              'availability_zone'   => 'nova',
-              'created_at'          => Time.now,
-              'attachments'         => []
-            }
-          }
-          response
+          if data = self.data[:volumes][volume_id]
+            response.status = 200
+            response.body = { 'volume' => data }
+            response
+          else
+            raise Fog::Compute::OpenStack::NotFound
+          end
         end
       end
 

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

@@ -16,6 +16,16 @@ module Fog
 
       class Mock
 
+        def list_address_pools
+          response = Excon::Response.new
+          response.status = 200
+          response.body = { 
+            'floating_ip_pools' => [
+              { 'name' => 'nova' }
+            ]
+          }
+          response
+        end
 
       end
     end

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

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

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

@@ -23,7 +23,7 @@ module Fog
 
           groups = if server_id then
                      server_group_names =
-                       self.data[:server_security_group_map][server_id]
+                       Array(self.data[:server_security_group_map][server_id])
 
                      server_group_names.map do |name|
                        security_groups.find do |sg|

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

@@ -19,7 +19,7 @@ module Fog
 
       class Mock
 
-        def list_servers
+        def list_servers(options = {})
           response = Excon::Response.new
           data = list_servers_detail.body['servers']
           servers = []

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

@@ -21,6 +21,7 @@ module Fog
           response = Excon::Response.new
           response.status = [200, 204][rand(1)]
           response.body = {
+            'tenants_links' => [],
             'tenants' => [
               {'id' => '1',
                'description' => 'Has access to everything',

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

@@ -0,0 +1,26 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def list_tenants_with_flavor_access(flavor_ref)
+          request(
+            :expects  => [200, 203],
+            :method   => 'GET',
+            :path     => "flavors/#{flavor_ref}/os-flavor-access.json"
+          )
+        end
+      end
+
+      class Mock
+        def list_tenants_with_flavor_access(flavor_ref)
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            "flavor_access" => [{ "tenant_id" => @tenant_id, "flavor_id" => flavor_ref }]
+          }
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -17,32 +17,10 @@ module Fog
       class Mock
 
         def list_volumes(detailed=true)
-          response = Excon::Response.new
-          response.status = 200
-          self.data[:volumes] ||= [
-            { "status" => "available",
-              "display_description" => "",
-              "availability_zone" => "nova",
-              "display_name" => "test 1",
-              "attachments" => [{}],
-              "volume_type" => nil,
-              "snapshot_id" => nil,
-              "size" => 1,
-              "id" => Fog::Mock.random_hex(32),
-              "created_at" => Time.now },
-            { "status" => "available",
-              "display_description" => "",
-              "availability_zone" => "nova",
-              "display_name" => "test 2",
-              "attachments" => [{}],
-              "volume_type" => nil,
-              "snapshot_id" => nil,
-              "size" => 1,
-              "id" => Fog::Mock.random_hex(32),
-              "created_at" => Time.now }
-            ]
-          response.body = { 'volumes' => self.data[:volumes] }
-          response
+          Excon::Response.new(
+            :body   => { 'volumes' => self.data[:volumes].values },
+            :status => 200
+          )
         end
       end