yao 0.11.3 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3cbb72cd422a646b28bb0493c19f63ae4f60b3d951a67807d343e67e684baa9
-  data.tar.gz: '09622cbb3bcd99965722ec00c6bfbf4adae237aeec0932706c08a71fee9587c6'
+  metadata.gz: b2ea8c98f6fdefadcfeca2782ed5dde20a91423afc3cc44b925a64fdee3b552a
+  data.tar.gz: a0993ca6bd8ddb9a222d632e98c77031682b492756be20c164632410da64bed4
 SHA512:
-  metadata.gz: 53d922dd979a4bef85b50bbdc9bb63b2c62119a5e1e8a1edb09259a3776ca9e4c04e2b521a65e3c408e507bdffaf709b20e7854c1f0db32c53cc15c734d21b8f
-  data.tar.gz: 1fe061f8f816c30c5bada3edbbef1535b1fc992fd932715a698b4752334931eb7685d67e6f3381c4d18879b9e61ce9f81b41244c09e314efc2cd80da8e530b6a
+  metadata.gz: aa2d0252174bc0e69a7697d6fb8e90aba053105fa416219bb5c7b0800a861fcffee6d1e48d0fdc3d84a38f20cb4790d8030dbafbae65f1548c221ae79dbd7e52
+  data.tar.gz: ccef8bca36eda0c7191017929f466a9b424ca8ac697e2e0f104519394ccdc022bd7159391ad1cfebbf9590635ca4b74c5a5705823b2fc54a27027877e252bcb5

data/Gemfile

@@ -6,7 +6,7 @@ gemspec
 group :development do
   gem 'rubocop'
   gem "bundler", ">= 1.10"
-  gem "rake", "~> 10.0"
+  gem "rake", "~> 13.0"
   gem "test-unit", ">= 3"
   gem "test-unit-rr"
   gem "power_assert"

data/Rakefile

@@ -9,4 +9,5 @@ Rake::TestTask.new do |t|
   t.test_files = Dir["test/**/test_*.rb"]
   t.verbose = true
   t.ruby_opts = ["-r config"]
+  t.warning = false
 end

data/lib/yao/auth.rb

