yao 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2448b0a2070a9d61401c29e6f53445a4cb0c9bbd8f1bc98aac172661d6d9bc0
-  data.tar.gz: 0f50c66bd6fd508c0b47132c672395da04037cb4dd59842d48006c386d19f9fb
+  metadata.gz: edb91db2ac62cf431603c29ce61eaaf16f522827e455b563f0bcb2922af0fe18
+  data.tar.gz: 23b08a38cba8ac2d59fda37c33f9854ba0f88b8a3110e613439ba466014bbbc7
 SHA512:
-  metadata.gz: 4e6553ffc603ead2c2ec1d4a4fcc133381b3b4065f7cdce8df9705a8776ab7cf916d1d49d7cc59f5b5453c55b8d8bb1890cec7c35ace2d67f698a43e72f11450
-  data.tar.gz: 0b79462e8a112e7b12f490f8d24e3839b80792d2f4247fee849963c07b4b3b732d3d773a9b4806f27427812e80823e27b7f69a2e0ea198f5286bb7c18439b85c
+  metadata.gz: 8d1e378004468dfaf40ea14866a8404c9936f3f2276f5492767cae69178bd323dd3f8bbb5cf82e45a87b72fd9d1b8b3f495ddd745562098abc44c2b25e41570b
+  data.tar.gz: 3bab6f8e27cad21a6bd704276fc26dcd2ec50e1e7d3af9cd22b9911ff4b10e0daea2022fd40fc480fe215665a466d8aeb86f2713850b868345b5144ba9a0fb35

data/.github/workflows/rubocop.yml

@@ -8,9 +8,9 @@ jobs:
     steps:
     - uses: actions/checkout@master
     - name: Set up Ruby
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.0
+        ruby-version: 3.1
     - name: Install dependencies
       run: |
         gem install bundler --no-document

data/.github/workflows/ubuntu-rvm.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ 'ruby-3.0.3' ]
+        ruby: [ 'ruby-3.1.1' ]
     steps:
     - uses: actions/checkout@master
     - name: Set up RVM

data/.github/workflows/ubuntu.yml

@@ -7,11 +7,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [3.0, 2.7, 2.6]
+        ruby: [3.1, 3.0, 2.7]
     steps:
     - uses: actions/checkout@master
     - name: Set up Ruby
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
     - name: Install dependencies

data/lib/yao/resources/base.rb

@@ -8,9 +8,6 @@ module Yao::Resources
     def self.friendly_attributes(*names)
       names.map(&:to_s).each do |name|
         define_method(name) do
-          if !@data.key?(name) && id
-            @data = self.class.get(id).to_hash
-          end
           self[name]
         end
       end
@@ -58,6 +55,9 @@ module Yao::Resources
     # @param name [String]
     # @return [String]
     def [](name)
+      unless @data["id"].nil? || @data.key?(name) || name.include?("__")
+        @data = self.class.get(@data["id"]).to_hash
+      end
       @data[name]
     end
 
@@ -80,18 +80,30 @@ module Yao::Resources
 
     # @return [Date]
     def created
-      if date = self["created"] || self["created_at"]
+      if date = self["created_at"] || self["created"]
         Time.parse(date)
       end
     end
 
     # @return [Date]
     def updated
-      if date = self["updated"] || self["updated_at"]
+      if date = self["updated_at"] || self["updated"]
         Time.parse(date)
       end
     end
 
+    # @param resource_params [Hash]
+    # @return [Yao::Resources::*]
+    def update(resource_params)
+      self.class.update(id, resource_params)
+    end
+
+    # @return [String]
+    def destroy
+      self.class.destroy(id)
+    end
+    alias delete destroy
+
     extend RestfullyAccessible
   end
 end

data/lib/yao/resources/flavor.rb

@@ -20,5 +20,15 @@ module Yao::Resources
     self.resource_name  = "flavor"
     self.resources_name = "flavors"
     self.resources_detail_available = true
+
+    class << self
+      # override Yao::Resources::RestfullyAccessible#find_by_name
+      # @return [Array<Yao::Resources::Role>]
+      def find_by_name(name, query={})
+        list(query).select do |flavor|
+          flavor.name == name
+        end
+      end
+    end
   end
 end

data/lib/yao/resources/floating_ip.rb

@@ -2,7 +2,7 @@ module Yao::Resources
   class FloatingIP < Base
 
     include PortAssociationable
