yao 0.14.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55df2a0420c42a9448a180f6b0378d82bd8c6fb2d9efac004c152675d357ee3a
-  data.tar.gz: ff5477041bca286e2283ef8130c3659cd4762a8b415dbc374df73ff077dae51a
+  metadata.gz: 22e30555da286a1d595d60c3278cb2d3b63d1353defa42ebfade5851341d486b
+  data.tar.gz: 27ed61a3d891a286a54c78af0f6b7eea591e461b7bca75e5e2da93e30f2e6741
 SHA512:
-  metadata.gz: 75274af855b318f6be285de56b21260f350e5dd892a291b4ef128db9683b9559e06a6284024f555e4123c879530a2b903b3abea29cc08be0c76fe54417638d38
-  data.tar.gz: 66ee630a29f13cd94eb4639fcabc711da46d71f1ff8ff779777b7833a052cf6899b5076f9bac7c25669449fb28a87d4c1d6a63857e5bbeae22bd27280834d84f
+  metadata.gz: e5610760a589bb5e0bbdd8bbfd6da917628865faa8b64f46f8cc9dbe94f6e9eb95929daf93d1831de5b2bc8a520b94da33455619bb1f412bbeda8dc51833cd5e
+  data.tar.gz: 8c2e8f48490af04d4f3a7cb9b42506f74f36fb99d39dc91a7036444de996838639443e3064a01616a9354078b98ca1092a9dfe9dd05feee96dd0cfb7198efadb

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/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/{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

@@ -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]
+    # @return [Yao::Resources::Project]
     def project
-      @project ||= Yao::Tenant.get(scope["project"]["id"])
+      @project ||= Yao::Project.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/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
@@ -32,6 +32,11 @@ module Yao::Resources
       Yao::OldSample.list(counter_name, query).select{|os| os.resource_metadata["instance_id"] == id}
     end
 
+    # @return [Array<Yao::Resources::Port>]
+    def ports
+      @ports ||= Yao::Port.list(device_id: id)
+    end
+
     # @param id [String]
     # @return [Hash]
     def self.start(id)

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/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,25 @@
+require 'yao/resources/volume_action'
+
 module Yao::Resources
   class Volume < Base
-    friendly_attributes :name, :size, :volume_type
+    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
 
+    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/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.14.0"
+  VERSION = "0.17.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