Signed-off-by: IWASE Yusuke <iwase.yusu...@gmail.com>
---
ryu/services/protocols/bgp/rtconf/base.py | 20 ++++++++++----------
ryu/services/protocols/bgp/rtconf/common.py | 2 +-
ryu/services/protocols/bgp/rtconf/neighbors.py | 8 ++++----
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/ryu/services/protocols/bgp/rtconf/base.py
b/ryu/services/protocols/bgp/rtconf/base.py
index a02a6a7..fdccbd6 100644
--- a/ryu/services/protocols/bgp/rtconf/base.py
+++ b/ryu/services/protocols/bgp/rtconf/base.py
@@ -562,7 +562,7 @@ def validate_conf_desc(description):
@validate(name=ConfWithStats.STATS_LOG_ENABLED)
def validate_stats_log_enabled(stats_log_enabled):
- if stats_log_enabled not in (True, False):
+ if not isinstance(stats_log_enabled, bool):
raise ConfigTypeError(desc='Statistics log enabled settings can only'
' be boolean type.')
return stats_log_enabled
@@ -582,7 +582,7 @@ def validate_stats_time(stats_time):
@validate(name=CAP_REFRESH)
def validate_cap_refresh(crefresh):
- if crefresh not in (True, False):
+ if not isinstance(crefresh, bool):
raise ConfigTypeError(desc='Invalid Refresh capability settings: %s. '
'Boolean value expected' % crefresh)
return crefresh
@@ -590,7 +590,7 @@ def validate_cap_refresh(crefresh):
@validate(name=CAP_ENHANCED_REFRESH)
def validate_cap_enhanced_refresh(cer):
- if cer not in (True, False):
+ if not isinstance(cer, bool):
raise ConfigTypeError(desc='Invalid Enhanced Refresh capability '
'settings: %s. Boolean value expected' % cer)
return cer
@@ -598,7 +598,7 @@ def validate_cap_enhanced_refresh(cer):
@validate(name=CAP_FOUR_OCTET_AS_NUMBER)
def validate_cap_four_octet_as_number(cfoan):
- if cfoan not in (True, False):
+ if not isinstance(cfoan, bool):
raise ConfigTypeError(desc='Invalid Four-Octet AS Number capability '
'settings: %s boolean value expected' % cfoan)
return cfoan
@@ -606,7 +606,7 @@ def validate_cap_four_octet_as_number(cfoan):
@validate(name=CAP_MBGP_IPV4)
def validate_cap_mbgp_ipv4(cmv4):
- if cmv4 not in (True, False):
+ if not isinstance(cmv4, bool):
raise ConfigTypeError(desc='Invalid MP-BGP IPv4 capability '
'settings: %s. Boolean value expected' % cmv4)
@@ -615,7 +615,7 @@ def validate_cap_mbgp_ipv4(cmv4):
@validate(name=CAP_MBGP_IPV6)
def validate_cap_mbgp_ipv6(cmv6):
- if cmv6 not in (True, False):
+ if not isinstance(cmv6, bool):
raise ConfigTypeError(desc='Invalid MP-BGP IPv6 capability '
'settings: %s. Boolean value expected' % cmv6)
@@ -624,7 +624,7 @@ def validate_cap_mbgp_ipv6(cmv6):
@validate(name=CAP_MBGP_VPNV4)
def validate_cap_mbgp_vpnv4(cmv4):
- if cmv4 not in (True, False):
+ if not isinstance(cmv4, bool):
raise ConfigTypeError(desc='Invalid MP-BGP VPNv4 capability '
'settings: %s. Boolean value expected' % cmv4)
@@ -633,7 +633,7 @@ def validate_cap_mbgp_vpnv4(cmv4):
@validate(name=CAP_MBGP_VPNV6)
def validate_cap_mbgp_vpnv6(cmv6):
- if cmv6 not in (True, False):
+ if not isinstance(cmv6, bool):
raise ConfigTypeError(desc='Invalid MP-BGP VPNv6 capability '
'settings: %s. Boolean value expected' % cmv6)
@@ -642,7 +642,7 @@ def validate_cap_mbgp_vpnv6(cmv6):
@validate(name=CAP_MBGP_EVPN)
def validate_cap_mbgp_evpn(cmevpn):
- if cmevpn not in (True, False):
+ if not isinstance(cmevpn, bool):
raise ConfigTypeError(desc='Invalid Ethernet VPN capability '
'settings: %s. Boolean value expected' % cmevpn)
return cmevpn
@@ -650,7 +650,7 @@ def validate_cap_mbgp_evpn(cmevpn):
@validate(name=CAP_RTC)
def validate_cap_rtc(cap_rtc):
- if cap_rtc not in (True, False):
+ if not isinstance(cap_rtc, bool):
raise ConfigTypeError(desc='Invalid type for specifying RTC '
'capability. Expected boolean got: %s' %
type(cap_rtc))
diff --git a/ryu/services/protocols/bgp/rtconf/common.py
b/ryu/services/protocols/bgp/rtconf/common.py
index 5115424..06cee45 100644
--- a/ryu/services/protocols/bgp/rtconf/common.py
+++ b/ryu/services/protocols/bgp/rtconf/common.py
@@ -212,7 +212,7 @@ def validate_bgp_conn_retry_time(bgp_conn_retry_time):
@validate(name=MAX_PATH_EXT_RTFILTER_ALL)
def validate_max_path_ext_rtfilter_all(max_path_ext_rtfilter_all):
- if max_path_ext_rtfilter_all not in (True, False):
+ if not isinstance(max_path_ext_rtfilter_all, bool):
raise ConfigTypeError(desc=('Invalid max_path_ext_rtfilter_all'
' configuration value %s' %
max_path_ext_rtfilter_all))
diff --git a/ryu/services/protocols/bgp/rtconf/neighbors.py
b/ryu/services/protocols/bgp/rtconf/neighbors.py
index c02d1ef..2276c24 100644
--- a/ryu/services/protocols/bgp/rtconf/neighbors.py
+++ b/ryu/services/protocols/bgp/rtconf/neighbors.py
@@ -259,7 +259,7 @@ def validate_attribute_maps(attribute_maps):
@validate(name=IS_ROUTE_SERVER_CLIENT)
def validate_is_route_server_client(is_route_server_client):
- if is_route_server_client not in (True, False):
+ if not isinstance(is_route_server_client, bool):
raise ConfigValueError(desc='Invalid is_route_server_client(%s)' %
is_route_server_client)
@@ -268,7 +268,7 @@ def validate_is_route_server_client(is_route_server_client):
@validate(name=IS_ROUTE_REFLECTOR_CLIENT)
def validate_is_route_reflector_client(is_route_reflector_client):
- if is_route_reflector_client not in (True, False):
+ if not isinstance(is_route_reflector_client, bool):
raise ConfigValueError(desc='Invalid is_route_reflector_client(%s)' %
is_route_reflector_client)
@@ -277,7 +277,7 @@ def
validate_is_route_reflector_client(is_route_reflector_client):
@validate(name=CHECK_FIRST_AS)
def validate_check_first_as(check_first_as):
- if check_first_as not in (True, False):
+ if not isinstance(check_first_as, bool):
raise ConfigValueError(desc='Invalid check_first_as(%s)' %
check_first_as)
@@ -286,7 +286,7 @@ def validate_check_first_as(check_first_as):
@validate(name=IS_NEXT_HOP_SELF)
def validate_is_next_hop_self(is_next_hop_self):
- if is_next_hop_self not in (True, False):
+ if not isinstance(is_next_hop_self, bool):
raise ConfigValueError(desc='Invalid is_next_hop_self(%s)' %
is_next_hop_self)
--
2.7.4
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Ryu-devel mailing list
Ryu-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ryu-devel
