yao 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d43c067685907e1e430dc8e003d9817fdf16f260
-  data.tar.gz: 80d85a73f095c4bcb7f4805cc7aa23e548c77493
+SHA256:
+  metadata.gz: 90d6e614a43f68cec261e6f44fa08445acfa614f0c3d940e6aaec21b17b874b7
+  data.tar.gz: 133aeb2173987b98cb8bdd16a47db04135e789be94f598a45853e19e4ffe0238
 SHA512:
-  metadata.gz: c3f5118243d9ed662b34e981dcd15f4889475eeab02b5cfcea86af12e5afe677b873f538cf4e628ca9546ca0b03fc10ad49e01df0f5a9d00194d579b1c683d11
-  data.tar.gz: 499c01244f7d5cda681ba5f0ad0baf68bbea8f9784d14a01630ef3d4cc8668ae2941509bf9de32bed2fa988c47861d8c667855cbc73150627f93a9120769389a
+  metadata.gz: 15f635d55f68d4f62f10335ec52046ad02bfb2ee3cbe3f6fbff75552b9d55f5b0cb8e876f19f51675538cbc286a9c02df6736356c1836173c93a822fc8f786ed
+  data.tar.gz: 07bec0d33bcb5565f774ed2a3d23d5525d2a594c46f6fb85c5ef5968af72cc2aedf49f13786b3aefae0a76993bcc29805dae60b4f8d0fe3f5aaf54861e3fd3e5

data/.rubocop.yml

@@ -0,0 +1,58 @@
+AllCops:
+  TargetRubyVersion: 2.4
+  DisplayCopNames: true
+  DisabledByDefault: true
+  Exclude:
+    - 'vendor/**/*'
+
+Style/HashSyntax:
+  Enabled: true
+
+Layout/EmptyLines:
+  Enabled: true
+
+Layout/TrailingBlankLines:
+  Enabled: true
+
+Layout/TrailingWhitespace:
+  Enabled: true
+
+Style/MethodDefParentheses:
+  Enabled: true
+
+# Generated by gry
+
+Layout/AccessModifierIndentation:
+  EnforcedStyle: indent
+  Enabled: true
+
+Layout/CaseIndentation:
+  EnforcedStyle: end
+  Enabled: true
+
+Style/Encoding:
+  Enabled: true
+
+Style/For:
+  EnforcedStyle: each
+  Enabled: true
+
+Style/FrozenStringLiteralComment:
+  EnforcedStyle: never
+  Enabled: true
+
+Layout/MultilineHashBraceLayout:
+  EnforcedStyle: symmetrical
+  Enabled: true
+
+Style/NumericLiteralPrefix:
+  EnforcedOctalStyle: zero_only
+  Enabled: true
+
+Style/StabbyLambdaParentheses:
+  EnforcedStyle: require_parentheses
+  Enabled: true
+
+Rails/ActionFilter:
+  EnforcedStyle: action
+  Enabled: true

data/.travis.yml

@@ -12,9 +12,14 @@ cache:
   directories: vendor/bundle
 
 script:
+  - bundle exec rubocop
   - bundle exec rake test
   - find lib -name '*.rb' | xargs -i ruby -wc {}
 
 notifications:
   slack:
     secure: XhJ3SUF4I7a+MleHLEokgNrqROeCiTfVGzVOwFCTqVETurarb0s4FA5MGWgu7C9MCkIAVFLATwgIZQ9lo9MWFujVTh4Qj+rOdjI08c2ehVxwPyGMXbvkvqMRzvBbJuswnrXuJGUzxdCCjea64cdiZxguDiODp+cfjtKGSB59aNZoMsgwqVTppGDyXAThqZx/l2UKYjzONbnuCI9T9wt+UWW8nAMDn5zSTLVqVyK4GXs2ofGXswQlHvc7VlPLkmHVGm0ywazCyct+lo/Y9x1ofOeHZJllLRc5wccLxciCJBLJDrm/28LHy1PoidR5TXNRjp5ioJGVMwqvsBY8z3OwD8XVv6CPPGRYnEsJVT90R9HJoQ5YFHX5sDeGVbHSaX63eK4W7bn8MxqvEuQF5XU86B2xpLFOTKMK7HRKYjbToRKGMolj+1zv65orHM2Ts0ZtCuwa41oiYkRLWzSc9UDODn67OF+pJlEEYouljsGfcRYcv7JJ2rhFnFXi/9uISxzQMsP4L8dwEEJHxSkaSwJBMJf/it5hD4m5oO0oBQ1DRd3qg2ljpLPuzuY+pW1/R1JY1Z/DA4Kw7dvr8R0DJmXdDiWI9EYilYcP8Wk5qYlJdDGLEUfL8I+tz+e67wAzpqm9okE4gNiJ4HsS2MtztXCJgoSkBJVvhoEE9SXsYNICAno=
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/Gemfile

@@ -4,3 +4,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'travis'
+gem 'rubocop'

data/lib/yao/auth.rb

@@ -2,9 +2,11 @@ require 'json'
 require 'time'
 
 require 'yao/token'
+require 'yao/tokenv3'
 
 module Yao
-  %i(tenant_name username password timeout client_cert client_key region_name).each do |name|
+  %i(tenant_name username password timeout client_cert client_key region_name
+     identity_api_version user_domain_id user_domain_name project_domain_id project_domain_name).each do |name|
     Yao.config.param name, nil
   end
 
@@ -16,21 +18,72 @@ module Yao
         end
       end
 
