yao 0.8.0 → 0.9.0

data/test/yao/resources/test_role.rb

@@ -6,8 +6,8 @@ class TestRole < TestYaoResource
     }
 
     role = Yao::Role.new(params)
-    assert_equal(role.name, "test_role")
-    assert_equal(role.description, "test_description_1")
+    assert_equal("test_role", role.name)
+    assert_equal("test_description_1", role.description)
   end
 
   sub_test_case 'with keystone v2.0' do
@@ -35,7 +35,7 @@ class TestRole < TestYaoResource
       roles = Yao::Role.find_by_name("admin")
 
       assert_instance_of(Yao::Role, roles.first)
-      assert_equal(roles.first.id, "0123456789abcdef0123456789abcdef")
+      assert_equal("0123456789abcdef0123456789abcdef", roles.first.id)
       assert_requested(stub)
     end
 
@@ -57,7 +57,7 @@ class TestRole < TestYaoResource
       roles = Yao::Role.list
 
       assert_instance_of(Yao::Role, roles.first)
-      assert_equal(roles.first.id, "0123456789abcdef0123456789abcdef")
+      assert_equal("0123456789abcdef0123456789abcdef", roles.first.id)
       assert_requested(stub)
     end
     
@@ -79,7 +79,7 @@ class TestRole < TestYaoResource
         )
       
       roles = Yao::Role.list_for_user("test_user", on:"admin")
-      assert_equal(roles.first.id, "0123456789abcdef0123456789abcdef")
+      assert_equal("0123456789abcdef0123456789abcdef", roles.first.id)
       assert_received(Yao::User) { |subject| subject.get("test_user") }
       assert_received(Yao::Tenant) { |subject| subject.find_by_name("admin") }
       assert_requested(stub)
@@ -147,7 +147,7 @@ class TestRole < TestYaoResource
       roles = Yao::Role.find_by_name("admin")
 
       assert_instance_of(Yao::Role, roles.first)
-      assert_equal(roles.first.id, "0123456789abcdef0123456789abcdef")
+      assert_equal("0123456789abcdef0123456789abcdef", roles.first.id)
       assert_requested(stub)
     end
 
@@ -169,7 +169,7 @@ class TestRole < TestYaoResource
       roles = Yao::Role.list
 
       assert_instance_of(Yao::Role, roles.first)
-      assert_equal(roles.first.id, "0123456789abcdef0123456789abcdef")
+      assert_equal("0123456789abcdef0123456789abcdef", roles.first.id)
       assert_requested(stub)
     end
     
@@ -191,7 +191,7 @@ class TestRole < TestYaoResource
         )
       
       roles = Yao::Role.list_for_user("test_user", on:"admin")
-      assert_equal(roles.first.id, "0123456789abcdef0123456789abcdef")
+      assert_equal("0123456789abcdef0123456789abcdef", roles.first.id)
       assert_received(Yao::Resources::User) { |subject| subject.get("test_user") }
       assert_received(Yao::Resources::Project) { |subject| subject.get("admin") }
       assert_requested(stub)

data/test/yao/resources/test_role_assignment.rb

@@ -21,15 +21,15 @@ class TestRoleAssignment < TestYaoResource
     }
 
     role_assignment = Yao::RoleAssignment.new(params)
-    assert_equal(role_assignment.scope, { "project" => { "id" => "456789" } })
+    assert_equal({ "project" => { "id" => "456789" } }, role_assignment.scope)
 
     # map_attribute_to_resource
     assert_instance_of(Yao::Resources::Role, role_assignment.role)
-    assert_equal(role_assignment.role.id, "123456")
+    assert_equal("123456", role_assignment.role.id)
 
     # map_attribute_to_resource
     assert_instance_of(Yao::Resources::User, role_assignment.user)
-    assert_equal(role_assignment.user.id, "313233")
+    assert_equal("313233", role_assignment.user.id)
   end
 
   def test_project
@@ -56,7 +56,7 @@ class TestRoleAssignment < TestYaoResource
 
     role_assignment = Yao::RoleAssignment.new(params)
     assert_instance_of(Yao::Resources::Tenant, role_assignment.project)
-    assert_equal(role_assignment.project.id, "456789")
+    assert_equal("456789", role_assignment.project.id)
 
     assert_requested(stub)
   end

