Merge pull request #7 from draganbjedov/main

Added ITF Integration

Author: antonkri

qnx_qemu/.bazelrc

@@ -1,6 +1,14 @@
 common --registry=https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/
 common --registry=https://bcr.bazel.build
 
+build:x86_64-qnx --noexperimental_merged_skyframe_analysis_execution
+build:x86_64-qnx --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
+build:x86_64-qnx --incompatible_enable_cc_toolchain_resolution
 build:x86_64-qnx --incompatible_strict_action_env
 build:x86_64-qnx --platforms=@score_toolchains_qnx//platforms:x86_64-qnx
 build:x86_64-qnx --sandbox_writable_path=/var/tmp
+
+build:qemu-integration --config=x86_64-qnx
+build:qemu-integration --run_under=@score_itf//scripts:run_under_qemu
+build:qemu-integration --test_arg="--qemu"
+build:qemu-integration --test_arg="--os=qnx"

qnx_qemu/BUILD

@@ -10,7 +10,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # *******************************************************************************
-
+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
+load("@score_itf//:defs.bzl", "py_itf_test")
 
 
 sh_binary(
@@ -49,7 +50,7 @@ sh_binary(
         "$(location @toolchains_qnx_sdp//:host_dir)",
         "$(location //build:init)",
         "--timeout=90",
-        "--ssh-port=2222", 
+        "--ssh-port=2222",
         "--boot-wait=15",
     ],
     data = [
@@ -66,7 +67,7 @@ sh_binary(
         "$(location @toolchains_qnx_sdp//:host_dir)",
         "$(location //build:init)",
         "--timeout=90",
-        "--ssh-port=2222", 
+        "--ssh-port=2222",
         "--boot-wait=15",
     ],
     data = [
@@ -75,3 +76,22 @@ sh_binary(
         "@toolchains_qnx_sdp//:host_dir",
     ],
 )
+
+py_itf_test(
+    name = "test_ssh_qemu",
+    srcs = [
+        "test/itf/test_ssh.py",
+    ],
+    args = [
+        "--target_config=$(location target_config.json)",
+        "--ecu=s_core_ecu_qemu",
+        "--qemu_image=$(location //build:init)",
+    ],
+    plugins = [
+        "itf.plugins.base.base_plugin",
+    ],
+    data = [
+        "//build:init",
+        "target_config.json",
+    ],
+)

qnx_qemu/MODULE.bazel

@@ -30,5 +30,59 @@ use_repo(toolchains_qnx, "toolchains_qnx_qcc")
 use_repo(toolchains_qnx, "toolchains_qnx_ifs")
 
 register_toolchains("@toolchains_qnx_qcc//:qcc_x86_64")
-
 register_toolchains("@toolchains_qnx_ifs//:ifs_x86_64")
+
+###############################################################################
+#
+# Shell dependency
+#
+###############################################################################
+bazel_dep(name = "rules_shell", version = "0.6.0")
+
+###############################################################################
+#
+# Python version
+#
+###############################################################################
+bazel_dep(name = "rules_python", version = "1.0.0")
+
+PYTHON_VERSION = "3.12"
+
+python = use_extension("@rules_python//python/extensions:python.bzl", "python")
+python.toolchain(
+    configure_coverage_tool = True,
+    is_default = True,
+    python_version = PYTHON_VERSION,
+)
+use_repo(python)
+
+###############################################################################
+#
+# LLVM Toolchains
+#
+###############################################################################
+bazel_dep(name = "toolchains_llvm", version = "1.2.0")
+
+llvm = use_extension("@toolchains_llvm//toolchain/extensions:llvm.bzl", "llvm")
+llvm.toolchain(
+    cxx_standard = {"": "c++17"},
+    llvm_version = "19.1.0",
+)
+use_repo(llvm, "llvm_toolchain")
+use_repo(llvm, "llvm_toolchain_llvm")
+
+register_toolchains("@llvm_toolchain//:all")
+
+###############################################################################
+#
+# C++ rules
+#
+###############################################################################
+bazel_dep(name = "rules_cc", version = "0.1.1")
+
+###############################################################################
+#
+# ITF dependency
+#
+###############################################################################
+bazel_dep(name = "score_itf", version = "0.1.0")

qnx_qemu/README.md

@@ -83,7 +83,7 @@ qnx_qemu/
 │   ├── run_qemu.sh                    # QEMU launcher with bridge networking
 │   ├── run_qemu_portforward.sh        # QEMU launcher with port forwarding
 │   └── qnx_wireshark.sh               # Wireshark integration for network analysis
-│        
+│
 └── test/                              # Testing framework
    ├── test_qnx_qemu_bridge.sh        # Bridge networking integration tests
    └── test_qnx_qemu_portforward.sh   # Port forwarding integration tests
@@ -128,7 +128,17 @@ bazel run --config=x86_64-qnx //:test_qemu_bridge
 
 # Run integration tests for port forwarding
 bazel run --config=x86_64-qnx //:test_qemu_portforward
+
+# Run ITF tests for ssh
+bazel test --config=qemu-integration //:test_ssh_qemu --test_output=streamed
+```
+
+In order to provide credentials for qnx.com pass to bazel command:
+```bash
+--credential_helper=*.qnx.com=<path_to_toolchains-qnx>/tools/qnx_credential_helper.py
 ```
+See more in [toolchains_qnx README](https://github.com/eclipse-score/toolchains_qnx?tab=readme-ov-file#using-pre-packaged-qnx-80-sdp).
+
 
 ## Running the System
 
@@ -201,7 +211,7 @@ qemu-system-x86_64 \
 
 - **`-smp 2`** - Enable 2 CPU cores for SMP support
 - **`--enable-kvm`** - Use hardware virtualization for better performance
-- **`-cpu Cascadelake-Server-v5`** - Emulate modern Intel CPU features for older Ubuntu Versions change that to -cpu host in case of errors
+- **`-cpu Cascadelake-Server-v5`** - Emulate modern Intel CPU features for older Ubuntu versions change that to `-cpu host` in case of errors
 - **`-m 1G`** - Allocate 1GB of RAM
 - **`-nographic`** - Disable graphical display (console-only)
 - **`-netdev bridge`** - Connect to host bridge network for direct IP access
@@ -236,7 +246,7 @@ To modify the default IP address, edit the network configuration:
    vim configs/network_setup.sh
    ```
 
-2. **Eample on modify the IP configuration line**:
+2. **Example on modify the IP configuration line**:
 
    ```bash
    # Change this line to your desired IP
@@ -279,11 +289,16 @@ echo 1 | sudo tee /proc/sys/net/ipv4/ip_forward
 ```
 
 In case of failed to parse default acl file /etc/qemu/bridge.conf'
-1. Check acl of /etc/qemu/bridge.conf 
+1. Check acl of `/etc/qemu/bridge.conf`
 2. If file does not exist; create that file and add the following line in it
-allow virbr0
+`allow virbr0`
 3. Run qemu with Sudo as debug option in case of failure with acl
 
+In case of error "Operation not permitted" for `qemu-bridge-helper` run
+```bash
+sudo chmod u+s /usr/lib/qemu/qemu-bridge-helper
+```
+
 ## User Accounts and Access
 
 ### Available Users

qnx_qemu/configs/network_setup_dhcp.sh

@@ -42,21 +42,22 @@ MAX_RETRIES=10                         # 10 retries * 3 seconds = 30 seconds tot
 while [ $RETRY_COUNT -lt $MAX_RETRIES ]; do
     # Get current IP address for vtnet0
     IP_ADDR=$(ifconfig vtnet0 | grep 'inet ' | awk '{print $2}')
-    
+
     if [ -n "$IP_ADDR" ] && [ "$IP_ADDR" != "0.0.0.0" ]; then
         echo "---> DHCP successful! Acquired IP"
         # Get additional network info
         NETMASK=$(ifconfig vtnet0 | grep 'inet ' | awk '{print $4}')
         echo "---> Network configuration:"
-        
+
         # Save basic DHCP status
         echo "DHCP_SUCCESS" > /tmp_ram/dhcp_status
         IP_ADDR=$(ifconfig vtnet0 | grep 'inet ' | awk '{print $2}')
+        echo "IP address set to: $IP_ADDR"
         echo "IP: $IP_ADDR" >> /tmp_ram/dhcp_status
         echo "Date: $(date)" >> /tmp_ram/dhcp_status
         break
     fi
-    
+
     echo "---> Still waiting for DHCP lease... (attempt $((RETRY_COUNT + 1))/$MAX_RETRIES)"
     sleep 3
     RETRY_COUNT=$((RETRY_COUNT + 1))
@@ -70,14 +71,15 @@ if [ -z "$IP_ADDR" ] || [ "$IP_ADDR" = "0.0.0.0" ]; then
     if kill -0 $DHCP_PID 2>/dev/null; then
         kill $DHCP_PID 2>/dev/null
     fi
-    
+
     # Configure static IP as fallback
     echo "---> Configuring static IP fallback: 192.168.122.100"
     ifconfig vtnet0 192.168.122.100 netmask 255.255.255.0
     route add default 192.168.122.1  # Add default gateway
-    
+
     # Save fallback status
     echo "DHCP_FAILED_STATIC_FALLBACK" > /tmp_ram/dhcp_status
+    echo "IP address set to: 192.168.122.100"
     echo "IP: 192.168.122.100" >> /tmp_ram/dhcp_status
     echo "Date: $(date)" >> /tmp_ram/dhcp_status
 else

qnx_qemu/target_config.json

@@ -0,0 +1,30 @@
+{
+    "S_CORE_ECU_QEMU": {
+        "performance_processor": {
+            "name": "S_CORE_ECU_QEMU_PP",
+            "ip_address": "169.254.158.190",
+            "ext_ip_address": "169.254.158.190",
+            "ssh_port": 22,
+            "diagnostic_ip_address": "169.254.158.190",
+            "diagnostic_address": "0x91",
+            "serial_device": "",
+            "network_interfaces": [],
+            "ecu_name": "s_core_ecu_qemu_pp",
+            "data_router_config": {
+                "vlan_address": "127.0.0.1",
+                "multicast_addresses": []
+            },
+            "qemu_num_cores": 2,
+            "qemu_ram_size": "1G"
+        },
+        "safety_processor": {
+            "name": "S_CORE_ECU_QEMU_SC",
+            "ip_address": "169.254.158.190",
+            "diagnostic_ip_address": "169.254.158.190",
+            "diagnostic_address": "0x90",
+            "serial_device": "",
+            "use_doip": true
+        },
+        "other_processors": {}
+    }
+}

qnx_qemu/test/itf/test_ssh.py

@@ -0,0 +1,23 @@
+# *******************************************************************************
+# Copyright (c) 2025 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Apache License Version 2.0 which is available at
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# SPDX-License-Identifier: Apache-2.0
+# *******************************************************************************
+from itf.plugins.com.ssh import execute_command
+
+
+def test_ssh_with_default_user(target_fixture):
+    with target_fixture.sut.ssh() as ssh:
+        execute_command(ssh, "echo 'Username:' $USER && uname -a")
+
+
+def test_ssh_with_qnx_user(target_fixture):
+    with target_fixture.sut.ssh(username="qnxuser") as ssh:
+        execute_command(ssh, "echo 'Username:' $USER && uname -a")