+      def build_authv3_info(tenant_name, username, password,
+                            user_domain_id, user_domain_name,
+                            project_domain_id, project_domain_name)
+          identity = {
+            methods: ["password"],
+            password: {
+              user: { name: username, password: password }
+            }
+          }
+          if user_domain_id
+            identity[:password][:user][:domain] = { id: user_domain_id }
+          elsif user_domain_name
+            identity[:password][:user][:domain] = { name: user_domain_name }
+          end
+
+          scope = {
+            project: { name: tenant_name }
+          }
+          if project_domain_id
+            scope[:project][:domain] = { id: project_domain_id }
+          elsif project_domain_name
+            scope[:project][:domain] = { name: project_domain_name }
+          end
+
+          {
+            auth: {
+              identity: identity,
+              scope: scope
+            }
+          }
+      end
+
+      def build_auth_info(tenant_name, username, password)
+          auth_info = {
+            auth: {
+              passwordCredentials: {
+                username: username, password: password
+              }
+            }
+          }
+          auth_info[:auth][:tenantName] = tenant_name if tenant_name
+
+          auth_info
+      end
+
       def new(
           tenant_name: Yao.config.tenant_name,
           username: Yao.config.username,
-          password: Yao.config.password
+          password: Yao.config.password,
+          identity_api_version: Yao.config.identity_api_version,
+          user_domain_id: Yao.config.user_domain_id,
+          user_domain_name: Yao.config.user_domain_name,
+          project_domain_id: Yao.config.project_domain_id,
+          project_domain_name: Yao.config.project_domain_name
       )
-        auth_info = {
-          auth: {
-            passwordCredentials: {
-              username: username, password: password
-            }
-          }
-        }
-        auth_info[:auth][:tenantName] = tenant_name if tenant_name
+        if identity_api_version.to_i == 3
+          auth_info = build_authv3_info(tenant_name, username, password,
+                                        user_domain_id, user_domain_name,
+                                        project_domain_id, project_domain_name)
+          issue = TokenV3.issue(Yao.default_client.default, auth_info)
+        else
+          auth_info = build_auth_info(tenant_name, username, password)
+          issue = Token.issue(Yao.default_client.default, auth_info)
+        end
 
-        return Token.issue(Yao.default_client.default, auth_info)
+        issue
       end
     end
   end

data/lib/yao/plugins/default_client_generator.rb

@@ -16,7 +16,7 @@ module Yao::Plugins
       f.request :read_only
 
       f.response :os_error_detector
-      f.response :json, :content_type => /\bjson$/
+      f.response :json, content_type: /\bjson$/
 
       if Yao.config.debug
         f.response :logger

data/lib/yao/resources/image.rb

@@ -2,8 +2,8 @@ require 'yao/resources/metadata_available'
 module Yao::Resources
   class Image < Base
     friendly_attributes :name, :status, :progress, :metadata
-    map_attribute_to_attribute :minDisk => :min_disk
-    map_attribute_to_attribute :minRam  => :min_ram
+    map_attribute_to_attribute minDisk: :min_disk
+    map_attribute_to_attribute minRam: :min_ram
 
     def size(unit=nil)
       size = self["OS-EXT-IMG-SIZE:size"]

data/lib/yao/resources/loadbalancer.rb

@@ -1,34 +1,33 @@
 module Yao::Resources
   class LoadBalancer < Base
     friendly_attributes :provider, :description, :admin_state_up, :provisioning_status,
-                        :pools, :vip_address,
-                        :operationg_status, :name
+                        :vip_address, :operationg_status, :name
+
+    map_attribute_to_resources listeners: LoadBalancerListener
+    map_attribute_to_resources pools: LoadBalancerListener
 
     def project
-      Yao::Tenant.find self["project_id"]
+      if project_id = self["project_id"]
+        Yao::Tenant.find project_id
+      end
     end
+    alias :tenant :project
 
     def vip_network
-      Yao::Network.find self["vip_network_id"]
+      if vip_network_id = self["vip_network_id"]
+        Yao::Network.find vip_network_id
+      end
     end
 
     def vip_port
-      Yao::Port.find self["vip_port_id"]
-    end
-
-    def vip_subnet
-      Yao::Subnet.find self["vip_subnet_id"]
-    end
-
-    def listeners
-      self["listeners"].map do |listener|
-        Yao::LoadBalancerListener.find listener["id"]
+      if vip_port_id = self["vip_port_id"]
+        Yao::Port.find vip_port_id
       end
     end
 
-    def pools
-      self["pools"].map do |pool|
-        Yao::LoadBalancerPool.find pool["id"]
+    def vip_subnet
+      if vip_subnet_id = self["vip_subnet_id"]
+        Yao::Subnet.find vip_subnet_id
       end
     end
 

data/lib/yao/resources/loadbalancer_healthmonitor.rb

@@ -5,11 +5,22 @@ module Yao::Resources
                         :http_method, :timeout, :max_retries_down,
                         :url_path, :type, :operating_status
 
-    def pools
-      self["pools"].map do |pool|
-        Yao::LoadBalancerPool.find pool["id"]
+    map_attribute_to_resources pools: LoadBalancerListener
+
+    def created_at
+      Date.parse(self["created_at"])
+    end
+
+    def updated_at
+      Date.parse(self["updated_at"])
+    end
+
+    def project
+      if project_id = self["project_id"]
+        Yao::Tenant.find project_id
       end
     end
+    alias :tenant :project
 
     self.service        = "load-balancer"
     self.api_version    = "v2.0"

data/lib/yao/resources/loadbalancer_listener.rb

@@ -6,18 +6,19 @@ module Yao::Resources
                         :operating_status, :sni_container_refs,
                         :l7policies, :name
 
-    def project
-      Yao::Tenant.find self["project_id"]
-    end
+    map_attribute_to_resources loadbalancers: LoadBalancer
 
