From: Alfredo Deza <adeza@redhat.com>
Date: Wed, 8 Aug 2018 16:54:23 +0000 (-0400)
Subject: ceph-volume util.disk do not modify self instance of Size objects
X-Git-Tag: v14.0.1~520^2~3^2~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=00dba2e83ad80cd41b6b29efa642e2da826c2124;p=ceph.git

ceph-volume util.disk do not modify self instance of Size objects

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/src/ceph-volume/ceph_volume/util/disk.py b/src/ceph-volume/ceph_volume/util/disk.py
index 70eb8d528646..fcefb28102ac 100644
--- a/src/ceph-volume/ceph_volume/util/disk.py
+++ b/src/ceph-volume/ceph_volume/util/disk.py
@@ -484,31 +484,31 @@ class Size(object):
 
     def __add__(self, other):
         if isinstance(other, Size):
-            self._b = self._b + other._b
-            return self
+            _b = self._b + other._b
+            return Size(b=_b)
         raise TypeError('Cannot add "Size" object with int')
 
     def __sub__(self, other):
         if isinstance(other, Size):
-            self._b = self._b - other._b
-            return self
+            _b = self._b - other._b
+            return Size(b=_b)
         raise TypeError('Cannot subtract "Size" object from int')
 
     def __mul__(self, other):
         if isinstance(other, Size):
             raise TypeError('Cannot multiply with "Size" object')
-        self._b = self._b * other
-        return self
+        _b = self._b * other
+        return Size(b=_b)
 
     def __truediv__(self, other):
         if isinstance(other, Size):
-            raise TypeError('Cannot divide by "Size" object')
+            return self._b / other._b
         self._b = self._b / other
         return self
 
     def __div__(self, other):
         if isinstance(other, Size):
-            raise TypeError('Cannot divide by "Size" object')
+            return self._b / other._b
         self._b = self._b / other
         return self