fog 1.6.0 → 1.7.0

data/tests/openstack/models/network/networks_tests.rb

@@ -0,0 +1,21 @@
+Shindo.tests("Fog::Network[:openstack] | networks", ['openstack']) do
+  @network = Fog::Network[:openstack].networks.create(:name => 'net_name',
+                                                      :shared => false,
+                                                      :admin_state_up => true,
+                                                      :tenant_id => 'tenant_id')
+  @networks = Fog::Network[:openstack].networks
+
+  tests('success') do
+
+    tests('#all').succeeds do
+      @networks.all
+    end
+
+    tests('#get').succeeds do
+      @networks.get @network.id
+    end
+
+  end
+
+  @network.destroy
+end

data/tests/openstack/models/network/port_tests.rb

@@ -0,0 +1,28 @@
+Shindo.tests("Fog::Network[:openstack] | port", ['openstack']) do
+
+  tests('success') do
+
+    tests('#create').succeeds do
+      @instance = Fog::Network[:openstack].ports.create(:name => 'port_name',
+                                                        :network_id => 'net_id',
+                                                        :fixed_ips => [],
+                                                        :mac_address => 'fa:16:3e:62:91:7f',
+                                                        :admin_state_up => true,
+                                                        :device_owner => 'device_owner',
+                                                        :device_id => 'device_id',
+                                                        :tenant_id => 'tenant_id')
+      !@instance.id.nil?
+    end
+
+    tests('#update').succeeds do
+      @instance.name = 'new_port_name'
+      @instance.update
+    end
+
+    tests('#destroy').succeeds do
+      @instance.destroy == true
+    end
+
+  end
+
+end

data/tests/openstack/models/network/ports_tests.rb

@@ -0,0 +1,25 @@
+Shindo.tests("Fog::Network[:openstack] | ports", ['openstack']) do
+  @port = Fog::Network[:openstack].ports.create(:name => 'port_name',
+                                                :network_id => 'net_id',
+                                                :fixed_ips => [],
+                                                :mac_address => 'fa:16:3e:62:91:7f',
+                                                :admin_state_up => true,
+                                                :device_owner => 'device_owner',
+                                                :device_id => 'device_id',
+                                                :tenant_id => 'tenant_id')
+  @ports = Fog::Network[:openstack].ports
+
+  tests('success') do
+
+    tests('#all').succeeds do
+      @ports.all
+    end
+
+    tests('#get').succeeds do
+      @ports.get @port.id
+    end
+
+  end
+
+  @port.destroy
+end

data/tests/openstack/models/network/subnet_tests.rb

@@ -0,0 +1,30 @@
+Shindo.tests("Fog::Network[:openstack] | subnet", ['openstack']) do
+
+  tests('success') do
+
+    tests('#create').succeeds do
+      @instance = Fog::Network[:openstack].subnets.create(:name => 'subnet_name',
+                                                          :network_id => 'net_id',
+                                                          :cidr => '10.2.2.0/24',
+                                                          :ip_version => 4,
+                                                          :gateway_ip => '10.2.2.1',
+                                                          :allocation_pools => [],
+                                                          :dns_nameservers => [],
+                                                          :host_routes => [],
+                                                          :enable_dhcp => true,
+                                                          :tenant_id => 'tenant_id')
+      !@instance.id.nil?
+    end
+
+    tests('#update').succeeds do
+      @instance.name = 'new_subnet_name'
+      @instance.update
+    end
+
+    tests('#destroy').succeeds do
+      @instance.destroy == true
+    end
+
+  end
+
+end

data/tests/openstack/models/network/subnets_tests.rb

@@ -0,0 +1,27 @@
+Shindo.tests("Fog::Network[:openstack] | subnets", ['openstack']) do
+  @subnet = Fog::Network[:openstack].subnets.create(:name => 'subnet_name',
+                                                    :network_id => 'net_id',
+                                                    :cidr => '10.2.2.0/24',
+                                                    :ip_version => 4,
+                                                    :gateway_ip => '10.2.2.1',
+                                                    :allocation_pools => [],
+                                                    :dns_nameservers => [],
+                                                    :host_routes => [],
+                                                    :enable_dhcp => true,
+                                                    :tenant_id => 'tenant_id')
+  @subnets = Fog::Network[:openstack].subnets
+
+  tests('success') do
+
+    tests('#all').succeeds do
+      @subnets.all
+    end
+
+    tests('#get').succeeds do
+      @subnets.get @subnet.id
+    end
+
+  end
+
+  @subnet.destroy
+end

data/tests/openstack/requests/compute/image_tests.rb

