Fix spec patching, add missing "time" imports

.openapi-generator/FILES

@@ -722,7 +722,6 @@ docs/PatchedWritableConsoleServerPortRequest.md
 docs/PatchedWritableConsoleServerPortTemplateRequest.md
 docs/PatchedWritableCustomFieldRequest.md
 docs/PatchedWritableDeviceRedundancyGroupRequest.md
-docs/PatchedWritableDeviceRedundancyGroupRequestFailoverStrategy.md
 docs/PatchedWritableDeviceRequest.md
 docs/PatchedWritableDeviceTypeRequest.md
 docs/PatchedWritableFrontPortRequest.md
@@ -756,15 +755,9 @@ docs/PlatformRequest.md
 docs/PortTypeChoices.md
 docs/PowerFeed.md
 docs/PowerFeedPhase.md
-docs/PowerFeedPhaseLabel.md
-docs/PowerFeedPhaseValue.md
 docs/PowerFeedSupply.md
-docs/PowerFeedSupplyLabel.md
-docs/PowerFeedSupplyValue.md
 docs/PowerFeedType.md
 docs/PowerFeedTypeChoices.md
-docs/PowerFeedTypeLabel.md
-docs/PowerFeedTypeValue.md
 docs/PowerOutlet.md
 docs/PowerOutletFeedLeg.md
 docs/PowerOutletFeedLegValue.md
@@ -787,8 +780,6 @@ docs/PrefixLocationAssignment.md
 docs/PrefixLocationAssignmentRequest.md
 docs/PrefixType.md
 docs/PrefixTypeChoices.md
-docs/PrefixTypeLabel.md
-docs/PrefixTypeValue.md
 docs/PrimaryIPv4.md
 docs/PrimaryIPv6.md
 docs/ProvidedContentsEnum.md
@@ -1627,7 +1618,6 @@ model_patched_writable_console_server_port_request.go
 model_patched_writable_console_server_port_template_request.go
 model_patched_writable_custom_field_request.go
 model_patched_writable_device_redundancy_group_request.go
-model_patched_writable_device_redundancy_group_request_failover_strategy.go
 model_patched_writable_device_request.go
 model_patched_writable_device_type_request.go
 model_patched_writable_front_port_request.go
@@ -1661,15 +1651,9 @@ model_platform_request.go
 model_port_type_choices.go
 model_power_feed.go
 model_power_feed_phase.go
-model_power_feed_phase_label.go
-model_power_feed_phase_value.go
 model_power_feed_supply.go
-model_power_feed_supply_label.go
-model_power_feed_supply_value.go
 model_power_feed_type.go
 model_power_feed_type_choices.go
-model_power_feed_type_label.go
-model_power_feed_type_value.go
 model_power_outlet.go
 model_power_outlet_feed_leg.go
 model_power_outlet_feed_leg_value.go
@@ -1692,8 +1676,6 @@ model_prefix_location_assignment.go
 model_prefix_location_assignment_request.go
 model_prefix_type.go
 model_prefix_type_choices.go
-model_prefix_type_label.go
-model_prefix_type_value.go
 model_primary_ipv4.go
 model_primary_ipv6.go
 model_provided_contents_enum.go

README.md

@@ -1896,7 +1896,6 @@ Class | Method | HTTP request | Description
  - [PatchedWritableConsoleServerPortTemplateRequest](docs/PatchedWritableConsoleServerPortTemplateRequest.md)
  - [PatchedWritableCustomFieldRequest](docs/PatchedWritableCustomFieldRequest.md)
  - [PatchedWritableDeviceRedundancyGroupRequest](docs/PatchedWritableDeviceRedundancyGroupRequest.md)
- - [PatchedWritableDeviceRedundancyGroupRequestFailoverStrategy](docs/PatchedWritableDeviceRedundancyGroupRequestFailoverStrategy.md)
  - [PatchedWritableDeviceRequest](docs/PatchedWritableDeviceRequest.md)
  - [PatchedWritableDeviceTypeRequest](docs/PatchedWritableDeviceTypeRequest.md)
  - [PatchedWritableFrontPortRequest](docs/PatchedWritableFrontPortRequest.md)
@@ -1930,15 +1929,9 @@ Class | Method | HTTP request | Description
  - [PortTypeChoices](docs/PortTypeChoices.md)
  - [PowerFeed](docs/PowerFeed.md)
  - [PowerFeedPhase](docs/PowerFeedPhase.md)