data/test/yao/resources/test_router.rb

@@ -59,16 +59,16 @@ class TestRouter < TestYaoResource
 
     router = Yao::Router.new(params)
 
-    assert_equal(router.id, "915a14a6-867b-4af7-83d1-70efceb146f9")
+    assert_equal("915a14a6-867b-4af7-83d1-70efceb146f9", router.id)
 
     # friendly_attributes
-    assert_equal(router.tenant_id, "0bd18306d801447bb457a46252d82d13")
-    assert_equal(router.project_id, "0bd18306d801447bb457a46252d82d13")
-    assert_equal(router.name, "router2")
-    assert_equal(router.description, "")
-    assert_equal(router.admin_state_up, true)
-    assert_equal(router.status, "ACTIVE")
-    assert_equal(router.external_gateway_info, {
+    assert_equal("0bd18306d801447bb457a46252d82d13", router.tenant_id)
+    assert_equal("0bd18306d801447bb457a46252d82d13", router.project_id)
+    assert_equal("router2", router.name)
+    assert_equal("", router.description)
+    assert_equal(true, router.admin_state_up)
+    assert_equal("ACTIVE", router.status)
+    assert_equal({
       "enable_snat" => true,
       "external_fixed_ips" => [
         {
@@ -81,23 +81,23 @@ class TestRouter < TestYaoResource
         }
       ],
       "network_id" => "ae34051f-aa6c-4c75-abf5-50dc9ac99ef3"
-    })
+    }, router.external_gateway_info)
 
-    assert_equal(router.routes, [
+    assert_equal([
       {
         "destination" => "179.24.1.0/24",
         "nexthop" => "172.24.3.99"
       }
-    ])
+    ], router.routes)
 
-    assert_equal(router.distributed, false)
-    assert_equal(router.ha, false)
-    assert_equal(router.availability_zone_hints, [])
-    assert_equal(router.availability_zones, [ "nova" ])
+    assert_equal(false, router.distributed)
+    assert_equal(false, router.ha)
+    assert_equal([], router.availability_zone_hints)
+    assert_equal([ "nova" ], router.availability_zones)
 
     pend 'oops. These are invalid friendly_attributes'
-    assert_equal(router.network_id,  '')
-    assert_equal(router.enable_snat, '')
+    assert_equal( '', router.network_id)
+    assert_equal('', router.enable_snat)
     assert_equal(router.external_fixed_ips '')
     assert_equal(router.destination '')
     assert_equal(router.nexthop '')
@@ -124,7 +124,7 @@ class TestRouter < TestYaoResource
     router = Yao::Router.new(params)
     port   = router.interfaces.first
     assert_instance_of(Yao::Port, port)
-    assert_equal(port.id, "00000000-0000-0000-0000-000000000000")
+    assert_equal("00000000-0000-0000-0000-000000000000", port.id)
 
     assert_requested(stub)
   end
@@ -146,7 +146,7 @@ class TestRouter < TestYaoResource
 
     router = Yao::Router.new('tenant_id' => '0123456789abcdef0123456789abcdef')
     assert_instance_of(Yao::Tenant, router.tenant)
-    assert_equal(router.tenant.id, '0123456789abcdef0123456789abcdef')
+    assert_equal('0123456789abcdef0123456789abcdef', router.tenant.id)
 
     assert_requested(stub)
   end

data/test/yao/resources/test_sample.rb

@@ -22,20 +22,20 @@ class TestSample < TestYaoResource
     }
 
     sample = Yao::Resources::Sample.new(params)
-    assert_equal(sample.id, "2e589cbc-738f-11e9-a9b2-bc764e200515")
-    assert_equal(sample.metadata, {
+    assert_equal("2e589cbc-738f-11e9-a9b2-bc764e200515", sample.id)
+    assert_equal({
       "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"))
+    }, sample.metadata)
+    assert_equal("instance", sample.meter)
+    assert_equal("openstack", sample.source)
+    assert_equal("gauge", sample.type)
+    assert_equal("instance", sample.unit)
+    assert_equal(1.0, sample.volume)
+    assert_equal("bd9431c1-8d69-4ad3-803a-8d4a6b89fd36", sample.resource_id)
+    assert_equal("efd87807-12d2-4b38-9c70-5f5c2ac427ff", sample.user_id)
+    assert_equal(Time.parse("2015-01-01T12:00:00"), sample.recorded_at)
+    assert_equal(Time.parse("2015-01-01T12:00:00"), sample.timestamp)
   end
 
   def test_resource
