Snap for 11209752 from 5e6f633fde96958e8d7e4ce37c8850afd87c7acf to emu-33-releaseemu-33-release

Change-Id: I84724db9e3ce601efdbfe1ac619e382788d61056

2 files changed, 57 insertions, 61 deletions

diff --git a/pytest/test_embedded/tests/files/test_zip_distribution.py b/pytest/test_embedded/tests/files/test_zip_distribution.py
index 8f2b4da4..6bd4bf3b 100644
--- a/pytest/test_embedded/tests/files/test_zip_distribution.py
+++ b/pytest/test_embedded/tests/files/test_zip_distribution.py
@@ -50,7 +50,6 @@ def get_expected_files():
         "mksdcard",
         "nimble_bridge",
         "emulator",
-        "netsim"
     ]
 
     exp_files_win = [
@@ -68,7 +67,6 @@ def get_expected_files():
         "mksdcard.exe",
         "nimble_bridge.exe",
         "emulator.exe",
-        "netsim.exe",
         "android-emu-agents.lib",
         "concrt140.dll",
         "libandroid-emu-agents.dll",
@@ -137,7 +135,6 @@ def get_exp_sub_dirs():
             "libprotobuf.32.dylib",
             "vulkan"
         ],
-        "netsim-ui": ["assets", "index.html", "js", "node_modules"],
         "resources": [
             "Toren1BD.mtl",
             "Toren1BD.posters",
@@ -214,7 +211,6 @@ def get_exp_sub_dirs():
             "gles_mesa",
             "concrt140.dll"
         ],
