Patch 0.12.3 (#172)

* Add new Lexer and update (#170)

* Setup: only require `ipaddress` for older python versions (#171)

* Prepare for release 0.12.3: Updating version number

netconan/__init__.py

@@ -19,4 +19,4 @@
 
 __url__ = "https://github.com/intentionet/netconan"
 
-__version__ = "0.12.2"
+__version__ = "0.12.3"

netconan/default_reserved_words.py

@@ -22,6 +22,7 @@
 # These are important tokens in network device configs and should not be modified by keyword anonymization
 default_reserved_words = {
     '!',
+    '"',
     '#',
     '$',
     '%',
@@ -41,14 +42,19 @@
     '10000half',
     '1000full',
     '1000half',
+    '1000m/full',
     '100full',
     '100g',
     '100gfull',
     '100ghalf',
     '100half',
+    '100m/full',
+    '100m/half',
     '10full',
     '10g-4x',
     '10half',
+    '10m/full',
+    '10m/half',
     '2',
     '2-byte',
     '25gbase-cr',
@@ -59,6 +65,7 @@
     '40gfull',
     '6pe',
     '802.3ad',
+    '8023ad',
     ':',
     ';',
     '<',
@@ -129,6 +136,7 @@
     'activated-service-template',
     'activation-character',
     'active',
+    'active-backup',
     'active-bonus',
     'active-modules',
     'active-server-group',
@@ -1136,6 +1144,7 @@
     'dnsix',
     'do',
     'do-all',
+    'do-auto-recovery',
     'do-until-failure',
     'do-until-success',
     'docsis-enable',
@@ -1182,6 +1191,7 @@
     'ds0-group',
     'dsa-signatures',
     'dscp',
+    'dscp-lop',
     'dscp-value',
     'dsg',
     'dsl',
@@ -1454,6 +1464,7 @@
     'false',
     'family',
     'fan',
+    'fast',
     'fast-age',
     'fast-detect',
     'fast-external-fallover',
@@ -2025,6 +2036,7 @@
     'ip-options',
     'ip-protocol',
     'ip-range',
+    'ip-rr',
     'ip-source-address',
     'ip-sweep',
     'ipaddr',
@@ -2059,6 +2071,7 @@
     'ipsla',
     'iptables',
     'ipv4',
+    'ipv4-address',
     'ipv4-l5',
     'ipv4-unicast',
     'ipv6',
@@ -2362,7 +2375,10 @@
     'labeled-unicast',
     'lacp',
     'lacp-bypass-allow',
+    'lacp-rate',
     'lacp-timeout',
+    'lacp-trunk',
+    'lacp-udld',
     'lag',
     'lan',
     'land',
@@ -2380,6 +2396,7 @@
     'layer2',
     'layer2-control',
     'layer3',
+    'layer3+4',
     'lcd-menu',
     'ldap',
     'ldap-base-dn',
@@ -2513,6 +2530,7 @@
     'log-updown',
     'logfile',
     'logging',
+    'logical',
     'logical-system',
     'logical-systems',
     'login',
@@ -2615,6 +2633,7 @@
     'marketing-name',
     'martians',
     'mask',
+    'mask-length',
     'mask-reply',
     'mask-request',
     'master',
@@ -3359,6 +3378,7 @@
     'port-mode',
     'port-name',
     'port-object',
+    'port-overload',
     'port-overloading',
     'port-overloading-factor',
     'port-priority',
@@ -3377,6 +3397,7 @@
     'portnetwork',
     'portrestrole',
     'ports',
+    'ports-threshold',
     'pos',
     'post',
     'post-policy',
@@ -3569,6 +3590,7 @@
     'rate-per-route',
     'rate-thresholds-profile',
     'raw',
+    'rba',
     'rbacl',
     'rcmd',
     'rcp',
@@ -3885,6 +3907,7 @@
     'saved-core-context',
     'saved-core-files',
     'scale-factor',
+    'scaleout-device-id',
     'scan-time',
     'scanning',
     'sccp',
@@ -4075,6 +4098,7 @@
     'slaves',
     'slot',
     'slot-table-cos',
+    'slow',
     'slow-peer',
     'slow-ramp-time',
     'small',
@@ -4621,6 +4645,7 @@
     'true',
     'truncation',
     'trunk',
+    'trunk-group',
     'trunk-status',
     'trunk-threshold',
     'trunks',
@@ -4786,6 +4811,7 @@
     'user-message',
     'user-role',
     'user-statistics',
+    'user-tag',
     'usergroup',
     'userid',
     'userinfo',
@@ -4828,6 +4854,7 @@
     'variance',
     'vdc',
     'vdom',
+    've',
     'vendor-option',
     'ver',
     'verification',
@@ -4917,6 +4944,7 @@
     'vrf-table-label',
     'vrf-target',
     'vrf-unicast-rib',
+    'vrid',
     'vrrp',
     'vrrp-group',
     'vserver',
@@ -5022,13 +5050,15 @@
     'xdmcp',
     'xdr',
     'xlate',
+    'xmit-hash-policy',
     'xml',
     'xml-config',
     'xnm-clear-text',
     'xnm-ssl',
     'xns-ch',
     'xns-mail',
     'xns-time',
+    'xor',
     'yellow',
     'yes',
     'z39-50',

setup.py

@@ -64,7 +64,8 @@
         "bidict<1.0.0",
         # Only use enum34 for Python older than 3.4
         'enum34<2.0.0; python_version < "3.4"',
-        "ipaddress<2.0.0",
+        # ipaddress is in the Python standard library in 3.3+
+        'ipaddress<2.0.0; python_version < "3.3"',
         "passlib<2.0.0",
         "six<2.0.0",
     ],

tools/BUILD.bazel

@@ -27,6 +27,8 @@ filegroup(
         "@batfish//projects/batfish/src/main/antlr4/org/batfish/grammar/routing_table/ios:IosRoutingTableLexer.tokens",
         "@batfish//projects/batfish/src/main/antlr4/org/batfish/grammar/routing_table/nxos:NxosRoutingTableLexer.tokens",
         "@batfish//projects/batfish/src/main/antlr4/org/batfish/grammar/vyos:VyosLexer.tokens",
+        "@batfish//projects/batfish/src/main/antlr4/org/batfish/vendor/a10/grammar:A10Lexer.tokens",
+        "@batfish//projects/batfish/src/main/antlr4/org/batfish/vendor/check_point_gateway/grammar:CheckPointGatewayLexer.tokens",
     ],
 )