-    def loadbalancers
-      self["loadbalancers"].map do |loadbalancer|
-        Yao::LoadBalancer.get loadbalancer["id"]
+    def project
+      if project_id = self["project_id"]
+        Yao::Tenant.find project_id
       end
     end
+    alias :tenant :project
 
     def default_pool
-      Yao::LoadBalancerPool.find self["default_pool_id"]
+      if default_pool_id = self["default_pool_id"]
+        Yao::LoadBalancerPool.find default_pool_id
+      end
     end
     alias pool default_pool
 

data/lib/yao/resources/loadbalancer_pool.rb

@@ -2,12 +2,17 @@ module Yao::Resources
   class LoadBalancerPool < Base
     friendly_attributes :lb_algorithm, :protocol, :description,
                         :admin_state_up, :provisioning_status,
-                        :session_persistence, :operating_status, :name,
+                        :session_persistence, :operating_status, :name
 
-    def loadbalancers
-      self["loadbalancers"].map do |loadbalancer|
-        Yao::LoadBalancer.find loadbalancer["id"]
-      end
+    map_attribute_to_resources loadbalancers: LoadBalancer
+    map_attribute_to_resources listeners: LoadBalancerListener
+
+    def created_at
+      Date.parse(self["created_at"])
+    end
+
+    def updated_at
+      Date.parse(self["updated_at"])
     end
 
     def listeners
@@ -17,8 +22,11 @@ module Yao::Resources
     end
 
     def project
-      Yao::Tenant.find self["project_id"]
+      if project_id = self["project_id"]
+        Yao::Tenant.find project_id
+      end
     end
+    alias :tenant :project
 
     def members
       self["members"].map do |member|
@@ -27,7 +35,9 @@ module Yao::Resources
     end
 
     def healthmonitor
-      Yao::LoadBalancerHealthMonitor.find self["healthmonitor_id"]
+      if healthmonitor_id = self["healthmonitor_id"]
+        Yao::LoadBalancerHealthMonitor.find healthmonitor_id
+      end
     end
 
     self.service        = "load-balancer"

data/lib/yao/resources/loadbalancer_pool_member.rb

@@ -6,11 +6,16 @@ module Yao::Resources
                         :protocol_port, :operating_status
 
     def project
-      Yao::Tenant.find self["project_id"]
+      if project_id = self["project_id"]
+        Yao::Tenant.find project_id
+      end
     end
+    alias :tenant :project
 
     def subnet
-      Yao::Subnet.find self["subnet_id"]
+      if subnet_id = self["subnet_id"]
+        Yao::Subnet.find subnet_id
+      end
     end
 
     self.service        = "load-balancer"

data/lib/yao/resources/restfully_accessible.rb

@@ -84,16 +84,22 @@ module Yao::Resources
       end
     end
 
-    def get(id_or_permalink, query={})
-      res = if id_or_permalink =~ /^https?:\/\//
+    def get(id_or_name_or_permalink, query={})
+      res = if id_or_name_or_permalink =~ /^https?:\/\//
               GET(id_or_permalink, query)
+            elsif uuid?(id_or_name_or_permalink)
+              GET([resources_path, id_or_name_or_permalink].join("/"), query)
             else
-              GET([resources_path, id_or_permalink].join("/"), query)
+              find_by_name(id_or_name_or_permalink, query)
             end
       return_resource(resource_from_json(res.body))
     end
     alias find get
 
