ofctl_utils: Enhance user value conversion

Currently, OFCtlUtil._reserved_num_from_user() fails to convert
an user specified value when it is a numeric string.
This patch enhances this conversion to enable to convert an user
value as follows.

e.g.)
 - Integer: 1 -> 1
 - Numeric string: "1" -> 1
 - Reserved number: "OFPP_ANY" -> 0xffffffff
 - Invalid value: "foobar" -> "foobar" (do not conversion)

Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>

1 files changed, 12 insertions, 7 deletions

diff --git a/ryu/lib/ofctl_utils.py b/ryu/lib/ofctl_utils.py
index b5fbc9b8..832baf0b 100644
--- a/ryu/lib/ofctl_utils.py
+++ b/ryu/lib/ofctl_utils.py
@@ -240,13 +240,18 @@ class OFCtlUtil(object):
             'OFPQCFC_EPERM']
 
     def _reserved_num_from_user(self, num, prefix):
-        if isinstance(num, int):
-            return num
-        else:
-            if num.startswith(prefix):
-                return getattr(self.ofproto, num)
-            else:
-                return getattr(self.ofproto, prefix + num.upper())
+        try:
+            return str_to_int(num)
+        except ValueError:
+            try:
+                if num.startswith(prefix):
+                    return getattr(self.ofproto, num.upper())
+                else:
+                    return getattr(self.ofproto, prefix + num.upper())
+            except AttributeError:
+                LOG.warning(
+                    "Cannot convert argument to reserved number: %s", num)
+        return num
 
     def _reserved_num_to_user(self, num, prefix):
         for k, v in self.ofproto.__dict__.items():