From 2a206f0e4c8cfdb431bd2b5f98992cb839e4a975 Mon Sep 17 00:00:00 2001
From: yanzhangi <51999930+yanzhangi@users.noreply.github.com>
Date: Fri, 20 Sep 2019 10:34:11 +0800
Subject: [PATCH] update ce_bgp_af to fix bugs (#62589)

* update to fix bugs

* update to fix bugs
---
 .../modules/network/cloudengine/ce_bgp_af.py  | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/lib/ansible/modules/network/cloudengine/ce_bgp_af.py b/lib/ansible/modules/network/cloudengine/ce_bgp_af.py
index c0918996593..80d3584e550 100644
--- a/lib/ansible/modules/network/cloudengine/ce_bgp_af.py
+++ b/lib/ansible/modules/network/cloudengine/ce_bgp_af.py
@@ -2555,15 +2555,15 @@ class BgpAf(object):
                 cmds.append(cmd)
 
         preference_external = module.params['preference_external']
-        if preference_external:
-            conf_str += "<preferenceExternal>%s</preferenceExternal>" % preference_external
-
         preference_internal = module.params['preference_internal']
-        if preference_internal:
-            conf_str += "<preferenceInternal>%s</preferenceInternal>" % preference_internal
-
         preference_local = module.params['preference_local']
-        if preference_local:
+        if any([preference_external, preference_internal, preference_local]):
+            preference_external = preference_external or "255"
+            preference_internal = preference_internal or "255"
+            preference_local = preference_local or "255"
+
+            conf_str += "<preferenceExternal>%s</preferenceExternal>" % preference_external
+            conf_str += "<preferenceInternal>%s</preferenceInternal>" % preference_internal
             conf_str += "<preferenceLocal>%s</preferenceLocal>" % preference_local
 
             cmd = "preference %s %s %s" % (
@@ -2808,6 +2808,8 @@ class BgpAf(object):
 
         cmds = []
         cmd = "import-route %s %s" % (import_protocol, import_process_id)
+        if import_protocol == "direct" or import_protocol == "static":
+            cmd = "import-route %s" % import_protocol
         cmds.append(cmd)
 
         return cmds
@@ -2836,7 +2838,7 @@ class BgpAf(object):
 
         cmds = []
         cmd = "import-route %s %s" % (import_protocol, import_process_id)
-        if import_process_id == "0":
+        if import_protocol == "direct" or import_protocol == "static":
             cmd = "import-route %s" % import_protocol
         cmds.append(cmd)
 
@@ -2866,6 +2868,8 @@ class BgpAf(object):
 
         cmds = []
         cmd = "undo import-route %s %s" % (import_protocol, import_process_id)
+        if import_protocol == "direct" or import_protocol == "static":
+            cmd = "undo import-route %s" % import_protocol
         cmds.append(cmd)
 
         return cmds