yao 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55df2a0420c42a9448a180f6b0378d82bd8c6fb2d9efac004c152675d357ee3a
-  data.tar.gz: ff5477041bca286e2283ef8130c3659cd4762a8b415dbc374df73ff077dae51a
+  metadata.gz: b2448b0a2070a9d61401c29e6f53445a4cb0c9bbd8f1bc98aac172661d6d9bc0
+  data.tar.gz: 0f50c66bd6fd508c0b47132c672395da04037cb4dd59842d48006c386d19f9fb
 SHA512:
-  metadata.gz: 75274af855b318f6be285de56b21260f350e5dd892a291b4ef128db9683b9559e06a6284024f555e4123c879530a2b903b3abea29cc08be0c76fe54417638d38
-  data.tar.gz: 66ee630a29f13cd94eb4639fcabc711da46d71f1ff8ff779777b7833a052cf6899b5076f9bac7c25669449fb28a87d4c1d6a63857e5bbeae22bd27280834d84f
+  metadata.gz: 4e6553ffc603ead2c2ec1d4a4fcc133381b3b4065f7cdce8df9705a8776ab7cf916d1d49d7cc59f5b5453c55b8d8bb1890cec7c35ace2d67f698a43e72f11450
+  data.tar.gz: 0b79462e8a112e7b12f490f8d24e3839b80792d2f4247fee849963c07b4b3b732d3d773a9b4806f27427812e80823e27b7f69a2e0ea198f5286bb7c18439b85c

data/lib/yao/resources/project.rb

@@ -25,6 +25,11 @@ module Yao::Resources
       @ports ||= Yao::Port.list(tenant_id: id)
     end
 
+    # @return [Yao::Resources::RoleAssignment]
+    def role_assignment
+      Yao::RoleAssignment.get(project: id)
+    end
+
     class << self
 
       def accessible

data/lib/yao/resources/role_assignment.rb

@@ -1,19 +1,51 @@
 module Yao::Resources
   class RoleAssignment < Base
     friendly_attributes :scope, :role, :user
+
+    map_attribute_to_resource  role: Role
+    map_attribute_to_resource  user: User
+
     self.service        = "identity"
     self.resource_name  = "role_assignment"
     self.resources_name  = "role_assignments"
     self.admin          = true
     self.api_version    = "v3"
-    self.client.url_prefix = Yao.config.auth_url.gsub(/v2.0|v3/, '')
 
     # @return [Yao::Resources::Tenant]
     def project
       @project ||= Yao::Tenant.get(scope["project"]["id"])
     end
 
-    map_attribute_to_resource  role: Role
-    map_attribute_to_resource  user: User
+    class << self
+      # @param _subpath [String]
+      # @return [String]
+      def create_url(_subpath='')
+        resources_name
+      end
+
+      # @param query [Hash]
+      def get(opt = {})
+        query = {}
+
+        if (user = opt[:user])
+          query['user.id'] = resource_id_or_string(user)
+        end
+
+        if (project = opt[:project] || opt[:tenant])
+          query['scope.project.id'] = resource_id_or_string(project)
+        end
+
+        list(query)
+      end
+
+      private
+      def resource_id_or_string(item)
+        if item.respond_to?(:id)
+          item.id
+        else
+          item
+        end
+      end
+    end
   end
 end

data/lib/yao/resources/tenant.rb

@@ -30,6 +30,11 @@ module Yao::Resources
       meters.select{|m| m.name == meter_name}
     end
 
+    # @return [Yao::Resources::RoleAssignment]
+    def role_assignment
+      Yao::RoleAssignment.get(tenant: id)
+    end
+
     class << self
       def accessible
         as_member { self.list }

data/lib/yao/resources/user.rb

@@ -1,6 +1,6 @@
 module Yao::Resources
   class User < Base
-    friendly_attributes :name, :email, :enabled, :id
+    friendly_attributes :name, :email, :enabled
 
     alias enabled? enabled
 
@@ -9,6 +9,11 @@ module Yao::Resources
     self.resources_name = "users"
     self.admin          = true
 
+    # @return [Yao::Resources::RoleAssignment]
+    def role_assignment
+      Yao::RoleAssignment.get(user: self)
+    end
+
     class << self
       # @return [Bool]
       def return_single_on_querying

data/lib/yao/resources/volume.rb

@@ -1,12 +1,23 @@
+require 'yao/resources/volume_action'
+
 module Yao::Resources
   class Volume < Base
-    friendly_attributes :name, :size, :volume_type
+    friendly_attributes :attachments, :availability_zone, :bootable, :descriptions, :encrypted, :metadata, :multiattach, :name, :replication_status, :size, :snapshot_id, :status, :user_id, :volume_type
+    alias :type :volume_type
 
+    map_attribute_to_attribute 'os-vol-host-attr:host' => :host
     map_attribute_to_attribute 'os-vol-tenant-attr:tenant_id' => :tenant_id
 
     self.service        = "volumev3"
     self.resource_name  = "volume"
     self.resources_name = "volumes"
     self.resources_detail_available = true
+
+    def status=(s)
+      self.class.set_status(self.id, s)
+      self['status'] = s
+    end
+
+    extend VolumeAction
   end
 end

