yao 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97e6146fda8345c89f804cb55928c3011e8603999355e27e5416d13eb336e569
-  data.tar.gz: b47ac5d66e43b08e2482f157c13ff9fa45a335b8ac6992737d6554d08a2c4ca3
+  metadata.gz: 5f7b084698d4c47d604863ccbfe4c36b1d5d7815e0b9b011ae1d2f83c8a61895
+  data.tar.gz: 00be9619242873d469ce87df87f320e8bb2ce78f8316537f6015023b9c0ac304
 SHA512:
-  metadata.gz: f4066fa6911823b55df1b9e61d6796b3efa7719b7dc6afb4858b1daf28153bf16754aed5f4646fdbbbf8a80b540235f2cbf0d763c98e8ec428d1d8de7cb78077
-  data.tar.gz: 545be1baceecc9ad556b207f19e01dc2658a37321038225707643005f802cbbbfea57f7fba5ba581ad4df1d1a7f2c331d4168ff7ee13c181f2ffb2f7d43056ff
+  metadata.gz: ad4a4d532cf894994470e285584ecf54a024591dc7adc43d32cd63aaf32d9bcb7ae4720a96b759b5df8baf38798aa9896332848a0f9dee769f3fa65b6e88c4a5
+  data.tar.gz: '099e654bb588b941b5becb906a4b75a7f5c97ce261ed2be093683ee9a39ff9df31ef205252180c72a532b32464d28aa38b59f8e6aeb13a4f79bc00ec9a3790b8'

data/.github/workflows/ubuntu.yml

@@ -13,7 +13,7 @@ jobs:
     - name: Set up Ruby
       uses: actions/setup-ruby@v1
       with:
-        version: ${{ matrix.ruby }}
+        ruby-version: ${{ matrix.ruby }}
     - name: Install dependencies
       run: |
         gem install bundler --no-document

data/lib/yao/client.rb

@@ -1,5 +1,6 @@
 require 'yao/config'
 require 'faraday'
+require 'openssl'
 require 'yao/plugins/default_client_generator'
 
 module Yao
@@ -11,20 +12,50 @@ module Yao
         @pool       = {}
         @admin_pool = {}
       end
+
+      # #pool and #admin_pool returns Hash like below structure
+      #
+      # {
+      #   "identity" => #<Faraday::Connection:...>,
+      #   "image"    => #<Faraday::Connection:...>,
+      # }
+      #
+      # @return [Hash { String => Faraday::Connection }]
       attr_reader :pool, :admin_pool
 
       %w(default compute network image metering volume orchestration identity).each do |type|
+
+        # @return [Faraday::Connection]
         define_method(type) do
           self.pool[type]
         end
 
+        # @return [Faraday::Connection]
         define_method("#{type}_admin") do
           self.admin_pool[type]
         end
       end
 
+      # endpoints is a Hash like below structure
+      #
+      # {
+      #   "identity" => {
+      #       public_url:   "https://example.com/mitaka/keystone/v3",
+      #       internal_url: "https://example.com/mitaka/keystone/v3",
+      #       admin_url:    "https://example.com/mitaka/admin/keystone/v3"
+      #   },
+      #   "image" => {
+      #     ...
+      #   },
+      # }
+      #
+      # @param endpoints [Hash{ String => Hash }]
       def register_endpoints(endpoints, token: nil)
+
+        # type is String (e.g. network, identity, ... )
+        # urls is Hash{ Symbol => String }
         endpoints.each_pair do |type, urls|
+
           # XXX: neutron just have v2.0 API and endpoint may not have version prefix
           if type == "network"
             urls = urls.map {|public_or_admin, url|
@@ -33,39 +64,64 @@ module Yao
             }.to_h
           end
 
+          # User can override the public_url and admin_url of endpoints by setting Yao.configure
+          # For example.
+          #
+          #   Yao.configure do
+          #     endpoints identity: { public: "http://override-endpoint.example.com:35357/v3.0" }
+          #   end
+          #
           force_public_url = Yao.config.endpoints[type.to_sym][:public] rescue nil
-          force_admin_url = Yao.config.endpoints[type.to_sym][:admin] rescue nil
+          force_admin_url  = Yao.config.endpoints[type.to_sym][:admin]  rescue nil
+
+          if force_public_url || urls[:public_url]
+            self.pool[type] = Yao::Client.gen_client(force_public_url || urls[:public_url], token: token)
+          end
 
