Update tests after API changes on DevCloud

Author: mawilk90

test/integration/conftest.py

@@ -737,7 +737,7 @@ def create_reserved_ip(test_linode_client):
     region = get_region(client, {"Linodes", "Cloud Firewall"}, site_type="core")
     reserved_ip = client.networking.reserved_ip_create(
         region=region,
-        tags=["test1"]
+        tags=["test"]
     )
 
     yield reserved_ip

test/integration/models/linode/interfaces/test_interfaces.py

@@ -417,6 +417,7 @@ def test_linode_interfaces_with_reserved_ips(test_linode_client, e2e_test_firewa
     assert len(linode_ips) == 1
     assert linode_ips[0].address == reserved_ip.address
     assert linode_ips[0].reserved == True
+    # assert linode_ips[0].tags == ["test"]  # TODO Does not work at the moment - during clarifications with API Team
     assert linode_ips[0].linode_id == linode.id
     assert linode_ips[0].assigned_entity.id == linode.id
     assert linode_ips[0].assigned_entity.type == "linode"
@@ -427,5 +428,6 @@ def test_linode_interfaces_with_reserved_ips(test_linode_client, e2e_test_firewa
     reserved_ips_list = client.networking.reserved_ips(ReservedIPAddress.address==reserved_ip.address)
     assert len(reserved_ips_list) == 1
     assert reserved_ips_list[0].reserved == True
+    # assert linode_ips[0].tags == ["test"]  # TODO Does not work at the moment - during clarifications with API Team
     assert reserved_ips_list[0].linode_id is None
     assert reserved_ips_list[0].assigned_entity is None

test/integration/models/networking/test_networking.py

@@ -1,4 +1,5 @@
 import ipaddress
+import requests
 import time
 from test.integration.conftest import (
     get_api_ca_file,
@@ -394,7 +395,7 @@ def test_create_reserved_ip(request, test_linode_client, region, tags):
     request.addfinalizer(reserved_ip.delete)
 
     verify_reserved_ip(reserved_ip)
-    # assert reserved_ip.tags == tags  # NOTE: Skipped as tags not available in the API yet
+    assert reserved_ip.tags == tags if tags else reserved_ip.tags == []
 
 
 def test_create_reserved_ip_wo_region_fail(test_linode_client):
@@ -411,7 +412,6 @@ def test_create_reserved_ip_wo_region_fail(test_linode_client):
     assert "region is required" in error_msg
 
 
-@pytest.mark.skip   # NOTE: Skipped as tags not available in the API yet
 def test_update_reserved_ip_tags(test_linode_client, create_reserved_ip):
     client = test_linode_client
     reserved_ip = create_reserved_ip
@@ -428,19 +428,18 @@ def test_update_reserved_ip_tags(test_linode_client, create_reserved_ip):
 def test_create_reserved_ip_assigned(test_linode_client, create_reserved_ip_assigned):
     client = test_linode_client
     linode, reserved_ip = create_reserved_ip_assigned
-
     verify_reserved_ip_assigned(reserved_ip, linode)
-    # assert reserved_ip.tags == tags  # NOTE: Skipped as tags not available in the API yet
+    assert sorted(reserved_ip.tags) == ["assigned", "test"]
 
-    ips_list = client.networking.ips()
-    assert reserved_ip.address in [ip.address for ip in ips_list]
+    # ips_list = client.networking.ips()
+    # assert reserved_ip.address in [ip.address for ip in ips_list]
 
     reserved_ips_list = client.networking.reserved_ips()
     assert reserved_ip.address in [ip.address for ip in reserved_ips_list]
 
-    # linode_ips = linode.ips.ipv4.public
-    # assert len(linode_ips) == 2
-    # assert any([ip.reserved for ip in linode_ips])
+    linode_ips = linode.ips.ipv4.public
+    assert len(linode_ips) == 2
+    assert any([ip.reserved for ip in linode_ips])
 
     reserved_ip.delete()
     reserved_ips_list = client.networking.reserved_ips()
@@ -449,25 +448,25 @@ def test_create_reserved_ip_assigned(test_linode_client, create_reserved_ip_assi
     reserved_ips_list = client.networking.reserved_ips(ReservedIPAddress.address==reserved_ip.address)
     assert len(reserved_ips_list) == 0
 
-    # delattr(linode, "_ips")
-    # linode_ips = linode.ips.ipv4.public
-    # assert len(linode_ips) == 2
-    # assert not any([ip.reserved for ip in linode_ips])
-    # assert not any([ip.tags for ip in linode_ips])  # Tags should be removed ???
+    delattr(linode, "_ips")
+    linode_ips = linode.ips.ipv4.public
+    assert len(linode_ips) == 2
+    assert not any([ip.reserved for ip in linode_ips])
+    assert not any([ip.tags for ip in linode_ips])  # Tags should be removed
 
 
 def test_get_reserved_ip_types(test_linode_client, create_reserved_ip):
-    # TODO: Currently it uses client (token), should not it be publicly accessible (no token required) ???
     client = test_linode_client
-    types = client.networking.reserved_ip_types()
-    assert types.only
+    endpoint = client.base_url + "/networking/reserved/ips/types"
+    types = requests.get(endpoint).json()["data"]  # Pricing should be publicly available
 
-    pricing = types.first()
-    assert pricing.id == "reserved-ipv4"
-    assert pricing.label == "Reserved IPv4"
-    assert pricing.price.hourly
-    # assert pricing.price.monthly is None
-    # assert pricing.region_prices == []
+    assert isinstance(types, list)
+    assert types[0]["id"] == "reserved-ipv4"
+    assert types[0]["label"] == "Reserved IPv4"
+    assert "hourly" in types[0]["price"]
+    assert "monthly" in types[0]["price"]
+    assert any(price != 0 for price in list(types[0]["price"].values()))
+    assert isinstance(types[0]["region_prices"], list)
 
 
 @pytest.mark.smoke
@@ -486,7 +485,7 @@ def test_create_reserved_ip_with_allocate(test_linode_client, create_linode, res
         reserved_ip = client.networking.ip_allocate(reserved=reserved, linode=linode.id)
         verify_reserved_ip_assigned(reserved_ip, linode)
 
-    # assert reserved_ip.tags == tags  # TODO: Skipped as tags not available in the API yet
+    assert reserved_ip.tags == []
 
 
 def test_reserve_ephemeral_ip(test_linode_client, create_linode):
@@ -498,7 +497,6 @@ def test_reserve_ephemeral_ip(test_linode_client, create_linode):
     assert ip_address.reserved == False
 
     ip_address.reserved = True
-    # ip_address.rdns = "test.example.org"  # TODO: Should be enabled ?
     ip_address.save()
     ip_address = client.load(IPAddress, linode.ipv4[0])
     assert ip_address.linode_id == linode.id
@@ -522,7 +520,3 @@ def test_convert_unassigned_reserved_ip_to_ephemeral(test_linode_client, create_
 
     reserved_ips_list = client.networking.reserved_ips(ReservedIPAddress.address==reserved_ip.address)
     assert len(reserved_ips_list) == 0
-
-
-# def test_create_unassigned_reserved_ip_with_rdns():
-#     pass

test/integration/models/nodebalancer/test_nodebalancer.py

@@ -114,7 +114,6 @@ def test_create_nb(test_linode_client, e2e_test_firewall):
     nb.delete()
 
 
-@pytest.mark.skip(reason="Currently it fails to assign ReservedIP via ipv4 param")
 def test_create_nb_with_reserved_ip(test_linode_client, e2e_test_firewall, create_reserved_ip):
     client = test_linode_client
     reserved_ip = create_reserved_ip