yao 0.15.0 → 0.18.0

data/test/yao/resources/test_floating_ip.rb

@@ -82,14 +82,14 @@ class TestFloatingIP < TestYaoResource
     assert_requested(stub)
   end
 
-  def test_tenant
+  def test_project
 
-    stub = stub_request(:get, "https://example.com:12345/tenants/0123456789abcdef0123456789abcdef")
+    stub = stub_request(:get, "https://example.com:12345/projects/0123456789abcdef0123456789abcdef")
       .to_return(
          status: 200,
          body: <<-JSON,
         {
-          "tenant": {
+          "project": {
             "id": "0123456789abcdef0123456789abcdef"
           }
         }
@@ -102,8 +102,8 @@ class TestFloatingIP < TestYaoResource
       "tenant_id"  => "0123456789abcdef0123456789abcdef",
     )
 
-    assert_instance_of(Yao::Tenant, fip.tenant)
-    assert_instance_of(Yao::Tenant, fip.project)
+    assert_instance_of(Yao::Project, fip.tenant)
+    assert_instance_of(Yao::Project, fip.project)
     assert_equal('0123456789abcdef0123456789abcdef', fip.tenant.id)
 
     assert_requested(stub)
@@ -131,4 +131,95 @@ class TestFloatingIP < TestYaoResource
 
     assert_requested(stub)
   end
+
+  def test_associate_port
+
+    floating_ip = Yao::FloatingIP.new("id" => "00000000-0000-0000-0000-000000000000")
+    port = Yao::Port.new("id" => "01234567-0123-0123-0123-0123456789ab")
+
+    stub = stub_request(:put, "https://example.com:12345/floatingips/00000000-0000-0000-0000-000000000000").
+      with(
+        body: '{"floatingip":{"port_id":"01234567-0123-0123-0123-0123456789ab"}}'
+      )
+      .to_return(
+        status: 200,
+        body: <<-JSON,
+        {
+          "floatingip": {
+            "id": "00000000-0000-0000-0000-000000000000"
+          }
+        }
+        JSON
+        headers: {'Content-Type' => 'application/json'}
+      )
+
+    resource = Yao::FloatingIP.associate_port(floating_ip.id, port.id)
+    assert_instance_of(Yao::FloatingIP, resource)
+    assert_equal("00000000-0000-0000-0000-000000000000", resource.id)
+
+    assert_requested(stub)
+  end
+
+  sub_test_case 'Yao::FloatingIP#associate_port' do
+
+    def setup
+      stub(Yao::Resources::FloatingIP).associate_port {}
+    end
+
+    def test_associate_port
+      floating_ip = Yao::FloatingIP.new("id" => "00000000-0000-0000-0000-000000000000")
+      port = Yao::Port.new("id" => "01234567-0123-0123-0123-0123456789ab")
+
+      floating_ip.associate_port(port)
+
+      assert_received(Yao::Resources::FloatingIP) { |subject|
+        subject.associate_port(floating_ip.id, port.id)
+      }
+    end
+  end
+
+  def test_disassociate_port
+
+    stub = stub_request(:put, "https://example.com:12345/floatingips/00000000-0000-0000-0000-000000000000").
+      with(
+        body: '{"floatingip":{"port_id":null}}'
+      )
+      .to_return(
+        status: 200,
+        body: <<-JSON,
+        {
+          "floatingip": {
+            "id": "00000000-0000-0000-0000-000000000000"
+          }
+        }
+        JSON
+        headers: {'Content-Type' => 'application/json'}
+      )
+
+    floating_ip = Yao::FloatingIP.new("id" => "00000000-0000-0000-0000-000000000000")
+
+    resource = Yao::FloatingIP.disassociate_port(floating_ip.id)
+    assert_instance_of(Yao::FloatingIP, resource)
+    assert_equal("00000000-0000-0000-0000-000000000000", resource.id)
+
+    assert_requested(stub)
+  end
+
+  sub_test_case 'Yao::FloatingIP#disassociate_port' do
+
+    def setup
+      stub(Yao::Resources::FloatingIP).disassociate_port {}
+    end
+
+    def test_associate_port
+      floating_ip = Yao::FloatingIP.new("id" => "00000000-0000-0000-0000-000000000000")
+      port = Yao::Port.new("id" => "01234567-0123-0123-0123-0123456789ab")
+
+      floating_ip.disassociate_port
+
+      assert_received(Yao::Resources::FloatingIP) { |subject|
+        subject.disassociate_port(floating_ip.id)
+      }
+    end
+  end
 end

data/test/yao/resources/test_loadbalancer_pool.rb

@@ -13,7 +13,14 @@ class TestLoadBalancerPool < TestYaoResource
         "type" => "SOURCE_IP"
       },
       "operating_status" => "ONLINE",