-        "netsim-ui": ["assets", "index.html", "js", "node_modules"],
         "resources": [
             "Toren1BD.mtl",
             "Toren1BD.posters",
diff --git a/pytest/test_embedded/tests/netsim/test_handle_devices.py b/pytest/test_embedded/tests/netsim/test_handle_devices.py
index 479a5b4d..f7cd0f5c 100644
--- a/pytest/test_embedded/tests/netsim/test_handle_devices.py
+++ b/pytest/test_embedded/tests/netsim/test_handle_devices.py
@@ -2,60 +2,60 @@ import pytest
 from netsim_grpc import netsim_client
 
 
-@pytest.mark.e2e
-@pytest.mark.boot
-@pytest.mark.timeout(timeout=20, func_only=True)
-def test_device_attaches_to_netsimd(avd):
-    """Test case to verify that a device is attached to netsimd."""
-    assert len(netsim_client.NetsimClient().get_devices()) != 0
-
-@pytest.mark.e2e
-@pytest.mark.boot
-@pytest.mark.timeout(timeout=20, func_only=True)
-def test_netsim_patch_and_reset(avd):
-    """Test case to verify that patch and reset device in netsim"""
-    initial_devices = netsim_client.NetsimClient().get_devices()
-    assert len(initial_devices) != 0
-
-    # Patch Device Position and Orientation
-    device_name = list(initial_devices.keys())[0]
-    patch_position = netsim_client.model.Position(x=1,y=2,z=3)
-    patch_orientation = netsim_client.model.Orientation(yaw=30,pitch=60,roll=90)
-    assert netsim_client.NetsimClient().set_position(device_name, position=patch_position, orientation=patch_orientation)
-
-    # Verfiy the new Position and Orientation
-    post_patch_device = netsim_client.NetsimClient().get_devices()[device_name]
-    assert post_patch_device.position == patch_position
-    assert post_patch_device.orientation == patch_orientation
-
-    # Attempt Reset and Verify with Position and Orientation
-    netsim_client.NetsimClient().reset()
-    post_reset_device = netsim_client.NetsimClient().get_devices()[device_name]
-    assert post_reset_device.position == netsim_client.model.Position(x=0,y=0,z=0)
-    assert post_reset_device.orientation == netsim_client.model.Orientation(yaw=0,pitch=0,roll=0)
-
-@pytest.mark.e2e
-@pytest.mark.boot
-@pytest.mark.timeout(timeout=20, func_only=True)
-def test_netsim_radio_state_toggle(avd):
-    """Test case to verify patch radio in netsim"""
-    initial_devices = netsim_client.NetsimClient().get_devices()
-    assert len(initial_devices) != 0
-
-    # Turn off Radio State (BLE) of Device and Verify
-    device_name = list(initial_devices.keys())[0]
-    patch_radio = netsim_client.model.PhyKind.BLUETOOTH_LOW_ENERGY
-    patch_state = False
-    netsim_client.NetsimClient().set_radio(device_name, patch_radio, patch_state)
-    post_patch_device = netsim_client.NetsimClient().get_devices()[device_name]
-    for chip in post_patch_device.chips:
-        if chip.kind == netsim_client.common.ChipKind.BLUETOOTH:
-            assert chip.bt.low_energy.state == netsim_client.model.State.OFF
-
-    # Turn on Radio State (BLE) of Device and Verify
-    patch_state = True
-    netsim_client.NetsimClient().set_radio(device_name, patch_radio, patch_state)
-    post_patch_device = netsim_client.NetsimClient().get_devices()[device_name]
-    for chip in post_patch_device.chips:
-        if chip.kind == netsim_client.common.ChipKind.BLUETOOTH:
-            assert chip.bt.low_energy.state == netsim_client.model.State.ON
\ No newline at end of file
+# @pytest.mark.e2e
+# @pytest.mark.boot
+# @pytest.mark.timeout(timeout=20, func_only=True)
+# def test_device_attaches_to_netsimd(avd):
+#     """Test case to verify that a device is attached to netsimd."""
+#     assert len(netsim_client.NetsimClient().get_devices()) != 0
+
+# @pytest.mark.e2e
+# @pytest.mark.boot
+# @pytest.mark.timeout(timeout=20, func_only=True)
+# def test_netsim_patch_and_reset(avd):
+#     """Test case to verify that patch and reset device in netsim"""
+#     initial_devices = netsim_client.NetsimClient().get_devices()
+#     assert len(initial_devices) != 0
+
+#     # Patch Device Position and Orientation
+#     device_name = list(initial_devices.keys())[0]
+#     patch_position = netsim_client.model.Position(x=1,y=2,z=3)
+#     patch_orientation = netsim_client.model.Orientation(yaw=30,pitch=60,roll=90)
+#     assert netsim_client.NetsimClient().set_position(device_name, position=patch_position, orientation=patch_orientation)
+
+#     # Verfiy the new Position and Orientation
+#     post_patch_device = netsim_client.NetsimClient().get_devices()[device_name]
+#     assert post_patch_device.position == patch_position
+#     assert post_patch_device.orientation == patch_orientation
+
+#     # Attempt Reset and Verify with Position and Orientation
+#     netsim_client.NetsimClient().reset()
+#     post_reset_device = netsim_client.NetsimClient().get_devices()[device_name]
+#     assert post_reset_device.position == netsim_client.model.Position(x=0,y=0,z=0)
+#     assert post_reset_device.orientation == netsim_client.model.Orientation(yaw=0,pitch=0,roll=0)
+
+# @pytest.mark.e2e
+# @pytest.mark.boot
+# @pytest.mark.timeout(timeout=20, func_only=True)
+# def test_netsim_radio_state_toggle(avd):
+#     """Test case to verify patch radio in netsim"""
+#     initial_devices = netsim_client.NetsimClient().get_devices()
+#     assert len(initial_devices) != 0
+
+#     # Turn off Radio State (BLE) of Device and Verify
+#     device_name = list(initial_devices.keys())[0]
+#     patch_radio = netsim_client.model.PhyKind.BLUETOOTH_LOW_ENERGY
+#     patch_state = False
+#     netsim_client.NetsimClient().set_radio(device_name, patch_radio, patch_state)
+#     post_patch_device = netsim_client.NetsimClient().get_devices()[device_name]
+#     for chip in post_patch_device.chips:
+#         if chip.kind == netsim_client.common.ChipKind.BLUETOOTH:
+#             assert chip.bt.low_energy.state == netsim_client.model.State.OFF
+
+#     # Turn on Radio State (BLE) of Device and Verify
+#     patch_state = True
+#     netsim_client.NetsimClient().set_radio(device_name, patch_radio, patch_state)
+#     post_patch_device = netsim_client.NetsimClient().get_devices()[device_name]
+#     for chip in post_patch_device.chips:
+#         if chip.kind == netsim_client.common.ChipKind.BLUETOOTH:
+#             assert chip.bt.low_energy.state == netsim_client.model.State.ON
\ No newline at end of file