Python-based commit script supporting 7-digit DSIDs
Changes introduced
This change set is introducing a Python-based commit_new_dsid
which should work the same way as the old commit_new_dsid.sh
, but also supports 7-digit DSIDs.
The old dictionary, which was mapping generator to a single DSID block, has been moved to jo_utils
and tweaked to map the generators onto an array of regular expressions that encode the allowed DSID blocks. For example, "MG"
currently maps only onto [r'5\d{5}', ]
, i.e. only 500000-599999 are allowed. (Note that in practice the regex is prefixed with a start-of-string character (^
), meaning it wouldn't allow 1500000 here.)
Additional DSID blocks can then be rolled out as needed. Currently, the validation block is mapped onto
[r'9[5-9]\d{4}', r'10\d{5}']
, which matches 950000-999999 and 1000000-1099999. At the moment, only 1000000-1099999 has been added (to the validation block).
Currently, the logic is set up to keep filling up the 6-digit DSIDs until they're used up, only then it would try to move things into the 7-digit blocks (if any are available for a given generator).
Gen_tf
has been updated to support the new path structure (as of 21.6.89). The allowed path structures are 100xxx/100000
(as before) or 1/1000xxx/1000000
.
Tests
6-digit pipeline
7-digit pipeline
Issues resolved
Support 7-digit DSIDs.
Closes #147 (closed)