From: Maria Matejka Date: Sat, 20 May 2023 09:12:00 +0000 (+0200) Subject: Python CLI Package: Use CLI code names instead of numbers X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7dcfad40856a7141f01e784a1c5ebaeb4e758069;p=thirdparty%2Fbird.git Python CLI Package: Use CLI code names instead of numbers --- diff --git a/python/BIRD/Basic.py b/python/BIRD/Basic.py index 73cbd03f2..413da117e 100644 --- a/python/BIRD/Basic.py +++ b/python/BIRD/Basic.py @@ -23,3 +23,9 @@ class Basic: async def load(self): if self.data is None: await self.update() + +class Code: + OK = 0 + Welcome = 1 + Status = 13 + Version = 1000 diff --git a/python/BIRD/Status.py b/python/BIRD/Status.py index 5d24da1dd..0ee8d8d68 100644 --- a/python/BIRD/Status.py +++ b/python/BIRD/Status.py @@ -1,5 +1,5 @@ import asyncio -from BIRD.Basic import Basic +from BIRD.Basic import Basic, Code class StatusException(Exception): def __init__(self, msg): @@ -12,12 +12,12 @@ class Status(Basic): await self.bird.cli.open() data = await self.bird.cli.socket.command("show status") - if data[0]["code"] != 1000: + if data[0]["code"] != Code.Version: raise StatusException(f"BIRD version not on the first line, got {data[0]['code']}") self.data["version"] = data[0]["data"] - if data[-1]["code"] != 13: + if data[-1]["code"] != Code.Status: raise StatusException(f"BIRD status not on the last line, got {data[-1]['code']}") self.data["status"] = data[-1]["data"] @@ -35,7 +35,7 @@ class Version(Basic): await self.bird.cli.open() hello = self.bird.cli.hello - if hello["code"] != 1: + if hello["code"] != Code.Welcome: raise VersionException(f"code is {hello['code']}, should be 1") s = hello["data"].split(" ")