openstack_activeresource 0.1.13 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.13
+0.2.0

data/lib/locales/openstack_activeresource.en.yml

@@ -23,3 +23,14 @@ en:
       unknown: "unknown"
       user_powered_down: "user powered down"
 
+    tasks:
+      block_device_mapping: "block device mapping"
+      deleting: "deleting"
+      networking: "networking"
+      pausing: "pausing"
+      rebooting_hard: "rebooting hard"
+      scheduling: "scheduling"
+      spawning: "spawning"
+      starting: "starting"
+      stopping: "stopping"
+      unpausing: "unpausing"

data/lib/open_stack/glance/base.rb

@@ -31,6 +31,13 @@ module OpenStack
       def self.site=(site)
         super(site)
         Thread.current[:open_stack_glance_site] = @site
+        # Regenerate the prefix method
+        default = @site.path
+        default << '/' unless default[-1..-1] == '/'
+        # generate the actual method based on the current site path
+        self.prefix = default
+
+        @site
       end
 
     end

data/lib/open_stack/keystone/admin/base.rb

@@ -32,6 +32,13 @@ module OpenStack
         def self.site=(site)
           super(site)
           Thread.current[:open_stack_keystone_admin_site] = @site
+          # Regenerate the prefix method
+          default = @site.path
+          default << '/' unless default[-1..-1] == '/'
+          # generate the actual method based on the current site path
+          self.prefix = default
+
+          @site
         end
 
       end

data/lib/open_stack/keystone/admin/user.rb

@@ -82,13 +82,16 @@ module OpenStack
         end
 
         def self.find_by_name(name)
-          all.each { |user| return user if user.name == name }
-
-          nil
+          all.detect { |user| user.name == name }
+        end
+        
+        def tenant
+          OpenStack::Keystone::Admin::Tenant.find tenant_id
         end
 
-        def roles(scope = :all)
-          OpenStack::Keystone::Admin::UserRole.find(scope, :params => { :tenant_id => self.tenant_id, :user_id => self.id })
+        def roles(scope = :all, tenant = nil)
+          tenant_id = tenant.is_a?(OpenStack::Keystone::Admin::Tenant) ? tenant.id : (tenant || self.tenant_id)
+          OpenStack::Keystone::Admin::UserRole.find(scope, :params => { :tenant_id => tenant_id, :user_id => self.id })
         end
 
       end

data/lib/open_stack/keystone/admin/user_role.rb

@@ -21,11 +21,7 @@ module OpenStack
 
       class UserRole < Base
         self.element_name = "role"
-
-        def self.site
-          superclass.site + "tenants/:tenant_id/users/:user_id"
-
-        end
+        self.site = superclass.site + "tenants/:tenant_id/users/:user_id"
 
       end
 

data/lib/open_stack/keystone/public/base.rb

@@ -32,6 +32,13 @@ module OpenStack
         def self.site=(site)
           super(site)
           Thread.current[:open_stack_keystone_public_site] = @site
+          # Regenerate the prefix method
+          default = @site.path
+          default << '/' unless default[-1..-1] == '/'
+          # generate the actual method based on the current site path
+          self.prefix = default
+
+          @site
         end
 
       end

data/lib/open_stack/nova/compute/base.rb

@@ -32,6 +32,13 @@ module OpenStack
         def self.site=(site)
           super(site)
           Thread.current[:open_stack_nova_compute_site] = @site
+          # Regenerate the prefix method
+          default = @site.path
+          default << '/' unless default[-1..-1] == '/'
+          # generate the actual method based on the current site path
+          self.prefix = default
+
+          @site
         end
 
       end

data/lib/open_stack/nova/compute/key_pair.rb

@@ -30,6 +30,10 @@ module OpenStack
           attribute :fingerprint, :string
         end
 
+        def id
+          name
+        end
+
         def self.find_all_by_name(name)
           all.reject! { |key_pair| key_pair.name != name }
         end

data/lib/open_stack/nova/compute/server.rb

@@ -220,6 +220,11 @@ module OpenStack
           SERVER_STATUSES[status]
         end
 
+        # Returns a localized description for the server task (if any)
+        def task_description
+          I18n.t(task, :scope => [:openstack, :tasks]) if task.present?
+        end
+
         ## Actions
 
         # Assign a floating IP to the server.

