From 1fac7a900b04a2e52f50a1029bbf826b8126a36e Mon Sep 17 00:00:00 2001
From: Michael Bear <38406045+mjbear@users.noreply.github.com>
Date: Tue, 30 Jul 2024 21:51:19 -0400
Subject: [PATCH 1/3] regenerate junos_show_version test data so keys are in
 alphabetical order

---
 .../juniper_junos_show_version.yml            | 46 +++++++-------
 .../juniper_junos_show_version_ex.yml         | 62 +++++++++----------
 ...juniper_junos_show_version_srx_cluster.yml | 62 +++++++++----------
 3 files changed, 85 insertions(+), 85 deletions(-)

diff --git a/tests/juniper_junos/show_version/juniper_junos_show_version.yml b/tests/juniper_junos/show_version/juniper_junos_show_version.yml
index 5bd54a21f4..b7edb1f413 100644
--- a/tests/juniper_junos/show_version/juniper_junos_show_version.yml
+++ b/tests/juniper_junos/show_version/juniper_junos_show_version.yml
@@ -1,42 +1,42 @@
 ---
 parsed_sample:
-  - hostname: "lab"
-    model: "mx240"
-    junos_version: "13.3R1.4"
+  - appid_services: "13.3R1.4"
     base_os_boot: "13.3R1.4"
     base_os_software_suite: "13.3R1.4"
-    kernel_software_suite: "13.3R1.4"
+    border_gateway_function_package: "13.3R1.4"
     crypto_software_suite: "13.3R1.4"
-    packet_forwarding_engine_support_m_t_ex_common: "13.3R1.4"
-    packet_forwarding_engine_support_mx_common: "13.3R1.4"
     fips_mode_utilities: ""
+    hostname: "lab"
+    idp_services: "13.3R1.4"
+    junos_version: "13.3R1.4"
+    kernel_software_suite: "13.3R1.4"
+    lab_package: "7.0"
+    model: "mx240"
     online_documentation: "113.3R1.4"
+    other_device_properties: []
+    other_properties_versions: []
+    packet_forwarding_engine_support_m_t_ex_common: "13.3R1.4"
+    packet_forwarding_engine_support_mx_common: "13.3R1.4"
+    platform_software_suite: "13.3R1.4"
+    py_base_i386: "13.3R1.4"
+    qfabric_system_id: "f158527a-f99e-11e0-9fbd-00e081c57cda"
+    redis_version: ""
+    routing_software_suite: "13.3R1.4"
+    runtime_software_suite: "13.3R1.4"
+    serial_number: "qfsn-0123456789"
     services_aacl_container_package: "13.3R1.4"
     services_application_level_gateways: "13.3R1.4"
-    appid_services: "13.3R1.4"
-    border_gateway_function_package: "13.3R1.4"
     services_captive_portal_content_delivery_package: "13.3R1.4"
+    services_crypto: "13.3R1.4"
     services_http_content_management_package: "13.3R1.4"
-    idp_services: "13.3R1.4"
+    services_ipsec: "13.3R1.4"
     services_jflow_container_package: "13.3R1.4"
     services_ll_pdf_container_package: "13.3R1.4"
-    services_mobilenext_software_package: "13.3R1.4"
     services_mobile_subscriber_service_package: "13.3R1.4"
+    services_mobilenext_software_package: "13.3R1.4"
     services_nat: "13.3R1.4"
     services_ptsp_container_package: "13.3R1.4"
     services_rpm: "13.3R1.4"
+    services_ssl: "13.3R1.4"
     services_stateful_firewall: "13.3R1.4"
     voice_services_container_package: "13.3R1.4"
-    services_crypto: "13.3R1.4"
-    services_ssl: "13.3R1.4"
-    services_ipsec: "13.3R1.4"
-    platform_software_suite: "13.3R1.4"
-    runtime_software_suite: "13.3R1.4"
-    routing_software_suite: "13.3R1.4"
-    py_base_i386: "13.3R1.4"
-    lab_package: "7.0"
-    serial_number: "qfsn-0123456789"
-    qfabric_system_id: "f158527a-f99e-11e0-9fbd-00e081c57cda"
-    other_device_properties: []
-    other_properties_versions: []
-    redis_version: ""
diff --git a/tests/juniper_junos/show_version/juniper_junos_show_version_ex.yml b/tests/juniper_junos/show_version/juniper_junos_show_version_ex.yml
index 175a88f2ab..80bd996ef9 100644
--- a/tests/juniper_junos/show_version/juniper_junos_show_version_ex.yml
+++ b/tests/juniper_junos/show_version/juniper_junos_show_version_ex.yml
@@ -1,42 +1,18 @@
 ---
 parsed_sample:
