diff options
| author | Tushar Gohad <tushar.gohad@intel.com> | 2014-06-23 17:03:22 -0700 |
|---|---|---|
| committer | Tushar Gohad <tushar.gohad@intel.com> | 2014-06-23 17:04:07 -0700 |
| commit | 7bc3b079bb9830336fd6485c6d1489a3b30bf345 (patch) | |
| tree | dad1f73e8dbd2189f8740e9c1d966cc69bfedf2c | |
| parent | 5b23c17592a6530c0bf8f30a3bc12c5557f37c34 (diff) | |
| download | pyeclib-7bc3b079bb9830336fd6485c6d1489a3b30bf345.tar.gz | |
ec_iface: Rename chksum type inline->inline_crc32
... in preparation to add inline_md5, in case we
don't add it before 1.0
Signed-off-by: Tushar Gohad <tushar.gohad@intel.com>
| -rw-r--r-- | src/python/pyeclib/core.py | 5 | ||||
| -rw-r--r-- | src/python/pyeclib/ec_iface.py | 4 | ||||
| -rw-r--r-- | test/test_pyeclib_api.py | 16 |
3 files changed, 13 insertions, 12 deletions
diff --git a/src/python/pyeclib/core.py b/src/python/pyeclib/core.py index 077cade..80416e5 100644 --- a/src/python/pyeclib/core.py +++ b/src/python/pyeclib/core.py @@ -42,7 +42,7 @@ class ECPyECLibException(Exception): class ECPyECLibDriver(object): def __init__(self, k, m, ec_type, - chksum_type=PyECLib_HDRCHKSUM_Types.inline): + chksum_type=PyECLib_HDRCHKSUM_Types.inline_crc32): self.k = k self.m = m self.ec_type = ec_type @@ -50,7 +50,8 @@ class ECPyECLibDriver(object): self.inline_chksum = 0 self.algsig_chksum = 0 - if self.chksum_type is PyECLib_HDRCHKSUM_Types.inline: + # crc32 is the only inline checksum type currently supported + if self.chksum_type is PyECLib_HDRCHKSUM_Types.inline_crc32: self.inline_chksum = 1 elif self.chksum_type is PyECLib_HDRCHKSUM_Types.algsig: self.algsig_chksum = 1 diff --git a/src/python/pyeclib/ec_iface.py b/src/python/pyeclib/ec_iface.py index 995bdd8..b4cded2 100644 --- a/src/python/pyeclib/ec_iface.py +++ b/src/python/pyeclib/ec_iface.py @@ -80,8 +80,8 @@ class PyECLib_EC_Types(PyECLibEnum): # 0 is False in the boolean sense but enum members evaluate to True class PyECLib_HDRCHKSUM_Types(PyECLibEnum): none = 1 - inline = 2 - algsig = 3 + algsig = 2 + inline_crc32 = 3 # Generic ECDriverException diff --git a/test/test_pyeclib_api.py b/test/test_pyeclib_api.py index 3e4f0d5..82356a4 100644 --- a/test/test_pyeclib_api.py +++ b/test/test_pyeclib_api.py @@ -197,16 +197,16 @@ class TestPyECLibDriver(unittest.TestCase): pyeclib_drivers = [] pyeclib_drivers.append( ECDriver("pyeclib.core.ECPyECLibDriver", - k=12, m=2, ec_type="rs_vand", chksum_type="inline")) + k=12, m=2, ec_type="rs_vand", chksum_type="inline_crc32")) pyeclib_drivers.append( ECDriver("pyeclib.core.ECPyECLibDriver", - k=12, m=3, ec_type="rs_vand", chksum_type="inline")) + k=12, m=3, ec_type="rs_vand", chksum_type="inline_crc32")) pyeclib_drivers.append( ECDriver("pyeclib.core.ECPyECLibDriver", - k=12, m=4, ec_type="rs_vand", chksum_type="inline")) + k=12, m=4, ec_type="rs_vand", chksum_type="inline_crc32")) pyeclib_drivers.append( ECDriver("pyeclib.core.ECPyECLibDriver", - k=12, m=2, ec_type="rs_cauchy_orig", chksum_type="inline")) + k=12, m=2, ec_type="rs_cauchy_orig", chksum_type="inline_crc32")) filesize = 1024 * 1024 * 3 file_str = ''.join(random.choice(ascii_letters) for i in range(filesize)) @@ -240,16 +240,16 @@ class TestPyECLibDriver(unittest.TestCase): pyeclib_drivers = [] pyeclib_drivers.append( ECDriver("pyeclib.core.ECPyECLibDriver", - k=12, m=2, ec_type="rs_vand", chksum_type="inline")) + k=12, m=2, ec_type="rs_vand", chksum_type="inline_crc32")) pyeclib_drivers.append( ECDriver("pyeclib.core.ECPyECLibDriver", - k=12, m=3, ec_type="rs_vand", chksum_type="inline")) + k=12, m=3, ec_type="rs_vand", chksum_type="inline_crc32")) pyeclib_drivers.append( ECDriver("pyeclib.core.ECPyECLibDriver", - k=12, m=4, ec_type="rs_vand", chksum_type="inline")) + k=12, m=4, ec_type="rs_vand", chksum_type="inline_crc32")) pyeclib_drivers.append( ECDriver("pyeclib.core.ECPyECLibDriver", - k=12, m=2, ec_type="rs_cauchy_orig", chksum_type="inline")) + k=12, m=2, ec_type="rs_cauchy_orig", chksum_type="inline_crc32")) filesize = 1024 * 1024 * 3 file_str = ''.join(random.choice(ascii_letters) for i in range(filesize)) |