From fce2d839277958593e5a6a2377cfdaa778f3fa97 Mon Sep 17 00:00:00 2001
From: Jonathan Hui <jonhui@nestlabs.com>
Date: Wed, 24 May 2017 08:34:49 -0700
Subject: [PATCH] Clean up route preference names. (#1810)

---
 .../drivers/windows/otNodeApi/otNodeApi.cpp    | 12 ++++++------
 include/openthread/types.h                     |  6 +++---
 src/cli/cli.cpp                                | 18 +++++++++---------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/examples/drivers/windows/otNodeApi/otNodeApi.cpp b/examples/drivers/windows/otNodeApi/otNodeApi.cpp
index ea9bb1664..24f5c745c 100644
--- a/examples/drivers/windows/otNodeApi/otNodeApi.cpp
+++ b/examples/drivers/windows/otNodeApi/otNodeApi.cpp
@@ -1596,15 +1596,15 @@ OTNODEAPI int32_t OTCALL otNodeAddPrefix(otNode* aNode, const char *aPrefix, con
     
     if (strcmp(aPreference, "high") == 0)
     {
-        config.mPreference = kRoutePreferenceHigh;
+        config.mPreference = OT_ROUTE_PREFERENCE_HIGH;
     }
     else if (strcmp(aPreference, "med") == 0)
     {
-        config.mPreference = kRoutePreferenceMedium;
+        config.mPreference = OT_ROUTE_PREFERENCE_MED;
     }
     else if (strcmp(aPreference, "low") == 0)
     {
-        config.mPreference = kRoutePreferenceLow;
+        config.mPreference = OT_ROUTE_PREFERENCE_LOW;
     }
     else
     {
@@ -1639,15 +1639,15 @@ OTNODEAPI int32_t OTCALL otNodeAddRoute(otNode* aNode, const char *aPrefix, cons
     
     if (strcmp(aPreference, "high") == 0)
     {
-        config.mPreference = kRoutePreferenceHigh;
+        config.mPreference = OT_ROUTE_PREFERENCE_HIGH;
     }
     else if (strcmp(aPreference, "med") == 0)
     {
-        config.mPreference = kRoutePreferenceMedium;
+        config.mPreference = OT_ROUTE_PREFERENCE_MED;
     }
     else if (strcmp(aPreference, "low") == 0)
     {
-        config.mPreference = kRoutePreferenceLow;
+        config.mPreference = OT_ROUTE_PREFERENCE_LOW;
     }
     else
     {
diff --git a/include/openthread/types.h b/include/openthread/types.h
index d96963d1c..34efbfbc3 100644
--- a/include/openthread/types.h
+++ b/include/openthread/types.h
@@ -762,9 +762,9 @@ typedef struct otExternalRouteConfig
  */
 typedef enum otRoutePreference
 {
-    kRoutePreferenceLow    = -1,  ///< Routes assigned this value are used as a last resort when no other more preferred route exists.
-    kRoutePreferenceMedium =  0,  ///< Routes assigned this value should be selected only in the absence of any kRoutePreferenceHigh routes.
-    kRoutePreferenceHigh   =  1   ///< The most preferred route. Routes assigned this value should be selected over any other route.
+    OT_ROUTE_PREFERENCE_LOW  = -1,  ///< Low route preference.
+    OT_ROUTE_PREFERENCE_MED  = 0,   ///< Medium route preference.
+    OT_ROUTE_PREFERENCE_HIGH = 1,   ///< High route preference.
 } otRoutePreference;
 
 /**
diff --git a/src/cli/cli.cpp b/src/cli/cli.cpp
index 6eed023bf..4e9d48d9a 100644
--- a/src/cli/cli.cpp
+++ b/src/cli/cli.cpp
@@ -1820,15 +1820,15 @@ otError Interpreter::ProcessPrefixAdd(int argc, char *argv[])
     {
         if (strcmp(argv[argcur], "high") == 0)
         {
-            config.mPreference = kRoutePreferenceHigh;
+            config.mPreference = OT_ROUTE_PREFERENCE_HIGH;
         }
         else if (strcmp(argv[argcur], "med") == 0)
         {
-            config.mPreference = kRoutePreferenceMedium;
+            config.mPreference = OT_ROUTE_PREFERENCE_MED;
         }
         else if (strcmp(argv[argcur], "low") == 0)
         {
-            config.mPreference = kRoutePreferenceLow;
+            config.mPreference = OT_ROUTE_PREFERENCE_LOW;
         }
         else
         {
@@ -1962,15 +1962,15 @@ otError Interpreter::ProcessPrefixList(void)
 
         switch (config.mPreference)
         {
-        case kRoutePreferenceLow:
+        case OT_ROUTE_PREFERENCE_LOW:
             sServer->OutputFormat(" low\r\n");
             break;
 
-        case kRoutePreferenceMedium:
+        case OT_ROUTE_PREFERENCE_MED:
             sServer->OutputFormat(" med\r\n");
             break;
 
-        case kRoutePreferenceHigh:
+        case OT_ROUTE_PREFERENCE_HIGH:
             sServer->OutputFormat(" high\r\n");
             break;
         }
@@ -2074,15 +2074,15 @@ otError Interpreter::ProcessRouteAdd(int argc, char *argv[])
         }
         else if (strcmp(argv[argcur], "high") == 0)
         {
-            config.mPreference = kRoutePreferenceHigh;
+            config.mPreference = OT_ROUTE_PREFERENCE_HIGH;
         }
         else if (strcmp(argv[argcur], "med") == 0)
         {
-            config.mPreference = kRoutePreferenceMedium;
+            config.mPreference = OT_ROUTE_PREFERENCE_MED;
         }
         else if (strcmp(argv[argcur], "low") == 0)
         {
-            config.mPreference = kRoutePreferenceLow;
+            config.mPreference = OT_ROUTE_PREFERENCE_LOW;
         }
         else
         {