Merge branch 'master' into dev-greg

2 files changed, 0 insertions, 144 deletions

diff --git a/test_utils/models/network/__init__.py b/test_utils/models/network/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/test_utils/models/network/__init__.py
+++ /dev/null
diff --git a/test_utils/models/network/conftest.py b/test_utils/models/network/conftest.py
deleted file mode 100644
index abfbc18..0000000
--- a/test_utils/models/network/conftest.py
+++ /dev/null
@@ -1,144 +0,0 @@
-import os
-from datetime import datetime, timedelta, timezone
-from uuid import uuid4
-
-import pytest
-from fastapi import Request
-
-from generalresearch.managers.network.label import IPLabelManager
-from generalresearch.managers.network.tool_run import ToolRunManager
-from generalresearch.models.network.definitions import IPProtocol
-from generalresearch.models.network.mtr.parser import parse_mtr_output
-from generalresearch.models.network.mtr.result import MTRResult
-from generalresearch.models.network.nmap.parser import parse_nmap_xml
-from generalresearch.models.network.nmap.result import NmapResult
-from generalresearch.models.network.rdns.parser import parse_rdns_output
-from generalresearch.models.network.rdns.result import RDNSResult
-from generalresearch.models.network.tool_run import MTRRun, NmapRun, RDNSRun, Status
-from generalresearch.models.network.tool_run_command import (
-    MTRRunCommand,
-    MTRRunCommandOptions,
-    NmapRunCommand,
-    NmapRunCommandOptions,
-    RDNSRunCommand,
-    RDNSRunCommandOptions,
-)
-from generalresearch.pg_helper import PostgresConfig
-
-
-@pytest.fixture(scope="session")
-def scan_group_id() -> str:
-    return uuid4().hex
-
-
-@pytest.fixture(scope="session")
-def iplabel_manager(thl_web_rw: PostgresConfig) -> IPLabelManager:
-    return IPLabelManager(pg_config=thl_web_rw)
-
-
-@pytest.fixture(scope="session")
-def toolrun_manager(thl_web_rw: PostgresConfig) -> ToolRunManager:
-    return ToolRunManager(pg_config=thl_web_rw)
-
-
-@pytest.fixture(scope="session")
-def nmap_raw_output(request: Request) -> str:
-    fp = os.path.join(request.config.rootpath, "data/nmaprun1.xml")
-    with open(fp) as f:
-        data = f.read()
-    return data
-
-
-@pytest.fixture(scope="session")
-def nmap_result(nmap_raw_output: str) -> NmapResult:
-    return parse_nmap_xml(nmap_raw_output)
-
-
-@pytest.fixture(scope="session")
-def nmap_run(nmap_result: NmapResult, scan_group_id: str):
-    r = nmap_result
-    config = NmapRunCommand(
-        command="nmap",
-        options=NmapRunCommandOptions(
-            ip=r.target_ip, ports="22-1000,11000,1100,3389,61232", top_ports=None
-        ),
-    )
-    return NmapRun(
-        tool_version=r.version,
-        status=Status.SUCCESS,
-        ip=r.target_ip,
-        started_at=r.started_at,
-        finished_at=r.finished_at,
-        raw_command=config.to_command_str(),
-        scan_group_id=scan_group_id,
-        config=config,
-        parsed=r,
-    )
-
-
-@pytest.fixture(scope="session")
-def dig_raw_output() -> str:
-    return "156.32.33.45.in-addr.arpa. 300	IN	PTR	scanme.nmap.org."
-
-
-@pytest.fixture(scope="session")
-def rdns_result(dig_raw_output: str) -> RDNSResult:
-    return parse_rdns_output(ip="45.33.32.156", raw=dig_raw_output)
-
-
-@pytest.fixture(scope="session")
-def rdns_run(rdns_result: RDNSResult, scan_group_id: str):
-    r = rdns_result
-    ip = "45.33.32.156"
-    utc_now = datetime.now(tz=timezone.utc)
-    config = RDNSRunCommand(command="dig", options=RDNSRunCommandOptions(ip=ip))
-    return RDNSRun(
-        tool_version="1.2.3",
-        status=Status.SUCCESS,
-        ip=ip,
-        started_at=utc_now,
-        finished_at=utc_now + timedelta(seconds=1),
-        raw_command=config.to_command_str(),
-        scan_group_id=scan_group_id,
-        config=config,
-        parsed=r,
-    )
-
-
-@pytest.fixture(scope="session")
-def mtr_raw_output(request: Request) -> str:
-    fp = os.path.join(request.config.rootpath, "data/mtr_fatbeam.json")
-    with open(fp) as f:
-        data = f.read()
-    return data
-
-
-@pytest.fixture(scope="session")
-def mtr_result(mtr_raw_output: str) -> MTRResult:
-    return parse_mtr_output(mtr_raw_output, port=443, protocol=IPProtocol.TCP)
-
-
-@pytest.fixture(scope="session")
-def mtr_run(mtr_result: MTRResult, scan_group_id: str):
-    r = mtr_result
-    utc_now = datetime.now(tz=timezone.utc)
-    config = MTRRunCommand(
-        command="mtr",
-        options=MTRRunCommandOptions(
-            ip=r.destination, protocol=IPProtocol.TCP, port=443
-        ),
-    )
-
-    return MTRRun(
-        tool_version="1.2.3",
-        status=Status.SUCCESS,
-        ip=r.destination,
-        started_at=utc_now,
-        finished_at=utc_now + timedelta(seconds=1),
-        raw_command=config.to_command_str(),
-        scan_group_id=scan_group_id,
-        config=config,
-        parsed=r,
-        facility_id=1,
-        source_ip="1.2.3.4",
-    )