@@ -17,12 +17,12 @@ Shindo.tests('Fog::Compute[:openstack] | image requests', ['openstack']) do
   }
 
   tests('success') do
-
+    # Setup
     @image_id = Fog::Compute[:openstack].images[0].id
-
     unless Fog.mocking?
       Fog::Compute[:openstack].images.get(@image_id).wait_for { ready? }
     end
+
     tests("#get_image_details(#{@image_id})").formats(@image_format) do
       pending if Fog.mocking?
       Fog::Compute[:openstack].get_image_details(@image_id).body['image']
@@ -36,14 +36,13 @@ Shindo.tests('Fog::Compute[:openstack] | image requests', ['openstack']) do
       Fog::Compute[:openstack].list_images_detail.body
     end
 
+    # Teardown
     unless Fog.mocking?
       Fog::Compute[:openstack].images.get(@image_id).wait_for { ready? }
     end
-
   end
 
   tests('failure') do
-
     tests('#delete_image(0)').raises(Fog::Compute::OpenStack::NotFound) do
       pending if Fog.mocking?
       Fog::Compute[:openstack].delete_image(0)

data/tests/openstack/requests/compute/quota_tests.rb

@@ -11,6 +11,8 @@ Shindo.tests('Fog::Compute[:openstack] | quota requests', ['openstack']) do
     'instances' => Fixnum,
     'volumes' => Fixnum,
     'cores' => Fixnum,
+    'security_groups' => Fog::Nullable::Integer,
+    'security_group_rules' => Fog::Nullable::Integer,
     'id' => String
   }
 

data/tests/openstack/requests/compute/security_group_tests.rb

@@ -2,21 +2,21 @@ Shindo.tests('Fog::Compute[:openstack] | security group requests', ['openstack']
   @security_group = Hash.new
   @security_group_rule = Hash.new
   @security_group_format = {
-    "rules" => Array,
-    "tenant_id" => String,
-    "id" => Integer,
-    "name" => String,
+    "id"          => Integer,
+    "rules"       => Array,
+    "tenant_id"   => String,
+    "name"        => String,
     "description" => String
   }
 
   @security_group_rule_format = {
-    "from_port" => Integer,
-    "group"     => Hash,
+    "id"          => Integer,
+    "from_port"   => Integer,
+    "to_port"     => Integer,
     "ip_protocol" => String,
-    "to_port" => Integer,
-    "parent_group_id" => Integer,
-    "ip_range" => Hash,
-    "id" => Integer
+    "group"       => Hash,
+    "ip_range"    => Hash,
+    "parent_group_id" => Integer
   }
 
   tests('success') do

data/tests/openstack/requests/compute/server_tests.rb

@@ -12,7 +12,9 @@ Shindo.tests('Fog::Compute[:openstack] | server requests', ['openstack']) do
     'status'     => String,
     'accessIPv4' => Fog::Nullable::String,
     'accessIPv6' => Fog::Nullable::String,
-    'links' => Array
+    'links'      => Array,
+    'created'    => String,
+    'updated'    => String
   }
 
   @image_format = {

data/tests/openstack/requests/compute/volume_tests.rb

@@ -3,19 +3,18 @@ require 'fog/openstack'
 Shindo.tests('Fog::Compute[:openstack] | volume requests', ['openstack']) do
 
   @volume_format = {
-    'id'                 => String,
-    'displayName'        => String,
-    'size'               => Integer,
-    'displayDescription' => String,
-    'status'             => String,
-    'snapshotId'         => String,
-    'availabilityZone'   => String,
-    'attachments'        => Array,
-    'volumeType'         => NilClass,
-    'createdAt'          => Time
+    'id'                  => String,
+    'display_name'        => String,
+    'size'                => Integer,
+    'display_description' => String,
+    'status'              => String,
+    'snapshot_id'         => Fog::Nullable::String,
+    'availability_zone'   => String,
+    'attachments'         => Array,
+    'volume_type'         => Fog::Nullable::String,
+    'created_at'          => Time
   }
 
-
   tests('success') do
     tests('#list_volumes').formats({'volumes' => [@volume_format]}) do
       Fog::Compute[:openstack].list_volumes.body
@@ -23,7 +22,7 @@ Shindo.tests('Fog::Compute[:openstack] | volume requests', ['openstack']) do
 
     tests('#get_volume_detail').formats({'volume' => @volume_format}) do
       pending unless Fog.mocking?
-      Fog::Compute[:openstack].get_volume_details(0).body
+      Fog::Compute[:openstack].get_volume_details(1).body
     end
 
     tests('#create_volume').formats({'volume' => @volume_format}) do

data/tests/openstack/requests/identity/tenant_tests.rb

@@ -20,10 +20,11 @@ Shindo.tests('Fog::Identity[:openstack] | tenant requests', ['openstack']) do
 
     tests('#list_roles_for_user_on_tenant(0,1)').
       formats({'roles' => [@role_format]}) do
+      user = Fog::Identity[:openstack].create_user("testuser", "passw", "e@mail.co", "us3r1d").body['user']
 
       openstack = Fog::Identity[:openstack]
       openstack.list_roles_for_user_on_tenant(
-        openstack.tenants.first, openstack.users.first).body
+        openstack.current_tenant['id'], user['id']).body
     end
 
     tests('#create_tenant').formats({'tenant' => @tenant_format}) do