-      "name" => "round_robin_pool"
+      "name" => "round_robin_pool",
+      "members" => [
+        {"id" => "957a1ace-1bd2-449b-8455-820b6e4b63f3"},
+      ],
+      "listeners" => [
+        {"id" => "023f2e34-7806-443b-bfae-16c324569a3d"}
+      ],
+      "healthmonitor_id" => "8ed3c5ac-6efa-420c-bedb-99ba14e58db5",
     }
 
     pool = Yao::Resources::LoadBalancerPool.new(params)
@@ -30,5 +37,143 @@ class TestLoadBalancerPool < TestYaoResource
     }, pool.session_persistence)
     assert_equal("ONLINE", pool.operating_status)
     assert_equal("round_robin_pool", pool.name)
+
+    # https://docs.openstack.org/api-ref/load-balancer/v2/?expanded=show-member-details-detail#show-member-details
+    stub = stub_request(:get, "http://endpoint.example.com:9876/v2.0/lbaas/pools//members/957a1ace-1bd2-449b-8455-820b6e4b63f3")
+          .to_return(
+            status: 200,
+            body: <<-JSON,
+            {
+              "member": {
+                "monitor_port": 8080,
+                "project_id": "e3cd678b11784734bc366148aa37580e",
+                "name": "web-server-1",
+                "weight": 20,
+                "backup": false,
+                "admin_state_up": true,
+                "subnet_id": "bbb35f84-35cc-4b2f-84c2-a6a29bba68aa",
+                "created_at": "2017-05-11T17:21:34",
+                "provisioning_status": "ACTIVE",
+                "monitor_address": null,
+                "updated_at": "2017-05-11T17:21:37",
+                "address": "192.0.2.16",
+                "protocol_port": 80,
+                "id": "957a1ace-1bd2-449b-8455-820b6e4b63f3",
+                "operating_status": "NO_MONITOR",
+                "tags": ["test_tag"]
+              }
+            }
+            JSON
+            headers: {'Content-Type' => 'application/json'}
+          )
+
+    assert_instance_of(Yao::LoadBalancerPoolMember, pool.members.first)
+    assert_equal("957a1ace-1bd2-449b-8455-820b6e4b63f3", pool.members.first.id)
+    assert_equal("web-server-1", pool.members.first.name)
+    assert_requested(stub)
+
+    # https://docs.openstack.org/api-ref/load-balancer/v2/?expanded=show-member-details-detail,show-listener-details-detail,show-pool-details-detail#show-listener-details
+    stub = stub_request(:get, "http://endpoint.example.com:9876/v2.0/lbaas/listeners/023f2e34-7806-443b-bfae-16c324569a3d")
+          .to_return(
+            status: 200,
+            body: <<-JSON,
+            {
+              "listener": {
+                "description": "A great TLS listener",
+                "admin_state_up": true,
+                "project_id": "e3cd678b11784734bc366148aa37580e",
+                "protocol": "TERMINATED_HTTPS",
+                "protocol_port": 443,
+                "provisioning_status": "ACTIVE",
+                "default_tls_container_ref": "http://198.51.100.10:9311/v1/containers/a570068c-d295-4780-91d4-3046a325db51",
+                "loadbalancers": [
+                  {
+                    "id": "607226db-27ef-4d41-ae89-f2a800e9c2db"
+                  }
+                ],
+                "insert_headers": {
+                  "X-Forwarded-Port": "true",
+                  "X-Forwarded-For": "true"
+                },
+                "created_at": "2017-02-28T00:42:44",
+                "updated_at": "2017-02-28T00:44:30",
+                "id": "023f2e34-7806-443b-bfae-16c324569a3d",
+                "operating_status": "ONLINE",
+                "default_pool_id": "ddb2b28f-89e9-45d3-a329-a359c3e39e4a",
+                "sni_container_refs": [
+                  "http://198.51.100.10:9311/v1/containers/a570068c-d295-4780-91d4-3046a325db51",
+                  "http://198.51.100.10:9311/v1/containers/aaebb31e-7761-4826-8cb4-2b829caca3ee"
+                ],
+                "l7policies": [
+                  {
+                    "id": "5e618272-339d-4a80-8d14-dbc093091bb1"
+                  }
+                ],
+                "name": "great_tls_listener",
+                "timeout_client_data": 50000,
+                "timeout_member_connect": 5000,
+                "timeout_member_data": 50000,
+                "timeout_tcp_inspect": 0,
+                "tags": ["test_tag"],
+                "client_ca_tls_container_ref": "http://198.51.100.10:9311/v1/containers/35649991-49f3-4625-81ce-2465fe8932e5",
+                "client_authentication": "MANDATORY",
+                "client_crl_container_ref": "http://198.51.100.10:9311/v1/containers/e222b065-b93b-4e2a-9a02-804b7a118c3c",
+                "allowed_cidrs": [
+                  "192.0.2.0/24",
+                  "198.51.100.0/24"
+                ],
+                "tls_ciphers": "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256",
+                "tls_versions": ["TLSv1.2", "TLSv1.3"],
+                "alpn_protocols": ["http/1.1", "http/1.0"]
+              }
+            }
+            JSON
+            headers: {'Content-Type' => 'application/json'}
+          )
+    assert_instance_of(Yao::LoadBalancerListener, pool.listeners.first)
+    assert_equal("023f2e34-7806-443b-bfae-16c324569a3d", pool.listeners.first.id)
+    assert_equal("great_tls_listener", pool.listeners.first.name)
+    assert_requested(stub)
+
+    # https://docs.openstack.org/api-ref/load-balancer/v2/?expanded=show-member-details-detail,show-listener-details-detail,show-pool-details-detail,show-health-monitor-details-detail#show-health-monitor-details
+    stub = stub_request(:get, "http://endpoint.example.com:9876/v2.0/lbaas/healthmonitors/8ed3c5ac-6efa-420c-bedb-99ba14e58db5")
+          .to_return(
+            status: 200,
+            body: <<-JSON,
+            {
+              "healthmonitor": {
+                "project_id": "e3cd678b11784734bc366148aa37580e",
+                "name": "super-pool-health-monitor",
+                "admin_state_up": true,
+                "pools": [
+                  {
+                    "id": "4029d267-3983-4224-a3d0-afb3fe16a2cd"
+                  }
+                ],
+                "created_at": "2017-05-11T23:53:47",
+                "provisioning_status": "ACTIVE",
+                "updated_at": "2017-05-11T23:53:47",
+                "delay": 10,
+                "expected_codes": "200",
+                "max_retries": 1,
+                "http_method": "GET",
+                "timeout": 5,
+                "max_retries_down": 3,
+                "url_path": "/",
+                "type": "HTTP",
+                "id": "8ed3c5ac-6efa-420c-bedb-99ba14e58db5",
+                "operating_status": "ONLINE",
+                "tags": ["test_tag"],
+                "http_version": 1.0,
+                "domain_name": null
+              }
+            }
+            JSON
+            headers: {'Content-Type' => 'application/json'}
+          )
+    assert_instance_of(Yao::LoadBalancerHealthMonitor, pool.healthmonitor)
+    assert_equal("8ed3c5ac-6efa-420c-bedb-99ba14e58db5", pool.healthmonitor.id)
+    assert_equal("super-pool-health-monitor", pool.healthmonitor.name)
+    assert_requested(stub)
   end
 end