@@ -54,7 +54,7 @@ class TestSample < TestYaoResource
     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_equal("00000000-0000-0000-0000-000000000000", sample.resource.id)
 
     assert_requested(stub)
   end

data/test/yao/resources/test_security_group.rb

@@ -17,9 +17,9 @@ class TestSecurityGroup < TestYaoResource
     }
 
     sg = Yao::SecurityGroup.new(params)
-    assert_equal(sg.name, "test_group_name_1")
-    assert_equal(sg.id, "test_group_id_1")
-    assert_equal(sg.description, "test_description_1")
+    assert_equal("test_group_name_1", sg.name)
+    assert_equal("test_group_id_1", sg.id)
+    assert_equal("test_description_1", sg.description)
     assert(sg.rules[0].instance_of?(Yao::SecurityGroupRule))
   end
 
@@ -40,7 +40,7 @@ class TestSecurityGroup < TestYaoResource
 
     sg = Yao::SecurityGroup.new('tenant_id' => '0123456789abcdef0123456789abcdef')
     assert_instance_of(Yao::Tenant, sg.tenant)
-    assert_equal(sg.tenant.id, '0123456789abcdef0123456789abcdef')
+    assert_equal('0123456789abcdef0123456789abcdef', sg.tenant.id)
 
     assert_requested(stub)
   end

data/test/yao/resources/test_security_group_rule.rb

@@ -14,10 +14,10 @@ class TestSecurityGroup < TestYaoResource
     }
 
     rule = Yao::SecurityGroupRule.new(params)
-    assert_equal(rule.id, "test_rule_id_1")
-    assert_equal(rule.protocol, "tcp")
-    assert_equal(rule.port_range_max, "443")
-    assert_equal(rule.port_range_min, "443")
-    assert_equal(rule.ethertype, "IPv4")
+    assert_equal("test_rule_id_1", rule.id)
+    assert_equal("tcp", rule.protocol)
+    assert_equal("443", rule.port_range_max)
+    assert_equal("443", rule.port_range_min)
+    assert_equal("IPv4", rule.ethertype)
   end
 end

data/test/yao/resources/test_server.rb

@@ -92,8 +92,8 @@ class TestServer < TestYaoResource
     server = Yao::Server.new(params)
 
     # friendly_attributes
-    assert_equal(server.id, "2ce4c5b3-2866-4972-93ce-77a2ea46a7f9")
-    assert_equal(server.addresses, {
+    assert_equal("2ce4c5b3-2866-4972-93ce-77a2ea46a7f9", server.id)
+    assert_equal({
       "private" => [
         {
           "OS-EXT-IPS-MAC:mac_addr" => "aa:bb:cc:dd:ee:ff",
@@ -102,40 +102,40 @@ class TestServer < TestYaoResource
           "version" => 4
         }
       ]
-    })
-    assert_equal(server.metadata, { "My Server Name" => "Apache1" })
-    assert_equal(server.name, "new-server-test")
-    assert_equal(server.progress, 0)
-    assert_equal(server.status, "ACTIVE")
-    assert_equal(server.tenant_id, "6f70656e737461636b20342065766572")
-    assert_equal(server.user_id, "fake")
-    assert_equal(server.key_name, nil)
+    }, server.addresses)
+    assert_equal({ "My Server Name" => "Apache1" }, server.metadata)
+    assert_equal("new-server-test", server.name)
+    assert_equal(0, server.progress)
+    assert_equal("ACTIVE", server.status)
+    assert_equal("6f70656e737461636b20342065766572", server.tenant_id)
+    assert_equal("fake", server.user_id)
+    assert_equal(nil, server.key_name)
 
     # map_attribute_to_attribute
-    assert_equal(server.host_id, "2091634baaccdc4c5a1d57069c833e402921df696b7f970791b12ec6")
+    assert_equal("2091634baaccdc4c5a1d57069c833e402921df696b7f970791b12ec6", server.host_id)
 
     # map_attribute_to_resource - flavor
     assert_instance_of(Yao::Resources::Flavor, server.flavor)
