Skip to content

Allow plugwise port number as IP address in config flow #38276

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

Closed
jeroen84 wants to merge 8 commits into from
Closed

Allow plugwise port number as IP address in config flow #38276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
92d748a
plugwise: add optional port number
jeroen84 Jul 26, 2020
f04f8ee
plugwise: add optional port number
jeroen84 Jul 27, 2020
4fc28b2
plugwise: adjust testing scenario with port number
jeroen84 Jul 27, 2020
594a6d7
Remove plugwise-add-port from ci.yaml
jeroen84 Jul 27, 2020
514281d
allow [HOST_IP]:[PORT] as entry for CONF_HOST
jeroen84 Jul 30, 2020
46992df
Remove the "port" attributes
jeroen84 Jul 30, 2020
99e18ed
remove port number from config
jeroen84 Jul 30, 2020
562fa90
reset test_config_flow.py to original
jeroen84 Jul 30, 2020
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
11 changes: 10 additions & 1 deletion homeassistant/components/plugwise/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,17 @@ async def async_setup(hass: HomeAssistant, config: dict):
async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
"""Set up Plugwise Smiles from a config entry."""
websession = async_get_clientsession(hass, verify_ssl=False)

if ":" in entry.data["host"]:
port = int(entry.data["host"].split(":")[1])
else:
port = 80

api = Smile(
host=entry.data["host"], password=entry.data["password"], websession=websession
host=entry.data["host"].split(":")[0],
password=entry.data["password"],
port=port,
websession=websession,
)

try:
Expand Down
9 changes: 8 additions & 1 deletion homeassistant/components/plugwise/config_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,16 @@ async def validate_input(hass: core.HomeAssistant, data):
Data has the keys from _base_schema() with values provided by the user.
"""
websession = async_get_clientsession(hass, verify_ssl=False)

if ":" in data[CONF_HOST]:
port = int(data[CONF_HOST].split(":")[1])
else:
port = 80

api = Smile(
host=data[CONF_HOST],
host=data[CONF_HOST].split(":")[0],
password=data[CONF_PASSWORD],
port=port,
timeout=30,
websession=websession,
)
Expand Down