data/test/yao/resources/test_meter.rb

@@ -88,13 +88,13 @@ class TestMeter < TestYaoResource
     assert_requested(stub)
   end
 
-  def test_tenant
-    stub = stub_request(:get, "https://example.com:12345/tenants/00000000-0000-0000-0000-000000000000")
+  def test_project
+    stub = stub_request(:get, "https://example.com:12345/projects/00000000-0000-0000-0000-000000000000")
       .to_return(
         status: 200,
         body: <<-JSON,
         {
-          "tenant": {
+          "project": {
             "id": "00000000-0000-0000-0000-000000000000"
           }
         }
@@ -107,8 +107,8 @@ class TestMeter < TestYaoResource
     }
 
     meter  = Yao::Meter.new(params)
-    assert_instance_of(Yao::Tenant, meter.tenant)
-    assert_equal("00000000-0000-0000-0000-000000000000", meter.tenant.id)
+    assert_instance_of(Yao::Project, meter.project)
+    assert_equal("00000000-0000-0000-0000-000000000000", meter.project.id)
 
     assert_requested(stub)
   end

data/test/yao/resources/test_network.rb

@@ -37,14 +37,14 @@ class TestNetwork < TestYaoResource
     assert_equal(1000, network.segmentation_id)
   end
 
-  def test_tenant
+  def test_project
 
-    stub = stub_request(:get, "https://example.com:12345/tenants/0123456789abcdef0123456789abcdef")
+    stub = stub_request(:get, "https://example.com:12345/projects/0123456789abcdef0123456789abcdef")
       .to_return(
          status: 200,
          body: <<-JSON,
         {
-          "tenant": {
+          "project": {
             "id": "0123456789abcdef0123456789abcdef"
           }
         }
@@ -57,9 +57,9 @@ class TestNetwork < TestYaoResource
       "tenant_id"  => "0123456789abcdef0123456789abcdef",
     )
 
-    assert_instance_of(Yao::Tenant, network.tenant)
-    assert_instance_of(Yao::Tenant, network.project)
-    assert_equal('0123456789abcdef0123456789abcdef', network.tenant.id)
+    assert_instance_of(Yao::Project, network.tenant)
+    assert_instance_of(Yao::Project, network.project)
+    assert_equal('0123456789abcdef0123456789abcdef', network.project.id)
 
     assert_requested(stub)
   end

data/test/yao/resources/test_port.rb

@@ -77,14 +77,14 @@ class TestPort < TestYaoResource
     assert_equal("10.0.0.1", port.primary_ip)
   end
 
-  def test_tenant
+  def test_project
 
-    stub = stub_request(:get, "https://example.com:12345/tenants/0123456789abcdef0123456789abcdef")
+    stub = stub_request(:get, "https://example.com:12345/projects/0123456789abcdef0123456789abcdef")
       .to_return(
         status: 200,
         body: <<-JSON,
         {
-          "tenant": {
+          "project": {
             "id": "0123456789abcdef0123456789abcdef"
           }
         }
@@ -92,9 +92,9 @@ class TestPort < TestYaoResource
         headers: {'Content-Type' => 'application/json'}
       )
 
-    port = Yao::Port.new('tenant_id' => '0123456789abcdef0123456789abcdef')
-    assert_instance_of(Yao::Tenant, port.tenant)
-    assert_equal('0123456789abcdef0123456789abcdef', port.tenant.id)
+    port = Yao::Port.new('project_id' => '0123456789abcdef0123456789abcdef')
+    assert_instance_of(Yao::Project, port.project)
+    assert_equal('0123456789abcdef0123456789abcdef', port.project.id)
 
     assert_requested(stub)
   end
@@ -170,4 +170,52 @@ class TestPort < TestYaoResource
 
     assert_requested(stub)
   end
+
+  def test_floating_ip
+
+    stub = stub_request(:get, "https://example.com:12345/floatingips?port_id")
+      .to_return(
+        status: 200,
+        body: <<-JSON,
+        {
+          "floatingips": [{
+            "id": "00000000-0000-0000-0000-000000000000"
+          }]
+        }
+        JSON
+        headers: {'Content-Type' => 'application/json'}
+      )
+
+    params = {
+      "port_id" => "00000000-0000-0000-0000-000000000000",
+    }
+
+    port = Yao::Port.new(params)
+    assert_instance_of(Yao::FloatingIP, port.floating_ip)
+    assert_true(port.has_floating_ip?)
+    assert_requested(stub)
+  end
+
+  def test_floating_ip_empty
+
+    stub = stub_request(:get, "https://example.com:12345/floatingips?port_id")
+      .to_return(
+        status: 200,
+        body: <<-JSON,
+        {
+          "floatingips": []
+        }
+        JSON
+        headers: {'Content-Type' => 'application/json'}
+      )
+
+    params = {
+      "port_id" => "00000000-0000-0000-0000-000000000000",
+    }
+
+    port = Yao::Port.new(params)
+    assert_nil(port.floating_ip)
+    assert_false(port.has_floating_ip?)
+    assert_requested(stub)
+  end
 end

data/test/yao/resources/test_restfully_accessible.rb

@@ -1,6 +1,18 @@
 class TestRestfullyAccesible < Test::Unit::TestCase
   include RestfullyAccessibleStub
   class Test
+    def initialize(data_via_json)
+      @data = data_via_json
+    end
+
+    def id
+      @data['id']
+    end
+
+    def name
+      @data['name']
+    end
+
     class << self
       attr_accessor :client
     end
@@ -45,7 +57,7 @@ class TestRestfullyAccesible < Test::Unit::TestCase
 
       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) }
+      mock(Test).new("dummy_resource") { Struct.new(:id, :name).new(uuid, name) }
       stub_get_request([@url, @resources_name, uuid].join('/'), @resources_name)
       mock(Test).new("dummy_resource") { "OK" }
 
@@ -60,7 +72,7 @@ class TestRestfullyAccesible < Test::Unit::TestCase
 
       stub_get_request_not_found([@url, @resources_name, name].join('/'))
       stub_get_request_with_json_response([@url, "#{@resources_name}?name=dummy"].join('/'), body)
-      mock(Test).new("dummy_resources") { Struct.new(:id).new(uuid) }
+      mock(Test).new("dummy_resources") { Struct.new(:id, :name).new(uuid, name) }
       stub_get_request([@url, @resources_name, uuid].join('/'), @resource_name)
       mock(Test).new("dummy_resource") { "OK" }
 
@@ -76,7 +88,7 @@ class TestRestfullyAccesible < Test::Unit::TestCase
       stub_get_request_not_found([@url, @resources_name, name].join('/'))
       stub_get_request_with_json_response([@url, "#{@resources_name}?name=#{name}"].join('/'), body)
 
-      assert_raise(Yao::InvalidResponse, "raise proper exception") do
+      assert_raise(Yao::ItemNotFound, "raise proper exception") do
         Test.get(name)
       end
     end
@@ -84,8 +96,17 @@ class TestRestfullyAccesible < Test::Unit::TestCase
 
   sub_test_case 'get!' do
     test 'not found' do
-      stub_get_request_not_found("https://example.com/dummy_resource")
-      assert_equal(nil, Test.get!("https://example.com/dummy_resource"))
+      Test.return_single_on_querying = false
+      name = "dummy"
+      uuid = "00112233-4455-6677-8899-aabbccddeeff"
+      body = {@resources_name => []}
+
+      stub1 = stub_get_request_not_found([@url, @resources_name, name].join('/'))
+      stub2 = stub_get_request_with_json_response([@url, "#{@resources_name}?name=#{name}"].join('/'), body)
+
+      assert_equal(nil, Test.get!(name))
+      assert_requested(stub1)
+      assert_requested(stub2)
     end
 
     test 'found' do
@@ -103,6 +124,63 @@ class TestRestfullyAccesible < Test::Unit::TestCase
     end
   end
 
+  sub_test_case 'get_by_name' do
+    test 'multiple found' do
+      name = 'dummy'
+      uuid = '00112233-4455-6677-8899-aabbccddeeff'
+      list_body = { @resources_name => [
+        { 'name' => 'dummy', 'id' => uuid },
+        { 'name' => 'dummy2', 'id' => '308cb410-9c84-40ec-a3eb-583001aaa7fd' }
+      ]}
+      get_body = { @resource_name => { 'name' => 'dummy', 'id' => uuid } }
+      stub1 = stub_get_request_not_found([@url, @resources_name, name].join('/'))
+      stub2 = stub_get_request_with_json_response([@url, "#{@resources_name}?name=#{name}"].join('/'), list_body)
+      stub3 = stub_get_request_with_json_response([@url, @resources_name, name].join('/'), get_body)
+
+      assert_equal(uuid, Test.send(:get_by_name, 'dummy').body[@resource_name]['id'])
+    end
+
+    test 'multiple same name found' do
+      name = 'dummy'
+      uuid = '00112233-4455-6677-8899-aabbccddeeff'
+      list_body = { @resources_name => [
+        { 'name' => 'dummy', 'id' => uuid },
+        { 'name' => 'dummy', 'id' => '308cb410-9c84-40ec-a3eb-583001aaa7fd' }
+      ]}
+      stub1 = stub_get_request_not_found([@url, @resources_name, name].join('/'))
+      stub2 = stub_get_request_with_json_response([@url, "#{@resources_name}?name=#{name}"].join('/'), list_body)
+
+      assert_raise(Yao::TooManyItemFonud, "More than one resource exists with the name '#{name}'") do
+        Test.send(:get_by_name, name)
+      end
+    end
+
+    test 'empty name' do
+      assert_raise(Yao::InvalidRequest, "Invalid requeset with empty name or nil") do
+        Test.send(:get_by_name, '')
+      end
+    end
+
+    test 'nil' do
+      assert_raise(Yao::InvalidRequest, "Invalid requeset with empty name or nil") do
+        Test.send(:get_by_name, nil)
+      end
+    end
+
+    test 'not found' do
+      name = "dummy"
+      uuid = "00112233-4455-6677-8899-aabbccddeeff"
+      body = {@resources_name => []}
+
+      stub1 = stub_get_request_not_found([@url, @resources_name, name].join('/'))
+      stub2 = stub_get_request_with_json_response([@url, "#{@resources_name}?name=#{name}"].join('/'), body)
+
+      assert_raise(Yao::ItemNotFound) do
+        Test.send(:get_by_name, name)
+      end
+    end
+  end
+
   def test_find_by_name
     mock(Test).list({"name" => "dummy"}) { "dummy" }
 
@@ -116,4 +194,8 @@ class TestRestfullyAccesible < Test::Unit::TestCase
     assert_equal(false, Test.send(:uuid?, "dummy resource"))
     assert_equal(false, Test.send(:uuid?, "00112233445566778899aabbccddeeff"))
   end
+
+  def test_delete
+    assert_equal(Test.method(:delete), Test.method(:destroy))
+  end
 end

data/test/yao/resources/test_role_assignment.rb

@@ -130,12 +130,12 @@ class TestRoleAssignment < TestYaoResource
   end
 
   def test_project
-    stub = stub_request(:get, "https://example.com:12345/tenants/456789").
+    stub = stub_request(:get, "https://example.com:12345/projects/456789").
       to_return(
         status: 200,
         body: <<-JSON,
         {
-          "tenant": {
+          "project": {
             "id": "456789"
           }
         }
@@ -152,7 +152,7 @@ class TestRoleAssignment < TestYaoResource
     }
 
     role_assignment = Yao::RoleAssignment.new(params)
-    assert_instance_of(Yao::Resources::Tenant, role_assignment.project)
+    assert_instance_of(Yao::Project, role_assignment.project)
     assert_equal("456789", role_assignment.project.id)
 
     assert_requested(stub)

data/test/yao/resources/test_router.rb

@@ -95,12 +95,33 @@ class TestRouter < TestYaoResource
     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.external_fixed_ips '')
-    assert_equal(router.destination '')
-    assert_equal(router.nexthop '')
+    stub = stub_request(:get, "https://example.com:12345/networks/ae34051f-aa6c-4c75-abf5-50dc9ac99ef3")
+           .to_return(
+             status: 200,
+             body: <<~JSON,
+             {
+               "network": {
+                 "id": "ae34051f-aa6c-4c75-abf5-50dc9ac99ef3",
+                 "name": "example-network"
+               }
+             }
+             JSON
+             headers: {'Content-Type' => 'application/json'}
+            )
+    assert_instance_of(Yao::Network, router.external_network)
+    assert_equal("ae34051f-aa6c-4c75-abf5-50dc9ac99ef3", router.external_network.id)
+    assert_equal("example-network", router.external_network.name)
+    assert_equal(true, router.enable_snat)
+    assert_equal([
+      {
+        "ip_address" => "172.24.4.3",
+        "subnet_id" => "b930d7f6-ceb7-40a0-8b81-a425dd994ccf"
+      },
+      {
+        "ip_address" => "2001:db8::c",
+        "subnet_id" => "0c56df5d-ace5-46c8-8f4c-45fa4e334d18"
+      }
+    ], router.external_fixed_ips)
   end
 
   def test_iterfaces
@@ -129,14 +150,14 @@ class TestRouter < TestYaoResource
     assert_requested(stub)
   end
 
-  def test_tenant
+  def test_project
 
-    stub = stub_request(:get, "https://example.com:12345/tenants/0123456789abcdef0123456789abcdef")
+    stub = stub_request(:get, "https://example.com:12345/projects/0123456789abcdef0123456789abcdef")
       .to_return(
         status: 200,
         body: <<-JSON,
         {
-          "tenant": {
+          "project": {
             "id": "0123456789abcdef0123456789abcdef"
           }
         }
@@ -144,9 +165,9 @@ class TestRouter < TestYaoResource
         headers: {'Content-Type' => 'application/json'}
       )
 
-    router = Yao::Router.new('tenant_id' => '0123456789abcdef0123456789abcdef')
-    assert_instance_of(Yao::Tenant, router.tenant)
-    assert_equal('0123456789abcdef0123456789abcdef', router.tenant.id)
+    router = Yao::Router.new('project_id' => '0123456789abcdef0123456789abcdef')
+    assert_instance_of(Yao::Project, router.project)
+    assert_equal('0123456789abcdef0123456789abcdef', router.project.id)
 
     assert_requested(stub)
   end