Remove ShipIt re-export markers (Bucket 1 cleanup)

pavanpatil92 · meta-codesync[bot] · commit d7c96e8a09c8 · 2026-06-18T15:15:09.000-07:00
Differential Revision: D109072826

fbshipit-source-id: 34b170e345f7295c81fdeab06e63acdbf3a4570d
diff --git a/taac/health_checks/abstract_health_check.py b/taac/health_checks/abstract_health_check.py
@@ -14,9 +14,7 @@
 from taac.health_checks.common_utils import (
     async_get_everpaste_fburl_if_needed,
 )
-from taac.ixia.taac_ixia import (  # oss-rewrite (force ShipIt re-export to taac.* root)
-    TaacIxia as Ixia,
-)
+from neteng.test_infra.dne.taac.ixia.taac_ixia import TaacIxia as Ixia
 from taac.utils.common import is_overridden
 from taac.utils.driver_factory import async_get_device_driver
 from taac.utils.oss_taac_lib_utils import ConsoleFileLogger
diff --git a/taac/health_checks/common_utils.py b/taac/health_checks/common_utils.py
@@ -4,10 +4,7 @@
 import typing as t
 
 from taac.health_checks.constants import COMPARISON_OPERATORS
-from taac.utils.common import (  # oss-rewrite (force ShipIt re-export to taac.* root)
-    async_everpaste_str,
-    async_get_fburl,
-)
+from neteng.test_infra.dne.taac.utils.common import async_everpaste_str, async_get_fburl
 from taac.health_check.health_check import types as hc_types
 
 
diff --git a/taac/health_checks/device_health_checks/bgp_fib_programming_health_check.py b/taac/health_checks/device_health_checks/bgp_fib_programming_health_check.py
@@ -10,10 +10,7 @@
 from taac.health_checks.abstract_health_check import (
     AbstractDeviceHealthCheck,
 )
-from taac.utils import (  # oss-rewrite (force ShipIt re-export to taac.* root)
-    arista_utils,
-    log_parsing_utils,
-)
+from neteng.test_infra.dne.taac.utils import arista_utils, log_parsing_utils
 from taac.health_check.health_check import types as hc_types
 
 
diff --git a/taac/health_checks/device_health_checks/fpf_stale_prefix_health_check.py b/taac/health_checks/device_health_checks/fpf_stale_prefix_health_check.py
@@ -9,10 +9,7 @@
 from taac.health_checks.abstract_health_check import (
     AbstractDeviceHealthCheck,
 )
-from taac.libs.fpf.fpf_bgp_rib import (  # oss-rewrite (force ShipIt re-export to taac.* root)
-    _count_matching,
-    get_bgp_rib,
-)
+from neteng.test_infra.dne.taac.libs.fpf.fpf_bgp_rib import _count_matching, get_bgp_rib
 from taac.health_check.health_check import types as hc_types
 
 
diff --git a/taac/health_checks/device_health_checks/generic_ods_health_check.py b/taac/health_checks/device_health_checks/generic_ods_health_check.py
@@ -19,10 +19,7 @@
 from taac.libs.fpf.fpf_collector_registry import (
     get_test_case_start_time,
 )
-from taac.utils.common import (  # oss-rewrite (force ShipIt re-export to taac.* root)
-    async_get_fburl_retry,
-    eval_jq,
-)
+from neteng.test_infra.dne.taac.utils.common import async_get_fburl_retry, eval_jq
 from pyre_extensions import JSON
 from taac.health_check.health_check import types as hc_types
 
diff --git a/taac/health_checks/device_health_checks/log_parsing_health_check.py b/taac/health_checks/device_health_checks/log_parsing_health_check.py
@@ -9,10 +9,7 @@
 from taac.health_checks.abstract_health_check import (
     AbstractDeviceHealthCheck,
 )
-from taac.utils import (  # oss-rewrite (force ShipIt re-export to taac.* root)
-    arista_utils,
-    log_parsing_utils,
-)
+from neteng.test_infra.dne.taac.utils import arista_utils, log_parsing_utils
 from taac.health_check.health_check import types as hc_types
 
 
