Allowed OIDs to be specified without a leading zero (fixes #15)

easysnmp · Jun 12, 2015 · 4571bf4 · 4571bf4
1 parent 7eb0aa5
commit 4571bf4
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/easysnmp/helpers.py b/easysnmp/helpers.py
@@ -5,13 +5,13 @@
 # This regular expression is used to extract the index from an OID
 OID_INDEX_RE = re.compile(
     r'''(
-            (?:\.\d+)+                   # numeric OID
-            |                            # or
-            (?:\w+(?:[-:]*\w+)+)         # regular OID
-            |                            # or
-            (?:\.iso(?:\.\w+[-:]*\w+)+)  # fully qualified OID
+            \.?\d+(?:\.\d+)*              # numeric OID
+            |                             # or
+            (?:\w+(?:[-:]*\w+)+)          # regular OID
+            |                             # or
+            (?:\.?iso(?:\.\w+[-:]*\w+)+)  # fully qualified OID
         )
-        \.?(.*)                          # OID index
+        \.?(.*)                           # OID index
      ''',
     re.VERBOSE
 )

diff --git a/tests/test_easy.py b/tests/test_easy.py
@@ -79,6 +79,30 @@ def test_snmp_get_fully_qualified_tuple(sess_args):
     'sess_args', [sess_v1_args(), sess_v2_args(), sess_v3_args()]
 )
 def test_snmp_get_numeric(sess_args):
+    res = snmp_get('.1.3.6.1.2.1.1.1.0', **sess_args)
+
+    assert platform.version() in res.value
+    assert res.oid == 'sysDescr'
+    assert res.oid_index == '0'
+    assert res.snmp_type == 'OCTETSTR'
+
+
+@pytest.mark.parametrize(
+    'sess_args', [sess_v1_args(), sess_v2_args(), sess_v3_args()]
+)
+def test_snmp_get_numeric_no_leading_dot(sess_args):
+    res = snmp_get('1.3.6.1.2.1.1.1.0', **sess_args)
+
+    assert platform.version() in res.value
+    assert res.oid == 'sysDescr'
+    assert res.oid_index == '0'
+    assert res.snmp_type == 'OCTETSTR'
+
+
+@pytest.mark.parametrize(
+    'sess_args', [sess_v1_args(), sess_v2_args(), sess_v3_args()]
+)
+def test_snmp_get_numeric_tuple(sess_args):
     res = snmp_get(('.1.3.6.1.2.1.1.1', '0'), **sess_args)
 
     assert platform.version() in res.value