add decorator for checking peer's state

peer's state must be established before some of the apis can work, so add a decorator to them for checking the peer's state before doing the reall job.

Signed-off-by: Peng Xiao <[email protected]>

Author: xiaopeng163

bin/yabgpd

@@ -19,6 +19,7 @@
 
 from oslo_config import cfg
 from flask import request
+import flask
 
 from yabgp.common import constants as common_cons
 
@@ -39,6 +40,20 @@ def decorated_function(*args, **kwargs):
     return decorated_function
 
 
+def makesure_peer_establish(f):
+    @wraps(f)
+    def decorator(*args, **kwargs):
+        value = kwargs['peer_ip']
+        if _ready_to_send_msg(peer_ip=value):
+            return f(*args, **kwargs)
+        else:
+            return flask.jsonify({
+                'status': False,
+                'code': "Please check the peer's state"
+            })
+    return decorator
+
+
 def get_peer_conf_and_state(peer_ip=None):
     """
     get peer configuration and state
@@ -105,24 +120,17 @@ def send_route_refresh(peer_ip, afi, safi, res):
     :param peer_ip: peer ip address
     :return: the sending results
     """
-    if _ready_to_send_msg(peer_ip):
-        LOG.debug('peer %s is ready to send route refresh', peer_ip)
-        try:
-            if cfg.CONF.bgp.running_config[peer_ip]['factory'].fsm.protocol.send_route_refresh(
-                    afi=afi, safi=safi, res=res):
-                return {
-                    'status': True
-                }
-        except Exception as e:
-            LOG.error(e)
+    try:
+        if cfg.CONF.bgp.running_config[peer_ip]['factory'].fsm.protocol.send_route_refresh(
+                afi=afi, safi=safi, res=res):
             return {
-                'status': False,
-                'code': 'failed when send this message out'
+                'status': True
             }
-    else:
+    except Exception as e:
+        LOG.error(e)
         return {
             'status': False,
-            'code': "Please check the peer's state"
+            'code': 'failed when send this message out'
         }
 
 
@@ -132,11 +140,6 @@ def send_update(peer_ip, attr, nlri, withdraw):
     :param peer_ip: peer ip address
     :return:
     """
-    if not _ready_to_send_msg(peer_ip):
-        return {
-            'status': False,
-            'code': "Please check the peer's state"
-        }
     # TODO check RIB out policy
     # TODO update RIB out table
     if cfg.CONF.bgp.running_config[peer_ip]['factory'].fsm.protocol.send_update({

yabgp/api/utils.py

@@ -210,6 +210,7 @@ def get_peer_statistic(peer_ip):
 @blueprint.route('/peer/<peer_ip>/send/route-refresh', methods=['POST'])
 @auth.login_required
 @api_utils.log_request
+@api_utils.makesure_peer_establish
 def send_route_refresh(peer_ip):
     """
     Try to send BGP Route Refresh message to a peer
@@ -272,6 +273,7 @@ def send_route_refresh(peer_ip):
 @blueprint.route('/peer/<peer_ip>/send/update', methods=['POST'])
 @auth.login_required
 @api_utils.log_request
+@api_utils.makesure_peer_establish
 def send_update_message(peer_ip):
     """
     Try to send BGP update message to the peer. Both update nlri and withdraw nlri treated as Update.