diff --git a/config/task_generator/manual_task_generator.properties b/config/task_generator/manual_task_generator.properties index 916c8161..aa26369f 100644 --- a/config/task_generator/manual_task_generator.properties +++ b/config/task_generator/manual_task_generator.properties @@ -14,7 +14,6 @@ TASK_REFERENCE_TIME = TASK_VERSION = TASK_MERGING_ENTITY = RUN_REPLACEMENT = -RUN_REPLACEMENT_LOCAL = RUN_SCALING = UPLOAD_TO_OPDM = UPLOAD_TO_MINIO = diff --git a/emf/model_merger/model_merger.py b/emf/model_merger/model_merger.py index cecbec96..075dcb32 100644 --- a/emf/model_merger/model_merger.py +++ b/emf/model_merger/model_merger.py @@ -159,7 +159,6 @@ def handle(self, task_object: dict, properties: dict, **kwargs): mas = task_properties["mas"] version = task_properties["version"] model_replacement = task_properties["replacement"] - model_replacement_local = task_properties["replacement_local"] model_scaling = task_properties["scaling"] model_upload_to_opdm = task_properties["upload_to_opdm"] model_upload_to_minio = task_properties["upload_to_minio"] @@ -194,7 +193,7 @@ def handle(self, task_object: dict, properties: dict, **kwargs): merged_model.excluded.extend([{'tso': tso, 'reason': 'missing-pdn'} for tso in missing_local_import]) # Perform local replacement if configured - if model_replacement_local and missing_local_import: + if model_replacement and missing_local_import: try: logger.info(f"Running replacement for local storage missing models: {missing_local_import}") replacement_models_local = run_replacement(tso_list=missing_local_import, @@ -492,7 +491,6 @@ def handle(self, task_object: dict, properties: dict, **kwargs): "post_temp_fixes": "True", "fix_net_interchange2": "True", "replacement": "True", - "replacement_local": "True", "scaling": "True", "upload_to_opdm": "False", "upload_to_minio": "True", diff --git a/emf/task_generator/manual_worker.py b/emf/task_generator/manual_worker.py index 697d5530..fdb7baa2 100644 --- a/emf/task_generator/manual_worker.py +++ b/emf/task_generator/manual_worker.py @@ -54,7 +54,6 @@ process_config_json[0]['runs'][0]['properties']['fix_net_interchange2'] = FIX_NET_INTERCHANGE2 process_config_json[0]['runs'][0]['properties']['version'] = TASK_VERSION process_config_json[0]['runs'][0]['properties']['replacement'] = RUN_REPLACEMENT -process_config_json[0]['runs'][0]['properties']['replacement_local'] = RUN_REPLACEMENT_LOCAL process_config_json[0]['runs'][0]['properties']['scaling'] = RUN_SCALING process_config_json[0]['runs'][0]['properties']['upload_to_opdm'] = UPLOAD_TO_OPDM process_config_json[0]['runs'][0]['properties']['upload_to_minio'] = UPLOAD_TO_MINIO