-    assert_equal(server.flavor.disk, 1)
+    assert_equal(1, server.flavor.disk)
 
     # map_attribute_to_resource - image
     assert_instance_of(Yao::Resources::Image, server.image)
-    assert_equal(server.image.id, "70a599e0-31e7-49b7-b260-868f441e862b")
+    assert_equal("70a599e0-31e7-49b7-b260-868f441e862b", server.image.id)
 
     # map_attribute_to_resource - security_groups
     assert_instance_of(Array, server.security_groups)
     assert_instance_of(Yao::Resources::SecurityGroup, server.security_groups.first)
-    assert_equal(server.security_groups.first.name, "default")
+    assert_equal("default", server.security_groups.first.name)
 
     # map_attribute_to_attribute
-    assert_equal(server.availability_zone, "nova")
-    assert_equal(server.dcf_disk_config, "AUTO")
-    assert_equal(server.ext_srv_attr_host, "compute")
-    assert_equal(server.ext_srv_attr_hypervisor_hostname, "fake-mini")
-    assert_equal(server.ext_srv_attr_instance_name, "instance-00000001")
-    assert_equal(server.ext_sts_power_state, 1)
-    assert_equal(server.ext_sts_task_state, nil)
-    assert_equal(server.ext_sts_vm_state, "active")
+    assert_equal("nova", server.availability_zone)
+    assert_equal("AUTO", server.dcf_disk_config)
+    assert_equal("compute", server.ext_srv_attr_host)
+    assert_equal("fake-mini", server.ext_srv_attr_hypervisor_hostname)
+    assert_equal("instance-00000001", server.ext_srv_attr_instance_name)
+    assert_equal(1, server.ext_sts_power_state)
+    assert_equal(nil, server.ext_sts_task_state)
+    assert_equal("active", server.ext_sts_vm_state)
   end
 
   def test_list
@@ -157,13 +157,13 @@ class TestServer < TestYaoResource
     servers = Yao::Server.list
     assert_instance_of(Array, servers)
     assert_instance_of(Yao::Server, servers.first)
-    assert_equal(servers.first.id, 'dummy')
+    assert_equal('dummy', servers.first.id)
 
     assert_requested(stub)
   end
 
   def test_list_detail
-    assert_equal(Yao::Server.method(:list_detail), Yao::Server.method(:list))
+    assert_equal(Yao::Server.method(:list), Yao::Server.method(:list_detail))
   end
 
   def test_tenant
@@ -183,7 +183,7 @@ class TestServer < TestYaoResource
 
     server = Yao::Server.new('tenant_id' => '0123456789abcdef0123456789abcdef')
     assert_instance_of(Yao::Tenant, server.tenant)
-    assert_equal(server.tenant.id, '0123456789abcdef0123456789abcdef')
+    assert_equal('0123456789abcdef0123456789abcdef', server.tenant.id)
 
     assert_requested(stub)
   end

data/test/yao/resources/test_subnet.rb

@@ -36,19 +36,19 @@ class TestSubnet < TestYaoResource
     subnet = Yao::Subnet.new(params)
 
     # friendly_attributes
-    assert_equal(subnet.name, "private-subnet")
-    assert_equal(subnet.cidr, "10.0.0.0/24")
-    assert_equal(subnet.gateway_ip, "10.0.0.1")
-    assert_equal(subnet.network_id, "db193ab3-96e3-4cb3-8fc5-05f4296d0324")
-    assert_equal(subnet.tenant_id, "26a7980765d0414dbc1fc1f88cdb7e6e")
-    assert_equal(subnet.ip_version, 4)
-    assert_equal(subnet.dns_nameservers, [])
-    assert_equal(subnet.host_routes, [])
-    assert_equal(subnet.enable_dhcp, true)
-    assert_equal(subnet.dhcp_enabled?, true) # alias
+    assert_equal("private-subnet", subnet.name)
+    assert_equal("10.0.0.0/24", subnet.cidr)
+    assert_equal("10.0.0.1", subnet.gateway_ip)
+    assert_equal("db193ab3-96e3-4cb3-8fc5-05f4296d0324", subnet.network_id)
+    assert_equal("26a7980765d0414dbc1fc1f88cdb7e6e", subnet.tenant_id)
+    assert_equal(4, subnet.ip_version)
+    assert_equal([], subnet.dns_nameservers)
+    assert_equal([], subnet.host_routes)
+    assert_equal(true, subnet.enable_dhcp)
+    assert_equal(true, subnet.dhcp_enabled?) # alias
 
     # #allocation_pools
