components/python/cinderclient/patches/01-service.patch
author Laszlo Peter <laszlo.peter@oracle.com>
Wed, 07 Sep 2016 14:48:36 -0700
changeset 6822 1b782154d546
permissions -rw-r--r--
23206258 Upgrade cinderclient to 1.6.0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6822
1b782154d546 23206258 Upgrade cinderclient to 1.6.0
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
     1
The 'service' attribute doesn't exists, which can cause horizon to throw an AttributeError exception.
1b782154d546 23206258 Upgrade cinderclient to 1.6.0
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
     2
Logged as upstream bug 1579982 https://bugs.launchpad.net/horizon/+bug/1579982 and this patch
1b782154d546 23206258 Upgrade cinderclient to 1.6.0
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
     3
should be removed when the upstream bug is fixed and integrated in our version of python-cinderclient.
1b782154d546 23206258 Upgrade cinderclient to 1.6.0
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
     4
1b782154d546 23206258 Upgrade cinderclient to 1.6.0
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
     5
--- python-cinderclient-1.6.0/cinderclient/v2/services.py.old	2016-09-01 11:21:55.402483826 -0700
1b782154d546 23206258 Upgrade cinderclient to 1.6.0
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
     6
+++ python-cinderclient-1.6.0/cinderclient/v2/services.py	2016-09-01 11:21:42.665135394 -0700
1b782154d546 23206258 Upgrade cinderclient to 1.6.0
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
     7
@@ -22,7 +22,7 @@
1b782154d546 23206258 Upgrade cinderclient to 1.6.0
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
     8
 class Service(base.Resource):
1b782154d546 23206258 Upgrade cinderclient to 1.6.0
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
     9
 
1b782154d546 23206258 Upgrade cinderclient to 1.6.0
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    10
     def __repr__(self):
1b782154d546 23206258 Upgrade cinderclient to 1.6.0
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    11
-        return "<Service: %s>" % self.service
1b782154d546 23206258 Upgrade cinderclient to 1.6.0
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    12
+        return "<Service: %s>" % self._info
1b782154d546 23206258 Upgrade cinderclient to 1.6.0
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    13
 
1b782154d546 23206258 Upgrade cinderclient to 1.6.0
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    14
 
1b782154d546 23206258 Upgrade cinderclient to 1.6.0
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    15
 class ServiceManager(base.ManagerWithFind):