diff --git a/conf/border_router.py b/conf/border_router.py new file mode 100644 index 0000000000000000000000000000000000000000..4e28f249f30ae0eb822eee683f32c70a0518d6b0 --- /dev/null +++ b/conf/border_router.py @@ -0,0 +1,5 @@ +BORDER_ROUTER_NAME = "br" +BORDER_ROUTER_IP = "172.18.0.1" +BORDER_ROUTER_PUBLIC_IP = "172.18.10.1" +BORDER_ROUTER_NETWORK_NAME = "BR" +BORDER_ROUTER_NETWORK_IP = "172.18.0.0/24" diff --git a/modules/routing.py b/modules/border_router.py similarity index 92% rename from modules/routing.py rename to modules/border_router.py index 20d6aa8b2bac6e35e0d2f027d8fb275794b54d9a..a30d89482be8a7e464d2172eaea353b414521910 100644 --- a/modules/routing.py +++ b/modules/border_router.py @@ -1,10 +1,6 @@ import sys +import conf.border_router -BORDER_ROUTER_NAME = "br" -BORDER_ROUTER_IP = "172.18.0.1" -BORDER_ROUTER_PUBLIC_IP = "172.18.10.1" -BORDER_ROUTER_NETWORK_NAME = "BR" -BORDER_ROUTER_NETWORK_IP = "172.18.0.0/24" def _are_br_parameters_free(definitions): """ Checks if border router parameters are not already taken. """ diff --git a/modules/file_generator.py b/modules/file_generator.py index d73861e69095902cdff418c15719fe3962cbd528..0a415bff7613e6d6e388164905d940b5fd89f26a 100644 --- a/modules/file_generator.py +++ b/modules/file_generator.py @@ -1,9 +1,9 @@ import jinja2 import os +import conf.border_router from modules.device_creator import create_devices from modules.ansible_data_generator import create_network_map, create_host_map, create_network_ips -from modules.routing import BORDER_ROUTER_IP, BORDER_ROUTER_NAME, BORDER_ROUTER_NETWORK_NAME, BORDER_ROUTER_PUBLIC_IP def _load_template(template_name): """ Returns a loaded jinja2 template. """ diff --git a/modules/network_parser.py b/modules/network_parser.py index a7224025003e77dd926ce0809e41df667cf94817..9e6693fa0bfac2fe4b2d8e753a29a2e74647c84e 100644 --- a/modules/network_parser.py +++ b/modules/network_parser.py @@ -1,7 +1,7 @@ """ This module handles network creation. """ import sys -from modules.routing import BORDER_ROUTER_NAME, BORDER_ROUTER_PUBLIC_IP +from conf.border_router import BORDER_ROUTER_NAME, BORDER_ROUTER_PUBLIC_IP def _find_networks(hostname, mappings, device_type): diff --git a/modules/preprocessing.py b/modules/preprocessing.py index 65705dcafbe9751f45fd113a3af08000169c23eb..f21b6cccbc0ab4d169a76e1f173deae6e524acc3 100644 --- a/modules/preprocessing.py +++ b/modules/preprocessing.py @@ -2,7 +2,7 @@ called after validating the input but before device creation. """ -from modules.routing import create_border_router +from modules.border_router import create_border_router def preprocess(definitions, flags): """