Updated naming schema for the Raw protocol files.

ccie18643 · Jul 13, 2024 · 2b1a10b · 2b1a10b
1 parent 87450be
commit 2b1a10b
Show file tree

Hide file tree

Showing 23 changed files with 29 additions and 28 deletions.
diff --git a/pytcp/protocols/arp/packet_handler_tx.py b/pytcp/protocols/arp/packet_handler_tx.py
@@ -64,7 +64,7 @@ class PacketHandlerTxArp(ABC):
         from pytcp.protocols.ethernet.base import EthernetPayload
         from pytcp.protocols.ip4.assembler import Ip4Assembler, Ip4FragAssembler
         from pytcp.protocols.ip6.assembler import Ip6Assembler
-        from pytcp.protocols.raw.fpa import RawAssembler
+        from pytcp.protocols.raw.assembler import RawAssembler
 
         packet_stats_tx: PacketStatsTx
 

diff --git a/pytcp/protocols/ethernet/assembler.py b/pytcp/protocols/ethernet/assembler.py
@@ -41,7 +41,7 @@
 from pytcp.lib.proto import ProtoAssembler
 from pytcp.protocols.ethernet.base import Ethernet
 from pytcp.protocols.ethernet.header import EthernetHeader
-from pytcp.protocols.raw.fpa import RawAssembler
+from pytcp.protocols.raw.assembler import RawAssembler
 
 if TYPE_CHECKING:
     from pytcp.protocols.ethernet.base import EthernetPayload

diff --git a/pytcp/protocols/ethernet/base.py b/pytcp/protocols/ethernet/base.py
@@ -45,7 +45,7 @@
     from pytcp.protocols.ethernet.header import EthernetHeader
     from pytcp.protocols.ip4.assembler import Ip4Assembler, Ip4FragAssembler
     from pytcp.protocols.ip6.assembler import Ip6Assembler
-    from pytcp.protocols.raw.fpa import RawAssembler
+    from pytcp.protocols.raw.assembler import RawAssembler
 
     EthernetPayload: TypeAlias = (
         ArpAssembler

diff --git a/pytcp/protocols/ethernet/packet_handler_tx.py b/pytcp/protocols/ethernet/packet_handler_tx.py
@@ -52,7 +52,7 @@
 from pytcp.protocols.ethernet.assembler import EthernetAssembler
 from pytcp.protocols.ip4.assembler import Ip4Assembler, Ip4FragAssembler
 from pytcp.protocols.ip6.assembler import Ip6Assembler
-from pytcp.protocols.raw.fpa import RawAssembler
+from pytcp.protocols.raw.assembler import RawAssembler
 
 
 class PacketHandlerTxEthernet(ABC):

diff --git a/pytcp/protocols/icmp4/phtx.py b/pytcp/protocols/icmp4/phtx.py
@@ -65,7 +65,7 @@ class PacketHandlerTxIcmp4(ABC):
         from pytcp.lib.ip4_address import Ip4Address
         from pytcp.lib.packet_stats import PacketStatsTx
         from pytcp.protocols.ip4.base import Ip4Payload
-        from pytcp.protocols.raw.fpa import RawAssembler
+        from pytcp.protocols.raw.assembler import RawAssembler
         from pytcp.protocols.tcp.assembler import TcpAssembler
         from pytcp.protocols.udp.fpa import UdpAssembler
 

diff --git a/pytcp/protocols/icmp6/phtx.py b/pytcp/protocols/icmp6/phtx.py
@@ -73,7 +73,7 @@ class PacketHandlerTxIcmp6(ABC):
         from pytcp.lib.tx_status import TxStatus
         from pytcp.protocols.ip6.base import Ip6Payload
         from pytcp.protocols.ip6_ext_frag.assembler import Ip6ExtFragAssembler
-        from pytcp.protocols.raw.fpa import RawAssembler
+        from pytcp.protocols.raw.assembler import RawAssembler
         from pytcp.protocols.tcp.assembler import TcpAssembler
         from pytcp.protocols.udp.fpa import UdpAssembler
 

diff --git a/pytcp/protocols/ip4/assembler.py b/pytcp/protocols/ip4/assembler.py
@@ -49,7 +49,7 @@
 from pytcp.protocols.ip4.base import Ip4
 from pytcp.protocols.ip4.header import IP4_HEADER_LEN, Ip4Header, Ip4Proto
 from pytcp.protocols.ip4.options import Ip4Option, Ip4OptionEol, Ip4OptionNop
-from pytcp.protocols.raw.fpa import RawAssembler
+from pytcp.protocols.raw.assembler import RawAssembler
 
 if TYPE_CHECKING:
     from pytcp.protocols.ip4.base import Ip4Payload

diff --git a/pytcp/protocols/ip4/base.py b/pytcp/protocols/ip4/base.py
@@ -46,7 +46,7 @@
 if TYPE_CHECKING:
     from pytcp.protocols.icmp4.fpa import Icmp4Assembler
     from pytcp.protocols.ip4.header import Ip4Header
-    from pytcp.protocols.raw.fpa import RawAssembler
+    from pytcp.protocols.raw.assembler import RawAssembler
     from pytcp.protocols.tcp.assembler import TcpAssembler
     from pytcp.protocols.udp.fpa import UdpAssembler
 

diff --git a/pytcp/protocols/ip4/packet_handler_tx.py b/pytcp/protocols/ip4/packet_handler_tx.py
@@ -50,7 +50,7 @@
 from pytcp.lib.mac_address import MacAddress
 from pytcp.lib.tx_status import TxStatus
 from pytcp.protocols.ip4.assembler import Ip4Assembler, Ip4FragAssembler
-from pytcp.protocols.raw.fpa import RawAssembler
+from pytcp.protocols.raw.assembler import RawAssembler
 from pytcp.protocols.udp.fpa import UdpAssembler
 
 

diff --git a/pytcp/protocols/ip6/assembler.py b/pytcp/protocols/ip6/assembler.py
@@ -45,7 +45,7 @@
 from pytcp.protocols.ethernet.header import EthernetType
 from pytcp.protocols.ip6.base import Ip6
 from pytcp.protocols.ip6.header import IP6_HEADER_LEN, Ip6Header, Ip6Next
-from pytcp.protocols.raw.fpa import RawAssembler
+from pytcp.protocols.raw.assembler import RawAssembler
 
 if TYPE_CHECKING:
     from pytcp.lib.tracker import Tracker

diff --git a/pytcp/protocols/ip6/base.py b/pytcp/protocols/ip6/base.py
@@ -45,7 +45,7 @@
 if TYPE_CHECKING:
     from pytcp.protocols.icmp6.fpa import Icmp6Assembler
     from pytcp.protocols.ip6_ext_frag.assembler import Ip6ExtFragAssembler
-    from pytcp.protocols.raw.fpa import RawAssembler
+    from pytcp.protocols.raw.assembler import RawAssembler
     from pytcp.protocols.tcp.assembler import TcpAssembler
     from pytcp.protocols.udp.fpa import UdpAssembler
 

diff --git a/pytcp/protocols/ip6/packet_handler_tx.py b/pytcp/protocols/ip6/packet_handler_tx.py
@@ -54,7 +54,7 @@
     Icmp6NdMessage,
 )
 from pytcp.protocols.ip6.assembler import Ip6Assembler
