diff --git a/exporting/export_objects.py b/exporting/export_objects.py index f5123d4..53c1188 100644 --- a/exporting/export_objects.py +++ b/exporting/export_objects.py @@ -489,14 +489,15 @@ def clean_objects(data_dict): if api_type == 'simple-cluster' or api_type == 'simple-gateway' or 'service' in api_type: for dependent_field in fields_to_exclude_due_to_value_of_other_fields: if dependent_field in obj: - # currently there's just 1 independent field; if there'll be more will need to add a 'break' if the - # presence of any of the independent fields requires removal of the dependent field + # for each dependant field, in the presence of any of it's independent fields in the object with + # the same value as in the dict, the dependant field is removed for independent_field in fields_to_exclude_due_to_value_of_other_fields[dependent_field].keys(): if independent_field in obj and obj[independent_field] == fields_to_exclude_due_to_value_of_other_fields[dependent_field][independent_field]: obj.pop(dependent_field, None) debug_log("The field " + dependent_field + " was removed from object of type " + api_type + " named " + obj["name"] + " since it cannot be present when the " "value of " + independent_field + " is " + str(obj[independent_field])) + break # converted_fields_to_add = {} for field in list(obj): diff --git a/import_export_package.py b/import_export_package.py index d2efe44..713f493 100644 --- a/import_export_package.py +++ b/import_export_package.py @@ -26,7 +26,7 @@ def get_version(client): if sys.version_info < (3, 7): raise Exception("Min Python version required is 3.7") - arg_parser = argparse.ArgumentParser(description="R80.X Policy Package Export/Import Tool, V6.2.1") + arg_parser = argparse.ArgumentParser(description="R80.X Policy Package Export/Import Tool, V6.2.2") args = process_arguments(arg_parser) if args.force: args.unsafe_auto_accept = True diff --git a/lists_and_dictionaries.py b/lists_and_dictionaries.py index 9a2343a..08eb923 100644 --- a/lists_and_dictionaries.py +++ b/lists_and_dictionaries.py @@ -984,7 +984,8 @@ "firewall-settings.memory-pool-size": { "firewall-settings.auto-calculate-connections-hash-table-size-and-memory-pool": True}, "firewall-settings.maximum-memory-pool-size": { - "firewall-settings.auto-calculate-connections-hash-table-size-and-memory-pool": True} + "firewall-settings.auto-calculate-connections-hash-table-size-and-memory-pool": True}, + "delayed-sync-value": {"use-delayed-sync": False, "sync-connections-on-cluster": False} } # in cases where the request is a single value (e.g name) and the reply is the corresponding object, we wish to create