diff --git a/.github/workflows/ca-clone-ssnv1-test.yml b/.github/workflows/ca-clone-ssnv1-test.yml index 217e1395ac0..09f3eb8d484 100644 --- a/.github/workflows/ca-clone-ssnv1-test.yml +++ b/.github/workflows/ca-clone-ssnv1-test.yml @@ -165,7 +165,7 @@ jobs: - name: Check request range objects run: | - tests/ca/bin/ca-request-range-objects-ssnv1.sh primaryds | tee output + tests/ca/bin/ca-request-range-objects.sh primaryds | tee output # since the remaining numbers in the current range are below # the minimum, a new request range was allocated @@ -181,7 +181,7 @@ jobs: - name: Check cert range objects run: | - tests/ca/bin/ca-cert-range-objects-ssnv1.sh primaryds | tee output + tests/ca/bin/ca-cert-range-objects.sh primaryds | tee output # since the remaining numbers in the current range are not # less than the minimum, no new cert range was allocated @@ -189,7 +189,7 @@ jobs: - name: Check request next range run: | - tests/ca/bin/ca-request-next-range-ssnv1.sh primaryds | tee output + tests/ca/bin/ca-request-next-range.sh primaryds | tee output # since there's an allocated request range, the nextRange # should be endRange + 1 which is 21 decimal @@ -201,7 +201,7 @@ jobs: - name: Check cert next range run: | - tests/ca/bin/ca-cert-next-range-ssnv1.sh primaryds | tee output + tests/ca/bin/ca-cert-next-range.sh primaryds | tee output # since there's no allocated cert range, the nextRange should be # dbs.endSerialNumber + 1 which is 13 hex (19 decimal), but due @@ -374,7 +374,7 @@ jobs: - name: Check request range objects run: | - tests/ca/bin/ca-request-range-objects-ssnv1.sh secondaryds | tee output + tests/ca/bin/ca-request-range-objects.sh secondaryds | tee output # request range should be the same # NOTE: there's no indication that half of the range has @@ -391,14 +391,14 @@ jobs: - name: Check cert range objects run: | - tests/ca/bin/ca-cert-range-objects-ssnv1.sh secondaryds | tee output + tests/ca/bin/ca-cert-range-objects.sh secondaryds | tee output # cert range should be the same diff /dev/null output - name: Check request next range run: | - tests/ca/bin/ca-request-next-range-ssnv1.sh secondaryds | tee output + tests/ca/bin/ca-request-next-range.sh secondaryds | tee output # request nextRange should be the same cat > expected << EOF @@ -409,7 +409,7 @@ jobs: - name: Check cert next range run: | - tests/ca/bin/ca-cert-next-range-ssnv1.sh secondaryds | tee output + tests/ca/bin/ca-cert-next-range.sh secondaryds | tee output # cert nextRange should be the same cat > expected << EOF @@ -550,7 +550,7 @@ jobs: - name: Check request range objects run: | - tests/ca/bin/ca-request-range-objects-ssnv1.sh primaryds | tee output + tests/ca/bin/ca-request-range-objects.sh primaryds | tee output # request range should be the same cat > expected << EOF @@ -565,14 +565,14 @@ jobs: - name: Check cert range objects run: | - tests/ca/bin/ca-cert-range-objects-ssnv1.sh primaryds | tee output + tests/ca/bin/ca-cert-range-objects.sh primaryds | tee output # cert range should be the same diff /dev/null output - name: Check request next range run: | - tests/ca/bin/ca-request-next-range-ssnv1.sh primaryds | tee output + tests/ca/bin/ca-request-next-range.sh primaryds | tee output # request nextRange should be the same cat > expected << EOF @@ -583,7 +583,7 @@ jobs: - name: Check cert next range run: | - tests/ca/bin/ca-cert-next-range-ssnv1.sh primaryds | tee output + tests/ca/bin/ca-cert-next-range.sh primaryds | tee output # cert nextRange should be the same cat > expected << EOF @@ -740,7 +740,7 @@ jobs: - name: Check request range objects run: | - tests/ca/bin/ca-request-range-objects-ssnv1.sh primaryds | tee output + tests/ca/bin/ca-request-range-objects.sh primaryds | tee output # since the remaining numbers are below the minimum in the # secondary CA, a new cert request should be allocated for it @@ -761,7 +761,7 @@ jobs: - name: Check cert range objects run: | - tests/ca/bin/ca-cert-range-objects-ssnv1.sh primaryds | tee output + tests/ca/bin/ca-cert-range-objects.sh primaryds | tee output # since the remaining numbers are below the minimum in both primary # and secondary CA, new cert ranges should be allocated for them @@ -782,7 +782,7 @@ jobs: - name: Check request next range run: | - tests/ca/bin/ca-request-next-range-ssnv1.sh primaryds | tee output + tests/ca/bin/ca-request-next-range.sh primaryds | tee output # request nextRange should be 31 decimal cat > expected << EOF @@ -793,7 +793,7 @@ jobs: - name: Check cert next range run: | - tests/ca/bin/ca-cert-next-range-ssnv1.sh primaryds | tee output + tests/ca/bin/ca-cert-next-range.sh primaryds | tee output # cert nextRange should be 49 decimal cat > expected << EOF @@ -931,7 +931,7 @@ jobs: - name: Check request range objects run: | - tests/ca/bin/ca-request-range-objects-ssnv1.sh primaryds | tee output + tests/ca/bin/ca-request-range-objects.sh primaryds | tee output # request ranges should remain the same cat > expected << EOF @@ -951,7 +951,7 @@ jobs: - name: Check cert range objects run: | - tests/ca/bin/ca-cert-range-objects-ssnv1.sh primaryds | tee output + tests/ca/bin/ca-cert-range-objects.sh primaryds | tee output # cert ranges should remain the same cat > expected << EOF @@ -971,7 +971,7 @@ jobs: - name: Check request next range run: | - tests/ca/bin/ca-request-next-range-ssnv1.sh primaryds | tee output + tests/ca/bin/ca-request-next-range.sh primaryds | tee output # request nextRange should remain the same cat > expected << EOF @@ -982,7 +982,7 @@ jobs: - name: Check cert next range run: | - tests/ca/bin/ca-cert-next-range-ssnv1.sh primaryds | tee output + tests/ca/bin/ca-cert-next-range.sh primaryds | tee output # cert nextRange should remain the same cat > expected << EOF @@ -1008,7 +1008,7 @@ jobs: - name: Check old request range objects run: | - tests/ca/bin/ca-request-range-objects-ssnv1.sh primaryds | tee output + tests/ca/bin/ca-request-range-objects.sh primaryds | tee output # request ranges should remain the same cat > expected << EOF @@ -1028,7 +1028,7 @@ jobs: - name: Check new request range objects run: | - tests/ca/bin/ca-request-range-objects-ssnv1.sh primaryds ou=requests,ou=ranges_v2 | tee output + tests/ca/bin/ca-request-range-objects.sh primaryds ou=requests,ou=ranges_v2 | tee output # request ranges should remain the same cat > expected << EOF @@ -1043,7 +1043,7 @@ jobs: - name: Check request next range run: | - tests/ca/bin/ca-request-next-range-ssnv1.sh primaryds | tee output + tests/ca/bin/ca-request-next-range.sh primaryds | tee output # request nextRange should remain the same cat > expected << EOF @@ -1054,7 +1054,7 @@ jobs: - name: Check old cert range objects run: | - tests/ca/bin/ca-cert-range-objects-ssnv1.sh primaryds | tee output + tests/ca/bin/ca-cert-range-objects.sh primaryds | tee output # cert ranges should remain the same but converted from hex to decimal # the range value for the primary move from 13-30 (hex) to 19-48 (dec) @@ -1075,7 +1075,7 @@ jobs: - name: Check new cert range objects run: | - tests/ca/bin/ca-cert-range-objects-ssnv1.sh primaryds ou=certificateRepository,ou=ranges_v2 | tee output + tests/ca/bin/ca-cert-range-objects.sh primaryds ou=certificateRepository,ou=ranges_v2 | tee output # cert ranges should remain the same but converted from hex to decimal # the range value for the primary move from 13-30 (hex) to 19-48 (dec) @@ -1091,7 +1091,7 @@ jobs: - name: Check cert next range run: | - tests/ca/bin/ca-cert-next-range-ssnv1.sh primaryds | tee output + tests/ca/bin/ca-cert-next-range.sh primaryds | tee output # cert nextRange should remain the same cat > expected << EOF @@ -1204,7 +1204,7 @@ jobs: - name: Check old request range objects run: | - tests/ca/bin/ca-request-range-objects-ssnv1.sh primaryds | tee output + tests/ca/bin/ca-request-range-objects.sh primaryds | tee output cat > expected << EOF SecurePort: 8443 @@ -1223,7 +1223,7 @@ jobs: - name: Check new request range objects run: | - tests/ca/bin/ca-request-range-objects-ssnv1.sh primaryds ou=requests,ou=ranges_v2 | tee output + tests/ca/bin/ca-request-range-objects.sh primaryds ou=requests,ou=ranges_v2 | tee output cat > expected << EOF SecurePort: 8443 @@ -1252,7 +1252,7 @@ jobs: - name: Check old cert range objects run: | - tests/ca/bin/ca-cert-range-objects-ssnv1.sh primaryds | tee output + tests/ca/bin/ca-cert-range-objects.sh primaryds | tee output # cert ranges should remain the same cat > expected << EOF @@ -1272,7 +1272,7 @@ jobs: - name: Check new cert range objects run: | - tests/ca/bin/ca-cert-range-objects-ssnv1.sh primaryds ou=certificateRepository,ou=ranges_v2 | tee output + tests/ca/bin/ca-cert-range-objects.sh primaryds ou=certificateRepository,ou=ranges_v2 | tee output # cert ranges should remain the same but in dec. # the range value for the primary move from 13-30 (hex) to 19-48 (dec) @@ -1294,7 +1294,7 @@ jobs: - name: Check request repository run: | - tests/ca/bin/ca-request-next-range-ssnv1.sh primaryds | tee output + tests/ca/bin/ca-request-next-range.sh primaryds | tee output cat > expected << EOF nextRange: 51 @@ -1304,7 +1304,7 @@ jobs: - name: Check cert repository run: | - tests/ca/bin/ca-cert-next-range-ssnv1.sh primaryds | tee output + tests/ca/bin/ca-cert-next-range.sh primaryds | tee output cat > expected << EOF nextRange: 73 @@ -1483,7 +1483,7 @@ jobs: - name: Check old request range objects run: | - tests/ca/bin/ca-request-range-objects-ssnv1.sh primaryds | tee output + tests/ca/bin/ca-request-range-objects.sh primaryds | tee output cat > expected << EOF SecurePort: 8443 @@ -1502,7 +1502,7 @@ jobs: - name: Check new request range objects run: | - tests/ca/bin/ca-request-range-objects-ssnv1.sh primaryds ou=requests,ou=ranges_v2 | tee output + tests/ca/bin/ca-request-range-objects.sh primaryds ou=requests,ou=ranges_v2 | tee output cat > expected << EOF SecurePort: 8443 @@ -1556,7 +1556,7 @@ jobs: - name: Check old cert range objects run: | - tests/ca/bin/ca-cert-range-objects-ssnv1.sh primaryds | tee output + tests/ca/bin/ca-cert-range-objects.sh primaryds | tee output # cert ranges should remain the same cat > expected << EOF @@ -1576,7 +1576,7 @@ jobs: - name: Check new cert range objects run: | - tests/ca/bin/ca-cert-range-objects-ssnv1.sh primaryds ou=certificateRepository,ou=ranges_v2 | tee output + tests/ca/bin/ca-cert-range-objects.sh primaryds ou=certificateRepository,ou=ranges_v2 | tee output cat > expected << EOF SecurePort: 8443 @@ -1610,7 +1610,7 @@ jobs: - name: Check request repository run: | - tests/ca/bin/ca-request-next-range-ssnv1.sh primaryds | tee output + tests/ca/bin/ca-request-next-range.sh primaryds | tee output cat > expected << EOF nextRange: 101 @@ -1620,7 +1620,7 @@ jobs: - name: Check cert repository run: | - tests/ca/bin/ca-cert-next-range-ssnv1.sh primaryds | tee output + tests/ca/bin/ca-cert-next-range.sh primaryds | tee output cat > expected << EOF nextRange: 127 diff --git a/.github/workflows/ca-clone-ssnv2-test.yml b/.github/workflows/ca-clone-ssnv2-test.yml index 57a2a7002e2..357fcb99c3b 100644 --- a/.github/workflows/ca-clone-ssnv2-test.yml +++ b/.github/workflows/ca-clone-ssnv2-test.yml @@ -172,7 +172,7 @@ jobs: - name: Check request range objects if: always() run: | - tests/ca/bin/ca-request-range-objects-ssnv2.sh primaryds | tee output + tests/ca/bin/ca-request-range-objects.sh primaryds | tee output # new range should be 11 - 20 (size: 10) cat > expected << EOF @@ -188,7 +188,7 @@ jobs: - name: Check cert range objects if: always() run: | - tests/ca/bin/ca-cert-range-objects-ssnv2.sh primaryds | tee output + tests/ca/bin/ca-cert-range-objects.sh primaryds | tee output # there should be no new range diff /dev/null output @@ -196,7 +196,7 @@ jobs: - name: Check request next range if: always() run: | - tests/ca/bin/ca-request-next-range-ssnv2.sh primaryds | tee output + tests/ca/bin/ca-request-next-range.sh primaryds | tee output # nextRange should be endRange + 1 = 11 cat > expected << EOF @@ -208,7 +208,7 @@ jobs: - name: Check cert next range if: always() run: | - tests/ca/bin/ca-cert-next-range-ssnv2.sh primaryds | tee output + tests/ca/bin/ca-cert-next-range.sh primaryds | tee output # nextRange should be dbs.endSerialNumber + 1 = 0x19 or 25 cat > expected << EOF @@ -386,7 +386,7 @@ jobs: - name: Check request range objects if: always() run: | - tests/ca/bin/ca-request-range-objects-ssnv2.sh secondaryds | tee output + tests/ca/bin/ca-request-range-objects.sh secondaryds | tee output # there should be no new range # NOTE: there's no indication that part of is has @@ -404,7 +404,7 @@ jobs: - name: Check cert range objects if: always() run: | - tests/ca/bin/ca-cert-range-objects-ssnv2.sh secondaryds | tee output + tests/ca/bin/ca-cert-range-objects.sh secondaryds | tee output # there should be no new range diff /dev/null output @@ -412,7 +412,7 @@ jobs: - name: Check request next range if: always() run: | - tests/ca/bin/ca-request-next-range-ssnv2.sh secondaryds | tee output + tests/ca/bin/ca-request-next-range.sh secondaryds | tee output # nextRange should be the same cat > expected << EOF @@ -424,7 +424,7 @@ jobs: - name: Check cert next range if: always() run: | - tests/ca/bin/ca-cert-next-range-ssnv2.sh secondaryds | tee output + tests/ca/bin/ca-cert-next-range.sh secondaryds | tee output # nextRange should be the same cat > expected << EOF @@ -555,7 +555,7 @@ jobs: - name: Check request range objects if: always() run: | - tests/ca/bin/ca-request-range-objects-ssnv2.sh primaryds | tee output + tests/ca/bin/ca-request-range-objects.sh primaryds | tee output # there should be no new range cat > expected << EOF @@ -571,7 +571,7 @@ jobs: - name: Check cert range objects if: always() run: | - tests/ca/bin/ca-cert-range-objects-ssnv2.sh primaryds | tee output + tests/ca/bin/ca-cert-range-objects.sh primaryds | tee output # there should be no new range diff /dev/null output @@ -579,7 +579,7 @@ jobs: - name: Check request next range if: always() run: | - tests/ca/bin/ca-request-next-range-ssnv2.sh primaryds | tee output + tests/ca/bin/ca-request-next-range.sh primaryds | tee output # nextRange should be the same cat > expected << EOF @@ -591,7 +591,7 @@ jobs: - name: Check cert next range if: always() run: | - tests/ca/bin/ca-cert-next-range-ssnv2.sh primaryds | tee output + tests/ca/bin/ca-cert-next-range.sh primaryds | tee output # nextRange should be the same cat > expected << EOF @@ -843,7 +843,7 @@ jobs: - name: Check request range objects if: always() run: | - tests/ca/bin/ca-request-range-objects-ssnv2.sh primaryds | tee output + tests/ca/bin/ca-request-range-objects.sh primaryds | tee output # new range should be 21 - 30 (size: 10) cat > expected << EOF @@ -864,7 +864,7 @@ jobs: - name: Check cert range objects if: always() run: | - tests/ca/bin/ca-cert-range-objects-ssnv2.sh primaryds | tee output + tests/ca/bin/ca-cert-range-objects.sh primaryds | tee output # new range should be 0x2b - 0x3c or 43 - 60 (size: 0x12) cat > expected << EOF @@ -885,7 +885,7 @@ jobs: - name: Check request next range if: always() run: | - tests/ca/bin/ca-request-next-range-ssnv2.sh primaryds | tee output + tests/ca/bin/ca-request-next-range.sh primaryds | tee output # nextRange should be endRange + 1 = 31 cat > expected << EOF @@ -897,7 +897,7 @@ jobs: - name: Check cert next range if: always() run: | - tests/ca/bin/ca-cert-next-range-ssnv2.sh primaryds | tee output + tests/ca/bin/ca-cert-next-range.sh primaryds | tee output # nextRange should be endRange + 1 = 61 or 0x3d cat > expected << EOF @@ -1039,7 +1039,7 @@ jobs: - name: Check request range objects if: always() run: | - tests/ca/bin/ca-request-range-objects-ssnv2.sh primaryds | tee output + tests/ca/bin/ca-request-range-objects.sh primaryds | tee output # there should be no new range cat > expected << EOF @@ -1060,7 +1060,7 @@ jobs: - name: Check cert range objects if: always() run: | - tests/ca/bin/ca-cert-range-objects-ssnv2.sh primaryds | tee output + tests/ca/bin/ca-cert-range-objects.sh primaryds | tee output # there should be no new range cat > expected << EOF @@ -1081,7 +1081,7 @@ jobs: - name: Check request next range if: always() run: | - tests/ca/bin/ca-request-next-range-ssnv2.sh primaryds | tee output + tests/ca/bin/ca-request-next-range.sh primaryds | tee output # nextRange should be the same cat > expected << EOF @@ -1093,7 +1093,7 @@ jobs: - name: Check cert next range if: always() run: | - tests/ca/bin/ca-cert-next-range-ssnv2.sh primaryds | tee output + tests/ca/bin/ca-cert-next-range.sh primaryds | tee output # nextRange should be the same cat > expected << EOF diff --git a/.github/workflows/ca-ssnv1-test.yml b/.github/workflows/ca-ssnv1-test.yml index f572996ef5d..2c0d6ed0733 100644 --- a/.github/workflows/ca-ssnv1-test.yml +++ b/.github/workflows/ca-ssnv1-test.yml @@ -140,7 +140,7 @@ jobs: - name: Check request next range run: | - tests/ca/bin/ca-request-next-range-ssnv1.sh ds | tee output + tests/ca/bin/ca-request-next-range.sh ds | tee output # SubsystemRangeUpdateCLI.updateRequestNumberRange() reads dbs.endRequestNumber # as 10 decimal, increments it by 1 to 11 decimal, then stores it as the @@ -153,7 +153,7 @@ jobs: - name: Check cert next range run: | - tests/ca/bin/ca-cert-next-range-ssnv1.sh ds | tee output + tests/ca/bin/ca-cert-next-range.sh ds | tee output # SubsystemRangeUpdateCLI.updateSerialNumberRange() incorrectly reads # dbs.endSerialNumber as 18 decimal, increments it by 1 to 19 decimal, @@ -166,14 +166,14 @@ jobs: - name: Check request range objects run: | - tests/ca/bin/ca-request-range-objects-ssnv1.sh ds | tee output + tests/ca/bin/ca-request-range-objects.sh ds | tee output # serial number management is disabled so there are no range objects created diff /dev/null output - name: Check cert range objects run: | - tests/ca/bin/ca-cert-range-objects-ssnv1.sh ds | tee output + tests/ca/bin/ca-cert-range-objects.sh ds | tee output # serial number management is disabled so there are no range objects created diff /dev/null output @@ -236,7 +236,7 @@ jobs: - name: Check request next range run: | - tests/ca/bin/ca-request-next-range-ssnv1.sh ds | tee output + tests/ca/bin/ca-request-next-range.sh ds | tee output # request nextRange should be incremented by 10 decimal cat > expected << EOF @@ -247,7 +247,7 @@ jobs: - name: Check cert next range run: | - tests/ca/bin/ca-cert-next-range-ssnv1.sh ds | tee output + tests/ca/bin/ca-cert-next-range.sh ds | tee output # cert nextRange should be the same cat > expected << EOF @@ -258,7 +258,7 @@ jobs: - name: Check request range objects run: | - tests/ca/bin/ca-request-range-objects-ssnv1.sh ds | tee output + tests/ca/bin/ca-request-range-objects.sh ds | tee output # new request range should be 11 - 20 decimal (size: 10) cat > expected << EOF @@ -273,7 +273,7 @@ jobs: - name: Check cert range objects run: | - tests/ca/bin/ca-cert-range-objects-ssnv1.sh ds | tee output + tests/ca/bin/ca-cert-range-objects.sh ds | tee output # there should be no new cert range diff /dev/null output @@ -377,7 +377,7 @@ jobs: - name: Check request next range run: | - tests/ca/bin/ca-request-next-range-ssnv1.sh ds | tee output + tests/ca/bin/ca-request-next-range.sh ds | tee output # request nextRange should be the same cat > expected << EOF @@ -388,7 +388,7 @@ jobs: - name: Check cert next range run: | - tests/ca/bin/ca-cert-next-range-ssnv1.sh ds | tee output + tests/ca/bin/ca-cert-next-range.sh ds | tee output # cert nextRange should be the same cat > expected << EOF @@ -399,7 +399,7 @@ jobs: - name: Check request range objects run: | - tests/ca/bin/ca-request-range-objects-ssnv1.sh ds | tee output + tests/ca/bin/ca-request-range-objects.sh ds | tee output # request range objects should be the same cat > expected << EOF @@ -414,7 +414,7 @@ jobs: - name: Check cert range objects run: | - tests/ca/bin/ca-cert-range-objects-ssnv1.sh ds | tee output + tests/ca/bin/ca-cert-range-objects.sh ds | tee output # cert range objects should be the same diff /dev/null output @@ -496,7 +496,7 @@ jobs: - name: Check request next range run: | - tests/ca/bin/ca-request-next-range-ssnv1.sh ds | tee output + tests/ca/bin/ca-request-next-range.sh ds | tee output # request nextRange should be the same cat > expected << EOF @@ -507,7 +507,7 @@ jobs: - name: Check cert next range run: | - tests/ca/bin/ca-cert-next-range-ssnv1.sh ds | tee output + tests/ca/bin/ca-cert-next-range.sh ds | tee output # cert nextRange should be the same cat > expected << EOF @@ -518,7 +518,7 @@ jobs: - name: Check request range objects run: | - tests/ca/bin/ca-request-range-objects-ssnv1.sh ds | tee output + tests/ca/bin/ca-request-range-objects.sh ds | tee output # request range objects should be the same cat > expected << EOF @@ -533,7 +533,7 @@ jobs: - name: Check cert range objects run: | - tests/ca/bin/ca-cert-range-objects-ssnv1.sh ds | tee output + tests/ca/bin/ca-cert-range-objects.sh ds | tee output # cert range objects should be the same diff /dev/null output @@ -584,7 +584,7 @@ jobs: - name: Check request next range run: | - tests/ca/bin/ca-request-next-range-ssnv1.sh ds | tee output + tests/ca/bin/ca-request-next-range.sh ds | tee output # request nextRange should be incremented by 10 decimal to 31 decimal cat > expected << EOF @@ -595,7 +595,7 @@ jobs: - name: Check cert next range run: | - tests/ca/bin/ca-cert-next-range-ssnv1.sh ds | tee output + tests/ca/bin/ca-cert-next-range.sh ds | tee output # cert nextRequest should incremented by 12 hex (18 decimal) to 37 decimal cat > expected << EOF @@ -606,7 +606,7 @@ jobs: - name: Check request range objects run: | - tests/ca/bin/ca-request-range-objects-ssnv1.sh ds | tee output + tests/ca/bin/ca-request-range-objects.sh ds | tee output # new request range should be 21 - 30 decimal (size: 10) cat > expected << EOF @@ -626,7 +626,7 @@ jobs: - name: Check cert range objects run: | - tests/ca/bin/ca-cert-range-objects-ssnv1.sh ds | tee output + tests/ca/bin/ca-cert-range-objects.sh ds | tee output # new request range is 19 - 36 decimal (size: 18) # Note: the size should have been consistent (i.e. 16) @@ -714,7 +714,7 @@ jobs: - name: Check request next range run: | - tests/ca/bin/ca-request-next-range-ssnv1.sh ds | tee output + tests/ca/bin/ca-request-next-range.sh ds | tee output # request nextRange should be the same cat > expected << EOF @@ -725,7 +725,7 @@ jobs: - name: Check cert next range run: | - tests/ca/bin/ca-cert-next-range-ssnv1.sh ds | tee output + tests/ca/bin/ca-cert-next-range.sh ds | tee output # cert nextRange should be the same cat > expected << EOF @@ -736,7 +736,7 @@ jobs: - name: Check request range objects run: | - tests/ca/bin/ca-request-range-objects-ssnv1.sh ds | tee output + tests/ca/bin/ca-request-range-objects.sh ds | tee output # request range objects should be the same cat > expected << EOF @@ -756,7 +756,7 @@ jobs: - name: Check cert range objects run: | - tests/ca/bin/ca-cert-range-objects-ssnv1.sh ds | tee output + tests/ca/bin/ca-cert-range-objects.sh ds | tee output # cert range objects should be the same cat > expected << EOF @@ -844,7 +844,7 @@ jobs: - name: Check request next range run: | - tests/ca/bin/ca-request-next-range-ssnv1.sh ds | tee output + tests/ca/bin/ca-request-next-range.sh ds | tee output # request nextRange should be the same cat > expected << EOF @@ -855,7 +855,7 @@ jobs: - name: Check cert next range run: | - tests/ca/bin/ca-cert-next-range-ssnv1.sh ds | tee output + tests/ca/bin/ca-cert-next-range.sh ds | tee output # cert nextRange should be the same cat > expected << EOF @@ -866,7 +866,7 @@ jobs: - name: Check request range objects run: | - tests/ca/bin/ca-request-range-objects-ssnv1.sh ds | tee output + tests/ca/bin/ca-request-range-objects.sh ds | tee output # request range objects should be the same cat > expected << EOF @@ -886,7 +886,7 @@ jobs: - name: Check cert range objects run: | - tests/ca/bin/ca-cert-range-objects-ssnv1.sh ds | tee output + tests/ca/bin/ca-cert-range-objects.sh ds | tee output # cert range objects should be the same cat > expected << EOF @@ -945,7 +945,7 @@ jobs: - name: Check request next range run: | - tests/ca/bin/ca-request-next-range-ssnv1.sh ds | tee output + tests/ca/bin/ca-request-next-range.sh ds | tee output # request nextRange should be incremented by 10 decimal to 41 decimal cat > expected << EOF @@ -956,7 +956,7 @@ jobs: - name: Check cert next range run: | - tests/ca/bin/ca-cert-next-range-ssnv1.sh ds | tee output + tests/ca/bin/ca-cert-next-range.sh ds | tee output # cert nextRange should be incremented by 12 hex (18 decimal) to 55 decimal cat > expected << EOF @@ -967,7 +967,7 @@ jobs: - name: Check request range objects run: | - tests/ca/bin/ca-request-range-objects-ssnv1.sh ds | tee output + tests/ca/bin/ca-request-range-objects.sh ds | tee output # new request range should be 31 - 40 decimal (size: 10) cat > expected << EOF @@ -992,7 +992,7 @@ jobs: - name: Check cert range objects run: | - tests/ca/bin/ca-cert-range-objects-ssnv1.sh ds | tee output + tests/ca/bin/ca-cert-range-objects.sh ds | tee output # new cert range should be 37 - 54 decimal (size: 18) cat > expected << EOF @@ -1088,7 +1088,7 @@ jobs: - name: Check request next range run: | - tests/ca/bin/ca-request-next-range-ssnv1.sh ds | tee output + tests/ca/bin/ca-request-next-range.sh ds | tee output # request nextRange should be the same cat > expected << EOF @@ -1099,7 +1099,7 @@ jobs: - name: Check cert next range run: | - tests/ca/bin/ca-cert-next-range-ssnv1.sh ds | tee output + tests/ca/bin/ca-cert-next-range.sh ds | tee output # cert nextRange should be incremented by 12 hex (18 decimal) to 55 decimal cat > expected << EOF @@ -1110,7 +1110,7 @@ jobs: - name: Check request range objects run: | - tests/ca/bin/ca-request-range-objects-ssnv1.sh ds | tee output + tests/ca/bin/ca-request-range-objects.sh ds | tee output # request range objects should be the same cat > expected << EOF @@ -1135,7 +1135,7 @@ jobs: - name: Check cert range objects run: | - tests/ca/bin/ca-cert-range-objects-ssnv1.sh ds | tee output + tests/ca/bin/ca-cert-range-objects.sh ds | tee output # cert range should be the same cat > expected << EOF @@ -1222,7 +1222,7 @@ jobs: - name: Check request repository run: | - tests/ca/bin/ca-request-next-range-ssnv1.sh ds | tee output + tests/ca/bin/ca-request-next-range.sh ds | tee output # request nextRange should be incremented by 10 decimal to 41 decimal cat > expected << EOF @@ -1233,7 +1233,7 @@ jobs: - name: Check cert repository run: | - tests/ca/bin/ca-cert-next-range-ssnv1.sh ds | tee output + tests/ca/bin/ca-cert-next-range.sh ds | tee output cat > expected << EOF nextRange: 85 @@ -1243,7 +1243,7 @@ jobs: - name: Check old request range objects run: | - tests/ca/bin/ca-request-range-objects-ssnv1.sh ds | tee output + tests/ca/bin/ca-request-range-objects.sh ds | tee output # new request range should be 31 - 40 decimal (total: 10) cat > expected << EOF @@ -1268,7 +1268,7 @@ jobs: - name: Check new request range objects run: | - tests/ca/bin/ca-request-range-objects-ssnv1.sh ds ou=requests,ou=ranges_v2 | tee output + tests/ca/bin/ca-request-range-objects.sh ds ou=requests,ou=ranges_v2 | tee output # new request range should be 31 - 40 decimal (total: 10) cat > expected << EOF @@ -1298,7 +1298,7 @@ jobs: - name: Check old cert range objects run: | - tests/ca/bin/ca-cert-range-objects-ssnv1.sh ds | tee output + tests/ca/bin/ca-cert-range-objects.sh ds | tee output # new cert range should be the same but converted to decimal # first range move from 19-36 (hex) to 25-54 (dec) @@ -1320,7 +1320,7 @@ jobs: - name: Check new cert range objects run: | - tests/ca/bin/ca-cert-range-objects-ssnv1.sh ds ou=certificateRepository,ou=ranges_v2 | tee output + tests/ca/bin/ca-cert-range-objects.sh ds ou=certificateRepository,ou=ranges_v2 | tee output # new cert range should be the same but converted to decimal # first range move from 19-36 (hex) to 25-54 (dec) @@ -1439,7 +1439,7 @@ jobs: - name: Check request repository run: | - tests/ca/bin/ca-request-next-range-ssnv1.sh ds | tee output + tests/ca/bin/ca-request-next-range.sh ds | tee output cat > expected << EOF nextRange: 101 @@ -1449,7 +1449,7 @@ jobs: - name: Check cert repository run: | - tests/ca/bin/ca-cert-next-range-ssnv1.sh ds | tee output + tests/ca/bin/ca-cert-next-range.sh ds | tee output cat > expected << EOF nextRange: 121 @@ -1459,7 +1459,7 @@ jobs: - name: Check old request range objects run: | - tests/ca/bin/ca-request-range-objects-ssnv1.sh ds | tee output + tests/ca/bin/ca-request-range-objects.sh ds | tee output # new request range should be 31 - 40 decimal (total: 10) cat > expected << EOF @@ -1484,7 +1484,7 @@ jobs: - name: Check new request range objects run: | - tests/ca/bin/ca-request-range-objects-ssnv1.sh ds ou=requests,ou=ranges_v2 | tee output + tests/ca/bin/ca-request-range-objects.sh ds ou=requests,ou=ranges_v2 | tee output cat > expected << EOF SecurePort: 8443 @@ -1538,7 +1538,7 @@ jobs: - name: Check old cert range objects run: | - tests/ca/bin/ca-cert-range-objects-ssnv1.sh ds | tee output + tests/ca/bin/ca-cert-range-objects.sh ds | tee output # new cert range should be the same but converted to decimal # first range move from 19-36 (hex) to 25-54 (dec) @@ -1560,7 +1560,7 @@ jobs: - name: Check new cert range objects run: | - tests/ca/bin/ca-cert-range-objects-ssnv1.sh ds ou=certificateRepository,ou=ranges_v2 | tee output + tests/ca/bin/ca-cert-range-objects.sh ds ou=certificateRepository,ou=ranges_v2 | tee output cat > expected << EOF SecurePort: 8443 diff --git a/.github/workflows/ca-ssnv2-test.yml b/.github/workflows/ca-ssnv2-test.yml index 0fe1280f034..9bf74070047 100644 --- a/.github/workflows/ca-ssnv2-test.yml +++ b/.github/workflows/ca-ssnv2-test.yml @@ -156,7 +156,7 @@ jobs: - name: Check request range objects if: always() run: | - tests/ca/bin/ca-request-range-objects-ssnv2.sh ds | tee output + tests/ca/bin/ca-request-range-objects.sh ds | tee output # there should be no new range diff /dev/null output @@ -164,7 +164,7 @@ jobs: - name: Check cert range objects if: always() run: | - tests/ca/bin/ca-cert-range-objects-ssnv2.sh ds | tee output + tests/ca/bin/ca-cert-range-objects.sh ds | tee output # there should be no new range diff /dev/null output @@ -172,7 +172,7 @@ jobs: - name: Check request next range if: always() run: | - tests/ca/bin/ca-request-next-range-ssnv2.sh ds | tee output + tests/ca/bin/ca-request-next-range.sh ds | tee output # request nextRange should be dbs.endRequestNumber + 1 = 11 cat > expected << EOF @@ -184,7 +184,7 @@ jobs: - name: Check cert next range if: always() run: | - tests/ca/bin/ca-cert-next-range-ssnv2.sh ds | tee output + tests/ca/bin/ca-cert-next-range.sh ds | tee output # cert nextRange should be dbs.endSerialNumber + 1 = 0x19 or 25 cat > expected << EOF @@ -256,7 +256,7 @@ jobs: - name: Check request range objects if: always() run: | - tests/ca/bin/ca-request-range-objects-ssnv2.sh ds | tee output + tests/ca/bin/ca-request-range-objects.sh ds | tee output # new range should be 11 - 20 (size: 10) cat > expected << EOF @@ -272,7 +272,7 @@ jobs: - name: Check cert range objects if: always() run: | - tests/ca/bin/ca-cert-range-objects-ssnv2.sh ds | tee output + tests/ca/bin/ca-cert-range-objects.sh ds | tee output # there should be no new range diff /dev/null output @@ -280,7 +280,7 @@ jobs: - name: Check request next range if: always() run: | - tests/ca/bin/ca-request-next-range-ssnv2.sh ds | tee output + tests/ca/bin/ca-request-next-range.sh ds | tee output # nextRange should be endRange + 1 = 21 cat > expected << EOF @@ -292,7 +292,7 @@ jobs: - name: Check cert next range if: always() run: | - tests/ca/bin/ca-cert-next-range-ssnv2.sh ds | tee output + tests/ca/bin/ca-cert-next-range.sh ds | tee output # nextRange should be the same cat > expected << EOF @@ -391,7 +391,7 @@ jobs: - name: Check request range objects if: always() run: | - tests/ca/bin/ca-request-range-objects-ssnv2.sh ds | tee output + tests/ca/bin/ca-request-range-objects.sh ds | tee output # there should be no new range cat > expected << EOF @@ -407,7 +407,7 @@ jobs: - name: Check cert range objects if: always() run: | - tests/ca/bin/ca-cert-range-objects-ssnv2.sh ds | tee output + tests/ca/bin/ca-cert-range-objects.sh ds | tee output # there should be no new range diff /dev/null output @@ -415,7 +415,7 @@ jobs: - name: Check request next range if: always() run: | - tests/ca/bin/ca-request-next-range-ssnv2.sh ds | tee output + tests/ca/bin/ca-request-next-range.sh ds | tee output # nextRange should be the same cat > expected << EOF @@ -427,7 +427,7 @@ jobs: - name: Check cert next range if: always() run: | - tests/ca/bin/ca-cert-next-range-ssnv2.sh ds | tee output + tests/ca/bin/ca-cert-next-range.sh ds | tee output # nextRange should be the same cat > expected << EOF @@ -519,7 +519,7 @@ jobs: - name: Check request range objects if: always() run: | - tests/ca/bin/ca-request-range-objects-ssnv2.sh ds | tee output + tests/ca/bin/ca-request-range-objects.sh ds | tee output # there should be no new range cat > expected << EOF @@ -535,7 +535,7 @@ jobs: - name: Check cert range objects if: always() run: | - tests/ca/bin/ca-cert-range-objects-ssnv2.sh ds | tee output + tests/ca/bin/ca-cert-range-objects.sh ds | tee output # there should be no new range diff /dev/null output @@ -543,7 +543,7 @@ jobs: - name: Check request next range if: always() run: | - tests/ca/bin/ca-request-next-range-ssnv2.sh ds | tee output + tests/ca/bin/ca-request-next-range.sh ds | tee output # request nextRange should be the same cat > expected << EOF @@ -555,7 +555,7 @@ jobs: - name: Check cert next range if: always() run: | - tests/ca/bin/ca-cert-next-range-ssnv2.sh ds | tee output + tests/ca/bin/ca-cert-next-range.sh ds | tee output # cert nextRange should be the same cat > expected << EOF @@ -616,7 +616,7 @@ jobs: - name: Check request range objects if: always() run: | - tests/ca/bin/ca-request-range-objects-ssnv2.sh ds | tee output + tests/ca/bin/ca-request-range-objects.sh ds | tee output # new request range should be 21 - 30 (size: 10) cat > expected << EOF @@ -637,7 +637,7 @@ jobs: - name: Check cert range objects if: always() run: | - tests/ca/bin/ca-cert-range-objects-ssnv2.sh ds | tee output + tests/ca/bin/ca-cert-range-objects.sh ds | tee output # new cert range should be 0x19 - 0x2a or 25 - 42 (size: 0x12) cat > expected << EOF @@ -653,7 +653,7 @@ jobs: - name: Check request next range if: always() run: | - tests/ca/bin/ca-request-next-range-ssnv2.sh ds | tee output + tests/ca/bin/ca-request-next-range.sh ds | tee output # request nextRange should be incremented by 10 to 31 cat > expected << EOF @@ -665,7 +665,7 @@ jobs: - name: Check cert next range if: always() run: | - tests/ca/bin/ca-cert-next-range-ssnv2.sh ds | tee output + tests/ca/bin/ca-cert-next-range.sh ds | tee output # cert nextRequest should incremented by 0x12 to 0x2b or 43 cat > expected << EOF @@ -753,7 +753,7 @@ jobs: - name: Check request range objects if: always() run: | - tests/ca/bin/ca-request-range-objects-ssnv2.sh ds | tee output + tests/ca/bin/ca-request-range-objects.sh ds | tee output # request range objects should be the same cat > expected << EOF @@ -774,7 +774,7 @@ jobs: - name: Check cert range objects if: always() run: | - tests/ca/bin/ca-cert-range-objects-ssnv2.sh ds | tee output + tests/ca/bin/ca-cert-range-objects.sh ds | tee output # cert range objects should be the same cat > expected << EOF @@ -790,7 +790,7 @@ jobs: - name: Check request next range if: always() run: | - tests/ca/bin/ca-request-next-range-ssnv2.sh ds | tee output + tests/ca/bin/ca-request-next-range.sh ds | tee output # request nextRange should be the same cat > expected << EOF @@ -802,7 +802,7 @@ jobs: - name: Check cert next range if: always() run: | - tests/ca/bin/ca-cert-next-range-ssnv2.sh ds | tee output + tests/ca/bin/ca-cert-next-range.sh ds | tee output # cert nextRange should be the same cat > expected << EOF @@ -892,7 +892,7 @@ jobs: - name: Check request range objects if: always() run: | - tests/ca/bin/ca-request-range-objects-ssnv2.sh ds | tee output + tests/ca/bin/ca-request-range-objects.sh ds | tee output # request range objects should be the same cat > expected << EOF @@ -913,7 +913,7 @@ jobs: - name: Check cert range objects if: always() run: | - tests/ca/bin/ca-cert-range-objects-ssnv2.sh ds | tee output + tests/ca/bin/ca-cert-range-objects.sh ds | tee output # cert range objects should be the same cat > expected << EOF @@ -929,7 +929,7 @@ jobs: - name: Check request next range if: always() run: | - tests/ca/bin/ca-request-next-range-ssnv2.sh ds | tee output + tests/ca/bin/ca-request-next-range.sh ds | tee output # request nextRange should be the same cat > expected << EOF @@ -941,7 +941,7 @@ jobs: - name: Check cert next range if: always() run: | - tests/ca/bin/ca-cert-next-range-ssnv2.sh ds | tee output + tests/ca/bin/ca-cert-next-range.sh ds | tee output # cert nextRange should be the same cat > expected << EOF @@ -1002,7 +1002,7 @@ jobs: - name: Check request range objects if: always() run: | - tests/ca/bin/ca-request-range-objects-ssnv2.sh ds | tee output + tests/ca/bin/ca-request-range-objects.sh ds | tee output # new range should be 31 - 40 (size: 10) cat > expected << EOF @@ -1028,7 +1028,7 @@ jobs: - name: Check cert range objects if: always() run: | - tests/ca/bin/ca-cert-range-objects-ssnv2.sh ds | tee output + tests/ca/bin/ca-cert-range-objects.sh ds | tee output # new range should be 0x2b - 0x3c or 43 - 60 (size: 0x12) cat > expected << EOF @@ -1049,7 +1049,7 @@ jobs: - name: Check request next range if: always() run: | - tests/ca/bin/ca-request-next-range-ssnv2.sh ds | tee output + tests/ca/bin/ca-request-next-range.sh ds | tee output # request nextRange should be incremented by 10 to 41 cat > expected << EOF @@ -1061,7 +1061,7 @@ jobs: - name: Check cert next range if: always() run: | - tests/ca/bin/ca-cert-next-range-ssnv2.sh ds | tee output + tests/ca/bin/ca-cert-next-range.sh ds | tee output # cert nextRange should be incremented by 0x12 to 0x47 or 61 cat > expected << EOF @@ -1149,7 +1149,7 @@ jobs: - name: Check request range objects if: always() run: | - tests/ca/bin/ca-request-range-objects-ssnv2.sh ds | tee output + tests/ca/bin/ca-request-range-objects.sh ds | tee output # request range objects should be the same cat > expected << EOF @@ -1175,7 +1175,7 @@ jobs: - name: Check cert range objects if: always() run: | - tests/ca/bin/ca-cert-range-objects-ssnv2.sh ds | tee output + tests/ca/bin/ca-cert-range-objects.sh ds | tee output # cert range objects should be the same cat > expected << EOF @@ -1196,7 +1196,7 @@ jobs: - name: Check request next range if: always() run: | - tests/ca/bin/ca-request-next-range-ssnv2.sh ds | tee output + tests/ca/bin/ca-request-next-range.sh ds | tee output # request nextRange should be the same cat > expected << EOF @@ -1208,7 +1208,7 @@ jobs: - name: Check cert next range if: always() run: | - tests/ca/bin/ca-cert-next-range-ssnv2.sh ds | tee output + tests/ca/bin/ca-cert-next-range.sh ds | tee output # cert nextRange should be the same cat > expected << EOF diff --git a/tests/ca/bin/ca-cert-next-range-ssnv2.sh b/tests/ca/bin/ca-cert-next-range-ssnv2.sh deleted file mode 100755 index 59796e57cab..00000000000 --- a/tests/ca/bin/ca-cert-next-range-ssnv2.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -e - -NAME=$1 - -docker exec $NAME ldapsearch \ - -H ldap://$NAME.example.com:3389 \ - -D "cn=Directory Manager" \ - -w Secret.123 \ - -b ou=certificateRepository,ou=ca,dc=ca,dc=pki,dc=example,dc=com \ - -s base \ - -o ldif_wrap=no \ - -LLL \ - | grep nextRange: diff --git a/tests/ca/bin/ca-cert-next-range-ssnv1.sh b/tests/ca/bin/ca-cert-next-range.sh similarity index 100% rename from tests/ca/bin/ca-cert-next-range-ssnv1.sh rename to tests/ca/bin/ca-cert-next-range.sh diff --git a/tests/ca/bin/ca-cert-range-objects-ssnv2.sh b/tests/ca/bin/ca-cert-range-objects-ssnv2.sh deleted file mode 100755 index 6524da82127..00000000000 --- a/tests/ca/bin/ca-cert-range-objects-ssnv2.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -e - -NAME=$1 - -LIST=$(docker exec $NAME ldapsearch \ - -H ldap://$NAME.example.com:3389 \ - -D "cn=Directory Manager" \ - -w Secret.123 \ - -b ou=certificateRepository,ou=ranges,dc=ca,dc=pki,dc=example,dc=com \ - -s one \ - -o ldif_wrap=no \ - -LLL \ - dn \ - | sed -n 's/^dn: *\(.*\)$/\1/p') - -for DN in $LIST -do - docker exec $NAME ldapsearch \ - -H ldap://$NAME.example.com:3389 \ - -D "cn=Directory Manager" \ - -w Secret.123 \ - -b $DN \ - -s base \ - -o ldif_wrap=no \ - -LLL \ - | grep \ - -e SecurePort: \ - -e beginRange: \ - -e endRange: \ - -e host: \ - | sort - - echo -done diff --git a/tests/ca/bin/ca-cert-range-objects-ssnv1.sh b/tests/ca/bin/ca-cert-range-objects.sh similarity index 100% rename from tests/ca/bin/ca-cert-range-objects-ssnv1.sh rename to tests/ca/bin/ca-cert-range-objects.sh diff --git a/tests/ca/bin/ca-request-next-range-ssnv2.sh b/tests/ca/bin/ca-request-next-range-ssnv2.sh deleted file mode 100755 index 3bf262d8a8c..00000000000 --- a/tests/ca/bin/ca-request-next-range-ssnv2.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -e - -NAME=$1 - -docker exec $NAME ldapsearch \ - -H ldap://$NAME.example.com:3389 \ - -D "cn=Directory Manager" \ - -w Secret.123 \ - -b ou=ca,ou=requests,dc=ca,dc=pki,dc=example,dc=com \ - -s base \ - -o ldif_wrap=no \ - -LLL \ - | grep nextRange: diff --git a/tests/ca/bin/ca-request-next-range-ssnv1.sh b/tests/ca/bin/ca-request-next-range.sh similarity index 100% rename from tests/ca/bin/ca-request-next-range-ssnv1.sh rename to tests/ca/bin/ca-request-next-range.sh diff --git a/tests/ca/bin/ca-request-range-objects-ssnv2.sh b/tests/ca/bin/ca-request-range-objects-ssnv2.sh deleted file mode 100755 index c17a316bfbd..00000000000 --- a/tests/ca/bin/ca-request-range-objects-ssnv2.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -e - -NAME=$1 - -LIST=$(docker exec $NAME ldapsearch \ - -H ldap://$NAME.example.com:3389 \ - -D "cn=Directory Manager" \ - -w Secret.123 \ - -b ou=requests,ou=ranges,dc=ca,dc=pki,dc=example,dc=com \ - -s one \ - -o ldif_wrap=no \ - -LLL \ - dn \ - | sed -n 's/^dn: *\(.*\)$/\1/p') - -for DN in $LIST -do - docker exec $NAME ldapsearch \ - -H ldap://$NAME.example.com:3389 \ - -D "cn=Directory Manager" \ - -w Secret.123 \ - -b $DN \ - -s base \ - -o ldif_wrap=no \ - -LLL \ - | grep \ - -e SecurePort: \ - -e beginRange: \ - -e endRange: \ - -e host: \ - | sort - - echo -done diff --git a/tests/ca/bin/ca-request-range-objects-ssnv1.sh b/tests/ca/bin/ca-request-range-objects.sh similarity index 100% rename from tests/ca/bin/ca-request-range-objects-ssnv1.sh rename to tests/ca/bin/ca-request-range-objects.sh