* Revert "Revert "Refactor zwave discovery to entity schema (#6445)" (#6564)"
This reverts commit 58826b264a.
* Update zwave tests for enitity schema
* Fix merge error
* Switch dict_id to id(self)
* Revert "Revert "Refactor zwave discovery to entity schema (#6445)" (#6564)"
This reverts commit 58826b264a.
* Update zwave tests for enitity schema
* Fix merge error
* Switch dict_id to id(self)