From 092c16b6156ccf69aa805fc86637a8085ca955ad Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Tue, 6 Feb 2024 12:17:35 -0500 Subject: [PATCH] caps & summary --- os/routers/glmain/config.yaml | 2 +- os/routers/glmain/gen-mappings.py | 24 +++++++--- os/routers/glmain/output/summary.yaml | 55 +++++++++++++++++++++++ os/routers/glmain/output/var/dnsmasq.conf | 32 ++++++------- pydeps.requirements | 1 + 5 files changed, 91 insertions(+), 23 deletions(-) create mode 100644 os/routers/glmain/output/summary.yaml diff --git a/os/routers/glmain/config.yaml b/os/routers/glmain/config.yaml index 5574823..e2112a1 100644 --- a/os/routers/glmain/config.yaml +++ b/os/routers/glmain/config.yaml @@ -1,6 +1,6 @@ lab: - mac: '3C:7C:3F:1E:B7:A0' - name: 'tnascore1' + name: 'tnas1' - mac: '00:A0:98:3D:7C:C8' name: 'kubedb' - mac: 'B8:27:EB:F7:44:4E' diff --git a/os/routers/glmain/gen-mappings.py b/os/routers/glmain/gen-mappings.py index fba03c7..fb66491 100755 --- a/os/routers/glmain/gen-mappings.py +++ b/os/routers/glmain/gen-mappings.py @@ -7,7 +7,7 @@ BASE_PATH = Path(__file__).parent CONFIG_FILE = BASE_PATH / "config.yaml" OUTPUT_FOLDER = BASE_PATH / "output" DNSMASQ_CONF = OUTPUT_FOLDER / "var" / "dnsmasq.conf" - +SUMMARY = OUTPUT_FOLDER / "summary.yaml" DNSMASQ_CONF.parent.mkdir(exist_ok=True, parents=True) root_domain = "internal" @@ -18,19 +18,31 @@ ip_prefix_map = { "cam": "10.0.13.", } +def cap1_and_join(*args: str) -> str: + out = "" + for a in args: + out += a[0].upper() + out += a[1:].lower() + return out + with CONFIG_FILE.open('r') as fp: devices = yaml.safe_load(fp) -with DNSMASQ_CONF.open('w') as fp: +with DNSMASQ_CONF.open('w') as dfp, SUMMARY.open('w') as sfp: for sub_domain, configs in devices.items(): ip_prefix = ip_prefix_map[sub_domain] + sfp.write(f'\n{cap1_and_join(sub_domain)}:') for ip_suffix, dvc in enumerate(configs, start=1): mac = dvc['mac'] name = dvc['name'] + sfp.write(f'\n {cap1_and_join(name)}:') ip = f"{ip_prefix}{ip_suffix}" host = f"{name}.{sub_domain}.{root_domain}" - fp.write(f"dhcp-host={mac},{name}{sub_domain},{ip},infinite\n") - fp.write(f"address=/{host}/{ip}\n") + sfp.write(f'\n ip: "{ip}"') + sfp.write(f'\n host: "{host}"') + dfp.write(f"dhcp-host={mac},{cap1_and_join(sub_domain, name)},{ip},infinite\n") + dfp.write(f"address=/{host}/{ip}\n") if domain := dvc.get('domain'): - fp.write(f"address=/{domain}/{ip}\n") - fp.write(f"address=/.{domain}/{ip}\n") + dfp.write(f"address=/{domain}/{ip}\n") + dfp.write(f"address=/.{domain}/{ip}\n") + sfp.write(f'\n domain: "{domain}"') \ No newline at end of file diff --git a/os/routers/glmain/output/summary.yaml b/os/routers/glmain/output/summary.yaml new file mode 100644 index 0000000..bd86fd5 --- /dev/null +++ b/os/routers/glmain/output/summary.yaml @@ -0,0 +1,55 @@ + +Lab: + Tnas1: + ip: "10.0.10.1" + host: "tnas1.lab.internal" + Kubedb: + ip: "10.0.10.2" + host: "kubedb.lab.internal" + Pi1: + ip: "10.0.10.3" + host: "pi1.lab.internal" + Fws1: + ip: "10.0.10.4" + host: "fws1.lab.internal" +K3s: + Bee1: + ip: "10.0.11.1" + host: "bee1.k3s.internal" + domain: "home.sosnovsky.ca" + Terry1: + ip: "10.0.11.2" + host: "terry1.k3s.internal" + domain: "home.sosnovsky.ca" + Minisf1: + ip: "10.0.11.3" + host: "minisf1.k3s.internal" + domain: "home.sosnovsky.ca" + Tnas1: + ip: "10.0.11.4" + host: "tnas1.k3s.internal" +Hub: + Castle: + ip: "10.0.12.1" + host: "castle.hub.internal" + domain: "castle.home.sosnovsky.ca" + Basement: + ip: "10.0.12.2" + host: "basement.hub.internal" + domain: "basement.home.sosnovsky.ca" + Flic: + ip: "10.0.12.3" + host: "flic.hub.internal" +Cam: + Korie: + ip: "10.0.13.1" + host: "korie.cam.internal" + Eddie: + ip: "10.0.13.2" + host: "eddie.cam.internal" + Doorbell: + ip: "10.0.13.3" + host: "doorbell.cam.internal" + Livingroom: + ip: "10.0.13.4" + host: "livingroom.cam.internal" \ No newline at end of file diff --git a/os/routers/glmain/output/var/dnsmasq.conf b/os/routers/glmain/output/var/dnsmasq.conf index 51ff2ab..6125f03 100644 --- a/os/routers/glmain/output/var/dnsmasq.conf +++ b/os/routers/glmain/output/var/dnsmasq.conf @@ -1,40 +1,40 @@ -dhcp-host=3C:7C:3F:1E:B7:A0,tnascore1lab,10.0.10.1,infinite -address=/tnascore1.lab.internal/10.0.10.1 -dhcp-host=00:A0:98:3D:7C:C8,kubedblab,10.0.10.2,infinite +dhcp-host=3C:7C:3F:1E:B7:A0,LabTnas1,10.0.10.1,infinite +address=/tnas1.lab.internal/10.0.10.1 +dhcp-host=00:A0:98:3D:7C:C8,LabKubedb,10.0.10.2,infinite address=/kubedb.lab.internal/10.0.10.2 -dhcp-host=B8:27:EB:F7:44:4E,pi1lab,10.0.10.3,infinite +dhcp-host=B8:27:EB:F7:44:4E,LabPi1,10.0.10.3,infinite address=/pi1.lab.internal/10.0.10.3 -dhcp-host=9C:BF:0D:00:56:51,fws1lab,10.0.10.4,infinite +dhcp-host=9C:BF:0D:00:56:51,LabFws1,10.0.10.4,infinite address=/fws1.lab.internal/10.0.10.4 -dhcp-host=7C:83:34:B8:7B:43,bee1k3s,10.0.11.1,infinite +dhcp-host=7C:83:34:B8:7B:43,K3sBee1,10.0.11.1,infinite address=/bee1.k3s.internal/10.0.11.1 address=/home.sosnovsky.ca/10.0.11.1 address=/.home.sosnovsky.ca/10.0.11.1 -dhcp-host=68:1D:EF:26:B7:6C,terry1k3s,10.0.11.2,infinite +dhcp-host=68:1D:EF:26:B7:6C,K3sTerry1,10.0.11.2,infinite address=/terry1.k3s.internal/10.0.11.2 address=/home.sosnovsky.ca/10.0.11.2 address=/.home.sosnovsky.ca/10.0.11.2 -dhcp-host=58:47:CA:71:D8:E6,minisf1k3s,10.0.11.3,infinite +dhcp-host=58:47:CA:71:D8:E6,K3sMinisf1,10.0.11.3,infinite address=/minisf1.k3s.internal/10.0.11.3 address=/home.sosnovsky.ca/10.0.11.3 address=/.home.sosnovsky.ca/10.0.11.3 -dhcp-host=00:A0:98:17:B2:64,tnas1k3s,10.0.11.4,infinite +dhcp-host=00:A0:98:17:B2:64,K3sTnas1,10.0.11.4,infinite address=/tnas1.k3s.internal/10.0.11.4 -dhcp-host=E4:5F:01:A2:8D:BC,castlehub,10.0.12.1,infinite +dhcp-host=E4:5F:01:A2:8D:BC,HubCastle,10.0.12.1,infinite address=/castle.hub.internal/10.0.12.1 address=/castle.home.sosnovsky.ca/10.0.12.1 address=/.castle.home.sosnovsky.ca/10.0.12.1 -dhcp-host=DC:A6:32:92:B2:79,basementhub,10.0.12.2,infinite +dhcp-host=DC:A6:32:92:B2:79,HubBasement,10.0.12.2,infinite address=/basement.hub.internal/10.0.12.2 address=/basement.home.sosnovsky.ca/10.0.12.2 address=/.basement.home.sosnovsky.ca/10.0.12.2 -dhcp-host=4E:F6:9C:7C:56:33,flichub,10.0.12.3,infinite +dhcp-host=4E:F6:9C:7C:56:33,HubFlic,10.0.12.3,infinite address=/flic.hub.internal/10.0.12.3 -dhcp-host=01:9c:8e:cd:25:83:1f,koriecam,10.0.13.1,infinite +dhcp-host=01:9c:8e:cd:25:83:1f,CamKorie,10.0.13.1,infinite address=/korie.cam.internal/10.0.13.1 -dhcp-host=01:a0:60:32:03:86:8a,eddiecam,10.0.13.2,infinite +dhcp-host=01:a0:60:32:03:86:8a,CamEddie,10.0.13.2,infinite address=/eddie.cam.internal/10.0.13.2 -dhcp-host=01:48:9e:9d:4a:32:80,doorbellcam,10.0.13.3,infinite +dhcp-host=01:48:9e:9d:4a:32:80,CamDoorbell,10.0.13.3,infinite address=/doorbell.cam.internal/10.0.13.3 -dhcp-host=34:60:F9:D7:51:3F,livingroomcam,10.0.13.4,infinite +dhcp-host=34:60:F9:D7:51:3F,CamLivingroom,10.0.13.4,infinite address=/livingroom.cam.internal/10.0.13.4 diff --git a/pydeps.requirements b/pydeps.requirements index e69de29..dbfc709 100644 --- a/pydeps.requirements +++ b/pydeps.requirements @@ -0,0 +1 @@ +PyYAML \ No newline at end of file