- - [PowerFeedPhaseLabel](docs/PowerFeedPhaseLabel.md)
- - [PowerFeedPhaseValue](docs/PowerFeedPhaseValue.md)
  - [PowerFeedSupply](docs/PowerFeedSupply.md)
- - [PowerFeedSupplyLabel](docs/PowerFeedSupplyLabel.md)
- - [PowerFeedSupplyValue](docs/PowerFeedSupplyValue.md)
  - [PowerFeedType](docs/PowerFeedType.md)
  - [PowerFeedTypeChoices](docs/PowerFeedTypeChoices.md)
- - [PowerFeedTypeLabel](docs/PowerFeedTypeLabel.md)
- - [PowerFeedTypeValue](docs/PowerFeedTypeValue.md)
  - [PowerOutlet](docs/PowerOutlet.md)
  - [PowerOutletFeedLeg](docs/PowerOutletFeedLeg.md)
  - [PowerOutletFeedLegValue](docs/PowerOutletFeedLegValue.md)
@@ -1961,8 +1954,6 @@ Class | Method | HTTP request | Description
  - [PrefixLocationAssignmentRequest](docs/PrefixLocationAssignmentRequest.md)
  - [PrefixType](docs/PrefixType.md)
  - [PrefixTypeChoices](docs/PrefixTypeChoices.md)
- - [PrefixTypeLabel](docs/PrefixTypeLabel.md)
- - [PrefixTypeValue](docs/PrefixTypeValue.md)
  - [PrimaryIPv4](docs/PrimaryIPv4.md)
  - [PrimaryIPv6](docs/PrimaryIPv6.md)
  - [ProvidedContentsEnum](docs/ProvidedContentsEnum.md)

api/nautobot_version

@@ -1 +1 @@
-2.2.11-beta
+2.2.24-beta

api/openapi.yaml

@@ -154096,12 +154096,8 @@ components:
           notes_url: https://openapi-generator.tech
           natural_slug: attribute1_attribute2
           connected_endpoint_reachable: true
-          type:
-            label: Primary
-            value: primary
-          supply:
-            label: AC
-            value: ac
+          type: primary
+          supply: ac
           power_panel:
             object_type: app_label.modelname
             id: null
@@ -154114,9 +154110,7 @@ components:
             object_type: app_label.modelname
             id: null
             url: https://openapi-generator.tech
-          phase:
-            label: Single phase
-            value: single-phase
+          phase: single-phase
           rack:
             object_type: app_label.modelname
             id: null
@@ -154149,12 +154143,8 @@ components:
           notes_url: https://openapi-generator.tech
           natural_slug: attribute1_attribute2
           connected_endpoint_reachable: true
-          type:
-            label: Primary
-            value: primary
-          supply:
-            label: AC
-            value: ac
+          type: primary
+          supply: ac
           power_panel:
             object_type: app_label.modelname
             id: null
@@ -154167,9 +154157,7 @@ components:
             object_type: app_label.modelname
             id: null
             url: https://openapi-generator.tech
-          phase:
-            label: Single phase
-            value: single-phase
+          phase: single-phase
           rack:
             object_type: app_label.modelname
             id: null
@@ -154692,9 +154680,7 @@ components:
           notes_url: https://openapi-generator.tech
           natural_slug: attribute1_attribute2
           description: description
-          type:
-            label: Container
-            value: container
+          type: network
           network: network
           ip_version: 6
           vlan:
@@ -154754,9 +154740,7 @@ components:
           notes_url: https://openapi-generator.tech
           natural_slug: attribute1_attribute2
           description: description
-          type:
-            label: Container
-            value: container
+          type: network
           network: network
           ip_version: 6
           vlan:
@@ -172744,7 +172728,7 @@ components:
           maxLength: 255
           type: string
         failover_strategy:
-          $ref: '#/components/schemas/PatchedWritableDeviceRedundancyGroupRequest_failover_strategy'
+          $ref: '#/components/schemas/BulkWritableDeviceRedundancyGroupRequest_failover_strategy'
         comments:
           type: string
         status:
@@ -175131,12 +175115,8 @@ components:
         notes_url: https://openapi-generator.tech
         natural_slug: attribute1_attribute2
         connected_endpoint_reachable: true
-        type:
-          label: Primary
-          value: primary
-        supply:
-          label: AC
-          value: ac
+        type: primary
+        supply: ac
         power_panel:
           object_type: app_label.modelname
           id: null
