Changeset 1463:8f6c77f24b1a in freeDiameter for contrib/tools/csv_to_fd

Timestamp:

Mar 9, 2020, 8:28:04 PM (3 years ago)

Author:

Luke Mewburn <luke@mewburn.net>

Branch:

default

Phase:

public

Message:

csv_to_fd: add QoSFilterRule. style fixes

Support derived type QoSFilterRule from RFC 7155 section 4.1.1
Minor code refactor.
Expand comments, removing UTF-8 chars and encoding requirement.

File:

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

contrib/tools/csv_to_fd

@@ -1 +1 @@
 #!/usr/bin/env python
-# vim: set fileencoding=utf-8 :
 
 """
@@ -11 +10 @@
     - Name:
         AVP Name. String, validated as ALPHA *(ALPHA / DIGIT / "-")
+        per RFC 6733 section 3.2.
     - Code:
         AVP Code. Integer, 0..4294967295.
@@ -16 +16 @@
         Section in relevant standard. String.
     - DataType:
-        AVP Data Type. String, validated per Per RFC 6733 § 4.2 and § 4.3.
+        AVP Data Type. String, validated per basic and derived types in:
+            - RFC 6733 section 4.2
+            - RFC 6733 section 4.3
+            - RFC 7155 section 4.1
     - Must, May, ShouldNot, MustNot:
         Flags, possibly comma or space separated: M, V
@@ -56 +59 @@
 ]
 
+DERIVED_TO_BASE = {
+    'Address':          'OctetString',  # RFC 6733 section 4.3.1
+    'Time':             'OctetString',  # RFC 6733 section 4.3.1
+    'UTF8String':       'OctetString',  # RFC 6733 section 4.3.1
+    'DiameterIdentity': 'OctetString',  # RFC 6733 section 4.3.1
+    'DiameterURI':      'OctetString',  # RFC 6733 section 4.3.1
+    'Enumerated':       'Integer32',    # RFC 6733 section 4.3.1
+    'IPFilterRule':     'OctetString',  # RFC 6733 section 4.3.1
+    'QoSFilterRule':    'OctetString',  # RFC 7155 section 4.1.1
+}
+
+# See https://www.iana.org/assignments/enterprise-numbers/enterprise-numbers
 VENDOR_TO_NAME = {
     0:      '',
@@ -67 +82 @@
     """Store an AVP row."""
 
-    # Regex to validate avp-name per RFC 6733 § 3.2,
+    # Regex to validate avp-name per RFC 6733 section 3.2,
     # with changes:
     # - Allow avp-name to start with numbers (for 3GPP)
@@ -100 +115 @@
         if (self.code < 0 or self.code > 4294967295):
             raise ValueError('Invalid AVP code {}'.format(self.code))
-        if self.datatype not in (
+        if (self.datatype not in (
                 'OctetString', 'Integer32', 'Integer64', 'Unsigned32',
-                'Unsigned64', 'Float32', 'Float64', 'Grouped',
-                'Address', 'Time', 'UTF8String', 'DiameterIdentity',
-                'DiameterURI', 'Enumerated', 'IPFilterRule',
-                ):
+                'Unsigned64', 'Float32', 'Float64', 'Grouped')
+                and self.datatype not in DERIVED_TO_BASE):
             raise ValueError('Invalid AVP data type "{}"'.format(
                 self.datatype))
@@ -202 +215 @@
 
     COMMENT_WIDTH = 64
-
-    DERIVED_TO_BASE = {
-        'Address':          'OctetString',
-        'Time':             'OctetString',
-        'UTF8String':       'OctetString',
-        'DiameterIdentity': 'OctetString',
-        'DiameterURI':      'OctetString',
-        'Enumerated':       'Integer32',
-        'IPFilterRule':     'OctetString',
-    }
 
     def __init__(self):
@@ -236 +239 @@
 # TODO: add trailing comma?
         self.add('\t\t\tAVP_TYPE_{}\t/* base type of data */'.format(
-            self.DERIVED_TO_BASE.get(
-                avp.datatype, avp.datatype).upper()))
+            DERIVED_TO_BASE.get(avp.datatype, avp.datatype).upper()))
         self.add('\t\t};')
         avp_type = 'NULL'
@@ -252 +254 @@
             self.add('\t\tCHECK_dict_new(DICT_TYPE, &tdata, NULL, &type);')
             avp_type = "type"
-        elif avp.datatype in self.DERIVED_TO_BASE:
+        elif avp.datatype in DERIVED_TO_BASE:
             avp_type = '{}_type'.format(avp.datatype)
         self.add('\t\tCHECK_dict_new(DICT_AVP, &data, {}, NULL);'.format(