enum overhaul

- move python enums to a proper modul
- pull up OID show and dump flags to the auto.yml
- update APIs and tests to use autogen enums

packages/base/any/onlp/APKG.yml

@@ -27,10 +27,10 @@ packages:
       builds/onlp-platform-defaults/$BUILD_DIR/${TOOLCHAIN}/bin/libonlp-platform-defaults.so : $libdir/
       builds/onlpd/$BUILD_DIR/${TOOLCHAIN}/bin/onlpd : $bindir/
       ${ONL}/packages/base/any/onlp/src/onlpdump.py: $bindir/
-      ${ONL}/packages/base/any/onlp/src/onlp/module/python/onlp/*.py: ${PY_INSTALL}/onlp/
-      ${ONL}/packages/base/any/onlp/src/onlp/module/python/onlp/onlp/*.py: ${PY_INSTALL}/onlp/onlp/
-      ${ONL}/packages/base/any/onlp/src/onlp/module/python/onlp/test/*.py: ${PY_INSTALL}/onlp/test/
-      ${ONL}/packages/base/any/onlp/src/onlplib/module/python/onlp/onlplib/*.py: ${PY_INSTALL}/onlp/onlplib/
+      ${ONL}/packages/base/any/onlp/src/onlp/module/python/onlp/__init__.py: ${PY_INSTALL}/onlp/
+      ${ONL}/packages/base/any/onlp/src/onlp/module/python/onlp/onlp: ${PY_INSTALL}/onlp/onlp
+      ${ONL}/packages/base/any/onlp/src/onlp/module/python/onlp/test: ${PY_INSTALL}/onlp/test
+      ${ONL}/packages/base/any/onlp/src/onlplib/module/python/onlp/onlplib: ${PY_INSTALL}/onlp/onlplib
 
     init: $ONL/packages/base/any/onlp/src/onlpd.init
 

packages/base/any/onlp/src/onlp/module/auto/make.mk

@@ -24,5 +24,5 @@
 ############################################################
 
 onlp_AUTO_DEFS := module/auto/onlp.yml
-onlp_AUTO_DIRS := module/inc/onlp module/src module/py
+onlp_AUTO_DIRS := module/inc/onlp module/src module/python/onlp/onlp
 include $(BUILDER)/auto.mk

packages/base/any/onlp/src/onlp/module/auto/onlp.yml

@@ -109,6 +109,17 @@ oid_types: &oid_types
 - MODULE : 6
 - RTC : 7
 
+# OID dump options
+oid_dump: &oid_dump
+- RECURSE
+- EVEN_IF_ABSENT
+
+# OID show options
+oid_show: &oid_show
+- RECURSE
+- EXTENDED
+- YAML
+
 # SFP Control
 sfp_control: &sfp_control
 - RESET
@@ -255,6 +266,14 @@ definitions:
     onlp_oid_type:
       tag: oid
       members: *oid_types
+    onlp_oid_show:
+      tag: oid
+      members: *oid_show
+      flags: True
+    onlp_oid_dump:
+      tag: oid
+      members: *oid_dump
+      flags: True
     onlp_thermal_status:
       tag: thermal
       members: *thermal_status

packages/base/any/onlp/src/onlp/module/inc/onlp/oids.h

@@ -47,6 +47,19 @@
 typedef uint32_t onlp_oid_t;
 
 /* <auto.start.enum(tag:oid).define> */
