Implemented OrderedDict in iwconfig, closes #36

netengine/utils/ifconfig.py

@@ -1,6 +1,7 @@
 import re
 import json
 import ipaddress
+from collections import OrderedDict
 
 
 class IfConfig(object):

netengine/utils/iwconfig.py

@@ -1,5 +1,6 @@
 import re
 import json
+from collections import OrderedDict
 
 
 class IwConfig(object):
@@ -26,7 +27,7 @@ def __init__(self, output):
                 self.interfaces.append(self._parse_block(block))
 
     def _parse_block(self, output):
-        result = {}
+        result = OrderedDict()
         lines = output.split('\n')
         # first line is special, split it in parts,
         # use double whitespace as delimeter
@@ -60,22 +61,22 @@ def to_netjson(self, python=False, **kwargs):
         """ convert to netjson format """
         result = []
         for i in self.interfaces:
-            wireless = {
-                'bitrate': i.get('bit_rate'),
-                'standard': i.get('ieee'),
-                'essid': i.get('essid'),
-                'mode': self.MODE_MAP.get(i['mode']),
-                'rts_threshold': i.get('rts_thr'),
-                'frag_threshold': i.get('fragment_thr')
-            }
+            wireless = OrderedDict((
+                ('bitrate', i.get('bit_rate')),
+                ('standard', i.get('ieee')),
+                ('essid', i.get('essid')),
+                ('mode', self.MODE_MAP.get(i['mode'])),
+                ('rts_threshold', i.get('rts_thr')),
+                ('frag_threshold', i.get('fragment_thr'))
+            ))
             if 'encryption_key' in i:
                 wireless['encryption'] = i['encryption_key'] != 'off'
-            
-            result.append({
-                'name': i['name'],
-                'mac': i['access_point'],
-                'wireless': wireless
-            })
+
+            result.append(OrderedDict((
+                ('name', i['name']),
+                ('mac', i['access_point']),
+                ('wireless', wireless)
+            )))
         # can return both python and json
         if python:
             return result

tests/utils/iwconfig.py

@@ -1,5 +1,6 @@
 import unittest
 import json
+from collections import OrderedDict
 
 from netengine.utils.iwconfig import IwConfig
 
@@ -32,12 +33,11 @@ def test_openwrt_backfire(self):
           Tx excessive retries:3  Invalid misc:4   Missed beacon:5
 
 setup00   no wireless extensions."""
-
         i = IwConfig(output).to_python()
 
         self.assertEqual(len(i), 1)
         self.assertEqual(len(i[0].keys()), 21)
-        self.assertTrue(type(i[0]) is dict)
+        self.assertTrue(type(i[0]) is OrderedDict)
         self.assertEqual(i[0]['name'], 'r11v16')
         self.assertEqual(i[0]['ieee'], '802.11g')
         self.assertEqual(i[0]['essid'], 'ExampleWifi')
@@ -85,6 +85,13 @@ def test_to_netjson(self):
           Link Quality=69/70  Signal level=-27 dBm  Noise level=-96 dBm
           Rx invalid nwid:630390  Rx invalid crypt:1  Rx invalid frag:2
           Tx excessive retries:3  Invalid misc:4   Missed beacon:5"""
+
+        i = IwConfig(output).to_netjson(python=True)
+        self.assertEqual(len(i), 1)
+        self.assertTrue(type(i[0]) is OrderedDict)
+        self.assertEqual(len(i[0].keys()), 3)
+        self.assertEqual(len(i[0]['wireless'].keys()), 7)
+
         json_output = IwConfig(output).to_netjson()
         i = json.loads(json_output)
         self.assertEqual(len(i), 1)