Skip to content

Commit 91ff28c

Browse files
remove functional dir, add requirements.txt and correct imports
1 parent 467252e commit 91ff28c

33 files changed

+27
-261
lines changed

tests/validation/Engine/mcm_apps.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import threading
66
from pathlib import Path
77

8-
from mcm.Engine.const import *
8+
from Engine.const import *
99

1010
logger = logging.getLogger(__name__)
1111
STOP_GRACEFULLY_PERIOD = 2 # seconds

tests/validation/Engine/rx_tx_app_connection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from enum import Enum
66

7-
from mcm.Engine.const import (
7+
from Engine.const import (
88
DEFAULT_REMOTE_IP_ADDR, DEFAULT_REMOTE_PORT, DEFAULT_PACING,
99
DEFAULT_PAYLOAD_TYPE_ST2110_20, DEFAULT_PIXEL_FORMAT,
1010
DEFAULT_MPG_URN, DEFAULT_PAYLOAD_TYPE_ST2110_30,

tests/validation/Engine/rx_tx_app_connection_json_usage_example.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# Copyright 2024-2025 Intel Corporation
33
# Media Communications Mesh
44

5-
from mcm.Engine.rx_tx_app_connection import (ConnectionMode, Rdma, St2110,
5+
from Engine.rx_tx_app_connection import (ConnectionMode, Rdma, St2110,
66
TransportType)
7-
from mcm.Engine.rx_tx_app_connection_json import ConnectionJson
8-
from mcm.Engine.rx_tx_app_payload import Audio, Video
7+
from Engine.rx_tx_app_connection_json import ConnectionJson
8+
from Engine.rx_tx_app_payload import Audio, Video
99

1010
rx_tx_app_connection_rdma = Rdma(connectionMode=ConnectionMode.UC, maxLatencyNs=30000)
1111

tests/validation/Engine/rx_tx_app_connection_usage_example.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright 2024-2025 Intel Corporation
33
# Media Communications Mesh
44

5-
from mcm.Engine.rx_tx_app_connection import (ConnectionMode, Rdma, St2110,
5+
from Engine.rx_tx_app_connection import (ConnectionMode, Rdma, St2110,
66
TransportType)
77

88
rx_tx_app_connection_rdma = Rdma(connectionMode=ConnectionMode.UC, maxLatencyNs=30000)

tests/validation/Engine/rx_tx_app_engine_mcm.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99

1010
from mfd_connect.exceptions import RemoteProcessInvalidState
1111

12-
import mcm.Engine.rx_tx_app_client_json
13-
import mcm.Engine.rx_tx_app_connection_json
14-
from mcm.Engine.const import LOG_FOLDER, RX_TX_APP_ERROR_KEYWORDS, DEFAULT_OUTPUT_PATH
15-
from mcm.Engine.mcm_apps import get_media_proxy_port, output_validator, save_process_log, get_mcm_path
16-
from mcm.Engine.rx_tx_app_file_validation_utils import validate_file
12+
import Engine.rx_tx_app_client_json
13+
import Engine.rx_tx_app_connection_json
14+
from Engine.const import LOG_FOLDER, RX_TX_APP_ERROR_KEYWORDS, DEFAULT_OUTPUT_PATH
15+
from Engine.mcm_apps import get_media_proxy_port, output_validator, save_process_log, get_mcm_path
16+
from Engine.rx_tx_app_file_validation_utils import validate_file
1717

1818
logger = logging.getLogger(__name__)
1919

2020

21-
def create_client_json(build: str, client: mcm.Engine.rx_tx_app_client_json.ClientJson) -> None:
21+
def create_client_json(build: str, client: Engine.rx_tx_app_client_json.ClientJson) -> None:
2222
logger.debug("Client JSON:")
2323
for line in client.to_json().splitlines():
2424
logger.debug(line)
@@ -28,7 +28,7 @@ def create_client_json(build: str, client: mcm.Engine.rx_tx_app_client_json.Clie
2828

2929

3030
def create_connection_json(
31-
build: str, rx_tx_app_connection: mcm.Engine.rx_tx_app_connection_json.ConnectionJson
31+
build: str, rx_tx_app_connection: Engine.rx_tx_app_connection_json.ConnectionJson
3232
) -> None:
3333
logger.debug("Connection JSON:")
3434
for line in rx_tx_app_connection.to_json().splitlines():
@@ -63,11 +63,11 @@ def __init__(
6363
self.rx_tx_app_connection = rx_tx_app_connection()
6464
self.payload = payload_type.from_file_info(media_path=self.media_path, file_info=file_dict)
6565
self.media_proxy_port = get_media_proxy_port(host)
66-
self.rx_tx_app_client_json = mcm.Engine.rx_tx_app_client_json.ClientJson(
66+
self.rx_tx_app_client_json = Engine.rx_tx_app_client_json.ClientJson(
6767
host,
6868
apiConnectionString=f"Server=127.0.0.1; Port={self.media_proxy_port}"
6969
)
70-
self.rx_tx_app_connection_json = mcm.Engine.rx_tx_app_connection_json.ConnectionJson(
70+
self.rx_tx_app_connection_json = Engine.rx_tx_app_connection_json.ConnectionJson(
7171
host=host, rx_tx_app_connection=self.rx_tx_app_connection, payload=self.payload
7272
)
7373
self.app_path = host.connection.path(self.mcm_path, "tests", "tools", "TestApp", "build")
@@ -291,7 +291,7 @@ def log_output():
291291

292292
def cleanup(self):
293293
"""Clean up the output file created by the Rx app."""
294-
from mcm.Engine.rx_tx_app_file_validation_utils import cleanup_file
294+
from Engine.rx_tx_app_file_validation_utils import cleanup_file
295295

296296
if self.output:
297297
success = cleanup_file(self.host.connection, str(self.output))

tests/validation/Engine/rx_tx_app_payload_usage_example.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright 2024-2025 Intel Corporation
33
# Media Communications Mesh
44

5-
from mcm.Engine.rx_tx_app_payload import Audio, Video
5+
from Engine.rx_tx_app_payload import Audio, Video
66

77
payload = Video(width=3840, height=2160)
88

tests/validation/conftest.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# Copyright 2024-2025 Intel Corporation
33
# Media Communications Mesh
44
import logging
5+
import sys
56
import os
67
import shutil
78
from ipaddress import IPv4Interface
@@ -11,14 +12,16 @@
1112
from mfd_connect.exceptions import ConnectionCalledProcessError, RemoteProcessTimeoutExpired
1213
import pytest
1314

15+
# Add the path to the 'common' module
16+
common_path = os.path.join(os.path.expanduser('~'), 'Media-Transport-Library', 'tests', 'validation')
17+
sys.path.append(common_path)
1418
from common.nicctl import Nicctl
15-
from mcm.Engine.const import *
16-
from mcm.Engine.mcm_apps import MediaProxy, MeshAgent, get_mcm_path, get_mtl_path
19+
from Engine.const import *
20+
from Engine.mcm_apps import MediaProxy, MeshAgent, get_mcm_path, get_mtl_path
1721
from datetime import datetime
1822

1923
logger = logging.getLogger(__name__)
2024

21-
2225
@pytest.fixture(scope="function")
2326
def media_proxy(hosts, mesh_agent, media_config, log_path):
2427
"""

tests/validation/functional/Readme.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

tests/validation/functional/__init__.py

Whitespace-only changes.

tests/validation/functional/cluster/Readme.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)