data/lib/yao/resources/volume_action.rb

@@ -0,0 +1,13 @@
+require 'yao/resources/action'
+
+module Yao::Resources
+  module VolumeAction
+    include Action
+
+    def set_status(id, status)
+      action(id, 'os-reset_status' => {
+        'status' => status,
+      })
+    end
+  end
+end

data/lib/yao/version.rb

@@ -1,3 +1,3 @@
 module Yao
-  VERSION = "0.14.0"
+  VERSION = "0.15.0"
 end

data/test/yao/resources/test_project.rb

@@ -1,9 +1,4 @@
 class TestProject < TestYaoResource
-  def setup
-    super
-    Yao.default_client.admin_pool["identity"] = Yao::Client.gen_client("https://example.com:12345/v2.0")
-  end
-
   # https://docs.openstack.org/api-ref/identity/v3/?expanded=list-projects-detail#projects
   def test_project
     params = {
@@ -273,4 +268,29 @@ class TestProject < TestYaoResource
     usage = project.server_usage
     assert_equal(1024, usage["total_memory_mb_usage"])
   end
+
+  def test_role_assignment
+    project_id = 'aaaa166533fd49f3b11b1cdce2430000'
+    stub = stub_request(:get, "https://example.com:12345/role_assignments?scope.project.id=#{project_id}").
+      to_return(
+        status: 200,
+        body: <<-JSON,
+        {
+          "role_assignments": [{
+            "scope": {
+              "project": {
+                "id": "aaaa166533fd49f3b11b1cdce2430000"
+              }
+            }
+          }]
+        }
+        JSON
+        headers: {'Content-Type' => 'application/json'}
+      )
+
+    project = Yao::Project.new('id' => project_id)
+    role_assignment = project.role_assignment
+    assert_equal('aaaa166533fd49f3b11b1cdce2430000', role_assignment.first.scope['project']['id'])
+    assert_requested(stub)
+  end
 end

data/test/yao/resources/test_role_assignment.rb

@@ -32,8 +32,105 @@ class TestRoleAssignment < TestYaoResource
     assert_equal("313233", role_assignment.user.id)
   end
 
+  def test_list
+    stub = stub_request(:get, "https://example.com:12345/role_assignments").
+      to_return(
+        status: 200,
+        body: <<-JSON,
+        {
+          "role_assignments": [{
+            "scope": {
+              "project": {
+                "id": "aaaa166533fd49f3b11b1cdce2430000"
+              }
+            }
+          }]
+        }
+        JSON
+        headers: {'Content-Type' => 'application/json'}
+      )
+    role_assignment = Yao::RoleAssignment.list
+    assert_equal('aaaa166533fd49f3b11b1cdce2430000', role_assignment.first.scope['project']['id'])
+    assert_requested(stub)
+  end
+
+  def test_get_user
+    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 = Yao::RoleAssignment.get(user: user)
+    assert_equal('aaaa166533fd49f3b11b1cdce2430000', role_assignment.first.scope['project']['id'])
+    assert_requested(stub)
+  end
+
+  def test_get_project
+    project_id = 'aaaa166533fd49f3b11b1cdce2430000'
+    stub = stub_request(:get, "https://example.com:12345/role_assignments?scope.project.id=#{project_id}").
+      to_return(
+        status: 200,
+        body: <<-JSON,
+        {
+          "role_assignments": [{
+            "scope": {
+              "project": {
+                "id": "aaaa166533fd49f3b11b1cdce2430000"
+              }
+            }
+          }]
+        }
+        JSON
+        headers: {'Content-Type' => 'application/json'}
+      )
+
+    project = Yao::Project.new('id' => project_id)
+    role_assignment = Yao::RoleAssignment.get(project: project)
+    assert_equal('aaaa166533fd49f3b11b1cdce2430000', role_assignment.first.scope['project']['id'])
+    assert_requested(stub)
+  end
+
+  def test_get_tenant
+    tenant_id = 'aaaa166533fd49f3b11b1cdce2430000'
+    stub = stub_request(:get, "https://example.com:12345/role_assignments?scope.project.id=#{tenant_id}").
+      to_return(
+        status: 200,
+        body: <<-JSON,
+        {
+          "role_assignments": [{
+            "scope": {
+              "project": {
+                "id": "aaaa166533fd49f3b11b1cdce2430000"
+              }
+            }
+          }]
+        }
+        JSON
+        headers: {'Content-Type' => 'application/json'}
+      )
+
+    tenant = Yao::Project.new('id' => tenant_id)
+    role_assignment = Yao::RoleAssignment.get(tenant: tenant)
+    assert_equal('aaaa166533fd49f3b11b1cdce2430000', role_assignment.first.scope['project']['id'])
+    assert_requested(stub)
+  end
+
   def test_project
-    stub = stub_request(:get, "http://example.com:12345/tenants/456789").
+    stub = stub_request(:get, "https://example.com:12345/tenants/456789").
       to_return(
         status: 200,
         body: <<-JSON,

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,41 @@ 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
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yao
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Uchio, KONDO
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-03 00:00:00.000000000 Z
+date: 2021-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -138,6 +138,7 @@ files:
 - 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