Merge pull request #14 from cherusk/bug_repair_init

bufix - repair config parsing in selector
cherusk · Jan 7, 2023 · d08dcd3 · d08dcd3
2 parents f72e4e4 + 4d0e721
commit d08dcd3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/prometheus_ss_exporter/selection.py b/prometheus_ss_exporter/selection.py
@@ -61,6 +61,7 @@ def process(self, flow,
 
     def __init__(self, cnfg):
         key = 'selection'
+        cnfg = cnfg.get('logic')
         if (key in cnfg.keys() and
            cnfg[key]):
             self._core = self._arbitrate

diff --git a/test/selection_test.py b/test/selection_test.py
@@ -98,10 +98,12 @@ def test_process_accept_test(self):
 
     def test_combined_accept_test(self):
         selection_config = {
-                'selection': {
-                    'peering': {
-                        'networks': [ '192.168.0.0/16' ],
-                        'portranges': [{ 'lower': 1000, 'upper': 2000 }]
+                'logic': {
+                    'selection': {
+                        'peering': {
+                            'networks': [ '192.168.0.0/16' ],
+                            'portranges': [{ 'lower': 1000, 'upper': 2000 }]
+                            }
                         }
                     }
                 }
@@ -114,10 +116,12 @@ def test_combined_accept_test(self):
 
     def test_combined_decline_test(self):
         selection_config = {
-                'selection': {
-                    'peering': {
-                        'networks': [ '192.168.0.0/16' ],
-                        'portranges': [{ 'lower': 1000, 'upper': 2000 }]
+                'logic': {
+                    'selection': {
+                        'peering': {
+                            'networks': [ '192.168.0.0/16' ],
+                            'portranges': [{ 'lower': 1000, 'upper': 2000 }]
+                            }
                         }
                     }
                 }