-  - hostname: "lab"
-    model: "ex4550-32f"
-    junos_version: "13.2X51-D35.3"
+  - appid_services: ""
     base_os_boot: ""
     base_os_software_suite: ""
-    kernel_software_suite: ""
+    border_gateway_function_package: ""
     crypto_software_suite: ""
-    packet_forwarding_engine_support_m_t_ex_common: ""
-    packet_forwarding_engine_support_mx_common: ""
     fips_mode_utilities: "13.2X51-D35.3"
-    online_documentation: "13.2X51-D35.3"
-    services_aacl_container_package: ""
-    services_application_level_gateways: ""
-    appid_services: ""
-    border_gateway_function_package: ""
-    services_captive_portal_content_delivery_package: ""
-    services_http_content_management_package: ""
+    hostname: "lab"
     idp_services: ""
-    services_jflow_container_package: ""
-    services_ll_pdf_container_package: ""
-    services_mobilenext_software_package: ""
-    services_mobile_subscriber_service_package: ""
-    services_nat: ""
-    services_ptsp_container_package: ""
-    services_rpm: ""
-    services_stateful_firewall: ""
-    voice_services_container_package: ""
-    services_crypto: ""
-    services_ssl: ""
-    services_ipsec: ""
-    platform_software_suite: ""
-    runtime_software_suite: ""
-    routing_software_suite: ""
-    py_base_i386: ""
+    junos_version: "13.2X51-D35.3"
+    kernel_software_suite: ""
     lab_package: ""
-    serial_number: ""
-    qfabric_system_id: ""
+    model: "ex4550-32f"
+    online_documentation: "13.2X51-D35.3"
     other_device_properties:
       - "EX 4500 Software Suite "
       - "Web Management "
@@ -47,4 +23,28 @@ parsed_sample:
       - "13.2X51-D35.3"
       - "13.2X51-D35.3"
       - "13.2X51-D35.3"
+    packet_forwarding_engine_support_m_t_ex_common: ""
+    packet_forwarding_engine_support_mx_common: ""
+    platform_software_suite: ""
+    py_base_i386: ""
+    qfabric_system_id: ""
     redis_version: ""
+    routing_software_suite: ""
+    runtime_software_suite: ""
+    serial_number: ""
+    services_aacl_container_package: ""
+    services_application_level_gateways: ""
+    services_captive_portal_content_delivery_package: ""
+    services_crypto: ""
+    services_http_content_management_package: ""
+    services_ipsec: ""
+    services_jflow_container_package: ""
+    services_ll_pdf_container_package: ""
+    services_mobile_subscriber_service_package: ""
+    services_mobilenext_software_package: ""
+    services_nat: ""
+    services_ptsp_container_package: ""
+    services_rpm: ""
+    services_ssl: ""
+    services_stateful_firewall: ""
+    voice_services_container_package: ""
diff --git a/tests/juniper_junos/show_version/juniper_junos_show_version_srx_cluster.yml b/tests/juniper_junos/show_version/juniper_junos_show_version_srx_cluster.yml
index 0edd14abfa..dca49275f6 100644
--- a/tests/juniper_junos/show_version/juniper_junos_show_version_srx_cluster.yml
+++ b/tests/juniper_junos/show_version/juniper_junos_show_version_srx_cluster.yml
@@ -1,42 +1,18 @@
 ---
 parsed_sample:
-  - hostname: "lab"
-    model: "srx1500"
-    junos_version: "19.4R3-S1.3"
+  - appid_services: ""
     base_os_boot: ""
     base_os_software_suite: ""
-    kernel_software_suite: ""
+    border_gateway_function_package: ""
     crypto_software_suite: ""
