Skip to content

Commit 784c4d4

Browse files
authored
Fix ccdb repo cleanup new json format (#378)
* validFrom is now an int and not a str * change type to int also in arguments
1 parent b428750 commit 784c4d4

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

  • Framework/script/RepoCleaner

Framework/script/RepoCleaner/Ccdb.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def __init__(self, path, uuid, validFrom, validTo, metadata):
2525
'''
2626
self.path = path
2727
self.uuid = uuid
28-
self.validFromAsDatetime = datetime.datetime.fromtimestamp(int(validFrom) / 1000) # /1000 because we get ms
28+
self.validFromAsDatetime = datetime.datetime.fromtimestamp(validFrom / 1000) # /1000 because we get ms
2929
self.validFrom = validFrom
3030
self.validTo = validTo
3131
self.metadata = metadata
@@ -97,7 +97,7 @@ def deleteVersion(self, version: ObjectVersion):
9797
Delete the specified version of an object.
9898
:param version: The version of the object to delete, as an instance of ObjectVersion.
9999
'''
100-
url_delete = self.url + '/' + version.path + '/' + version.validFrom + '/' + version.uuid
100+
url_delete = self.url + '/' + version.path + '/' + str(version.validFrom) + '/' + version.uuid
101101
logging.debug(f"Delete version at url {url_delete}")
102102
try:
103103
r = requests.delete(url_delete)
@@ -108,7 +108,7 @@ def deleteVersion(self, version: ObjectVersion):
108108
sys.exit(1) # really ?
109109

110110
@dryable.Dryable()
111-
def updateValidity(self, version: ObjectVersion, validFrom: str, validTo: str):
111+
def updateValidity(self, version: ObjectVersion, validFrom: int, validTo: int):
112112
'''
113113
Update the validity range of the specified version of an object.
114114
:param version: The ObjectVersion to update.
@@ -118,7 +118,7 @@ def updateValidity(self, version: ObjectVersion, validFrom: str, validTo: str):
118118
if version.validTo == validTo:
119119
logging.debug("The new timestamp for validTo is identical to the existing one. Skipping.")
120120
return
121-
url_update_validity = self.url + '/' + version.path + '/' + validFrom + '/' + validTo
121+
url_update_validity = self.url + '/' + version.path + '/' + str(validFrom) + '/' + str(validTo)
122122
logging.debug(f"Update end limit validity of {version.path} from {version.validTo} to {validTo}")
123123
try:
124124
r = requests.put(url_update_validity)

0 commit comments

Comments
 (0)