Open
Conversation
Contributor
Author
|
Fixes issue #1353 |
0156b07 to
1b91901
Compare
Contributor
Author
|
Would be nice if 'black' was run with '--diff', since black does not signal any errors on my machine. |
Refactor zone combining code
core/fw_config.py
move combined zone logic to 'add_zone' method
add 'select' argument to 'get_zone' and 'get_zones'
core/fw.py
in '_start_copy_config_to_runtime' don't copy zones with '/' in name
remove combined zone logic from '_loader_zones'
use 'list_zone_files' to find what files to load
core/io/functions.py
add 'list_xml_files' function
add 'list_zone_files' function
rewrite 'check_on_disk_config' to use 'list_xml_files' and
'list_zone_files'
server/config.py
don't return combined zones in 'getZoneNames'
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
core/fw_config.py:
move combined zone logic to 'add_zone' method
core/fw.py:
in '_start_copy_config_to_runtime' don't copy zones with '/' in name
remove combined zone logic from '_loader_zones'
use 'list_zone_files' to find what files to load
core/io/functions.py:
add 'list_xml_files' function
add 'list_zone_files' function
rewrite 'check_on_disk_config' to use 'list_xml_files' and
'list_zone_files'
server/config.py:
don't return combined zones in 'getZoneNames'