yao 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60c1114d4626aed1840dea9429543222ce8a0526
-  data.tar.gz: e53ef4409bcd048d6f3fd1fc719b2900c7b8e392
+  metadata.gz: d43c067685907e1e430dc8e003d9817fdf16f260
+  data.tar.gz: 80d85a73f095c4bcb7f4805cc7aa23e548c77493
 SHA512:
-  metadata.gz: '025418597e6b6f0bb2b8dae6591773a927354ba2215511b032ef17d0a57710bbc7fede8f5f66ac994c82336646abe570ce794f6c317f773d3056082508ae980f'
-  data.tar.gz: 2ef45a2b54da4430835e03569a772a6af5779736bfcf91c25b5575863bc1af33595596cf5484b17253dd45f3814fad83584dcde1c47d3567e6777cd06c94c55f
+  metadata.gz: c3f5118243d9ed662b34e981dcd15f4889475eeab02b5cfcea86af12e5afe677b873f538cf4e628ca9546ca0b03fc10ad49e01df0f5a9d00194d579b1c683d11
+  data.tar.gz: 499c01244f7d5cda681ba5f0ad0baf68bbea8f9784d14a01630ef3d4cc8668ae2941509bf9de32bed2fa988c47861d8c667855cbc73150627f93a9120769389a

data/lib/yao/resources/aggregates.rb

@@ -4,14 +4,6 @@ module Yao::Resources
   class Aggregates < Base
     friendly_attributes :availability_zone, :deleted, :hosts, :metadata, :name
 
-    def created_at
-      Date.parse(self["created_at"])
-    end
-
-    def updated_at
-      Date.parse(self["updated_at"]) if self["updated_at"]
-    end
-
     def deleted_at
       Date.parse(self["deleted_at"]) if self["deleted_at"]
     end

data/lib/yao/resources/base.rb

@@ -6,6 +6,9 @@ module Yao::Resources
     def self.friendly_attributes(*names)
       names.map(&:to_s).each do |name|
         define_method(name) do
+          if !@data.key?(name) && id
+            @data = self.class.get(id)
+          end
           self[name]
         end
       end
@@ -53,13 +56,13 @@ module Yao::Resources
     end
 
     def created
-      if date = self["created"]
+      if date = self["created"] || self["created_at"]
         Time.parse(date)
       end
     end
 
     def updated
-      if date = self["updated"]
+      if date = self["updated"] || self["updated_at"]
         Time.parse(date)
       end
     end

data/lib/yao/resources/hypervisor.rb

@@ -3,12 +3,16 @@ module Yao::Resources
     friendly_attributes :hypervisor_hostname, :hypervisor_type, :hypervisor_version, :running_vms, :current_workload,
                         :vcpus, :vcpus_used,
                         :memory_mb, :memory_mb_used, :free_disk_gb,
-                        :local_gb, :local_gb_used, :free_disk_gb
+                        :local_gb, :local_gb_used, :free_disk_gb, :status
 
     def cpu_info
       JSON.parse self["cpu_info"]
     end
 
+    def enabled?
+      self['status'] == 'enabled'
+    end
+
     alias hostname hypervisor_hostname
     alias type     hypervisor_hostname
     alias version  hypervisor_version

data/lib/yao/resources/loadbalancer.rb

@@ -1,19 +1,9 @@
-require 'date'
-
 module Yao::Resources
   class LoadBalancer < Base
     friendly_attributes :provider, :description, :admin_state_up, :provisioning_status,
                         :pools, :vip_address,
                         :operationg_status, :name
 
-    def created_at
-      Date.parse(self["created_at"])
-    end
-
-    def updated_at
-      Date.parse(self["updated_at"])
-    end
-
     def project
       Yao::Tenant.find self["project_id"]
     end

data/lib/yao/resources/loadbalancer_healthmonitor.rb