diff --git a/taac/health_checks/ixia_health_checks/ixia_packet_loss_health_check.py b/taac/health_checks/ixia_health_checks/ixia_packet_loss_health_check.py
@@ -10,9 +10,7 @@
     AbstractIxiaHealthCheck,
 )
 from taac.health_checks.common_utils import evaluate_comparison
-from taac.ixia.taac_ixia import (  # oss-rewrite (force ShipIt re-export to taac.* root)
-    TaacIxia as Ixia,
-)
+from neteng.test_infra.dne.taac.ixia.taac_ixia import TaacIxia as Ixia
 from taac.utils.common import async_everpaste_str
 from taac.utils.json_thrift_utils import try_thrift_to_dict
 from taac.health_check.health_check import types as hc_types
diff --git a/taac/health_checks/ixia_health_checks/ixia_ptp_health_check.py b/taac/health_checks/ixia_health_checks/ixia_ptp_health_check.py
@@ -7,9 +7,7 @@
 from taac.health_checks.abstract_health_check import (
     AbstractIxiaHealthCheck,
 )
-from taac.ixia.taac_ixia import (  # oss-rewrite (force ShipIt re-export to taac.* root)
-    TaacIxia as Ixia,
-)
+from neteng.test_infra.dne.taac.ixia.taac_ixia import TaacIxia as Ixia
 from taac.health_check.health_check import types as hc_types
 
 PTP_DEFAULT_OFFSET_NS_THRESHOLD: int = 50
diff --git a/taac/health_checks/ixia_health_checks/ixia_traffic_rate_health_check.py b/taac/health_checks/ixia_health_checks/ixia_traffic_rate_health_check.py
@@ -5,9 +5,7 @@
 from taac.health_checks.abstract_health_check import (
     AbstractIxiaHealthCheck,
 )
-from taac.ixia.taac_ixia import (  # oss-rewrite (force ShipIt re-export to taac.* root)
-    TaacIxia as Ixia,
-)
+from neteng.test_infra.dne.taac.ixia.taac_ixia import TaacIxia as Ixia
 from taac.utils.common import async_everpaste_str
 from taac.health_check.health_check import types as hc_types
 from tabulate import tabulate
diff --git a/taac/ixia/taac_ixia.py b/taac/ixia/taac_ixia.py
@@ -15,10 +15,7 @@
 )
 from ixnetwork_restpy.files import Files
 from taac.ixia.ixia import Ixia
-from taac.utils.oss_taac_lib_utils import (  # oss-rewrite (force ShipIt re-export to taac.* root)
-    none_throws,
-    retryable,
-)
+from neteng.test_infra.dne.taac.utils.oss_taac_lib_utils import none_throws, retryable
 from uhd_restpy.assistants.statistics.statviewassistant import (
     StatViewAssistant as UhdStatViewAssistant,
 )
diff --git a/taac/libs/fpf/fpf_stress_checks.py b/taac/libs/fpf/fpf_stress_checks.py
@@ -30,10 +30,7 @@
 from taac.internal.driver.fboss_switch_internal import (
     FbossSwitchInternal,
 )
