Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions exporting/export_objects.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion import_export_package.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion lists_and_dictionaries.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading