summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTushar Gohad <tushar.gohad@intel.com>2015-03-11 09:15:21 -0700
committerTushar Gohad <tushar.gohad@intel.com>2015-03-13 01:06:29 -0700
commit1c9fc482b02178eb483ebc5c07f6f62a05941291 (patch)
tree7ac80e2199e4d91a2c5c1421f2210564564ba737
parentd1bf211f4305f84f0ff8441fd1bc563d5f8bc3dd (diff)
downloadpyeclib-1c9fc482b02178eb483ebc5c07f6f62a05941291.tar.gz
Convert remaining ECPyECLibException instances to ECDriverError
-rw-r--r--pyeclib/core.py12
-rw-r--r--test/test_pyeclib_api.py4
2 files changed, 8 insertions, 8 deletions
diff --git a/pyeclib/core.py b/pyeclib/core.py
index c0935c5..17dfa75 100644
--- a/pyeclib/core.py
+++ b/pyeclib/core.py
@@ -85,7 +85,7 @@ class ECPyECLibDriver(object):
try:
ret = pyeclib_c.decode(self.handle, fragment_payloads, fragment_len, ranges, force_metadata_checks)
except PyECLibError as e:
- raise ECPyECLibException(e)
+ raise ECDriverError(e)
# Was there an error decoding
if ret is None:
@@ -113,7 +113,7 @@ class ECPyECLibDriver(object):
reconstructed = pyeclib_c.reconstruct(
self.handle, _fragment_payloads, fragment_len, index)
except PyECLibError as e:
- raise ECPyECLibException(e)
+ raise ECDriverError(e)
reconstructed_data.append(reconstructed)
_fragment_payloads.append(reconstructed)
@@ -125,7 +125,7 @@ class ECPyECLibDriver(object):
self.handle, reconstruct_indexes, exclude_indexes)
return required_fragments
except PyECLibError as e:
- raise ECPyECLibException(e)
+ raise ECDriverError(e)
def min_parity_fragments_needed(self):
""" FIXME - fix this to return a function of HD """
@@ -136,21 +136,21 @@ class ECPyECLibDriver(object):
fragment_metadata = pyeclib_c.get_metadata(self.handle, fragment, formatted)
return fragment_metadata
except PyECLibError as e:
- raise ECPyECLibException(e)
+ raise ECDriverError(e)
def verify_stripe_metadata(self, fragment_metadata_list):
try:
success = pyeclib_c.check_metadata(self.handle, fragment_metadata_list)
return success
except PyECLibError as e:
- raise ECPyECLibException(e)
+ raise ECDriverError(e)
def get_segment_info(self, data_len, segment_size):
try:
segment_info = pyeclib_c.get_segment_info(self.handle, data_len, segment_size)
return segment_info
except PyECLibError as e:
- raise ECPyECLibException(e)
+ raise ECDriverError(e)
class ECNullDriver(object):
diff --git a/test/test_pyeclib_api.py b/test/test_pyeclib_api.py
index f0c27ff..a6ed14f 100644
--- a/test/test_pyeclib_api.py
+++ b/test/test_pyeclib_api.py
@@ -26,7 +26,7 @@ from string import ascii_letters, ascii_uppercase, digits
import sys
import tempfile
import unittest
-from pyeclib.core import ECPyECLibException
+from pyeclib.ec_iface import ECDriverError
from pyeclib.ec_iface import ECDriver, VALID_EC_TYPES, ECDriverError, \
PyECLib_EC_Types
@@ -533,7 +533,7 @@ class TestPyECLibDriver(unittest.TestCase):
#
try:
pyeclib_driver.reconstruct([fragments[0]], [1,2,3,4,5,6])
- except ECPyECLibException as e:
+ except ECDriverError as e:
hit_exception = True
self.assertTrue(e.error_str.__str__().find("Insufficient number of fragments") > -1)