-from taac.libs.fpf.fpf_bgp_rib import (  # oss-rewrite (force ShipIt re-export to taac.* root)
-    _count_matching,
-    get_bgp_rib,
-)
+from neteng.test_infra.dne.taac.libs.fpf.fpf_bgp_rib import _count_matching, get_bgp_rib
 from taac.libs.fpf.fpf_fsdb_ribmap import get_fsdb_rib_map
 from taac.libs.fpf.fpf_hrt_bulk_tracker import (
     count_failed_per_lane,
diff --git a/taac/libs/oss_test_bed_chunker.py b/taac/libs/oss_test_bed_chunker.py
@@ -18,10 +18,7 @@
 
 import typing as t
 
-from taac.constants import (  # oss-rewrite (force ShipIt re-export to taac.* root)
-    TestDevice,
-    TestTopology,
-)
+from neteng.test_infra.dne.taac.constants import TestDevice, TestTopology
 from taac.oss_topology_info.circuit_info_loader import (
     get_circuits_for_hostname_oss,
 )
diff --git a/taac/libs/periodic_task_worker.py b/taac/libs/periodic_task_worker.py
@@ -8,9 +8,7 @@
 import typing as t
 
 from taac.constants import PeriodicCheckResult
-from taac.ixia.taac_ixia import (  # oss-rewrite (force ShipIt re-export to taac.* root)
-    TaacIxia as Ixia,
-)
+from neteng.test_infra.dne.taac.ixia.taac_ixia import TaacIxia as Ixia
 from taac.libs.parameter_evaluator import ParameterEvaluator
 from taac.tasks.utils import get_task_obj
 from taac.utils.common import async_everpaste_file
diff --git a/taac/libs/taac_runner.py b/taac/libs/taac_runner.py
@@ -48,10 +48,7 @@
     TestSetupOrchestrator,
 )
 from taac.stages.stage_definitions import create_steps_stage
-from taac.steps.all_steps import (  # oss-rewrite (force ShipIt re-export to taac.* root)
-    NAME_TO_STEP,
-    STEP_NAME_TO_INPUT,
-)
+from neteng.test_infra.dne.taac.steps.all_steps import NAME_TO_STEP, STEP_NAME_TO_INPUT
 from taac.steps.step import Step
 from taac.steps.step_definitions import ValidationStep
 from taac.tasks.utils import run_task
diff --git a/taac/libs/test_setup_orchestrator.py b/taac/libs/test_setup_orchestrator.py
@@ -6,10 +6,7 @@
 import time
 import typing as t
 
-from taac.constants import (  # oss-rewrite (force ShipIt re-export to taac.* root)
-    FbossPackage,
-    TestTopology,
-)
+from neteng.test_infra.dne.taac.constants import FbossPackage, TestTopology
 from taac.ixia.taac_ixia import TaacIxia
 from taac.libs.oss_test_bed_chunker import OssTestBedChunker
 from taac.libs.traffic_generator import TrafficGenerator
diff --git a/taac/steps/step_definitions.py b/taac/steps/step_definitions.py
@@ -52,9 +52,7 @@
 from taac.internal.utils.openr_route_utils import (
     OpenRRouteManager,
 )