+    def find_by_name(name, query={})
+      list(query.merge({"name" => name}))
+    end
+
     def create(resource_params)
       params = {
         resource_name_in_json => resource_params
@@ -142,5 +148,9 @@ module Yao::Resources
     def return_resources(arr)
       arr.map{|d| return_resource(d) }
     end
+
+    def uuid?(str)
+      /^[\da-f]{8}-([\da-f]{4}-){3}[\da-f]{12}$/ === str
+    end
   end
 end

data/lib/yao/resources/role_assignment.rb

@@ -12,7 +12,7 @@ module Yao::Resources
       @project ||= Yao::Tenant.get(scope["project"]["id"])
     end
 
-    map_attribute_to_resource  :role => Role
-    map_attribute_to_resource  :user => User
+    map_attribute_to_resource  role: Role
+    map_attribute_to_resource  user: User
   end
 end

data/lib/yao/resources/server.rb

@@ -4,10 +4,10 @@ module Yao::Resources
   class Server < Base
     friendly_attributes :addresses, :metadata, :name, :progress,
                         :status, :tenant_id, :user_id, :key_name
-    map_attribute_to_attribute :hostId => :host_id
-    map_attribute_to_resource  :flavor => Flavor
-    map_attribute_to_resource  :image  => Image
-    map_attribute_to_resources :security_groups => SecurityGroup
+    map_attribute_to_attribute hostId: :host_id
+    map_attribute_to_resource  flavor: Flavor
+    map_attribute_to_resource  image: Image
+    map_attribute_to_resources security_groups: SecurityGroup
 
     map_attribute_to_attribute 'OS-EXT-AZ:availability_zone'         => :availability_zone
     map_attribute_to_attribute 'OS-DCF:diskConfig'                   => :dcf_disk_config

data/lib/yao/tokenv3.rb

@@ -0,0 +1,72 @@
+require 'yao/client'
+
+module Yao
+  class TokenV3
+    def self.issue(cli, auth_info)
+      t = new(auth_info)
+      t.refresh(cli)
+      t
+    end
+
+    def initialize(auth_info, token_data=nil)
+      @auth_info = auth_info
+
+      @endpoints = {}
+    end
+    attr_accessor :auth_info, :token, :issued_at, :expire_at, :endpoints
+    alias expires expire_at
+    alias to_s token
+
+    def register(response)
+      @token = response.headers["X-Subject-Token"]
+
+      token_data = response.body["token"]
+      @issued_at = Time.parse(token_data["issued_at"]).localtime
+      @expire_at = Time.parse(token_data["expires_at"]).localtime
+      Yao.current_tenant_id token_data["project"]["id"]
+    end
+
+    def expired?
+      return true unless self.expire_at
+      Time.now >= self.expire_at
+    end
+
+    def refresh(cli)
+      @endpoints.clear
+
+      res = cli.post("#{Yao.config.auth_url}/auth/tokens") do |req|
+        req.body = auth_info.to_json
+        req.headers['Content-Type'] = 'application/json'
+      end
+
+      register(res)
+      register_endpoints(res.body["token"]["catalog"])
+      self
+    end
+
+    def register_endpoints(_endpoints)
+      return unless _endpoints
+
+      _endpoints.each do |endpoint_data|
+        type = endpoint_data["type"]
+        region_name = Yao.config.region_name ? Yao.config.region_name : 'RegionOne'
+        endpoints = endpoint_data["endpoints"].select { |ep| ep.has_value?(region_name) }
+        urls = {}
+        endpoints.each do |ep|
+          name = "#{ep["interface"]}_url".to_sym
+          urls[name] = ep["url"]
+        end
+        @endpoints[type] = urls
+      end
+
+      Yao.default_client.register_endpoints(@endpoints, token: self)
+    end
+  end
+
+  def self.current_tenant_id(id=nil)
+    if id
+      @__tenant_id = id
+    end
+    @__tenant_id
+  end
+end

data/lib/yao/version.rb

@@ -1,3 +1,3 @@
 module Yao
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

data/test/config.rb

@@ -4,6 +4,7 @@ require 'power_assert'
 require 'yao'
 
 require 'support/auth_stub'
+require 'support/authv3_stub'
 
 require 'webmock/test_unit'
 

data/test/support/auth_stub.rb

@@ -4,9 +4,9 @@ module AuthStub
       .with(
         body: auth_json(username, password, tenant)
       ).to_return(
-        :status => 200,
-        :body => response_json(auth_url, username, tenant),
-        :headers => {'Content-Type' => 'application/json'}
+        status: 200,
+        body: response_json(auth_url, username, tenant),
+        headers: {'Content-Type' => 'application/json'}
       )
   end
 

data/test/support/authv3_stub.rb

@@ -0,0 +1,308 @@
+module AuthV3Stub
+  def stub_auth_request(auth_url, username, password, tenant, user_domain_name, project_domain_name)
+    stub_request(:post, "#{auth_url}/auth/tokens")
+      .with(
+        body: auth_json(username, password, tenant, user_domain_name, project_domain_name)
+      ).to_return(
+        status: 200,
+        body: response_json(auth_url, username, tenant, user_domain_name, project_domain_name),
+        headers: {
+          'Content-Type' => 'application/json',
+          'X-Subject-Token' => 'aaaa166533fd49f3b11b1cdce2430000'
+        }
+      )
+  end
+
+  private
+
+  def auth_json(username, password, tenant, user_domain_name, project_domain_name)
+    json = <<-JSON
+{"auth":{"identity":{"methods":["password"],"password":{"user":{"name":"#{username}","password":"XXXXXXXX","domain":{"name":"#{user_domain_name}"}}}},"scope":{"project":{"name":"#{tenant}","domain":{"name":"#{project_domain_name}"}}}}}
+    JSON
+
+    json.strip
+  end
+
+  def response_json(auth_url, username, tenant, user_domain_name, project_domain_name)
+    <<-JSON
+{
+  "token": {
+    "methods": ["password"],
+    "roles": [{
+      "id": "aaaa166533fd49f3b11b1cdce2430000",
+      "name": "admin"
+    }],
+    "issued_at": "#{Time.now.iso8601}",
+    "expires_at": "#{(Time.now + 3600).utc.iso8601}",
+    "project": {
+      "domain": {
+        "id": "aaaa166533fd49f3b11b1cdce2430000",
+        "name": "#{project_domain_name}"
+      },
+      "id": "aaaa166533fd49f3b11b1cdce2430000",
+      "name": "#{project_domain_name}"
+    },
+    "catalog": [
+      {
+        "endpoints": [
+          {
+            "region_id": "RegionOne",
+            "url": "http://nova-endpoint.example.com:8774/v2/b598bf98671c47e1b955f8c9660e3c44",
+            "region": "RegionOne",
+            "interface": "internal",
+            "id": "1a66e6af97c440b2a7bbc4f9735923d9"
+          },
+          {
+            "region_id": "RegionOne",
+            "url": "http://nova-endpoint.example.com:8774/v2/b598bf98671c47e1b955f8c9660e3c44",
+            "region": "RegionOne",
+            "interface": "public",
+            "id": "1a66e6af97c440b2a7bbc4f9735923d9"
+          },
+          {
+            "region_id": "RegionOne",
+            "url": "http://nova-endpoint.example.com:8774/v2/b598bf98671c47e1b955f8c9660e3c44",
+            "region": "RegionOne",
+            "interface": "admin",
+            "id": "1a66e6af97c440b2a7bbc4f9735923d9"
+          },
+          {
+            "region_id": "RegionTest",
+            "url": "http://global-endpoint.example.com:8774/v2/b598bf98671c47e1b955f8c9660e3c44",
+            "region": "RegionTest",
+            "interface": "internal",
+            "id": "1a66e6af97c440b2a7bbc4f9735923d9"
+          },
+          {
+            "region_id": "RegionTest",
+            "url": "http://global-endpoint.example.com:8774/v2/b598bf98671c47e1b955f8c9660e3c44",
+            "region": "RegionTest",
+            "interface": "public",
+            "id": "1a66e6af97c440b2a7bbc4f9735923d9"
+          },
+          {
+            "region_id": "RegionTest",
+            "url": "http://global-endpoint.example.com:8774/v2/b598bf98671c47e1b955f8c9660e3c44",
+            "region": "RegionTest",
+            "interface": "admin",
+            "id": "1a66e6af97c440b2a7bbc4f9735923d9"
+          }
+        ],
+        "type": "compute",
+        "id": "a226b3eeb5594f50bf8b6df94636ed28",
+        "name": "nova"
+      },
+      {
+        "endpoints": [
+          {
+            "region_id": "RegionOne",
+            "url": "http://neutron-endpoint.example.com:9696/",
+            "region": "RegionOne",
+            "interface": "internal",
+            "id": "0418104da877468ca65d739142fa3454"
+          },
+          {
+            "region_id": "RegionOne",
+            "url": "http://neutron-endpoint.example.com:9696/",
+            "region": "RegionOne",
+            "interface": "public",
+            "id": "0418104da877468ca65d739142fa3454"
+          },
+          {
+            "region_id": "RegionTest",
+            "url": "http://global-endpoint.example.com:9696/",
+            "region": "RegionTest",
+            "interface": "admin",
+            "id": "0418104da877468ca65d739142fa3454"
+          },
+          {
+            "region_id": "RegionTest",
+            "url": "http://global-endpoint.example.com:9696/",
+            "region": "RegionTest",
+            "interface": "internal",
+            "id": "0418104da877468ca65d739142fa3454"
+          },
+          {
+            "region_id": "RegionTest",
+            "url": "http://global-endpoint.example.com:9696/",
+            "region": "RegionTest",
+            "interface": "public",
+            "id": "0418104da877468ca65d739142fa3454"
+          },
+          {
+            "region_id": "RegionTest",
+            "url": "http://global-endpoint.example.com:9696/",
+            "region": "RegionTest",
+            "interface": "admin",
+            "id": "0418104da877468ca65d739142fa3454"
+          }
+        ],
+        "type": "network",
+        "id": "67b993549db94296a853d635b48db3c9",
+        "name": "neutron"
+      },
+      {
+        "endpoints": [
+          {
+            "region_id": "RegionOne",
+            "url": "http://glance-endpoint.example.com:9292",
+            "region": "RegionOne",
+            "interface": "internal",
+            "id": "246f33509ff64802b86eb081307ecec0"
+          },
+          {
+            "region_id": "RegionOne",
+            "url": "http://glance-endpoint.example.com:9292",
+            "region": "RegionOne",
+            "interface": "public",
+            "id": "246f33509ff64802b86eb081307ecec0"
+          },
+          {
+            "region_id": "RegionOne",
+            "url": "http://glance-endpoint.example.com:9292",
+            "region": "RegionOne",
+            "interface": "admin",
+            "id": "246f33509ff64802b86eb081307ecec0"
+          },
+          {
+            "region_id": "RegionTest",
+            "url": "http://global-endpoint.example.com:9292",
+            "region": "RegionTest",
+            "interface": "internal",
+            "id": "246f33509ff64802b86eb081307ecec0"
+          },
+          {
+            "region_id": "RegionTest",
+            "url": "http://global-endpoint.example.com:9292",
+            "region": "RegionTest",
+            "interface": "public",
+            "id": "246f33509ff64802b86eb081307ecec0"
+          },
+          {
+            "region_id": "RegionTest",
+            "url": "http://global-endpoint.example.com:9292",
+            "region": "RegionOne",
+            "interface": "admin",
+            "id": "246f33509ff64802b86eb081307ecec0"
+          }
+        ],
+        "type": "image",
+        "id": "d512f8860c0f45cf99b1c3cef86cfd97",
+        "name": "glance"
+      },
+      {
+        "endpoints": [
+          {
+            "region_id": "RegionOne",
+            "url": "http://endpoint.example.com:5000/v2.0",
+            "region": "RegionOne",
+            "interface": "internal",
+            "id": "2b982236cc084128bf42b647c1b7fb49"
+          },
+          {
+            "region_id": "RegionOne",
+            "url": "http://endpoint.example.com:5000/v2.0",
+            "region": "RegionOne",
+            "interface": "public",
+            "id": "2b982236cc084128bf42b647c1b7fb49"
+          },
+          {
+            "region_id": "RegionOne",
+            "url": "#{auth_url}",
+            "region": "RegionOne",
+            "interface": "admin",
+            "id": "2b982236cc084128bf42b647c1b7fb49"
+          },
+          {
+            "region_id": "RegionTest",
+            "url": "https://global-endpoint.example.com/api/keystone/",
+            "region": "RegionTest",
+            "interface": "internal",
+            "id": "2b982236cc084128bf42b647c1b7fb49"
+          },
+          {
+            "region_id": "RegionTest",
+            "url": "https://global-endpoint.example.com/api/keystone/",
+            "region": "RegionTest",
+            "interface": "public",
+            "id": "2b982236cc084128bf42b647c1b7fb49"
+          },
+          {
+            "region_id": "RegionTest",
+            "url": "https://global-endpoint.example.com/api/admin/keystone/",
+            "region": "RegionTest",
+            "interface": "admin",
+            "id": "2b982236cc084128bf42b647c1b7fb49"
+          }
+        ],
+        "type": "identity",
+        "id": "050726f278654128aba89757ae25950c",
+        "name": "keystone"
+      },
+      {
+        "endpoints": [
+          {
+            "region_id": "RegionOne",
+            "internalurl": "http://octavia-endpoint.example.com:9876",
+            "region": "RegionOne",
+            "interface": "internal",
+            "id": "bde3abca8864400a809f0089f025370a"
+          },
+          {
+            "region_id": "RegionOne",
+            "internalurl": "http://octavia-endpoint.example.com:9876",
+            "region": "RegionOne",
+            "interface": "public",
+            "id": "bde3abca8864400a809f0089f025370a"
+          },
+          {
+            "region_id": "RegionOne",
+            "internalurl": "http://octavia-endpoint.example.com:9876",
+            "region": "RegionOne",
+            "interface": "admin",
+            "id": "bde3abca8864400a809f0089f025370a"
+          },
+          {
+            "region_id": "RegionTest",
+            "internalurl": "http://global-endpoint.example.com:9876",
+            "region": "RegionTest",
+            "interface": "internal",
+            "id": "bde3abca8864400a809f0089f025370a"
+          },
+          {
+            "region_id": "RegionTest",
+            "internalurl": "http://global-endpoint.example.com:9876",
+            "region": "RegionTest",
+            "interface": "public",
+            "id": "bde3abca8864400a809f0089f025370a"
+          },
+          {
+            "region_id": "RegionTest",
+            "internalurl": "http://global-endpoint.example.com:9876",
+            "region": "RegionTest",
+            "interface": "admin",
+            "id": "bde3abca8864400a809f0089f025370a"
+          }
+        ],
+        "type": "load-balancer",
+        "id": "a5f7070bda40443fa3819fbdf1689af1",
+        "name": "octavia"
+      }
+    ],
+    "user": {
+      "domain": {
+        "id": "a9994b2dee82423da7da572397d3157a",
+        "name": "#{user_domain_name}"
+      },
+      "name": "#{username}",
+      "id": "a9994b2dee82423da7da572397d3157a",
+      "name": "#{username}"
+    },
+    "audit_ids": [
+      "3t2dc1cgqxyjshddu1xkcw"
+    ]
+  }
+}
+    JSON
+  end
+end

data/test/yao/resources/test_loadbalancer.rb

@@ -14,7 +14,7 @@ class TestRole < Test::Unit::TestCase
       "updated_at" => "2017-02-28T00:43:30",
     }
 