data/lib/open_stack/nova/compute/volume_attachment.rb

@@ -22,10 +22,7 @@ module OpenStack
       class VolumeAttachment < Base
         self.element_name = "volumeAttachment"
         self.collection_name = "os-volume_attachments"
-
-        def self.site
-          superclass.site + "servers/:server_id"
-        end
+        self.site = superclass.site + "servers/:server_id"
 
         schema do
           attribute :device, :string

data/lib/open_stack/nova/volume/base.rb

@@ -32,6 +32,13 @@ module OpenStack
         def self.site=(site)
           super(site)
           Thread.current[:open_stack_nova_volume_site] = @site
+          # Regenerate the prefix method
+          default = @site.path
+          default << '/' unless default[-1..-1] == '/'
+          # generate the actual method based on the current site path
+          self.prefix = default
+
+          @site
         end
 
       end

data/openstack_activeresource.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "openstack_activeresource"
-  s.version = "0.1.13"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Davide Guerri"]
-  s.date = "2013-01-25"
+  s.date = "2013-02-06"
   s.description = "OpenStack Ruby and RoR bindings implemented with ActiveResource - See also http://www.unicloud.it"
   s.email = "d.guerri@rd.unidata.it"
   s.extra_rdoc_files = [
@@ -62,7 +62,9 @@ Gem::Specification.new do |s|
     "lib/open_stack/nova/volume/volume.rb",
     "lib/openstack_activeresource.rb",
     "openstack_activeresource.gemspec",
+    "test/.gitignore",
     "test/helper.rb",
+    "test/test_configuration-sample.yml",
     "test/test_openstack-activeresource.rb"
   ]
   s.homepage = "https://github.com/Unidata-SpA/openstack_activeresource"

data/test/.gitignore

@@ -0,0 +1,2 @@
+test_configuration.yml
+

data/test/helper.rb

@@ -16,3 +16,17 @@ require 'openstack_activeresource'
 
 class Test::Unit::TestCase
 end
+
+# Load test configuration for OpenStack API
+test_path = File.expand_path('..', __FILE__)
+$:.unshift(test_path)
+
+unless  File.exist? "#{test_path}/test_configuration.ymla"
+  raise "\n****" +
+            "\n**** Please add a valid 'test_configuration.yml' file in '#{test_path}'." +
+            "\n**** See #{test_path}/test_configuration-sample.yml for an example" +
+            "\n****"
+end
+
+TEST_CONFIG = (YAML.load_file("#{test_path}/test_configuration.yml")['test_configuration']).with_indifferent_access
+

data/test/test_configuration-sample.yml

@@ -0,0 +1,11 @@
+test_configuration:
+  public_base_site:   "https://my.api.com:5000/v2.0/"
+  public_admin_site:  "https://my.api.com:35357/v2.0/"
+  user_username:      "user_username"
+  user_password:      "user_password"
+  user_tenant_id:     "user_tenant_id"
+  admin_username:     "admin_username"
+  admin_password:     "admin_password"
+  admin_tenant_id:    "admin_tenant_id"
+
+# If admin_* are omitted the corresponding tests will be skipped

data/test/test_openstack-activeresource.rb

@@ -1,7 +1,289 @@
+lib_path = File.expand_path('../../lib', __FILE__)
+$:.unshift(lib_path)
+
+test_path = File.expand_path('..', __FILE__)
+$:.unshift(test_path)
+
 require 'helper'
+require 'openstack_activeresource'
 
 class TestOpenStackActiveResource < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+