-          self.pool[type] = Yao::Client.gen_client(force_public_url || urls[:public_url], token: token) if force_public_url || urls[:public_url]
-          self.admin_pool[type] = Yao::Client.gen_client(force_admin_url || urls[:admin_url],  token: token) if force_admin_url || urls[:admin_url]
+          if force_admin_url || urls[:admin_url]
+            self.admin_pool[type] = Yao::Client.gen_client(force_admin_url || urls[:admin_url],  token: token)
+          end
         end
       end
     end
 
     class << self
+
+      # @return [Yao::Client::ClientSet]
       attr_accessor :default_client
 
+      # @return [Yao::Plugins::DefaultClientGenerator]
       def client_generator
         Plugins::Registry.instance[:client_generator][Yao.config.client_generator].new
       end
 
+      # @param endpoint [String]
+      # @param token    [String]
+      # @return [Faraday::Connection]
       def gen_client(endpoint, token: nil)
         Faraday.new( endpoint, client_options ) do |f|
           client_generator.call(f, token)
         end
       end
 
+      # @param [String]
       def reset_client(new_endpoint=nil)
         set = ClientSet.new
         set.register_endpoints("default" => {public_url: new_endpoint || Yao.config.endpoint})
         self.default_client = set
       end
 
+      # generate Hash options for Faraday.new
+      # @return [Hash]
       def client_options
         opt = {}
-        opt.merge!({ request: { timeout: Yao.config.timeout }}) if Yao.config.timeout
+
+        if Yao.config.timeout
+          opt.merge!({ request: { timeout: Yao.config.timeout }})
+        end
+
+        # Client Certificate Authentication
         if Yao.config.client_cert && Yao.config.client_key
