Integrating github/staging through commit 5f214be

AutomatedTesting/Gem/PythonTests/automatedtesting_shared/asset_database_utils.py

@@ -16,7 +16,7 @@ import sqlite3
 import os
 from typing import List
 
-import ly_test_tools.lumberyard.pipeline_utils as pipeline_utils
+import ly_test_tools.o3de.pipeline_utils as pipeline_utils
 
 # Index for ProductID in Products table in DB
 PRODUCT_ID_INDEX = 0

AutomatedTesting/Gem/PythonTests/automatedtesting_shared/asset_utils.py

@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # Built-in Imports
 from __future__ import annotations
 
-# Lumberyard Imports
+# Open 3D Engine Imports
 import azlmbr.bus as bus
 import azlmbr.asset as azasset
 import azlmbr.math as math

AutomatedTesting/Gem/PythonTests/automatedtesting_shared/base.py

@@ -20,7 +20,7 @@ import ly_test_tools.environment.file_system as file_system
 import ly_test_tools.environment.process_utils as process_utils
 import ly_test_tools.environment.waiter as waiter
 
-from ly_test_tools.lumberyard.asset_processor import AssetProcessor
+from ly_test_tools.o3de.asset_processor import AssetProcessor
 from ly_test_tools.launchers.exceptions import WaitTimeoutError
 from ly_test_tools.log.log_monitor import LogMonitor, LogMonitorException
 

AutomatedTesting/Gem/PythonTests/automatedtesting_shared/editor_entity_utils.py

@@ -16,7 +16,7 @@ from typing import List, Tuple, Union
 # Helper file Imports
 import utils
 
-# Lumberyard Imports
+# Open 3D Engine Imports
 import azlmbr
 import azlmbr.bus as bus
 import azlmbr.editor as editor

AutomatedTesting/Gem/PythonTests/automatedtesting_shared/editor_test_helper.py

@@ -17,7 +17,7 @@ import time
 from typing import Sequence
 from .report import Report
 
-# Lumberyard specific imports
+# Open 3D Engine specific imports
 import azlmbr.legacy.general as general
 import azlmbr.legacy.settings as settings
 

AutomatedTesting/Gem/PythonTests/automatedtesting_shared/hydra_editor_utils.py

@@ -296,8 +296,8 @@ def get_set_test(entity: object, component_index: int, path: str, value: object)
 
 def get_set_property_test(ly_object: object, attribute_name: str, value: object, expected_result: object = None) -> bool:
     """
-    Used to set and validate BehaviorContext property changes in Lumberyard objects
-    :param ly_object: The lumberyard object to test
+    Used to set and validate BehaviorContext property changes in Open 3D Engine objects
+    :param ly_object: The Open 3D Engine object to test
     :param attribute_name: property (attribute) name in the BehaviorContext
     :param value: new value for the variable being changed in the component
     :param expected_result: (optional) check the result against a specific expected value other than the one set
@@ -410,7 +410,7 @@ def set_editor_settings_by_path(path, value, is_bool = False):
 def get_component_type_id_map(component_name_list):
     """
     Given a list of component names, returns a map of component name -> component type id
-    :param component_name_list: The lumberyard object to test
+    :param component_name_list: The Open 3D Engine object to test
     :return: Dictionary of component name -> component type id pairs
     """
     # Remove any duplicates so we don't have to query for the same TypeId

AutomatedTesting/Gem/PythonTests/automatedtesting_shared/platform_setting.py

@@ -16,7 +16,7 @@ import pytest
 import logging
 from typing import Optional, Any
 
-import ly_test_tools.lumberyard.pipeline_utils as utils
+import ly_test_tools.o3de.pipeline_utils as utils
 
 logger = logging.getLogger(__name__)