Use new icons

This commit is contained in:
Clément Martin 2022-01-05 20:47:25 +01:00
parent 7d817a4718
commit c25b594902

View File

@ -6,44 +6,39 @@
""" """
from diagrams import Cluster, Diagram from diagrams import Cluster, Diagram
from diagrams.generic.network import Firewall, Router, Switch
from diagrams.onprem.network import Internet
from diagrams.onprem.client import User, Users
from diagrams.onprem.compute import Server
from diagrams.generic.storage import Storage
from audio import Amplifier, AudioStreamer, TubeAmp, TurnTable from audio import Amplifier, AudioStreamer, BlueSoundSpeaker, TubeAmp, TurnTable
from consoles import NintendoSwitch, PlayStation4 from consoles import NintendoSwitch, PlayStation4
from devices import AndroidPhone, IPhone, Laptop, NUC, Printer, Rpi4, WashingMachine from devices import AndroidPhone, EliteBook, IPhone, Laptop, NUC, Printer, Rpi4, SynologyDS, ThinkPad, WashingMachine
from edges import MyEdge, Legend from edges import MyEdge
from electricity import Boxx, CPL from electricity import Boxx, CPL
from fitbit import Aria from fitbit import Aria
from lights import HueBridge, HueBulb, HueSpot, SmartPlug, Tradfri from lights import HueBridge, HueBulb, HueSpot, SmartPlug, Tradfri
from network import Modem, UniFiAP from network import IndustrialRouter, Modem, ProximusBBox, ProximusInternet, Switch, TelenetInternet, UniFiAP
from video import ProximusTV, Television, UltraWideScreen from video import ProximusTV, Television, UltraWideScreen
with Diagram('Konijnenberg', direction='TB'): with Diagram('Konijnenberg', direction='TB', show=False):
with Cluster('Bureau', direction='TB'): with Cluster('Bureau', direction='TB'):
office_cpl = CPL('CPL bureau') office_cpl = CPL('')
ps4 = PlayStation4() ps4 = PlayStation4()
printer = Printer() printer = Printer()
rainbow = Rpi4('Rainbow') rainbow = Rpi4('Rainbow')
switch = Switch('dlink') switch = Switch('')
walter = NUC('walter') walter = NUC('walter')
zippo = Storage('Zippo') zippo = SynologyDS('Zippo')
rpi4s = [ Rpi4('RPI4/{x}') for x in range(5) ] rpi4s = [ Rpi4(f'RPI4/{x}') for x in range(5) ]
switch << MyEdge('ethernet') >> [office_cpl, ps4, printer, rainbow, walter, zippo] + rpi4s switch << MyEdge('ethernet') >> [office_cpl, ps4, printer, rainbow, walter, zippo] + rpi4s
with Cluster('Salon'): with Cluster('Salon'):
hue = HueBridge('Hue Bridge') hue = HueBridge('')
living_cpl = CPL('CPL salon') living_cpl = CPL('')
malkovitch = Firewall('malkovitch') malkovitch = IndustrialRouter('malkovitch')
proximus = Internet('Proximus') proximus = ProximusInternet('')
proximus_router = Modem('Proximus') proximus_router = ProximusBBox('')
proximus_tv = ProximusTV('Decodeur') proximus_tv = ProximusTV('')
telenet = Internet('Telenet') telenet = TelenetInternet('')
telenet_router = Modem('Telenet') telenet_router = ProximusBBox('') # FIXME: find the correct icon.
malkovitch << MyEdge('ethernet') >> [living_cpl, proximus_router, telenet_router] malkovitch << MyEdge('ethernet') >> [living_cpl, proximus_router, telenet_router]
proximus_router << MyEdge('adsl') >> proximus proximus_router << MyEdge('adsl') >> proximus
@ -51,32 +46,35 @@ with Diagram('Konijnenberg', direction='TB'):
telenet_router << MyEdge('cable') >> telenet telenet_router << MyEdge('cable') >> telenet
with Cluster('Wireless', direction='TB'): with Cluster('Wireless', direction='TB'):
wifi_ap = UniFiAP('NanoHD') wifi_ap = UniFiAP('NanoHD')
with Cluster('Misc'): with Cluster('Misc'):
with Cluster('Salon'): with Cluster('Salon'):
boxx = Boxx() boxx = Boxx('Thermostat')
with Cluster('Salle de bain'): with Cluster('Salle de bain'):
balance = Aria('Balance') balance = Aria('')
with Cluster('Garage', direction='TB'): with Cluster('Garage', direction='TB'):
lessiveuse = WashingMachine('Lave linge') lessiveuse = WashingMachine('')
with Cluster('Sound'): with Cluster('Sound'):
with Cluster('Cuisine', direction='TB'): with Cluster('Cuisine', direction='TB'):
flex2i = AudioStreamer('Flex 2i') flex2i = BlueSoundSpeaker('')
with Cluster('Salon'): with Cluster('Salon'):
# ampli = Amplifier('Ampli') # has buletooth # ampli = Amplifier('Ampli') # has buletooth
hifi = AudioStreamer('HiFi') hifi = BlueSoundSpeaker('')
with Cluster('Video'): with Cluster('Video'):
tv_salon = Television('TV Salon') with Cluster('Salon'):
jack = Rpi4('Jack') tv_salon = Television('')
jack = Rpi4('')
with Cluster('User Devices'): with Cluster('User Devices'):
laptop_clement = Laptop('Laptop Clément') with Cluster('Clément'):
laptop_maithe = Laptop('Laptop Maïthé') laptop_clement = ThinkPad('')
nintendo_switch = NintendoSwitch('Switch Alistair') tel_clement = AndroidPhone('')
tel_alistair = AndroidPhone('Téléphone Alistair') with Cluster('Maïthé'):
tel_clement = AndroidPhone('Téléphone Clément') laptop_maithe = EliteBook('')
tel_maithe = IPhone('Téléphone Maïthé') tel_maithe = IPhone('')
with Cluster('Alistair'):
nintendo_switch = NintendoSwitch('')
tel_alistair = AndroidPhone('')
wifi_devices = [ nintendo_switch, laptop_clement, laptop_maithe, wifi_devices = [ nintendo_switch, laptop_clement, laptop_maithe,
tel_alistair, tel_maithe, tel_clement ] tel_alistair, tel_maithe, tel_clement ]