bugfix - junos show version for vmhosts

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+
+  ^\-+
   ^{master:\d+}
   ^{primary:\S+}
   ^\s*$$

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: ""

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: ""

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

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: ""

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: ""