diff --git a/tests/dhcpv6/ddns/test_ddns_no_tsig_release.py b/tests/dhcpv6/ddns/test_ddns_no_tsig_release.py index ed0a82fd33f7129078fc78f3734f3c722dc7e5e4..eb0e83f5ba495f1fe4689a0e5cd0fe1a475def31 100644 --- a/tests/dhcpv6/ddns/test_ddns_no_tsig_release.py +++ b/tests/dhcpv6/ddns/test_ddns_no_tsig_release.py @@ -65,8 +65,8 @@ def test_ddns6_notsig_forw_and_rev_release(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') - srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') + srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com.') misc.test_procedure() srv_msg.dns_question_record('sth6.six.example.com', 'AAAA', 'IN') @@ -178,8 +178,8 @@ def test_ddns6_notsig_forw_and_rev_release_notenabled(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') - srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') + srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com.') misc.test_procedure() srv_msg.dns_question_record('sth6.six.example.com', 'AAAA', 'IN') @@ -320,8 +320,10 @@ def test_ddns6_notsig_rev_release(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '0') - srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com') + srv_msg.response_check_option_content('Response', '39', "NOT", 'flags', 'S') + srv_msg.response_check_option_content('Response', '39', "NOT", 'flags', 'N') + srv_msg.response_check_option_content('Response', '39', "NOT", 'flags', 'O') + srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com.') misc.test_procedure() srv_msg.dns_question_record('sth6.six.example.com', 'AAAA', 'IN') @@ -435,8 +437,8 @@ def test_ddns6_notsig_expired(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') - srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') + srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com.') misc.test_procedure() srv_msg.dns_question_record('sth6.six.example.com', 'AAAA', 'IN') diff --git a/tests/dhcpv6/ddns/test_ddns_no_tsig_release_sanitization.py b/tests/dhcpv6/ddns/test_ddns_no_tsig_release_sanitization.py index 4de49025a89572f63563eeee2f3f737782334251..4a42a1dfc563e3e46924eba8f02586672014a6a8 100644 --- a/tests/dhcpv6/ddns/test_ddns_no_tsig_release_sanitization.py +++ b/tests/dhcpv6/ddns/test_ddns_no_tsig_release_sanitization.py @@ -70,7 +70,7 @@ def test_ddns6_notsig_forw_and_rev_release_fqdn_sanitization_replace_1(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') srv_msg.response_check_option_content('Response', '39', None, @@ -263,8 +263,8 @@ def test_ddns6_notsig_forw_and_rev_release_fqdn_sanitization_omit_1(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') - srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') + srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com.') misc.test_procedure() srv_msg.dns_question_record('sth6.six.example.com', 'AAAA', 'IN') @@ -395,7 +395,7 @@ def test_ddns6_notsig_forw_and_rev_release_fqdn_sanitization_omit_identical_name srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') srv_msg.response_check_option_content('Response', '39', None, @@ -461,7 +461,7 @@ def test_ddns6_notsig_forw_and_rev_release_fqdn_sanitization_omit_identical_name srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') srv_msg.response_check_option_content('Response', '39', None, @@ -592,7 +592,7 @@ def test_ddns6_notsig_expired_fqdn_sanitization(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth.six.example.com') misc.test_procedure() diff --git a/tests/dhcpv6/ddns/test_ddns_no_tsig_request.py b/tests/dhcpv6/ddns/test_ddns_no_tsig_request.py index 20c1ec0a26889ece0c0eeff7c3c4a173328d0182..0c43921df9a45f6c214143cf97da594cbc32a5e8 100644 --- a/tests/dhcpv6/ddns/test_ddns_no_tsig_request.py +++ b/tests/dhcpv6/ddns/test_ddns_no_tsig_request.py @@ -64,8 +64,8 @@ def test_ddns6_notsig_forw_and_rev_add_success_Sflag(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') - srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') + srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com.') misc.test_procedure() srv_msg.dns_question_record('sth6.six.example.com', 'AAAA', 'IN') @@ -158,7 +158,7 @@ def test_ddns6_notsig_forw_and_rev_add_fail_Sflag(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.com') misc.test_procedure() @@ -246,7 +246,7 @@ def test_ddns6_notsig_forw_and_rev_notenabled_Sflag(): srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') srv_msg.response_check_option_content('Response', '39', None, 'flags', '6') - srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com') + srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com.') misc.test_procedure() srv_msg.dns_question_record('sth6.six.example.com', 'AAAA', 'IN') @@ -332,8 +332,8 @@ def test_ddns6_notsig_forw_and_rev_update_success_Sflag(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') - srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') + srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com.') misc.test_procedure() srv_msg.dns_question_record('sth6.six.example.com', 'AAAA', 'IN') @@ -434,8 +434,8 @@ def test_ddns6_notsig_forw_and_rev_update_success_Sflag(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') - srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') + srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com.') misc.test_procedure() srv_msg.dns_question_record('sth6.six.example.com', 'AAAA', 'IN') @@ -528,7 +528,7 @@ def test_ddns6_notsig_forw_and_rev_two_dhci_Sflag(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') srv_msg.response_check_option_content('Response', '39', None, @@ -573,7 +573,7 @@ def test_ddns6_notsig_forw_and_rev_two_dhci_Sflag(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') srv_msg.response_check_option_content('Response', '39', None, @@ -656,7 +656,7 @@ def test_ddns6_notsig_forw_and_rev_dhci_conflicts_Sflag(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') srv_msg.response_check_option_content('Response', '39', None, @@ -701,7 +701,7 @@ def test_ddns6_notsig_forw_and_rev_dhci_conflicts_Sflag(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') srv_msg.response_check_option_content('Response', '39', None, @@ -740,7 +740,7 @@ def test_ddns6_notsig_forw_and_rev_dhci_conflicts_Sflag(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') srv_msg.response_check_option_content('Response', '39', None, @@ -853,7 +853,7 @@ def test_ddns6_notsig_forw_and_rev_dhci_conflicts_remove_Sflag(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') srv_msg.response_check_option_content('Response', '39', None, @@ -898,7 +898,7 @@ def test_ddns6_notsig_forw_and_rev_dhci_conflicts_remove_Sflag(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') srv_msg.response_check_option_content('Response', '39', None, @@ -939,7 +939,7 @@ def test_ddns6_notsig_forw_and_rev_dhci_conflicts_remove_Sflag(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') srv_msg.response_check_option_content('Response', '39', None, @@ -1045,8 +1045,8 @@ def test_ddns6_notsig_forw_and_rev_add_success_withoutflag_override_client(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '3') - srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'SO') + srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com.') misc.test_procedure() srv_msg.dns_question_record('sth6.six.example.com', 'AAAA', 'IN') @@ -1137,8 +1137,10 @@ def test_ddns6_notsig_rev_success_withoutflag(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '0') - srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com') + srv_msg.response_check_option_content('Response', '39', "NOT", 'flags', 'S') + srv_msg.response_check_option_content('Response', '39', "NOT", 'flags', 'N') + srv_msg.response_check_option_content('Response', '39', "NOT", 'flags', 'O') + srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com.') srv_msg.log_contains_line('DNS', None, 'adding an RR at \'0.5.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa\' PTR sth6.six.example.com.') @@ -1221,8 +1223,8 @@ def test_ddns6_notsig_rev_withoutflag_notenabled(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '4') - srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'N') + srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com.') srv_msg.log_contains_line('DNS', 'NOT ', 'adding an RR at \'0.5.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa\' PTR sth6.six.example.com.') @@ -1302,8 +1304,8 @@ def test_ddns6_notsig_rev_Nflag_override_no_update(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '3') - srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'SO') + srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com.') srv_msg.log_contains_line('DNS', None, 'adding an RR at \'0.5.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa\' PTR sth6.six.example.com.') diff --git a/tests/dhcpv6/ddns/test_ddns_tsig_release.py b/tests/dhcpv6/ddns/test_ddns_tsig_release.py index 9832a78b8630710f166765c288e027091519f032..4ca2fe7a6bc608608ed043b8a6b1df2e3922a4f9 100644 --- a/tests/dhcpv6/ddns/test_ddns_tsig_release.py +++ b/tests/dhcpv6/ddns/test_ddns_tsig_release.py @@ -66,8 +66,8 @@ def test_ddns6_tsig_sha1_forw_and_rev_release(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') - srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') + srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com.') misc.test_procedure() srv_msg.dns_question_record('sth6.six.example.com', 'AAAA', 'IN') @@ -180,8 +180,8 @@ def test_ddns6_tsig_forw_and_rev_release_notenabled(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') - srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') + srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com.') misc.test_procedure() srv_msg.dns_question_record('sth6.six.example.com', 'AAAA', 'IN') @@ -324,8 +324,10 @@ def test_ddns6_tsig_sha1_rev_release(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '0') - srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com') + srv_msg.response_check_option_content('Response', '39', "NOT", 'flags', 'S') + srv_msg.response_check_option_content('Response', '39', "NOT", 'flags', 'N') + srv_msg.response_check_option_content('Response', '39', "NOT", 'flags', 'O') + srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com.') misc.test_procedure() srv_msg.dns_question_record('sth6.six.example.com', 'AAAA', 'IN') diff --git a/tests/dhcpv6/ddns/test_ddns_tsig_request.py b/tests/dhcpv6/ddns/test_ddns_tsig_request.py index 47028610d801738ae10cc8db892bbb1f14e02982..be234e29d1e491d1b40ed7cbfb085850f250d48c 100644 --- a/tests/dhcpv6/ddns/test_ddns_tsig_request.py +++ b/tests/dhcpv6/ddns/test_ddns_tsig_request.py @@ -64,8 +64,8 @@ def test_ddns6_tsig_sha1_forw_and_rev(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') - srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') + srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com.') misc.test_procedure() srv_msg.dns_question_record('sth6.six.example.com', 'AAAA', 'IN') @@ -148,8 +148,8 @@ def test_ddns6_tsig_sha224_forw_and_rev(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') - srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') + srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com.') misc.test_procedure() srv_msg.dns_question_record('sth6.six.example.com', 'AAAA', 'IN') @@ -232,8 +232,8 @@ def test_ddns6_tsig_sha256_forw_and_rev(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') - srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') + srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com.') misc.test_procedure() srv_msg.dns_question_record('sth6.six.example.com', 'AAAA', 'IN') @@ -316,8 +316,8 @@ def test_ddns6_tsig_sha384_forw_and_rev(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') - srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') + srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com.') misc.test_procedure() srv_msg.dns_question_record('sth6.six.example.com', 'AAAA', 'IN') @@ -400,8 +400,8 @@ def test_ddns6_tsig_sha512_forw_and_rev(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') - srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') + srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com.') misc.test_procedure() srv_msg.dns_question_record('sth6.six.example.com', 'AAAA', 'IN') @@ -484,8 +484,8 @@ def test_ddns6_tsig_md5_forw_and_rev(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') - srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') + srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com.') misc.test_procedure() srv_msg.dns_question_record('sth6.six.example.com', 'AAAA', 'IN') @@ -569,8 +569,8 @@ def test_ddns6_tsig_multi_key_forw_and_rev(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') - srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') + srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com.') misc.test_procedure() srv_msg.dns_question_record('sth6.six.example.com', 'AAAA', 'IN') diff --git a/tests/dhcpv6/kea_only/test_kea_logging.py b/tests/dhcpv6/kea_only/test_kea_logging.py index add98ccaf8b3b5ae62ee8d3ca76b64c24a1155c6..57d5f05c456f4e539910f939786fcd6cb3d64c9d 100644 --- a/tests/dhcpv6/kea_only/test_kea_logging.py +++ b/tests/dhcpv6/kea_only/test_kea_logging.py @@ -898,8 +898,8 @@ def test_ddns6_logging_all_types_debug(): srv_msg.response_check_include_option('Response', None, '1') srv_msg.response_check_include_option('Response', None, '2') srv_msg.response_check_include_option('Response', None, '39') - srv_msg.response_check_option_content('Response', '39', None, 'flags', '1') - srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com') + srv_msg.response_check_option_content('Response', '39', None, 'flags', 'S') + srv_msg.response_check_option_content('Response', '39', None, 'fqdn', 'sth6.six.example.com.') misc.test_procedure() srv_msg.client_sets_value('Client', 'DUID', '00:03:00:01:ff:ff:ff:ff:ff:01') diff --git a/tests/dhcpv6/options_validation/test_v6_user_options.py b/tests/dhcpv6/options_validation/test_v6_user_options.py index 1d36cd6415a815a979fbf08276dcc6b8d0c7cd4d..405f40c82a88ada78a2406224228654e63ce2a1f 100644 --- a/tests/dhcpv6/options_validation/test_v6_user_options.py +++ b/tests/dhcpv6/options_validation/test_v6_user_options.py @@ -77,11 +77,7 @@ def test_v6_options_user_defined_option_code_zero(): srv_control.config_srv_subnet('3000::/64', '3000::1-3000::ff') srv_control.config_srv_custom_opt('foo', '0', 'uint8', '123') srv_control.build_and_send_config_files('SSH', 'config-file') - srv_control.start_srv_during_process('DHCP', 'configure') - # TODO: this test passes but in background there is and error: - # ERROR option code must not be zero - # Here are missing some asserts and checks. - assert False + srv_control.start_srv_during_process('DHCP', 'configuration') @pytest.mark.v6 @@ -105,12 +101,7 @@ def test_v6_options_user_defined_option_standard_code(): srv_control.config_srv_subnet('3000::/64', '3000::1-3000::ff') srv_control.config_srv_custom_opt('foo', '12', 'uint8', '123') srv_control.build_and_send_config_files('SSH', 'config-file') - srv_control.start_srv_during_process('DHCP', 'configure') - # TODO: this test passes but in background there is and error: - # ERROR [kea-dhcp6.dhcp6/5600] DHCP6_PARSER_FAIL failed to create or run parser for configuration element : - # unable to override definition of option '12' in standard option space 'dhcp6' - # Here are missing some asserts and checks. - assert False + srv_control.start_srv_during_process('DHCP', 'configuration') @pytest.mark.v6 diff --git a/tests/forge_cfg.py b/tests/forge_cfg.py index 88efb2e4f5d00b8e4451cf924eaedb6041cf2648..e0581bf0f7706733b967409f7dd439724cbc0868 100644 --- a/tests/forge_cfg.py +++ b/tests/forge_cfg.py @@ -178,14 +178,15 @@ class ForgeConfiguration: return "0a:00:27:00:00:00" def basic_validation(self): - if self.proto == "v4" and self.software_under_test[0] not in ["none_server"]: - if "4" not in self.software_under_test[0]: - print "Miss match of protocol version and DHCP server version" - sys.exit(-1) - if self.proto == "v6" and self.software_under_test[0] not in ["none_server"]: - if "6" not in self.software_under_test[0]: - print "Miss match of protocol version and DHCP server version" - sys.exit(-1) + # TODO we need new basic validation or just dump it... + # if self.proto == "v4" and self.software_under_test[0] not in ["none_server"]: + # if "4" not in self.software_under_test[0]: + # print "Miss match of protocol version and DHCP server version" + # sys.exit(-1) + # if self.proto == "v6" and self.software_under_test[0] not in ["none_server"]: + # if "6" not in self.software_under_test[0]: + # print "Miss match of protocol version and DHCP server version" + # sys.exit(-1) if self.software_install_path == "": print "Configuration failure, software_install_path empty." \ " Please use ./forge.py -T to validate configuration." diff --git a/tests/other_tests/v4/test_host_reservation_address_mysql.py b/tests/other_tests/v4/test_host_reservation_address_mysql.py index 425a01d033d251ac0dc5066313924e86ec9870c9..dee8e7778e2be77d22e248cbe7ce6b6862f78179 100644 --- a/tests/other_tests/v4/test_host_reservation_address_mysql.py +++ b/tests/other_tests/v4/test_host_reservation_address_mysql.py @@ -9,7 +9,7 @@ import misc import srv_control -@pytest.mark.v4 +@pytest.mark.disabled @pytest.mark.host_reservation @pytest.mark.kea_only def test_v4_host_reservation_mysql_one_address_inside_pool(): @@ -44,7 +44,7 @@ def test_v4_host_reservation_mysql_one_address_inside_pool(): srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') -@pytest.mark.v4 +@pytest.mark.disabled @pytest.mark.host_reservation @pytest.mark.kea_only def test_v4_host_reservation_mysql_one_address_inside_pool_option(): @@ -97,7 +97,7 @@ def test_v4_host_reservation_mysql_one_address_inside_pool_option(): srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') -@pytest.mark.v4 +@pytest.mark.disabled @pytest.mark.host_reservation @pytest.mark.kea_only def test_v4_host_reservation_mysql_one_address_outside_pool_dual_backend(): @@ -159,7 +159,7 @@ def test_v4_host_reservation_mysql_one_address_outside_pool_dual_backend(): srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') -@pytest.mark.v4 +@pytest.mark.disabled @pytest.mark.host_reservation @pytest.mark.kea_only def test_v4_host_reservation_pgsql_one_address_outside_pool_dual_backend(): @@ -221,7 +221,7 @@ def test_v4_host_reservation_pgsql_one_address_outside_pool_dual_backend(): srv_msg.response_check_option_content('Response', '1', None, 'value', '255.255.255.0') -@pytest.mark.v4 +@pytest.mark.disabled @pytest.mark.host_reservation @pytest.mark.kea_only def test_v4_host_reservation_one_address_inside_pool_different_mac(): @@ -255,7 +255,7 @@ def test_v4_host_reservation_one_address_inside_pool_different_mac(): srv_msg.response_check_content('Response', None, 'yiaddr', '0.0.0.0') -@pytest.mark.v4 +@pytest.mark.disabled @pytest.mark.host_reservation @pytest.mark.kea_only def test_v4_host_reservation_one_address_empty_pool(): @@ -277,7 +277,7 @@ def test_v4_host_reservation_one_address_empty_pool(): srv_msg.send_dont_wait_for_message() -@pytest.mark.v4 +@pytest.mark.disabled @pytest.mark.host_reservation @pytest.mark.kea_only def test_v4_host_reservation_mysql_multiple_address_reservation_empty_pool(): @@ -306,7 +306,7 @@ def test_v4_host_reservation_mysql_multiple_address_reservation_empty_pool(): srv_msg.send_dont_wait_for_message() -@pytest.mark.v4 +@pytest.mark.disabled @pytest.mark.host_reservation @pytest.mark.kea_only def test_v4_host_reservation_multiple_mysql_address_reservation_empty_pool_2(): diff --git a/tests/other_tests/v4/test_host_reservation_conflicts_mysql.py b/tests/other_tests/v4/test_host_reservation_conflicts_mysql.py index 9b9f2def664e06854dec6104a4dfa4be295709bd..d1cfef241212a0faf67ad27b84188b9febc7c82b 100644 --- a/tests/other_tests/v4/test_host_reservation_conflicts_mysql.py +++ b/tests/other_tests/v4/test_host_reservation_conflicts_mysql.py @@ -9,7 +9,7 @@ import misc import srv_control -@pytest.mark.v4 +@pytest.mark.disabled @pytest.mark.host_reservation @pytest.mark.kea_only def test_v4_host_reservation_conflicts_duplicate_reservations(): @@ -28,7 +28,7 @@ def test_v4_host_reservation_conflicts_duplicate_reservations(): srv_control.start_srv_during_process('DHCP', 'configuration') -@pytest.mark.v4 +@pytest.mark.disabled @pytest.mark.host_reservation @pytest.mark.kea_only def test_v4_host_reservation_conflicts_duplicate_reservations_different_subnets(): @@ -49,7 +49,7 @@ def test_v4_host_reservation_conflicts_duplicate_reservations_different_subnets( srv_control.start_srv('DHCP', 'started') -@pytest.mark.v4 +@pytest.mark.disabled @pytest.mark.host_reservation @pytest.mark.kea_only def test_v4_host_reservation_conflicts_mysql_reconfigure_server_with_reservation_of_used_address(): @@ -108,7 +108,7 @@ def test_v4_host_reservation_conflicts_mysql_reconfigure_server_with_reservation srv_msg.response_check_content('Response', 'NOT ', 'yiaddr', '192.168.50.2') -@pytest.mark.v4 +@pytest.mark.disabled @pytest.mark.host_reservation @pytest.mark.kea_only def test_v4_host_reservation_conflicts_mysql_reconfigure_server_with_reservation_of_used_address_2(): @@ -173,7 +173,7 @@ def test_v4_host_reservation_conflicts_mysql_reconfigure_server_with_reservation srv_msg.response_check_content('Response', 'NOT ', 'yiaddr', '192.168.50.2') -@pytest.mark.v4 +@pytest.mark.disabled @pytest.mark.host_reservation @pytest.mark.kea_only def test_v4_host_reservation_conflicts_reconfigure_server_with_reservation_of_used_address_3(): @@ -231,7 +231,7 @@ def test_v4_host_reservation_conflicts_reconfigure_server_with_reservation_of_us srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.30') -@pytest.mark.v4 +@pytest.mark.disabled @pytest.mark.host_reservation @pytest.mark.kea_only def test_v4_host_reservation_conflicts_reconfigure_server_switched_mac_in_reservations_in_pool(): @@ -279,7 +279,7 @@ def test_v4_host_reservation_conflicts_reconfigure_server_switched_mac_in_reserv srv_msg.response_check_content('Response', 'NOT ', 'yiaddr', '192.168.50.10') -@pytest.mark.v4 +@pytest.mark.disabled @pytest.mark.host_reservation @pytest.mark.kea_only def test_v4_host_reservation_conflicts_reconfigure_server_switched_mac_in_reservations_out_of_pool(): @@ -327,7 +327,7 @@ def test_v4_host_reservation_conflicts_reconfigure_server_switched_mac_in_reserv srv_msg.response_check_content('Response', 'NOT ', 'yiaddr', '192.168.50.50') -@pytest.mark.v4 +@pytest.mark.disabled @pytest.mark.host_reservation @pytest.mark.kea_only def test_v4_host_reservation_conflicts_reconfigure_server_add_reservation_for_host_that_has_leases(): @@ -402,7 +402,7 @@ def test_v4_host_reservation_conflicts_reconfigure_server_add_reservation_for_ho srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.5') -@pytest.mark.v4 +@pytest.mark.disabled @pytest.mark.host_reservation @pytest.mark.kea_only def test_v4_host_reservation_conflicts_renew_address_that_has_been_reserved_during_reconfiguration(): @@ -482,7 +482,7 @@ def test_v4_host_reservation_conflicts_renew_address_that_has_been_reserved_duri srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.5') -@pytest.mark.v4 +@pytest.mark.disabled @pytest.mark.host_reservation @pytest.mark.kea_only def test_v4_host_reservation_conflicts_renew_address_using_different_mac_that_has_been_reserved_during_reconfiguration(): @@ -553,7 +553,7 @@ def test_v4_host_reservation_conflicts_renew_address_using_different_mac_that_ha srv_msg.send_wait_for_message('MUST', None, 'NAK') -@pytest.mark.v4 +@pytest.mark.disabled @pytest.mark.host_reservation @pytest.mark.kea_only def test_v4_host_reservation_conflicts_renew_address_which_reservation_changed_during_reconfigure(): @@ -638,7 +638,7 @@ def test_v4_host_reservation_conflicts_renew_address_which_reservation_changed_d srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.5') -@pytest.mark.v4 +@pytest.mark.disabled @pytest.mark.host_reservation @pytest.mark.kea_only def test_v4_host_reservation_conflicts_renew_address_which_reservation_changed_during_reconfigure_2(): @@ -715,7 +715,7 @@ def test_v4_host_reservation_conflicts_renew_address_which_reservation_changed_d srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.50') -@pytest.mark.v4 +@pytest.mark.disabled @pytest.mark.host_reservation @pytest.mark.kea_only def test_v4_host_reservation_conflicts_rebind_address_which_reservation_changed_during_reconfigure(): @@ -800,7 +800,7 @@ def test_v4_host_reservation_conflicts_rebind_address_which_reservation_changed_ srv_msg.response_check_content('Response', None, 'yiaddr', '192.168.50.5') -@pytest.mark.v4 +@pytest.mark.disabled @pytest.mark.host_reservation @pytest.mark.kea_only def test_v4_host_reservation_conflicts_rebind_address_which_reservation_changed_during_reconfigure_2(): diff --git a/tests/other_tests/v6/test_rfc7550.py b/tests/other_tests/v6/test_rfc7550.py index 34578fdd6cc85725db3bad7ea5722a46bc0733a8..aed8ada03a6a73e42ca713e8e759b35782a5865a 100644 --- a/tests/other_tests/v6/test_rfc7550.py +++ b/tests/other_tests/v6/test_rfc7550.py @@ -10,7 +10,7 @@ import misc import srv_control -@pytest.mark.v6 +@pytest.mark.disabled @pytest.mark.rfc7550 def test_v6_rfc7550_1(): misc.test_setup() @@ -57,7 +57,7 @@ def test_v6_rfc7550_1(): references.references_check('RFC') -@pytest.mark.v6 +@pytest.mark.disabled @pytest.mark.rfc7550 def test_v6_rfc7550_2(): misc.test_setup() @@ -113,7 +113,7 @@ def test_v6_rfc7550_2(): srv_msg.response_check_option_content('Response', '25', None, 'sub-option', '26') -@pytest.mark.v6 +@pytest.mark.disabled @pytest.mark.rfc7550 def test_v6_rfc7550_3(): misc.test_setup() @@ -163,7 +163,7 @@ def test_v6_rfc7550_3(): srv_msg.response_check_option_content('Response', '25', None, 'sub-option', '26') -@pytest.mark.v6 +@pytest.mark.disabled @pytest.mark.rfc7550 def test_v6_rfc7550_4(): misc.test_setup() @@ -212,7 +212,7 @@ def test_v6_rfc7550_4(): srv_msg.response_check_option_content('Response', '25', None, 'sub-option', '13') -@pytest.mark.v6 +@pytest.mark.disabled @pytest.mark.rfc7550 def test_v6_rfc7550_5(): misc.test_setup() @@ -265,7 +265,7 @@ def test_v6_rfc7550_5(): srv_msg.response_check_option_content('Response', '25', None, 'sub-option', '13') -@pytest.mark.v6 +@pytest.mark.disabled @pytest.mark.rfc7550 def test_v6_rfc7550_6(): misc.test_setup() @@ -324,7 +324,7 @@ def test_v6_rfc7550_6(): srv_msg.response_check_option_content('Response', '25', None, 'sub-option', '13') -@pytest.mark.v6 +@pytest.mark.disabled @pytest.mark.rfc7550 def test_v6_rfc7550_7(): misc.test_setup() @@ -396,7 +396,7 @@ def test_v6_rfc7550_7(): srv_msg.response_check_option_content('Response', '25', None, 'sub-option', '26') -@pytest.mark.v6 +@pytest.mark.disabled @pytest.mark.rfc7550 def test_v6_rfc7550_8(): misc.test_setup() @@ -456,7 +456,7 @@ def test_v6_rfc7550_8(): srv_msg.response_check_option_content('Response', '25', None, 'sub-option', '13') -@pytest.mark.v6 +@pytest.mark.disabled @pytest.mark.rfc7550 def test_v6_rfc7550_9(): misc.test_setup() @@ -515,7 +515,7 @@ def test_v6_rfc7550_9(): srv_msg.response_check_include_option('Response', None, '25') -@pytest.mark.v6 +@pytest.mark.disabled @pytest.mark.rfc7550 def test_v6_rfc7550_10(): misc.test_setup() @@ -564,7 +564,7 @@ def test_v6_rfc7550_10(): srv_msg.response_check_include_option('Response', None, '25') -@pytest.mark.v6 +@pytest.mark.disabled @pytest.mark.rfc7550 def test_v6_rfc7550_11(): misc.test_setup() @@ -614,7 +614,7 @@ def test_v6_rfc7550_11(): srv_msg.response_check_include_option('Response', None, '25') -@pytest.mark.v6 +@pytest.mark.disabled @pytest.mark.rfc7550 @pytest.mark.dhcp6 @pytest.mark.PD @@ -679,7 +679,7 @@ def test_prefix(): srv_msg.response_check_option_content('Response', '25', None, 'sub-option', '26') -@pytest.mark.v6 +@pytest.mark.disabled @pytest.mark.rfc7550 def test_v6_rfc7550_12(): misc.test_setup() @@ -747,7 +747,7 @@ def test_v6_rfc7550_12(): srv_msg.response_check_option_content('Response', '25', None, 'sub-option', '26') -@pytest.mark.v6 +@pytest.mark.disabled @pytest.mark.rfc7550 def test_v6_rfc7550_13(): misc.test_setup() @@ -804,7 +804,7 @@ def test_v6_rfc7550_13(): srv_msg.response_check_option_content('Response', '25', None, 'sub-option', '26') -@pytest.mark.v6 +@pytest.mark.disabled @pytest.mark.rfc7550 def test_v6_rfc7550_14(): misc.test_setup() diff --git a/tests/softwaresupport/kea6_server/functions.py b/tests/softwaresupport/kea6_server/functions.py index 032e934a56c7ca90120555bbc5d6c8a14772850b..e3df69daa969b672db70b4264fd4da4f93b6d4b9 100644 --- a/tests/softwaresupport/kea6_server/functions.py +++ b/tests/softwaresupport/kea6_server/functions.py @@ -633,6 +633,7 @@ def cfg_write(): for each_subnet in world.subcfg: if counter in world.shared_subnets_tmp: # subnets that suppose to go to shared-networks should be omitted here + checker = 1 counter += 1 continue if counter > 0 and comma == 1: diff --git a/tests/terrain.py b/tests/terrain.py index 4cb0002a1f53ae08b64c3c0c3def88cc687ead64..6166838b85d44f10faa2ed29e1710f5e30fca099 100644 --- a/tests/terrain.py +++ b/tests/terrain.py @@ -370,10 +370,6 @@ def initialize(scenario): if not os.path.exists(world.cfg["dir_name"] + '/dns') and world.dns_enable: os.makedirs(world.cfg["dir_name"] + '/dns') - cfg_file = open(world.cfg["dir_name"]+'/test_steps', 'w') - cfg_file.write(str(scenario.name)) - cfg_file.close() - if world.f_cfg.tcpdump: cmd = world.f_cfg.tcpdump_path + 'tcpdump' args = [cmd, "-U", "-w", world.cfg["dir_name"] + "/capture.pcap",