-    packet_forwarding_engine_support_m_t_ex_common: ""
-    packet_forwarding_engine_support_mx_common: ""
     fips_mode_utilities: "20201202.202156_builder_junos_194_r3_s1"
-    online_documentation: "20201202.202156_builder_junos_194_r3_s1"
-    services_aacl_container_package: ""
-    services_application_level_gateways: ""
-    appid_services: ""
-    border_gateway_function_package: ""
-    services_captive_portal_content_delivery_package: ""
-    services_http_content_management_package: ""
+    hostname: "lab"
     idp_services: ""
-    services_jflow_container_package: ""
-    services_ll_pdf_container_package: ""
-    services_mobilenext_software_package: ""
-    services_mobile_subscriber_service_package: ""
-    services_nat: ""
-    services_ptsp_container_package: ""
-    services_rpm: ""
-    services_stateful_firewall: ""
-    voice_services_container_package: ""
-    services_crypto: ""
-    services_ssl: ""
-    services_ipsec: ""
-    platform_software_suite: ""
-    runtime_software_suite: ""
-    routing_software_suite: ""
-    py_base_i386: ""
+    junos_version: "19.4R3-S1.3"
+    kernel_software_suite: ""
     lab_package: ""
-    serial_number: ""
-    qfabric_system_id: ""
+    model: "srx1500"
+    online_documentation: "20201202.202156_builder_junos_194_r3_s1"
     other_device_properties:
       - "OS Kernel 64-bit  "
       - "OS libs "
@@ -199,4 +175,28 @@ parsed_sample:
       - "1.0.0+20201202.202156_builder_junos_194_r3_s1"
       - "20201202.202156_builder_junos_194_r3_s1"
       - "20201028.e1cef1d_builder_stable_11"
+    packet_forwarding_engine_support_m_t_ex_common: ""
+    packet_forwarding_engine_support_mx_common: ""
+    platform_software_suite: ""
+    py_base_i386: ""
+    qfabric_system_id: ""
     redis_version: "20201202.202156_builder_junos_194_r3_s1"
+    routing_software_suite: ""
+    runtime_software_suite: ""
+    serial_number: ""
+    services_aacl_container_package: ""
+    services_application_level_gateways: ""
+    services_captive_portal_content_delivery_package: ""
+    services_crypto: ""
+    services_http_content_management_package: ""
+    services_ipsec: ""
+    services_jflow_container_package: ""
+    services_ll_pdf_container_package: ""
+    services_mobile_subscriber_service_package: ""
+    services_mobilenext_software_package: ""
+    services_nat: ""
+    services_ptsp_container_package: ""
+    services_rpm: ""
+    services_ssl: ""
+    services_stateful_firewall: ""
+    voice_services_container_package: ""

From 299d87deaaddeb23eb2b76f698827ce96071d6a5 Mon Sep 17 00:00:00 2001
From: Michael Bear <38406045+mjbear@users.noreply.github.com>
Date: Tue, 30 Jul 2024 22:01:07 -0400
Subject: [PATCH 2/3] handle CHEF and Junos for Automation Enhancement lines in
 show_version

---
 .../juniper_junos_show_version.textfsm        |  4 +-
 .../juniper_junos_show_version_qfx5100.raw    | 24 ++++++++
 .../juniper_junos_show_version_qfx5100.yml    | 60 +++++++++++++++++++
 3 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 tests/juniper_junos/show_version/juniper_junos_show_version_qfx5100.raw
 create mode 100644 tests/juniper_junos/show_version/juniper_junos_show_version_qfx5100.yml

diff --git a/ntc_templates/templates/juniper_junos_show_version.textfsm b/ntc_templates/templates/juniper_junos_show_version.textfsm
index d72bfc7c00..2c7b4acf82 100644
--- a/ntc_templates/templates/juniper_junos_show_version.textfsm
+++ b/ntc_templates/templates/juniper_junos_show_version.textfsm
@@ -82,7 +82,9 @@ Start
   ^Redis\s+\[${REDIS_VERSION}\]
   ^fpc\d+
   ^node\d+
