yao 0.7.0 → 0.8.0

data/test/yao/resources/test_hypervisor.rb

@@ -1,4 +1,5 @@
-class TestHypervisor < Test::Unit::TestCase
+class TestHypervisor < TestYaoResource
+
   def test_hypervisor
     params = {
       "status" => "enabled"
@@ -8,12 +9,8 @@ class TestHypervisor < Test::Unit::TestCase
     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")
+  def test_list
+    stub = 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 v#{Faraday::VERSION}"})
       .to_return(
         status: 200,
@@ -27,12 +24,18 @@ class TestHypervisor < Test::Unit::TestCase
         headers: {'Content-Type' => 'application/json'}
       )
 
-    h = Yao::Resources::Hypervisor.list_detail
+    h = Yao::Resources::Hypervisor.list
     assert_equal(h.first.id, "dummy")
+
+    assert_requested(stub)
+  end
+
+  def test_list_detail
+    assert_equal(Yao::Hypervisor.method(:list_detail), Yao::Hypervisor.method(:list))
   end
 
   def test_statistics
-    stub_request(:get, "https://example.com:12345/os-hypervisors/statistics")
+    stub = 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 v#{Faraday::VERSION}"})
       .to_return(
         status: 200,
@@ -59,10 +62,12 @@ class TestHypervisor < Test::Unit::TestCase
 
     s = Yao::Resources::Hypervisor.statistics
     assert_equal(s.count, 1)
+
+    assert_requested(stub)
   end
 
   def test_uptime
-    stub_request(:get, "https://example.com:12345/os-hypervisors/1/uptime")
+    stub = 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 v#{Faraday::VERSION}"})
       .to_return(
         status: 200,
@@ -82,5 +87,7 @@ class TestHypervisor < Test::Unit::TestCase
 
     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_requested(stub)
   end
 end

data/test/yao/resources/test_image.rb

@@ -1,4 +1,4 @@
-class TestImage < Test::Unit::TestCase
+class TestImage < TestYaoResource
 
   def test_image
 

data/test/yao/resources/test_keypair.rb

@@ -1,8 +1,4 @@
-class TestKeypair < Test::Unit::TestCase
-
-  def setup
-    Yao.default_client.pool["compute"] = Yao::Client.gen_client("https://example.com:12345")
-  end
+class TestKeypair < TestYaoResource
 
   def test_keypair
     # https://docs.openstack.org/api-ref/compute/?expanded=list-keypairs-detail#list-keypairs
@@ -24,7 +20,7 @@ EOS
   end
 
   def test_list
-    stub_request(:get, "https://example.com:12345/os-keypairs")
+    stub = stub_request(:get, "https://example.com:12345/os-keypairs")
       .to_return(
         status: 200,
         body: <<-JSON,
@@ -50,5 +46,6 @@ EOS
 
     keypairs = Yao::Keypair.list
     assert_equal(keypairs.first.fingerprint, "7e:eb:ab:24:ba:d1:e1:88:ae:9a:fb:66:53:df:d3:bd")
+    assert_requested(stub)
   end
 end

data/test/yao/resources/test_loadbalancer.rb

@@ -1,6 +1,4 @@
-require "time"
-
-class TestLoadBalancer < Test::Unit::TestCase
+class TestLoadBalancer < TestYaoResource
   def test_loadbalancer
     params = {
       "provider" => "octavia",

data/test/yao/resources/test_loadbalancer_healthmonitor.rb

@@ -1,6 +1,4 @@
-require "time"
-
-class TestLoadBalancerHealthMonitor < Test::Unit::TestCase
+class TestLoadBalancerHealthMonitor < TestYaoResource
   def test_loadbalancer_healtchmonitor
     params = {
       "name" => "super-pool-health-monitor",

data/test/yao/resources/test_loadbalancer_listener.rb

@@ -1,6 +1,4 @@
-require "time"
-
-class TestLoadBalancerListener < Test::Unit::TestCase
+class TestLoadBalancerListener < TestYaoResource
   def test_loadbalancer_listener
     params = {
       "description" => "A great TLS listener",
@@ -22,7 +20,6 @@ class TestLoadBalancerListener < Test::Unit::TestCase
       ],
       "l7policies" => [
           {
-              "id" => "58284ac9-673e-47ff-9dcb-09871a1956c4",
               "id" => "5e618272-339d-4a80-8d14-dbc093091bb1"
           }
       ],
@@ -49,7 +46,6 @@ class TestLoadBalancerListener < Test::Unit::TestCase
     ])
     assert_equal(listener.l7policies, [
         {
-            "id" => "58284ac9-673e-47ff-9dcb-09871a1956c4",
             "id" => "5e618272-339d-4a80-8d14-dbc093091bb1"
         }
     ])

data/test/yao/resources/test_loadbalancer_pool.rb

@@ -1,6 +1,4 @@
-require "time"
-
-class TestLoadBalancerPool < Test::Unit::TestCase
+class TestLoadBalancerPool < TestYaoResource
   def test_loadbalancer_pool
     params = {
       "lb_algorithm" => "ROUND_ROBIN",

data/test/yao/resources/test_loadbalancer_pool_member.rb

@@ -1,6 +1,4 @@
-require "time"
-
-class TestLoadBalancerPoolMember < Test::Unit::TestCase
+class TestLoadBalancerPoolMember < TestYaoResource
   def test_loadbalancer_pool_member
     params = {
       "monitor_port" => 8080,

data/test/yao/resources/test_meter.rb

@@ -1,10 +1,4 @@
-class TestMeter < Test::Unit::TestCase
-
-  def setup
-    Yao.default_client.pool["metering"]       = Yao::Client.gen_client("https://example.com:12345")
-    # notice: admin_pool を指定するあたりでハマったので注意
-    Yao.default_client.admin_pool["identity"] = Yao::Client.gen_client("https://example.com:12345")
-  end
+class TestMeter < TestYaoResource
 
   def test_meter
     # https://docs.openstack.org/ceilometer/pike/webapi/v2.html
@@ -34,9 +28,8 @@ class TestMeter < Test::Unit::TestCase
   end
 
   def test_resource
-
     # https://docs.openstack.org/ceilometer/pike/webapi/v2.html
-    stub_request(:get, "https://example.com:12345/v2/resources/00000000-0000-0000-0000-000000000000")
+    stub = stub_request(:get, "https://example.com:12345/v2/resources/00000000-0000-0000-0000-000000000000")
       .to_return(
         status: 200,
         body: <<-JSON,
@@ -52,13 +45,15 @@ class TestMeter < Test::Unit::TestCase
     }
 
     meter    = Yao::Meter.new(params)
-    resource = meter.resource
-    assert_instance_of(Yao::Resource, resource)
-    assert_equal(resource.resource_id, "00000000-0000-0000-0000-000000000000")
+    assert_instance_of(Yao::Resource, meter.resource)
+    assert_equal(meter.resource.resource_id, "00000000-0000-0000-0000-000000000000")
+    assert_equal(meter.resource.id, "00000000-0000-0000-0000-000000000000")
+
+    assert_requested(stub)
   end
 
   def test_tenant
-    stub_request(:get, "https://example.com:12345/tenants/00000000-0000-0000-0000-000000000000")
+    stub = stub_request(:get, "https://example.com:12345/tenants/00000000-0000-0000-0000-000000000000")
       .to_return(
         status: 200,
         body: <<-JSON,
@@ -78,10 +73,12 @@ class TestMeter < Test::Unit::TestCase
     meter  = Yao::Meter.new(params)
     assert_instance_of(Yao::Tenant, meter.tenant)
     assert_equal(meter.tenant.id, "00000000-0000-0000-0000-000000000000")
+
+    assert_requested(stub)
   end
 
   def test_user
-    stub_request(:get, "https://example.com:12345/users/00000000-0000-0000-0000-000000000000")
+    stub = stub_request(:get, "https://example.com:12345/users/00000000-0000-0000-0000-000000000000")
       .to_return(
         status: 200,
         body: <<-JSON,
@@ -101,5 +98,7 @@ class TestMeter < Test::Unit::TestCase
     meter  = Yao::Meter.new(params)
     assert_instance_of(Yao::User, meter.user)
     assert_equal(meter.user.id, "00000000-0000-0000-0000-000000000000")
+
+    assert_requested(stub)
   end
 end

data/test/yao/resources/test_network.rb

@@ -1,4 +1,4 @@
-class TestNetwork < Test::Unit::TestCase
+class TestNetwork < TestYaoResource
 
   def test_network
 
@@ -35,4 +35,31 @@ class TestNetwork < Test::Unit::TestCase
     assert_equal(network.type, "vlan")
     assert_equal(network.segmentation_id, 1000)
   end
+
+  def test_tenant
+
+    stub = stub_request(:get, "https://example.com:12345/tenants/0123456789abcdef0123456789abcdef")
+      .to_return(
+         status: 200,
+         body: <<-JSON,
+        {
+          "tenant": {
+            "id": "0123456789abcdef0123456789abcdef"
+          }
+        }
+        JSON
+        headers: {'Content-Type' => 'application/json'}
+      )
+
+    network = Yao::Network.new(
+      "project_id" => "0123456789abcdef0123456789abcdef",
+      "tenant_id"  => "0123456789abcdef0123456789abcdef",
+    )
+
+    assert_instance_of(Yao::Tenant, network.tenant)
+    assert_instance_of(Yao::Tenant, network.project)
+    assert_equal(network.tenant.id, '0123456789abcdef0123456789abcdef')
+
+    assert_requested(stub)
+  end
 end

data/test/yao/resources/test_old_sample.rb

@@ -0,0 +1,86 @@
+class TestOldSample < TestYaoResource
+
+  def test_old_sample
+
+    # https://docs.openstack.org/ceilometer/pike/webapi/v2.html#Sample
+    params = {
+      "counter_name" => "instance",
+      "counter_type" => "gauge",
+      "counter_unit" => "instance",
+      "counter_volume" => 1.0,
+      "message_id" => "5460acce-4fd6-480d-ab18-9735ec7b1996",
+      "project_id" => "35b17138-b364-4e6a-a131-8f3099c5be68",
+      "recorded_at" => "2015-01-01T12:00:00",
+      "resource_id" => "bd9431c1-8d69-4ad3-803a-8d4a6b89fd36",
+      "resource_metadata" => {
+        "name1" => "value1",
+        "name2" => "value2"
+      },
+      "source" => "openstack",
+      "timestamp" => "2015-01-01T12:00:00",
+      "user_id" => "efd87807-12d2-4b38-9c70-5f5c2ac427ff"
+    }
+
+    sample = Yao::Resources::OldSample.new(params)
+
+    assert_equal(sample.id, "5460acce-4fd6-480d-ab18-9735ec7b1996")
+    assert_equal(sample.message_id, "5460acce-4fd6-480d-ab18-9735ec7b1996")
+
+    assert_equal(sample.counter_name, "instance")
+    assert_equal(sample.counter_type, "gauge")
+    assert_equal(sample.counter_unit, "instance")
+    assert_equal(sample.counter_volume, 1.0)
+    assert_equal(sample.resource_id, "bd9431c1-8d69-4ad3-803a-8d4a6b89fd36")
+    assert_equal(sample.timestamp, Time.parse("2015-01-01T12:00:00"))
+    assert_equal(sample.resource_metadata, {
+      "name1" => "value1",
+      "name2" => "value2"
+    })
+    assert_equal(sample.user_id, "efd87807-12d2-4b38-9c70-5f5c2ac427ff")
+    assert_equal(sample.source, "openstack")
+    assert_equal(sample.recorded_at, Time.parse("2015-01-01T12:00:00"))
+  end
+
+  def test_resource
+    # https://docs.openstack.org/ceilometer/pike/webapi/v2.html
+    stub = stub_request(:get, "https://example.com:12345/v2/resources/00000000-0000-0000-0000-000000000000")
+      .to_return(
+        status: 200,
+        body: <<-JSON,
+        {
+            "resource_id": "00000000-0000-0000-0000-000000000000"
+        }
+        JSON
+        headers: {'Content-Type' => 'application/json'}
+      )
+
+    sample = Yao::Resources::OldSample.new( 'resource_id' => '00000000-0000-0000-0000-000000000000' )
+
+    assert_instance_of(Yao::Resources::Resource, sample.resource)
+    assert_equal(sample.resource.id, "00000000-0000-0000-0000-000000000000")
+
+    assert_requested(stub)
+  end
+
+  def test_user
+
+    stub = stub_request(:get, "https://example.com:12345/users/00000000-0000-0000-0000-000000000000")
+      .to_return(
+        status: 200,
+        body: <<-JSON,
+        {
+          "user": {
+            "id": "00000000-0000-0000-0000-000000000000"
+          }
+        }
+        JSON
+        headers: {'Content-Type' => 'application/json'}
+      )
+
+    meter  = Yao::OldSample.new( "user_id" => "00000000-0000-0000-0000-000000000000" )
+    assert_instance_of(Yao::User, meter.user)
+    assert_equal(meter.user.id, "00000000-0000-0000-0000-000000000000")
+
+    assert_requested(stub)
+  end
+end

data/test/yao/resources/test_port.rb

@@ -1,8 +1,4 @@
-class TestPort < Test::Unit::TestCase
-
-  def setup
-    Yao.default_client.pool["network"] = Yao::Client.gen_client("https://example.com:12345")
-  end
+class TestPort < TestYaoResource
 
   def test_port
 
@@ -81,6 +77,28 @@ class TestPort < Test::Unit::TestCase
     assert_equal(port.primary_ip, "10.0.0.1")
   end
 
+  def test_tenant
+
+    stub = stub_request(:get, "https://example.com:12345/tenants/0123456789abcdef0123456789abcdef")
+      .to_return(
+        status: 200,
+        body: <<-JSON,
+        {
+          "tenant": {
+            "id": "0123456789abcdef0123456789abcdef"
+          }
+        }
+        JSON
+        headers: {'Content-Type' => 'application/json'}
+      )
+
+    port = Yao::Port.new('tenant_id' => '0123456789abcdef0123456789abcdef')
+    assert_instance_of(Yao::Tenant, port.tenant)
+    assert_equal(port.tenant.id, '0123456789abcdef0123456789abcdef')
+
+    assert_requested(stub)
+  end
+
   def test_primary_ip
 
     params = {
@@ -98,7 +116,7 @@ class TestPort < Test::Unit::TestCase
 
   def test_primary_subnet
 
-    stub_request(:get, "https://example.com:12345/subnets/00000000-0000-0000-0000-000000000000")
+    stub = stub_request(:get, "https://example.com:12345/subnets/00000000-0000-0000-0000-000000000000")
       .to_return(
         status: 200,
         body: <<-JSON,
@@ -123,11 +141,13 @@ class TestPort < Test::Unit::TestCase
     port = Yao::Port.new(params)
     assert{ port.primary_subnet.instance_of?(Yao::Subnet) }
     assert_equal(port.primary_subnet.id, "00000000-0000-0000-0000-000000000000")
+
+    assert_requested(stub)
   end
 
   def test_network
 
-    stub_request(:get, "https://example.com:12345/networks/00000000-0000-0000-0000-000000000000")
+    stub = stub_request(:get, "https://example.com:12345/networks/00000000-0000-0000-0000-000000000000")
       .to_return(
         status: 200,
         body: <<-JSON,
@@ -147,5 +167,7 @@ class TestPort < Test::Unit::TestCase
     port = Yao::Port.new(params)
     assert_instance_of(Yao::Network, port.network)
     assert_equal(port.network.id, "00000000-0000-0000-0000-000000000000")
+
+    assert_requested(stub)
   end
 end

data/test/yao/resources/test_project.rb

@@ -0,0 +1,32 @@
+class TestProject < TestYaoResource
+  def setup
+    super
+    Yao.default_client.admin_pool["identity"] = Yao::Client.gen_client("https://example.com:12345/v2.0")
+  end
+
+  # https://docs.openstack.org/api-ref/identity/v3/?expanded=list-projects-detail#projects
+  def test_project
+    params = {
+      "is_domain" => false,
+      "description" => nil,
+      "domain_id" => "default",
+      "enabled" => true,
+      "id" => "0c4e939acacf4376bdcd1129f1a054ad",
+      "links" => {
+        "self" => "http://example.com/identity/v3/projects/0c4e939acacf4376bdcd1129f1a054ad"
+      },
+      "name" => "admin",
+      "parent_id" => nil,
+      "tags" => []
+    }
+
+    project = Yao::Project.new(params)
+    assert_equal(project.domain?, false)
+    assert_equal(project.description, nil)
+    assert_equal(project.domain_id, "default")
+    assert_equal(project.enabled?, true)
+    assert_equal(project.id, "0c4e939acacf4376bdcd1129f1a054ad")
+    assert_equal(project.name, "admin")
+    assert_equal(project.parent_id, nil)
+  end
+end

data/test/yao/resources/test_resource.rb

@@ -0,0 +1,56 @@
+class TestResource < TestYaoResource
+
+  def test_resource
+
+    # https://docs.openstack.org/ceilometer/pike/webapi/v2.html#Resource
+    params = {
+      "links" =>[
+        {
+          "href" => "http://localhost:8777/v2/resources/bd9431c1-8d69-4ad3-803a-8d4a6b89fd36",
+          "rel" => "self"
+        },
+        {
+          "href" => "http://localhost:8777/v2/meters/volume?q.field=resource_id&q.value=bd9431c1-8d69-4ad3-803a-8d4a6b89fd36",
+          "rel" => "volume"
+        }
+      ],
+      "metadata" => {
+        "name1" =>"value1",
+        "name2" =>"value2"
+      },
+      "project_id" => "35b17138-b364-4e6a-a131-8f3099c5be68",
+      "resource_id" => "bd9431c1-8d69-4ad3-803a-8d4a6b89fd36",
+      "source" => "openstack",
+      "user_id" => "efd87807-12d2-4b38-9c70-5f5c2ac427ff",
+      # uncodumented
+      "last_sample_timestamp" => "2019-08-29T08:41:22.555000",
+      "first_sample_timestamp" => "2019-03-19T08:41:21.383000",
+    }
+
+    resource = Yao::Resources::Resource.new(params)
+
+    assert_equal(resource.last_sample_timestamp, "2019-08-29T08:41:22.555000")
+    assert_equal(resource.last_sampled_at, Time.parse("2019-08-29T08:41:22.555000"))
+
+    assert_equal(resource.first_sample_timestamp, "2019-03-19T08:41:21.383000")
+    assert_equal(resource.first_sampled_at, Time.parse("2019-03-19T08:41:21.383000"))
+
+    assert_equal(resource.id, "bd9431c1-8d69-4ad3-803a-8d4a6b89fd36")
+    assert_equal(resource.resource_id, "bd9431c1-8d69-4ad3-803a-8d4a6b89fd36")
+    assert_equal(resource.user_id, "efd87807-12d2-4b38-9c70-5f5c2ac427ff")
+    assert_equal(resource.metadata, {
+      "name1" =>"value1",
+      "name2" =>"value2"
+    })
+    assert_equal(resource.links, [
+      {
+        "href" => "http://localhost:8777/v2/resources/bd9431c1-8d69-4ad3-803a-8d4a6b89fd36",
+        "rel" => "self"
+      },
+      {
+        "href" => "http://localhost:8777/v2/meters/volume?q.field=resource_id&q.value=bd9431c1-8d69-4ad3-803a-8d4a6b89fd36",
+        "rel" => "volume"
+      }
+    ])
+  end
+end