yao 0.15.0 → 0.18.0

data/test/yao/resources/test_security_group.rb

@@ -25,12 +25,12 @@ class TestSecurityGroup < TestYaoResource
 
   def test_sg_to_tenant
 
-    stub = stub_request(:get, "https://example.com:12345/tenants/0123456789abcdef0123456789abcdef")
+    stub = stub_request(:get, "https://example.com:12345/projects/0123456789abcdef0123456789abcdef")
       .to_return(
         status: 200,
         body: <<-JSON,
         {
-          "tenant": {
+          "project": {
             "id": "0123456789abcdef0123456789abcdef"
           }
         }
@@ -38,9 +38,9 @@ class TestSecurityGroup < TestYaoResource
         headers: {'Content-Type' => 'application/json'}
       )
 
-    sg = Yao::SecurityGroup.new('tenant_id' => '0123456789abcdef0123456789abcdef')
-    assert_instance_of(Yao::Tenant, sg.tenant)
-    assert_equal('0123456789abcdef0123456789abcdef', sg.tenant.id)
+    sg = Yao::SecurityGroup.new('project_id' => '0123456789abcdef0123456789abcdef')
+    assert_instance_of(Yao::Project, sg.project)
+    assert_equal('0123456789abcdef0123456789abcdef', sg.project.id)
 
     assert_requested(stub)
   end

data/test/yao/resources/test_server.rb

@@ -206,14 +206,14 @@ class TestServer < TestYaoResource
     assert_equal(Yao::Server.method(:list), Yao::Server.method(:list_detail))
   end
 
-  def test_tenant
+  def test_project
 
-    stub = stub_request(:get, "https://example.com:12345/tenants/0123456789abcdef0123456789abcdef")
+    stub = stub_request(:get, "https://example.com:12345/projects/0123456789abcdef0123456789abcdef")
       .to_return(
         status: 200,
         body: <<-JSON,
         {
-          "tenant": {
+          "project": {
             "id": "0123456789abcdef0123456789abcdef"
           }
         }
@@ -221,10 +221,56 @@ class TestServer < TestYaoResource
         headers: {'Content-Type' => 'application/json'}
       )
 
-    server = Yao::Server.new('tenant_id' => '0123456789abcdef0123456789abcdef')
-    assert_instance_of(Yao::Tenant, server.tenant)
-    assert_equal('0123456789abcdef0123456789abcdef', server.tenant.id)
+    server = Yao::Server.new('project_id' => '0123456789abcdef0123456789abcdef')
+    assert_instance_of(Yao::Project, server.project)
+    assert_equal('0123456789abcdef0123456789abcdef', server.project.id)
 
     assert_requested(stub)
   end
+
+  def test_ports
+
+    stub = stub_request(:get, "https://example.com:12345/ports?device_id")
+      .to_return(
+        status: 200,
+        body: <<-JSON,
+        {
+          "ports": [{
+            "id": "0123456789abcdef0123456789abcdef"
+          }]
+        }
+        JSON
+        headers: {'Content-Type' => 'application/json'}
+      )
+
+    server = Yao::Server.new('project_id' => '0123456789abcdef0123456789abcdef')
+    ports  = server.ports
+
+    assert_instance_of(Array, ports)
+    assert_instance_of(Yao::Port, ports.first)
+    assert_equal('0123456789abcdef0123456789abcdef', ports.first.id)
+
+    assert_requested(stub)
+  end
+
+  def test_ports_empty
+
+    stub = stub_request(:get, "https://example.com:12345/ports?device_id")
+      .to_return(
+        status: 200,
+        body: <<-JSON,
+        {
+          "ports": []
+        }
+        JSON
+        headers: {'Content-Type' => 'application/json'}
+      )
+
+    server = Yao::Server.new('project_id' => '0123456789abcdef0123456789abcdef')
+    ports  = server.ports
+
+    assert_instance_of(Array, ports)
+    assert_equal(0, ports.size)
+    assert_requested(stub)
+  end
 end

data/test/yao/resources/test_subnet.rb

@@ -76,13 +76,13 @@ class TestSubnet < TestYaoResource
     assert_requested(stub)
   end
 
-  def test_tenant
-    stub = stub_request(:get, "https://example.com:12345/tenants/0123456789abcdef0123456789abcdef")
+  def test_project
+    stub = stub_request(:get, "https://example.com:12345/projects/0123456789abcdef0123456789abcdef")
       .to_return(
         status: 200,
         body: <<-JSON,
         {
-          "tenant": {
+          "project": {
             "id": "0123456789abcdef0123456789abcdef"
           }
         }
@@ -90,9 +90,9 @@ class TestSubnet < TestYaoResource
         headers: {'Content-Type' => 'application/json'}
       )
 
-    subnet = Yao::Subnet.new('tenant_id' => '0123456789abcdef0123456789abcdef')
-    assert_instance_of(Yao::Tenant, subnet.tenant)
-    assert_equal('0123456789abcdef0123456789abcdef', subnet.tenant.id)
+    subnet = Yao::Subnet.new('project_id' => '0123456789abcdef0123456789abcdef')
+    assert_instance_of(Yao::Project, subnet.project)
+    assert_equal('0123456789abcdef0123456789abcdef', subnet.project.id)
 
     assert_requested(stub)
   end

data/test/yao/resources/test_volume.rb

@@ -98,4 +98,25 @@ class TestVolume < TestYaoResource
     volume.status = 'error'
     assert_requested(stub)
   end
+
+  def test_project
+    stub = stub_request(:get, "https://example.com:12345/projects/0123456789abcdef0123456789abcdef")
+      .to_return(
+        status: 200,
+        body: <<-JSON,
+        {
+          "project": {
+            "id": "0123456789abcdef0123456789abcdef"
+          }
+        }
+        JSON
+        headers: {'Content-Type' => 'application/json'}
+      )
+
+    volume = Yao::Volume.new('project_id' => '0123456789abcdef0123456789abcdef')
+    assert_instance_of(Yao::Project, volume.project)
+    assert_equal('0123456789abcdef0123456789abcdef', volume.project.id)
+
+    assert_requested(stub)
+  end
 end

data/yao.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "json"
   spec.add_dependency "deep_merge"
-  spec.add_dependency "faraday", "~> 1.8.0"
+  spec.add_dependency "faraday", ">= 1.8.0"
   spec.add_dependency "faraday_middleware"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yao
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Uchio, KONDO
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-10 00:00:00.000000000 Z
+date: 2022-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -42,14 +42,14 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.0
 - !ruby/object:Gem::Dependency
@@ -122,6 +122,7 @@ files:
 - lib/yao/resources/port.rb
 - lib/yao/resources/port_associationable.rb
 - lib/yao/resources/project.rb
+- lib/yao/resources/project_associationable.rb
 - lib/yao/resources/resource.rb
 - lib/yao/resources/restfully_accessible.rb
 - lib/yao/resources/role.rb
@@ -135,7 +136,6 @@ files:
 - lib/yao/resources/server_usage_associationable.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_action.rb
@@ -216,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Yet Another OpenStack API Wrapper that rocks!!