@@ -1,4 +1,3 @@
-require 'date'
 module Yao::Resources
   class LoadBalancerHealthMonitor < Base
     friendly_attributes :name, :admin_state_up, :provisioning_status,
@@ -12,14 +11,6 @@ module Yao::Resources
       end
     end
 
-    def created_at
-      Date.parse(self["created_at"])
-    end
-
-    def updated_at
-      Date.parse(self["updated_at"])
-    end
-
     self.service        = "load-balancer"
     self.api_version    = "v2.0"
     self.resource_name  = "healthmonitor"

data/lib/yao/resources/loadbalancer_listener.rb

@@ -1,4 +1,3 @@
-require 'date'
 module Yao::Resources
   class LoadBalancerListener < Base
     friendly_attributes :description, :admin_state_up,
@@ -17,14 +16,6 @@ module Yao::Resources
       end
     end
 
-    def created_at
-      Date.parse(self["created_at"])
-    end
-
-    def updated_at
-      Date.parse(self["updated_at"])
-    end
-
     def default_pool
       Yao::LoadBalancerPool.find self["default_pool_id"]
     end

data/lib/yao/resources/loadbalancer_pool.rb

@@ -1,4 +1,3 @@
-require 'date'
 module Yao::Resources
   class LoadBalancerPool < Base
     friendly_attributes :lb_algorithm, :protocol, :description,
@@ -11,14 +10,6 @@ module Yao::Resources
       end
     end
 
-    def created_at
-      Date.parse(self["created_at"])
-    end
-
-    def updated_at
-      Date.parse(self["updated_at"])
-    end
-
     def listeners
       self["listeners"].map do |listener|
         Yao::LoadBalancerListener.find listener["id"]

data/lib/yao/resources/loadbalancer_pool_member.rb

@@ -1,4 +1,3 @@
-require 'date'
 module Yao::Resources
   class LoadBalancerPoolMember < Base
     friendly_attributes :monitor_port, :name, :weight,
@@ -14,14 +13,6 @@ module Yao::Resources
       Yao::Subnet.find self["subnet_id"]
     end
 
-    def created_at
-      Date.parse(self["created_at"])
-    end
-
-    def updated_at
-      Date.parse(self["updated_at"])
-    end
-
     self.service        = "load-balancer"
     self.api_version    = "v2.0"
     self.resource_name  = "member"

data/lib/yao/version.rb

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

data/test/yao/resources/test_aggregates.rb

@@ -1,3 +1,4 @@
+require "time"
 require "date"
 
 class TestRole < Test::Unit::TestCase
@@ -19,8 +20,8 @@ class TestRole < Test::Unit::TestCase
     assert_equal(aggregates.hosts, ["host1", "host2"])
     assert_equal(aggregates.metadata, {"foo" => "bar"})
     assert_equal(aggregates.name, "nova")
-    assert_equal(aggregates.created_at, Date.parse("2015-08-27T09:49:58-05:00"))
-    assert_equal(aggregates.created_at, Date.parse("2015-08-27T09:49:58-05:00"))
-    assert_equal(aggregates.created_at, Date.parse("2015-08-27T09:49:58-05:00"))
+    assert_equal(aggregates.created, Time.parse("2015-08-27T09:49:58-05:00"))
+    assert_equal(aggregates.updated, Time.parse("2015-08-27T09:49:58-05:00"))
+    assert_equal(aggregates.deleted_at, Date.parse("2015-08-27T09:49:58-05:00"))
   end
 end

data/test/yao/resources/test_base.rb

@@ -0,0 +1,15 @@
+class TestResourceBase < Test::Unit::TestCase
+  def setup
+    stub(Yao::Resources::Base).get { Yao::Resources::Base.new({"id" => "foor", "name" => "bar"}) }
+  end
+
+  def test_friendly_attributes
+    base = Yao::Resources::Base.new({"id" => "foor"})
+    base.class.friendly_attributes(:name)
+    assert_equal(base.name, "bar")
+
+    base = Yao::Resources::Base.new({"name" => "bar"})
+    base.class.friendly_attributes(:name)
+    assert_equal(base.name, "bar")
+  end
+end

