Skip to content
Open
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,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
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets be on a defensive side and use StreamerType_ssh only when None or "ssh" is passed and raise an exception otherwise.


def make_dev_credentials(self) -> Optional[Credentials]:
if not self.dev_login and not self.dev_password:
return None
Expand Down Expand Up @@ -170,6 +178,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 @@ -179,6 +189,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 @@ -266,6 +278,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 @@ -283,6 +297,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 All @@ -309,6 +325,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 @@ -319,6 +337,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 @@ -455,6 +475,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
Loading