From 4c6fe5602edcbd9857a846e5b13a21d5c671a2c8 Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Fri, 13 Apr 2018 19:45:33 +0200 Subject: Fix warnings reported by gen_doc.sh + Docstring warnings fixed. + Multiline param descriptions indented by 4 spaces. - Except the PacketVerifier.py one - I have tried several quote-like blocks, nothing works. - Rst warnings not fixed. - How can I fix them? They refer to temporarily created files. + Other improvements: + Python lines no longer than 80 characters. + :return: -> :returns: + Notes before params. + :raises + closing colon after exception class. + Description is a sentence. + Present tense in conditional sentences. + Bumped copyright year in edited files. Change-Id: I462c194eeecb666dc146e26858486a07c990be9b Signed-off-by: Vratko Polak --- resources/libraries/python/PacketVerifier.py | 98 ++++++++++++++-------------- 1 file changed, 50 insertions(+), 48 deletions(-) (limited to 'resources/libraries/python/PacketVerifier.py') diff --git a/resources/libraries/python/PacketVerifier.py b/resources/libraries/python/PacketVerifier.py index 9306f486ba..d1e7bbd229 100644 --- a/resources/libraries/python/PacketVerifier.py +++ b/resources/libraries/python/PacketVerifier.py @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Cisco and/or its affiliates. +# Copyright (c) 2018 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -13,53 +13,55 @@ """PacketVerifier module. - :Example: - - >>> from scapy.all import * - >>> from PacketVerifier import * - >>> rxq = RxQueue('eth1') - >>> txq = TxQueue('eth1') - >>> src_mac = "AA:BB:CC:DD:EE:FF" - >>> dst_mac = "52:54:00:ca:5d:0b" - >>> src_ip = "11.11.11.10" - >>> dst_ip = "11.11.11.11" - >>> sent_packets = [] - >>> pkt_send = Ether(src=src_mac, dst=dst_mac) / - ... IP(src=src_ip, dst=dst_ip) / - ... ICMP() - >>> sent_packets.append(pkt_send) - >>> txq.send(pkt_send) - >>> pkt_send = Ether(src=src_mac, dst=dst_mac) / - ... ARP(hwsrc=src_mac, psrc=src_ip, hwdst=dst_mac, pdst=dst_ip, op=2) - >>> sent_packets.append(pkt_send) - >>> txq.send(pkt_send) - >>> rxq.recv(100, sent_packets).show() - ###[ Ethernet ]### - dst = aa:bb:cc:dd:ee:ff - src = 52:54:00:ca:5d:0b - type = 0x800 - ###[ IP ]### - version = 4L - ihl = 5L - tos = 0x0 - len = 28 - id = 43183 - flags = - frag = 0L - ttl = 64 - proto = icmp - chksum = 0xa607 - src = 11.11.11.11 - dst = 11.11.11.10 - options - ###[ ICMP ]### - type = echo-reply - code = 0 - chksum = 0xffff - id = 0x0 - seq = 0x0 - ###[ Padding ]### - load = 'RT\x00\xca]\x0b\xaa\xbb\xcc\xdd\xee\xff\x08\x06\x00\x01\x08\x00' + Example. :: + + | >>> from scapy.all import * + | >>> from PacketVerifier import * + | >>> rxq = RxQueue('eth1') + | >>> txq = TxQueue('eth1') + | >>> src_mac = "AA:BB:CC:DD:EE:FF" + | >>> dst_mac = "52:54:00:ca:5d:0b" + | >>> src_ip = "11.11.11.10" + | >>> dst_ip = "11.11.11.11" + | >>> sent_packets = [] + | >>> pkt_send = Ether(src=src_mac, dst=dst_mac) / + | ... IP(src=src_ip, dst=dst_ip) / + | ... ICMP() + | >>> sent_packets.append(pkt_send) + | >>> txq.send(pkt_send) + | >>> pkt_send = Ether(src=src_mac, dst=dst_mac) / + | ... ARP(hwsrc=src_mac, psrc=src_ip, hwdst=dst_mac, pdst=dst_ip, op=2) + | >>> sent_packets.append(pkt_send) + | >>> txq.send(pkt_send) + | >>> rxq.recv(100, sent_packets).show() + | ###[ Ethernet ]### + | dst = aa:bb:cc:dd:ee:ff + | src = 52:54:00:ca:5d:0b + | type = 0x800 + | ###[ IP ]### + | version = 4L + | ihl = 5L + | tos = 0x0 + | len = 28 + | id = 43183 + | flags = + | frag = 0L + | ttl = 64 + | proto = icmp + | chksum = 0xa607 + | src = 11.11.11.11 + | dst = 11.11.11.10 + | options + | ###[ ICMP ]### + | type = echo-reply + | code = 0 + | chksum = 0xffff + | id = 0x0 + | seq = 0x0 + | ###[ Padding ]### + | load = 'RT\x00\xca]\x0b\xaa\xbb\xcc\xdd\xee\xff\x08\x06\x00\x01\x08\x00' + + Example end. """ import os -- cgit 1.2.3-korg