+  # Keystone
+
+  # Authentication
+
+  def test_authentication
+    OpenStack::Keystone::Public::Base.site = TEST_CONFIG[:public_base_site]
+
+    # User auth
+    assert_nothing_raised ActiveResource::ClientError, "Cannot authenticate as user" do
+      auth = OpenStack::Keystone::Public::Auth.create :username => TEST_CONFIG[:user_username],
+                                                      :password => TEST_CONFIG[:user_password],
+                                                      :tenant_id => TEST_CONFIG[:user_tenant_id]
+
+      assert_not_nil auth.token, "Cannot authenticate as user"
+
+      auth = OpenStack::Keystone::Public::Auth.create :username => "baduser",
+                                                      :password => "badpassword",
+                                                      :tenant_id => TEST_CONFIG[:user_tenant_id]
+
+      assert_nil auth.token, "Authentication seems broken!"
+    end
+
+    # Admin auth
+    return unless admin_test_possible?
+
+    assert_nothing_raised ActiveResource::ClientError, "Cannot authenticate as admin" do
+      auth = OpenStack::Keystone::Public::Auth.create :username => TEST_CONFIG[:admin_username],
+                                                      :password => TEST_CONFIG[:admin_password],
+                                                      :tenant_id => TEST_CONFIG[:admin_tenant_id]
+
+      assert_not_nil auth.token, "Cannot authenticate as admin"
+    end
+
+  end
+
+  def test_list_tenant
+    return unless admin_test_possible?
+
+    auth_admin
+
+    assert_nothing_raised ActiveResource::ClientError, "Cannot list tenants" do
+      tenants = OpenStack::Keystone::Public::Tenant.all
+
+      assert_block("No tenants?") do
+        !tenants.empty?
+      end
+    end
+
+  end
+
+  def test_simple_tenant_usage
+    return unless admin_test_possible?
+
+    auth_admin
+
+    assert_nothing_raised ActiveResource::ClientError, "Cannot retrieve simple_usages" do
+      simple_usages = OpenStack::Nova::Compute::SimpleTenantUsage.find_from_date(:all, 5.days.ago)
+
+      assert_not_nil simple_usages
+    end
+
+  end
+
+  # Nova
+
+  ## Flavors
+
+  def test_list_flavor
+    auth_user
+
+    assert_nothing_raised ActiveResource::ClientError, "Cannot list flavors" do
+      flavors = OpenStack::Nova::Compute::Flavor.all
+
+      assert_block("No flavors?") do
+        !flavors.empty?
+      end
+    end
+  end
+
+  # Images
+
+  def test_list_images
+    auth_user
+
+    assert_nothing_raised ActiveResource::ClientError, "Cannot list images" do
+      images = OpenStack::Nova::Compute::Image.all
+
+      assert_block("No images?") do
+        !images.empty?
+      end
+    end
   end