-from taac.steps.step import (  # oss-rewrite (force ShipIt re-export to taac.* root)
-    Step as StepBase,
-)
+from neteng.test_infra.dne.taac.steps.step import Step as StepBase
 from taac.tasks.utils import run_task
 from taac.utils.common import (
     async_write_test_result,
diff --git a/taac/tasks/base_task.py b/taac/tasks/base_task.py
@@ -4,9 +4,7 @@
 import typing as t
 
 from taac.constants import PeriodicCheckResult
-from taac.ixia.taac_ixia import (  # oss-rewrite (force ShipIt re-export to taac.* root)
-    TaacIxia as Ixia,
-)
+from neteng.test_infra.dne.taac.ixia.taac_ixia import TaacIxia as Ixia
 from taac.utils.driver_factory import async_get_device_driver
 from taac.utils.oss_taac_lib_utils import (
     ConsoleFileLogger,
diff --git a/taac/tasks/bgp_tcpdump_task.py b/taac/tasks/bgp_tcpdump_task.py
@@ -5,10 +5,7 @@
 import typing as t
 from enum import Enum
 
-from taac.constants import (  # oss-rewrite (force ShipIt re-export to taac.* root)
-    ARISTA_DAEMON_EXEC_SCRIPTS,
-    BGP_PORT,
-)
+from neteng.test_infra.dne.taac.constants import ARISTA_DAEMON_EXEC_SCRIPTS, BGP_PORT
 from taac.tasks.all import AristaDaemonControlTask
 from taac.tasks.base_task import BaseTask
 
diff --git a/taac/tasks/ixia_tasks.py b/taac/tasks/ixia_tasks.py
@@ -11,10 +11,7 @@
 from taac.tasks.base_task import BaseTask
 from taac.utils.common import get_default_bgp_configs
 from taac.utils.driver_factory import async_get_device_driver
-from taac.utils.oss_taac_lib_utils import (  # oss-rewrite (force ShipIt re-export to taac.* root)
-    none_throws,
-    retryable,
-)
+from neteng.test_infra.dne.taac.utils.oss_taac_lib_utils import none_throws, retryable
 
 
 class IxiaEnableDisableBgpPrefixes(BaseTask):
diff --git a/taac/tasks/utils.py b/taac/tasks/utils.py
@@ -3,9 +3,7 @@
 import asyncio
 import typing as t
 
-from taac.ixia.taac_ixia import (  # oss-rewrite (force ShipIt re-export to taac.* root)
-    TaacIxia as Ixia,
-)
+from neteng.test_infra.dne.taac.ixia.taac_ixia import TaacIxia as Ixia
 from taac.tasks.registry import TASK_NAME_TO_CLASS
 from taac.utils.oss_taac_lib_utils import ConsoleFileLogger
 from taac.test_as_a_config import types as taac_types
diff --git a/taac/testconfigs/routing/ebb/bag013_ash6_test_config.py b/taac/testconfigs/routing/ebb/bag013_ash6_test_config.py
@@ -26,10 +26,7 @@
 - Et3/36/3 -> 8/4 (BGP MON)
 """
 
-from taac.constants import (  # oss-rewrite (force ShipIt re-export to taac.* root)
-    BgpPlusPlusProfile,
-    Gigabyte,
-)
+from neteng.test_infra.dne.taac.constants import BgpPlusPlusProfile, Gigabyte
 from taac.health_checks.healthcheck_definitions import (
     create_bgp_graceful_restart_check,
     create_bgp_session_establish_check,
diff --git a/taac/utils/common.py b/taac/utils/common.py
@@ -15,10 +15,7 @@
 from typing import Type
 
 import pyjq
-from taac.constants import (  # oss-rewrite (force ShipIt re-export to taac.* root)
-    TestDevice,
-    TestResult,
-)
+from neteng.test_infra.dne.taac.constants import TestDevice, TestResult
 from taac.utils.oss_taac_lib_utils import (
     ConsoleFileLogger,
     get_root_logger,
diff --git a/taac/utils/deploy_utils.py b/taac/utils/deploy_utils.py
@@ -3,10 +3,7 @@
 import asyncio
 import typing as t
 
-from taac.constants import (  # oss-rewrite (force ShipIt re-export to taac.* root)
-    DNE_LOG_DIR,
-    RSYSLOG_AGENT_FILE,
-)
+from neteng.test_infra.dne.taac.constants import DNE_LOG_DIR, RSYSLOG_AGENT_FILE
 from taac.utils.driver_factory import async_get_device_driver
 from taac.utils.oss_taac_lib_utils import (
     ConsoleFileLogger,
diff --git a/taac/utils/taac_test_summary.py b/taac/utils/taac_test_summary.py
@@ -8,10 +8,7 @@
 from contextlib import contextmanager
 from dataclasses import dataclass, field
 
-from taac.utils.common import (  # oss-rewrite (force ShipIt re-export to taac.* root)
-    async_everpaste_str,
-    async_get_fburl,
-)
+from neteng.test_infra.dne.taac.utils.common import async_everpaste_str, async_get_fburl
 from taac.utils.taac_log_formatter import (
     format_duration,
     log_phase_end,

Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,7 @@`
`15`	`15`	`)`
`16`	`16`	`from ixnetwork_restpy.files import Files`
`17`	`17`	`from taac.ixia.ixia import Ixia`
`18`		`-from taac.utils.oss_taac_lib_utils import ( # oss-rewrite (force ShipIt re-export to taac.* root)`
`19`		`- none_throws,`
`20`		`- retryable,`
`21`		`-)`
	`18`	`+from neteng.test_infra.dne.taac.utils.oss_taac_lib_utils import none_throws, retryable`
`22`	`19`	`from uhd_restpy.assistants.statistics.statviewassistant import (`
`23`	`20`	`StatViewAssistant as UhdStatViewAssistant,`
`24`	`21`	`)`