-    include TenantAssociationable
+    include ProjectAssociationable
 
     friendly_attributes :router_id, :description, :dns_domain, :dns_name,
                         :revision_number,
@@ -18,11 +18,5 @@ module Yao::Resources
     def router
       @router ||= Yao::Router.get(router_id)
     end
-
-    # @return [Yao::Resources::Tenant]
-    def project
-      @project ||= Yao::Tenant.get(project_id)
-    end
-    alias :tenant :project
   end
 end

data/lib/yao/resources/loadbalancer_pool.rb

@@ -7,21 +7,11 @@ module Yao::Resources
     map_attribute_to_resources loadbalancers: LoadBalancer
     map_attribute_to_resources listeners: LoadBalancerListener
 
-    # @return [Date]
-    def created_at
-      Date.parse(self["created_at"])
-    end
-
-    # @return [Date]
-    def updated_at
-      Date.parse(self["updated_at"])
-    end
-
     # @return [Yao::Resources::LoadBalancerListener]
     def listeners
-      self["listeners"].map do |listener|
-        Yao::LoadBalancerListener.find listener["id"]
-      end
+      @listeners ||= self["listeners"].map do |listener|
+                       Yao::LoadBalancerListener.get(listener["id"])
+                     end
     end
 
     # @return [Yao::Resources::Tenant]
@@ -32,18 +22,18 @@ module Yao::Resources
     end
     alias :tenant :project
 
-    # @return [Yao::Resources::LoadBalancerListener]
+    # @return [Yao::Resources::LoadBalancerPoolMember]
     def members
-      self["members"].map do |member|
-        Yao::LoadBalancerPoolMember.find(self,member["id"])
-      end
+      @members ||= self["members"].map do |member|
+                     Yao::LoadBalancerPoolMember.get(self, member["id"])
+                   end
     end
 
     # @return [Yao::Resources::LoadBalancerHealthMonitor]
     def healthmonitor
-      if healthmonitor_id = self["healthmonitor_id"]
-        Yao::LoadBalancerHealthMonitor.find healthmonitor_id
-      end
+      @healthmonitor ||= if healthmonitor_id = self["healthmonitor_id"]
+                           Yao::LoadBalancerHealthMonitor.get(healthmonitor_id)
+                         end
     end
 
     self.service        = "load-balancer"

data/lib/yao/resources/meter.rb

@@ -1,7 +1,7 @@
 module Yao::Resources
   class Meter < Base
 
-    include TenantAssociationable
+    include ProjectAssociationable
 
     friendly_attributes :meter_id, :name, :user_id, :resource_id, :source, :type, :unit
 

data/lib/yao/resources/network.rb

@@ -1,6 +1,6 @@
 module Yao::Resources
   class Network < Base
-    include TenantAssociationable
+    include ProjectAssociationable
 
     friendly_attributes :name, :status, :shared, :subnets, :admin_state_up
     map_attribute_to_attribute "provider:physical_network" => :physical_network

data/lib/yao/resources/old_sample.rb

@@ -1,6 +1,6 @@
 module Yao::Resources
   class OldSample < Base
-    include TenantAssociationable
+    include ProjectAssociationable
 
     friendly_attributes :counter_name, :counter_type, :counter_unit, :counter_volume,
                         :message_id, :resource_id, :timestamp, :resource_metadata, :user_id,

data/lib/yao/resources/port.rb

@@ -2,7 +2,7 @@ module Yao::Resources
   class Port < Base
 
     include NetworkAssociationable
-    include TenantAssociationable
+    include ProjectAssociationable
 
     friendly_attributes :name, :mac_address, :status, :allowed_address_pairs,
                         :device_owner, :fixed_ips, :security_groups, :device_id,

data/lib/yao/resources/{tenant_associationable.rb → project_associationable.rb}

@@ -1,18 +1,18 @@
 module Yao
   module Resources
-    module TenantAssociationable
+    module ProjectAssociationable
 
       def self.included(base)
         base.friendly_attributes :project_id
         base.friendly_attributes :tenant_id
       end
 
-      # @return [Yao::Resources::Tenant]
-      def tenant
-        @tenant ||= Yao::Tenant.find(project_id || tenant_id)
+      # @return [Yao::Resources::Project]
+      def project
+        @project ||= Yao::Project.find(project_id || tenant_id)
       end
 
-      alias :project :tenant
+      alias :tenant :project
     end
   end
 end

