diff --git a/miners/__init__.py b/miners/__init__.py index 35754433..4937cff3 100644 --- a/miners/__init__.py +++ b/miners/__init__.py @@ -13,8 +13,27 @@ class BaseMiner: self.api_type = None self.model = None + async def get_board_info(self): + return None + + async def get_config(self): + return None + + async def get_hostname(self): + return None + + async def get_model(self): + return None + async def reboot(self): return None async def restart_backend(self): return None + + async def send_config(self, yaml_config): + return None + + + + diff --git a/miners/bmminer.py b/miners/bmminer.py index 1c4630dc..7f2d1c46 100644 --- a/miners/bmminer.py +++ b/miners/bmminer.py @@ -2,6 +2,7 @@ from API.bmminer import BMMinerAPI from miners import BaseMiner import asyncssh + class BMMiner(BaseMiner): def __init__(self, ip: str) -> None: api = BMMinerAPI(ip) @@ -11,7 +12,6 @@ class BMMiner(BaseMiner): self.uname = 'root' self.pwd = 'admin' - def __repr__(self) -> str: return f"BMMiner: {str(self.ip)}" @@ -54,7 +54,7 @@ class BMMiner(BaseMiner): except Exception as e: print(e) except OSError: - print(str(self.ip) + " Connection refused.") + print(str(self.ip) + ": Connection refused.") return None async def send_ssh_command(self, cmd): @@ -68,19 +68,7 @@ class BMMiner(BaseMiner): if i == 3: return continue - - async def send_config(self, _): - return None # ignore for now - - async def restart_backend(self) -> None: - return None + return result async def reboot(self) -> None: await self.send_ssh_command("reboot") - - async def get_config(self) -> None: - return None - - async def get_board_info(self): - return None - diff --git a/miners/btminer.py b/miners/btminer.py index 1c5e209a..118bc7fd 100644 --- a/miners/btminer.py +++ b/miners/btminer.py @@ -28,18 +28,3 @@ class BTMiner(BaseMiner): return host_data["Msg"]["hostname"] except APIError: return "?" - - async def send_config(self, _): - return None # ignore for now - - async def restart_backend(self) -> None: - return None - - async def reboot(self) -> None: - return None - - async def get_config(self) -> None: - return None - - async def get_board_info(self): - return None diff --git a/miners/cgminer.py b/miners/cgminer.py index cf2f7790..729c880e 100644 --- a/miners/cgminer.py +++ b/miners/cgminer.py @@ -39,9 +39,6 @@ class CGMiner(BaseMiner): except Exception: return "?" - async def send_config(self, _): - return None # ignore for now - async def _get_ssh_connection(self) -> asyncssh.connect: try: conn = await asyncssh.connect(str(self.ip), @@ -137,5 +134,3 @@ class CGMiner(BaseMiner): self.config = result.stdout print(str(self.config)) - async def get_board_info(self): - return None diff --git a/miners/unknown.py b/miners/unknown.py index 5a26665b..2395c33d 100644 --- a/miners/unknown.py +++ b/miners/unknown.py @@ -13,11 +13,5 @@ class UnknownMiner(BaseMiner): async def get_model(self): return "Unknown" - async def send_config(self, _): - return None - async def get_hostname(self): return "Unknown" - - async def get_board_info(self): - return None