-  ^-----
+  ^CHEF
+  ^[Jj][Uu][Nn][Oo][Ss]\s+for
+  ^\-+
   ^{master:\d+}
   ^{primary:\S+}
   ^\s*$$
diff --git a/tests/juniper_junos/show_version/juniper_junos_show_version_qfx5100.raw b/tests/juniper_junos/show_version/juniper_junos_show_version_qfx5100.raw
new file mode 100644
index 0000000000..81cb76373c
--- /dev/null
+++ b/tests/juniper_junos/show_version/juniper_junos_show_version_qfx5100.raw
@@ -0,0 +1,24 @@
+fpc0:
+-------------------------------------------------------------------------
+Hostname: asxx.xx.xx
+Model: qfx5100-48t-6q
+Junos: 21.4R3-S3.4
+JUNOS Base OS boot [21.4R3-S3.4]
+JUNOS Base OS Software Suite [21.4R3-S3.4]
+JUNOS Online Documentation [21.4R3-S3.4]
+JUNOS Crypto Software Suite [21.4R3-S3.4]
+JUNOS Crypto Software Suite [21.4R3-S3.4]
+JUNOS Kernel Software Suite [21.4R3-S3.4]
+JUNOS Packet Forwarding Engine Support (qfx-ex-x86-32) [21.4R3-S3.4]
+JUNOS Phone-Home Software Suite [21.4R3-S3.4]
+JUNOS Routing Software Suite [21.4R3-S3.4]
+JUNOS SDN Software Suite [21.4R3-S3.4]
+JUNOS jsd [i386-21.4R3-S3.4-jet-1]
+JUNOS Enterprise Software Suite [21.4R3-S3.4]
+JUNOS Web Management Platform Package [21.4R3-S3.4]
+JUNOS Openconfig [21.4R3-S3.4]
+JUNOS py-base-i386 [21.4R3-S3.4]
+JUNOS py-extensions-i386 [21.4R3-S3.4]
+CHEF client bundle [11.10.4_2.0_i386]
+JUNOS Host Software [20.4R3-S4.8]
+Junos for Automation Enhancement
diff --git a/tests/juniper_junos/show_version/juniper_junos_show_version_qfx5100.yml b/tests/juniper_junos/show_version/juniper_junos_show_version_qfx5100.yml
new file mode 100644
index 0000000000..f05896f85f
--- /dev/null
+++ b/tests/juniper_junos/show_version/juniper_junos_show_version_qfx5100.yml
@@ -0,0 +1,60 @@
+---
+parsed_sample:
+  - appid_services: ""
+    base_os_boot: "21.4R3-S3.4"
+    base_os_software_suite: "21.4R3-S3.4"
+    border_gateway_function_package: ""
+    crypto_software_suite: "21.4R3-S3.4"
+    fips_mode_utilities: ""
+    hostname: "asxx.xx.xx"
+    idp_services: ""
+    junos_version: "21.4R3-S3.4"
+    kernel_software_suite: "21.4R3-S3.4"
+    lab_package: ""
+    model: "qfx5100-48t-6q"
+    online_documentation: "21.4R3-S3.4"
+    other_device_properties:
+      - "Packet Forwarding Engine Support (qfx-ex-x86-32) "
+      - "Phone-Home Software Suite "
+      - "SDN Software Suite "
+      - "jsd "
+      - "Enterprise Software Suite "
+      - "Web Management Platform Package "
+      - "Openconfig "
+      - "py-extensions-i386 "
+      - "Host Software "
+    other_properties_versions:
+      - "21.4R3-S3.4"
+      - "21.4R3-S3.4"
+      - "21.4R3-S3.4"
+      - "i386-21.4R3-S3.4-jet-1"
+      - "21.4R3-S3.4"
+      - "21.4R3-S3.4"
+      - "21.4R3-S3.4"
+      - "21.4R3-S3.4"
+      - "20.4R3-S4.8"
+    packet_forwarding_engine_support_m_t_ex_common: ""
+    packet_forwarding_engine_support_mx_common: ""
+    platform_software_suite: ""
+    py_base_i386: "21.4R3-S3.4"
+    qfabric_system_id: ""
+    redis_version: ""
+    routing_software_suite: "21.4R3-S3.4"
+    runtime_software_suite: ""
+    serial_number: ""
+    services_aacl_container_package: ""
+    services_application_level_gateways: ""
+    services_captive_portal_content_delivery_package: ""
+    services_crypto: ""
+    services_http_content_management_package: ""
+    services_ipsec: ""
+    services_jflow_container_package: ""
+    services_ll_pdf_container_package: ""
+    services_mobile_subscriber_service_package: ""
+    services_mobilenext_software_package: ""
+    services_nat: ""
+    services_ptsp_container_package: ""
+    services_rpm: ""
+    services_ssl: ""
+    services_stateful_firewall: ""
+    voice_services_container_package: ""