-          require 'openssl'
           cert = OpenSSL::X509::Certificate.new(File.read(Yao.config.client_cert))
           key  = OpenSSL::PKey.read(File.read(Yao.config.client_key))
           opt.merge!(ssl: {
@@ -84,6 +140,7 @@ module Yao
     end
   end
 
+  # @return [Yao::Client::ClientSet]
   def self.default_client
     Yao::Client.default_client
   end

data/lib/yao/plugins/registry.rb

@@ -1,5 +1,7 @@
 require 'singleton'
 
+# Regstiry Pattern - https://www.martinfowler.com/eaaCatalog/registry.html
+# A well-known object that other objects can use to find common objects and services.
 module Yao::Plugins
   class Registry
     include Singleton
@@ -8,10 +10,15 @@ module Yao::Plugins
       @types = {}
     end
 
+    # @type type [Symbol]
+    # @return [Object]
     def [](type)
       @types[type]
     end
 
+    # @param klass [*]
+    # @param type [Symbol]
+    # @param name [Symbol]
     def register(klass, type: nil, name: :default)
       raise("Plugin registration requires both type and name.") if !type or !name
       @types[type] ||= {}
@@ -19,6 +26,9 @@ module Yao::Plugins
     end
   end
 
+  # @param [*]
+  # @param [Symbol]
+  # @param [Symbol]
   def self.register(*a)
     Registry.instance.register(*a)
   end

data/lib/yao/resources/compute_services.rb

@@ -6,6 +6,18 @@ module Yao::Resources
     self.resource_name  = "service"
     self.resources_name = "os-services"
 
+    # return true if ComputeServices is enabled
+    # @return [Bool]
+    def enabled?
+      status == 'enabled'
+    end
+
+    # return true if ComputeServices is disabled
+    # @return [Bool]
+    def disabled?
+      status == 'disabled'
+    end
+
     class << self
       def enable(host, binary)
         params = {

data/lib/yao/resources/hypervisor.rb

@@ -7,16 +7,28 @@ module Yao::Resources
                         :memory_mb, :memory_mb_used, :free_disk_gb,
                         :local_gb, :local_gb_used, :free_disk_gb, :status
 
+    # @return [Hash]
     def cpu_info
       JSON.parse self["cpu_info"]
     end
 
+    # @return [Bool]
     def enabled?
       self['status'] == 'enabled'
     end
 
+    # @return [Bool]
+    def disabled?
+      self['status'] == 'disabled'
+    end
+
+    # @return [Yao::ComputeServices]
+    def service
+      Yao::ComputeServices.new(self['service'])
+    end
+
     alias hostname hypervisor_hostname
-    alias type     hypervisor_hostname
+    alias type     hypervisor_type
     alias version  hypervisor_version
 
     self.service        = "compute"

data/lib/yao/resources/restfully_accessible.rb

@@ -115,6 +115,15 @@ module Yao::Resources
     end
     alias find get
 
+    # @param id_or_name_or_permalink [Stirng]
+    # @param query [Hash]
+    # @return [Yao::Resources::*]
+    def get!(id_or_name_or_permalink, query={})
+      get(id_or_name_or_permalink, query)
+    rescue Yao::ItemNotFound, Yao::NotFound
+      nil
+    end
+
     def find_by_name(name, query={})
       list(query.merge({"name" => name}))
     end

data/lib/yao/version.rb

@@ -1,3 +1,3 @@
 module Yao
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/test/support/restfully_accesible_stub.rb

@@ -19,6 +19,16 @@ module RestfullAccessibleStub
       )
   end
 
+  def stub_get_request_unauthorized(url)
+    stub_request(:get, url)
+      .with(
+        headers: request_headers
+      ).to_return(
+        status: 401,
+        body: "unauthorized"
+      )
+  end
+
   def request_headers
     {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>"Faraday v#{Faraday::VERSION}"}
   end

data/test/yao/resources/test_aggregates.rb

@@ -12,13 +12,13 @@ class TestAggregates < TestYaoResource
     }
 
     aggregates = Yao::Aggregates.new(params)
-    assert_equal(aggregates.availability_zone, "nova")
-    assert_equal(aggregates.deleted, false)
-    assert_equal(aggregates.hosts, ["host1", "host2"])
-    assert_equal(aggregates.metadata, {"foo" => "bar"})
-    assert_equal(aggregates.name, "nova")
-    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"))
+    assert_equal("nova", aggregates.availability_zone)
+    assert_equal(false, aggregates.deleted)
+    assert_equal(["host1", "host2"], aggregates.hosts)
+    assert_equal({"foo" => "bar"}, aggregates.metadata)
+    assert_equal("nova", aggregates.name)
+    assert_equal(Time.parse("2015-08-27T09:49:58-05:00"), aggregates.created)
+    assert_equal(Time.parse("2015-08-27T09:49:58-05:00"), aggregates.updated)
+    assert_equal(Date.parse("2015-08-27T09:49:58-05:00"), aggregates.deleted_at)
   end
 end

data/test/yao/resources/test_base.rb

@@ -6,10 +6,10 @@ class TestResourceBase < TestYaoResource
   def test_friendly_attributes
     base = Yao::Resources::Base.new({"id" => "foor"})
     base.class.friendly_attributes(:name)
-    assert_equal(base.name, "bar")
+    assert_equal("bar", base.name)
 
     base = Yao::Resources::Base.new({"name" => "bar"})
     base.class.friendly_attributes(:name)
-    assert_equal(base.name, "bar")
+    assert_equal("bar", base.name)
   end
 end

data/test/yao/resources/test_compute_services.rb

@@ -16,15 +16,27 @@ class TestComputeServices < TestYaoResource
     }
     compute_service = Yao::ComputeServices.new(params)
 
-    assert_equal(compute_service.id, 1)
-    assert_equal(compute_service.binary, "nova-scheduler")
-    assert_equal(compute_service.disabled_reason, "test1")
-    assert_equal(compute_service.host, "host1")
-    assert_equal(compute_service.state, "up")
-    assert_equal(compute_service.status, "disabled")
-    assert_equal(compute_service.updated, Time.mktime(2012,10,29,13,42,2))
-    assert_equal(compute_service.forced_down, false)
-    assert_equal(compute_service.zone, "internal")
+    assert_equal(1, compute_service.id)
+    assert_equal("nova-scheduler", compute_service.binary)
+    assert_equal("test1", compute_service.disabled_reason)
+    assert_equal("host1", compute_service.host)
+    assert_equal("up", compute_service.state)
+    assert_equal("disabled", compute_service.status)
+    assert_equal(Time.mktime(2012,10,29,13,42,2), compute_service.updated)
+    assert_equal(false, compute_service.forced_down)
+    assert_equal("internal", compute_service.zone)
+  end
+
+  def test_enabled?
+    compute_service = Yao::ComputeServices.new( 'status' => 'enabled' )
+    assert_true  compute_service.enabled?
+    assert_false compute_service.disabled?
+  end
+
+  def test_disabled?
+    compute_service = Yao::ComputeServices.new( 'status' => 'disabled' )
+    assert_false compute_service.enabled?
+    assert_true  compute_service.disabled?
   end
 
   def test_enable
