yao 0.3.8 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90d6e614a43f68cec261e6f44fa08445acfa614f0c3d940e6aaec21b17b874b7
-  data.tar.gz: 133aeb2173987b98cb8bdd16a47db04135e789be94f598a45853e19e4ffe0238
+  metadata.gz: 36f84d89c695aac876fb180e51240cfd7740290d9b0c75b3b3450feeac21c569
+  data.tar.gz: 573a38f087cdd5916099693ecf6592cfae29db2a3bbdfedba6f8957a05c64f85
 SHA512:
-  metadata.gz: 15f635d55f68d4f62f10335ec52046ad02bfb2ee3cbe3f6fbff75552b9d55f5b0cb8e876f19f51675538cbc286a9c02df6736356c1836173c93a822fc8f786ed
-  data.tar.gz: 07bec0d33bcb5565f774ed2a3d23d5525d2a594c46f6fb85c5ef5968af72cc2aedf49f13786b3aefae0a76993bcc29805dae60b4f8d0fe3f5aaf54861e3fd3e5
+  metadata.gz: 7ebf7fb5a5256b23591caa47658f7ba1bfaad61217263ac01a171a5729cf3f39617704ed8297abaaded036ddb0da417a6bf01b2d97d0eac71acfe5f565368136
+  data.tar.gz: 1df8f5ae479134251c0c8484a34ceffe2ea792d70e741521bceba9736aa5c72731e86f789554bc087db5628ded10f047bb59d3aee03f30f8cddd8f5942a059b1

data/.travis.yml

@@ -1,11 +1,14 @@
 language: ruby
 
 rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
   - ruby-head
 
+before_install:
+  - gem update --system --no-document
+  - gem i bundler --no-document
 install: bundle install --path vendor/bundle
 
 cache:

data/README.md

@@ -62,7 +62,7 @@ end
 
 YAO supports rubies which are supported by Ruby Core Team. Please look into [`.travis.yml`](./.travis.yml) 's directive.
 
-If you want to use YAO's full functionality, e.g Ruby 2.0 or below, please create an issue or a PR first (PR Recommended ;) ).
+If you want to use YAO's full functionality, e.g Ruby 2.3 or below, please create an issue or a PR first (PR Recommended ;) ).
 
 ## Pro tips
 

data/lib/yao/error.rb

@@ -1,5 +1,6 @@
 module Yao
   class ReadOnlyViolationError < ::StandardError; end
+  class TooManyItemFonud       < ::StandardError; end
 
   class ServerError < ::StandardError
     def initialize(message, requested_env)

data/lib/yao/resources/hypervisor.rb

@@ -1,3 +1,5 @@
+require 'ostruct'
+
 module Yao::Resources
   class Hypervisor < Base
     friendly_attributes :hypervisor_hostname, :hypervisor_type, :hypervisor_version, :running_vms, :current_workload,
@@ -20,5 +22,30 @@ module Yao::Resources
     self.service        = "compute"
     self.resource_name  = "os-hypervisor"
     self.resources_name = "os-hypervisors"
+
+    class << self
+      def list_detail(query={})
+        return_resources(
+          resources_from_json(
+            GET([resources_path, "detail"].join("/"), query).body
+          )
+        )
+      end
+
+      def statistics
+        json = GET([resources_path, "statistics"].join("/")).body
+        Yao::Resources::Hypervisor::Statistics.new(json["hypervisor_statistics"])
+      end
+
+      def uptime(id)
+        res = resource_from_json(
+                GET([resources_path, id, "uptime"].join("/")).body
+              )
+        Yao::Resources::Hypervisor::Uptime.new(res)
+      end
+    end
+
+    class Statistics < OpenStruct; end
+    class Uptime     < OpenStruct; end
   end
 end

data/lib/yao/resources/restfully_accessible.rb

@@ -85,13 +85,14 @@ module Yao::Resources
     end
 
     def get(id_or_name_or_permalink, query={})
-      res = if id_or_name_or_permalink =~ /^https?:\/\//
-              GET(id_or_permalink, query)
+      res = if id_or_name_or_permalink.start_with?("http://", "https://")
+              GET(id_or_name_or_permalink, query)
             elsif uuid?(id_or_name_or_permalink)
               GET([resources_path, id_or_name_or_permalink].join("/"), query)
             else
-              find_by_name(id_or_name_or_permalink, query)
+              get_by_name(id_or_name_or_permalink, query)
             end
