resolve merge conflict

sonic-net · Dec 1, 2022 · 5a49504 · 5a49504
2 parents 2df6aac + 336b447
commit 5a49504
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/config/main.py b/config/main.py
@@ -1048,7 +1048,7 @@ def cli_sroute_to_config(ctx, command_str, strict_nh = True):
             # prefix_str: ['prefix', 'vrf', Vrf-name, ip]
             vrf_name = prefix_str[2]
             if not is_vrf_exists(config_db, vrf_name):
-                ctx.fail("VRF %s does not exist!"%(vrf_name))
+                ctx.fail("1VRF %s does not exist!"%(vrf_name))
             ip_prefix = prefix_str[3]
         elif 'prefix' in prefix_str:
             # prefix_str: ['prefix', ip]
@@ -1062,7 +1062,7 @@ def cli_sroute_to_config(ctx, command_str, strict_nh = True):
             # nexthop_str: ['nexthop', 'vrf', Vrf-name, ip]
             config_entry["nexthop"] = nexthop_str[3]
             if not is_vrf_exists(config_db, nexthop_str[2]):
-                ctx.fail("VRF %s does not exist!"%(nexthop_str[2]))
+                ctx.fail("2VRF %s does not exist!"%(nexthop_str[2]))
             config_entry["nexthop-vrf"] = nexthop_str[2]
         elif 'nexthop' in nexthop_str and 'dev' in nexthop_str:
             # nexthop_str: ['nexthop', 'dev', ifname]
@@ -5044,7 +5044,7 @@ def bind(ctx, interface_name, vrf_name):
             ctx.fail("'interface_name' is None!")
 
     if not is_vrf_exists(config_db, vrf_name):
-        ctx.fail("VRF %s does not exist!"%(vrf_name))
+        ctx.fail("3VRF %s does not exist!"%(vrf_name))
 
     table_name = get_interface_table_name(interface_name)
     if table_name == "":