-    lb = Yao::LoadBalancer.new(params)
+    lb = Yao::Resources::LoadBalancer.new(params)
     assert_equal(lb.provider, "octavia")
     assert_equal(lb.description, "greate loadbalancer")
     assert_equal(lb.admin_state_up, true)

data/test/yao/resources/test_loadbalancer_healthmonitor.rb

@@ -17,9 +17,9 @@ class TestRole < Test::Unit::TestCase
       "url_path" => "/",
       "type" => "HTTP",
       "operating_status" => "ONLINE"
-    } 
+    }
 
-    healthmonitor = Yao::LoadBalancerHealthMonitor.new(params)
+    healthmonitor = Yao::Resources::LoadBalancerHealthMonitor.new(params)
     assert_equal(healthmonitor.name, "super-pool-health-monitor")
     assert_equal(healthmonitor.admin_state_up, true)
     assert_equal(healthmonitor.created, Time.parse("2017-05-11T23:53:47"))

data/test/yao/resources/test_loadbalancer_listener.rb

@@ -29,7 +29,7 @@ class TestRole < Test::Unit::TestCase
       "name" => "great_tls_listener"
     }
 
-    listener = Yao::LoadBalancerListener.new(params)
+    listener = Yao::Resources::LoadBalancerListener.new(params)
     assert_equal(listener.description, "A great TLS listener")
     assert_equal(listener.admin_state_up, true)
     assert_equal(listener.protocol, "TERMINATED_HTTPS")

data/test/yao/resources/test_loadbalancer_pool.rb

@@ -18,7 +18,7 @@ class TestRole < Test::Unit::TestCase
       "name" => "round_robin_pool"
     }
 
-    pool = Yao::LoadBalancerPool.new(params)
+    pool = Yao::Resources::LoadBalancerPool.new(params)
     assert_equal(pool.lb_algorithm, "ROUND_ROBIN")
     assert_equal(pool.protocol, "HTTP")
     assert_equal(pool.description, "My round robin pool")

data/test/yao/resources/test_loadbalancer_pool_member.rb

@@ -16,7 +16,7 @@ class TestRole < Test::Unit::TestCase
       "operating_status" => "NO_MONITOR"
     }
 
-    member = Yao::LoadBalancerPoolMember.new(params)
+    member = Yao::Resources::LoadBalancerPoolMember.new(params)
     assert_equal(member.monitor_port, 8080)
     assert_equal(member.name, "web-server-1")
     assert_equal(member.weight, 20)

data/test/yao/resources/test_restfully_accessible.rb

@@ -0,0 +1,26 @@
+class TestRestfullyAccesible < Test::Unit::TestCase
+  include Yao::Resources::RestfullyAccessible
+
+  def test_get
+    mock(self).find_by_name("dummy", {}) { Struct.new(:body).new("dummy") }
+    mock(self).resource_from_json("dummy") { "dummy" }
+    mock(self).return_resource("dummy") { "dummy" }
+
+    get("dummy")
+    RR.verify
+  end
+
+  def test_find_by_name
+    mock(self).list({"name" => "dummy"}) { "dummy" }
+
+    assert_equal(find_by_name("dummy"), "dummy")
+  end
+
+  def test_uuid?
+    assert_equal(uuid?("00112233-4455-6677-8899-aabbccddeeff"), true)
+
+    # not uuid
+    assert_equal(uuid?("dummy resource"), false)
+    assert_equal(uuid?("00112233445566778899aabbccddeeff"), false)
+  end
+end

data/test/yao/test_auth.rb

@@ -87,4 +87,10 @@ class TestAuth < Test::Unit::TestCase
     end
   end
 
+  def test_build_auth_info
+    auth_info = Yao::Auth.build_auth_info("example", "udzura", "XXXXXXXX")
+    assert { auth_info[:auth][:tenantName] == "example" }
+    assert { auth_info[:auth][:passwordCredentials][:username] == "udzura" }
+    assert { auth_info[:auth][:passwordCredentials][:password] == "XXXXXXXX" }
+  end
 end

data/test/yao/test_authv3.rb

@@ -0,0 +1,121 @@
+class TestAuthV3 < Test::Unit::TestCase
+  include AuthV3Stub
+
+  def setup
+    @auth_url = "http://endpoint.example.com:12345/v3"
+    username = "udzura"
+    tenant   = "example"
+    password = "XXXXXXXX"
+    identity_api_version = "3"
+    user_domain_name = "default"
+    project_domain_name = "default"
+
+    stub_auth_request(@auth_url, username, password, tenant, user_domain_name, project_domain_name)
+
+    Yao.config.set :auth_url, @auth_url
+    @token = Yao::Auth.new(tenant_name: tenant, username: username, password: password,
+                           identity_api_version: identity_api_version,
+                           user_domain_name: user_domain_name, project_domain_name: project_domain_name)
+  end
+
+  def teardown
+    Yao.configure do
+      endpoints            nil
+      identity_api_version nil
+    end
+  end
+
+  def test_auth_successful
+    cli = Yao.default_client.pool["default"]
+    assert { cli.url_prefix.to_s == "http://endpoint.example.com:12345/v3" }
+  end
+
+  def test_service_sclients_initialized
+    %w(compute network image identity).each do |service|
+      cli = Yao.default_client.pool[service]
+      assert { !cli.nil? }
+    end
+  end
+
+  def test_nova_tenant_logged_in
+    tenant_id = "b598bf98671c47e1b955f8c9660e3c44"
+    cli = Yao.default_client.compute
+    assert { cli.url_prefix.to_s == "http://nova-endpoint.example.com:8774/v2/#{tenant_id}" }
+  end
+
+  def test_neutron_prefix_added
+    cli = Yao.default_client.network
+    assert { cli.url_prefix.to_s == "http://neutron-endpoint.example.com:9696/v2.0" }
+  end
+
+  def test_token_is_valid
+    assert { @token.token == "aaaa166533fd49f3b11b1cdce2430000" }
+    assert { @token.expire_at - @token.issued_at == 3600 }
+    assert { @token.endpoints.size == 5 }
+  end
+
+  def test_hooked_by_configure_block
+    auth = Yao::Auth
+    stub(auth).new
+
+    Yao.configure do
+      auth_url             "http://endpoint.example.com:12345/v2.0"
+      tenant_name          "example"
+      username             "udzura"
+      password             "XXXXXXXX"
+      identity_api_version "3"
+      user_domain_name     "default"
+      project_domain_name  "default"
+    end
+    assert_received(auth) {|a| a.new }
+  end
+
+  def test_override_endpoint
+    Yao.configure do
+      auth_url             "http://endpoint.example.com:12345/v3"
+      tenant_name          "example"
+      username             "udzura"
+      password             "XXXXXXXX"
+      identity_api_version "3"
+      user_domain_name     "default"
+      project_domain_name  "default"
+      endpoints ({ identity: { public: "http://override-endpoint.example.com:35357/v3.0" } })
+    end
+    assert { Yao.default_client.pool["identity"].url_prefix.to_s == "http://override-endpoint.example.com:35357/v3.0" }
+  end
+
+  def test_region
+    Yao.configure do
+      auth_url             "http://endpoint.example.com:12345/v3"
+      tenant_name          "example"
+      username             "udzura"
+      password             "XXXXXXXX"
+      identity_api_version "3"
+      user_domain_name     "default"
+      project_domain_name  "default"
+      region_name          "RegionTest"
+    end
+    assert { Yao.default_client.pool["identity"].url_prefix.to_s == "https://global-endpoint.example.com/api/keystone/" }
+  ensure
+    Yao.configure do
+      region_name "RegionOne"
+    end
+  end
+
+  def test_build_authv3_info
+    auth_info = Yao::Auth.build_authv3_info("example", "udzura", "XXXXXXXX", "default", nil, "default", nil)
+
+    user = auth_info[:auth][:identity][:password][:user]
+    assert { user[:name] == "udzura" }
+    assert { user[:password] == "XXXXXXXX" }
+    assert { user[:domain][:id] == "default" }
+
+    project = auth_info[:auth][:scope][:project]
+    assert { project[:name] == "example" }
+    assert { project[:domain][:id] == "default" }
+
+    auth_info = Yao::Auth.build_authv3_info("example", "udzura", "XXXXXXXX", nil, "default", nil, "default")
+    assert { auth_info[:auth][:identity][:password][:user][:domain][:name] == "default" }
+    assert { auth_info[:auth][:scope][:project][:domain][:name] == "default" }
+  end
+end

data/test/yao/test_client_plugin.rb

@@ -21,7 +21,7 @@ class TestClientPlugin < Test::Unit::TestCase
 
   class ::Yao::Plugins::TestCustomClientGenerator
     def call(f, t)
-      f.response :xml, :content_type => /\/xml$/
+      f.response :xml, content_type: /\/xml$/
     end
     ::Yao::Plugins.register self, type: :client_generator, name: :test_custom
   end

data/test/yao/test_tokenv3.rb