@@ -175149,9 +175129,7 @@ components:
           object_type: app_label.modelname
           id: null
           url: https://openapi-generator.tech
-        phase:
-          label: Single phase
-          value: single-phase
+        phase: single-phase
         rack:
           object_type: app_label.modelname
           id: null
@@ -176218,9 +176196,7 @@ components:
         notes_url: https://openapi-generator.tech
         natural_slug: attribute1_attribute2
         description: description
-        type:
-          label: Container
-          value: container
+        type: network
         network: network
         ip_version: 6
         vlan:
@@ -183406,7 +183382,7 @@ components:
           maxLength: 255
           type: string
         failover_strategy:
-          $ref: '#/components/schemas/PatchedWritableDeviceRedundancyGroupRequest_failover_strategy'
+          $ref: '#/components/schemas/BulkWritableDeviceRedundancyGroupRequest_failover_strategy'
         comments:
           type: string
         status:
@@ -186367,7 +186343,6 @@ components:
           type: string
       type: object
     BulkWritableDeviceRedundancyGroupRequest_failover_strategy:
-      default: null
       oneOf:
       - $ref: '#/components/schemas/FailoverStrategyEnum'
       - $ref: '#/components/schemas/BlankEnum'
@@ -187629,10 +187604,6 @@ components:
       oneOf:
       - $ref: '#/components/schemas/ConsolePortTypeChoices'
       - $ref: '#/components/schemas/BlankEnum'
-    PatchedWritableDeviceRedundancyGroupRequest_failover_strategy:
-      oneOf:
-      - $ref: '#/components/schemas/FailoverStrategyEnum'
-      - $ref: '#/components/schemas/BlankEnum'
     Rack_face:
       oneOf:
       - $ref: '#/components/schemas/FaceEnum'
@@ -187685,75 +187656,24 @@ components:
       oneOf:
       - $ref: '#/components/schemas/OuterUnitEnum'
       - $ref: '#/components/schemas/BlankEnum'
-    PowerFeed_type_value:
+    PowerFeed_type:
+      default: primary
       enum:
       - primary
       - redundant
       type: string
-    PowerFeed_type_label:
-      enum:
-      - Primary
-      - Redundant
-      type: string
-    PowerFeed_type:
-      default:
-        value: primary
-        label: Primary
-      example:
-        label: Primary
-        value: primary
-      properties:
-        value:
-          $ref: '#/components/schemas/PowerFeed_type_value'
-        label:
-          $ref: '#/components/schemas/PowerFeed_type_label'
-      type: object
-    PowerFeed_supply_value:
+    PowerFeed_supply:
+      default: ac
       enum:
       - ac
       - dc
       type: string
-    PowerFeed_supply_label:
-      enum:
-      - AC
-      - DC
-      type: string
-    PowerFeed_supply:
-      default:
-        value: ac
-        label: AC
-      example:
-        label: AC
-        value: ac
-      properties:
-        value:
-          $ref: '#/components/schemas/PowerFeed_supply_value'
-        label:
-          $ref: '#/components/schemas/PowerFeed_supply_label'
-      type: object
-    PowerFeed_phase_value:
+    PowerFeed_phase:
+      default: single-phase
       enum:
       - single-phase
       - three-phase
       type: string
-    PowerFeed_phase_label:
-      enum:
-      - Single phase
-      - Three-phase
-      type: string
-    PowerFeed_phase:
-      default:
-        value: single-phase
-        label: Single phase
-      example:
-        label: Single phase
-        value: single-phase
-      properties:
-        value:
-          $ref: '#/components/schemas/PowerFeed_phase_value'
-        label:
-          $ref: '#/components/schemas/PowerFeed_phase_label'
-      type: object
     PowerOutlet_type_value:
       enum:
       - iec-60320-c5
@@ -188188,31 +188108,13 @@ components:
         label:
           $ref: '#/components/schemas/PowerPort_type_label'
       type: object
-    Prefix_type_value:
+    Prefix_type:
+      default: network
       enum:
       - container
       - network
       - pool
       type: string
-    Prefix_type_label:
-      enum:
-      - Container
-      - Network
-      - Pool
-      type: string
-    Prefix_type:
-      default:
-        value: network
-        label: Network
-      example:
-        label: Container
-        value: container
-      properties:
-        value:
-          $ref: '#/components/schemas/Prefix_type_value'
-        label:
-          $ref: '#/components/schemas/Prefix_type_label'
-      type: object
     Rack_type_value:
       enum:
       - 2-post-frame