openstack_activeresource 0.4.0 → 0.5.0

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

@@ -127,8 +127,7 @@ module OpenStack
         end
 
         # Overloads ActiveRecord::encode method
-        def encode(options={}) #:nodoc:
-                               # Custom encoding to deal with openstack API
+        def encode(options={}) # :nodoc: Custom encoding to deal with openstack API
           to_encode = {
               :server => {
                   :name => name,

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

@@ -40,7 +40,7 @@ module OpenStack
         end
 
         # Redefine the find method to add the detailed flag
-        def self.find(*arguments) #:nodoc:
+        def self.find(*arguments) # :nodoc:
           scope = arguments.slice!(0)
           options = arguments.slice!(0) || {}
 

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

@@ -26,7 +26,7 @@ module OpenStack
       class VolumeAttachment < Base
         self.element_name = "volumeAttachment"
         self.collection_name = "os-volume_attachments"
-        self.site = superclass.site + "servers/:server_id"
+        self.site = "#{superclass.site}/servers/:server_id"
 
         schema do
           attribute :device, :string
@@ -42,7 +42,7 @@ module OpenStack
         validates :server,
                   :presence => true
 
-        def initialize(attributes = {}, persisted = false) #:notnew:
+        def initialize(attributes = {}, persisted = false) # :notnew:
           attributes = attributes.with_indifferent_access
           new_attributes = {
               :device => attributes[:device],
@@ -68,8 +68,7 @@ module OpenStack
         end
 
         # Overloads ActiveRecord::encode method
-        def encode(options={}) #:nodoc:
-                               # Custom encoding to deal with openstack API
+        def encode(options={}) # :nodoc: Custom encoding to deal with openstack API
           to_encode = {
               VolumeAttachment.element_name => {
                   :device => device,

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

@@ -51,7 +51,7 @@ module OpenStack
                   :presence => true,
                   :numericality => {:greater_than_or_equal_to => 1, :only_integer => true, :allow_blank => true}
 
-        def initialize(attributes = {}, persisted = false) #:notnew:
+        def initialize(attributes = {}, persisted = false) # :notnew:
           attributes = attributes.with_indifferent_access
           new_attributes = {
               :id => attributes[:id],

data/openstack_activeresource.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "openstack_activeresource"
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Davide Guerri"]
-  s.date = "2013-02-19"
+  s.date = "2013-03-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 = [
@@ -38,7 +38,6 @@ Gem::Specification.new do |s|
     "lib/open_stack/keystone/admin/role.rb",
     "lib/open_stack/keystone/admin/tenant.rb",
     "lib/open_stack/keystone/admin/user.rb",
-    "lib/open_stack/keystone/admin/user_role.rb",
     "lib/open_stack/keystone/public.rb",
     "lib/open_stack/keystone/public/auth.rb",
     "lib/open_stack/keystone/public/base.rb",
@@ -68,7 +67,7 @@ Gem::Specification.new do |s|
     "test/test_configuration-sample.yml",
     "test/test_keystone_authentications.rb",
     "test/test_keystone_tenants.rb",
-    "test/test_keystone_users.rb",
+    "test/test_keystone_users_and_roles.rb",
     "test/test_nova_flavors.rb",
     "test/test_nova_floating_ips.rb",
     "test/test_nova_images.rb",
@@ -89,36 +88,36 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activemodel>, ["~> 3.2.6"])
-      s.add_runtime_dependency(%q<activeresource>, ["~> 3.2.6"])
+      s.add_runtime_dependency(%q<activemodel>, ["~> 3.2.12"])
+      s.add_runtime_dependency(%q<activeresource>, ["~> 3.2.12"])
       s.add_runtime_dependency(%q<oj>, ["~> 1.2.9"])
-      s.add_runtime_dependency(%q<bundler>, ["~> 1.2.0"])
-      s.add_runtime_dependency(%q<shoulda>, [">= 0"])
-      s.add_runtime_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_runtime_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_runtime_dependency(%q<simplecov>, [">= 0"])
       s.add_runtime_dependency(%q<json>, ["~> 1.7.7"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<test-unit>, [">= 0"])
     else
-      s.add_dependency(%q<activemodel>, ["~> 3.2.6"])
-      s.add_dependency(%q<activeresource>, ["~> 3.2.6"])
+      s.add_dependency(%q<activemodel>, ["~> 3.2.12"])
+      s.add_dependency(%q<activeresource>, ["~> 3.2.12"])
       s.add_dependency(%q<oj>, ["~> 1.2.9"])
-      s.add_dependency(%q<bundler>, ["~> 1.2.0"])
+      s.add_dependency(%q<json>, ["~> 1.7.7"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<json>, ["~> 1.7.7"])
+      s.add_dependency(%q<test-unit>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activemodel>, ["~> 3.2.6"])
-    s.add_dependency(%q<activeresource>, ["~> 3.2.6"])
+    s.add_dependency(%q<activemodel>, ["~> 3.2.12"])
+    s.add_dependency(%q<activeresource>, ["~> 3.2.12"])
     s.add_dependency(%q<oj>, ["~> 1.2.9"])
-    s.add_dependency(%q<bundler>, ["~> 1.2.0"])
+    s.add_dependency(%q<json>, ["~> 1.7.7"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<json>, ["~> 1.7.7"])
+    s.add_dependency(%q<test-unit>, [">= 0"])
   end
 end
 

data/test/helper.rb

@@ -12,7 +12,6 @@ require 'shoulda'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'openstack_activeresource'
 
 class Test::Unit::TestCase
 end
@@ -28,5 +27,8 @@ unless  File.exist? "#{test_path}/test_configuration.yml"
             "\n****"
 end
 
+require 'openstack_activeresource'
+require 'utils'
+
 TEST_CONFIG = (YAML.load_file("#{test_path}/test_configuration.yml")['test_configuration']).with_indifferent_access
 

data/test/test_configuration-sample.yml

@@ -9,5 +9,6 @@ test_configuration:
   admin_username:     "admin_username"
   admin_password:     "admin_password"
   admin_tenant_id:    "admin_tenant_id"
+  default_role_name:  "member"
 
 # If admin_* are omitted the corresponding tests will be skipped

data/test/test_keystone_authentications.rb

@@ -1,12 +1,7 @@
-lib_path = File.expand_path('../../lib', __FILE__)
-$:.unshift(lib_path)
-
 test_path = File.expand_path('..', __FILE__)
 $:.unshift(test_path)
 
 require 'helper'
-require 'openstack_activeresource'
-require 'utils'
 
 class TestOpenStackActiveResource < Test::Unit::TestCase
   include OpenstackTestUtils
@@ -15,7 +10,7 @@ class TestOpenStackActiveResource < Test::Unit::TestCase
 
   # Authentication
 
-  def test_authentications
+  def test_10_authentications
     OpenStack::Keystone::Public::Base.site = TEST_CONFIG[:public_base_site]
 
     # User auth

data/test/test_keystone_tenants.rb

@@ -1,23 +1,32 @@
-lib_path = File.expand_path('../../lib', __FILE__)
-$:.unshift(lib_path)
-
 test_path = File.expand_path('..', __FILE__)
 $:.unshift(test_path)
 
 require 'helper'
-require 'openstack_activeresource'
-require 'utils'
 
 class TestOpenStackActiveResource < Test::Unit::TestCase
   include OpenstackTestUtils
 
-  def test_list_tenant
+  TENANT_NAME = "__test__tenant__"
+
+  def test_10_tenant_create
+    return unless admin_test_possible?
+
+    auth_admin
+
+    assert_nothing_raised ActiveResource::ClientError, "Cannot create tenant" do
+      new_tenant = OpenStack::Keystone::Admin::Tenant.create :name => TENANT_NAME, :enabled => true, :description => "Test tenant"
+
+      assert_not_nil new_tenant.id, "Cannot create tenant: #{active_resource_errors_to_s(new_tenant)}"
+    end
+  end
+
+  def test_20_tenant_list
     return unless admin_test_possible?
 
     auth_admin
 
     assert_nothing_raised ActiveResource::ClientError, "Cannot list tenants" do
-      tenants = OpenStack::Keystone::Public::Tenant.all
+      tenants = OpenStack::Keystone::Admin::Tenant.all
 
       assert_block("No tenants?") do
         !tenants.empty?
@@ -26,4 +35,46 @@ class TestOpenStackActiveResource < Test::Unit::TestCase
 
   end
 
+  def test_30_tenant_get
+    return unless admin_test_possible?
+
+    auth_admin
+
+    assert_nothing_raised ActiveResource::ResourceNotFound, "Cannot retrieve tenant '#{TEST_CONFIG[:user_tenant_id]}'" do
+      tenant = OpenStack::Keystone::Admin::Tenant.find TEST_CONFIG[:user_tenant_id]
+      assert_not_nil tenant, "Cannot retrieve tenant '#{TEST_CONFIG[:user_tenant_id]}'"
+    end
+
+    assert_raises ActiveResource::ResourceNotFound, "Tenant retrieval broken!" do
+      OpenStack::Keystone::Admin::Tenant.find 1
+    end
+
+  end
+
+  def test_40_tenant_update
+    return unless admin_test_possible?
+
+    auth_admin
+
+    tenant = OpenStack::Keystone::Admin::Tenant.find_by_name TENANT_NAME
+
+    assert_nothing_raised ActiveResource::ClientError, "Cannot update tenant '#{tenant.id}'" do
+      tenant.update_attributes :enabled => false
+      tenant.save
+      assert_true tenant.save, "Failed to update server '#{tenant.id}': #{active_resource_errors_to_s(tenant)}"
+    end
+  end
+
+  def test_50_tenant_destroy
+    return unless admin_test_possible?
+
+    auth_admin
+
+    tenant = OpenStack::Keystone::Admin::Tenant.find_by_name TENANT_NAME
+
+    assert_nothing_raised ActiveResource::ClientError, "Cannot destroy tenant '#{tenant.id}'" do
+      tenant.destroy
+    end
+  end
+
 end

data/test/test_keystone_users_and_roles.rb

@@ -0,0 +1,168 @@
+test_path = File.expand_path('..', __FILE__)
+$:.unshift(test_path)
+
+require 'helper'
+
+class TestOpenStackActiveResource < Test::Unit::TestCase
+  include OpenstackTestUtils
+
+  USER_NAME="__test_user__"
+
+  def test_10_user_create
+    return unless admin_test_possible?
+
+    auth_admin
+
+    tenant = OpenStack::Keystone::Admin::Tenant.find(TEST_CONFIG[:user_tenant_id])
+    assert_not_nil tenant, "Cannot retrieve tenant"
+
+    assert_nothing_raised ActiveResource::ClientError, "Cannot create user" do
+      new_user = OpenStack::Keystone::Admin::User.create :name => USER_NAME,
+                                                         :password => "test_password_123",
+                                                         :email => "fake@pretend.test",
+                                                         :enabled => false,
+                                                         :tenant => tenant
+
+      assert_not_nil new_user.id, "Cannot create user: #{active_resource_errors_to_s(new_user)}"
+    end
+
+  end
+
+  def test_20_user_list
+    return unless admin_test_possible?
+
+    auth_admin
+
+    assert_nothing_raised ActiveResource::ClientError, "Cannot list users" do
+      users = OpenStack::Keystone::Admin::User.all
+
+      assert_block("No users?") do
+        !users.nil? && !users.empty?
+      end
+    end
+
+  end
+
+  def test_30_user_get
+    return unless admin_test_possible?
+
+    auth_admin
+
+    assert_nothing_raised ActiveResource::ResourceNotFound, "Cannot retrieve user" do
+      user = OpenStack::Keystone::Admin::User.find_by_name USER_NAME
+      assert_not_nil user, "Cannot retrieve user by name"
+
+      user = OpenStack::Keystone::Admin::User.find user.id
+      assert_not_nil user, "Cannot retrieve user by id"
+
+    end
+
+    assert_raises ActiveResource::ResourceNotFound, "User retrieval broken!" do
+      OpenStack::Keystone::Admin::User.find 1
+    end
+
+  end
+
+  def test_40_user_update
+    return unless admin_test_possible?
+
+    auth_admin
+
+    user = OpenStack::Keystone::Admin::User.find_by_name USER_NAME
+    assert_not_nil user, "Cannot retrieve user by name"
+
+    assert_nothing_raised ActiveResource::ResourceNotFound, "Cannot update user" do
+      user.update_attributes :email => "fake2@pretend.test"
+      assert_true user.save, "Failed to update server '#{user.id}': #{active_resource_errors_to_s(user)}"
+    end
+
+  end
+
+  def test_50_role_list
+    return unless admin_test_possible?
+
+    auth_admin
+
+    assert_nothing_raised ActiveResource::ClientError, "Cannot list roles" do
+      roles = OpenStack::Keystone::Admin::Role.all
+
+      assert_block("No roles?") do
+        !roles.nil? && !roles.empty?
+      end
+    end
+
+  end
+
+  def test_60_role_get
+    return unless admin_test_possible?
+
+    auth_admin
+
+    role = OpenStack::Keystone::Admin::Role.find_by_name TEST_CONFIG[:default_role_name]
+    assert_not_nil role, "Cannot retrieve role by name"
+
+    assert_nothing_raised ActiveResource::ResourceNotFound, "Cannot retrieve role" do
+      role = OpenStack::Keystone::Admin::Role.find role.id
+      assert_not_nil role, "Cannot retrieve role by id"
+
+    end
+
+    assert_raises ActiveResource::ResourceNotFound, "Role retrieval broken!" do
+      OpenStack::Keystone::Admin::Role.find 1
+    end
+
+  end
+
+  def test_70_user_role_add
+    return unless admin_test_possible?
+
+    auth_admin
+
+    user = OpenStack::Keystone::Admin::User.find_by_name USER_NAME
+    assert_not_nil user, "Cannot retrieve user by name"
+
+    role = OpenStack::Keystone::Admin::Role.find_by_name TEST_CONFIG[:default_role_name]
+    assert_not_nil role, "Cannot retrieve role by name"
+
+    tenant = OpenStack::Keystone::Admin::Tenant.find(TEST_CONFIG[:user_tenant_id])
+    assert_not_nil tenant, "Cannot retrieve tenant"
+
+    assert_nothing_raised ActiveResource::ClientError, "Cannot list user roles" do
+      tenant.add_role_to_user role, user
+    end
+  end
+
+  def test_80_user_role_list
+    return unless admin_test_possible?
+
+    auth_admin
+
+    user = OpenStack::Keystone::Admin::User.find_by_name USER_NAME
+    assert_not_nil user, "Cannot retrieve user by name"
+
+    assert_nothing_raised ActiveResource::ClientError, "Cannot list user roles" do
+      roles = user.roles
+
+      assert_not_nil roles
+      assert_block("No user roles?") do
+        !roles.empty?
+      end
+    end
+
+  end
+
+  def test_90_user_destroy
+    return unless admin_test_possible?
+
+    auth_admin
+
+    user = OpenStack::Keystone::Admin::User.find_by_name USER_NAME
+    assert_not_nil user, "Cannot retrieve user by name"
+
+    assert_nothing_raised ActiveResource::ClientError, "Cannot destroy user" do
+      user.destroy
+    end
+
+  end
+
+end

data/test/test_nova_flavors.rb

@@ -1,17 +1,35 @@
-lib_path = File.expand_path('../../lib', __FILE__)
-$:.unshift(lib_path)
-
 test_path = File.expand_path('..', __FILE__)
 $:.unshift(test_path)
 
 require 'helper'
-require 'openstack_activeresource'
-require 'utils'
 
 class TestOpenStackActiveResource < Test::Unit::TestCase
   include OpenstackTestUtils
 
-  def test_list_flavor
+  FLAVOR_NAME="__test__flavor__"
+
+
+  def test_10_flavor_create
+    return unless admin_test_possible?
+
+    auth_admin
+
+    assert_nothing_raised ActiveResource::ClientError, "Cannot create flavors" do
+      new_flavor = OpenStack::Nova::Compute::Flavor.create :name => FLAVOR_NAME,
+                                                           :ram => 1,
+                                                           :disk => 10,
+                                                           :swap => 1,
+                                                           :vcpus => 1,
+                                                           :ephemeral_disk => 1,
+                                                           :rxtx_factor => 1,
+                                                           :is_public => false
+
+      assert_not_nil new_flavor.id, "Cannot create flavor: #{active_resource_errors_to_s(new_flavor)}"
+    end
+
+  end
+
+  def test_20_flavor_list
     auth_user
 
     assert_nothing_raised ActiveResource::ClientError, "Cannot list flavors" do
@@ -23,4 +41,44 @@ class TestOpenStackActiveResource < Test::Unit::TestCase
     end
   end
 
+  def test_20_flavor_get
+    auth_user
+
+    assert_nothing_raised ActiveResource::ResourceNotFound, "Cannot get flavors" do
+      flavor = OpenStack::Nova::Compute::Flavor.first
+      assert_not_nil flavor, "Cannot retrieve flavor"
+    end
+
+    return unless admin_test_possible?
+
+    auth_admin
+
+    flavor = OpenStack::Nova::Compute::Flavor.find_by_name FLAVOR_NAME
+    assert_not_nil flavor, "Cannot retrieve flavor by name"
+
+    assert_nothing_raised ActiveResource::ResourceNotFound, "Cannot get flavor '#{flavor.id}'" do
+      flavor = OpenStack::Nova::Compute::Flavor.find flavor.id
+      assert_not_nil flavor, "Cannot retrieve flavor"
+    end
+
+  end
+
+  def test_30_flavor_update
+    # Flavor cannot be updated!
+  end
+
+  def test_40_flavor_destroy
+    return unless admin_test_possible?
+
+    auth_admin
+
+    flavor = OpenStack::Nova::Compute::Flavor.find_by_name FLAVOR_NAME
+    assert_not_nil flavor, "Cannot retrieve flavor by name"
+
+    assert_nothing_raised ActiveResource::ClientError, "Cannot destroy flavor '#{flavor.id}'" do
+      flavor.destroy
+    end
+
+  end
+
 end