data/lib/yao/resources/resource.rb

@@ -1,7 +1,7 @@
 require 'time'
 module Yao::Resources
   class Resource < Base
-    include TenantAssociationable
+    include ProjectAssociationable
 
     friendly_attributes :user_id, :resource_id,
                         :last_sample_timestamp, :first_sample_timestamp,

data/lib/yao/resources/restfully_accessible.rb

@@ -148,7 +148,7 @@ module Yao::Resources
     # @return [Yao::Resources::*]
     def get!(id_or_name_or_permalink, query={})
       get(id_or_name_or_permalink, query)
-    rescue Yao::ItemNotFound, Yao::NotFound
+    rescue Yao::ItemNotFound, Yao::NotFound, Yao::InvalidResponse
       nil
     end
 
@@ -188,6 +188,7 @@ module Yao::Resources
       res = DELETE(create_url(id))
       res.body
     end
+    alias delete destroy
 
     private
 
@@ -238,7 +239,7 @@ module Yao::Resources
         GET(create_url(name), query)
       rescue => e
         raise e unless e.class == Yao::ItemNotFound || e.class == Yao::NotFound
-        item = find_by_name(name)
+        item = find_by_name(name).select { |r| r.name == name }
         if item.size > 1
           raise Yao::TooManyItemFonud.new("More than one resource exists with the name '#{name}'")
         elsif item.size.zero?

data/lib/yao/resources/role_assignment.rb

@@ -11,9 +11,9 @@ module Yao::Resources
     self.admin          = true
     self.api_version    = "v3"
 
-    # @return [Yao::Resources::Tenant]
+    # @return [Yao::Resources::Project]
     def project
-      @project ||= Yao::Tenant.get(scope["project"]["id"])
+      @project ||= Yao::Project.get(scope["project"]["id"])
     end
 
     class << self

data/lib/yao/resources/router.rb

@@ -1,15 +1,31 @@
 module Yao::Resources
   class Router < Base
-    include TenantAssociationable
+    include ProjectAssociationable
 
     friendly_attributes :name, :description, :admin_state_up, :status, :external_gateway_info,
-                        :network_id, :enable_snat, :external_fixed_ips, :routes, :destination, :nexthop, :distributed,
-                        :ha, :availability_zone_hints, :availability_zones
+                        :routes, :distributed, :ha, :availability_zone_hints, :availability_zones
 
     self.service        = 'network'
     self.resource_name  = 'router'
     self.resources_name = 'routers'
 
+    # @return [bool]
+    def enable_snat
+      external_gateway_info["enable_snat"]
+    end
+
+    # @return [Array<Hash>]
+    def external_fixed_ips
+      external_gateway_info["external_fixed_ips"]
+    end
+
+    # @return [Yao::Resource::Network]
+    def external_network
+      @external_network ||= if network_id = external_gateway_info["network_id"]
+                              Yao::Network.get(network_id)
+                            end
+    end
+
     # @return [Array<Yao::Resources::Port>]
     def interfaces
       Yao::Port.list(device_id: id)
@@ -29,13 +45,6 @@ module Yao::Resources
       def remove_interface(id, param)
         PUT(['routers', id, 'remove_router_interface.json'].join('/'), param.to_json)
       end
-
-      # @param name [String]
-      # @return [Array<Yao::Resources::Router>]
-      def get_by_name(name)
-        self.list(name: name)
-      end
-      alias find_by_name get_by_name
     end
   end
 end

data/lib/yao/resources/security_group.rb

@@ -1,7 +1,7 @@
 require 'yao/resources/security_group_rule'
 module Yao::Resources
   class SecurityGroup < Base
-    include TenantAssociationable
+    include ProjectAssociationable
 
     friendly_attributes :name, :description
 

data/lib/yao/resources/server.rb

@@ -2,7 +2,7 @@ require 'yao/resources/metadata_available'
 require 'yao/resources/action'
 module Yao::Resources
   class Server < Base
-    include TenantAssociationable
+    include ProjectAssociationable
 
     friendly_attributes :addresses, :metadata, :name, :progress,
                         :status, :user_id, :key_name

data/lib/yao/resources/subnet.rb

@@ -2,7 +2,7 @@ module Yao::Resources
   class Subnet < Base
 
     include NetworkAssociationable
-    include TenantAssociationable
+    include ProjectAssociationable
 
     friendly_attributes :name, :cidr, :gateway_ip, :network_id, :ip_version,
                         :dns_nameservers, :host_routes, :enable_dhcp