data/test/yao/resources/test_hypervisor.rb

@@ -0,0 +1,12 @@
+require "time"
+
+class TestHypervisor < Test::Unit::TestCase
+  def test_hypervisor
+    params = {
+      "status" => "enabled"
+    }
+
+    host = Yao::Hypervisor.new(params)
+    assert_equal(host.enabled?, true)
+  end
+end

data/test/yao/resources/test_loadbalancer.rb

@@ -1,4 +1,4 @@
-require "date"
+require "time"
 
 class TestRole < Test::Unit::TestCase
   def test_loadbalancer
@@ -22,7 +22,7 @@ class TestRole < Test::Unit::TestCase
     assert_equal(lb.vip_address, "198.51.100.1")
     assert_equal(lb.operationg_status, "ONLINE")
     assert_equal(lb.name, "greate loadbalancer")
-    assert_equal(lb.created_at, Date.parse("2017-02-28T00:41:44"))
-    assert_equal(lb.updated_at, Date.parse("2017-02-28T00:43:30"))
+    assert_equal(lb.created, Time.parse("2017-02-28T00:41:44"))
+    assert_equal(lb.updated, Time.parse("2017-02-28T00:43:30"))
   end
 end

data/test/yao/resources/test_loadbalancer_healthmonitor.rb

@@ -1,13 +1,13 @@
-require "date"
+require "time"
 
 class TestRole < Test::Unit::TestCase
   def test_loadbalancer_healtchmonitor
     params = {
       "name" => "super-pool-health-monitor",
       "admin_state_up" => true,
-      "created_at" => "2017-05-11T23 =>53 =>47",
+      "created_at" => "2017-05-11T23:53:47",
       "provisioning_status" => "ACTIVE",
-      "updated_at" => "2017-05-11T23 =>53 =>47",
+      "updated_at" => "2017-05-11T23:53:47",
       "delay" => 10,
       "expected_codes" => "200",
       "max_retries" => 1,
@@ -22,9 +22,9 @@ class TestRole < Test::Unit::TestCase
     healthmonitor = Yao::LoadBalancerHealthMonitor.new(params)
     assert_equal(healthmonitor.name, "super-pool-health-monitor")
     assert_equal(healthmonitor.admin_state_up, true)
-    assert_equal(healthmonitor.created_at, Date.parse("2017-05-11T23:53:47"))
+    assert_equal(healthmonitor.created, Time.parse("2017-05-11T23:53:47"))
     assert_equal(healthmonitor.provisioning_status, "ACTIVE")
-    assert_equal(healthmonitor.updated_at, Date.parse("2017-05-11T23:53:47"))
+    assert_equal(healthmonitor.updated, Time.parse("2017-05-11T23:53:47"))
     assert_equal(healthmonitor.delay, 10)
     assert_equal(healthmonitor.expected_codes, "200")
     assert_equal(healthmonitor.max_retries, 1)

data/test/yao/resources/test_loadbalancer_listener.rb

@@ -1,4 +1,4 @@
-require "date"
+require "time"
 
 class TestRole < Test::Unit::TestCase
   def test_loadbalancer_listener
@@ -40,8 +40,8 @@ class TestRole < Test::Unit::TestCase
       "X-Forwarded-Port" => "true",
       "X-Forwarded-For" => "true"
     })
