yao 0.7.0 → 0.8.0

data/test/yao/resources/test_role.rb

@@ -1,4 +1,4 @@
-class TestRole < Test::Unit::TestCase
+class TestRole < TestYaoResource
   def test_role_attributes
     params = {
       "name" => "test_role",
@@ -9,4 +9,258 @@ class TestRole < Test::Unit::TestCase
     assert_equal(role.name, "test_role")
     assert_equal(role.description, "test_description_1")
   end
+
+  sub_test_case 'with keystone v2.0' do
+
+    def setup
+      super
+      Yao.default_client.admin_pool["identity"] = Yao::Client.gen_client("https://example.com:12345/v2.0")
+    end
+
+    def test_find_by_name
+      stub = stub_request(:get, "https://example.com:12345/v2.0/OS-KSADM/roles").
+        to_return(
+          status: 200,
+          body: <<-JSON,
+          {
+            "roles": [{
+              "id": "0123456789abcdef0123456789abcdef",
+              "name": "admin"
+            }]
+          }
+          JSON
+          headers: {'Content-Type' => 'application/json'}
+        )
+
+      roles = Yao::Role.find_by_name("admin")
+
+      assert_instance_of(Yao::Role, roles.first)
+      assert_equal(roles.first.id, "0123456789abcdef0123456789abcdef")
+      assert_requested(stub)
+    end
+
+    def test_resource_path
+      stub = stub_request(:get, "https://example.com:12345/v2.0/OS-KSADM/roles").
+        to_return(
+          status: 200,
+          body: <<-JSON,
+          {
+            "roles": [{
+              "id": "0123456789abcdef0123456789abcdef",
+              "name": "admin"
+            }]
+          }
+          JSON
+          headers: {'Content-Type' => 'application/json'}
+        )
+
+      roles = Yao::Role.list
+
+      assert_instance_of(Yao::Role, roles.first)
+      assert_equal(roles.first.id, "0123456789abcdef0123456789abcdef")
+      assert_requested(stub)
+    end
+    
+    def test_list_for_user
+      stub_user
+      stub_tenant
+      stub = stub_request(:get, "https://example.com:12345/v2.0/tenants/0123456789abcdef0123456789abcdef/users/2844b2a08be147a08ef58317d6471f1f/roles").
+        to_return(
+          status: 200,
+          body: <<-JSON,
+          {
+            "roles": [{
+              "id": "0123456789abcdef0123456789abcdef",
+              "name": "admin"
+            }]
+          }
+          JSON
+          headers: {'Content-Type' => 'application/json'}
+        )
+      
+      roles = Yao::Role.list_for_user("test_user", on:"admin")
+      assert_equal(roles.first.id, "0123456789abcdef0123456789abcdef")
+      assert_received(Yao::User) { |subject| subject.get("test_user") }
+      assert_received(Yao::Tenant) { |subject| subject.find_by_name("admin") }
+      assert_requested(stub)
+    end
+
+    def test_grant
+      stub_role
+      stub_user
+      stub_tenant
+      stub = stub_request(:put, "https://example.com:12345/v2.0/tenants/0123456789abcdef0123456789abcdef/users/2844b2a08be147a08ef58317d6471f1f/roles/OS-KSADM/5318e65d75574c17bf5339d3df33a5a3").
+        to_return(
+          status: 204,
+          body: "",
+          headers: {'Content-Type' => 'application/json'}
+        )
+
+      Yao::Role.grant("test_role", to:"test_user", on:"admin")
+      assert_received(Yao::Role) { |subject| subject.get("test_role") }
+      assert_received(Yao::User) { |subject| subject.get("test_user") }
+      assert_received(Yao::Tenant) { |subject| subject.find_by_name("admin") }
+      assert_requested(stub)
+    end
+
+    def test_revoke
+      stub_role
+      stub_user
+      stub_tenant
+      stub = stub_request(:delete, "https://example.com:12345/v2.0/tenants/0123456789abcdef0123456789abcdef/users/2844b2a08be147a08ef58317d6471f1f/roles/OS-KSADM/5318e65d75574c17bf5339d3df33a5a3").
+        to_return(
+          status: 204,
+          body: "",
+          headers: {'Content-Type' => 'application/json'}
+        )
+
+      Yao::Role.revoke("test_role", from:"test_user", on:"admin")
+      assert_received(Yao::Role) { |subject| subject.get("test_role") }
+      assert_received(Yao::User) { |subject| subject.get("test_user") }
+      assert_received(Yao::Tenant) { |subject| subject.find_by_name("admin") }
+      assert_requested(stub)
+    end
+  end
+
+  sub_test_case 'with keystone v3' do
+
+    def setup
+      super
+      Yao.default_client.admin_pool["identity"] = Yao::Client.gen_client("https://example.com:12345/v3")
+    end
+
+    def test_find_by_name
+      stub = stub_request(:get, "https://example.com:12345/v3/roles?name=admin").
+        to_return(
+          status: 200,
+          body: <<-JSON,
+          {
+            "roles": [{
+              "id": "0123456789abcdef0123456789abcdef",
+              "name": "admin"
+            }]
+          }
+          JSON
+          headers: {'Content-Type' => 'application/json'}
+        )
+
+      roles = Yao::Role.find_by_name("admin")
+
+      assert_instance_of(Yao::Role, roles.first)
+      assert_equal(roles.first.id, "0123456789abcdef0123456789abcdef")
+      assert_requested(stub)
+    end
+
+    def test_resource_path
+      stub = stub_request(:get, "https://example.com:12345/v3/roles").
+        to_return(
+          status: 200,
+          body: <<-JSON,
+          {
+            "roles": [{
+              "id": "0123456789abcdef0123456789abcdef",
+              "name": "admin"
+            }]
+          }
+          JSON
+          headers: {'Content-Type' => 'application/json'}
+        )
+
+      roles = Yao::Role.list
+
+      assert_instance_of(Yao::Role, roles.first)
+      assert_equal(roles.first.id, "0123456789abcdef0123456789abcdef")
+      assert_requested(stub)
+    end
+    
+    def test_list_for_user
+      stub_user
+      stub_project
+      stub = stub_request(:get, "https://example.com:12345/v3/projects/0123456789abcdef0123456789abcdef/users/2844b2a08be147a08ef58317d6471f1f/roles").
+        to_return(
+          status: 200,
+          body: <<-JSON,
+          {
+            "roles": [{
+              "id": "0123456789abcdef0123456789abcdef",
+              "name": "admin"
+            }]
+          }
+          JSON
+          headers: {'Content-Type' => 'application/json'}
+        )
+      
+      roles = Yao::Role.list_for_user("test_user", on:"admin")
+      assert_equal(roles.first.id, "0123456789abcdef0123456789abcdef")
+      assert_received(Yao::Resources::User) { |subject| subject.get("test_user") }
+      assert_received(Yao::Resources::Project) { |subject| subject.get("admin") }
+      assert_requested(stub)
+    end
+
+    def test_grant
+      stub_role
+      stub_user
+      stub_project
+      stub = stub_request(:put, "https://example.com:12345/v3/projects/0123456789abcdef0123456789abcdef/users/2844b2a08be147a08ef58317d6471f1f/roles/5318e65d75574c17bf5339d3df33a5a3").
+        to_return(
+          status: 204,
+          body: "",
+          headers: {'Content-Type' => 'application/json'}
+        )
+
+      Yao::Role.grant("test_role", to:"test_user", on:"admin")
+      assert_received(Yao::Role) { |subject| subject.get("test_role") }
+      assert_received(Yao::User) { |subject| subject.get("test_user") }
+      assert_received(Yao::Project) { |subject| subject.get("admin") }
+      assert_requested(stub)
+    end
+
+    def test_revoke
+      stub_role
+      stub_user
+      stub_project
+      stub = stub_request(:delete, "https://example.com:12345/v3/projects/0123456789abcdef0123456789abcdef/users/2844b2a08be147a08ef58317d6471f1f/roles/5318e65d75574c17bf5339d3df33a5a3").
+        to_return(
+          status: 204,
+          body: "",
+          headers: {'Content-Type' => 'application/json'}
+        )
+
+      Yao::Role.revoke("test_role", from:"test_user", on:"admin")
+      assert_received(Yao::Role) { |subject| subject.get("test_role") }
+      assert_received(Yao::User) { |subject| subject.get("test_user") }
+      assert_received(Yao::Project) { |subject| subject.get("admin") }
+      assert_requested(stub)
+    end
+  end
+
+  private
+  def stub_role
+    stub(Yao::Role).get { Yao::Role.new(
+      "id" => "5318e65d75574c17bf5339d3df33a5a3",
+      "name" => "test_role",
+      "description" => "test_description_1"
+    )}
+  end
+
+  def stub_user
+    stub(Yao::User).get { Yao::User.new({
+      "id" => "2844b2a08be147a08ef58317d6471f1f",
+      "name" => "test_user",
+    }) }
+  end
+  
+  def stub_tenant
+    stub(Yao::Tenant).find_by_name { Yao::Tenant.new({
+      "id" => "0123456789abcdef0123456789abcdef",
+      "name" => "admin",
+    }) }
+  end
+
+  def stub_project
+    stub(Yao::Project).get { Yao::Tenant.new({
+      "id" => "0123456789abcdef0123456789abcdef",
+      "name" => "admin",
+    }) }
+  end
 end

data/test/yao/resources/test_role_assignment.rb

@@ -1,8 +1,4 @@
-class TestRoleAssignment < Test::Unit::TestCase
-
-  def setup
-    Yao.default_client.pool["compute"] = Yao::Client.gen_client("https://example.com:12345")
-  end
+class TestRoleAssignment < TestYaoResource
 
   def test_role_assignment
 
@@ -37,7 +33,7 @@ class TestRoleAssignment < Test::Unit::TestCase
   end
 
   def test_project
-    stub_request(:get, "http://endpoint.example.com:12345/tenants/456789").
+    stub = stub_request(:get, "http://example.com:12345/tenants/456789").
       to_return(
         status: 200,
         body: <<-JSON,
@@ -61,5 +57,7 @@ class TestRoleAssignment < Test::Unit::TestCase
     role_assignment = Yao::RoleAssignment.new(params)
     assert_instance_of(Yao::Resources::Tenant, role_assignment.project)
     assert_equal(role_assignment.project.id, "456789")
+
+    assert_requested(stub)
   end
 end

data/test/yao/resources/test_router.rb

@@ -1,8 +1,4 @@
-class TestRouter < Test::Unit::TestCase
-
-  def setup
-    Yao.default_client.pool["network"] = Yao::Client.gen_client("https://example.com:12345")
-  end
+class TestRouter < TestYaoResource
 
   def test_router
 
@@ -108,7 +104,7 @@ class TestRouter < Test::Unit::TestCase
   end
 
   def test_iterfaces
-    stub_request(:get, "https://example.com:12345/ports?device_id=00000000-0000-0000-0000-000000000000")
+    stub = stub_request(:get, "https://example.com:12345/ports?device_id=00000000-0000-0000-0000-000000000000")
     .to_return(
         status: 200,
         body: <<-JSON,
@@ -129,5 +125,29 @@ class TestRouter < Test::Unit::TestCase
     port   = router.interfaces.first
     assert_instance_of(Yao::Port, port)
     assert_equal(port.id, "00000000-0000-0000-0000-000000000000")
+
+    assert_requested(stub)
+  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'}
+      )
+
+    router = Yao::Router.new('tenant_id' => '0123456789abcdef0123456789abcdef')
+    assert_instance_of(Yao::Tenant, router.tenant)
+    assert_equal(router.tenant.id, '0123456789abcdef0123456789abcdef')
+
+    assert_requested(stub)
   end
 end

data/test/yao/resources/test_sample.rb

@@ -0,0 +1,61 @@
+class TestSample < TestYaoResource
+
+  def test_sample
+
+    # https://docs.openstack.org/ceilometer/pike/webapi/v2.html#Sample
+    params = {
+      "id" => "2e589cbc-738f-11e9-a9b2-bc764e200515",
+      "metadata" => {
+        "name1" => "value1",
+        "name2" => "value2"
+      },
+      "meter" => "instance",
+      "project_id" => "35b17138-b364-4e6a-a131-8f3099c5be68",
+      "recorded_at" => "2015-01-01T12:00:00",
+      "resource_id" => "bd9431c1-8d69-4ad3-803a-8d4a6b89fd36",
+      "source" => "openstack",
+      "timestamp" => "2015-01-01T12:00:00",
+      "type" => "gauge",
+      "unit" => "instance",
+      "user_id" => "efd87807-12d2-4b38-9c70-5f5c2ac427ff",
+      "volume" => 1.0
+    }
+
+    sample = Yao::Resources::Sample.new(params)
+    assert_equal(sample.id, "2e589cbc-738f-11e9-a9b2-bc764e200515")
+    assert_equal(sample.metadata, {
+      "name1" => "value1",
+      "name2" => "value2"
+    })
+    assert_equal(sample.meter, "instance")
+    assert_equal(sample.source, "openstack")
+    assert_equal(sample.type, "gauge")
+    assert_equal(sample.unit, "instance")
+    assert_equal(sample.volume, 1.0)
+    assert_equal(sample.resource_id, "bd9431c1-8d69-4ad3-803a-8d4a6b89fd36")
+    assert_equal(sample.user_id, "efd87807-12d2-4b38-9c70-5f5c2ac427ff")
+    assert_equal(sample.recorded_at, Time.parse("2015-01-01T12:00:00"))
+    assert_equal(sample.timestamp, 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::Sample.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
+end

data/test/yao/resources/test_security_group.rb

@@ -1,4 +1,4 @@
-class TestSecurityGroup < Test::Unit::TestCase
+class TestSecurityGroup < TestYaoResource
   def test_sg_attributes
     params = {
       "id"                   => "test_group_id_1",
@@ -22,4 +22,26 @@ class TestSecurityGroup < Test::Unit::TestCase
     assert_equal(sg.description, "test_description_1")
     assert(sg.rules[0].instance_of?(Yao::SecurityGroupRule))
   end
+
+  def test_sg_to_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'}
+      )
+
+    sg = Yao::SecurityGroup.new('tenant_id' => '0123456789abcdef0123456789abcdef')
+    assert_instance_of(Yao::Tenant, sg.tenant)
+    assert_equal(sg.tenant.id, '0123456789abcdef0123456789abcdef')
+
+    assert_requested(stub)
+  end
 end

data/test/yao/resources/test_security_group_rule.rb

@@ -1,4 +1,4 @@
-class TestSecurityGroup < Test::Unit::TestCase
+class TestSecurityGroup < TestYaoResource
   def test_rule_attributes
     params = {
       "id" => "test_rule_id_1",

data/test/yao/resources/test_server.rb

@@ -1,8 +1,4 @@
-class TestServer < Test::Unit::TestCase
-
-  def setup
-    Yao.default_client.pool["compute"] = Yao::Client.gen_client("https://example.com:12345")
-  end
+class TestServer < TestYaoResource
 
   def test_server
 
@@ -142,8 +138,8 @@ class TestServer < Test::Unit::TestCase
     assert_equal(server.ext_sts_vm_state, "active")
   end
 
-  def test_list_detail
-    stub_request(:get, "https://example.com:12345/servers/detail")
+  def test_list
+    stub = stub_request(:get, "https://example.com:12345/servers/detail")
       .to_return(
         status: 200,
         body: <<-JSON,
@@ -156,9 +152,39 @@ class TestServer < Test::Unit::TestCase
         headers: {'Content-Type' => 'application/json'}
       )
 
-    servers = Yao::Server.list_detail
+    assert(Yao::Server.resources_detail_available)
+
+    servers = Yao::Server.list
     assert_instance_of(Array, servers)
     assert_instance_of(Yao::Server, servers.first)
     assert_equal(servers.first.id, 'dummy')
+
+    assert_requested(stub)
+  end
+
+  def test_list_detail
+    assert_equal(Yao::Server.method(:list_detail), Yao::Server.method(:list))
+  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'}
+      )
+
+    server = Yao::Server.new('tenant_id' => '0123456789abcdef0123456789abcdef')
+    assert_instance_of(Yao::Tenant, server.tenant)
+    assert_equal(server.tenant.id, '0123456789abcdef0123456789abcdef')
+
+    assert_requested(stub)
   end
 end