fog 1.6.0 → 1.7.0

data/lib/fog/openstack/requests/image/list_public_images_detailed.rb

@@ -19,49 +19,10 @@ module Fog
       end # class Real
 
       class Mock
-        def list_public_images_detailed
+        def list_public_images_detailed(attribute=nil, query=nil)
           response = Excon::Response.new
           response.status = [200, 204][rand(1)]
-          response.body = {"images"=>[{
-             "name"=>"cirros-0.3.0-x86_64-blank",
-             "size"=>25165824,
-             "min_disk"=>0,
-             "disk_format"=>"ami",
-             "created_at"=>"2012-02-21T07:32:26",
-             "container_format"=>"ami",
-             "deleted_at"=>nil,
-             "updated_at"=>"2012-02-21T07:32:29",
-             "checksum"=>"2f81976cae15c16ef0010c51e3a6c163",
-             "id"=>"0e09fbd6-43c5-448a-83e9-0d3d05f9747e",
-             "deleted"=>false,
-             "protected"=>false,
-             "is_public"=>true,
-             "status"=>"active",
-             "min_ram"=>0,
-             "owner"=>"ff528b20431645ebb5fa4b0a71ca002f",
-             "properties"=>{
-               "ramdisk_id"=>"b45aa128-cd36-4ad9-a026-1a1c2bfd8fdc",
-               "kernel_id"=>"cd28951e-e1c2-4bc5-95d3-f0495abbcdc5"}
-               },
-            {"name"=>"new image",
-             "size"=>0,
-             "min_disk"=>0,
-             "disk_format"=>nil,
-             "created_at"=>"2012-02-24T06:45:00",
-             "container_format"=>nil,
-             "deleted_at"=>nil,
-             "updated_at"=>"2012-02-24T06:45:00",
-             "checksum"=>nil,
-             "id"=>"e41304f3-2453-42b4-9829-2e220a737395",
-             "deleted"=>false,
-             "protected"=>false,
-             "is_public"=>false,
-             "status"=>"queued",
-             "min_ram"=>0,
-             "owner"=>"728ecc7c10614a1faa6fbabd1a68a4a0",
-             "properties"=>{}
-             }]
-          }
+          response.body = {'images' => self.data[:images].values}
           response
         end # def list_tenants
       end # class Mock

data/lib/fog/openstack/requests/image/update_image.rb

@@ -11,6 +11,9 @@ module Fog
               "x-image-meta-container-format" => attributes[:container_format],
               "x-image-meta-size" => attributes[:size],
               "x-image-meta-is-public" => attributes[:is_public],
+              "x-image-meta-min-ram"  => attributes[:min_ram],
+              "x-image-meta-min-disk" => attributes[:min_disk],
+              "x-image-meta-checksum" => attributes[:checksum],
               "x-image-meta-owner" => attributes[:owner]
           }
 
