misc: fix python sonarcloud BLOCKER level issues

[vpp.git] / src / plugins / vrrp / test / test_vrrp.py

diff --git a/src/plugins/vrrp/test/test_vrrp.py b/src/plugins/vrrp/test/test_vrrp.py
index cc46a1d..3a85d2e 100644 (file)
--- a/src/plugins/vrrp/test/test_vrrp.py
+++ b/src/plugins/vrrp/test/test_vrrp.py
@@ -8,12 +8,13 @@
 
 import unittest
 import time
-from socket import inet_pton, inet_ntop, AF_INET6
+import socket
+from socket import inet_pton, inet_ntop
 
 from vpp_object import VppObject
 from vpp_papi import VppEnum
 
-from scapy.packet import Raw
+from scapy.packet import raw
 from scapy.layers.l2 import Ether, ARP
 from scapy.layers.inet import IP, ICMP, icmptypes
 from scapy.layers.inet6 import IPv6, ipv6nh, IPv6ExtHdrHopByHop, \
@@ -22,7 +23,7 @@ from scapy.layers.inet6 import IPv6, ipv6nh, IPv6ExtHdrHopByHop, \
 from scapy.contrib.igmpv3 import IGMPv3, IGMPv3mr, IGMPv3gr
 from scapy.layers.vrrp import IPPROTO_VRRP, VRRPv3
 from scapy.utils6 import in6_getnsma, in6_getnsmac
-from framework import VppTestCase, VppTestRunner
+from framework import VppTestCase, VppTestRunner, running_extended_tests
 from util import ip6_normalize
 
 VRRP_VR_FLAG_PREEMPT = 1
@@ -214,6 +215,7 @@ class VppVRRPVirtualRouter(VppObject):
         return (vr_details.runtime.master_down_int * 0.01)
 
 
+@unittest.skipUnless(running_extended_tests, "part of extended tests")
 class TestVRRP4(VppTestCase):
     """ IPv4 VRRP Test Case """
 
@@ -746,6 +748,7 @@ class TestVRRP4(VppTestCase):
         self.assertEqual(rx[VRRPv3].addrlist, [vip])
 
 
+@unittest.skipUnless(running_extended_tests, "part of extended tests")
 class TestVRRP6(VppTestCase):
     """ IPv6 VRRP Test Case """
 
@@ -831,8 +834,8 @@ class TestVRRP6(VppTestCase):
 
         self.assertEqual(pkt[IPv6].dst, "ff02::1")
         # convert addrs to packed format since string versions could differ
-        src_addr = inet_pton(AF_INET6, pkt[IPv6].src)
-        vr_ll_addr = inet_pton(AF_INET6, vr.interface().local_ip6_ll)
+        src_addr = inet_pton(socket.AF_INET6, pkt[IPv6].src)
+        vr_ll_addr = inet_pton(socket.AF_INET6, vr.interface().local_ip6_ll)
         self.assertEqual(src_addr, vr_ll_addr)
 
         self.assertTrue(pkt[ICMPv6ND_NA].tgt in vr.virtual_ips())