+/** onlp_oid_dump */
+typedef enum onlp_oid_dump_e {
+    ONLP_OID_DUMP_RECURSE = (1 << 0),
+    ONLP_OID_DUMP_EVEN_IF_ABSENT = (1 << 1),
+} onlp_oid_dump_t;
+
+/** onlp_oid_show */
+typedef enum onlp_oid_show_e {
+    ONLP_OID_SHOW_RECURSE = (1 << 0),
+    ONLP_OID_SHOW_EXTENDED = (1 << 1),
+    ONLP_OID_SHOW_YAML = (1 << 2),
+} onlp_oid_show_t;
+
 /** onlp_oid_type */
 typedef enum onlp_oid_type_e {
     ONLP_OID_TYPE_SYS = 1,
@@ -121,13 +134,6 @@ typedef struct onlp_oid_hdr_s {
 } onlp_oid_hdr_t;
 
 
-#define ONLP_OID_DUMP_F_RECURSE 0x1
-#define ONLP_OID_DUMP_F_EVEN_IF_ABSENT 0x2
-
-#define ONLP_OID_SHOW_F_RECURSE  0x1
-#define ONLP_OID_SHOW_F_EXTENDED 0x2
-#define ONLP_OID_SHOW_F_YAML     0x4
-
 void onlp_oid_dump(onlp_oid_t oid, aim_pvs_t* pvs, uint32_t flags);
 void onlp_oid_table_dump(onlp_oid_table_t table, aim_pvs_t* pvs,
                          uint32_t flags);
@@ -199,6 +205,48 @@ int onlp_oid_hdr_get(onlp_oid_t oid, onlp_oid_hdr_t* hdr);
  *
  *****************************************************************************/
 /* <auto.start.enum(tag:oid).supportheader> */
+/** Enum names. */
+const char* onlp_oid_dump_name(onlp_oid_dump_t e);
+
+/** Enum values. */
+int onlp_oid_dump_value(const char* str, onlp_oid_dump_t* e, int substr);
+
+/** Enum descriptions. */
+const char* onlp_oid_dump_desc(onlp_oid_dump_t e);
+
+/** Enum validator. */
+int onlp_oid_dump_valid(onlp_oid_dump_t e);
+
+/** validator */
+#define ONLP_OID_DUMP_VALID(_e) \
+    (onlp_oid_dump_valid((_e)))
+
+/** onlp_oid_dump_map table. */
+extern aim_map_si_t onlp_oid_dump_map[];
+/** onlp_oid_dump_desc_map table. */
+extern aim_map_si_t onlp_oid_dump_desc_map[];
+
+/** Enum names. */
+const char* onlp_oid_show_name(onlp_oid_show_t e);
+
+/** Enum values. */
+int onlp_oid_show_value(const char* str, onlp_oid_show_t* e, int substr);
+
+/** Enum descriptions. */
+const char* onlp_oid_show_desc(onlp_oid_show_t e);
+
+/** Enum validator. */
+int onlp_oid_show_valid(onlp_oid_show_t e);
+
+/** validator */
+#define ONLP_OID_SHOW_VALID(_e) \
+    (onlp_oid_show_valid((_e)))
+
+/** onlp_oid_show_map table. */
+extern aim_map_si_t onlp_oid_show_map[];
+/** onlp_oid_show_desc_map table. */
+extern aim_map_si_t onlp_oid_show_desc_map[];
+
 /** Enum names. */
 const char* onlp_oid_type_name(onlp_oid_type_t e);
 

packages/base/any/onlp/src/onlp/module/inc/onlp/onlp.x

@@ -48,6 +48,8 @@ ONLP_ENUMERATION_ENTRY(onlp_fan_status, "")
 ONLP_ENUMERATION_ENTRY(onlp_led_caps, "")
 ONLP_ENUMERATION_ENTRY(onlp_led_mode, "")
 ONLP_ENUMERATION_ENTRY(onlp_led_status, "")
+ONLP_ENUMERATION_ENTRY(onlp_oid_dump, "")
+ONLP_ENUMERATION_ENTRY(onlp_oid_show, "")
 ONLP_ENUMERATION_ENTRY(onlp_oid_type, "")
 ONLP_ENUMERATION_ENTRY(onlp_psu_caps, "")
 ONLP_ENUMERATION_ENTRY(onlp_psu_status, "")

packages/base/any/onlp/src/onlp/module/python/onlp/onlp/__init__.py

@@ -12,6 +12,8 @@ libc = ctypes.cdll.LoadLibrary(ctypes.util.find_library("c"))
 
 import onlp.onlplib
 
+from onlp.onlp.enums import *
+
 # AIM/aim_memory.h
 
 class aim_void_p(ctypes.c_void_p):
@@ -113,27 +115,11 @@ def aim_pvs_init_prototypes():
 
 onlp_oid = ctypes.c_uint
 
-ONLP_OID_TYPE_SYS = 1
-ONLP_OID_TYPE_THERMAL = 2
-ONLP_OID_TYPE_FAN = 3
-ONLP_OID_TYPE_PSU = 4
-ONLP_OID_TYPE_LED = 5
-ONLP_OID_TYPE_MODULE = 6
-ONLP_OID_TYPE_RTC = 7
-# XXX roth waiting for enum generator
-
-ONLP_OID_SYS = (ONLP_OID_TYPE_SYS<<24) | 1
+ONLP_OID_SYS = (ONLP_OID_TYPE.SYS<<24) | 1
 
 ONLP_OID_DESC_SIZE = 128
 ONLP_OID_TABLE_SIZE = 32
 
-ONLP_OID_DUMP_F_RECURSE = 0x1
-ONLP_OID_DUMP_F_EVEN_IF_ABSENT = 0x2
-
-ONLP_OID_SHOW_F_RECURSE = 0x1
-ONLP_OID_SHOW_F_EXTENDED = 0x2
-ONLP_OID_SHOW_F_YAML = 0x4
-
 class OidTableIterator(object):
 
     def __init__(self, hdr):
@@ -165,19 +151,19 @@ class onlp_oid_hdr(ctypes.Structure):
         return self._id >> 24
 
     def isSystem(self):
-        return self.getType() == ONLP_OID_TYPE_SYS
+        return self.getType() == ONLP_OID_TYPE.SYS
     def isThermal(self):
-        return self.getType() == ONLP_OID_TYPE_THERMAL
+        return self.getType() == ONLP_OID_TYPE.THERMAL
     def isFan(self):
-        return self.getType() == ONLP_OID_TYPE_FAN
+        return self.getType() == ONLP_OID_TYPE.FAN
     def isPsu(self):
-        return self.getType() == ONLP_OID_TYPE_PSU
+        return self.getType() == ONLP_OID_TYPE.PSU
     def isLed(self):
-        return self.getType() == ONLP_OID_TYPE_LED
+        return self.getType() == ONLP_OID_TYPE.LED
     def isModule(self):
-        return self.getType() == ONLP_OID_TYPE_MODULE
+        return self.getType() == ONLP_OID_TYPE.MODULE
     def isRtc(self):
-        return self.getType() == ONLP_OID_TYPE_RTC
+        return self.getType() == ONLP_OID_TYPE.RTC
 
     def children(self):
         return OidTableIterator(self)
@@ -201,11 +187,9 @@ def onlp_oid_init_prototypes():
     libonlp.onlp_oid_iterate.restype = ctypes.c_int
     libonlp.onlp_oid_iterate.argtypes = (onlp_oid, ctypes.c_int,
                                          onlp_oid_iterate_f, ctypes.c_void_p,)
-    # XXX enum
 
     libonlp.onlp_oid_hdr_get.restype = ctypes.c_int
     libonlp.onlp_oid_hdr_get.argtypes = (onlp_oid, ctypes.POINTER(onlp_oid_hdr,))
-    # XXX enum
 
 # onlp/sys.h
 
@@ -262,10 +246,6 @@ def onlp_sys_init_prototypes():
 
 # onlp/onlp.h
 
-ONLP_STATUS_OK = 0
-ONLP_STATUS_E_UNSUPPORTED = -10
-# XXX roth
-
 def onlp_init():
     libonlp.onlp_init()
     aim_memory_init_prototypes()

packages/base/any/onlp/src/onlp/module/python/onlp/onlp/enums.py

@@ -88,6 +88,17 @@ class ONLP_LED_STATUS(Enumeration):
     ON = (1 << 2)
 
 
+class ONLP_OID_DUMP(Enumeration):
+    RECURSE = (1 << 0)
+    EVEN_IF_ABSENT = (1 << 1)
+
+
+class ONLP_OID_SHOW(Enumeration):
+    RECURSE = (1 << 0)
+    EXTENDED = (1 << 1)
+    YAML = (1 << 2)
+
+
 class ONLP_OID_TYPE(Enumeration):
     SYS = 1
     THERMAL = 2

packages/base/any/onlp/src/onlp/module/python/onlp/test/OnlpApiTest.py

@@ -96,14 +96,14 @@ class OnlpTest(OnlpTestMixin,
 
         libonlp.aim_pvs_buffer_reset(self.aim_pvs_buffer_p)
 
-        flags = onlp.onlp.ONLP_OID_DUMP_F_RECURSE
+        flags = onlp.onlp.ONLP_OID_DUMP.RECURSE
         libonlp.onlp_platform_dump(self.aim_pvs_buffer_p, flags)
         buf = libonlp.aim_pvs_buffer_get(self.aim_pvs_buffer_p)
         bufStr = buf.string_at()
         self.assertIn("psu @ 1", bufStr)
         self.assertIn("PSU-1 Fan", bufStr)
 
-        # hard to test onlp.onlp.ONLP_OID_DUMP_F_RECURSE,
+        # hard to test onlp.onlp.ONLP_OID_DUMP.RECURSE,
         # since it depends on whether a specific component is inserted
 
     def testPlatformShow(self):
@@ -127,7 +127,7 @@ class OnlpTest(OnlpTestMixin,
 
         libonlp.aim_pvs_buffer_reset(self.aim_pvs_buffer_p)
 
-        flags = onlp.onlp.ONLP_OID_SHOW_F_RECURSE
+        flags = onlp.onlp.ONLP_OID_SHOW.RECURSE
         libonlp.onlp_platform_show(self.aim_pvs_buffer_p, flags)
         buf = libonlp.aim_pvs_buffer_get(self.aim_pvs_buffer_p)
         bufStr = buf.string_at()
@@ -152,36 +152,22 @@ class SysHdrMixin(object):
         self.assert_(len(coids) < onlp.onlp.ONLP_OID_TABLE_SIZE)
 
         def _oidType(oid):
-            if oid.isSystem():
-                return "sys"
-            if oid.isThermal():
-                return "thm"
-            if oid.isFan():
-                return "fan"
-            if oid.isPsu():
-                return "psu"
-            if oid.isLed():
-                return "led"
-            if oid.isModule():
-                return "mod"
-            if oid.isRtc():
-                return "rtc"
-            return "unk"
+            return onlp.onlp.ONLP_OID_TYPE.name(oid._id>>24)
 
         for coid in coids:
             self.log.info("oid %d (%s): %s",
                           coid._id, _oidType(coid), coid.description)
-            if _oidType(coid) == "unk":
+            if _oidType(coid) is None:
                 raise AssertionError("invalid oid")
             self.assertEqual(hdr._id, coid.poid)
 
             # if it's a PSU, verify that it has fans
-            if _oidType(coid) == "psu":
+            if _oidType(coid) == "PSU":
                 foids = [x for x in coid.children()]
                 for foid in foids:
                     self.log.info("oid %d (%s): %s",
                                   foid._id, _oidType(foid), foid.description)
-                    self.assertEqual("fan", _oidType(foid))
+                    self.assertEqual("FAN", _oidType(foid))
                     # parent should the the PSU or the chassis
                     if coid._id == foid.poid:
                         pass
@@ -309,7 +295,7 @@ class SysTest(OnlpTestMixin,
         # no such ioctl
 
         code = libonlp.onlp_sys_ioctl(9999)
-        self.assertEqual(onlp.onlp.ONLP_STATUS_E_UNSUPPORTED, code)
+        self.assertEqual(onlp.onlp.ONLP_STATUS.E_UNSUPPORTED, code)
 
 class OidTest(OnlpTestMixin,
               SysHdrMixin,
@@ -338,7 +324,7 @@ class OidTest(OnlpTestMixin,
                 self.log = log or logging.getLogger("visit")
 
             def visit(self, oid, cookie):
-                return 0
+                return onlp.onlp.ONLP_STATUS.E_OK
 
             def cvisit(self):
                 def _v(oid, cookie):
@@ -346,7 +332,7 @@ class OidTest(OnlpTestMixin,
                         return self.visit(oid, cookie)
                     except:
                         self.log.exception("visitor failed")
-                        return -1
+                        return onlp.onlp.ONLP_STATUS.E_GENERIC
                 return onlp.onlp.onlp_oid_iterate_f(_v)
 
         class V1(OidIterator):
@@ -361,7 +347,7 @@ class OidTest(OnlpTestMixin,
                     raise AssertionError("invalid cookie")
                 self.log.info("found oid %d", oid)
                 self.oids.append(oid)
-                return 0
+                return onlp.onlp.ONLP_STATUS.E_OK
 
         oidType = 0
         cookie = 0xdeadbeef
@@ -389,10 +375,10 @@ class OidTest(OnlpTestMixin,
 
             def visit(self, oid, cookie):
                 if oid == cookie:
-                    return -1
+                    return onlp.onlp.ONLP_STATUS.E_GENERIC
                 self.log.info("found oid %d", oid)
                 self.oids.append(oid)
-                return 0
+                return onlp.onlp.ONLP_STATUS.E_OK
 
         v3 = V3(log=self.log.getChild("v3"))
         cookie = oids[4]

packages/base/any/onlp/src/onlp/module/src/fan.c

@@ -281,7 +281,7 @@ onlp_fan_show(onlp_oid_t oid, aim_pvs_t* pvs, uint32_t flags)
 
     rv = onlp_fan_info_get(oid, &fi);
 
-    yaml = flags & ONLP_OID_SHOW_F_YAML;
+    yaml = flags & ONLP_OID_SHOW_YAML;
 
     if(yaml) {
         iof_push(&iof, "- ");

packages/base/any/onlp/src/onlp/module/src/led.c

@@ -215,7 +215,7 @@ onlp_led_show(onlp_oid_t id, aim_pvs_t* pvs, uint32_t flags)
     VALIDATENR(id);
     onlp_oid_show_iof_init_default(&iof, pvs, flags);
 
-    yaml = flags & ONLP_OID_SHOW_F_YAML;
+    yaml = flags & ONLP_OID_SHOW_YAML;
 
     if(yaml) {
         iof_push(&iof, " -");

packages/base/any/onlp/src/onlp/module/src/onlp_enums.c

@@ -519,6 +519,128 @@ onlp_led_status_valid(onlp_led_status_t e)
 }
 
 
+aim_map_si_t onlp_oid_dump_map[] =
+{
+    { "RECURSE", ONLP_OID_DUMP_RECURSE },
+    { "EVEN_IF_ABSENT", ONLP_OID_DUMP_EVEN_IF_ABSENT },
+    { NULL, 0 }
+};
+
+aim_map_si_t onlp_oid_dump_desc_map[] =
+{
+    { "None", ONLP_OID_DUMP_RECURSE },
+    { "None", ONLP_OID_DUMP_EVEN_IF_ABSENT },
+    { NULL, 0 }
+};
+
+const char*
+onlp_oid_dump_name(onlp_oid_dump_t e)
+{
+    const char* name;
+    if(aim_map_si_i(&name, e, onlp_oid_dump_map, 0)) {
+        return name;
+    }
+    else {
+        return "-invalid value for enum type 'onlp_oid_dump'";
+    }
+}
+
+int
+onlp_oid_dump_value(const char* str, onlp_oid_dump_t* e, int substr)
+{
+    int i;
+    AIM_REFERENCE(substr);
+    if(aim_map_si_s(&i, str, onlp_oid_dump_map, 0)) {
+        /* Enum Found */
+        *e = i;
+        return 0;
+    }
+    else {
+        return -1;
+    }
+}
+
+const char*
+onlp_oid_dump_desc(onlp_oid_dump_t e)
+{
+    const char* name;
+    if(aim_map_si_i(&name, e, onlp_oid_dump_desc_map, 0)) {
+        return name;
+    }
+    else {
+        return "-invalid value for enum type 'onlp_oid_dump'";
+    }
+}
+
+int
+onlp_oid_dump_valid(onlp_oid_dump_t e)
+{
+    return aim_map_si_i(NULL, e, onlp_oid_dump_map, 0) ? 1 : 0;
+}
+
+
+aim_map_si_t onlp_oid_show_map[] =
+{
+    { "RECURSE", ONLP_OID_SHOW_RECURSE },
+    { "EXTENDED", ONLP_OID_SHOW_EXTENDED },
+    { "YAML", ONLP_OID_SHOW_YAML },
+    { NULL, 0 }
+};
+
+aim_map_si_t onlp_oid_show_desc_map[] =
+{
+    { "None", ONLP_OID_SHOW_RECURSE },
+    { "None", ONLP_OID_SHOW_EXTENDED },
+    { "None", ONLP_OID_SHOW_YAML },
+    { NULL, 0 }
+};
+
+const char*
+onlp_oid_show_name(onlp_oid_show_t e)
+{
+    const char* name;
+    if(aim_map_si_i(&name, e, onlp_oid_show_map, 0)) {
+        return name;
+    }
+    else {
+        return "-invalid value for enum type 'onlp_oid_show'";
+    }
+}
+
+int
+onlp_oid_show_value(const char* str, onlp_oid_show_t* e, int substr)
+{
+    int i;
+    AIM_REFERENCE(substr);
+    if(aim_map_si_s(&i, str, onlp_oid_show_map, 0)) {
+        /* Enum Found */
+        *e = i;
+        return 0;
+    }
+    else {
+        return -1;
+    }
+}
+
+const char*
+onlp_oid_show_desc(onlp_oid_show_t e)
+{
+    const char* name;
+    if(aim_map_si_i(&name, e, onlp_oid_show_desc_map, 0)) {
+        return name;
+    }
+    else {
+        return "-invalid value for enum type 'onlp_oid_show'";
+    }
+}
+
+int
+onlp_oid_show_valid(onlp_oid_show_t e)
+{
+    return aim_map_si_i(NULL, e, onlp_oid_show_map, 0) ? 1 : 0;
+}
+
+
 aim_map_si_t onlp_oid_type_map[] =
 {
     { "SYS", ONLP_OID_TYPE_SYS },

packages/base/any/onlp/src/onlp/module/src/onlp_main.c

@@ -203,8 +203,8 @@ onlpdump_main(int argc, char* argv[])
         switch(c)
             {
             case 's': show=1; break;
-            case 'r': show=1; showflags |= ONLP_OID_SHOW_F_RECURSE; break;
-            case 'e': show=1; showflags |= ONLP_OID_SHOW_F_EXTENDED; break;
+            case 'r': show=1; showflags |= ONLP_OID_SHOW_RECURSE; break;
+            case 'e': show=1; showflags |= ONLP_OID_SHOW_EXTENDED; break;
             case 'd': show=0; break;
             case 'h': help=1; rv = 0; break;
             case 'j': j=1; break;
@@ -220,7 +220,7 @@ onlpdump_main(int argc, char* argv[])
             case 'l': l=1; break;
             case 'b': b=1; break;
             case 'J': J = optarg; break;
-            case 'y': show=1; showflags |= ONLP_OID_SHOW_F_YAML; break;
+            case 'y': show=1; showflags |= ONLP_OID_SHOW_YAML; break;
             default: help=1; rv = 1; break;
             }
     }
@@ -305,8 +305,8 @@ onlpdump_main(int argc, char* argv[])
         int oid;
         if(sscanf(O, "0x%x", &oid) == 1) {
             onlp_oid_dump(oid, &aim_pvs_stdout,
-                          ONLP_OID_DUMP_F_RECURSE |
-                          ONLP_OID_DUMP_F_EVEN_IF_ABSENT);
+                          ONLP_OID_DUMP_RECURSE |
+                          ONLP_OID_DUMP_EVEN_IF_ABSENT);
         }
         return 0;
     }
@@ -349,7 +349,7 @@ onlpdump_main(int argc, char* argv[])
         if(show == 0) {
             /* Default to full dump */
             onlp_platform_dump(&aim_pvs_stdout,
-                               ONLP_OID_DUMP_F_RECURSE | ONLP_OID_DUMP_F_EVEN_IF_ABSENT);
+                               ONLP_OID_DUMP_RECURSE | ONLP_OID_DUMP_EVEN_IF_ABSENT);
         }
         else {
             onlp_platform_show(&aim_pvs_stdout,

packages/base/any/onlp/src/onlp/module/src/psu.c

@@ -143,7 +143,7 @@ onlp_psu_dump(onlp_oid_t id, aim_pvs_t* pvs, uint32_t flags)
             iof_iprintf(&iof, "Iout:   %d", info.miout);
             iof_iprintf(&iof, "Pin:    %d", info.mpin);
             iof_iprintf(&iof, "Pout:   %d", info.mpout);
-            if(flags & ONLP_OID_DUMP_F_RECURSE) {
+            if(flags & ONLP_OID_DUMP_RECURSE) {
                 onlp_oid_table_dump(info.hdr.coids, &iof.inherit, flags);
             }
         }
@@ -165,7 +165,7 @@ onlp_psu_show(onlp_oid_t id, aim_pvs_t* pvs, uint32_t flags)
     onlp_oid_show_iof_init_default(&iof, pvs, flags);
     rv = onlp_psu_info_get(id, &pi);
 
-    yaml = flags & ONLP_OID_SHOW_F_YAML;
+    yaml = flags & ONLP_OID_SHOW_YAML;
 
     if(yaml) {
         iof_push(&iof, "- ");
@@ -235,7 +235,7 @@ onlp_psu_show(onlp_oid_t id, aim_pvs_t* pvs, uint32_t flags)
                                 ONLP_MILLI_NORMAL_INTEGER_TENTHS(pi.mpout));
                 }
 
-                if(flags & ONLP_OID_SHOW_F_RECURSE) {
+                if(flags & ONLP_OID_SHOW_RECURSE) {
                     /*
                      * Display sub oids.
                      *
@@ -264,7 +264,7 @@ onlp_psu_show(onlp_oid_t id, aim_pvs_t* pvs, uint32_t flags)
                         iof_pop(&iof);
                     }
 
-                    if(flags & ONLP_OID_SHOW_F_EXTENDED) {
+                    if(flags & ONLP_OID_SHOW_EXTENDED) {
                         /* Include all other types as well. */
                         ONLP_OID_TABLE_ITER_TYPE(pi.hdr.coids, oidp, LED) {
                             onlp_oid_show(*oidp, &iof.inherit, flags);

packages/base/any/onlp/src/onlp/module/src/sys.c

@@ -214,7 +214,7 @@ onlp_sys_show(onlp_oid_t id, aim_pvs_t* pvs, uint32_t flags)
     int yaml;
 
     onlp_oid_show_iof_init_default(&iof, pvs, flags);
-    yaml = (flags & ONLP_OID_SHOW_F_YAML);
+    yaml = (flags & ONLP_OID_SHOW_YAML);
 
     if(id && ONLP_OID_TYPE_GET(id) != ONLP_OID_TYPE_SYS) {
         return;
@@ -234,14 +234,14 @@ onlp_sys_show(onlp_oid_t id, aim_pvs_t* pvs, uint32_t flags)
      * unless you specify EXTENDED or !RECURSIVE
      */
     if(yaml ||
-       flags & ONLP_OID_SHOW_F_EXTENDED ||
-       (flags & ONLP_OID_SHOW_F_RECURSE) == 0) {
+       flags & ONLP_OID_SHOW_EXTENDED ||
+       (flags & ONLP_OID_SHOW_RECURSE) == 0) {
         iof_push(&iof, "System Information:");
         onlp_onie_show(&si.onie_info, &iof.inherit);
         iof_pop(&iof);
     }
 
-    if(flags & ONLP_OID_SHOW_F_RECURSE) {
+    if(flags & ONLP_OID_SHOW_RECURSE) {
 
         onlp_oid_t* oidp;
 
@@ -266,7 +266,7 @@ onlp_sys_show(onlp_oid_t id, aim_pvs_t* pvs, uint32_t flags)
         }
         YPOP();
 
-        if(flags & ONLP_OID_SHOW_F_EXTENDED) {
+        if(flags & ONLP_OID_SHOW_EXTENDED) {
             /** Show all LEDs */
             YPUSH("LEDs:");
             ONLP_OID_TABLE_ITER_TYPE(si.hdr.coids, oidp, LED) {

packages/base/any/onlp/src/onlp/module/src/thermal.c

@@ -202,7 +202,7 @@ onlp_thermal_show(onlp_oid_t id, aim_pvs_t* pvs, uint32_t flags)
 
     rv = onlp_thermal_info_get(id, &ti);
 
-    yaml = flags & ONLP_OID_SHOW_F_YAML;
+    yaml = flags & ONLP_OID_SHOW_YAML;
 
     if(yaml) {
         iof_push(&iof, "- ");

packages/base/any/onlp/src/onlp/utest/main.c

@@ -115,9 +115,9 @@ aim_main(int argc, char* argv[])
 
     /* Example Platform Dump */
     onlp_init();
-    onlp_platform_dump(&aim_pvs_stdout, ONLP_OID_DUMP_F_RECURSE);
+    onlp_platform_dump(&aim_pvs_stdout, ONLP_OID_DUMP_RECURSE);
     onlp_oid_iterate(0, 0, iter__, NULL);
-    onlp_platform_show(&aim_pvs_stdout, ONLP_OID_SHOW_F_RECURSE|ONLP_OID_SHOW_F_EXTENDED);
+    onlp_platform_show(&aim_pvs_stdout, ONLP_OID_SHOW_RECURSE|ONLP_OID_SHOW_EXTENDED);
 
     if(argv[1] && !strcmp("manage", argv[1])) {
         onlp_sys_platform_manage_start();

packages/base/any/onlp/src/onlpdump.py

@@ -30,7 +30,7 @@ pdb.set_trace()
 
 ##libonlp.onlp_onie_show(byref(si.onie_info), byref(libonlp.aim_pvs_stdout))
 libonlp.onlp_platform_dump(libonlp.aim_pvs_stdout,
-                           (onlp.onlp.ONLP_OID_DUMP_F_RECURSE
-                            | onlp.onlp.ONLP_OID_DUMP_F_EVEN_IF_ABSENT))
+                           (onlp.onlp.ONLP_OID_DUMP.RECURSE
+                            | onlp.onlp.ONLP_OID_DUMP.EVEN_IF_ABSENT))
 
 sys.exit(0)

packages/base/any/oom-shim/src/utest/main.c

@@ -115,9 +115,9 @@ aim_main(int argc, char* argv[])
 
     /* Example Platform Dump */
     onlp_init();
-    onlp_platform_dump(&aim_pvs_stdout, ONLP_OID_DUMP_F_RECURSE);
+    onlp_platform_dump(&aim_pvs_stdout, ONLP_OID_DUMP_RECURSE);
     onlp_oid_iterate(0, 0, iter__, NULL);
-    onlp_platform_show(&aim_pvs_stdout, ONLP_OID_SHOW_F_RECURSE|ONLP_OID_SHOW_F_EXTENDED);
+    onlp_platform_show(&aim_pvs_stdout, ONLP_OID_SHOW_RECURSE|ONLP_OID_SHOW_EXTENDED);
 
     if(argv[1] && !strcmp("manage", argv[1])) {
         onlp_sys_platform_manage_start();