type -> ec_type updates for command line tools

Signed-off-by: Tushar Gohad <tushar.gohad@intel.com>

4 files changed, 20 insertions, 22 deletions

diff --git a/tools/pyeclib_conf_tool.py b/tools/pyeclib_conf_tool.py
index 5f6a964..ddb475c 100644
--- a/tools/pyeclib_conf_tool.py
+++ b/tools/pyeclib_conf_tool.py
@@ -100,14 +100,14 @@ def nCr(n, r):
 
 class ECScheme:
 
-    def __init__(self, k, m, w, type):
+    def __init__(self, k, m, w, ec_type):
         self.k = k
         self.m = m
         self.w = w
-        self.type = type
+        self.ec_type = ec_type
 
     def __str__(self):
-        return "k=%d m=%d w=%d type=%s" % (self.k, self.m, self.w, self.type)
+        return "k=%d m=%d w=%d ec_type=%s" % (self.k, self.m, self.w, self.ec_type)
 
 valid_flat_xor_3 = [(6, 6), (7, 6), (8, 6), (9, 6),
                     (10, 6), (11, 6), (12, 6), (13, 6),
@@ -223,7 +223,7 @@ return_limit = args.l
 
 schemes = get_viable_schemes(args.n, args.r, args.s, args.f)
 
-# Results will be List[(type, throughput)]
+# Results will be List[(ec_type, throughput)]
 results = []
 
 # Num iterations
@@ -240,7 +240,7 @@ for scheme in schemes:
     try:
         ec_driver = ECDriver(
             "pyeclib.core.ECPyECLibDriver",
-            k=scheme.k, m=scheme.m, type=scheme.type)
+            k=scheme.k, m=scheme.m, ec_type=scheme.ec_type)
     except Exception as e:
         print("Scheme %s is not defined (%s)." % (scheme, e))
         continue
@@ -266,9 +266,9 @@ for i in range(len(results)):
     print("  ======== To Use this Policy, Copy and Paste Text (not including "
           "this header and footer) to Swift Conf ========")
     print("  type = erasure_coding")
-    print("  name = %s_%d_%d" % (results[i][0].type,
+    print("  name = %s_%d_%d" % (results[i][0].ec_type,
                                  results[i][0].k, results[i][0].m))
-    print("  ec_type = %s" % results[i][0].type)
+    print("  ec_type = %s" % results[i][0].ec_type)
     print("  ec_k = %s" % results[i][0].k)
     print("  ec_m = %s" % results[i][0].m)
     print("  ================================================================"
diff --git a/tools/pyeclib_decode.py b/tools/pyeclib_decode.py
index acc313d..4ec7f52 100644
--- a/tools/pyeclib_decode.py
+++ b/tools/pyeclib_decode.py
@@ -32,21 +32,20 @@ import argparse
 parser = argparse.ArgumentParser(description='Decoder for PyECLib.')
 parser.add_argument('k', type=int, help='number of data elements')
 parser.add_argument('m', type=int, help='number of parity elements')
-parser.add_argument('type', help='EC algorithm used')
+parser.add_argument('ec_type', help='EC algorithm used')
 parser.add_argument('fragments', metavar='fragment', nargs='+',
                     help='fragments to decode')
 parser.add_argument('filename', help='output file')
 
 args = parser.parse_args()
 
-print args.k
-print args.m
-print args.type
-print args.fragments
-print args.filename
+print("k = %d, m = %d" % (args.k, args.m))
+print("ec_type = %s" % args.ec_type)
+print("fragments = %s" % args.fragments)
+print("filename = %s" % args.filename)
 
 ec_driver = ECDriver(
-    "pyeclib.core.ECPyECLibDriver", k=args.k, m=args.m, type=args.type)
+    "pyeclib.core.ECPyECLibDriver", k=args.k, m=args.m, ec_type=args.ec_type)
 
 fragment_list = []
 
diff --git a/tools/pyeclib_encode.py b/tools/pyeclib_encode.py
index fdfae80..28563c5 100644
--- a/tools/pyeclib_encode.py
+++ b/tools/pyeclib_encode.py
@@ -32,21 +32,20 @@ import argparse
 parser = argparse.ArgumentParser(description='Encoder for PyECLib.')
 parser.add_argument('k', type=int, help='number of data elements')
 parser.add_argument('m', type=int, help='number of parity elements')
-parser.add_argument('type', help='EC algorithm used')
+parser.add_argument('ec_type', help='EC algorithm used')
 parser.add_argument('file_dir', help='directory with the file')
 parser.add_argument('filename', help='file to encode')
 parser.add_argument('fragment_dir', help='directory to drop encoded fragments')
 
 args = parser.parse_args()
 
-print args.k
-print args.m
-print args.type
-print args.filename
+print("k = %d, m = %d" % (args.k, args.m))
+print("ec_type = %s" % args.ec_type)
+print("filename = %s" % args.filename)
 
 ec_driver = ECDriver(
     "pyeclib.core.ECPyECLibDriver",
-    k=args.k, m=args.m, type=args.type)
+    k=args.k, m=args.m, ec_type=args.ec_type)
 
 # read
 with open(("%s/%s" % (args.file_dir, args.filename)), "rb") as fp:
diff --git a/tools/pyeclib_fragments_needed.py b/tools/pyeclib_fragments_needed.py
index 4bcc754..92fd0b3 100644
--- a/tools/pyeclib_fragments_needed.py
+++ b/tools/pyeclib_fragments_needed.py
@@ -34,7 +34,7 @@ parser = argparse.ArgumentParser(
                 'recover missing fragments.')
 parser.add_argument('k', type=int, help='number of data elements')
 parser.add_argument('m', type=int, help='number of parity elements')
-parser.add_argument('type', help='EC algorithm used')
+parser.add_argument('ec_type', help='EC algorithm used')
 parser.add_argument('missing_fragments', type=int, metavar='missing_fragment',
                     nargs='+', help='missing_fragments')
 
@@ -42,7 +42,7 @@ args = parser.parse_args()
 
 ec_driver = ECDriver(
     "pyeclib.core.ECPyECLibDriver",
-    k=args.k, m=args.m, type=args.type)
+    k=args.k, m=args.m, ec_type=args.ec_type)
 
 fragments_needed = ec_driver.fragments_needed(args.missing_fragments)