From 7eb790e05ce2a67eb51dd1e684c757082b083970 Mon Sep 17 00:00:00 2001
From: Michael Bear <38406045+mjbear@users.noreply.github.com>
Date: Tue, 30 Jul 2024 22:13:07 -0400
Subject: [PATCH 3/3] handle additional Junos package names for Juniper vmhosts

---
 .../juniper_junos_show_version.textfsm        |   2 +-
 .../juniper_junos_show_version_vmhost.raw     |  99 +++++++++
 .../juniper_junos_show_version_vmhost.yml     | 198 ++++++++++++++++++
 3 files changed, 298 insertions(+), 1 deletion(-)
 create mode 100644 tests/juniper_junos/show_version/juniper_junos_show_version_vmhost.raw
 create mode 100644 tests/juniper_junos/show_version/juniper_junos_show_version_vmhost.yml

diff --git a/ntc_templates/templates/juniper_junos_show_version.textfsm b/ntc_templates/templates/juniper_junos_show_version.textfsm
index 2c7b4acf82..18323ae52f 100644
--- a/ntc_templates/templates/juniper_junos_show_version.textfsm
+++ b/ntc_templates/templates/juniper_junos_show_version.textfsm
@@ -83,7 +83,7 @@ Start
   ^fpc\d+
   ^node\d+
   ^CHEF
-  ^[Jj][Uu][Nn][Oo][Ss]\s+for
+  ^[Jj][Uu][Nn][Oo][Ss]\s+
   ^\-+
   ^{master:\d+}
   ^{primary:\S+}
