Skip to content

feat: Add Telnet support (dev_port and streamer_type) #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vadvolo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: Add Telnet support (dev_port and streamer_type) #75

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions src/gnetcli_adapter/gnetcli_adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,16 @@ class AppSettings(BaseSettings):
password: Optional[str] = None
dev_login: Optional[str] = None
dev_password: Optional[str] = None
dev_port: Optional[int] = None
streamer_type: Optional[str] = None # "ssh" or "telnet"
ssh_agent_enabled: bool = True

def get_streamer_type(self):
"""Convert string streamer_type to proto enum value"""
if self.streamer_type == "telnet":
return pb.StreamerType.StreamerType_telnet
return pb.StreamerType.StreamerType_ssh

def make_dev_credentials(self) -> Optional[Credentials]:
if not self.dev_login and not self.dev_password:
return None
Expand Down Expand Up @@ -151,6 +159,8 @@ def __init__(
password: Optional[str] = None,
dev_login: Optional[str] = None,
dev_password: Optional[str] = None,
dev_port: Optional[int] = None,
streamer_type: Optional[str] = None,
ssh_agent_enabled: bool = True,
server_path: Optional[str] = None,
server_conf: Config = DEFAULT_GNETCLI_SERVER_CONF,
Expand All @@ -160,6 +170,8 @@ def __init__(
"password": password,
"dev_login": dev_login,
"dev_password": dev_password,
"dev_port": dev_port,
"streamer_type": streamer_type,
"server_path": server_path,
"url": url,
"server_conf": server_conf,
Expand Down Expand Up @@ -247,6 +259,8 @@ async def afetch_dev(self, api: Gnetcli, device: Device) -> str:
credentials=self.conf.make_dev_credentials(),
device=gnetcli_device,
ip=ip,
port=self.conf.dev_port,
streamer_type=self.conf.get_streamer_type(),
),
)
if res.status != 0:
Expand All @@ -264,6 +278,8 @@ async def adownload_dev(self, api: Gnetcli, device: Device, files: List[str]) ->
credentials=self.conf.make_dev_credentials(),
device=gnetcli_device,
ip=ip,
port=self.conf.dev_port,
streamer_type=self.conf.get_streamer_type(),
),
)
res: Dict[str, str] = {}
Expand Down Expand Up @@ -301,6 +317,8 @@ def __init__(
password: Optional[str] = None,
dev_login: Optional[str] = None,
dev_password: Optional[str] = None,
dev_port: Optional[int] = None,
streamer_type: Optional[str] = None,
ssh_agent_enabled: bool = True,
server_path: Optional[str] = None,
server_conf: Optional[Config] = DEFAULT_GNETCLI_SERVER_CONF,
Expand All @@ -311,6 +329,8 @@ def __init__(
"password": password,
"dev_login": dev_login,
"dev_password": dev_password,
"dev_port": dev_port,
"streamer_type": streamer_type,
"server_path": server_path,
"url": url,
"server_conf": server_conf,
Expand Down Expand Up @@ -447,6 +467,8 @@ async def deploy(
credentials=self.conf.make_dev_credentials(),
device=gnetcli_device,
ip=ip,
port=self.conf.dev_port,
streamer_type=self.conf.get_streamer_type(),
)
command_groups: list[tuple[str, CommandList]]= []
if isinstance(cmds, dict): # PC
Expand Down