data/lib/yao/resources/volume.rb

@@ -2,6 +2,8 @@ require 'yao/resources/volume_action'
 
 module Yao::Resources
   class Volume < Base
+    include ProjectAssociationable
+
     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
 

data/lib/yao/resources.rb

@@ -1,7 +1,7 @@
 module Yao
   module Resources
     require "yao/resources/base"
-    require "yao/resources/tenant_associationable"
+    require "yao/resources/project_associationable"
     require "yao/resources/port_associationable"
     require "yao/resources/network_associationable"
     require "yao/resources/server_usage_associationable"

data/lib/yao/version.rb

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

data/test/yao/resources/test_base.rb

@@ -23,4 +23,25 @@ class TestResourceBase < TestYaoResource
     assert_equal(nil, base.empty)
   end
 
+  def test_update
+    stub(Yao::Resources::Base).update('foo', {name: 'BAR'}) { Yao::Resources::Base.new('id' => 'foo', 'name' => 'BAR')}
+    base = Yao::Resources::Base.new({'id' => 'foo', 'name' => 'bar'})
+    got = base.update(name: 'BAR')
+    assert_equal(got.name, 'BAR')
+  end
+
+  def test_destroy
+    stub(Yao::Resources::Base).destroy('foo') { nil }
+    base = Yao::Resources::Base.new({'id' => 'foo'})
+    got = base.destroy
+    assert_equal(got, nil)
+  end
+
+  def test_delete
+    stub(Yao::Resources::Base).destroy('foo') { nil }
+    base = Yao::Resources::Base.new({'id' => 'foo'})
+    got = base.delete
+    assert_equal(got, nil)
+  end
+
 end

data/test/yao/resources/test_flavor.rb

@@ -46,48 +46,64 @@ class TestFlavor < TestYaoResource
     assert_equal(512, flavor.memory)
   end
 
-  def test_list
-    stub = stub_request(:get, "https://example.com:12345/flavors/detail").
+  def flavor_detail
+    JSON.parse(<<~JSON)
+      {
+          "OS-FLV-DISABLED:disabled": false,
+          "disk": 20,
+          "OS-FLV-EXT-DATA:ephemeral": 0,
+          "os-flavor-access:is_public": true,
+          "id": "7",
+          "links": [
+              {
+                  "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/7",
+                  "rel": "self"
+              },
+              {
+                  "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/7",
+                  "rel": "bookmark"
+              }
+          ],
+          "name": "m1.small.description",
+          "ram": 2048,
+          "swap": 0,
+          "vcpus": 1,
+          "rxtx_factor": 1.0,
+          "description": "test description",
+          "extra_specs": {
+              "hw:cpu_policy": "shared",
+              "hw:numa_nodes": "1"
+          }
+      }
+    JSON
+  end
+
+  def stub_flavors_detail(query=nil)
+    url = ['https://example.com:12345/flavors/detail',query].compact.join('?')
+    stub_request(:get, url).
       to_return(
         status: 200,
-        body: <<-JSON,
-        {
-            "flavors": [
-                {
-                    "OS-FLV-DISABLED:disabled": false,
-                    "disk": 1,
-                    "OS-FLV-EXT-DATA:ephemeral": 0,
-                    "os-flavor-access:is_public": true,
-                    "id": "1",
-                    "links": [
-                        {
-                            "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/flavors/1",
-                            "rel": "self"
-                        },
-                        {
-                            "href": "http://openstack.example.com/6f70656e737461636b20342065766572/flavors/1",
-                            "rel": "bookmark"
-                        }
-                    ],
-                    "name": "m1.tiny",
-                    "ram": 512,
-                    "swap": "",
-                    "vcpus": 1,
-                    "rxtx_factor": 1.0,
-                    "description": null,
-                    "extra_specs": {}
-                }
-            ]
-        }
-        JSON
+        body: { flavors:[flavor_detail] }.to_json,
         headers: {'Content-Type' => 'application/json'}
       )
+  end
 
+  def stub_flavor(id)
+    stub_request(:get, "https://example.com:12345/flavors/#{id}").
+      to_return(
+        status: 200,
+        body: { 'flavor': flavor_detail }.to_json,
+        headers: {'Content-Type' => 'application/json'}
+      )
+  end
+
+  def test_list
+    stub = stub_flavors_detail
     assert(Yao::Flavor.resources_detail_available)
 
     flavors = Yao::Flavor.list
     assert_instance_of(Yao::Flavor, flavors.first)
