Merge the INSAR_ISCE_MULTI_BURST
job spec with INSAR_ISCE_BURST
#2442
Labels
Jira Task
Create a Jira Task for this issue
Jira: https://asfdaac.atlassian.net/browse/TOOL-3145
Note: The above link is accessible only to members of ASF.
Currently we have an
INSAR_ISCE_MULTI_BURST
job spec (which takesreference
andsecondary
parameters) and a separateINSAR_ISCE_BURST
job spec (which takes agranules
parameter) because it was the easiest way to merge the multi-burst work tomain
without breaking backwards compatibility forINSAR_ISCE_BURST
.For this issue, we'll want to merge the two job specs as follows:
granules
parameter toINSAR_ISCE_MULTI_BURST.yml
and enforce that eithergranules
orreference
andsecondary
must be used.oneOf
keyword (see https://swagger.io/specification/#discriminator-object and https://stackoverflow.com/a/25637397), which would require modifying our job spec parsing hereINSAR_ISCE_MULTI_BURST.yml
toINSAR_ISCE_BURST.yml
(replacing the existingINSAR_ISCE_BURST.yml
)INSAR_ISCE_BURST
(first line of the job spec)reference
andsecondary
each to length1
(this can be changed back to30
in thehyp3-multi-burst-sandbox
deployment for testing purposes)INSAR_ISCE_MULTI_BURST.yml
fromhyp3-multi-burst-sandbox
deploymentvalidate_jobs
function callsconvert_single_burst_jobs
to convert the parameters for allINSAR_ISCE_BURST
jobs fromgranules
toreference
andsecondary
invalidation.py
. This will need to be updated to only perform the conversion if the job has agranules
parameter. Or we could just handle thegranules
parameter in the actual validator functions that use the burst granule names (currently that should just be thecheck_same_burst_ids
validator), which is probably the better option.INSAR_ISCE_MULTI_BURST
toINSAR_ISCE_BURST
everywhere it's used in the code (seegit grep INSAR_ISCE_MULTI_BURST
); should just beset_batch_overrides.py
,test_set_batch_overrides.py
, andtest_validation.py
granules
is now deprecated forINSAR_ISCE_BURST
The text was updated successfully, but these errors were encountered: