Update ssnv2 tests to support new ranges object for legacy2 migration

dogtagpki · Oct 28, 2024 · 1e1e7e7 · 1e1e7e7
1 parent d138ee6
commit 1e1e7e7
Show file tree

Hide file tree

Showing 4 changed files with 247 additions and 14 deletions.
diff --git a/.github/workflows/ca-clone-ssnv1-test.yml b/.github/workflows/ca-clone-ssnv1-test.yml
@@ -1006,7 +1006,7 @@ jobs:
           docker exec primary pki-server ca-id-generator-update --type legacy2 request
           docker exec primary pki-server ca-id-generator-update --type legacy2 cert
 
-      - name: Check request range objects
+      - name: Check old request range objects
         run: |
           tests/ca/bin/ca-request-range-objects-ssnv1.sh primaryds | tee output
 
@@ -1026,6 +1026,21 @@ jobs:
 
           diff expected output
 
+      - name: Check new request range objects
+        run: |
+          tests/ca/bin/ca-request-range-objects-ssnv1.sh primaryds ou=requests,ou=ranges_v2 | tee output
+
+          # request ranges should remain the same
+          cat > expected << EOF
+          SecurePort: 8443
+          beginRange: 11
+          endRange: 20
+          host: primary.example.com
+
+          EOF
+
+          diff expected output
+
       - name: Check request next range
         run: |
           tests/ca/bin/ca-request-next-range-ssnv1.sh primaryds | tee output
@@ -1037,18 +1052,34 @@ jobs:
 
           diff expected output
 
-      - name: Check cert range objects
+      - name: Check old cert range objects
         run: |
           tests/ca/bin/ca-cert-range-objects-ssnv1.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) 
           cat > expected << EOF
+          SecurePort: 8443
+          beginRange: 13
+          endRange: 30
+          host: primary.example.com
+
           SecurePort: 8443
           beginRange: 31
           endRange: 48
           host: secondary.example.com
 
+          EOF
+
+          diff expected output
+
+      - name: Check new cert range objects
+        run: |
+          tests/ca/bin/ca-cert-range-objects-ssnv1.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) 
+          cat > expected << EOF
           SecurePort: 8443
           beginRange: 19
           endRange: 48
@@ -1127,6 +1158,22 @@ jobs:
 
           diff expected output
           
+      - name: Check the new range object is configured in a different DN in all CAs
+        run: |
+          docker exec primary pki-server ca-config-show dbs.serialRangeDN | tee output
+          docker exec primary pki-server ca-config-show dbs.requestRangeDN | tee -a output
+          docker exec secondary pki-server ca-config-show dbs.serialRangeDN | tee -a output
+          docker exec secondary pki-server ca-config-show dbs.requestRangeDN | tee -a output
+
+          cat > expected <<EOF
+          ou=certificateRepository,ou=ranges_v2
+          ou=requests,ou=ranges_v2
+          ou=certificateRepository,ou=ranges_v2
+          ou=requests,ou=ranges_v2
+          EOF
+
+          diff expected output
+
       - name: Check cert range config in primary CA
         run: |
           tests/ca/bin/ca-cert-range-config.sh primary | tee output
@@ -1155,7 +1202,7 @@ jobs:
 
           diff expected output
 
-      - name: Check request range objects
+      - name: Check old request range objects
         run: |
           tests/ca/bin/ca-request-range-objects-ssnv1.sh primaryds | tee output
 
@@ -1170,6 +1217,25 @@ jobs:
           endRange: 30
           host: secondary.example.com
 
+          EOF
+
+          diff expected output
+
+      - name: Check new request range objects
+        run: |
+          tests/ca/bin/ca-request-range-objects-ssnv1.sh primaryds ou=requests,ou=ranges_v2 | tee output
+
+          cat > expected << EOF
+          SecurePort: 8443
+          beginRange: 11
+          endRange: 20
+          host: primary.example.com
+
+          SecurePort: 8443
+          beginRange: 21
+          endRange: 30
+          host: secondary.example.com
+
           SecurePort: 8443
           beginRange: 31
           endRange: 40
@@ -1184,10 +1250,30 @@ jobs:
 
           diff expected output
 
-      - name: Check cert range objects
+      - name: Check old cert range objects
         run: |
           tests/ca/bin/ca-cert-range-objects-ssnv1.sh primaryds | tee output
 
+          # cert ranges should remain the same
+          cat > expected << EOF
+          SecurePort: 8443
+          beginRange: 13
+          endRange: 30
+          host: primary.example.com
+
+          SecurePort: 8443
+          beginRange: 31
+          endRange: 48
+          host: secondary.example.com
+
+          EOF
+
+          diff expected output
+
+      - name: Check new cert range objects
+        run: |
+          tests/ca/bin/ca-cert-range-objects-ssnv1.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)
           # the range value for the secondary move from 31-48 (hex) to 49-72 (dec)          
@@ -1395,7 +1481,7 @@ jobs:
 
           diff expected output
 
-      - name: Check request range objects
+      - name: Check old request range objects
         run: |
           tests/ca/bin/ca-request-range-objects-ssnv1.sh primaryds | tee output
 
@@ -1410,6 +1496,25 @@ jobs:
           endRange: 30
           host: secondary.example.com
 
+          EOF
+
+          diff expected output
+
+      - name: Check new request range objects
+        run: |
+          tests/ca/bin/ca-request-range-objects-ssnv1.sh primaryds ou=requests,ou=ranges_v2 | tee output
+
+          cat > expected << EOF
+          SecurePort: 8443
+          beginRange: 11
+          endRange: 20
+          host: primary.example.com
+
+          SecurePort: 8443
+          beginRange: 21
+          endRange: 30
+          host: secondary.example.com
+
           SecurePort: 8443
           beginRange: 31
           endRange: 40
@@ -1449,10 +1554,30 @@ jobs:
 
           diff expected output
 
-      - name: Check cert range objects
+      - name: Check old cert range objects
         run: |
           tests/ca/bin/ca-cert-range-objects-ssnv1.sh primaryds | tee output
 
+          # cert ranges should remain the same
+          cat > expected << EOF
+          SecurePort: 8443
+          beginRange: 13
+          endRange: 30
+          host: primary.example.com
+
+          SecurePort: 8443
+          beginRange: 31
+          endRange: 48
+          host: secondary.example.com
+
+          EOF
+
+          diff expected output
+
+      - name: Check new cert range objects
+        run: |
+          tests/ca/bin/ca-cert-range-objects-ssnv1.sh primaryds ou=certificateRepository,ou=ranges_v2 | tee output
+
           cat > expected << EOF
           SecurePort: 8443
           beginRange: 19