-    assert_equal("m1.tiny", flavors.first.name)
+    assert_equal("m1.small.description", flavors.first.name)
 
     assert_requested(stub)
   end
@@ -97,4 +113,22 @@ class TestFlavor < TestYaoResource
     # see also: https://stackoverflow.com/questions/25883618/how-to-test-method-alias-ruby
     assert_equal(Yao::Flavor.method(:list), Yao::Flavor.method(:list_detail))
   end
+
+  def test_get_by_id
+    stub = stub_flavor(7)
+    flavor = Yao::Flavor.get('7')
+    assert_equal('m1.small.description', flavor.name)
+    assert_requested(stub)
+  end
+
+  def test_get_by_name
+    stub = stub_request(:get, "https://example.com:12345/flavors/m1.small.description").to_return(status: 404)
+    stub2 = stub_flavors_detail
+    stub3 = stub_flavor(7)
+    flavor = Yao::Flavor.get('m1.small.description')
+    assert_equal('7', flavor.id)
+    assert_requested(stub)
+    assert_requested(stub2)
+    assert_requested(stub3)
+  end
 end

data/test/yao/resources/test_floating_ip.rb

@@ -82,14 +82,14 @@ class TestFloatingIP < 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"
           }
         }
@@ -102,8 +102,8 @@ class TestFloatingIP < TestYaoResource
       "tenant_id"  => "0123456789abcdef0123456789abcdef",
     )
 
-    assert_instance_of(Yao::Tenant, fip.tenant)
-    assert_instance_of(Yao::Tenant, fip.project)
+    assert_instance_of(Yao::Project, fip.tenant)
+    assert_instance_of(Yao::Project, fip.project)
     assert_equal('0123456789abcdef0123456789abcdef', fip.tenant.id)
 
     assert_requested(stub)

data/test/yao/resources/test_loadbalancer_pool.rb

@@ -13,7 +13,14 @@ class TestLoadBalancerPool < TestYaoResource
         "type" => "SOURCE_IP"
       },
       "operating_status" => "ONLINE",
-      "name" => "round_robin_pool"
+      "name" => "round_robin_pool",
+      "members" => [
+        {"id" => "957a1ace-1bd2-449b-8455-820b6e4b63f3"},
+      ],
+      "listeners" => [
+        {"id" => "023f2e34-7806-443b-bfae-16c324569a3d"}
+      ],
+      "healthmonitor_id" => "8ed3c5ac-6efa-420c-bedb-99ba14e58db5",
     }
 
     pool = Yao::Resources::LoadBalancerPool.new(params)
@@ -30,5 +37,143 @@ class TestLoadBalancerPool < TestYaoResource
     }, pool.session_persistence)
     assert_equal("ONLINE", pool.operating_status)
     assert_equal("round_robin_pool", pool.name)