-    assert_equal(subnet.allocation_pools, ["10.0.0.2".."10.0.0.254"])
+    assert_equal(["10.0.0.2".."10.0.0.254"], subnet.allocation_pools)
   end
 
   def test_network
@@ -71,7 +71,7 @@ class TestSubnet < TestYaoResource
 
     subnet = Yao::Subnet.new(params)
     assert_instance_of(Yao::Resources::Network, subnet.network)
-    assert_equal(subnet.network.id, "00000000-0000-0000-0000-000000000000")
+    assert_equal("00000000-0000-0000-0000-000000000000", subnet.network.id)
 
     assert_requested(stub)
   end
@@ -92,7 +92,7 @@ class TestSubnet < TestYaoResource
 
     subnet = Yao::Subnet.new('tenant_id' => '0123456789abcdef0123456789abcdef')
     assert_instance_of(Yao::Tenant, subnet.tenant)
-    assert_equal(subnet.tenant.id, '0123456789abcdef0123456789abcdef')
+    assert_equal('0123456789abcdef0123456789abcdef', subnet.tenant.id)
 
     assert_requested(stub)
   end

data/test/yao/resources/test_user.rb

@@ -7,8 +7,8 @@ class TestUser < TestYaoResource
     }
 
     user = Yao::User.new(params)
-    assert_equal(user.name, "test_user")
-    assert_equal(user.email, "test-user@example.com")
+    assert_equal("test_user", user.name)
+    assert_equal("test-user@example.com", user.email)
   end
 
   sub_test_case 'with keystone v2.0' do
@@ -37,7 +37,7 @@ class TestUser < TestYaoResource
 
         roles = Yao::User.find_by_name("test_user")
         assert_instance_of(Array, roles)
-        assert_equal(roles.first.id, "u1000")
+        assert_equal("u1000", roles.first.id)
         assert_requested(stub)
     end
   end
@@ -78,7 +78,7 @@ class TestUser < TestYaoResource
 
         roles = Yao::User.find_by_name("test_user")
         assert_instance_of(Array, roles)
-        assert_equal(roles.first.id, "2844b2a08be147a08ef58317d6471f1f")
+        assert_equal("2844b2a08be147a08ef58317d6471f1f", roles.first.id)
         assert_requested(stub)
     end
   end

data/test/yao/resources/test_volume.rb

@@ -6,8 +6,8 @@ class TestVolume < TestYaoResource
     }
 
     volume = Yao::Volume.new(params)
-    assert_equal('cinder', volume.name)
-    assert_equal(10, volume.size)
+    assert_equal(volume.name, 'cinder')
+    assert_equal(volume.size, 10)
   end
 
   def test_list
@@ -31,12 +31,12 @@ class TestVolume < TestYaoResource
 
     volumes = Yao::Volume.list
     assert_instance_of(Yao::Volume, volumes.first)
-    assert_equal(volumes.first.id, "00000000-0000-0000-0000-000000000000")
+    assert_equal("00000000-0000-0000-0000-000000000000", volumes.first.id)
 
     assert_requested(stub)
   end
 
   def test_list_detail
-    assert_equal(Yao::Volume.method(:list_detail), Yao::Volume.method(:list))
+    assert_equal(Yao::Volume.method(:list), Yao::Volume.method(:list_detail))
   end
 end

data/test/yao/resources/test_volume_type.rb

@@ -7,8 +7,8 @@ class TestVolumeType < TestYaoResource
     }
 
     volume = Yao::VolumeType.new(params)
-    assert_equal('test_volume', volume.name)
-    assert_equal('this is test volume', volume.description)
-    assert_equal(true, volume.is_public)
+    assert_equal(volume.name, 'test_volume')
+    assert_equal(volume.description, 'this is test volume')
+    assert_equal(volume.is_public, true)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yao
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Uchio, KONDO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-10 00:00:00.000000000 Z
+date: 2019-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json