+
+  # Security groups
+
+  def test_list_security_groups
+    auth_user
+
+    assert_nothing_raised ActiveResource::ClientError, "Cannot list security group" do
+      security_groups = OpenStack::Nova::Compute::SecurityGroup.all
+
+      assert_block("No security_groups?") do
+        !security_groups.empty?
+      end
+    end
+  end
+
+  # Keypairs
+
+  def test_keypair_list
+    auth_user
+
+    assert_nothing_raised ActiveResource::ClientError, "Cannot list keypair" do
+      keys = OpenStack::Nova::Compute::KeyPair.all
+
+      assert_not_nil keys, "Cannot retrieve key-pairs"
+    end
+
+  end
+
+  def test_keypair_create_destroy
+    auth_user
+
+    keypair_name = '___my_new_keypair'
+    key = nil
+    assert_nothing_raised ActiveResource::ClientError, "Cannot create key pair" do
+      key = OpenStack::Nova::Compute::KeyPair.create :name => keypair_name
+    end
+    assert_not_nil key, "Cannot create key pair"
+
+    key = nil
+    assert_nothing_raised ActiveResource::ClientError, "Cannot find keypair '#{keypair_name}'" do
+      key = OpenStack::Nova::Compute::KeyPair.find_by_name keypair_name
+    end
+
+    assert_not_nil key, "Cannot find key pair"
+
+    assert_nothing_raised "Cannot destroy key pair" do
+      key.destroy
+    end
+
+  end
+
+  # Floating IPs
+  def test_floating_ip_list
+    auth_user
+
+    assert_nothing_raised ActiveResource::ClientError, "Cannot list floating IP" do
+      floating_ips = OpenStack::Nova::Compute::FloatingIp.all
+
+      assert_not_nil floating_ips, "Cannot retrieve key-pairs"
+    end
+  end
+
+  def test_floating_ip_allocation
+    auth_user
+
+    assert_nothing_raised ActiveResource::ClientError, "Cannot list floating IP" do
+      floating_ip = nil
+      OpenStack::Nova::Compute::FloatingIpPool.all.each do |ip_pool|
+        begin
+          floating_ip = OpenStack::Nova::Compute::FloatingIp.create(:pool => ip_pool.name)
+          break
+        rescue ActiveResource::ClientError => e
+          next # Retry with the next pool
+        end
+      end
+
+      assert_not_nil floating_ip, "Failed to allocate a floating IP"
+
+      floating_ip.destroy
+    end
+  end
+
+  # Servers
+
+  def test_list_server
+    auth_user
+
+    assert_nothing_raised ActiveResource::ClientError, "Cannot list server" do
+      OpenStack::Nova::Compute::Server.all
+    end
+  end
+
+  def test_server_create_destroy
+    auth_user
+
+    flavor = OpenStack::Nova::Compute::Flavor.first
+    image = OpenStack::Nova::Compute::Image.last
+    security_groups = OpenStack::Nova::Compute::SecurityGroup.first
+
+    new_server_id = nil
+    assert_nothing_raised ActiveResource::ClientError, "Failed to create a new server" do
+      new_server = OpenStack::Nova::Compute::Server.create :name => 'test_server',
+                                                           :flavor => flavor,
+                                                           :image => image,
+                                                           :security_groups => [security_groups]
+      assert_not_nil new_server
+      new_server_id = new_server.id
+    end
+
+    # Verify server
+    my_server = loop_block(5) do
+      begin
+        OpenStack::Nova::Compute::Server.find new_server_id
+      rescue ActiveResource::ResourceNotFound
+
+        nil
+      end
+    end
+    assert_not_nil my_server, "Server not spawned after 5 seconds!?!"
+
+    # Wait for a network address
+    my_fixed_address = loop_block(60) do
+      my_server = OpenStack::Nova::Compute::Server.find new_server_id
+      return my_server.addresses[0] if my_server.addresses.count > 0
+
+      nil
+    end
+    assert_not_nil my_fixed_address, "No fixed address after a minute!"
+
+    assert_nothing_raised ActiveResource::ClientError, "Problem retrieving the server '#{new_server_id}'" do
+      my_server = OpenStack::Nova::Compute::Server.find new_server_id
+      my_server.destroy
+    end
+
+  end
+
+  private
+
+  # Utilities
+
+  def auth_admin
+    OpenStack::Keystone::Public::Base.site = TEST_CONFIG[:public_base_site]
+    OpenStack::Keystone::Admin::Base.site = TEST_CONFIG[:public_admin_site]
+
+    auth = OpenStack::Keystone::Public::Auth.create :username => TEST_CONFIG[:admin_username],
+                                                    :password => TEST_CONFIG[:admin_password],
+                                                    :tenant_id => TEST_CONFIG[:admin_tenant_id]
+
+    OpenStack::Base.token = auth.token
+    OpenStack::Nova::Compute::Base.site = auth.endpoint_for('compute').publicURL
+    OpenStack::Nova::Volume::Base.site = auth.endpoint_for('volume').publicURL
+
+  end
+
+  def auth_user
+    OpenStack::Keystone::Public::Base.site = TEST_CONFIG[:public_base_site]
+
+    auth = OpenStack::Keystone::Public::Auth.create :username => TEST_CONFIG[:user_username],
+                                                    :password => TEST_CONFIG[:user_password],
+                                                    :tenant_id => TEST_CONFIG[:user_tenant_id]
+
+    OpenStack::Base.token = auth.token
+    OpenStack::Nova::Compute::Base.site = auth.endpoint_for('compute').publicURL
+    OpenStack::Nova::Volume::Base.site = auth.endpoint_for('volume').publicURL
+
+  end
+
+  def admin_test_possible?
+    TEST_CONFIG[:admin_username] and TEST_CONFIG[:admin_password] and TEST_CONFIG[:admin_tenant_id]
+  end
+
+  def loop_block(seconds=10)
+    ret = nil
+    if block_given? and seconds > 0
+      begin
+        ret = yield
+        return ret unless ret.nil?
+        seconds-=1
+        sleep 1
+      end while seconds > 0
+    end
+
+    ret
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstack_activeresource
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -193,7 +193,9 @@ files:
 - lib/open_stack/nova/volume/volume.rb
 - lib/openstack_activeresource.rb
 - openstack_activeresource.gemspec
+- test/.gitignore
 - test/helper.rb
+- test/test_configuration-sample.yml
 - test/test_openstack-activeresource.rb
 homepage: https://github.com/Unidata-SpA/openstack_activeresource
 licenses:
@@ -210,7 +212,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -506182676093724300
+      hash: 3792719235558730488
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: