yao 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f5e910f9f7616e6e9e7402416b818e366d718e1
-  data.tar.gz: 392f0c4b9ba85c8c5fed0939c3dc07c457611a3e
+  metadata.gz: 9cb896f2250772f6580f028bb2dc529c962cbaec
+  data.tar.gz: 897adb236fd643b44fb04cbbfee42f33d6585f7c
 SHA512:
-  metadata.gz: 9432f815b9ec8e394f85764827537d2dcdc646823201f2cba83cd3b830177ce59f738675c61b4bcd18603e61b934ba31d46400c27f29b3abf022566d536c533d
-  data.tar.gz: 9d035450f40b5672afdffc7c8e43d0f8567ae47ddabcf3db0d6534da324b5987288bf53adc5bdd4b889e7e2c0cbc99b17be0c27492069117304a649c5b17a4b8
+  metadata.gz: 0d61e5b8f00624660f4fc2f2cf565d2ff61251b1dc7a7ab0b00a666337cf7f4b621b107e45bc3ca617ce12777174c6f62e21ccde194414acf348f46a97dcb48e
+  data.tar.gz: e5ec0f64e49552af51df369edb40f60157bdfc9013f144c4cb3eff654980186085c6efc896fc170532fa27991adacd8b1318b62f3befe34a125c48b16f501252

data/README.md

@@ -26,7 +26,7 @@ Or install it yourself as:
 require 'yao'
 
 Yao.configure do
-  auth_url    "http://keystone.example.local:8080/v2.0/tokens"
+  auth_url    "http://keystone.example.local:8080/v2.0"
   tenant_name "fooproject"
   username    "udzura"
   password    "tonk0tsu-r@men"
