Update SSNv1 and SSNv2 tests

The SSNv1 and SSNv2 tests have been updated to use the new SSNv2 nextRange location.
dogtagpki · Nov 4, 2024 · 678b8d0 · 678b8d0
1 parent 116ef36
commit 678b8d0
Show file tree

Hide file tree

Showing 6 changed files with 269 additions and 108 deletions.
diff --git a/.github/workflows/ca-clone-ssnv1-test.yml b/.github/workflows/ca-clone-ssnv1-test.yml
@@ -1063,7 +1063,7 @@ jobs:
           docker exec primary pki-server ca-id-generator-update -v --type legacy2 request
           docker exec primary pki-server ca-id-generator-update -v --type legacy2 cert
 
-      - name: Check old request range objects
+      - name: Check request range objects for SSNv1
         if: always()
         run: |
           tests/ca/bin/ca-request-range-objects.sh primaryds | tee output
@@ -1084,7 +1084,7 @@ jobs:
 
           diff expected output
 
-      - name: Check new request range objects
+      - name: Check request range objects for SSNv2
         if: always()
         run: |
           tests/ca/bin/ca-request-range-objects.sh -t legacy2 primaryds | tee output
@@ -1100,7 +1100,7 @@ jobs:
 
           diff expected output
 
-      - name: Check request next range
+      - name: Check request next range for SSNv1
         if: always()
         run: |
           tests/ca/bin/ca-request-next-range.sh primaryds | tee output
@@ -1112,7 +1112,19 @@ jobs:
 
           diff expected output
 
-      - name: Check old cert range objects
+      - name: Check request next range for SSNv2
+        if: always()
+        run: |
+          tests/ca/bin/ca-request-next-range.sh -t legacy2 primaryds | tee output
+
+          # request nextRange should remain the same
+          cat > expected << EOF
+          nextRange: 21
+          EOF
+
+          diff expected output
+
+      - name: Check cert range objects for SSNv1
         if: always()
         run: |
           tests/ca/bin/ca-cert-range-objects.sh primaryds | tee output
@@ -1134,7 +1146,7 @@ jobs:
 
           diff expected output
 
-      - name: Check new cert range objects
+      - name: Check cert range objects for SSNv2
         if: always()
         run: |
           tests/ca/bin/ca-cert-range-objects.sh -t legacy2 primaryds | tee output
@@ -1151,12 +1163,24 @@ jobs:
 
           diff expected output
 
-      - name: Check cert next range
+      - name: Check cert next range for SSNv1
         if: always()
         run: |
           tests/ca/bin/ca-cert-next-range.sh primaryds | tee output
 
-          # cert nextRange should remain the same
+          # next range should remain the same
+          cat > expected << EOF
+          nextRange: 49
+          EOF
+
+          diff expected output
+
+      - name: Check cert next range for SSNv2
+        if: always()
+        run: |
+          tests/ca/bin/ca-cert-next-range.sh -t legacy2 primaryds | tee output
+
+          # next range should be endRange + 1
           cat > expected << EOF
           nextRange: 49
           EOF
@@ -1273,7 +1297,7 @@ jobs:
 
           diff expected output
 
-      - name: Check old request range objects
+      - name: Check request range objects for SSNv1
         if: always()
         run: |
           tests/ca/bin/ca-request-range-objects.sh primaryds | tee output
@@ -1293,7 +1317,7 @@ jobs:
 
           diff expected output
 
-      - name: Check new request range objects
+      - name: Check request range objects for SSNv2
         if: always()
         run: |
           tests/ca/bin/ca-request-range-objects.sh -t legacy2 primaryds | tee output
@@ -1323,7 +1347,29 @@ jobs:
 
           diff expected output
 
-      - name: Check old cert range objects
+      - name: Check request next range for SSNv1
+        if: always()
+        run: |
+          tests/ca/bin/ca-request-next-range.sh primaryds | tee output
+
+          cat > expected << EOF
+          nextRange: 31
+          EOF
+
+          diff expected output
+
+      - name: Check request next range for SSNv2
+        if: always()
+        run: |
+          tests/ca/bin/ca-request-next-range.sh -t legacy2 primaryds | tee output
+
+          cat > expected << EOF
+          nextRange: 51
+          EOF
+
+          diff expected output
+
+      - name: Check cert range objects for SSNv1
         if: always()
         run: |
           tests/ca/bin/ca-cert-range-objects.sh primaryds | tee output
@@ -1344,7 +1390,7 @@ jobs:
 
           diff expected output
 
-      - name: Check new cert range objects
+      - name: Check cert range objects for SSNv2
         if: always()
         run: |
           tests/ca/bin/ca-cert-range-objects.sh -t legacy2 primaryds | tee output
@@ -1367,22 +1413,24 @@ jobs:
 
           diff expected output
 
-      - name: Check request repository
+      - name: Check cert next range for SSNv1
         if: always()
         run: |
-          tests/ca/bin/ca-request-next-range.sh primaryds | tee output
+          tests/ca/bin/ca-cert-next-range.sh primaryds | tee output
 
+          # next range should remain the same
           cat > expected << EOF
-          nextRange: 51
+          nextRange: 49
           EOF
 
           diff expected output
 
-      - name: Check cert repository
+      - name: Check cert next range for SSNv2
         if: always()
         run: |