@@ -49,9 +61,9 @@ class TestComputeServices < TestYaoResource
 
     compute_service = Yao::ComputeServices.enable('host1', 'nova-compute')
 
-    assert_equal(compute_service.host, "host1")
-    assert_equal(compute_service.binary, "nova-compute")
-    assert_equal(compute_service.status, "enabled")
+    assert_equal("host1", compute_service.host)
+    assert_equal("nova-compute", compute_service.binary)
+    assert_equal("enabled", compute_service.status)
 
     assert_requested stub
   end
@@ -78,9 +90,9 @@ class TestComputeServices < TestYaoResource
 
     compute_service = Yao::ComputeServices.disable('host1', 'nova-compute')
 
-    assert_equal(compute_service.host, "host1")
-    assert_equal(compute_service.binary, "nova-compute")
-    assert_equal(compute_service.status, "disabled")
+    assert_equal("host1", compute_service.host)
+    assert_equal("nova-compute", compute_service.binary)
+    assert_equal("disabled", compute_service.status)
 
     assert_requested stub
   end
@@ -108,10 +120,10 @@ class TestComputeServices < TestYaoResource
 
     compute_service = Yao::ComputeServices.disable('host1', 'nova-compute', 'test2')
 
-    assert_equal(compute_service.host, "host1")
-    assert_equal(compute_service.binary, "nova-compute")
-    assert_equal(compute_service.status, "disabled")
-    assert_equal(compute_service.disabled_reason, "test2")
+    assert_equal("host1", compute_service.host)
+    assert_equal("nova-compute", compute_service.binary)
+    assert_equal("disabled", compute_service.status)
+    assert_equal("test2", compute_service.disabled_reason)
 
     assert_requested stub
   end

data/test/yao/resources/test_flavor.rb

@@ -30,20 +30,20 @@ class TestFlavor < TestYaoResource
     flavor = Yao::Flavor.new(params)
 
     # friendly_attributes
-    assert_equal(flavor.id, "1")
-    assert_equal(flavor.name, "m1.tiny")
-    assert_equal(flavor.vcpus, 1)
-    assert_equal(flavor.disk, 1)
-    assert_equal(flavor.swap, "")
+    assert_equal("1", flavor.id)
+    assert_equal("m1.tiny", flavor.name)
+    assert_equal(1, flavor.vcpus)
+    assert_equal(1, flavor.disk)
+    assert_equal("", flavor.swap)
 
     # map_attribute_to_attribute
-    assert_equal(flavor.public?, true)
-    assert_equal(flavor.disabled?, false)
+    assert_equal(true, flavor.public?)
+    assert_equal(false, flavor.disabled?)
 
-    assert_equal(flavor.ram, 512)
-    assert_equal(flavor.ram('M'), 512)
-    assert_equal(flavor.ram('G'), 0.5)
-    assert_equal(flavor.memory, 512)
+    assert_equal(512, flavor.ram)
+    assert_equal(512, flavor.ram('M'))
+    assert_equal(0.5, flavor.ram('G'))
+    assert_equal(512, flavor.memory)
   end
 
   def test_list
@@ -87,7 +87,7 @@ class TestFlavor < TestYaoResource
 
     flavors = Yao::Flavor.list
     assert_instance_of(Yao::Flavor, flavors.first)
-    assert_equal(flavors.first.name, "m1.tiny")
+    assert_equal("m1.tiny", flavors.first.name)
 
     assert_requested(stub)
   end
@@ -95,6 +95,6 @@ class TestFlavor < TestYaoResource
   def test_list_detail
     # Yao::Flavor.list_detail と Yao::Flavor.list が alias にあることをテストする
     # see also: https://stackoverflow.com/questions/25883618/how-to-test-method-alias-ruby
-    assert_equal(Yao::Flavor.method(:list_detail), Yao::Flavor.method(:list))
+    assert_equal(Yao::Flavor.method(:list), Yao::Flavor.method(:list_detail))
   end
 end

data/test/yao/resources/test_floating_ip.rb

@@ -31,23 +31,23 @@ class TestFloatingIP < TestYaoResource
     }
 
     fip = Yao::Resources::FloatingIP.new(params)
