Skip to content
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.

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

Z-Wave usb_path in configuration.yaml overrides config entry usb_path #22038

Merged
merged 3 commits into from Mar 14, 2019

Conversation

Projects
None yet
3 participants
@cgarwood
Copy link
Contributor

cgarwood commented Mar 14, 2019

Breaking Change:

Potentially a breaking change if people have a stale usb_path setting in configuration.yaml that's no longer accurate.

Description:

Updates Z-Wave so that if a usb_path is specified in configuration.yaml, it will override the usb_path that is in the zwave config entry. Had to remove the default path in the voluptuous schema as part of this. It's very possible that zwave: will be specified in configuration.yaml without a usb_path since there's a number of configuration.yaml-only settings for zwave.

This should help reduce the number of people that need to manually edit the storage/core.config_entries file if their usb_path changes.

Example entry for configuration.yaml (if applicable):

zwave:
  usb_path: /dev/zwave

Checklist:

  • The code change is tested and works locally.
  • Local tests pass with tox. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.

If user exposed functionality or configuration variables are added/changed:

@cgarwood cgarwood requested a review from home-assistant/z-wave as a code owner Mar 14, 2019

@wafflebot wafflebot bot added the in progress label Mar 14, 2019

usb_path = config.get(
CONF_USB_STICK_PATH, config_entry.data[CONF_USB_STICK_PATH])

_LOGGER.info('Z-Wave USB path is %s', usb_path)

This comment has been minimized.

Copy link
@balloob

balloob Mar 14, 2019

Member
Suggested change
_LOGGER.info('Z-Wave USB path is %s', usb_path)
_LOGGER.info('Z-Wave USB path is %s', usb_path)
@balloob
Copy link
Member

balloob left a comment

Looks good.

We just added config entry options, this would be a good candidate.

@balloob balloob merged commit 62f12d2 into home-assistant:dev Mar 14, 2019

4 checks passed

Hound No violations found. Woof!
cla-bot Everyone involved has signed the CLA
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage decreased (-0.06%) to 92.768%
Details

@wafflebot wafflebot bot removed the in progress label Mar 14, 2019

mxworm added a commit to mxworm/home-assistant that referenced this pull request Mar 15, 2019

Merge branch 'dev' into current
* dev: (177 commits)
  Bump androidtv to 0.0.12 (home-assistant#22072)
  Fix func
  Updated frontend to 20190315.0
  Binary Sensor for Remote UI & Fix timezone (home-assistant#22076)
  Update rest.py (home-assistant#22077)
  Correct context (home-assistant#22061)
  Upgrade ruamel.yaml to 0.15.89 (home-assistant#22064)
  Fix more test
  Fix test
  Return config entry ID after creation (home-assistant#22060)
  Add HTTP auth and SSL verification to REST notify (home-assistant#22016)
  Mobile App: Expose Cloud Remote UI FQDN in registration response (home-assistant#22055)
  Cleanup remaining constants stuff in ZHA (home-assistant#22050)
  Fix cloud services.yaml
  Minor ZHA consts fixes (home-assistant#22049)
  Mobile App: Sensors (home-assistant#21854)
  Fix Google Assistant User with Cloud (home-assistant#22042)
  Mobile App: Register devices into the registry (home-assistant#21856)
  Z-Wave usb_path in configuration.yaml overrides config entry usb_path (home-assistant#22038)
  Update additional platforms to use new MQTT message callback (home-assistant#22030)
  ...

@balloob balloob referenced this pull request Apr 3, 2019

Merged

0.91.0 #22688

@tomhoover tomhoover referenced this pull request Apr 12, 2019

Closed

Z-Wave config (0.91) #60

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.