yao 0.13.4 → 0.16.0

data/lib/yao/resources/loadbalancer_pool_member.rb

@@ -5,6 +5,7 @@ module Yao::Resources
                         :monitor_address, :address,
                         :protocol_port, :operating_status
 
+    # @return [Yao::Resources::Tenant]
     def project
       if project_id = self["project_id"]
         Yao::Tenant.find project_id
@@ -12,6 +13,7 @@ module Yao::Resources
     end
     alias :tenant :project
 
+    # @return [Yao::Resources::Subnet]
     def subnet
       if subnet_id = self["subnet_id"]
         Yao::Subnet.find subnet_id
@@ -25,33 +27,52 @@ module Yao::Resources
 
     class << self
 
+      # @param pool [Yao::Resources::LoadBalancerPool]
+      # @param query [Hash]
+      # @return [Array<Yao::Resources::LoadBalancerPoolMember>]
       def list(pool, query={})
         self.resources_path = member_resources_path(pool)
         super(query)
       end
 
+      # @param pool [Yao::Resources::LoadBalancerPool]
+      # @param id_or_permalink [String]
+      # @param query [Hash]
+      # @return [Yao::Resources::LoadBalancerPoolMember]
       def get(pool, id_or_permalink, query={})
         self.resources_path = member_resources_path(pool)
         super(id_or_permalink, query)
       end
       alias find get
 
+      # @param pool [Yao::Resources::LoadBalancerPool]
+      # @param resource_params [Hash]
+      # @return [Yao::Resources::LoadBalancerPoolMember]
       def create(pool, resource_params)
         self.resources_path = member_resources_path(pool)
         super(resource_params)
       end
 
+      # @param pool [Yao::Resources::LoadBalancerPool]
+      # @param id [String]
+      # @param resource_params [Hash]
+      # @return [Yao::Resources::LoadBalancerPoolMember]
       def update(pool, id, resource_params)
         self.resources_path = member_resources_path(pool)
         super(id, resource_params)
       end
 
+      # @param pool [Yao::Resources::LoadBalancerPool]
+      # @param id [String]
+      # @return [String]
       def destroy(pool, id)
         self.resources_path = member_resources_path(pool)
         super(id)
       end
 
       private
+      # @param pool [Yao::Resources::LoadBalancerPool]
+      # @return [String]
       def member_resources_path(pool)
         "lbaas/pools/#{pool.id}/#{self.resources_name}"
       end

data/lib/yao/resources/metadata_available.rb

@@ -1,9 +1,14 @@
 module Yao::Resources
   module MetadataAvailable
+    # @param id [String]
+    # @return [Hash]
     def list_metadata(id)
       GET(metadata_path(id)).body["metadata"]
     end
 
+    # @param id [String]
+    # @param metadata [Hash]
+    # @return [Hash]
     def create_metadata(id, metadata)
       res = POST(metadata_path(id)) do |req|
         req.body = {"metadata" => metadata}.to_json
@@ -13,6 +18,9 @@ module Yao::Resources
     end
     alias append_metadata create_metadata
 
+    # @param id [String]
+    # @param metadata [Hash]
+    # @return [Hash]
     def update_metadata(id, metadata)
       res = PUT(metadata_path(id)) do |req|
         req.body = {"metadata" => metadata}.to_json
@@ -22,10 +30,17 @@ module Yao::Resources
     end
     alias replace_metadata update_metadata
 
+    # @param id [String]
+    # @param key [String]
+    # @return [Hash]
     def get_metadata(id, key)
       GET(metadata_key_path(id, key)).body["meta"]
     end
 
+    # @param id [String]
+    # @param key [String]
+    # @param value [String]
+    # @return [Hash]
     def set_metadata(id, key, value)
       res = PUT(metadata_key_path(id, key)) do |req|
         req.body = {"meta" => {key => value}}.to_json
@@ -34,15 +49,21 @@ module Yao::Resources
       res.body["meta"]
     end
 
+    # @param id [String]
+    # @param key [String]
     def delete_metadata(id, key)
       DELETE(metadata_key_path(id, key)).body
     end
 
     private
+    # @param id [String]
+    # @return [String]
     def metadata_path(id)
       ["servers", id, "metadata"].join("/")
     end
 
+    # @param id [String]
+    # @param key [String]
     def metadata_key_path(id, key)
       ["servers", id, "metadata", key].join("/")
     end

data/lib/yao/resources/meter.rb

@@ -1,18 +1,21 @@
 module Yao::Resources
   class Meter < Base
 
-    include TenantAssociationable
+    include ProjectAssociationable
 
     friendly_attributes :meter_id, :name, :user_id, :resource_id, :source, :type, :unit
 
+    # @return [String]
     def id
       meter_id
     end
 
