added network.py and some other changes

This will be used to control systemd-networkd via d-bus and runtime
configs and make things easier in implementing B.A.T.M.A.N. gateway support
This commit is contained in:
Pranav Jerry 2021-09-25 15:04:29 +05:30
parent 9171b942db
commit 25a5bdee30
Signed by: pranav
GPG Key ID: F1DCDC4FED0A0C5B
4 changed files with 54 additions and 1 deletions

View File

@ -170,6 +170,13 @@ def parse_args() -> Namespace:
"-v", "--verbose", action="count", default=0, help="increase output verbosity"
)
parser.add_argument(
"--glob-mesh-configs",
type=str,
default=config["globs"]["meshconfigs"],
help="glob matching filenames for mesh configuration",
)
# logger.debug("Parsing arguments")
return parser.parse_args()

View File

@ -31,6 +31,7 @@ CONFIG = {
"confdir": "/usr/share/naxalnet/networkd",
"runtimedir": "/run/systemd/network",
},
"globs": {"meshconfigs": "mesh.*", "checkconfigs": "check.*"},
"adhoc": {"name": "NxMesh"},
"ap": {"ssid": "MeshWiFi", "passwd": "naxalnet256"},
}

45
naxalnet/network.py Normal file
View File

@ -0,0 +1,45 @@
# This file is part of naxalnet.
# Copyright (C) 2021 The naxalnet Authors
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
network.py
----------
This submodule manages the systemd-networkd configuration.
TODO: Add more details
"""
from pathlib import Path
from shutil import copy
from dasbus.connection import SystemMessageBus
NETWORKD_BUS = "org.freedesktop.network1"
NETWORKD_PATH = "/org/freedesktop/network1"
def copy_glob(directory: str, glob: str, destination: str) -> None:
"""copy files in directory matching the glob to destination"""
match = Path(directory).glob(glob)
for i in match:
copy(i, destination)
class Networkd:
"""control systemd-networkd"""
def __init__(self, bus=SystemMessageBus()):
self._bus = bus
self.proxy = self._bus.get_proxy(NETWORKD_BUS, NETWORKD_PATH)

View File

@ -138,7 +138,7 @@ def setup_devices():
logger.error(REPORT_BUG_INFO)
sys.exit(4)
except:
logger.exception("An unknow error occured while setting up the mesh")
logger.exception("An unknown error occured while setting up the mesh")
logger.error(REPORT_BUG_INFO)
sys.exit(4)