-    assert_equal(fip.router_id, "d23abc8d-2991-4a55-ba98-2aaea84cc72f")
-    assert_equal(fip.description, "for test")
-    assert_equal(fip.dns_domain, "my-domain.org.")
-    assert_equal(fip.dns_name, "myfip")
-    assert_equal(fip.created, Time.parse("2016-12-21T10:55:50Z"))
-    assert_equal(fip.updated, Time.parse("2016-12-21T10:55:53Z"))
-    assert_equal(fip.revision_number, 1)
-    assert_equal(fip.project_id, "4969c491a3c74ee4af974e6d800c62de")
-    assert_equal(fip.tenant_id, "4969c491a3c74ee4af974e6d800c62de")
-    assert_equal(fip.floating_network_id, "376da547-b977-4cfe-9cba-275c80debf57")
-    assert_equal(fip.fixed_ip_address, "10.0.0.3")
-    assert_equal(fip.floating_ip_address, "172.24.4.228")
-    assert_equal(fip.port_id, "ce705c24-c1ef-408a-bda3-7bbd946164ab")
-    assert_equal(fip.id, "2f245a7b-796b-4f26-9cf9-9e82d248fda7")
-    assert_equal(fip.status, "ACTIVE")
-    assert_equal(fip.tags, ["tag1,tag2"])
-    assert_equal(fip.port_details, {
+    assert_equal("d23abc8d-2991-4a55-ba98-2aaea84cc72f", fip.router_id)
+    assert_equal("for test", fip.description)
+    assert_equal("my-domain.org.", fip.dns_domain)
+    assert_equal("myfip", fip.dns_name)
+    assert_equal(Time.parse("2016-12-21T10:55:50Z"), fip.created)
+    assert_equal(Time.parse("2016-12-21T10:55:53Z"), fip.updated)
+    assert_equal(1, fip.revision_number)
+    assert_equal("4969c491a3c74ee4af974e6d800c62de", fip.project_id)
+    assert_equal("4969c491a3c74ee4af974e6d800c62de", fip.tenant_id)
+    assert_equal("376da547-b977-4cfe-9cba-275c80debf57", fip.floating_network_id)
+    assert_equal("10.0.0.3", fip.fixed_ip_address)
+    assert_equal("172.24.4.228", fip.floating_ip_address)
+    assert_equal("ce705c24-c1ef-408a-bda3-7bbd946164ab", fip.port_id)
+    assert_equal("2f245a7b-796b-4f26-9cf9-9e82d248fda7", fip.id)
+    assert_equal("ACTIVE", fip.status)
+    assert_equal(["tag1,tag2"], fip.tags)
+    assert_equal({
         "status" => "ACTIVE",
         "name" => "",
         "admin_state_up" => true,
@@ -55,8 +55,8 @@ class TestFloatingIP < TestYaoResource
         "device_owner" => "compute:nova",
         "mac_address" => "fa:16:3e:b1:3b:30",
         "device_id" => "8e3941b4-a6e9-499f-a1ac-2a4662025cba"
-    })
-    assert_equal(fip.port_forwardings, [])
+    },fip.port_details)
+    assert_equal([], fip.port_forwardings)
   end
 
   def test_floating_ip_to_router
@@ -77,7 +77,7 @@ class TestFloatingIP < TestYaoResource
     fip = Yao::FloatingIP.new("router_id" => "00000000-0000-0000-0000-000000000000")
 
     assert_instance_of(Yao::Router, fip.router)
-    assert_equal(fip.router.id, "00000000-0000-0000-0000-000000000000")
+    assert_equal("00000000-0000-0000-0000-000000000000", fip.router.id)
 
     assert_requested(stub)
   end
@@ -104,7 +104,7 @@ class TestFloatingIP < TestYaoResource
 
     assert_instance_of(Yao::Tenant, fip.tenant)
     assert_instance_of(Yao::Tenant, fip.project)
-    assert_equal(fip.tenant.id, '0123456789abcdef0123456789abcdef')
+    assert_equal('0123456789abcdef0123456789abcdef', fip.tenant.id)
 
     assert_requested(stub)
   end
@@ -127,7 +127,7 @@ class TestFloatingIP < TestYaoResource
     fip = Yao::FloatingIP.new("port_id" => "00000000-0000-0000-0000-000000000000")
 
     assert_instance_of(Yao::Port, fip.port)
-    assert_equal(fip.port.id, "00000000-0000-0000-0000-000000000000")
+    assert_equal("00000000-0000-0000-0000-000000000000", fip.port.id)
 
     assert_requested(stub)
   end