@@ -47,7 +47,7 @@ If you want to override some of endpoints by service, you can do:
 
 ```ruby
 Yao.configure do
-  auth_url    "http://endpoint.example.com:12345"
+  auth_url    "http://endpoint.example.com:12345/v2.0"
   tenant_name "example"
   username    "udzura"
   password    "XXXXXXXX"
@@ -70,7 +70,7 @@ You can use a prittier namespace:
 require 'yao/is_openstack_client'
 
 OpenStack.configure do
-  auth_url    "http://keystone.example.local:8080/v2.0/tokens"
+  auth_url    "http://keystone.example.local:8080/v2.0"
   tenant_name "fooproject"
   username    "udzura"
   password    "tonk0tsu-r@men"

data/lib/yao/auth.rb

@@ -4,7 +4,7 @@ require 'time'
 require 'yao/token'
 
 module Yao
-  %i(tenant_name username password timeout client_cert client_key).each do |name|
+  %i(tenant_name username password timeout client_cert client_key region_name).each do |name|
     Yao.config.param name, nil
   end
 

data/lib/yao/client.rb

@@ -28,8 +28,7 @@ module Yao
           # XXX: neutron just have v2.0 API and endpoint may not have version prefix
           if type == "network"
             urls = urls.map {|public_or_admin, url|
-              path = URI.parse(url).path
-              url = (path == '' || path == '/') ? File.join(url, "v2.0") : url
+              url = File.join(url, "v2.0")
               [public_or_admin, url]
             }.to_h
           end

data/lib/yao/faraday_middlewares.rb

@@ -22,7 +22,7 @@ class Faraday::Request::OSToken
 
   def call(env)
     if @token.expired?
-      @token.reflesh(Yao.default_client.default)
+      @token.refresh(Yao.default_client.default)
     end
 
     env[:request_headers]['X-Auth-Token'] = @token.to_s
@@ -51,7 +51,7 @@ class Faraday::Request::ReadOnly
   private
 
   ALLOWED_REQUESTS = [
-    {method: :post, path: "/v2.0/tokens"}
+    {method: :post, path: "/tokens"}
   ]
 
   def allowed_request?(env)

data/lib/yao/resources/role_assignment.rb

@@ -0,0 +1,17 @@
+module Yao::Resources
+  class RoleAssignment < Base
+    friendly_attributes :scope, :role, :user
+    self.service        = "identity"
+    self.resource_name  = "role_assignment"
+    self.resources_name  = "role_assignments"
+    self.admin          = true
+    self.api_version    = "v3"
+
+    def project
+      @project ||= Yao::Tenant.get(scope["project"]["id"])
+    end
+
+    map_attribute_to_resource  :role => Role
+    map_attribute_to_resource  :user => User
+  end
+end

data/lib/yao/resources.rb

@@ -18,6 +18,7 @@ module Yao
     autoload :Host,              "yao/resources/host"
     autoload :User,              "yao/resources/user"
     autoload :Role,              "yao/resources/role"
+    autoload :RoleAssignment,    "yao/resources/role_assignment"
 
     autoload :Resource,          "yao/resources/resource"
     autoload :Meter,             "yao/resources/meter"

data/lib/yao/token.rb

@@ -4,7 +4,7 @@ module Yao
   class Token
     def self.issue(cli, auth_info)
       t = new(auth_info)
-      t.reflesh(cli)
+      t.refresh(cli)
       t
     end
 
@@ -29,10 +29,10 @@ module Yao
       Time.now >= self.expire_at
     end
 
-    def reflesh(cli)
+    def refresh(cli)
       @endpoints.clear
 
-      res = cli.post('/v2.0/tokens') do |req|
+      res = cli.post("#{Yao.config.auth_url}/tokens") do |req|
         req.body = auth_info.to_json
         req.headers['Content-Type'] = 'application/json'
       end
@@ -48,11 +48,13 @@ module Yao
 
       _endpoints.each do |endpoint_data|
         type = endpoint_data["type"]
-        endpoint = endpoint_data["endpoints"].first
+        region_name = Yao.config.region_name ? Yao.config.region_name : 'RegionOne'
+        endpoint = endpoint_data["endpoints"].find { |ep| ep.has_value?(region_name) }
         urls = {}
-        urls[:public_url] = endpoint["publicURL"] if endpoint["publicURL"]
-        urls[:admin_url]  = endpoint["adminURL"]  if endpoint["adminURL"]
-
+        if endpoint
+          urls[:public_url] = endpoint["publicURL"] if endpoint["publicURL"]
+          urls[:admin_url]  = endpoint["adminURL"]  if endpoint["adminURL"]
+        end
         @endpoints[type] = urls
       end
 

data/lib/yao/version.rb

@@ -1,3 +1,3 @@
 module Yao
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/test/support/auth_stub.rb

@@ -1,6 +1,6 @@
 module AuthStub
   def stub_auth_request(auth_url, username, password, tenant)
-    stub_request(:post, "#{auth_url}/v2.0/tokens")
+    stub_request(:post, "#{auth_url}/tokens")
       .with(
         body: auth_json(username, password, tenant)
       ).to_return(
@@ -44,6 +44,13 @@ module AuthStub
             "internalURL": "http://nova-endpoint.example.com:8774/v2/b598bf98671c47e1b955f8c9660e3c44",
             "id": "1a66e6af97c440b2a7bbc4f9735923d9",
             "publicURL": "http://nova-endpoint.example.com:8774/v2/b598bf98671c47e1b955f8c9660e3c44"
+          },
+          {
+            "adminURL": "https://global-endpoint.example.com/api/nova/b598bf98671c47e1b955f8c9660e3c44",
+            "region": "RegionTest",
+            "internalURL": "http://192.168.10.52:8774/v2/b598bf98671c47e1b955f8c9660e3c44",
+            "id": "18df07456cda4af1a7031f0de68637ea",
+            "publicURL": "https://global-endpoint.example.com/api/nova/b598bf98671c47e1b955f8c9660e3c44"
           }
         ],
         "endpoints_links": [],
@@ -58,6 +65,13 @@ module AuthStub
             "internalURL": "http://neutron-endpoint.example.com:9696/",
             "id": "0418104da877468ca65d739142fa3454",
             "publicURL": "http://neutron-endpoint.example.com:9696/"
+          },
+          {
+            "adminURL": "https://global-endpoint.example.com/api/neutron/",
+            "region": "RegionTest",
+            "internalURL": "http://192.168.10.53:9696/",
+            "id": "5e5cf4ffecfa4ce1a956fe517baf3154",
+            "publicURL": "https://global-endpoint.example.com/api/neutron/"
           }
         ],
         "endpoints_links": [],
@@ -72,6 +86,13 @@ module AuthStub
             "internalURL": "http://glance-endpoint.example.com:9292",
             "id": "246f33509ff64802b86eb081307ecec0",
             "publicURL": "http://glance-endpoint.example.com:9292"
+          },
+          {
+            "adminURL": "https://global-endpoint.example.com/api/glance/",
+            "region": "RegionTest",
+            "internalURL": "http://192.168.10.54:9292/",
+            "id": "62d6f676ff0c491e9671a7ab6a596493",
+            "publicURL": "https://global-endpoint.example.com/api/glance/"
           }
         ],
         "endpoints_links": [],
@@ -81,11 +102,18 @@ module AuthStub
       {
         "endpoints": [
           {
-            "adminURL": "#{auth_url}/v2.0",
+            "adminURL": "#{auth_url}",
             "region": "RegionOne",
             "internalURL": "http://endpoint.example.com:5000/v2.0",
             "id": "2b982236cc084128bf42b647c1b7fb49",
             "publicURL": "http://endpoint.example.com:5000/v2.0"
+          },
+          {
+            "adminURL": "https://global-endpoint.example.com/api/admin/keystone/",
+            "region": "RegionTest",
+            "internalURL": "http://192.168.10.52:35357/v2.0",
+            "id": "11ae249e090d4b548ae992c08ea3b35a",
+            "publicURL": "https://global-endpoint.example.com/api/keystone/"
           }
         ],
         "endpoints_links": [],

data/test/yao/test_auth.rb

@@ -2,7 +2,7 @@ class TestAuth < Test::Unit::TestCase
   include AuthStub
 
   def setup
-    @auth_url = "http://endpoint.example.com:12345"
+    @auth_url = "http://endpoint.example.com:12345/v2.0"
     username = "udzura"
     tenant   = "example"
     password = "XXXXXXXX"
@@ -21,7 +21,7 @@ class TestAuth < Test::Unit::TestCase
 
   def test_auth_successful
     cli = Yao.default_client.pool["default"]
-    assert { cli.url_prefix.to_s == "http://endpoint.example.com:12345/" }
+    assert { cli.url_prefix.to_s == "http://endpoint.example.com:12345/v2.0" }
   end
 
   def test_service_sclients_initialized
@@ -53,7 +53,7 @@ class TestAuth < Test::Unit::TestCase
     stub(auth).new
 
     Yao.configure do
-      auth_url    "http://endpoint.example.com:12345"
+      auth_url    "http://endpoint.example.com:12345/v2.0"
       tenant_name "example"
       username    "udzura"
       password    "XXXXXXXX"
@@ -63,14 +63,28 @@ class TestAuth < Test::Unit::TestCase
 
   def test_override_endpoint
     Yao.configure do
-      auth_url    "http://endpoint.example.com:12345"
+      auth_url    "http://endpoint.example.com:12345/v2.0"
       tenant_name "example"
       username    "udzura"
       password    "XXXXXXXX"
       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")
+    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/v2.0"
+      tenant_name "example"
+      username    "udzura"
+      password    "XXXXXXXX"
+      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
 
 end

data/test/yao/test_read_only.rb

@@ -2,7 +2,7 @@ class TestOnly < Test::Unit::TestCase
   include AuthStub
 
   def setup
-    auth_url = "http://endpoint.example.com:12345"
+    auth_url = "http://endpoint.example.com:12345/v2.0"
     username = "udzura"
     tenant   = "example"
     password = "XXXXXXXX"
@@ -17,8 +17,8 @@ class TestOnly < Test::Unit::TestCase
     end
 
     @username = username
-    @get_stub  = stub_request(:get,  "#{auth_url}/v2.0/users?name=#{username}")
-    @post_stub = stub_request(:post, "#{auth_url}/v2.0/users")
+    @get_stub  = stub_request(:get,  "#{auth_url}/users?name=#{username}")
+    @post_stub = stub_request(:post, "#{auth_url}/users")
   end
 
   def test_read_only

data/test/yao/test_token.rb

@@ -30,8 +30,8 @@ class TestToken < Test::Unit::TestCase
     assert { ! t.expired? }
   end
 
-  def test_reflesh
-    auth_url = "http://endpoint.example.com:12345"
+  def test_refresh
+    auth_url = "http://endpoint.example.com:12345/v2.0"
     username = "udzura"
     tenant   = "example"
     password = "XXXXXXXX"
@@ -58,7 +58,7 @@ class TestToken < Test::Unit::TestCase
     stub_auth_request(auth_url, username, password, tenant)
 
     Yao.config.auth_url auth_url
-    t.reflesh(Yao.default_client.default)
+    t.refresh(Yao.default_client.default)
 
     assert { t.token == "aaaa166533fd49f3b11b1cdce2430000" }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yao
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Uchio, KONDO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-10 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -193,6 +193,7 @@ files:
 - lib/yao/resources/resource.rb
 - lib/yao/resources/restfully_accessible.rb
 - lib/yao/resources/role.rb
+- lib/yao/resources/role_assignment.rb
 - lib/yao/resources/router.rb
 - lib/yao/resources/sample.rb
 - lib/yao/resources/security_group.rb
@@ -241,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Yet Another OpenStack API Wrapper that rocks!!