diff --git a/.gitignore b/.gitignore
index 4d86431..a1ea7c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,5 @@ target/
 .pypirc
 
 .DS_Store
+
+.idea/
diff --git a/cloudshell/networking/juniper/autoload/juniper_snmp_autoload.py b/cloudshell/networking/juniper/autoload/juniper_snmp_autoload.py
index aea017e..30f6513 100755
--- a/cloudshell/networking/juniper/autoload/juniper_snmp_autoload.py
+++ b/cloudshell/networking/juniper/autoload/juniper_snmp_autoload.py
@@ -294,7 +294,7 @@ class JuniperSnmpAutoload(object):
         model = ''
         os_version = ''
         sys_obj_id = self.snmp_handler.get_property('SNMPv2-MIB', 'sysObjectID', 0)
-        model_search = re.search('^(?P<vendor>\w+)-\S+jnxProductName(?P<model>\S+)', sys_obj_id)
+        model_search = re.search('^(?P<vendor>\w+)-\S+jnxProduct(?:Name)?(?P<model>\S+)', sys_obj_id)
         if model_search:
             vendor = model_search.groupdict()['vendor'].capitalize()
             model = model_search.groupdict()['model']
diff --git a/version.txt b/version.txt
index 2d2d681..30b26df 100644
--- a/version.txt
+++ b/version.txt
@@ -1,1 +1,1 @@
-4.0.10
+4.0.11

Vendor and Model attributes sometimes empty
In some cases, vendor and Model attributes are empty during the autoload. For example when sysObjectID = jnxProductQFX520032C32Q.
diff --git a/tests/networking/juniper/autoload/test_juniper_snmp_autoload.py b/tests/networking/juniper/autoload/test_juniper_snmp_autoload.py
index e80ff56..9d4baa1 100644
--- a/tests/networking/juniper/autoload/test_juniper_snmp_autoload.py
+++ b/tests/networking/juniper/autoload/test_juniper_snmp_autoload.py
@@ -159,6 +159,34 @@ class TestJuniperSnmpAutoload(TestCase):
                  call('SNMPv2-MIB', 'sysLocation', '0')]
         self._snmp_handler.get_property.assert_has_calls(calls)
 
+    def test_build_root2(self):
+        vendor = 'Test_Vendor'
+        model = 'Tets_Model'
+        version = '12.1R6.5'
+        contact_name = Mock()
+        system_name = Mock()
+        location = Mock()
+        self._snmp_handler.get_property.side_effect = [
+            "{0}-testjnxProduct{1}".format(vendor, model),
+            "TEst JUNOS {} #/test".format(version),
+            contact_name,
+            system_name,
+            location
+        ]
+
+        self._autoload_operations_instance._build_root()
+
+        self.assertIs(self._autoload_operations_instance.resource.contact_name, contact_name)
+        self.assertIs(self._autoload_operations_instance.resource.system_name, system_name)
+        self.assertIs(self._autoload_operations_instance.resource.location, location)
+        self.assertEqual(self._resource.os_version, version)
+        self.assertEqual(self._resource.vendor, vendor.capitalize())
+        self.assertEqual(self._resource.model, model)
+        calls = [call('SNMPv2-MIB', 'sysObjectID', 0), call('SNMPv2-MIB', 'sysDescr', '0'),
+                 call('SNMPv2-MIB', 'sysContact', '0'), call('SNMPv2-MIB', 'sysName', '0'),
+                 call('SNMPv2-MIB', 'sysLocation', '0')]
+        self._snmp_handler.get_property.assert_has_calls(calls)
+
     def test_get_content_indexes(self):
         index1 = 1
         index2 = 2

pytest-asyncio-config.yml
pip install -e .[dev]
parse_log_pytest
requirements.txt
pytest pytest-cov pytest-xdist pytest-mock pytest-asyncio mock
apt-get update apt-get install -y gcc
3.9
requirements.txt
pytest --no-header -rA --tb=line --color=no -p no:cacheprovider -W ignore::DeprecationWarning
cloudshell-automation-api==7.0.0.132
cloudshell-cli==3.1.2
cloudshell-core==2.2.180
cloudshell-networking==5.0.0
cloudshell-networking-devices==2.0.8
-e git+https://github.com/QualiSystems/cloudshell-networking-juniper.git@118ac36e83190764bb65ded2c431aa129451687c#egg=cloudshell_networking_juniper
cloudshell-shell-core==3.1.240
cloudshell-snmp==3.0.136
coverage==7.8.0
ecdsa==0.19.1
exceptiongroup==1.2.2
execnet==2.1.1
iniconfig==2.1.0
ipcalc==1.1.3
jsonpickle==0.9.3
mock==5.2.0
packaging==24.2
paramiko==1.15.2
pluggy==1.5.0
ply==3.8
pyasn1==0.1.9
pycrypto==2.6.1
pysmi==0.0.6
pysnmp==4.3.1
pytest==8.3.5
pytest-asyncio==0.26.0
pytest-cov==6.0.0
pytest-mock==3.14.0
pytest-xdist==3.6.1
scpclient==0.7
six==1.17.0
tomli==2.2.1
typing_extensions==4.13.0

