Changeset 1506:2ab9d941bad5 in freeDiameter for contrib

Timestamp:

Apr 3, 2020, 3:04:13 PM (4 years ago)

Author:

Luke Mewburn <luke@mewburn.net>

Branch:

default

Phase:

public

Message:

csv_to_fd: improve validation error handling

File:

• contrib/tools/csv_to_fd (modified) (4 diffs)

contrib/tools/csv_to_fd

@@ -2 +2 @@
 
 """
-Convert CSV files containing RADIUS or Diameter AVP tables
+Convert 8 column CSV files containing RADIUS or Diameter AVP tables
 into various formats.
 
 Format of the CSV files is one of:
 - Row per 3GPP AVP tables:
-    Name, Code, Section, DataType, Must, May, ShouldNot, MustNot [, extra]
+    Name, Code, Section, DataType, Must, May, ShouldNot, MustNot
     - Name:
         AVP Name. String, validated as ALPHA *(ALPHA / DIGIT / "-")
@@ -601 +601 @@
         with open(filename, 'r') as csvfile:
             csvdata = csv.DictReader(csvfile, CSV_COLUMN_NAMES,
-                                     restkey='extra_cells')
+                                     restkey='extra_cells', restval='')
             standard = ''
             vendor = 0
@@ -607 +607 @@
             for row in csvdata:
                 try:
+                    if csvdata.restkey in row:
+                        raise ValueError('Extra cells: {}'.format(
+                            ','.join(row[csvdata.restkey])))
                     if row['name'] in (None, '', 'Attribute Name'):
                         continue
@@ -641 +644 @@
                         # Process AVP
                         avpproc.avp(avp)
-                except ValueError as e:
+                except (TypeError, ValueError) as e:
                     errors.append('CSV file "{}" line {}: {}\n'.format(
                         filename, csvdata.line_num, e))