few fixes to prep rc2

nautobot · Jun 27, 2024 · 740a39b · 740a39b
1 parent 2150773
commit 740a39b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/docs/user/app_yaml_overrides.md b/docs/user/app_yaml_overrides.md
@@ -9,7 +9,7 @@ There are only a few components to the file and they're described below:
 - `root key data name` - Is fully defined in the schema definition.
 - `commands` - List of commands to execute in order to get the required data.
 - `command` - Actual `show` command to execute.
-- `parser` - Whether to use a parser (textfsm, pyats, ttp, etc) alternatively `no` can be used if the platform supports some other method to return structured data. E.g. (`| display json`) or an equivalent.
+- `parser` - Whether to use a parser (textfsm, pyats, ttp, etc) alternatively `none` can be used if the platform supports some other method to return structured data. E.g. (`| display json`) or an equivalent.
 - `jpath` - The jmespath (specifically jdiffs implementation) to extract the data from the parsed json returned from parser.
 - `post_processor` - Jinja2 capable code to further transform the returned data post jpath extraction.
 - `iterable_type` - A optional value to force a parsed result to a specific data type.

diff --git a/nautobot_device_onboarding/command_mappers/cisco_ios.yml b/nautobot_device_onboarding/command_mappers/cisco_ios.yml
@@ -17,6 +17,7 @@ sync_devices:
         parser: "textfsm"
         jpath: "[*].hardware[]"
         post_processor: "{{ obj | unique | first }}"
+        iterable_type: "str"
   mgmt_interface:
     commands:
       - command: "show interfaces"

diff --git a/nautobot_device_onboarding/nornir_plays/schemas.py b/nautobot_device_onboarding/nornir_plays/schemas.py
@@ -12,7 +12,7 @@ def sync_devices_schema(json_schema=True):
             "properties": {
                 "hostname": {"type": "string", "description": "Hostname of the network device"},
                 "serial": {"type": "string", "description": "Serial number of the network device"},
-                "device_type": {"type": "string", "description": "Type of the network device"},
+                "device_type": {"type": ["string", "integer"], "description": "Type of the network device"},
                 "mgmt_interface": {"type": "string", "description": "Management interface of the network device"},
                 "mask_length": {
                     "type": "integer",
@@ -117,7 +117,7 @@ def sync_network_data_schema(json_schema=True):
             "minItems": 1,
         },
         "hostname": {"type": "string"},
-        "device_type": {"type": "string"},
+        "device_type": {"type": ["string", "integer"]},
         "mgmt_interface": {"type": "string"},
         "mask_length": {"type": "integer"},
     },