+
       return_resource(resource_from_json(res.body))
     end
     alias find get
@@ -152,5 +153,18 @@ module Yao::Resources
     def uuid?(str)
       /^[\da-f]{8}-([\da-f]{4}-){3}[\da-f]{12}$/ === str
     end
+
+    def get_by_name(name, query={})
+      # At first, search by ID. If nothing is found, search by name.
+      begin
+        GET([resources_path, name].join("/"), query)
+      rescue Yao::ItemNotFound
+        item = find_by_name(name)
+        if item.size > 1
+          raise Yao::TooManyItemFonud.new("More than one resource exists with the name '#{name}'")
+        end
+        GET([resources_path, item.first.id].join("/"), query)
+      end
+    end
   end
 end

data/lib/yao/version.rb

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

data/test/config.rb

@@ -5,6 +5,7 @@ require 'yao'
 
 require 'support/auth_stub'
 require 'support/authv3_stub'
+require 'support/restfully_accesible_stub'
 
 require 'webmock/test_unit'
 

data/test/support/restfully_accesible_stub.rb

@@ -0,0 +1,25 @@
+module RestfullAccessibleStub
+  def stub_get_request(url, resource_name)
+    stub_request(:get, url)
+      .with(
+        headers: request_headers
+      ).to_return(
+        status: 200,
+        body: %Q[{#{resource_name}: "dummy"}]
+      )
+  end
+
+  def stub_get_request_not_found(url)
+    stub_request(:get, url)
+      .with(
+        headers: request_headers
+      ).to_return(
+        status: 404,
+        body: "itemNotFound"
+      )
+  end
+
+  def request_headers
+    {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Faraday v0.12.2'}
+  end
+end

data/test/yao/resources/test_hypervisor.rb

@@ -1,5 +1,3 @@
-require "time"
-
 class TestHypervisor < Test::Unit::TestCase
   def test_hypervisor
     params = {
@@ -9,4 +7,80 @@ class TestHypervisor < Test::Unit::TestCase
     host = Yao::Hypervisor.new(params)
     assert_equal(host.enabled?, true)
   end
+
+  def setup
+    Yao.default_client.pool["compute"] = Yao::Client.gen_client("https://example.com:12345")
+  end
+
+  def test_list_detail
+    stub_request(:get, "https://example.com:12345/os-hypervisors/detail")
+      .with(headers: {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Faraday v0.12.2'})
+      .to_return(
+        status: 200,
+        body: <<-JSON,
+        {
+          "hypervisors": [{
+            "id": "dummy"
+          }]
+        }
+        JSON
+        headers: {'Content-Type' => 'application/json'}
+      )
+
+    h = Yao::Resources::Hypervisor.list_detail
+    assert_equal(h.first.id, "dummy")
+  end
+
+  def test_statistics
+    stub_request(:get, "https://example.com:12345/os-hypervisors/statistics")
+      .with(headers: {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Faraday v0.12.2'})
+      .to_return(
+        status: 200,
+        body: <<-JSON,
+        {
+          "hypervisor_statistics": {
+            "count": 1,
+            "current_workload": 0,
+            "disk_available_least": 0,
+            "free_disk_gb": 1028,
+            "free_ram_mb": 7680,
+            "local_gb": 1028,
+            "local_gb_used": 0,
+            "memory_mb": 8192,
+            "memory_mb_used": 512,
+            "running_vms": 0,
+            "vcpus": 2,
+            "vcpus_used": 0
+          }
+        }
+        JSON
+        headers: {'Content-Type' => 'application/json'}
+      )
+
+    s = Yao::Resources::Hypervisor.statistics
+    assert_equal(s.count, 1)
+  end
+
+  def test_uptime
+    stub_request(:get, "https://example.com:12345/os-hypervisors/1/uptime")
+      .with(headers: {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Faraday v0.12.2'})
+      .to_return(
+        status: 200,
+        body: <<-JSON,
+        {
+            "hypervisor": {
+                "hypervisor_hostname": "fake-mini",
+                "id": 1,
+                "state": "up",
+                "status": "enabled",
+                "uptime": " 08:32:11 up 93 days, 18:25, 12 users,  load average: 0.20, 0.12, 0.14"
+            }
+        }
+        JSON
+        headers: {'Content-Type' => 'application/json'}
+      )
+
+    u = Yao::Resources::Hypervisor.uptime(1)
+    assert_equal(u.uptime, " 08:32:11 up 93 days, 18:25, 12 users,  load average: 0.20, 0.12, 0.14")
+  end
 end

data/test/yao/resources/test_restfully_accessible.rb

@@ -1,26 +1,69 @@
 class TestRestfullyAccesible < Test::Unit::TestCase
-  include Yao::Resources::RestfullyAccessible
+  include RestfullAccessibleStub
+  class Test
+    class << self
+      attr_accessor :client
+    end
+    extend Yao::Resources::RestfullyAccessible
+  end
+
+  def setup
+    @url = "https://example.com:12345"
+    @resource_name  = "dummy_resource"
+    @resources_name = "dummy_resources"
+
+    Test.resource_name  = @resource_name
+    Test.resources_name = @resources_name
+    Test.client = Yao::Client.gen_client(@url)
+  end
+
+  sub_test_case 'get' do
+    test 'permalink' do
+      stub_get_request("https://example.com/dummy_resource", @resource_name)
+      mock(Test).new("dummy_resource") { "OK" }
+      assert_equal(Test.get("https://example.com/dummy_resource"), "OK")
+    end
+
+    test 'uuid' do
+      uuid = "00112233-4455-6677-8899-aabbccddeeff"
+      stub_get_request([@url, @resources_name, uuid].join('/'), @resource_name)
+      mock(Test).new("dummy_resource") { "OK" }
+      assert_equal(Test.get(uuid), "OK")
+    end
+
+    test 'id (not uuid)' do
+      id = "1"
+      stub_get_request([@url, @resources_name, id].join('/'), @resource_name)
+      mock(Test).new("dummy_resource") { "OK" }
+      assert_equal(Test.get(id), "OK")
+    end
+
+    test 'name' do
+      Test.return_single_on_querying = true
+      name = "dummy"
+      uuid = "00112233-4455-6677-8899-aabbccddeeff"
 
-  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" }
+      stub_get_request_not_found([@url, @resources_name, name].join('/'))
+      stub_get_request([@url, "#{@resources_name}?name=dummy"].join('/'), @resources_name)
+      mock(Test).new("dummy_resource") { [Struct.new(:id).new(uuid)] }
+      stub_get_request([@url, @resources_name, uuid].join('/'), @resources_name)
+      mock(Test).new("dummy_resource") { "OK" }
 
-    get("dummy")
-    RR.verify
+      assert_equal(Test.get(name), "OK")
+    end
   end
 
   def test_find_by_name
-    mock(self).list({"name" => "dummy"}) { "dummy" }
+    mock(Test).list({"name" => "dummy"}) { "dummy" }
 
-    assert_equal(find_by_name("dummy"), "dummy")
+    assert_equal(Test.find_by_name("dummy"), "dummy")
   end
 
   def test_uuid?
-    assert_equal(uuid?("00112233-4455-6677-8899-aabbccddeeff"), true)
+    assert_equal(Test.send(:uuid?, "00112233-4455-6677-8899-aabbccddeeff"), true)
 
     # not uuid
-    assert_equal(uuid?("dummy resource"), false)
-    assert_equal(uuid?("00112233445566778899aabbccddeeff"), false)
+    assert_equal(Test.send(:uuid?, "dummy resource"), false)
+    assert_equal(Test.send(:uuid?, "00112233445566778899aabbccddeeff"), false)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yao
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.4.0
 platform: ruby
 authors:
 - Uchio, KONDO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-23 00:00:00.000000000 Z
+date: 2018-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -218,6 +218,7 @@ files:
 - test/fixtures/dummy.pem
 - test/support/auth_stub.rb
 - test/support/authv3_stub.rb
+- test/support/restfully_accesible_stub.rb
 - test/yao/resources/test_aggregates.rb
 - test/yao/resources/test_base.rb
 - test/yao/resources/test_hypervisor.rb
@@ -262,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Yet Another OpenStack API Wrapper that rocks!!
@@ -272,6 +273,7 @@ test_files:
 - test/fixtures/dummy.pem
 - test/support/auth_stub.rb
 - test/support/authv3_stub.rb
+- test/support/restfully_accesible_stub.rb
 - test/yao/resources/test_aggregates.rb
 - test/yao/resources/test_base.rb
 - test/yao/resources/test_hypervisor.rb