-from pytcp.protocols.raw.fpa import RawAssembler
+from pytcp.protocols.raw.assembler import RawAssembler
 
 
 class PacketHandlerTxIp6(ABC):

diff --git a/pytcp/protocols/ip6_ext_frag/base.py b/pytcp/protocols/ip6_ext_frag/base.py
@@ -48,7 +48,7 @@
 
 if TYPE_CHECKING:
     from pytcp.protocols.icmp6.fpa import Icmp6Assembler
-    from pytcp.protocols.raw.fpa import RawAssembler
+    from pytcp.protocols.raw.assembler import RawAssembler
     from pytcp.protocols.tcp.assembler import TcpAssembler
     from pytcp.protocols.udp.fpa import UdpAssembler
 

diff --git a/pytcp/protocols/ip6_ext_frag/packet_handler_tx.py b/pytcp/protocols/ip6_ext_frag/packet_handler_tx.py
@@ -61,7 +61,7 @@ class PacketHandlerTxIp6ExtFrag(ABC):
         from pytcp.protocols.icmp6.fpa import Icmp6Assembler
         from pytcp.protocols.ip6.assembler import Ip6Assembler
         from pytcp.protocols.ip6.base import Ip6Payload
-        from pytcp.protocols.raw.fpa import RawAssembler
+        from pytcp.protocols.raw.assembler import RawAssembler
         from pytcp.protocols.tcp.assembler import TcpAssembler
         from pytcp.protocols.udp.fpa import UdpAssembler
 

diff --git a/pytcp/protocols/raw/fpa.py → pytcp/protocols/raw/assembler.py b/pytcp/protocols/raw/fpa.py → pytcp/protocols/raw/assembler.py
@@ -23,13 +23,14 @@
 #                                                                          #
 ############################################################################
 
+# pylint: disable = unused-argument
 
 """
-Module contains Fast Packet Assembler support class for the raw protocol.
+Module contains assembler support class for the raw protocol.
 
-pytcp/protocols/raw/fpa.py
+pytcp/protocols/raw/assembler.py
 
-ver 2.8
+ver 2.9
 """
 
 
@@ -39,7 +40,7 @@
 
 from pytcp.lib.proto import ProtoAssembler
 from pytcp.lib.tracker import Tracker
