From f0f8e6b5ab3b3602e54f81d15af6c08e3c710545 Mon Sep 17 00:00:00 2001
From: xiexs <xiexs@cn.fujitsu.com>
Date: Sat, 25 Jun 2016 11:43:32 -0400
Subject: [PATCH] Fix Service.__repr__ to remove the undefined attribute

The self.name is undefined in the Service class.
And also there is no need any unique information to
identify this object, so we just remove it directly.

Change-Id: I3ce8663f830357855f2155e080393ea97f8f80ba
Partial-Bug: #1585024
---
 cinderclient/tests/unit/v1/test_services.py | 16 ++++++++++++++++
 cinderclient/v1/services.py                 |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/cinderclient/tests/unit/v1/test_services.py b/cinderclient/tests/unit/v1/test_services.py
index e0bfa7779..bf3e26c1d 100644
--- a/cinderclient/tests/unit/v1/test_services.py
+++ b/cinderclient/tests/unit/v1/test_services.py
@@ -20,6 +20,11 @@ from cinderclient.v1 import services
 
 cs = fakes.FakeClient()
 
+FAKE_SERVICE = {"host": "host1",
+                'binary': 'cinder-volume',
+                "status": "enable",
+                "availability_zone": "nova"}
+
 
 class ServicesTest(utils.TestCase):
 
@@ -73,3 +78,14 @@ class ServicesTest(utils.TestCase):
         cs.assert_called('PUT', '/os-services/disable-log-reason', values)
         self.assertIsInstance(s, services.Service)
         self.assertEqual('disabled', s.status)
+
+    def test___repr__(self):
+        """
+        Unit test for Service.__repr__
+
+        Verify that one Service object can be printed.
+        """
+        svs = services.Service(None, FAKE_SERVICE)
+        self.assertEqual(
+            "<Service: binary=%s host=%s>" % (FAKE_SERVICE['binary'],
+            FAKE_SERVICE['host']), repr(svs))
diff --git a/cinderclient/v1/services.py b/cinderclient/v1/services.py
index 3bc4b3b43..b6faf0399 100644
--- a/cinderclient/v1/services.py
+++ b/cinderclient/v1/services.py
@@ -22,7 +22,7 @@ from cinderclient import base
 class Service(base.Resource):
 
     def __repr__(self):
-        return "<Service: %s>" % self.service
+        return "<Service: binary=%s host=%s>" % (self.binary, self.host)
 
 
 class ServiceManager(base.ManagerWithFind):