yao 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 661703f10f4674a5a29c12e9834ef95cc30ce2d5
-  data.tar.gz: 179bf1287b23cfb2da9c63645a1d262b254aa9bf
+  metadata.gz: 906c17b5fd4d30db28ae3338f591a18cff3798e2
+  data.tar.gz: f9f55488c58e43f8ac6c50923cc717ce4091bb11
 SHA512:
-  metadata.gz: 0d548d149e633239cf0d6fd7e534f90bb51680924c47399e10fd87b6d639c7bf7ec5c4d69f75ffe546e6c8b622f72194622bfeda0094225ea770028acf17a101
-  data.tar.gz: 9471beb9e8a2d98c36ca85d5d8d08906e9d44cd62fc5b832c1dc9069a8cfaa5efbaa341ab1e1ebfc1fa731c04e79505553859dfe8931dcb557a148777086eaa1
+  metadata.gz: f935edeb5201604969ad2ac71ad39b25795d55f02e9d7fdc4ad8bd7048b1eca1ee15289bae1cb3a6e4717368a7a7fc01d6bfd0f4c24a7065eb55927f320836f9
+  data.tar.gz: c45079ed8e8e107660d19c683155d43bce62e4ee3504c8885ed7b72d0c43f60bfb1a601282405f3640288ed4dbfcf00254f7d52750449646a574f338c6b981be

data/.gitignore

@@ -15,4 +15,6 @@ mkmf.log
 
 tmp
 
-/vendor/
+/vendor/
+
+/bin/

data/lib/yao/auth.rb

@@ -1,4 +1,3 @@
-require 'yao'
 require 'json'
 require 'time'
 

data/lib/yao/client.rb

@@ -1,4 +1,3 @@
-require 'yao'
 require 'yao/config'
 require 'faraday'
 require 'yao/plugins/default_client_generator'

data/lib/yao/config.rb

@@ -1,5 +1,3 @@
-require 'yao'
-
 module Yao
   class Config
     def _configuration_defaults
@@ -80,6 +78,6 @@ module Yao
   end
 
   def self.configure(&blk)
-    config &blk
+    config(&blk)
   end
 end

data/lib/yao/token.rb

@@ -21,6 +21,7 @@ module Yao
       @token = token_data["id"]
       @issued_at = Time.parse(token_data["issued_at"]).localtime
       @expire_at = Time.parse(token_data["expires"]).localtime
+      Yao.current_tenant_id token_data["tenant"]["id"]
     end
 
     def expired?
@@ -35,7 +36,6 @@ module Yao
         req.body = auth_info.to_json
         req.headers['Content-Type'] = 'application/json'
       end
-
       body = res.body["access"]
 
       register(body["token"])
@@ -59,4 +59,11 @@ module Yao
       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.2.11"
+  VERSION = "0.2.12"
 end

data/test/yao/resources/test_role.rb

@@ -0,0 +1,12 @@
+class TestRole < Test::Unit::TestCase
+  def test_role_attributes
+    params = {
+      "name" => "test_role",
+      "description" => "test_description_1"
+    }
+
+    role = Yao::Role.new(params)
+    assert_equal(role.name, "test_role")
+    assert_equal(role.description, "test_description_1")
+  end
+end

data/test/yao/resources/test_security_group.rb

@@ -0,0 +1,25 @@
+class TestSecurityGroup < Test::Unit::TestCase
+  def test_sg_attributes
+    params = {
+      "id"                   => "test_group_id_1",
+      "name"                 => "test_group_name_1",
+      "description"          => "test_description_1",
+      "security_group_rules" => [
+        {
+          "id"        => "test_rule_id_1",
+          "direction" => "ingress",
+          "protocol"  => "tcp",
+          "ethertype" => "IPv4",
+          "port"      =>  "443",
+          "remote_ip" => "10.0.0.0/24"
+        }
+      ]
+    }
+
+    sg = Yao::SecurityGroup.new(params)
+    assert_equal(sg.name, "test_group_name_1")
+    assert_equal(sg.id, "test_group_id_1")
+    assert_equal(sg.description, "test_description_1")
+    assert(sg.rules[0].instance_of?(Yao::SecurityGroupRule))
+  end
+end

