yao 0.7.0 → 0.8.0

data/test/yao/resources/test_subnet.rb

@@ -1,8 +1,4 @@
-class TestSubnet < Test::Unit::TestCase
-
-  def setup
-    Yao.default_client.pool["network"] = Yao::Client.gen_client("https://example.com:12345")
-  end
+class TestSubnet < TestYaoResource
 
   def test_subnet
     # https://docs.openstack.org/api-ref/network/v2/#subnets
@@ -56,7 +52,7 @@ class TestSubnet < Test::Unit::TestCase
   end
 
   def test_network
-    stub_request(:get, "https://example.com:12345/networks/00000000-0000-0000-0000-000000000000").
+    stub = stub_request(:get, "https://example.com:12345/networks/00000000-0000-0000-0000-000000000000").
       to_return(
        status: 200,
        body: <<-JSON,
@@ -76,5 +72,28 @@ class TestSubnet < Test::Unit::TestCase
     subnet = Yao::Subnet.new(params)
     assert_instance_of(Yao::Resources::Network, subnet.network)
     assert_equal(subnet.network.id, "00000000-0000-0000-0000-000000000000")
+
+    assert_requested(stub)
+  end
+
+  def test_tenant
+    stub = stub_request(:get, "https://example.com:12345/tenants/0123456789abcdef0123456789abcdef")
+      .to_return(
+        status: 200,
+        body: <<-JSON,
+        {
+          "tenant": {
+            "id": "0123456789abcdef0123456789abcdef"
+          }
+        }
+        JSON
+        headers: {'Content-Type' => 'application/json'}
+      )
+
+    subnet = Yao::Subnet.new('tenant_id' => '0123456789abcdef0123456789abcdef')
+    assert_instance_of(Yao::Tenant, subnet.tenant)
+    assert_equal(subnet.tenant.id, '0123456789abcdef0123456789abcdef')
+
+    assert_requested(stub)
   end
 end

data/test/yao/resources/test_user.rb

@@ -1,4 +1,4 @@
-class TestUser < Test::Unit::TestCase
+class TestUser < TestYaoResource
   def test_sg_attributes
     params = {
       "name" => "test_user",
@@ -10,4 +10,76 @@ class TestUser < Test::Unit::TestCase
     assert_equal(user.name, "test_user")
     assert_equal(user.email, "test-user@example.com")
   end
+
+  sub_test_case 'with keystone v2.0' do
+    def setup
+      super
+      Yao.default_client.admin_pool["identity"] = Yao::Client.gen_client("https://example.com:12345/v2.0")
+    end
+
+    def test_find_by_name
+      stub = stub_request(:get, "https://example.com:12345/v2.0/users?name=test_user").
+        to_return(
+          status: 200,
+          body: <<-JSON,
+          {
+            "user": {
+              "email": "test-user@example.com",
+              "enabled": true,
+              "id": "u1000",
+              "name": "test_user",
+              "username": "test_user"
+            }
+          }
+          JSON
+          headers: {'Content-Type' => 'application/json'}
+        )
+
+        roles = Yao::User.find_by_name("test_user")
+        assert_instance_of(Array, roles)
+        assert_equal(roles.first.id, "u1000")
+        assert_requested(stub)
+    end
+  end
+
+  sub_test_case 'with keystone v3' do
+    def setup
+      super
+      Yao.default_client.admin_pool["identity"] = Yao::Client.gen_client("https://example.com:12345/v3")
+    end
+
+    def test_find_by_name
+      stub = stub_request(:get, "https://example.com:12345/v3/users?name=test_user").
+        to_return(
+          status: 200,
+          body: <<-JSON,
+          {
+            "links": {
+              "next": null,
+              "previous": null,
+              "self": "http://example.com:12345/v3/users"
+            },
+            "users": [
+                {
+                    "domain_id": "default",
+                    "enabled": true,
+                    "id": "2844b2a08be147a08ef58317d6471f1f",
+                    "links": {
+                        "self": "http://example.com:12345/v3/users/2844b2a08be147a08ef58317d6471f1f"
+                    },
+                    "name": "test_user",
+                    "password_expires_at": null
+                }
+            ]
+          }
+          JSON
+          headers: {'Content-Type' => 'application/json'}
+        )
+
+        roles = Yao::User.find_by_name("test_user")
+        assert_instance_of(Array, roles)
+        assert_equal(roles.first.id, "2844b2a08be147a08ef58317d6471f1f")
+        assert_requested(stub)
+    end
+  end
 end

data/test/yao/resources/test_volume.rb

@@ -1,4 +1,4 @@
-class TestVolume < Test::Unit::TestCase
+class TestVolume < TestYaoResource
   def test_volume
     params = {
         'name' => 'cinder',
@@ -9,4 +9,34 @@ class TestVolume < Test::Unit::TestCase
     assert_equal('cinder', volume.name)
     assert_equal(10, volume.size)
   end
+
+  def test_list
+    # https://docs.openstack.org/api-ref/block-storage/v3/index.html?expanded=#volumes-volumes
+    stub = stub_request(:get, "https://example.com:12345/volumes/detail").
+      to_return(
+        status: 200,
+        body: <<-JSON,
+        {
+            "volumes": [
+                {
+                    "id": "00000000-0000-0000-0000-000000000000"
+                }
+            ]
+        }
+        JSON
+        headers: {'Content-Type' => 'application/json'}
+      )
+
+    assert(Yao::Volume.resources_detail_available)
+
+    volumes = Yao::Volume.list
+    assert_instance_of(Yao::Volume, volumes.first)
+    assert_equal(volumes.first.id, "00000000-0000-0000-0000-000000000000")
+
+    assert_requested(stub)
+  end
+
+  def test_list_detail
+    assert_equal(Yao::Volume.method(:list_detail), Yao::Volume.method(:list))
+  end
 end

data/test/yao/resources/test_volume_type.rb

@@ -1,4 +1,4 @@
-class TestVolumeType < Test::Unit::TestCase
+class TestVolumeType < TestYaoResource
   def test_volume
     params = {
         'name' => 'test_volume',

data/test/yao/test_config.rb

@@ -50,16 +50,29 @@ class TestConfig < Test::Unit::TestCase
     assert { hooked_value == "test 2" }
   end
 
-  def test_auth_is_hooked
-    auth = Yao::Auth
-    count = Yao::Config::HOOK_RENEW_CLIENT_KEYS.size
-    mock(auth).try_new.times(count)
-    Yao::Config::HOOK_RENEW_CLIENT_KEYS.each do |key|
-      Yao.configure do
-        set key, "http://dummy"
+  sub_test_case 'setting Yao.configure' do
+
+    def test_auth_is_hooked
+      auth = Yao::Auth
+      count = Yao::Config::HOOK_RENEW_CLIENT_KEYS.size
+      mock(auth).try_new.times(count)
+      Yao::Config::HOOK_RENEW_CLIENT_KEYS.each do |key|
+        # configurations have side effects !!!!
+        Yao.configure do
+          set key, "http://dummy"
+        end
       end
+
+      assert_received(auth) {|a| a.try_new.times(count) }
     end
 
-    assert_received(auth) {|a| a.try_new.times(count) }
+    # reset configurations of Yao.configure
+    def teardown
+      Yao::Config::HOOK_RENEW_CLIENT_KEYS.each do |key|
+        Yao.configure do
+          set key, nil
+        end
+      end
+    end
   end
 end

data/test/yao/test_read_only.rb

@@ -17,13 +17,13 @@ class TestOnly < Test::Unit::TestCase
     end
 
     @username = username
-    @get_stub  = stub_request(:get,  "#{auth_url}/users?name=#{username}")
+    @get_stub  = stub_request(:get,  "#{auth_url}/users/#{username}")
     @post_stub = stub_request(:post, "#{auth_url}/users")
   end
 
   def test_read_only
     Yao.read_only do
-      Yao::User.get_by_name(@username)
+      Yao::User.get(@username)
       Yao::User.create(name: "foo", email: "bar", password: "baz")
     end
 
@@ -34,7 +34,7 @@ class TestOnly < Test::Unit::TestCase
   def test_read_only!
     assert_raise Yao::ReadOnlyViolationError do
       Yao.read_only! do
-        Yao::User.get_by_name(@username)
+        Yao::User.get(@username)
         Yao::User.create(name: "foo", email: "bar", password: "baz")
       end
     end

data/yao.gemspec

@@ -20,12 +20,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency "json"
   spec.add_dependency "faraday"
   spec.add_dependency "faraday_middleware"
-
-  spec.add_development_dependency "bundler", ">= 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "test-unit", ">= 3"
-  spec.add_development_dependency "test-unit-rr"
-  spec.add_development_dependency "power_assert"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "webmock"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yao
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Uchio, KONDO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-22 00:00:00.000000000 Z
+date: 2019-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -52,104 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: test-unit-rr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: power_assert
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: YAO is a Yet Another OpenStack API Wrapper that rocks!!
 email:
 - udzura@udzura.jp
@@ -157,9 +59,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/macos.yml"
+- ".github/workflows/ubuntu-rvm.yml"
+- ".github/workflows/ubuntu.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -181,6 +85,7 @@ files:
 - lib/yao/resources/action.rb
 - lib/yao/resources/aggregates.rb
 - lib/yao/resources/base.rb
+- lib/yao/resources/compute_services.rb
 - lib/yao/resources/flavor.rb
 - lib/yao/resources/floating_ip.rb
 - lib/yao/resources/host.rb
@@ -195,8 +100,11 @@ files:
 - lib/yao/resources/metadata_available.rb
 - lib/yao/resources/meter.rb
 - lib/yao/resources/network.rb
+- lib/yao/resources/network_associationable.rb
 - lib/yao/resources/old_sample.rb
 - lib/yao/resources/port.rb
+- lib/yao/resources/port_associationable.rb
+- lib/yao/resources/project.rb
 - lib/yao/resources/resource.rb
 - lib/yao/resources/restfully_accessible.rb
 - lib/yao/resources/role.rb
@@ -208,6 +116,7 @@ files:
 - lib/yao/resources/server.rb
 - lib/yao/resources/subnet.rb
 - lib/yao/resources/tenant.rb
+- lib/yao/resources/tenant_associationable.rb
 - lib/yao/resources/user.rb
 - lib/yao/resources/volume.rb
 - lib/yao/resources/volume_type.rb
@@ -221,8 +130,10 @@ files:
 - test/support/auth_stub.rb
 - test/support/authv3_stub.rb
 - test/support/restfully_accesible_stub.rb
+- test/support/test_yao_resource.rb
 - test/yao/resources/test_aggregates.rb
 - test/yao/resources/test_base.rb
+- test/yao/resources/test_compute_services.rb
 - test/yao/resources/test_flavor.rb
 - test/yao/resources/test_floating_ip.rb
 - test/yao/resources/test_host.rb
@@ -236,11 +147,15 @@ files:
 - test/yao/resources/test_loadbalancer_pool_member.rb
 - test/yao/resources/test_meter.rb
 - test/yao/resources/test_network.rb
+- test/yao/resources/test_old_sample.rb
 - test/yao/resources/test_port.rb
+- test/yao/resources/test_project.rb
+- test/yao/resources/test_resource.rb
 - test/yao/resources/test_restfully_accessible.rb
 - test/yao/resources/test_role.rb
 - test/yao/resources/test_role_assignment.rb
 - test/yao/resources/test_router.rb
+- test/yao/resources/test_sample.rb
 - test/yao/resources/test_security_group.rb
 - test/yao/resources/test_security_group_rule.rb
 - test/yao/resources/test_server.rb
@@ -289,8 +204,10 @@ test_files:
 - test/support/auth_stub.rb
 - test/support/authv3_stub.rb
 - test/support/restfully_accesible_stub.rb
+- test/support/test_yao_resource.rb
 - test/yao/resources/test_aggregates.rb
 - test/yao/resources/test_base.rb
+- test/yao/resources/test_compute_services.rb
 - test/yao/resources/test_flavor.rb
 - test/yao/resources/test_floating_ip.rb
 - test/yao/resources/test_host.rb
@@ -304,11 +221,15 @@ test_files:
 - test/yao/resources/test_loadbalancer_pool_member.rb
 - test/yao/resources/test_meter.rb
 - test/yao/resources/test_network.rb
+- test/yao/resources/test_old_sample.rb
 - test/yao/resources/test_port.rb
+- test/yao/resources/test_project.rb
+- test/yao/resources/test_resource.rb
 - test/yao/resources/test_restfully_accessible.rb
 - test/yao/resources/test_role.rb
 - test/yao/resources/test_role_assignment.rb
 - test/yao/resources/test_router.rb
+- test/yao/resources/test_sample.rb
 - test/yao/resources/test_security_group.rb
 - test/yao/resources/test_security_group_rule.rb
 - test/yao/resources/test_server.rb