yao 0.14.0 → 0.17.0

data/test/yao/resources/test_router.rb

@@ -95,12 +95,33 @@ class TestRouter < TestYaoResource
     assert_equal([], router.availability_zone_hints)
     assert_equal([ "nova" ], router.availability_zones)
 
-    pend 'oops. These are invalid friendly_attributes'
-    assert_equal( '', router.network_id)
-    assert_equal('', router.enable_snat)
-    assert_equal(router.external_fixed_ips '')
-    assert_equal(router.destination '')
-    assert_equal(router.nexthop '')
+    stub = stub_request(:get, "https://example.com:12345/networks/ae34051f-aa6c-4c75-abf5-50dc9ac99ef3")
+           .to_return(
+             status: 200,
+             body: <<~JSON,
+             {
+               "network": {
+                 "id": "ae34051f-aa6c-4c75-abf5-50dc9ac99ef3",
+                 "name": "example-network"
+               }
+             }
+             JSON
+             headers: {'Content-Type' => 'application/json'}
+            )
+    assert_instance_of(Yao::Network, router.external_network)
+    assert_equal("ae34051f-aa6c-4c75-abf5-50dc9ac99ef3", router.external_network.id)
+    assert_equal("example-network", router.external_network.name)
+    assert_equal(true, router.enable_snat)
+    assert_equal([
+      {
+        "ip_address" => "172.24.4.3",
+        "subnet_id" => "b930d7f6-ceb7-40a0-8b81-a425dd994ccf"
+      },
+      {
+        "ip_address" => "2001:db8::c",
+        "subnet_id" => "0c56df5d-ace5-46c8-8f4c-45fa4e334d18"
+      }
+    ], router.external_fixed_ips)
   end
 
   def test_iterfaces
@@ -129,14 +150,14 @@ class TestRouter < TestYaoResource
     assert_requested(stub)
   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"
           }
         }
@@ -144,9 +165,9 @@ class TestRouter < TestYaoResource
         headers: {'Content-Type' => 'application/json'}
       )
 
-    router = Yao::Router.new('tenant_id' => '0123456789abcdef0123456789abcdef')
-    assert_instance_of(Yao::Tenant, router.tenant)
-    assert_equal('0123456789abcdef0123456789abcdef', router.tenant.id)
+    router = Yao::Router.new('project_id' => '0123456789abcdef0123456789abcdef')
+    assert_instance_of(Yao::Project, router.project)
+    assert_equal('0123456789abcdef0123456789abcdef', router.project.id)
 
     assert_requested(stub)
   end

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_user.rb

@@ -1,16 +1,43 @@
 class TestUser < TestYaoResource
-  def test_sg_attributes
+  def test_user
     params = {
+      "id" => '1234567890',
       "name" => "test_user",
       "email" => "test-user@example.com",
       "password" => "passw0rd"
     }
 
     user = Yao::User.new(params)
+    assert_equal("1234567890", user.id)
     assert_equal("test_user", user.name)
     assert_equal("test-user@example.com", user.email)
   end
 
+  def test_role_assignment
+    user_id = '123456'
+    stub = stub_request(:get, "https://example.com:12345/role_assignments?user.id=#{user_id}").
+      to_return(
+        status: 200,
+        body: <<-JSON,
+        {
+          "role_assignments": [{
+            "scope": {
+              "project": {
+                "id": "aaaa166533fd49f3b11b1cdce2430000"
+              }
+            }
+          }]
+        }
+        JSON
+        headers: {'Content-Type' => 'application/json'}
+      )
+
+    user = Yao::User.new('id' => user_id)
+    role_assignment = user.role_assignment
+    assert_equal('aaaa166533fd49f3b11b1cdce2430000', role_assignment.first.scope['project']['id'])
+    assert_requested(stub)
+  end
+
   sub_test_case 'with keystone v2.0' do
     def setup
       super

data/test/yao/resources/test_volume.rb

@@ -1,13 +1,35 @@
 class TestVolume < TestYaoResource
   def test_volume
     params = {
+        'attachments' => [],
+        'availability_zone' => 'test',
+        'bootable' => true,
+        'encrypted' => false,
+        'metadata' => {},
+        'multiattach' => false,
         'name' => 'cinder',
-        'size' => 10
+        'replication_status' => 'disabled',
+        'size' => 10,
+        'snapshot_id' => nil,
+        'status' => 'available',
+        'user_id' => 'aaaa166533fd49f3b11b1cdce2430000',
+        'volume_type' => 'test'
     }
 
     volume = Yao::Volume.new(params)
+    assert_equal(volume.attachments, [])
+    assert_equal(volume.availability_zone, 'test')
+    assert_equal(volume.bootable, true)
+    assert_equal(volume.encrypted, false)
+    assert_equal(volume.metadata, {})
+    assert_equal(volume.multiattach, false)
     assert_equal(volume.name, 'cinder')
+    assert_equal(volume.replication_status, 'disabled')
     assert_equal(volume.size, 10)
+    assert_equal(volume.snapshot_id, nil)
+    assert_equal(volume.user_id, 'aaaa166533fd49f3b11b1cdce2430000')
+    assert_equal(volume.volume_type, 'test')
+    assert_equal(volume.type, 'test')
   end
 
   def test_list
@@ -39,4 +61,62 @@ class TestVolume < TestYaoResource
   def test_list_detail
     assert_equal(Yao::Volume.method(:list), Yao::Volume.method(:list_detail))
   end
+
+  def stub_action_request(id, body)
+    # https://docs.openstack.org/api-ref/block-storage/v3/index.html?expanded=list-accessible-volumes-with-details-detail,reset-a-volume-s-statuses-detail#reset-a-volume-s-statuses
+    stub_request(:post, "https://example.com:12345/volumes/#{id}/action").
+      with(
+      body: body,
+      headers: {
+          'Accept'=>'application/json',
+          'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+          'Content-Type'=>'application/json',
+          'User-Agent'=>"Yao/#{Yao::VERSION} Faraday/#{Faraday::VERSION}"
+      }).
+      to_return(
+        status: 202,
+        body: '',
+        headers: {'Content-Type' => 'application/json'}
+      )
+  end
+
+  def test_set_status
+    volume_id = '00000000-0000-0000-0000-000000000000'
+
+    stub = stub_action_request(volume_id, {'os-reset_status': {'status': 'error'}})
+    Yao::Volume.set_status(volume_id, 'error')
+    assert_requested(stub)
+  end
+
+  def test_set_status_on_instance
+    volume_id = '00000000-0000-0000-0000-000000000000'
+    stub = stub_action_request(volume_id, {'os-reset_status': {'status': 'error'}})
+    params = {
+      'id' => volume_id,
+    }
+    volume = Yao::Volume.new(params)
+    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.14.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Uchio, KONDO
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-03 00:00:00.000000000 Z
+date: 2022-04-26 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,9 +136,9 @@ 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
 - lib/yao/resources/volume_type.rb
 - lib/yao/setup.rb
 - lib/yao/token.rb
@@ -215,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!!