Revert "chore(agw): Move script-only dependencies to scripts folders (#…

…12773)"

This reverts commit 059393d.

Signed-off-by: Nils Semmelrock <nils.semmelrock@tngtech.com>

bazel/scripts/check_py_bazel.sh

@@ -54,6 +54,13 @@ DENY_LIST_NOT_RELEVANT=(
 DENY_LIST_NOT_YET_BAZELIFIED=(
   # TODO: GH12752 tests should be bazelified
   "./lte/gateway/python/integ_tests"
+  # TODO: GH12754 move to (lte|orc8r)/gateway/python/scripts/
+  "./orc8r/gateway/python/magma/common/health/docker_health_service.py"
+  "./orc8r/gateway/python/magma/common/health/health_service.py"
+  "./orc8r/gateway/python/magma/common/health/entities.py"
+  "./lte/gateway/python/magma/health/health_service.py"
+  "./lte/gateway/python/magma/health/entities.py"
+  "./lte/gateway/python/magma/pipelined/pg_set_session_msg.py"
   # TODO: GH12755 access via absolut path on the VM,
   # this needs to be refactored when make is not used anymore
   "./lte/gateway/python/magma/pipelined/tests/script/gtp-packet.py"

lte/gateway/python/scripts/lte_health_service.py → lte/gateway/python/magma/health/health_service.py

@@ -22,12 +22,12 @@
 from lte.protos.mobilityd_pb2_grpc import MobilityServiceStub
 from magma.common.service_registry import ServiceRegistry
 from magma.configuration.mconfig_managers import load_service_mconfig_as_json
-from orc8r.protos.common_pb2 import Void
-from scripts.lte_health_entities import (
+from magma.health.entities import (
     AGWHealthSummary,
     CoreDumps,
     RegistrationSuccessRate,
 )
+from orc8r.protos.common_pb2 import Void
 
 
 class AGWHealth:

lte/gateway/python/scripts/agw_health_cli.py

@@ -16,7 +16,7 @@
 import subprocess
 
 import fire
-from scripts.lte_health_service import AGWHealth
+from magma.health.health_service import AGWHealth
 from termcolor import colored
 
 

lte/gateway/python/scripts/cpe_monitoring_cli.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 """
 Copyright 2020 The Magma Authors.
 

lte/gateway/python/scripts/pipelined_cli.py

@@ -49,12 +49,12 @@
 from magma.pipelined.app.enforcement_stats import EnforcementStatsController
 from magma.pipelined.bridge_util import BridgeTools
 from magma.pipelined.ng_set_session_msg import CreateSessionUtil
+from magma.pipelined.pg_set_session_msg import CreateMMESessionUtils
 from magma.pipelined.policy_converters import convert_ipv4_str_to_ip_proto
 from magma.pipelined.qos.common import QosManager
 from magma.pipelined.service_manager import Tables
 from magma.subscriberdb.sid import SIDUtils
 from orc8r.protos.common_pb2 import Void
-from scripts.pg_set_session_msg import CreateMMESessionUtils
 
 LOG_INCREMENT = 25
 UEInfo = namedtuple(

orc8r/gateway/python/scripts/docker_health_service.py → orc8r/gateway/python/magma/common/health/docker_health_service.py

@@ -17,8 +17,8 @@
 
 import dateutil.parser
 import docker
-from scripts.orc8r_health_entities import Errors, ServiceHealth, Version
-from scripts.orc8r_health_service import GenericHealthChecker
+from magma.common.health.entities import Errors, ServiceHealth, Version
+from magma.common.health.health_service import GenericHealthChecker
 
 
 class DockerHealthChecker(GenericHealthChecker):

orc8r/gateway/python/scripts/orc8r_health_service.py → orc8r/gateway/python/magma/common/health/health_service.py

@@ -20,6 +20,15 @@
 
 import apt
 from dateutil import tz
+from magma.common.health.entities import (
+    ActiveState,
+    Errors,
+    HealthStatus,
+    HealthSummary,
+    RestartFrequency,
+    ServiceHealth,
+    Version,
+)
 from magma.common.service import MagmaService
 from magma.common.service_registry import ServiceRegistry
 from magma.configuration.mconfig_managers import load_service_mconfig_as_json
@@ -29,15 +38,6 @@
 from orc8r.protos.magmad_pb2_grpc import MagmadStub
 from orc8r.protos.mconfig import mconfigs_pb2
 from pystemd.systemd1 import Unit
-from scripts.orc8r_health_entities import (
-    ActiveState,
-    Errors,
-    HealthStatus,
-    HealthSummary,
-    RestartFrequency,
-    ServiceHealth,
-    Version,
-)
 
 
 class GenericHealthChecker:

orc8r/gateway/python/scripts/health_cli.py

@@ -16,8 +16,8 @@
 import subprocess
 
 import fire as fire
-from scripts.docker_health_service import DockerHealthChecker
-from scripts.orc8r_health_service import GenericHealthChecker
+from magma.common.health.docker_health_service import DockerHealthChecker
+from magma.common.health.health_service import GenericHealthChecker
 from termcolor import colored
 
 

orc8r/gateway/python/scripts/traffic_cli.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 """
 Copyright 2020 The Magma Authors.