@@ -19,6 +19,7 @@ module Yao
       end
 
       def build_authv3_info(tenant_name, username, password,
+                            default_domain,
                             user_domain_id, user_domain_name,
                             project_domain_id, project_domain_name)
           identity = {
@@ -31,6 +32,8 @@ module Yao
             identity[:password][:user][:domain] = { id: user_domain_id }
           elsif user_domain_name
             identity[:password][:user][:domain] = { name: user_domain_name }
+          elsif default_domain
+            identity[:password][:user][:domain] = { id: default_domain }
           end
 
           scope = {
@@ -40,6 +43,8 @@ module Yao
             scope[:project][:domain] = { id: project_domain_id }
           elsif project_domain_name
             scope[:project][:domain] = { name: project_domain_name }
+          elsif default_domain
+            scope[:project][:domain] = { id: default_domain }
           end
 
           {
@@ -68,6 +73,7 @@ module Yao
           username: Yao.config.username,
           password: Yao.config.password,
           identity_api_version: Yao.config.identity_api_version,
+          default_domain: Yao.config.default_domain,
           user_domain_id: Yao.config.user_domain_id,
           user_domain_name: Yao.config.user_domain_name,
           project_domain_id: Yao.config.project_domain_id,
@@ -75,6 +81,7 @@ module Yao
       )
         if identity_api_version.to_i == 3
           auth_info = build_authv3_info(tenant_name, username, password,
+                                        default_domain,
                                         user_domain_id, user_domain_name,
                                         project_domain_id, project_domain_name)
           issue = TokenV3.issue(Yao.default_client.default, auth_info)

data/lib/yao/client.rb

@@ -107,7 +107,10 @@ module Yao
       # @param [String]
       def reset_client(new_endpoint=nil)
         set = ClientSet.new
-        set.register_endpoints("default" => {public_url: new_endpoint || Yao.config.endpoint})
+        endpoint = {
+          "default" => {public_url: new_endpoint || Yao.config.endpoint}
+        }
+        set.register_endpoints(endpoint)
         self.default_client = set
       end
 
@@ -145,6 +148,8 @@ module Yao
     Yao::Client.default_client
   end
 
+  Yao.config.param :default_domain, 'default'
+
   Yao.config.param :noop_on_write, false
   Yao.config.param :raise_on_write, false
 

data/lib/yao/resources.rb

@@ -6,6 +6,7 @@ module Yao
     require "yao/resources/network_associationable"
 
     autoload :Server,                    "yao/resources/server"
+    autoload :ServerGroup,               "yao/resources/server_group"
     autoload :Flavor,                    "yao/resources/flavor"
     autoload :Image,                     "yao/resources/image"
     autoload :SecurityGroup,             "yao/resources/security_group"

data/lib/yao/resources/server_group.rb

@@ -0,0 +1,9 @@
+module Yao::Resources
+  class ServerGroup < Base
+    friendly_attributes :name, :poicies, :members, :metadata, :project_id, :user_id, :policy, :rules
+
+    self.service        = "compute"
+    self.resource_name  = "server_group"
+    self.resources_name = "os-server-groups"
+  end
+end

data/lib/yao/version.rb

@@ -1,3 +1,3 @@
 module Yao
-  VERSION = "0.11.3"
+  VERSION = "0.12.0"
 end

data/test/yao/resources/test_server_group.rb

@@ -0,0 +1,23 @@
+class TestServerGroup < TestYaoResource
+  def test_server_group
+    # https://docs.openstack.org/api-ref/compute/?expanded=list-server-groups-detail,show-server-group-details-detail#list-server-groups
+    params = {
+      "id" => "616fb98f-46ca-475e-917e-2563e5a8cd19",
+      "name" => "test",
+      "policy" => "anti-affinity",
+      "rules" => {"max_server_per_host" => 3},
+      "members" => [],
+      "project_id" => "6f70656e737461636b20342065766572",
+      "user_id" => "fake"
+    }
+
+    sg = Yao::ServerGroup.new(params)
+    assert_equal("616fb98f-46ca-475e-917e-2563e5a8cd19", sg.id)
+    assert_equal("test", sg.name)
+    assert_equal("anti-affinity", sg.policy)
+    assert_equal({"max_server_per_host" => 3}, sg.rules)
+    assert_equal([], sg.members)
+    assert_equal("6f70656e737461636b20342065766572", sg.project_id)
+    assert_equal("fake", sg.user_id)
+  end
+end

data/test/yao/test_authv3.rb

@@ -103,18 +103,22 @@ class TestAuthV3 < Test::Unit::TestCase
   end
 
   def test_build_authv3_info
-    auth_info = Yao::Auth.build_authv3_info("example", "udzura", "XXXXXXXX", "default", nil, "default", nil)
+    auth_info = Yao::Auth.build_authv3_info("example", "udzura", "XXXXXXXX", "test", nil, nil, nil, nil)
 
     user = auth_info[:auth][:identity][:password][:user]
     assert { user[:name] == "udzura" }
     assert { user[:password] == "XXXXXXXX" }
-    assert { user[:domain][:id] == "default" }
+    assert { user[:domain][:id] == "test" }
 
     project = auth_info[:auth][:scope][:project]
     assert { project[:name] == "example" }
-    assert { project[:domain][:id] == "default" }
+    assert { project[:domain][:id] == "test" }
 
-    auth_info = Yao::Auth.build_authv3_info("example", "udzura", "XXXXXXXX", nil, "default", nil, "default")
+    auth_info = Yao::Auth.build_authv3_info("example", "udzura", "XXXXXXXX", nil, "default", nil, "default", nil)
+    assert { auth_info[:auth][:identity][:password][:user][:domain][:id] == "default" }
+    assert { auth_info[:auth][:scope][:project][:domain][:id] == "default" }
+
+    auth_info = Yao::Auth.build_authv3_info("example", "udzura", "XXXXXXXX", nil, nil, "default", nil, "default")
     assert { auth_info[:auth][:identity][:password][:user][:domain][:name] == "default" }
     assert { auth_info[:auth][:scope][:project][:domain][:name] == "default" }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yao
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.12.0
 platform: ruby
 authors:
 - Uchio, KONDO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -116,6 +116,7 @@ files:
 - lib/yao/resources/security_group.rb
 - lib/yao/resources/security_group_rule.rb
 - lib/yao/resources/server.rb
+- lib/yao/resources/server_group.rb
 - lib/yao/resources/subnet.rb
 - lib/yao/resources/tenant.rb
 - lib/yao/resources/tenant_associationable.rb
@@ -163,6 +164,7 @@ files:
 - test/yao/resources/test_security_group.rb
 - test/yao/resources/test_security_group_rule.rb
 - test/yao/resources/test_server.rb
+- test/yao/resources/test_server_group.rb
 - test/yao/resources/test_subnet.rb
 - test/yao/resources/test_user.rb
 - test/yao/resources/test_volume.rb
@@ -239,6 +241,7 @@ test_files:
 - test/yao/resources/test_security_group.rb
 - test/yao/resources/test_security_group_rule.rb
 - test/yao/resources/test_server.rb
+- test/yao/resources/test_server_group.rb
 - test/yao/resources/test_subnet.rb
 - test/yao/resources/test_user.rb
 - test/yao/resources/test_volume.rb