data/tests/openstack/requests/image/image_tests.rb

@@ -1,75 +1,96 @@
 Shindo.tests('Fog::Image[:openstack] | image requests', ['openstack']) do
+  openstack = Fog::Identity[:openstack]
+  @image_attributes = {
+    'name'            => 'new image',
+    'owner'           => openstack.current_tenant['id'],
+    'is_public'       => 'true',
+    'copy_from'       => 'http://website.com/image.iso',
+    'disk_format'     => 'iso',
+    'properties'      =>
+      {'user_id'      => openstack.current_user['id'],
+       'owner_id'     => openstack.current_tenant['id']},
+    'container_format'=> 'bare' }
 
   @image_format = {
+    'name'             => String,
+    'container_format' => String,
+    'disk_format'      => String,
+    'checksum'         => String,
+    'id'               => String,
+    'size'             => Integer
+  }
+
+  @detailed_image_format = {
     'id' => String,
     'name' => String,
-    'size' => Fog::Nullable::Integer,
-    'disk_format' => Fog::Nullable::String,
-    'container_format' => Fog::Nullable::String,
-    'checksum' => Fog::Nullable::String,
-    'min_disk'  => Fog::Nullable::Integer,
-    'created_at' => Fog::Nullable::String,
+    'size' => Integer,
+    'disk_format' => String,
+    'container_format' => String,
+    'checksum' => String,
+    'min_disk'  => Integer,
+    'created_at' => String,
     'deleted_at' => Fog::Nullable::String,
-    'updated_at' => Fog::Nullable::String,
-    'deleted' => Fog::Nullable::Boolean,
-    'protected' => Fog::Nullable::Boolean,
-    'is_public' => Fog::Nullable::Boolean,
-    'status' => Fog::Nullable::String,
-    'min_ram' => Fog::Nullable::Integer,
+    'updated_at' => String,
+    'deleted' => Fog::Boolean,
+    'protected' => Fog::Boolean,
+    'is_public' => Fog::Boolean,
+    'status' => String,
+    'min_ram' => Integer,
     'owner' => Fog::Nullable::String,
-    'properties' => Fog::Nullable::Hash
+    'properties' => Hash
   }
 
   @image_meta_format ={
-                     "X-Image-Meta-Is_public"=>String,
-                     "X-Image-Meta-Min_disk"=>Fog::Nullable::String,
-                     "X-Image-Meta-Property-Ramdisk_id"=>Fog::Nullable::String,
-                     "X-Image-Meta-Disk_format"=>Fog::Nullable::String,
-                     "X-Image-Meta-Created_at"=>String,
-                     "X-Image-Meta-Container_format"=>Fog::Nullable::String,
-                     "Etag"=>String,
-                     "Location"=>String,
-                     "X-Image-Meta-Protected"=>String,
-                     "Date"=>String,
-                     "X-Image-Meta-Name"=>String,
-                     "X-Image-Meta-Min_ram"=>String,
-                     "Content-Type"=>String,
-                     "X-Image-Meta-Updated_at"=>String,
-                     "X-Image-Meta-Property-Kernel_id"=>Fog::Nullable::String,
-                     "X-Image-Meta-Size"=>String,
-                     "X-Image-Meta-Checksum"=>Fog::Nullable::String,
-                     "X-Image-Meta-Deleted"=>String,
-                     "Content-Length"=>String,
-                     "X-Image-Meta-Owner"=>String,
-                     "X-Image-Meta-Status"=>String,
-                     "X-Image-Meta-Id"=>String}
+    'X-Image-Meta-Is_public'=>String,
+    'X-Image-Meta-Min_disk'=>Fog::Nullable::String,
+    'X-Image-Meta-Property-Ramdisk_id'=>Fog::Nullable::String,
+    'X-Image-Meta-Disk_format'=>Fog::Nullable::String,
+    'X-Image-Meta-Created_at'=>String,
+    'X-Image-Meta-Container_format'=>Fog::Nullable::String,
+    'Etag'=>String,
+    'Location'=>String,
+    'X-Image-Meta-Protected'=>String,
+    'Date'=>String,
+    'X-Image-Meta-Name'=>String,
+    'X-Image-Meta-Min_ram'=>String,
+    'Content-Type'=>String,
+    'X-Image-Meta-Updated_at'=>String,
+    'X-Image-Meta-Property-Kernel_id'=>Fog::Nullable::String,
+    'X-Image-Meta-Size'=>String,
+    'X-Image-Meta-Checksum'=>Fog::Nullable::String,
+    'X-Image-Meta-Deleted'=>String,
+    'Content-Length'=>String,
+    'X-Image-Meta-Status'=>String,
+    'X-Image-Meta-Owner'=>String,
+    'X-Image-Meta-Id'=>String
+  }
 
   @image_members_format =[
-                          {"can_share"=>Fog::Nullable::Boolean,
-                           "member_id"=>String
-                          }
-                         ]
+    {'can_share'=>Fog::Nullable::Boolean,
+      'member_id'=>String
+    }
+  ]
 
   tests('success') do
     tests('#list_public_images').formats({'images' => [@image_format]}) do
       Fog::Image[:openstack].list_public_images.body
     end
 
