From e5756ba41df64c4f46103abbc9f34c48b50fd54a Mon Sep 17 00:00:00 2001
From: Robbie Trencheny <me@robbiet.us>
Date: Thu, 13 Apr 2017 22:48:59 -0700
Subject: [PATCH] Break product name up into manufacturer name and product name

---
 homeassistant/components/zwave/node_entity.py | 6 ++++--
 tests/components/zwave/test_node_entity.py    | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/homeassistant/components/zwave/node_entity.py b/homeassistant/components/zwave/node_entity.py
index 5448da3c59c..e43ee735ac7 100644
--- a/homeassistant/components/zwave/node_entity.py
+++ b/homeassistant/components/zwave/node_entity.py
@@ -16,6 +16,7 @@ ATTR_AWAKE = 'is_awake'
 ATTR_READY = 'is_ready'
 ATTR_FAILED = 'is_failed'
 ATTR_PRODUCT_NAME = 'product_name'
+ATTR_MANUFACTURER_NAME = 'manufacturer_name'
 
 STAGE_COMPLETE = 'Complete'
 
@@ -80,8 +81,8 @@ class ZWaveNodeEntity(ZWaveBaseEntity):
         self.node = node
         self.node_id = self.node.node_id
         self._name = node_name(self.node)
-        self._product_name = '{} {}'.format(
-            node.manufacturer_name, node.product_name)
+        self._product_name = node.product_name
+        self._manufacturer_name = node.manufacturer_name
         self.entity_id = "{}.{}_{}".format(
             DOMAIN, slugify(self._name), self.node_id)
         self._attributes = {}
@@ -164,6 +165,7 @@ class ZWaveNodeEntity(ZWaveBaseEntity):
         """Return the device specific state attributes."""
         attrs = {
             ATTR_NODE_ID: self.node_id,
+            ATTR_MANUFACTURER_NAME: self._manufacturer_name,
             ATTR_PRODUCT_NAME: self._product_name,
         }
         attrs.update(self._attributes)
diff --git a/tests/components/zwave/test_node_entity.py b/tests/components/zwave/test_node_entity.py
index 0d57a973c31..871520d1e6d 100644
--- a/tests/components/zwave/test_node_entity.py
+++ b/tests/components/zwave/test_node_entity.py
@@ -83,7 +83,8 @@ class TestZWaveNodeEntity(unittest.TestCase):
         self.maxDiff = None
         self.assertEqual(
             {'node_id': self.node.node_id,
-             'product_name': 'Test Manufacturer Test Product'},
+             'manufacturer_name': 'Test Manufacturer',
+             'product_name': 'Test Product'},
             self.entity.device_state_attributes)
 
         self.node.get_values.return_value = {
@@ -139,7 +140,8 @@ class TestZWaveNodeEntity(unittest.TestCase):
         self.entity.node_changed()
         self.assertEqual(
             {'node_id': self.node.node_id,
-             'product_name': 'Test Manufacturer Test Product',
+             'manufacturer_name': 'Test Manufacturer',
+             'product_name': 'Test Product',
              'query_stage': 'Dynamic',
              'is_awake': True,
              'is_ready': False,