+
+    # https://docs.openstack.org/api-ref/load-balancer/v2/?expanded=show-member-details-detail#show-member-details
+    stub = stub_request(:get, "http://endpoint.example.com:9876/v2.0/lbaas/pools//members/957a1ace-1bd2-449b-8455-820b6e4b63f3")
+          .to_return(
+            status: 200,
+            body: <<-JSON,
+            {
+              "member": {
+                "monitor_port": 8080,
+                "project_id": "e3cd678b11784734bc366148aa37580e",
+                "name": "web-server-1",
+                "weight": 20,
+                "backup": false,
+                "admin_state_up": true,
+                "subnet_id": "bbb35f84-35cc-4b2f-84c2-a6a29bba68aa",
+                "created_at": "2017-05-11T17:21:34",
+                "provisioning_status": "ACTIVE",
+                "monitor_address": null,
+                "updated_at": "2017-05-11T17:21:37",
+                "address": "192.0.2.16",
+                "protocol_port": 80,
+                "id": "957a1ace-1bd2-449b-8455-820b6e4b63f3",
+                "operating_status": "NO_MONITOR",
+                "tags": ["test_tag"]
+              }
+            }
+            JSON
+            headers: {'Content-Type' => 'application/json'}
+          )
+
+    assert_instance_of(Yao::LoadBalancerPoolMember, pool.members.first)
+    assert_equal("957a1ace-1bd2-449b-8455-820b6e4b63f3", pool.members.first.id)
+    assert_equal("web-server-1", pool.members.first.name)
+    assert_requested(stub)
+
+    # https://docs.openstack.org/api-ref/load-balancer/v2/?expanded=show-member-details-detail,show-listener-details-detail,show-pool-details-detail#show-listener-details
+    stub = stub_request(:get, "http://endpoint.example.com:9876/v2.0/lbaas/listeners/023f2e34-7806-443b-bfae-16c324569a3d")
+          .to_return(
+            status: 200,
+            body: <<-JSON,
+            {
+              "listener": {
+                "description": "A great TLS listener",
+                "admin_state_up": true,
+                "project_id": "e3cd678b11784734bc366148aa37580e",
+                "protocol": "TERMINATED_HTTPS",
+                "protocol_port": 443,
+                "provisioning_status": "ACTIVE",
+                "default_tls_container_ref": "http://198.51.100.10:9311/v1/containers/a570068c-d295-4780-91d4-3046a325db51",
+                "loadbalancers": [
+                  {
+                    "id": "607226db-27ef-4d41-ae89-f2a800e9c2db"
+                  }
+                ],
+                "insert_headers": {
+                  "X-Forwarded-Port": "true",
+                  "X-Forwarded-For": "true"
+                },
+                "created_at": "2017-02-28T00:42:44",
+                "updated_at": "2017-02-28T00:44:30",
+                "id": "023f2e34-7806-443b-bfae-16c324569a3d",
+                "operating_status": "ONLINE",
+                "default_pool_id": "ddb2b28f-89e9-45d3-a329-a359c3e39e4a",
+                "sni_container_refs": [
+                  "http://198.51.100.10:9311/v1/containers/a570068c-d295-4780-91d4-3046a325db51",
+                  "http://198.51.100.10:9311/v1/containers/aaebb31e-7761-4826-8cb4-2b829caca3ee"
+                ],
+                "l7policies": [
+                  {
+                    "id": "5e618272-339d-4a80-8d14-dbc093091bb1"
+                  }
+                ],
+                "name": "great_tls_listener",
+                "timeout_client_data": 50000,
+                "timeout_member_connect": 5000,
+                "timeout_member_data": 50000,
+                "timeout_tcp_inspect": 0,
+                "tags": ["test_tag"],
+                "client_ca_tls_container_ref": "http://198.51.100.10:9311/v1/containers/35649991-49f3-4625-81ce-2465fe8932e5",
+                "client_authentication": "MANDATORY",
+                "client_crl_container_ref": "http://198.51.100.10:9311/v1/containers/e222b065-b93b-4e2a-9a02-804b7a118c3c",
+                "allowed_cidrs": [
+                  "192.0.2.0/24",
+                  "198.51.100.0/24"
+                ],
+                "tls_ciphers": "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256",
+                "tls_versions": ["TLSv1.2", "TLSv1.3"],
+                "alpn_protocols": ["http/1.1", "http/1.0"]
+              }
+            }
+            JSON
+            headers: {'Content-Type' => 'application/json'}
+          )
+    assert_instance_of(Yao::LoadBalancerListener, pool.listeners.first)
+    assert_equal("023f2e34-7806-443b-bfae-16c324569a3d", pool.listeners.first.id)
+    assert_equal("great_tls_listener", pool.listeners.first.name)
+    assert_requested(stub)
+
+    # https://docs.openstack.org/api-ref/load-balancer/v2/?expanded=show-member-details-detail,show-listener-details-detail,show-pool-details-detail,show-health-monitor-details-detail#show-health-monitor-details
+    stub = stub_request(:get, "http://endpoint.example.com:9876/v2.0/lbaas/healthmonitors/8ed3c5ac-6efa-420c-bedb-99ba14e58db5")
+          .to_return(
+            status: 200,
+            body: <<-JSON,
+            {
+              "healthmonitor": {
+                "project_id": "e3cd678b11784734bc366148aa37580e",
+                "name": "super-pool-health-monitor",
+                "admin_state_up": true,
+                "pools": [
+                  {
+                    "id": "4029d267-3983-4224-a3d0-afb3fe16a2cd"
+                  }
+                ],
+                "created_at": "2017-05-11T23:53:47",
+                "provisioning_status": "ACTIVE",
+                "updated_at": "2017-05-11T23:53:47",
+                "delay": 10,
+                "expected_codes": "200",
+                "max_retries": 1,
+                "http_method": "GET",
+                "timeout": 5,
+                "max_retries_down": 3,
+                "url_path": "/",
+                "type": "HTTP",
+                "id": "8ed3c5ac-6efa-420c-bedb-99ba14e58db5",
+                "operating_status": "ONLINE",
+                "tags": ["test_tag"],
+                "http_version": 1.0,
+                "domain_name": null
+              }
+            }
+            JSON
+            headers: {'Content-Type' => 'application/json'}
+          )
+    assert_instance_of(Yao::LoadBalancerHealthMonitor, pool.healthmonitor)
+    assert_equal("8ed3c5ac-6efa-420c-bedb-99ba14e58db5", pool.healthmonitor.id)
+    assert_equal("super-pool-health-monitor", pool.healthmonitor.name)
+    assert_requested(stub)
   end
 end