data/test/yao/resources/test_security_group_rule.rb

@@ -0,0 +1,23 @@
+class TestSecurityGroup < Test::Unit::TestCase
+  def test_rule_attributes
+    params = {
+      "id" => "test_rule_id_1",
+      "security_group_ip" => "test_group_id_1",
+      "direction"         => "ingress",
+      "protocol"          => "tcp",
+      "ethertype"         => "IPv4",
+      "port_range_max"    => "443",
+      "port_range_min"    => "443",
+      "remote_ip_prefix"  => "10.0.0.0/24",
+      "remote_group_id"   => nil,
+      "tenant_id"         => "test_tenant"
+    }
+
+    rule = Yao::SecurityGroupRule.new(params)
+    assert_equal(rule.id, "test_rule_id_1")
+    assert_equal(rule.protocol, "tcp")
+    assert_equal(rule.port_range_max, "443")
+    assert_equal(rule.port_range_min, "443")
+    assert_equal(rule.ethertype, "IPv4")
+  end
+end

data/test/yao/resources/test_user.rb

@@ -0,0 +1,13 @@
+class TestUser < Test::Unit::TestCase
+  def test_sg_attributes
+    params = {
+      "name" => "test_user",
+      "email" => "test-user@example.com",
+      "password" => "passw0rd"
+    }
+
+    user = Yao::User.new(params)
+    assert_equal(user.name, "test_user")
+    assert_equal(user.email, "test-user@example.com")
+  end
+end

data/test/yao/test_token.rb

@@ -11,7 +11,10 @@ class TestToken < Test::Unit::TestCase
     t.register({
         "id" => "aaaa166533fd49f3b11b1cdce2430000",
         "issued_at" => Time.now.iso8601,
-        "expires" => (Time.now - 3600).utc.iso8601
+        "expires" => (Time.now - 3600).utc.iso8601,
+        "tenant" => {
+          "id" => "aaaa166533fd49f3b11b1cdce2430000"
+        }
       })
 
     assert { t.expired? }
@@ -19,7 +22,10 @@ class TestToken < Test::Unit::TestCase
     t.register({
         "id" => "aaaa166533fd49f3b11b1cdce2430000",
         "issued_at" => Time.now.iso8601,
-        "expires" => (Time.now + 3600).utc.iso8601
+        "expires" => (Time.now + 3600).utc.iso8601,
+        "tenant" => {
+          "id" => "aaaa166533fd49f3b11b1cdce2430000"
+        }
       })
     assert { ! t.expired? }
   end
@@ -42,7 +48,10 @@ class TestToken < Test::Unit::TestCase
     t.register({
         "id" => "old_token",
         "issued_at" => Time.now.iso8601,
-        "expires" => (Time.now - 3600).utc.iso8601
+        "expires" => (Time.now - 3600).utc.iso8601,
+        "tenant" => {
+          "id" => "aaaa166533fd49f3b11b1cdce2430000"
+        }
       })
     assert { t.token == "old_token" }
 
@@ -53,4 +62,18 @@ class TestToken < Test::Unit::TestCase
 
     assert { t.token == "aaaa166533fd49f3b11b1cdce2430000" }
   end
+
+  def test_current_tenant_id
+    t = Yao::Token.new({})
+    t.register({
+        "id" => "aaaa166533fd49f3b11b1cdce2430000",
+        "issued_at" => Time.now.iso8601,
+        "expires" => (Time.now - 3600).utc.iso8601,
+        "tenant" => {
+          "id" => "aaaa166533fd49f3b11b1cdce2430000"
+        }
+      })
+
+    assert { Yao.current_tenant_id == "aaaa166533fd49f3b11b1cdce2430000" }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yao
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - Uchio, KONDO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -204,6 +204,10 @@ files:
 - lib/yao/version.rb
 - test/config.rb
 - test/support/auth_stub.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_client.rb
 - test/yao/test_client_plugin.rb
@@ -233,13 +237,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Yet Another OpenStack API Wrapper that rocks!!
 test_files:
 - test/config.rb
 - test/support/auth_stub.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_client.rb
 - test/yao/test_client_plugin.rb