openstack_activeresource 0.4.0 → 0.5.0

data/test/test_nova_floating_ips.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
@@ -17,7 +12,7 @@ class TestOpenStackActiveResource < Test::Unit::TestCase
     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"
+      assert_not_nil floating_ips, "Cannot retrieve floating IP list"
     end
   end
 

data/test/test_nova_images.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

data/test/test_nova_keypairs.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

data/test/test_nova_quota_sets.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

data/test/test_nova_security_groups.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
@@ -23,4 +18,20 @@ class TestOpenStackActiveResource < Test::Unit::TestCase
     end
   end
 
+  def test_list_security_group_rules
+    auth_user
+
+    security_group = OpenStack::Nova::Compute::SecurityGroup.first
+
+    assert_nothing_raised ActiveResource::ClientError, "Cannot list security group rules" do
+
+      security_group_rules = security_group.rules
+      assert_not_nil security_group_rules
+
+      assert_block("No rules?") do
+        !security_group_rules.empty?
+      end
+    end
+  end
+
 end

data/test/test_nova_servers.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

data/test/test_simple_tenant_usages.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

data/test/utils.rb

@@ -47,5 +47,13 @@ module OpenstackTestUtils
     ret
   end
 
+  def active_resource_errors_to_s(active_resource)
+    message = ""
+    active_resource.errors.messages.each_pair { |k, v|
+      message += "#{k}: " + v.join(",") + ". \n"
+    }
+
+    message
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstack_activeresource
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: 3.2.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: 3.2.12
 - !ruby/object:Gem::Dependency
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: 3.2.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: 3.2.12
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -60,13 +60,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.9
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.7.7
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -99,7 +99,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.12'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -115,7 +115,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.4
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -131,7 +131,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -140,21 +140,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.7.7
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: '0'
 description: OpenStack Ruby and RoR bindings implemented with ActiveResource - See
   also http://www.unicloud.it
 email: d.guerri@rd.unidata.it
@@ -185,7 +185,6 @@ files:
 - 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
@@ -215,7 +214,7 @@ files:
 - 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
@@ -240,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1700532988989412175
+      hash: 76159689674776618
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

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

@@ -1,45 +0,0 @@
-# This file is part of the OpenStack-ActiveResource
-#
-# Copyright (C) 2012 Unidata S.p.A. (Davide Guerri - d.guerri@unidata.it)
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-module OpenStack
-  module Keystone
-    module Admin
-
-      # User Role ("admin view") (\*Warning:* incomplete)
-      #
-      # ==== Attributes
-      # * +name+ - The name of the Role
-      # * +description+ - A description of the role
-      class UserRole < Base
-        self.element_name = "role"
-        self.site = superclass.site + "tenants/:tenant_id/users/:user_id"
-
-        schema do
-          attribute :name, :string
-          attribute :description, :string
-        end
-
-        # Return the associated instance of OpenStack::Keystone::Admin::Role
-        def role
-          OpenStack::Keystone::Admin::Role.find(self.id) if persisted?
-        end
-
-      end
-
-    end
-  end
-end

data/test/test_keystone_users.rb

@@ -1,29 +0,0 @@
-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_users
-    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
-
-end