data/test/yao/resources/test_meter.rb

@@ -88,13 +88,13 @@ class TestMeter < TestYaoResource
     assert_requested(stub)
   end
 
-  def test_tenant
-    stub = stub_request(:get, "https://example.com:12345/tenants/00000000-0000-0000-0000-000000000000")
+  def test_project
+    stub = stub_request(:get, "https://example.com:12345/projects/00000000-0000-0000-0000-000000000000")
       .to_return(
         status: 200,
         body: <<-JSON,
         {
-          "tenant": {
+          "project": {
             "id": "00000000-0000-0000-0000-000000000000"
           }
         }
@@ -107,8 +107,8 @@ class TestMeter < TestYaoResource
     }
 
     meter  = Yao::Meter.new(params)
-    assert_instance_of(Yao::Tenant, meter.tenant)
-    assert_equal("00000000-0000-0000-0000-000000000000", meter.tenant.id)
+    assert_instance_of(Yao::Project, meter.project)
+    assert_equal("00000000-0000-0000-0000-000000000000", meter.project.id)
 
     assert_requested(stub)
   end

data/test/yao/resources/test_network.rb

@@ -37,14 +37,14 @@ class TestNetwork < TestYaoResource
     assert_equal(1000, network.segmentation_id)
   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"
           }
         }
@@ -57,9 +57,9 @@ class TestNetwork < TestYaoResource
       "tenant_id"  => "0123456789abcdef0123456789abcdef",
     )
 
-    assert_instance_of(Yao::Tenant, network.tenant)
-    assert_instance_of(Yao::Tenant, network.project)
-    assert_equal('0123456789abcdef0123456789abcdef', network.tenant.id)
+    assert_instance_of(Yao::Project, network.tenant)
+    assert_instance_of(Yao::Project, network.project)
+    assert_equal('0123456789abcdef0123456789abcdef', network.project.id)
 
     assert_requested(stub)
   end

data/test/yao/resources/test_port.rb

@@ -77,14 +77,14 @@ class TestPort < TestYaoResource
     assert_equal("10.0.0.1", port.primary_ip)
   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"
           }
         }
@@ -92,9 +92,9 @@ class TestPort < TestYaoResource
         headers: {'Content-Type' => 'application/json'}
       )
 
-    port = Yao::Port.new('tenant_id' => '0123456789abcdef0123456789abcdef')
-    assert_instance_of(Yao::Tenant, port.tenant)
-    assert_equal('0123456789abcdef0123456789abcdef', port.tenant.id)
+    port = Yao::Port.new('project_id' => '0123456789abcdef0123456789abcdef')
+    assert_instance_of(Yao::Project, port.project)
+    assert_equal('0123456789abcdef0123456789abcdef', port.project.id)
 
     assert_requested(stub)
   end

data/test/yao/resources/test_restfully_accessible.rb

@@ -1,6 +1,18 @@
 class TestRestfullyAccesible < Test::Unit::TestCase
   include RestfullyAccessibleStub
   class Test
+    def initialize(data_via_json)
+      @data = data_via_json
+    end
+
+    def id
+      @data['id']
+    end
+
+    def name
+      @data['name']
+    end
+
     class << self
       attr_accessor :client
     end
@@ -45,7 +57,7 @@ class TestRestfullyAccesible < Test::Unit::TestCase
 
       stub_get_request_not_found([@url, @resources_name, name].join('/'))
       stub_get_request([@url, "#{@resources_name}?name=dummy"].join('/'), @resources_name)
