Deprecate ROUTES

Author: gcoxmoz

openvpn_client_connect/client_connect.py

@@ -126,11 +126,6 @@ def __init__(self, conf_file):
         self.routes_4 = []
         if _config.has_section('static-mapping'):
             try:
-                try:
-                    self.routes_4 = ast.literal_eval(
-                        _config.get('static-mapping', 'ROUTES'))
-                except configparser.NoOptionError:
-                    pass
                 self.routes_4 = ast.literal_eval(
                     _config.get('static-mapping', 'ROUTES_4'))
             except configparser.NoOptionError:

test_configs/doubleup.conf

@@ -49,7 +49,7 @@ COMPREHENSIVE_OFFICE_ROUTES = [ '10.192.0.0/10' ]
 [static-mapping]
 
 # This is the list of preconfigured static routes
-ROUTES = [
-          '10.20.75.120 255.255.255.255',
-          '63.6.7.8 255.255.255.255 net_gateway',
-          ]
+ROUTES_4 = [
+            '10.20.75.120 255.255.255.255',
+            '63.6.7.8 255.255.255.255 net_gateway',
+            ]

test_configs/tcp4_static.conf

@@ -23,7 +23,7 @@ GLOBAL_SEARCH_DOMAINS = [
 [static-mapping]
 
 # This is the list of preconfigured static routes
-ROUTES = [
-          '10.20.75.120 255.255.255.255',
-          '63.6.7.8 255.255.255.255 net_gateway',
-          ]
+ROUTES_4 = [
+            '10.20.75.120 255.255.255.255',
+            '63.6.7.8 255.255.255.255 net_gateway',
+            ]

test_configs/udp4_static.conf

@@ -23,7 +23,7 @@ GLOBAL_SEARCH_DOMAINS = [
 [static-mapping]
 
 # This is the list of preconfigured static routes
-ROUTES = [
-          '10.20.75.120 255.255.255.255',
-          '63.6.7.8 255.255.255.255 net_gateway',
-          ]
+ROUTES_4 = [
+            '10.20.75.120 255.255.255.255',
+            '63.6.7.8 255.255.255.255 net_gateway',
+            ]

test_configs/wrongvals.conf

@@ -35,4 +35,4 @@ COMPREHENSIVE_OFFICE_ROUTES = '10.192.0.0/10'
 [static-mapping]
 
 # This is the list of preconfigured static routes
-ROUTES = '10.20.75.120 255.255.255.255'
+ROUTES_4 = '10.20.75.120 255.255.255.255'