name: cloudshell-networking-juniper
channels:
  - defaults
  - https://repo.anaconda.com/pkgs/main
  - https://repo.anaconda.com/pkgs/r
  - conda-forge
dependencies:
  - _libgcc_mutex=0.1=main
  - _openmp_mutex=5.1=1_gnu
  - ca-certificates=2025.2.25=h06a4308_0
  - ld_impl_linux-64=2.40=h12ee557_0
  - libffi=3.4.4=h6a678d5_1
  - libgcc-ng=11.2.0=h1234567_1
  - libgomp=11.2.0=h1234567_1
  - libstdcxx-ng=11.2.0=h1234567_1
  - ncurses=6.4=h6a678d5_0
  - openssl=3.0.16=h5eee18b_0
  - pip=25.0=py39h06a4308_0
  - python=3.9.21=he870216_1
  - readline=8.2=h5eee18b_0
  - setuptools=75.8.0=py39h06a4308_0
  - sqlite=3.45.3=h5eee18b_0
  - tk=8.6.14=h39e8969_0
  - tzdata=2025a=h04d1e81_0
  - wheel=0.45.1=py39h06a4308_0
  - xz=5.6.4=h5eee18b_1
  - zlib=1.2.13=h5eee18b_1
  - pip:
      - cloudshell-automation-api==7.0.0.132
      - cloudshell-cli==3.1.2
      - cloudshell-core==2.2.180
      - cloudshell-networking==5.0.0
      - cloudshell-networking-devices==2.0.8
      - cloudshell-shell-core==3.1.240
      - cloudshell-snmp==3.0.136
      - coverage==7.8.0
      - ecdsa==0.19.1
      - exceptiongroup==1.2.2
      - execnet==2.1.1
      - iniconfig==2.1.0
      - ipcalc==1.1.3
      - jsonpickle==0.9.3
      - mock==5.2.0
      - packaging==24.2
      - paramiko==1.15.2
      - pluggy==1.5.0
      - ply==3.8
      - pyasn1==0.1.9
      - pycrypto==2.6.1
      - pysmi==0.0.6
      - pysnmp==4.3.1
      - pytest==8.3.5
      - pytest-asyncio==0.26.0
      - pytest-cov==6.0.0
      - pytest-mock==3.14.0
      - pytest-xdist==3.6.1
      - scpclient==0.7
      - six==1.17.0
      - tomli==2.2.1
      - typing-extensions==4.13.0
prefix: /opt/conda/envs/cloudshell-networking-juniper

tests/networking/juniper/autoload/test_juniper_snmp_autoload.py::TestJuniperSnmpAutoload::test_build_root2
tests/networking/juniper/autoload/test_juniper_snmp_autoload.py::TestJuniperSnmpAutoload::test_generic_logical_ports_by_name_prop tests/networking/juniper/autoload/test_juniper_snmp_autoload.py::TestJuniperSnmpAutoload::test_generic_physical_ports_by_name_prop tests/networking/juniper/autoload/test_juniper_snmp_autoload.py::TestJuniperSnmpAutoload::test_get_content_indexes
tests/networking/juniper/autoload/test_juniper_snmp_autoload.py::TestJuniperSnmpAutoload::test_build_root tests/networking/juniper/autoload/test_juniper_snmp_autoload.py::TestJuniperSnmpAutoload::test_content_indexes_prop tests/networking/juniper/autoload/test_juniper_snmp_autoload.py::TestJuniperSnmpAutoload::test_discover tests/networking/juniper/autoload/test_juniper_snmp_autoload.py::TestJuniperSnmpAutoload::test_if_indexes tests/networking/juniper/autoload/test_juniper_snmp_autoload.py::TestJuniperSnmpAutoload::test_init tests/networking/juniper/autoload/test_juniper_snmp_autoload.py::TestJuniperSnmpAutoload::test_initialize_snmp_handler tests/networking/juniper/autoload/test_juniper_snmp_autoload.py::TestJuniperSnmpAutoload::test_ipv4_table_prop tests/networking/juniper/autoload/test_juniper_snmp_autoload.py::TestJuniperSnmpAutoload::test_ipv6_table_prop tests/networking/juniper/autoload/test_juniper_snmp_autoload.py::TestJuniperSnmpAutoload::test_lldp_keys_prop tests/networking/juniper/autoload/test_juniper_snmp_autoload.py::TestJuniperSnmpAutoload::test_logger_property tests/networking/juniper/autoload/test_juniper_snmp_autoload.py::TestJuniperSnmpAutoload::test_snm_handler_property
.gitignore version.txt cloudshell/networking/juniper/autoload/juniper_snmp_autoload.py
.gitignore version.txt cloudshell/networking/juniper/autoload/juniper_snmp_autoload.py