-    tests('#list_public_images_detailed').formats({'images' => [@image_format]}) do
-      Fog::Image[:openstack].list_public_images.body
+    tests('#list_public_images_detailed').formats({'images' => [@detailed_image_format]}) do
+      Fog::Image[:openstack].list_public_images_detailed.body
     end
 
-    tests('#create_image').formats({'image' => @image_format}) do
-      @instance = Fog::Image[:openstack].create_image({:name => "test image"}).body
+    tests('#create_image').formats({'image' => @detailed_image_format}) do
+      @instance = Fog::Image[:openstack].create_image(@image_attributes).body
     end
 
     tests('#get_image').formats(@image_meta_format) do
        Fog::Image[:openstack].get_image(@instance['image']['id']).headers
     end
 
-    tests('#update_image').formats(@image_format) do
+    tests('#update_image').formats(@detailed_image_format) do
        Fog::Image[:openstack].update_image({:id => @instance['image']['id'],
-                                            :name => "edit image"}).body['image']
+                                            :name => 'edit image'}).body['image']
     end
 
     tests('#add_member_to_image').succeeds do

data/tests/openstack/requests/network/network_tests.rb

@@ -0,0 +1,56 @@
+Shindo.tests('Fog::Network[:openstack] | network requests', ['openstack']) do
+
+  @network_format = {
+    'id'             => String,
+    'name'           => String,
+    'subnets'        => Array,
+    'shared'         => Fog::Boolean,
+    'status'         => String,
+    'admin_state_up' => Fog::Boolean,
+    'tenant_id'      => String,
+  }
+
+  tests('success') do
+    tests('#create_network').formats({'network' => @network_format}) do
+      attributes = {:name => 'net_name', :shared => false,
+                    :admin_state_up => true, :tenant_id => 'tenant_id'}
+      Fog::Network[:openstack].create_network(attributes).body
+    end
+
+    tests('#list_networks').formats({'networks' => [@network_format]}) do
+      Fog::Network[:openstack].list_networks.body
+    end
+
+    tests('#get_network').formats({'network' => @network_format}) do
+      network_id = Fog::Network[:openstack].networks.all.first.id
+      Fog::Network[:openstack].get_network(network_id).body
+    end
+
+    tests('#update_network').formats({'network' => @network_format}) do
+      network_id = Fog::Network[:openstack].networks.all.first.id
+      attributes = {:name => 'net_name', :shared => false,
+                    :admin_state_up => true}
+      Fog::Network[:openstack].update_network(network_id, attributes).body
+    end
+
+    tests('#delete_network').succeeds do
+      network_id = Fog::Network[:openstack].networks.all.first.id
+      Fog::Network[:openstack].delete_network(network_id)
+    end
+  end
+
+  tests('failure') do
+    tests('#get_network').raises(Fog::Network::OpenStack::NotFound) do
+      Fog::Network[:openstack].get_network(0)
+    end
+
+    tests('#update_network').raises(Fog::Network::OpenStack::NotFound) do
+      Fog::Network[:openstack].update_network(0, {})
+    end
+
+    tests('#delete_network').raises(Fog::Network::OpenStack::NotFound) do
+      Fog::Network[:openstack].delete_network(0)
+    end
+  end
+
+end