diff --git a/tests/juniper_junos/show_version/juniper_junos_show_version_vmhost.raw b/tests/juniper_junos/show_version/juniper_junos_show_version_vmhost.raw
new file mode 100644
index 0000000000..0275ccb41b
--- /dev/null
+++ b/tests/juniper_junos/show_version/juniper_junos_show_version_vmhost.raw
@@ -0,0 +1,99 @@
+Hostname: MyRouter
+Model: nfx250_att_s1_10_t
+JUNOS OS Kernel 64-bit [20220419.9889e6f_builder_stable_11]
+JUNOS OS libs [20220419.9889e6f_builder_stable_11]
+JUNOS OS runtime [20220419.9889e6f_builder_stable_11]
+JUNOS OS time zone information [20220419.9889e6f_builder_stable_11]
+JUNOS network stack and utilities [20220825.064945_builder_junos_211_x3]
+JUNOS libs [20220825.064945_builder_junos_211_x3]
+JUNOS OS libs compat32 [20220419.9889e6f_builder_stable_11]
+JUNOS OS 32-bit compatibility [20220419.9889e6f_builder_stable_11]
+JUNOS libs compat32 [20220825.064945_builder_junos_211_x3]
+JUNOS runtime [20220825.064945_builder_junos_211_x3]
+JUNOS Packet Forwarding Engine Simulation Package [20220825.064945_builder_junos_211_x3]
+JUNOS sflow mx [20220825.064945_builder_junos_211_x3]
+JUNOS py extensions [20220825.064945_builder_junos_211_x3]
+JUNOS py base [20220825.064945_builder_junos_211_x3]
+JUNOS OS vmguest [20220419.9889e6f_builder_stable_11]
+JUNOS OS crypto [20220419.9889e6f_builder_stable_11]
+JUNOS OS boot-ve files [20220419.9889e6f_builder_stable_11]
+JUNOS na telemetry [21.1X3.3]
+JUNOS Wireless WAN Module [20220825.064945_builder_junos_211_x3]
+Junos vmguest package [20220825.064945_builder_junos_211_x3]
+JUNOS Unified Threat Management Module [20220825.064945_builder_junos_211_x3]
+JUNOS userfw [20220825.064945_builder_junos_211_x3]
+JUNOS syshmd [20220825.064945_builder_junos_211_x3]
+JUNOS switch CLI for NFX-3 [20220825.064945_builder_junos_211_x3]
+JUNOS security base [20220825.064945_builder_junos_211_x3]
+JUNOS mx libs compat32 [20220825.064945_builder_junos_211_x3]
+JUNOS mx runtime [20220825.064945_builder_junos_211_x3]
+JUNOS RPD Telemetry Application [21.1X3.3]
+JUNOS Routing mpls-oam-basic [20220825.064945_builder_junos_211_x3]
+JUNOS Routing mpls-oam-advanced [20220825.064945_builder_junos_211_x3]
+JUNOS Routing lsys [20220825.064945_builder_junos_211_x3]
+JUNOS Routing controller-internal [20220825.064945_builder_junos_211_x3]
+JUNOS Routing controller-external [20220825.064945_builder_junos_211_x3]
+JUNOS Routing 32-bit Compatible Version [20220825.064945_builder_junos_211_x3]
+JUNOS Routing aggregated [20220825.064945_builder_junos_211_x3]
+Redis [20220825.064945_builder_junos_211_x3]
+JUNOS probe utility [20220825.064945_builder_junos_211_x3]
+JUNOS pppoe [20220825.064945_builder_junos_211_x3]
+JUNOS common platform support [20220825.064945_builder_junos_211_x3]
+JUNOS nfx platform support [20220825.064945_builder_junos_211_x3]
+JUNOS Openconfig [21.1X3.3]
+JUNOS mtx network modules [20220825.064945_builder_junos_211_x3]
+JUNOS named module [20220825.064945_builder_junos_211_x3]
+JUNOS modules [20220825.064945_builder_junos_211_x3]
+JUNOS mx modules [20220825.064945_builder_junos_211_x3]
+JUNOS mx libs [20220825.064945_builder_junos_211_x3]
+JUNOS SQL Sync Daemon [20220825.064945_builder_junos_211_x3]
+JUNOS jdm ure cmd [20220825.064945_builder_junos_211_x3]
+JUNOS jdm cmd [20220825.064945_builder_junos_211_x3]
+JUNOS Security Intelligence [20220825.064945_builder_junos_211_x3]
+JUNOS idpd64 [20220825.064945_builder_junos_211_x3]
+JUNOS idpd [20220825.064945_builder_junos_211_x3]
+JUNOS Web management gatekeeper module [20220825.064945_builder_junos_211_x3]
+JUNOS High Availability [20220825.064945_builder_junos_211_x3]
+JUNOS Firewall Authentication[20220825.064945_builder_junos_211_x3]
+JUNOS nfx Data Plane Crypto Support [20220825.064945_builder_junos_211_x3]
+JUNOS daemons [20220825.064945_builder_junos_211_x3]
+JUNOS mx daemons [20220825.064945_builder_junos_211_x3]
+JUNOS Broadband Egde User Plane Apps [21.1X3.3]
+JUNOS appidd-srx application-identification daemon [20220825.064945_builder_junos_211_x3]
+JUNOS Advanced Anti-Malware [20220825.064945_builder_junos_211_x3]
+JUNOS Services URL Filter package [20220825.064945_builder_junos_211_x3]
+JUNOS Services TLB Service PIC package [20220825.064945_builder_junos_211_x3]
+JUNOS Services Telemetry [20220825.064945_builder_junos_211_x3]
+JUNOS Services TCP-LOG [20220825.064945_builder_junos_211_x3]
+JUNOS Services SSL [20220825.064945_builder_junos_211_x3]
+JUNOS Services SOFTWIRE [20220825.064945_builder_junos_211_x3]
+JUNOS Services Stateful Firewall [20220825.064945_builder_junos_211_x3]
+JUNOS Services RTCOM [20220825.064945_builder_junos_211_x3]
+JUNOS Services RPM [20220825.064945_builder_junos_211_x3]
+JUNOS Services PCEF package [20220825.064945_builder_junos_211_x3]
+JUNOS Services NAT [20220825.064945_builder_junos_211_x3]
+JUNOS Services Mobile Subscriber Service Container package [20220825.064945_builder_junos_211_x3]
+JUNOS Services MobileNext Software package [20220825.064945_builder_junos_211_x3]
+JUNOS Services Logging Report Framework package [20220825.064945_builder_junos_211_x3]
+JUNOS Services LL-PDF Container package [20220825.064945_builder_junos_211_x3]
+JUNOS Services Jflow Container package [20220825.064945_builder_junos_211_x3]
+JUNOS Services Deep Packet Inspection package [20220825.064945_builder_junos_211_x3]
+JUNOS Services IPSec [20220825.064945_builder_junos_211_x3]
+JUNOS Services IDS [20220825.064945_builder_junos_211_x3]
+JUNOS IDP Services [20220825.064945_builder_junos_211_x3]
+JUNOS Services HTTP Content Management package [20220825.064945_builder_junos_211_x3]
+JUNOS Services DNS Filter package (i386) [20220825.064945_builder_junos_211_x3]
+JUNOS Services Crypto [20220825.064945_builder_junos_211_x3]
+JUNOS Services Captive Portal and Content Delivery Container package [20220825.064945_builder_junos_211_x3]
+JUNOS Services COS [20220825.064945_builder_junos_211_x3]
+JUNOS AppId Services [20220825.064945_builder_junos_211_x3]
+JUNOS Services Application Level Gateways [20220825.064945_builder_junos_211_x3]
+JUNOS Services AACL Container package [20220825.064945_builder_junos_211_x3]
+JUNOS SDN Software Suite [20220825.064945_builder_junos_211_x3]
+JUNOS Extension Toolkit [20220825.064945_builder_junos_211_x3]
+JUNOS Phone-home [20220825.064945_builder_junos_211_x3]
+JUNOS FXPC Package [20220825.064945_builder_junos_211_x3]
+JUNOS Juniper Malware Removal Tool (JMRT) [1.0.0+20220825.064945_builder_junos_211_x3]
+JUNOS J-Insight [20220825.064945_builder_junos_211_x3]
+JUNOS Online Documentation [20220825.064945_builder_junos_211_x3]
+JUNOS jail runtime [20220419.9889e6f_builder_stable_11]
diff --git a/tests/juniper_junos/show_version/juniper_junos_show_version_vmhost.yml b/tests/juniper_junos/show_version/juniper_junos_show_version_vmhost.yml
new file mode 100644
index 0000000000..97e856828f
--- /dev/null
+++ b/tests/juniper_junos/show_version/juniper_junos_show_version_vmhost.yml
@@ -0,0 +1,198 @@
+---
+parsed_sample:
+  - appid_services: "20220825.064945_builder_junos_211_x3"
+    base_os_boot: ""
+    base_os_software_suite: ""
+    border_gateway_function_package: ""
+    crypto_software_suite: ""
+    fips_mode_utilities: ""
+    hostname: "MyRouter"
+    idp_services: "20220825.064945_builder_junos_211_x3"
+    junos_version: ""
+    kernel_software_suite: ""
+    lab_package: ""
+    model: "nfx250_att_s1_10_t"
+    online_documentation: "20220825.064945_builder_junos_211_x3"
+    other_device_properties:
+      - "OS Kernel 64-bit "
+      - "OS libs "
+      - "OS runtime "
+      - "OS time zone information "
+      - "network stack and utilities "
+      - "libs "
+      - "OS libs compat32 "
+      - "OS 32-bit compatibility "
+      - "libs compat32 "
+      - "runtime "
+      - "Packet Forwarding Engine Simulation Package "
+      - "sflow mx "
+      - "py extensions "
+      - "py base "
+      - "OS vmguest "
+      - "OS crypto "
+      - "OS boot-ve files "
+      - "na telemetry "
+      - "Wireless WAN Module "
+      - "Unified Threat Management Module "
+      - "userfw "
+      - "syshmd "
+      - "switch CLI for NFX-3 "
+      - "security base "
+      - "mx libs compat32 "
+      - "mx runtime "
+      - "RPD Telemetry Application "
+      - "Routing mpls-oam-basic "
+      - "Routing mpls-oam-advanced "
+      - "Routing lsys "
+      - "Routing controller-internal "
+      - "Routing controller-external "
+      - "Routing 32-bit Compatible Version "
+      - "Routing aggregated "
+      - "probe utility "
+      - "pppoe "
+      - "common platform support "
+      - "nfx platform support "
+      - "Openconfig "
+      - "mtx network modules "
+      - "named module "
+      - "modules "
+      - "mx modules "
+      - "mx libs "
+      - "SQL Sync Daemon "
+      - "jdm ure cmd "
+      - "jdm cmd "
+      - "Security Intelligence "
+      - "idpd64 "
+      - "idpd "
+      - "Web management gatekeeper module "
+      - "High Availability "
+      - "Firewall Authentication"
+      - "nfx Data Plane Crypto Support "
+      - "daemons "
+      - "mx daemons "
+      - "Broadband Egde User Plane Apps "
+      - "appidd-srx application-identification daemon "
+      - "Advanced Anti-Malware "
+      - "Services URL Filter package "
+      - "Services TLB Service PIC package "
+      - "Services Telemetry "
+      - "Services TCP-LOG "
+      - "Services SOFTWIRE "
+      - "Services RTCOM "
+      - "Services PCEF package "
+      - "Services Logging Report Framework package "
+      - "Services Deep Packet Inspection package "
+      - "Services IDS "
+      - "Services DNS Filter package (i386) "
+      - "Services COS "
+      - "SDN Software Suite "
+      - "Extension Toolkit "
+      - "Phone-home "
+      - "FXPC Package "
+      - "Juniper Malware Removal Tool (JMRT) "
+      - "J-Insight "
+      - "jail runtime "
+    other_properties_versions:
+      - "20220419.9889e6f_builder_stable_11"
+      - "20220419.9889e6f_builder_stable_11"
+      - "20220419.9889e6f_builder_stable_11"
+      - "20220419.9889e6f_builder_stable_11"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220419.9889e6f_builder_stable_11"
+      - "20220419.9889e6f_builder_stable_11"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220419.9889e6f_builder_stable_11"
+      - "20220419.9889e6f_builder_stable_11"
+      - "20220419.9889e6f_builder_stable_11"
+      - "21.1X3.3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "21.1X3.3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "21.1X3.3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "21.1X3.3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "1.0.0+20220825.064945_builder_junos_211_x3"
+      - "20220825.064945_builder_junos_211_x3"
+      - "20220419.9889e6f_builder_stable_11"
+    packet_forwarding_engine_support_m_t_ex_common: ""
+    packet_forwarding_engine_support_mx_common: ""
+    platform_software_suite: ""
+    py_base_i386: ""
+    qfabric_system_id: ""
+    redis_version: "20220825.064945_builder_junos_211_x3"
+    routing_software_suite: ""
+    runtime_software_suite: ""
+    serial_number: ""
+    services_aacl_container_package: "20220825.064945_builder_junos_211_x3"
+    services_application_level_gateways: "20220825.064945_builder_junos_211_x3"
+    services_captive_portal_content_delivery_package: "20220825.064945_builder_junos_211_x3"
+    services_crypto: "20220825.064945_builder_junos_211_x3"
+    services_http_content_management_package: "20220825.064945_builder_junos_211_x3"
+    services_ipsec: "20220825.064945_builder_junos_211_x3"
+    services_jflow_container_package: "20220825.064945_builder_junos_211_x3"
+    services_ll_pdf_container_package: "20220825.064945_builder_junos_211_x3"
+    services_mobile_subscriber_service_package: "20220825.064945_builder_junos_211_x3"
+    services_mobilenext_software_package: "20220825.064945_builder_junos_211_x3"
+    services_nat: "20220825.064945_builder_junos_211_x3"
+    services_ptsp_container_package: ""
+    services_rpm: "20220825.064945_builder_junos_211_x3"
+    services_ssl: "20220825.064945_builder_junos_211_x3"
+    services_stateful_firewall: "20220825.064945_builder_junos_211_x3"
+    voice_services_container_package: ""