-from pytcp.protocols.raw.ps import Raw
+from pytcp.protocols.raw.base import Raw
 
 
 class RawAssembler(Raw, ProtoAssembler):

diff --git a/pytcp/protocols/raw/ps.py → pytcp/protocols/raw/base.py b/pytcp/protocols/raw/ps.py → pytcp/protocols/raw/base.py
@@ -25,11 +25,11 @@
 
 
 """
-Module contains base class for the UDP protccol.
+Module contains base class for the RAW protccol.
 
-pytcp/protocols/raw/ps.py
+pytcp/protocols/raw/base.py
 
-ver 2.8
+ver 2.9
 """
 
 

diff --git a/pytcp/protocols/tcp/packet_handler_tx.py b/pytcp/protocols/tcp/packet_handler_tx.py
@@ -72,7 +72,7 @@ class PacketHandlerTxTcp(ABC):
         from pytcp.protocols.ip4.base import Ip4Payload
         from pytcp.protocols.ip6.base import Ip6Payload
         from pytcp.protocols.ip6_ext_frag.assembler import Ip6ExtFragAssembler
-        from pytcp.protocols.raw.fpa import RawAssembler
+        from pytcp.protocols.raw.assembler import RawAssembler
         from pytcp.protocols.udp.fpa import UdpAssembler
 
         packet_stats_tx: PacketStatsTx

diff --git a/pytcp/protocols/udp/phtx.py b/pytcp/protocols/udp/phtx.py
@@ -62,7 +62,7 @@ class PacketHandlerTxUdp(ABC):
         from pytcp.protocols.ip4.base import Ip4Payload
         from pytcp.protocols.ip6.base import Ip6Payload
         from pytcp.protocols.ip6_ext_frag.assembler import Ip6ExtFragAssembler
-        from pytcp.protocols.raw.fpa import RawAssembler
+        from pytcp.protocols.raw.assembler import RawAssembler
         from pytcp.protocols.udp.fpa import UdpAssembler
 
         packet_stats_tx: PacketStatsTx

diff --git a/tests/unit/protocols__ip4__phtx.py b/tests/unit/protocols__ip4__phtx.py
@@ -36,7 +36,7 @@
 
 from pytcp.lib.packet_stats import PacketStatsTx
 from pytcp.lib.tx_status import TxStatus
-from pytcp.protocols.raw.fpa import RawAssembler
+from pytcp.protocols.raw.assembler import RawAssembler
 from pytcp.subsystems.packet_handler import PacketHandler
 from tests.unit.mock_network import (
     MockNetworkSettings,

diff --git a/tests/unit/protocols__ip6__phtx.py b/tests/unit/protocols__ip6__phtx.py
@@ -36,7 +36,7 @@
 
 from pytcp.lib.packet_stats import PacketStatsTx
 from pytcp.lib.tx_status import TxStatus
-from pytcp.protocols.raw.fpa import RawAssembler
+from pytcp.protocols.raw.assembler import RawAssembler
 from pytcp.subsystems.packet_handler import PacketHandler
 from tests.unit.mock_network import (
     MockNetworkSettings,

diff --git a/tests_unit_legacy/protocols__ethernet__ps.py b/tests_unit_legacy/protocols__ethernet__ps.py
@@ -39,7 +39,7 @@
     Ethernet,
     EthernetType,
 )
-from pytcp.protocols.raw.fpa import RawAssembler
+from pytcp.protocols.raw.assembler import RawAssembler
 
 ETHERNET__DST = MacAddress("00:11:22:33:44:55")
 ETHERNET__SRC = MacAddress("66:77:88:99:AA:BB")

diff --git a/tests_unit_legacy/protocols__ip4__fpa.py b/tests_unit_legacy/protocols__ip4__fpa.py
@@ -56,7 +56,7 @@
     IP4_PROTO_TCP,
     IP4_PROTO_UDP,
 )
-from pytcp.protocols.raw.fpa import RawAssembler
+from pytcp.protocols.raw.assembler import RawAssembler
 from pytcp.protocols.tcp.assembler import TcpAssembler
 from pytcp.protocols.udp.fpa import UdpAssembler
 

diff --git a/tests_unit_legacy/protocols__ip6__fpa.py b/tests_unit_legacy/protocols__ip6__fpa.py
@@ -39,7 +39,7 @@
 from protocols.ethernet.base import EthernetType
 from pytcp.protocols.ip6.assembler import Ip6Assembler
 from pytcp.protocols.ip6.base import IP6_HEADER_LEN, IP6_NEXT_RAW
-from pytcp.protocols.raw.fpa import RawAssembler
+from pytcp.protocols.raw.assembler import RawAssembler
 from pytcp.protocols.tcp.assembler import TcpAssembler
 from pytcp.protocols.udp.fpa import UdpAssembler