+    # @return [Yao::Resources::Resource]
     def resource
       @resource ||= Yao::Resource.get(resource_id)
     end
 
+    # @return [Yao::Resources::User]
     def user
       @user ||= Yao::User.get(user_id)
     end
@@ -23,12 +26,16 @@ module Yao::Resources
 
     class << self
       private
+
+      # override Yao::Resources::RestfullyAccessible.resource_from_json
+      # @param json [Hash]
+      # @return [Yao::Resources::Meter]
       def resource_from_json(json)
         new(json)
       end
 
       # override Yao::Resources::RestfullyAccessible.resources_from_json
-      # @param [Array]
+      # @param json [Array<Hash>]
       # @return [Array<Yao::Resources::Meter>]
       def resources_from_json(json)
         json.map{|d| new(d)}

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
@@ -13,6 +13,7 @@ module Yao::Resources
     self.resource_name  = "network"
     self.resources_name = "networks"
 
+    # @return [Array<Yao::Resources::Port>]
     def ports
       @ports ||= Yao::Port.list(network_id: id)
     end

data/lib/yao/resources/network_associationable.rb

@@ -6,6 +6,7 @@ module Yao
         base.friendly_attributes :network_id
       end
 
+      # @return [Yao::Resources::Network]
       def network
         @tenant ||= Yao::Network.find(network_id)
       end

data/lib/yao/resources/old_sample.rb

@@ -1,24 +1,28 @@
 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,
                         :source
 
+    # @return [Date]
     def recorded_at
       Time.parse(self["recorded_at"] || self["timestamp"])
     end
     alias timestamp recorded_at
 
+    # @return [String]
     def id
       message_id
     end
 
+    # @return [Yao::Resources::Resource]
     def resource
       @resource ||= Yao::Resource.get(resource_id)
     end
 
+    # @return [Yao::Resources::User]
     def user
       @user ||= Yao::User.get(user_id)
     end

data/lib/yao/resources/port.rb

@@ -2,17 +2,19 @@ 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,
                         :admin_state_up
     map_attribute_to_attribute "binding:host_id" => :host_id
 
+    # @return [String]
     def primary_ip
       fixed_ips.first["ip_address"]
     end
 
+    # @return [Yao::Resources::Subnet]
     def primary_subnet
       @subnet ||= Yao::Subnet.find fixed_ips.first["subnet_id"]
     end

data/lib/yao/resources/port_associationable.rb

@@ -6,6 +6,7 @@ module Yao
         base.friendly_attributes :port_id
       end
 
+      # @return [Yao::Resources::Port]
       def port
         @port ||= Yao::Port.find(port_id)
       end

data/lib/yao/resources/project.rb

@@ -1,5 +1,7 @@
 module Yao::Resources
   class Project < Base
+    include ServerUsageAssociationable
+
     friendly_attributes :id, :name, :description, :enabled, :parent_id, :domain_id
     alias :enabled? :enabled
 
@@ -8,19 +10,28 @@ module Yao::Resources
     self.resources_name = "projects"
     self.admin          = true
 
+    # @return [Bool]
     def domain?
       @data["is_domain"]
     end
 
+    # @return [Array<Yao::Resources::Server>]
     def servers
       @servers ||= Yao::Server.list(all_tenants: 1, project_id: id)
     end
 
+    # @return [Yao::Resources::Port]
     def ports
       @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
         as_member { self.list }
       end

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

@@ -1,17 +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
 
-      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,35 +1,41 @@
 require 'time'
 module Yao::Resources
   class Resource < Base
-    include TenantAssociationable
+    include ProjectAssociationable
 
     friendly_attributes :user_id, :resource_id,
                         :last_sample_timestamp, :first_sample_timestamp,
                         :metadata,
                         :links
 
+    # @return [String]
     def id
       resource_id
     end
 
+    # @return [Yao::User]
     def user
       @user ||= Yao::User.get(user_id)
     end
 
+    # @return [Date]
     def last_sampled_at
       Time.parse last_sample_timestamp
     end
 
+    # @return [Date]
     def first_sampled_at
       Time.parse first_sample_timestamp
     end
 
+    # @return [Array<Yao::Sample>]
     def get_meter(name)
       if link = links.find{|l| l["rel"] == name }
         Yao::Sample.list(link["href"])
       end
     end
 
+    # @return [Hash]
     def meters
       links.map{|l| l["rel"] }.delete_if{|n| n == 'self' }
     end
@@ -42,14 +48,14 @@ module Yao::Resources
       private
 
       # override Yao::Resources::RestfullyAccessible.resource_from_json
-      # @param [Hash]
+      # @param json [Hash]
       # @return [Yao::Resources::Resource]
       def resource_from_json(json)
         new(json)
       end
 
       # override Yao::Resources::RestfullyAccessible.resources_from_json
