CAT_TOM/pyasic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

slightly improved network functionality and added tests for network

Browse Source
This commit is contained in:
UpstreamData
2022-05-19 11:55:38 -06:00
parent 40f14876cc
commit ec5563f2f0
3 changed files with 100 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
network/net_range.py
View File

@@ -1,15 +1,16 @@
import ipaddress
from typing import Union
import ipaddress
class MinerNetworkRange:
"""A MinerNetwork that takes a range of IP addresses.
:param ip_range: A range of IP addresses to put in the network, or a list of IPs
Takes a string formatted as
{ip_range_1_start}-{ip_range_1_end}, {ip_range_2_start}-{ip_range_2_end}
Also takes a list of strings formatted as
[{ip1}, {ip2}, {ip3}, ...]
Takes a string formatted as:
{ip_range_1_start}-{ip_range_1_end}, {ip_address_1},
{ip_range_2_start}-{ip_range_2_end}, {ip_address_2}...
Also takes a list of strings formatted as:
[{ip_address_1}, {ip_address_2}, {ip_address_3}, ...]
"""
def __init__(self, ip_range: Union[str, list]):
@@ -17,17 +18,20 @@ class MinerNetworkRange:
if isinstance(ip_range, str):
ip_ranges = ip_range.replace(" ", "").split(",")
for item in ip_ranges:
start, end = item.split("-")
start_ip = ipaddress.ip_address(start)
end_ip = ipaddress.ip_address(end)
networks = ipaddress.summarize_address_range(start_ip, end_ip)
for network in networks:
self.host_ips.append(network.network_address)
for host in network.hosts():
if host not in self.host_ips:
self.host_ips.append(host)
if network.broadcast_address not in self.host_ips:
self.host_ips.append(network.broadcast_address)
if "-" in item:
start, end = item.split("-")
start_ip = ipaddress.ip_address(start)
end_ip = ipaddress.ip_address(end)
networks = ipaddress.summarize_address_range(start_ip, end_ip)
for network in networks:
self.host_ips.append(network.network_address)
for host in network.hosts():
if host not in self.host_ips:
self.host_ips.append(host)
if network.broadcast_address not in self.host_ips:
self.host_ips.append(network.broadcast_address)
else:
self.host_ips.append(ipaddress.ip_address(item))
elif isinstance(ip_range, list):
self.host_ips = [ipaddress.ip_address(ip_str) for ip_str in ip_range]

9
tests/__init__.py Normal file
View File

@@ -0,0 +1,9 @@
from tests.network_tests import test_network
def test_all():
test_network()
if __name__ == "__main__":
test_all()

70
tests/network_tests/__init__.py Normal file
View File

@@ -0,0 +1,70 @@
import ipaddress
from network.net_range import MinerNetworkRange
from network import MinerNetwork
def test_network():
net_range_str = "192.168.1.29, 192.168.1.40-192.168.1.43, 192.168.1.60"
net_range_list = [
"192.168.1.29",
"192.168.1.40",
"192.168.1.41",
"192.168.1.42",
"192.168.1.43",
"192.168.1.60",
]
miner_net_1 = "192.168.1.0"
miner_net_1_mask = 29
#######################
# Network Range Tests #
#######################
net_range_1 = list(MinerNetworkRange(net_range_str).hosts())
net_range_2 = list(MinerNetworkRange(net_range_list).hosts())
correct_net_range = [
ipaddress.IPv4Address("192.168.1.29"),
ipaddress.IPv4Address("192.168.1.40"),
ipaddress.IPv4Address("192.168.1.41"),
ipaddress.IPv4Address("192.168.1.42"),
ipaddress.IPv4Address("192.168.1.43"),
ipaddress.IPv4Address("192.168.1.60"),
]
assert net_range_1 == correct_net_range
assert net_range_2 == correct_net_range
print("Network Range test succeeded.")
#######################
# Miner Network Tests #
#######################
miner_net = list(
MinerNetwork(miner_net_1, mask=miner_net_1_mask).get_network().hosts()
)
miner_net_str = list(
MinerNetwork("192.168.1.1-192.168.1.5, 192.168.1.6").get_network().hosts()
)
correct_net = [
ipaddress.IPv4Address("192.168.1.1"),
ipaddress.IPv4Address("192.168.1.2"),
ipaddress.IPv4Address("192.168.1.3"),
ipaddress.IPv4Address("192.168.1.4"),
ipaddress.IPv4Address("192.168.1.5"),
ipaddress.IPv4Address("192.168.1.6"),
]
assert miner_net == correct_net
assert miner_net_str == correct_net
print("Miner Network test succeeded.")
if __name__ == "__main__":
test_network()