resolve merge conflict

isabelmsft · Sep 9, 2022 · 6565224 · 6565224
2 parents ed39006 + 7546b7c
commit 6565224
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/config/main.py b/config/main.py
@@ -2043,20 +2043,14 @@ def add_portchannel(ctx, portchannel_name, min_links, fallback, fast_rate):
 
     if is_portchannel_present_in_db(db, portchannel_name):
         ctx.fail("{} already exists!".format(portchannel_name))
-<<<<<<< HEAD
-
-    fvs = {'admin_status': 'up',
-           'mtu': '9100',
-           'lacp_key': 'auto'}
-=======
 
     fvs = {
         'admin_status': 'up',
         'mtu': '9100',
         'lacp_key': 'auto',
         'fast_rate': fast_rate.lower(),
     }
->>>>>>> bbcdf2ed7b47d6e2f452a5d20f68cc9b71ddf574
+
     if min_links != 0:
         fvs['min_links'] = str(min_links)
     if fallback != 'false':

diff --git a/tests/portchannel_test.py b/tests/portchannel_test.py
@@ -69,8 +69,6 @@ def test_delete_non_existing_portchannel(self):
         assert result.exit_code != 0
         assert "Error: PortChannel0005 is not present." in result.output
 
-<<<<<<< HEAD
-=======
     @pytest.mark.parametrize("fast_rate", ["False", "True", "false", "true"])
     def test_add_portchannel_with_fast_rate(self, fast_rate):
         runner = CliRunner()
@@ -96,7 +94,6 @@ def test_add_portchannel_with_invalid_fast_rate(self, fast_rate):
         assert result.exit_code != 0
         assert 'Invalid value for "--fast-rate"'  in result.output
 
->>>>>>> bbcdf2ed7b47d6e2f452a5d20f68cc9b71ddf574
     def test_add_portchannel_member_with_invalid_name(self):
         runner = CliRunner()
         db = Db()