Remove the git conflict records which has been merged (#7676)

Summary: Removed git conflict records that have been merged into tests/common/devices/sonic.py(introduced by #5871 Fixes # (issue) Fix #7666
sonic-net · Mar 13, 2023 · 583e899 · 583e899
1 parent 9d6c07d
commit 583e899
Showing 1 changed file with 0 additions and 28 deletions.
diff --git a/tests/common/devices/sonic.py b/tests/common/devices/sonic.py
@@ -1078,13 +1078,8 @@ def get_ip_route_info(self, dstip, ns=""):
         @param dstip: destination. either ip_address or ip_network
 
         Please beware: if dstip is an ip network, you will receive all ECMP nexthops
-<<<<<<< HEAD
         But if dstip is an ip address, only one nexthop will be returned,
         the one which is going to be used to send a packet to the destination.
-=======
-        But if dstip is an ip address, only one nexthop will be returned, the one which is going to be used to
-        send a packet to the destination.
->>>>>>> 090bc7a72 (Add loopback action test cases)
 
         Exanples:
 ----------------
@@ -1097,14 +1092,9 @@ def get_ip_route_info(self, dstip, ns=""):
 ----------------
 get_ip_route_info(ipaddress.ip_network(unicode("192.168.8.0/25")))
 returns {'set_src': IPv4Address(u'10.1.0.32'), 'nexthops': [(IPv4Address(u'10.0.0.1'), u'PortChannel0001'),
-<<<<<<< HEAD
                                                             (IPv4Address(u'10.0.0.5'), u'PortChannel0002'),
                                                             (IPv4Address(u'10.0.0.9'), u'PortChannel0003'),
                                                             (IPv4Address(u'10.0.0.13'), u'PortChannel0004')]}
-=======
-(IPv4Address(u'10.0.0.5'), u'PortChannel0002'), (IPv4Address(u'10.0.0.9'), u'PortChannel0003'),
-(IPv4Address(u'10.0.0.13'), u'PortChannel0004')]}
->>>>>>> 090bc7a72 (Add loopback action test cases)
 
 raw data
 192.168.8.0/25 proto 186 src 10.1.0.32 metric 20
@@ -1128,14 +1118,9 @@ def get_ip_route_info(self, dstip, ns=""):
 ----------------
 get_ip_route_info(ipaddress.ip_network(unicode("20c0:a818::/64")))
 returns {'set_src': IPv6Address(u'fc00:1::32'), 'nexthops': [(IPv6Address(u'fc00::2'), u'PortChannel0001'),
-<<<<<<< HEAD
                                                              (IPv6Address(u'fc00::a'), u'PortChannel0002'),
                                                              (IPv6Address(u'fc00::12'), u'PortChannel0003'),
                                                              (IPv6Address(u'fc00::1a'), u'PortChannel0004')]}
-=======
-(IPv6Address(u'fc00::a'), u'PortChannel0002'), (IPv6Address(u'fc00::12'), u'PortChannel0003'),
-(IPv6Address(u'fc00::1a'), u'PortChannel0004')]}
->>>>>>> 090bc7a72 (Add loopback action test cases)
 
 raw data
 20c0:a818::/64 via fc00::2 dev PortChannel0001 proto 186 src fc00:1::32 metric 20  pref medium
@@ -1152,14 +1137,9 @@ def get_ip_route_info(self, dstip, ns=""):
 ----------------
 get_ip_route_info(ipaddress.ip_network(unicode("0.0.0.0/0")))
 returns {'set_src': IPv4Address(u'10.1.0.32'), 'nexthops': [(IPv4Address(u'10.0.0.1'), u'PortChannel0001'),
-<<<<<<< HEAD
                                                             (IPv4Address(u'10.0.0.5'), u'PortChannel0002'),
                                                             (IPv4Address(u'10.0.0.9'), u'PortChannel0003'),
                                                             (IPv4Address(u'10.0.0.13'), u'PortChannel0004')]}
-=======
-(IPv4Address(u'10.0.0.5'), u'PortChannel0002'), (IPv4Address(u'10.0.0.9'), u'PortChannel0003'),
-(IPv4Address(u'10.0.0.13'), u'PortChannel0004')]}
->>>>>>> 090bc7a72 (Add loopback action test cases)
 
 raw data
 default proto 186 src 10.1.0.32 metric 20
@@ -1176,18 +1156,10 @@ def get_ip_route_info(self, dstip, ns=""):
         nexthop via 10.0.0.63 dev PortChannel0004 weight 1
 ----------------
 get_ip_route_info(ipaddress.ip_network(unicode("::/0")))
-<<<<<<< HEAD
 returns {'set_src': IPv6Address(u'fc00:1::32'), 'nexthops': [(IPv6Address(u'fc00::2'), u'PortChannel0001'),
                                                              (IPv6Address(u'fc00::a'), u'PortChannel0002'),
                                                              (IPv6Address(u'fc00::12'), u'PortChannel0003'),
                                                              (IPv6Address(u'fc00::1a'), u'PortChannel0004')]}
-=======
-returns {'set_src': IPv6Address(u'fc00:1::32'),
-'nexthops': [(IPv6Address(u'fc00::2'), u'PortChannel0001'),
-(IPv6Address(u'fc00::a'), u'PortChannel0002'),
-(IPv6Address(u'fc00::12'), u'PortChannel0003'),
- (IPv6Address(u'fc00::1a'), u'PortChannel0004')]}
->>>>>>> 090bc7a72 (Add loopback action test cases)
 
 raw data
 default via fc00::2 dev PortChannel0001 proto 186 src fc00:1::32 metric 20  pref medium