-    assert_equal(listener.created_at, Date.parse("2017-02-28T00:42:44"))
-    assert_equal(listener.updated_at, Date.parse("2017-02-28T00:44:30"))
+    assert_equal(listener.created, Time.parse("2017-02-28T00:42:44"))
+    assert_equal(listener.updated, Time.parse("2017-02-28T00:44:30"))
     assert_equal(listener.operating_status, "ONLINE")
     assert_equal(listener.sni_container_refs, [
       "http://198.51.100.10:9311/v1/containers/a570068c-d295-4780-91d4-3046a325db51",

data/test/yao/resources/test_loadbalancer_pool.rb

@@ -1,4 +1,4 @@
-require "date"
+require "time"
 
 class TestRole < Test::Unit::TestCase
   def test_loadbalancer_pool
@@ -23,9 +23,9 @@ class TestRole < Test::Unit::TestCase
     assert_equal(pool.protocol, "HTTP")
     assert_equal(pool.description, "My round robin pool")
     assert_equal(pool.admin_state_up, true)
-    assert_equal(pool.created_at, Date.parse("2017-04-13T18:14:44"))
+    assert_equal(pool.created, Time.parse("2017-04-13T18:14:44"))
     assert_equal(pool.provisioning_status, "ACTIVE")
-    assert_equal(pool.updated_at, Date.parse("2017-04-13T23:08:12"))
+    assert_equal(pool.updated, Time.parse("2017-04-13T23:08:12"))
     assert_equal(pool.session_persistence, {
         "cookie_name" => nil,
         "type" => "SOURCE_IP"

data/test/yao/resources/test_loadbalancer_pool_member.rb

@@ -1,4 +1,4 @@
-require "date"
+require "time"
 
 class TestRole < Test::Unit::TestCase
   def test_loadbalancer_pool_member
@@ -7,10 +7,10 @@ class TestRole < Test::Unit::TestCase
       "name" => "web-server-1",
       "weight" => 20,
       "admin_state_up" => true,
-      "created_at" => "2017-05-11T17 =>21 =>34",
+      "created_at" => "2017-05-11T17:21:34",
       "provisioning_status" => "ACTIVE",
       "monitor_address" => nil,
-      "updated_at" => "2017-05-11T17 =>21 =>37",
+      "updated_at" => "2017-05-11T17:21:37",
       "address" => "192.0.2.16",
       "protocol_port" => 80,
       "operating_status" => "NO_MONITOR"
@@ -21,10 +21,10 @@ class TestRole < Test::Unit::TestCase
     assert_equal(member.name, "web-server-1")
     assert_equal(member.weight, 20)
     assert_equal(member.admin_state_up, true)
-    assert_equal(member.created_at, Date.parse("2017-05-11T17:21:34"))
+    assert_equal(member.created, Time.parse("2017-05-11T17:21:34"))
     assert_equal(member.provisioning_status, "ACTIVE")
     assert_equal(member.monitor_address, nil)
-    assert_equal(member.updated_at, Date.parse("2017-05-11T17:21:37"))
+    assert_equal(member.updated, Time.parse("2017-05-11T17:21:37"))
     assert_equal(member.address, "192.0.2.16")
     assert_equal(member.protocol_port, 80)
     assert_equal(member.operating_status, "NO_MONITOR")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yao
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Uchio, KONDO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-07 00:00:00.000000000 Z
+date: 2017-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -216,6 +216,8 @@ files:
 - test/fixtures/dummy.pem
 - test/support/auth_stub.rb
 - test/yao/resources/test_aggregates.rb
+- test/yao/resources/test_base.rb
+- test/yao/resources/test_hypervisor.rb
 - test/yao/resources/test_loadbalancer.rb
 - test/yao/resources/test_loadbalancer_healthmonitor.rb
 - test/yao/resources/test_loadbalancer_listener.rb
@@ -254,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Yet Another OpenStack API Wrapper that rocks!!
@@ -264,6 +266,8 @@ test_files:
 - test/fixtures/dummy.pem
 - test/support/auth_stub.rb
 - test/yao/resources/test_aggregates.rb
+- test/yao/resources/test_base.rb
+- test/yao/resources/test_hypervisor.rb
 - test/yao/resources/test_loadbalancer.rb
 - test/yao/resources/test_loadbalancer_healthmonitor.rb
 - test/yao/resources/test_loadbalancer_listener.rb