diff options
| -rw-r--r-- | ryu/services/protocols/bgp/application.py | 4 | ||||
| -rw-r--r-- | ryu/services/protocols/bgp/rtconf/neighbors.py | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ryu/services/protocols/bgp/application.py b/ryu/services/protocols/bgp/application.py index 2df49f52..e6e224a3 100644 --- a/ryu/services/protocols/bgp/application.py +++ b/ryu/services/protocols/bgp/application.py @@ -171,7 +171,7 @@ class BaseApplication(object): All valid neighbors are loaded. Miss-configured neighbors are ignored and error is logged. """ - bgp_neighbors = routing_settings.get('bgp_neighbors') + bgp_neighbors = routing_settings.setdefault('bgp_neighbors', {}) for ip, bgp_neighbor in bgp_neighbors.items(): try: bgp_neighbor[neighbors.IP_ADDRESS] = ip @@ -188,7 +188,7 @@ class BaseApplication(object): If any of the VRFs are miss-configured errors are logged. All valid VRFs are loaded. """ - vpns_conf = routing_settings.get('vpns') + vpns_conf = routing_settings.setdefault('vpns', {}) for vrf in vpns_conf: try: call('vrf.create', **vrf) diff --git a/ryu/services/protocols/bgp/rtconf/neighbors.py b/ryu/services/protocols/bgp/rtconf/neighbors.py index 9a4920bd..e949ec9e 100644 --- a/ryu/services/protocols/bgp/rtconf/neighbors.py +++ b/ryu/services/protocols/bgp/rtconf/neighbors.py @@ -72,13 +72,13 @@ LOCAL_PORT = 'local_port' # Default value constants. DEFAULT_CAP_GR_NULL = True DEFAULT_CAP_REFRESH = True -DEFAULT_CAP_ENHANCED_REFRESH = True -DEFAULT_CAP_MBGP_IPV4 = False -DEFAULT_CAP_MBGP_VPNV4 = True +DEFAULT_CAP_ENHANCED_REFRESH = False +DEFAULT_CAP_MBGP_IPV4 = True +DEFAULT_CAP_MBGP_VPNV4 = False DEFAULT_CAP_MBGP_VPNV6 = False DEFAULT_HOLD_TIME = 40 DEFAULT_ENABLED = True -DEFAULT_CAP_RTC = True +DEFAULT_CAP_RTC = False # Default value for *MAX_PREFIXES* setting is set to 0. DEFAULT_MAX_PREFIXES = 0 |