@@ -21,7 +24,7 @@ module Fog
           end
 
           request(
-            :headers     => data,
+            :headers  => data,
             :expects  => 200,
             :method   => 'PUT',
             :path     => "images/#{attributes[:id]}"
@@ -35,26 +38,28 @@ module Fog
         def update_image(attributes)
           response = Excon::Response.new
           response.status = 200
-          response.body = {"image"=>
-                               {"name"=>"edit test image",
-                                "size"=>0,
-                                "min_disk"=>0,
-                                "disk_format"=>nil,
-                                "created_at"=>"2012-02-24T06:45:00",
-                                "container_format"=>nil,
-                                "deleted_at"=>nil,
-                                "updated_at"=>"2012-02-24T06:45:00",
-                                "checksum"=>nil,
-                                "id"=>"e41304f3-2453-42b4-9829-2e220a737395",
-                                "deleted"=>false,
-                                "protected"=>false,
-                                "is_public"=>false,
-                                "status"=>"queued",
-                                "min_ram"=>0,
-                                "owner"=>"728ecc7c10614a1faa6fbabd1a68a4a0",
-                                "properties"=>{}
-                               }
-                           }
+          image = self.images.last
+          response.body = {
+                            'image'=> {
+                              'name'             => attributes[:name] || image.name,
+                              'size'             => image.size,
+                              'min_disk'         => (attributes[:min_disk] || image.min_disk).to_i,
+                              'disk_format'      => attributes[:disk_format] || image.disk_format,
+                              'created_at'       => image.created_at,
+                              'container_format' => attributes[:container_format] || image.container_format,
+                              'deleted_at'       => nil,
+                              'updated_at'       => Time.now.to_s,
+                              'checksum'         => image.checksum,
+                              'id'               => attributes[:id],
+                              'deleted'          => false,
+                              'protected'        => false,
+                              'is_public'        => attributes[:is_public] || image.is_public,
+                              'status'           => image.status,
+                              'min_ram'          => (attributes[:min_ram] || image.min_ram).to_i,
+                              'owner'            => attributes[:owner] || image.owner,
+                              'properties'       => attributes[:properties] || image.properties
+                            }
+                          }
           response
 
         end

data/lib/fog/openstack/requests/image/update_image_members.rb

@@ -0,0 +1,37 @@
+module Fog
+  module Image
+    class OpenStack
+      class Real
+        def update_image_members(image_id, members)
+          # Sample members
+          # [
+          #   {'member_id' => 'tenant1', 'can_share' => true  },
+          #   {'member_id' => 'tenant2', 'can_share' => false }
+          # ]
+          data = { 'memberships' => members }
+
+          request(
+            :body    => MultiJson.encode(data),
+            :expects => [200, 202],
+            :method  => 'PUT',
+            :path    => "images/#{image_id}/members"
+          )
+        end
+      end # class Real
+
+      class Mock
+        def update_image_members(image_id, members)
+          response = Excon::Response.new
+          response.status = [200, 202][rand(1)]
+          response.body = {
+            'members' => [
+              { 'member_id'=>'ff528b20431645ebb5fa4b0a71ca002f', 'can_share' => false },
+              { 'member_id'=>'ff528b20431645ebb5fa4b0a71ca002f', 'can_share' => true  }
+            ]
+          }
+          response
+        end
+      end # class Mock
+    end # class OpenStack
+  end # module Identity
+end # module Fog

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

@@ -0,0 +1,44 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def create_network(options = {})
+          data = { 'network' => {} }
+
+          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
+
+          request(
+            :body     => Fog::JSON.encode(data),
+            :expects  => [201],
+            :method   => 'POST',
+            :path     => 'networks'
+          )
+        end
+      end
+
+      class Mock
+        def create_network(options = {})
+          response = Excon::Response.new
+          response.status = 201
+          data = {
+            'id'             => Fog::Mock.random_numbers(6).to_s,
+            'name'           => options[:name],
+            'shared'         => options[:shared],
+            'subnets'        => [],
+            'status'         => 'ACTIVE',
+            'admin_state_up' => options[:admin_state_up],
+            'tenant_id'      => options[:tenant_id],
+          }
+          self.data[:networks][data['id']] = data
+          response.body = { 'network' => data }
+          response
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def create_port(network_id, options = {})
+          data = {
+            'port' => {
+              'network_id' => network_id,
+            }
+          }
+
+          vanilla_options = [:name, :fixed_ips, :mac_address, :admin_state_up,
+                             :device_owner, :device_id, :tenant_id]
+          vanilla_options.reject{ |o| options[o].nil? }.each do |key|
+            data['port'][key] = options[key]
+          end
+
+          request(
+            :body     => Fog::JSON.encode(data),
+            :expects  => [201],
+            :method   => 'POST',
+            :path     => 'ports'
+          )
+        end
+      end
+
+      class Mock
+        def create_port(network_id, options = {})
+          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],
+          }
+          self.data[:ports][data['id']] = data
+          response.body = { 'port' => data }
+          response
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def create_subnet(network_id, cidr, ip_version, options = {})
+          data = {
+            'subnet' => {
+              'network_id' => network_id,
+              'cidr'       => cidr,
+              'ip_version' => ip_version,
+            }
+          }
+
+          vanilla_options = [:name, :gateway_ip, :allocation_pools,
+                             :dns_nameservers, :host_routes, :enable_dhcp,
+                             :tenant_id]
+          vanilla_options.reject{ |o| options[o].nil? }.each do |key|
+            data['subnet'][key] = options[key]
+          end
+
+          request(
+            :body     => Fog::JSON.encode(data),
+            :expects  => [201],
+            :method   => 'POST',
+            :path     => 'subnets'
+          )
+        end
+      end
+
+      class Mock
+        def create_subnet(network_id, cidr, ip_version, options = {})
+          response = Excon::Response.new
+          response.status = 201
+          data = {
+            'id'               => Fog::Mock.random_numbers(6).to_s,
+            'name'             => options[:name],
+            'network_id'       => network_id,
+            'cidr'             => cidr,
+            'ip_version'       => ip_version,
+            'gateway_ip'       => options[:gateway_ip],
+            'allocation_pools' => options[:allocation_pools],
+            'dns_nameservers'  => options[:dns_nameservers],
+            'host_routes'      => options[:host_routes],
+            'enable_dhcp'      => options[:enable_dhcp],
+            'tenant_id'        => options[:tenant_id],
+          }
+          self.data[:subnets][data['id']] = data
+          response.body = { 'subnet' => data }
+          response
+        end
+      end
+
+    end
+  end
+end

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

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

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

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

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

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

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

@@ -0,0 +1,42 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def get_network(network_id)
+          request(
+            :expects => [200],
+            :method  => 'GET',
+            :path    => "networks/#{network_id}"
+          )
+        end
+      end
+
+      class Mock
+        def get_network(network_id)
+          response = Excon::Response.new
+          if data = self.data[:networks][network_id]
+            response.status = 200
+            response.body = {
+              'network' => {
+                'id' => 'e624a36d-762b-481f-9b50-4154ceb78bbb',
+                'name' => 'network_1',
+                'subnets' => [
+                  '2e4ec6a4-0150-47f5-8523-e899ac03026e'
+                ],
+                'shared' => false,
+                'status' => 'ACTIVE',
+                'admin_state_up' => true,
+                'tenant_id' => 'f8b26a6032bc47718a7702233ac708b9',
+              }
+            }
+            response
+          else
+            raise Fog::Network::OpenStack::NotFound
+          end
+        end
+      end
+
+    end
+  end
+end