mir/vinyldns
2
0
Fork 0
mirror of https://github.com/VinylDNS/vinyldns synced 2025-08-30 22:05:21 +00:00
Code Issues Releases Wiki Activity

retry some failed record changes (#907)

Browse Source
This commit is contained in:
Britney Wright
2019-11-29 12:10:45 -05:00
committed by GitHub
parent 31b86f9733
commit f461a62ee5
4 changed files with 123 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
modules/api/functional_test/live_tests/batch/create_batch_change_test.py
View File

@@ -4080,7 +4080,7 @@ def test_create_batch_multi_record_update_succeeds(shared_zone_test_context):
get_change_A_AAAA_json(a_delete_record_and_record_set_fqdn, address="1.1.1.1", change_type="DeleteRecordSet"),
get_change_A_AAAA_json(a_delete_record_and_record_set_fqdn, change_type="DeleteRecordSet"),
get_change_TXT_json(txt_delete_record_and_record_set_fqdn, text="hello", change_type="DeleteRecordSet"),
get_change_TXT_json(txt_delete_record_and_record_set_fqdn, change_type="DeleteRecordSet")
get_change_TXT_json(txt_delete_record_and_record_set_fqdn, change_type="DeleteRecordSet"),
]
}
@@ -4091,8 +4091,10 @@ def test_create_batch_multi_record_update_succeeds(shared_zone_test_context):
create_rs = client.create_recordset(rs, status=202)
to_delete.append(client.wait_until_recordset_change_status(create_rs, 'Complete'))
result = client.create_batch_change(batch_change_input, status=202)
client.wait_until_batch_change_completed(result)
initial_result = client.create_batch_change(batch_change_input, status=202)
result = client.wait_until_batch_change_completed(initial_result)
assert_that(result['status'], is_('Complete'))
# Check batch change response
assert_change_success_response_values(result['changes'], zone=ok_zone, index=0, input_name=a_update_record_set_fqdn, record_name=a_update_record_set_name, record_data=None, change_type="DeleteRecordSet")
@@ -4171,6 +4173,60 @@ def test_create_batch_multi_record_update_succeeds(shared_zone_test_context):
finally:
clear_recordset_list(to_delete, client)
@pytest.mark.skip_production
def test_create_batch_update_record_type_succeeds(shared_zone_test_context):
"""
Test existing record sets can be updated to a different type in batch (relies on skip-prod)
"""
client = shared_zone_test_context.ok_vinyldns_client
ok_zone = shared_zone_test_context.ok_zone
# record sets to setup
a_update_to_cname_and_record_set_name = generate_record_name()
a_update_to_cname_and_record_set_fqdn = a_update_to_cname_and_record_set_name + ".ok."
a_update_to_cname_and_record_set = get_recordset_json(ok_zone, a_update_to_cname_and_record_set_name, "A", [{"address": "1.1.1.1"}], 200)
cname_update_from_a_and_record_set_fqdn = a_update_to_cname_and_record_set_name + ".ok."
batch_change_input = {
"comments": "this is optional",
"changes": [
# Update A record to CNAME
get_change_A_AAAA_json(a_update_to_cname_and_record_set_fqdn, change_type="DeleteRecordSet"),
get_change_CNAME_json(cname_update_from_a_and_record_set_fqdn, cname="example.com.")
]
}
to_delete = []
try:
create_rs = client.create_recordset(a_update_to_cname_and_record_set, status=202)
to_delete.append(client.wait_until_recordset_change_status(create_rs, 'Complete'))
initial_result = client.create_batch_change(batch_change_input, status=202)
result = client.wait_until_batch_change_completed(initial_result)
assert_that(result['status'], is_('Complete'))
# Check batch change response
assert_change_success_response_values(result['changes'], zone=ok_zone, index=0, input_name=a_update_to_cname_and_record_set_fqdn, record_name=a_update_to_cname_and_record_set_name, record_type="A", record_data=None, change_type="DeleteRecordSet")
assert_change_success_response_values(result['changes'], zone=ok_zone, index=1, input_name=cname_update_from_a_and_record_set_fqdn, record_name=a_update_to_cname_and_record_set_name, record_type="CNAME", record_data="example.com.")
# Perform look up to verify record set data
for rs in to_delete:
rs_id = rs['recordSet']['id']
zone_id = rs['zone']['id']
client.get_recordset(zone_id, rs_id, status=404)
new_cname_result_rs = result['changes'][1]
new_cname_rs = client.get_recordset(new_cname_result_rs['zoneId'], new_cname_result_rs['recordSetId'], status=200)['recordSet']
new_cname_rdata = new_cname_rs['records']
assert_that(new_cname_rdata, contains({"cname": "example.com."}))
client.delete_recordset(new_cname_rs['zoneId'], new_cname_rs['id'], status=202)
finally:
clear_recordset_list(to_delete, client)
def test_create_batch_deletes_succeeds(shared_zone_test_context):
"""
Test creating batch change with DeleteRecordSet with valid record data succeeds

2
modules/api/functional_test/vinyldns_python.py
View File

@@ -26,7 +26,7 @@ logger = logging.getLogger(__name__)
__all__ = [u'VinylDNSClient', u'MAX_RETRIES', u'RETRY_WAIT']
MAX_RETRIES = 40
MAX_RETRIES = 75
RETRY_WAIT = 0.05
class VinylDNSClient(object):