@@ -0,0 +1,108 @@
+class TestTokenV3 < Test::Unit::TestCase
+  include AuthV3Stub
+
+  class TestResponse
+    attr :headers, :body
+
+    def initialize
+      @headers = Hash.new
+      @body    = Hash.new
+    end
+  end
+
+  def setup
+    stub(Yao.config).debug { false }
+    stub(Yao.config).debug_record_response { false }
+  end
+
+  def test_expired
+    t = Yao::TokenV3.new({})
+    r = TestResponse.new
+    r.headers["X-Subject-Token"] = "aaaa166533fd49f3b11b1cdce2430000"
+    r.body["token"] = {
+      "issued_at"  => Time.now.iso8601,
+      "expires_at" => (Time.now - 3600).utc.iso8601,
+      "project"    => {
+        "id" => "aaaa166533fd49f3b11b1cdce2430000"
+      }
+    }
+    t.register(r)
+
+    assert { t.expired? }
+
+    r.body["token"] = {
+      "issued_at"  => Time.now.iso8601,
+      "expires_at" => (Time.now + 3600).utc.iso8601,
+      "project"    => {
+        "id" => "aaaa166533fd49f3b11b1cdce2430000"
+      }
+    }
+    t.register(r)
+    assert { ! t.expired? }
+  end
+
+  def test_refresh
+    auth_url             = "http://endpoint.example.com:12345/v3"
+    username             = "udzura"
+    tenant               = "example"
+    password             = "XXXXXXXX"
+    identity_api_version = 3
+    user_domain_name     = "default"
+    project_domain_name  = "default"
+
+    auth_info = {
+      auth: {
+        identity: {
+          methods: ["password"],
+          password: {
+            user: {
+              name: username, password: password,
+              domain: { name: user_domain_name },
+            }
+          }
+        },
+        scope: {
+          project: {
+            name: tenant,
+            domain: { name: project_domain_name },
+          }
+        }
+      }
+    }
+    t = Yao::TokenV3.new(auth_info)
+    r = TestResponse.new
+    r.headers["X-Subject-Token"] = "old_token"
+    r.body["token"] = {
+      "issued_at"  => Time.now.iso8601,
+      "expires_at" => (Time.now - 3600).utc.iso8601,
+      "project"    => {
+        "id" => "aaaa166533fd49f3b11b1cdce2430000"
+      }
+    }
+    t.register(r)
+    assert { t.token == "old_token" }
+
+    stub_auth_request(auth_url, username, password, tenant, user_domain_name, project_domain_name)
+
+    Yao.config.auth_url auth_url
+    t.refresh(Yao.default_client.default)
+
+    assert { t.token == "aaaa166533fd49f3b11b1cdce2430000" }
+  end
+
+  def test_current_tenant_id
+    t = Yao::TokenV3.new({})
+    r = TestResponse.new
+    r.headers["X-Subject-Token"] = "aaaa166533fd49f3b11b1cdce2430000"
+    r.body["token"] = {
+      "issued_at"  => Time.now.iso8601,
+      "expires_at" => (Time.now - 3600).utc.iso8601,
+      "project"    => {
+        "id" => "aaaa166533fd49f3b11b1cdce2430000"
+      }
+    }
+    t.register(r)
+
+    assert { Yao.current_tenant_id == "aaaa166533fd49f3b11b1cdce2430000" }
+  end
+end

data/yao.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'yao/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yao
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Uchio, KONDO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -158,6 +158,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -210,11 +211,13 @@ files:
 - lib/yao/resources/user.rb
 - lib/yao/setup.rb
 - lib/yao/token.rb
+- lib/yao/tokenv3.rb
 - lib/yao/version.rb
 - test/config.rb
 - test/fixtures/dummy.key
 - test/fixtures/dummy.pem
 - test/support/auth_stub.rb
+- test/support/authv3_stub.rb
 - test/yao/resources/test_aggregates.rb
 - test/yao/resources/test_base.rb
 - test/yao/resources/test_hypervisor.rb
@@ -223,17 +226,20 @@ files:
 - test/yao/resources/test_loadbalancer_listener.rb
 - test/yao/resources/test_loadbalancer_pool.rb
 - test/yao/resources/test_loadbalancer_pool_member.rb
+- test/yao/resources/test_restfully_accessible.rb
 - test/yao/resources/test_role.rb
 - test/yao/resources/test_security_group.rb
 - test/yao/resources/test_security_group_rule.rb
 - test/yao/resources/test_user.rb
 - test/yao/test_auth.rb
+- test/yao/test_authv3.rb
 - test/yao/test_client.rb
 - test/yao/test_client_plugin.rb
 - test/yao/test_config.rb
 - test/yao/test_read_only.rb
 - test/yao/test_server_error.rb
 - test/yao/test_token.rb
+- test/yao/test_tokenv3.rb
 - yao-logo.png
 - yao.gemspec
 homepage: https://github.com/yaocloud/yao
@@ -256,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Yet Another OpenStack API Wrapper that rocks!!
@@ -265,6 +271,7 @@ test_files:
 - test/fixtures/dummy.key
 - test/fixtures/dummy.pem
 - test/support/auth_stub.rb
+- test/support/authv3_stub.rb
 - test/yao/resources/test_aggregates.rb
 - test/yao/resources/test_base.rb
 - test/yao/resources/test_hypervisor.rb
@@ -273,14 +280,17 @@ test_files:
 - test/yao/resources/test_loadbalancer_listener.rb
 - test/yao/resources/test_loadbalancer_pool.rb
 - test/yao/resources/test_loadbalancer_pool_member.rb
+- test/yao/resources/test_restfully_accessible.rb
 - test/yao/resources/test_role.rb
 - test/yao/resources/test_security_group.rb
 - test/yao/resources/test_security_group_rule.rb
 - test/yao/resources/test_user.rb
 - test/yao/test_auth.rb
+- test/yao/test_authv3.rb
 - test/yao/test_client.rb
 - test/yao/test_client_plugin.rb
 - test/yao/test_config.rb
 - test/yao/test_read_only.rb
 - test/yao/test_server_error.rb
 - test/yao/test_token.rb
+- test/yao/test_tokenv3.rb