data/test/yao/resources/test_host.rb

@@ -11,8 +11,8 @@ class TestHost < TestYaoResource
     host = Yao::Host.new(params)
 
     # friendly_attributes
-    assert_equal(host.host_name, "b6e4adbc193d428ea923899d07fb001e")
-    assert_equal(host.service, "conductor")
-    assert_equal(host.zone, "internal")
+    assert_equal("b6e4adbc193d428ea923899d07fb001e", host.host_name)
+    assert_equal("conductor", host.service)
+    assert_equal("internal", host.zone)
   end
 end

data/test/yao/resources/test_hypervisor.rb

@@ -2,11 +2,80 @@ class TestHypervisor < TestYaoResource
 
   def test_hypervisor
     params = {
-      "status" => "enabled"
+      "current_workload" => 0,
+      "status" => "enabled",
+      "state" => "up",
+      "disk_available_least" => 0,
+      "host_ip" => "1.1.1.1",
+      "free_disk_gb" => 1028,
+      "free_ram_mb" => 7680,
+      "hypervisor_hostname" => "host1",
+      "hypervisor_type" => "fake",
+      "hypervisor_version" => 1000,
+      "id" => 2,
+      "local_gb" => 1028,
+      "local_gb_used" => 0,
+      "memory_mb" => 8192,
+      "memory_mb_used" => 512,
+      "running_vms" => 0,
+      "service" => {
+        "host" => "host1",
+        "id" => 6,
+        "disabled_reason" => nil,
+      },
+      "vcpus" => 2,
+      "vcpus_used" => 0
     }
 
+    # ooooooooooooooopsssssssssssss
+    params['cpu_info'] = {
+        "arch" => "x86_64",
+        "model" => "Nehalem",
+        "vendor" => "Intel",
+        "features" => [
+          "pge",
+          "clflush"
+        ],
+        "topology" => {
+          "cores" => 1,
+          "threads" => 1,
+          "sockets" => 4
+        }
+    }.to_json
+
     host = Yao::Hypervisor.new(params)
-    assert_equal(host.enabled?, true)
+
+    assert_equal("host1", host.hypervisor_hostname)
+    assert_equal("host1", host.hostname)
+
+    assert_equal("fake", host.hypervisor_type)
+    assert_equal("fake", host.type)
+
+    assert_equal(1000, host.hypervisor_version)
+    assert_equal(1000, host.version)
+
+    assert_equal(0, host.running_vms)
+    assert_equal(0, host.current_workload)
+    assert_equal(2, host.vcpus)
+    assert_equal(0, host.vcpus_used)
+    assert_equal(8192, host.memory_mb)
+    assert_equal(512, host.memory_mb_used)
+    assert_equal(1028, host.free_disk_gb)
+    assert_equal(1028, host.local_gb)
+    assert_equal(0, host.local_gb_used)
+    assert_equal(1028, host.free_disk_gb)
+    assert_equal('enabled', host.status)
+
+    # #cpu_info
+    assert_equal('x86_64', host.cpu_info["arch"])
+
+    # #enabled?
+    assert_true(host.enabled?)
+    assert_false(host.disabled?)
+
+    # #service
+    assert_instance_of(Yao::ComputeServices, host.service)
+    assert_equal(6, host.service.id)
   end
 
   def test_list
@@ -25,13 +94,13 @@ class TestHypervisor < TestYaoResource
       )
 
     h = Yao::Resources::Hypervisor.list
-    assert_equal(h.first.id, "dummy")
+    assert_equal("dummy", h.first.id)
 
     assert_requested(stub)
   end
 
   def test_list_detail
-    assert_equal(Yao::Hypervisor.method(:list_detail), Yao::Hypervisor.method(:list))
+    assert_equal(Yao::Hypervisor.method(:list), Yao::Hypervisor.method(:list_detail))
   end
 
   def test_statistics
@@ -61,7 +130,7 @@ class TestHypervisor < TestYaoResource
       )
 
     s = Yao::Resources::Hypervisor.statistics
-    assert_equal(s.count, 1)
+    assert_equal(1, s.count)
 
     assert_requested(stub)
   end
@@ -86,7 +155,7 @@ class TestHypervisor < TestYaoResource
       )
 
     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")
+    assert_equal(" 08:32:11 up 93 days, 18:25, 12 users,  load average: 0.20, 0.12, 0.14", u.uptime)
 
     assert_requested(stub)
   end