-          tests/ca/bin/ca-cert-next-range.sh primaryds | tee output
+          tests/ca/bin/ca-cert-next-range.sh -t legacy2 primaryds | tee output
 
+          # next range should be endRange + 1
           cat > expected << EOF
           nextRange: 73
           EOF
@@ -1568,7 +1616,7 @@ jobs:
 
           diff expected output
 
-      - name: Check old request range objects
+      - name: Check request range objects for SSNv1
         if: always()
         run: |
           tests/ca/bin/ca-request-range-objects.sh primaryds | tee output
@@ -1588,7 +1636,7 @@ jobs:
 
           diff expected output
 
-      - name: Check new request range objects
+      - name: Check request range objects for SSNv2
         if: always()
         run: |
           tests/ca/bin/ca-request-range-objects.sh -t legacy2 primaryds | tee output
@@ -1643,7 +1691,29 @@ jobs:
 
           diff expected output
 
-      - name: Check old cert range objects
+      - name: Check request next range for SSNv1
+        if: always()
+        run: |
+          tests/ca/bin/ca-request-next-range.sh primaryds | tee output
+
+          cat > expected << EOF
+          nextRange: 31
+          EOF
+
+          diff expected output
+
+      - name: Check request next range for SSNv2
+        if: always()
+        run: |
+          tests/ca/bin/ca-request-next-range.sh -t legacy2 primaryds | tee output
+
+          cat > expected << EOF
+          nextRange: 101
+          EOF
+
+          diff expected output
+
+      - name: Check cert range objects for SSNv1
         if: always()
         run: |
           tests/ca/bin/ca-cert-range-objects.sh primaryds | tee output
@@ -1664,7 +1734,7 @@ jobs:
 
           diff expected output
 
-      - name: Check new cert range objects
+      - name: Check cert range objects for SSNv2
         if: always()
         run: |
           tests/ca/bin/ca-cert-range-objects.sh -t legacy2 primaryds | tee output
@@ -1699,22 +1769,24 @@ jobs:
 
           diff expected output
 
-      - name: Check request repository
+      - name: Check cert next range for SSNv1
         if: always()
         run: |
-          tests/ca/bin/ca-request-next-range.sh primaryds | tee output
+          tests/ca/bin/ca-cert-next-range.sh primaryds | tee output
 
+          # next range should remain the same
           cat > expected << EOF
-          nextRange: 101
+          nextRange: 49
           EOF
 
           diff expected output
 
-      - name: Check cert repository
+      - name: Check cert next range for SSNv2
         if: always()
         run: |
-          tests/ca/bin/ca-cert-next-range.sh primaryds | tee output
+          tests/ca/bin/ca-cert-next-range.sh -t legacy2 primaryds | tee output
 
+          # next range should be endRange + 1
           cat > expected << EOF
           nextRange: 127
           EOF

diff --git a/.github/workflows/ca-clone-ssnv2-test.yml b/.github/workflows/ca-clone-ssnv2-test.yml
@@ -196,7 +196,7 @@ jobs:
       - name: Check request next range
         if: always()
         run: |
-          tests/ca/bin/ca-request-next-range.sh primaryds | tee output
+          tests/ca/bin/ca-request-next-range.sh -t legacy2 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.sh primaryds | tee output
+          tests/ca/bin/ca-cert-next-range.sh -t legacy2 primaryds | tee output
 
           # nextRange should be dbs.endSerialNumber + 1 = 0x19 or 25
           cat > expected << EOF
@@ -412,7 +412,7 @@ jobs:
       - name: Check request next range
         if: always()
         run: |
-          tests/ca/bin/ca-request-next-range.sh secondaryds | tee output
+          tests/ca/bin/ca-request-next-range.sh -t legacy2 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.sh secondaryds | tee output
+          tests/ca/bin/ca-cert-next-range.sh -t legacy2 secondaryds | tee output
 
           # nextRange should be the same
           cat > expected << EOF
@@ -579,7 +579,7 @@ jobs:
       - name: Check request next range
         if: always()
         run: |
-          tests/ca/bin/ca-request-next-range.sh primaryds | tee output
+          tests/ca/bin/ca-request-next-range.sh -t legacy2 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.sh primaryds | tee output
+          tests/ca/bin/ca-cert-next-range.sh -t legacy2 primaryds | tee output
 
           # nextRange should be the same
           cat > expected << EOF
@@ -885,7 +885,7 @@ jobs:
       - name: Check request next range
         if: always()
         run: |
-          tests/ca/bin/ca-request-next-range.sh primaryds | tee output
+          tests/ca/bin/ca-request-next-range.sh -t legacy2 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.sh primaryds | tee output
+          tests/ca/bin/ca-cert-next-range.sh -t legacy2 primaryds | tee output
 
           # nextRange should be endRange + 1 = 61 or 0x3d
           cat > expected << EOF
@@ -1081,7 +1081,7 @@ jobs:
       - name: Check request next range
         if: always()
         run: |
-          tests/ca/bin/ca-request-next-range.sh primaryds | tee output
+          tests/ca/bin/ca-request-next-range.sh -t legacy2 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.sh primaryds | tee output
+          tests/ca/bin/ca-cert-next-range.sh -t legacy2 primaryds | tee output
 
           # nextRange should be the same
           cat > expected << EOF