-      # @param [Hash]
+      # @param json [Hash]
       # @return [Yao::Resources::Resource]
       def resources_from_json(json)
         new(json)

data/lib/yao/resources/restfully_accessible.rb

@@ -15,41 +15,55 @@ module Yao::Resources
       end
     end
 
+    # @param name [String]
+    # @return
     def service=(name)
       @service = name
     end
     attr_reader :service
 
+    # @return [String]
     def api_version
       @api_version || ''
     end
 
+    # @param v [String]
+    # @return [String]
     def api_version=(v)
       raise("Set api_version after service is declared") unless service
       @api_version = v
       api_version
     end
 
+    # @param bool [Boolean]
+    # @return [Boolean]
     def admin=(bool)
       @admin = bool
     end
 
+    # @return [Boolean]
     def return_single_on_querying
       @return_single_on_querying
     end
 
+    # @param bool [Boolean]
+    # @return [Boolean]
     def return_single_on_querying=(bool)
       @return_single_on_querying = bool
     end
 
+    # @return [String]
     def resources_path
       @resources_path || resources_name
     end
 
+    # @param path [String]
+    # @return [String]
     def resources_path=(path)
       @resources_path = path.sub(%r!^\/!, "")
     end
 
+    # @return [Faraday::Connection]
     def client
       if @admin
         Yao.default_client.admin_pool[service]
@@ -58,6 +72,7 @@ module Yao::Resources
       end or raise "You do not have #{@admin ? 'admin' : 'public'} access to the #{service} service"
     end
 
+    # @param blk [Proc]
     def as_member(&blk)
       if @admin
         @admin = false
@@ -133,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
 
@@ -173,6 +188,7 @@ module Yao::Resources
       res = DELETE(create_url(id))
       res.body
     end
+    alias delete destroy
 
     private
 
@@ -223,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.rb

@@ -47,8 +47,8 @@ module Yao::Resources
       end
 
       # @param role_name [String]
-      # @param to: [String]
-      # @param on: [String]
+      # @param to [String]
+      # @param on [String]
       # @return [Faraday::Response]
       def grant(role_name, to:, on:)
         role   = Yao::Role.get(role_name)
@@ -64,8 +64,8 @@ module Yao::Resources
       end
 
       # @param role_name [String]
-      # @param from: [String]
-      # @param on: [String]
+      # @param from [String]
+      # @param on [String]
       # @return [Faraday::Response]
       def revoke(role_name, from:, on:)
         role   = Yao::Role.get(role_name)
@@ -88,6 +88,8 @@ module Yao::Resources
         client.url_prefix.to_s =~ /v2\.0/
       end
 
+      # @param tenant [String]
+      # @param user [String]
       def path_for_role_resource(tenant, user, role = nil)
         if api_version_v2?
           paths = ["tenants", tenant.id, "users", user.id, "roles"]

data/lib/yao/resources/role_assignment.rb

@@ -1,18 +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::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,32 +1,50 @@
 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)
     end
 
     class << self
+      # @param id [String]
+      # @param param [Hash]
+      # @return [Hash]
       def add_interface(id, param)
         PUT(['routers', id, 'add_router_interface.json'].join('/'), param.to_json)
       end
 
+      # @param id [String]
+      # @param param [Hash]
+      # @return [Hash]
       def remove_interface(id, param)
         PUT(['routers', id, 'remove_router_interface.json'].join('/'), param.to_json)
       end
-
-      def get_by_name(name)
-        self.list(name: name)
-      end
-      alias find_by_name get_by_name
     end
   end
 end

data/lib/yao/resources/sample.rb

@@ -4,18 +4,22 @@ module Yao::Resources
                         :source, :type, :unit, :volume,
                         :resource_id, :user_id
 
+    # @return [Date]
     def recorded_at
       Time.parse(self["recorded_at"])
     end
 
+    # @return [Date]
     def timestamp
       Time.parse(self["timestamp"])
     end
 
+    # @return [Yao::Resources::Resource]
     def resource
       @resource ||= Yao::Resource.get(resource_id)
     end
 
+    # @return [Yao::Resources::User]
     def user
       @user ||= Yao::User.get(user_id)
     end

data/lib/yao/resources/security_group.rb

@@ -1,10 +1,11 @@
 require 'yao/resources/security_group_rule'
 module Yao::Resources
   class SecurityGroup < Base
-    include TenantAssociationable
+    include ProjectAssociationable
 
     friendly_attributes :name, :description
 
+    # @return [Array<Yao::Resources::SecurityGroupRule>]
     def rules
       self[["rules", SecurityGroupRule].join("__")] ||= (case self.class.service
       when "compute"