commit 7562d4ea533e534b8f86338b74f6be29ac7a8dc5
author Stephen Finucane <stephenfinucane@hotmail.com> Thu Mar 13 15:10:29 2014 +0000
committer Stephen Finucane <stephenfinucane@hotmail.com> Thu Mar 13 15:10:29 2014 +0000
tree 90234120f9c6f42f950c093903faf7982bc67a2e
parent 92f7cf6bf060f5cf258d7e398b08b9a97623b38f

packet.py: Skip IPv6 import if IPv6 disabled

src/python/oftest/packet.py

diff --git a/src/python/oftest/packet.py b/src/python/oftest/packet.py
index 9631e02..1ed100f 100644
--- a/src/python/oftest/packet.py
+++ b/src/python/oftest/packet.py
@@ -4,15 +4,17 @@
 """
 Wrap scapy to satisfy pylint
 """
+from oftest import config
 import sys
 
 try:
     import scapy.config
     import scapy.route
-    import scapy.route6
     import scapy.layers.l2
     import scapy.layers.inet
-    import scapy.layers.inet6
+    if not config["disable_ipv6"]:
+        import scapy.route6
+        import scapy.layers.inet6
 except ImportError:
     sys.exit("Need to install scapy for packet parsing")
 
@@ -22,10 +24,12 @@
 Dot1Q = scapy.layers.l2.Dot1Q
 IP = scapy.layers.inet.IP
 IPOption = scapy.layers.inet.IPOption
-IPv6 = scapy.layers.inet6.IPv6
 ARP = scapy.layers.inet.ARP
 TCP = scapy.layers.inet.TCP
 UDP = scapy.layers.inet.UDP
 ICMP = scapy.layers.inet.ICMP
-ICMPv6Unknown = scapy.layers.inet6.ICMPv6Unknown
-ICMPv6EchoRequest = scapy.layers.inet6.ICMPv6EchoRequest
+
+if not config["disable_ipv6"]:
+    IPv6 = scapy.layers.inet6.IPv6
+    ICMPv6Unknown = scapy.layers.inet6.ICMPv6Unknown
+    ICMPv6EchoRequest = scapy.layers.inet6.ICMPv6EchoRequest