-      mock(Test).new("dummy_resource") { Struct.new(:id).new(uuid) }
+      mock(Test).new("dummy_resource") { Struct.new(:id, :name).new(uuid, name) }
       stub_get_request([@url, @resources_name, uuid].join('/'), @resources_name)
       mock(Test).new("dummy_resource") { "OK" }
 
@@ -60,7 +72,7 @@ class TestRestfullyAccesible < Test::Unit::TestCase
 
       stub_get_request_not_found([@url, @resources_name, name].join('/'))
       stub_get_request_with_json_response([@url, "#{@resources_name}?name=dummy"].join('/'), body)
-      mock(Test).new("dummy_resources") { Struct.new(:id).new(uuid) }
+      mock(Test).new("dummy_resources") { Struct.new(:id, :name).new(uuid, name) }
       stub_get_request([@url, @resources_name, uuid].join('/'), @resource_name)
       mock(Test).new("dummy_resource") { "OK" }
 
@@ -84,8 +96,17 @@ class TestRestfullyAccesible < Test::Unit::TestCase
 
   sub_test_case 'get!' do
     test 'not found' do
-      stub_get_request_not_found("https://example.com/dummy_resource")
-      assert_equal(nil, Test.get!("https://example.com/dummy_resource"))
+      Test.return_single_on_querying = false
+      name = "dummy"
+      uuid = "00112233-4455-6677-8899-aabbccddeeff"
+      body = {@resources_name => []}
+
+      stub1 = stub_get_request_not_found([@url, @resources_name, name].join('/'))
+      stub2 = stub_get_request_with_json_response([@url, "#{@resources_name}?name=#{name}"].join('/'), body)
+
+      assert_equal(nil, Test.get!(name))
+      assert_requested(stub1)
+      assert_requested(stub2)
     end
 
     test 'found' do
@@ -103,6 +124,23 @@ class TestRestfullyAccesible < Test::Unit::TestCase
     end
   end
 
+  sub_test_case 'get_by_name' do
+    test 'multiple found' do
+      name = 'dummy'
+      uuid = '00112233-4455-6677-8899-aabbccddeeff'
+      list_body = { @resources_name => [
+        { 'name' => 'dummy', 'id' => uuid },
+        { 'name' => 'dummy2', 'id' => '308cb410-9c84-40ec-a3eb-583001aaa7fd' }
+      ]}
+      get_body = { @resource_name => { 'name' => 'dummy', 'id' => uuid } }
+      stub1 = stub_get_request_not_found([@url, @resources_name, name].join('/'))
+      stub2 = stub_get_request_with_json_response([@url, "#{@resources_name}?name=#{name}"].join('/'), list_body)
+      stub3 = stub_get_request_with_json_response([@url, @resources_name, name].join('/'), get_body)
+
+      assert_equal(uuid, Test.send(:get_by_name, 'dummy').body[@resource_name]['id'])
+    end
+  end
+
   def test_find_by_name
     mock(Test).list({"name" => "dummy"}) { "dummy" }
 
@@ -116,4 +154,8 @@ class TestRestfullyAccesible < Test::Unit::TestCase
     assert_equal(false, Test.send(:uuid?, "dummy resource"))
     assert_equal(false, Test.send(:uuid?, "00112233445566778899aabbccddeeff"))
   end
+
+  def test_delete
+    assert_equal(Test.method(:delete), Test.method(:destroy))
+  end
 end

data/test/yao/resources/test_role_assignment.rb

@@ -130,12 +130,12 @@ class TestRoleAssignment < TestYaoResource
   end
 
   def test_project
-    stub = stub_request(:get, "https://example.com:12345/tenants/456789").
+    stub = stub_request(:get, "https://example.com:12345/projects/456789").
       to_return(
         status: 200,
         body: <<-JSON,
         {
-          "tenant": {
+          "project": {
             "id": "456789"
           }
         }
@@ -152,7 +152,7 @@ class TestRoleAssignment < TestYaoResource
     }
 
     role_assignment = Yao::RoleAssignment.new(params)
-    assert_instance_of(Yao::Resources::Tenant, role_assignment.project)
+    assert_instance_of(Yao::Project, role_assignment.project)
     assert_equal("456789", role_assignment.project.id)
 
     assert_requested(stub)

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,9 +221,9 @@ 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

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.16.0
 platform: ruby
 authors:
 - Uchio, KONDO
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-10 00:00:00.000000000 Z
+date: 2022-04-13 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!!