Revert Integration Tests

Signed-off-by: Yogesh Deshpande <[email protected]>
veraison · Oct 16, 2024 · 7e5c9a5 · 7e5c9a5
1 parent 433c1e3
commit 7e5c9a5
Show file tree

Hide file tree

Showing 5 changed files with 197 additions and 307 deletions.
diff --git a/integration-tests/data/endorsements/comid-cca-platform-refval.json b/integration-tests/data/endorsements/comid-cca-platform-refval.json
@@ -28,127 +28,81 @@
               "model": "RoadRunner"
             }
           },
-          "measurement": {
-            "key": {
-              "type": "psa.refval-id",
+          "measurements": [
+            {
+              "key": {
+                "type": "psa.refval-id",
+                "value": {
+                  "label": "BL",
+                  "version": "3.4.2",
+                  "signer-id": "BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg="
+                }
+              },
               "value": {
-                "label": "BL",
-                "version": "3.4.2",
-                "signer-id": "BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg="
+                "digests": [
+                  "sha-256:BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg="
+                ]
               }
             },
-            "value": {
-              "digests": [
-                "sha-256:BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg="
-              ]
-            }
-          }
-        },
-        {
-          "environment": {
-            "class": {
-              "id": {
-                "type": "psa.impl-id",
-                "value": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
+            {
+              "key": {
+                "type": "psa.refval-id",
+                "value": {
+                  "label": "M1",
+                  "version": "1.2.0",
+                  "signer-id": "BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg="
+                }
               },
-              "vendor": "ACME",
-              "model": "RoadRunner"
-            }
-          },
-          "measurement": {
-            "key": {
-              "type": "psa.refval-id",
               "value": {
-                "label": "M1",
-                "version": "1.2.0",
-                "signer-id": "BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg="
+                "digests": [
+                  "sha-256:CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg="
+                ]
               }
             },
-            "value": {
-              "digests": [
-                "sha-256:CwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg="
-              ]
-            }
-          }
-        },
-        {
-          "environment": {
-            "class": {
-              "id": {
-                "type": "psa.impl-id",
-                "value": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
+            {
+              "key": {
+                "type": "psa.refval-id",
+                "value": {
+                  "label": "M2",
+                  "version": "1.2.3",
+                  "signer-id": "BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg="
+                }
               },
-              "vendor": "ACME",
-              "model": "RoadRunner"
-            }
-          },
-          "measurement": {
-            "key": {
-              "type": "psa.refval-id",
               "value": {
-                "label": "M2",
-                "version": "1.2.3",
-                "signer-id": "BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg="
+                "digests": [
+                  "sha-256:DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg="
+                ]
               }
             },
-            "value": {
-              "digests": [
-                "sha-256:DwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg="
-              ]
-            }
-          }
-        },
-        {
-          "environment": {
-            "class": {
-              "id": {
-                "type": "psa.impl-id",
-                "value": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
+            {
+              "key": {
+                "type": "psa.refval-id",
+                "value": {
+                  "label": "M3",
+                  "version": "1.0.0",
+                  "signer-id": "BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg="
+                }
               },
-              "vendor": "ACME",
-              "model": "RoadRunner"
-            }
-          },
-          "measurement": {
-            "key": {
-              "type": "psa.refval-id",
               "value": {
-                "label": "M3",
-                "version": "1.0.0",
-                "signer-id": "BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg="
+                "digests": [
+                  "sha-256:EwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg="
+                ]
               }
             },
-            "value": {
-              "digests": [
-                "sha-256:EwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg="
-              ]
-            }
-          }
-        },
-        {
-          "environment": {
-            "class": {
-              "id": {
-                "type": "psa.impl-id",
-                "value": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
+            {
+              "key": {
+                "type": "cca.platform-config-id",
+                "value": "cfg v1.0.0"
               },
-              "vendor": "ACME",
-              "model": "RoadRunner"
-            }
-          },
-          "measurement": {
-            "key": {
-              "type": "cca.platform-config-id",
-              "value": "cfg v1.0.0"
-            },
-            "value": {
-              "raw-value": {
-                "type": "bytes",
-                "value": "AQID"
+              "value": {
+                "raw-value": {
+                  "type": "bytes",
+                  "value": "AQID"
+                }
               }
             }
-          }
+          ]
         }
       ]
     }
-  }
+  }
diff --git a/integration-tests/data/endorsements/comid-cca-realm-refval.json b/integration-tests/data/endorsements/comid-cca-realm-refval.json
@@ -31,47 +31,49 @@
             "value": "Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw=="
           }
         },
-        "measurement": {
-          "value": {
-            "raw-value": {
-              "type": "bytes",
-              "value": "QURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBRA=="
-            },
-            "integrity-registers": {
-              "rim": {
-                "key-type": "text",
-                "value": [
-                  "sha-512;Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw=="
-                ]
-              },
-              "rem0": {
-                "key-type": "text",
-                "value": [
-                  "sha-512;Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw=="
-                ]
-              },
-              "rem1": {
-                "key-type": "text",
-                "value": [
-                  "sha-512;Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw=="
-                ]
-              },
-              "rem2": {
-                "key-type": "text",
-                "value": [
-                  "sha-512;Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw=="
-                ]
+        "measurements": [
+          {
+            "value": {
+              "raw-value": {
+                "type": "bytes",
+                "value": "QURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBREFEQURBRA=="
               },
-              "rem3": {
-                "key-type": "text",
-                "value": [
-                  "sha-512;Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw=="
-                ]
+              "integrity-registers": {
+                "rim": {
+                  "key-type": "text",
+                  "value": [
+                    "sha-512;Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw=="
+                  ]
+                },
+                "rem0": {
+                  "key-type": "text",
+                  "value": [
+                    "sha-512;Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw=="
+                  ]
+                },
+                "rem1": {
+                  "key-type": "text",
+                  "value": [
+                    "sha-512;Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw=="
+                  ]
+                },
+                "rem2": {
+                  "key-type": "text",
+                  "value": [
+                    "sha-512;Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw=="
+                  ]
+                },
+                "rem3": {
+                  "key-type": "text",
+                  "value": [
+                    "sha-512;Q0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQw=="
+                  ]
+                }
               }
             }
           }
-        }
+        ]
       }
     ]
   }
-}
+}