From 5c0ce96b6fece788a4f5a0463f9278d892d3f6a9 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@netboxlabs.com>
Date: Fri, 24 Mar 2023 21:11:10 -0400
Subject: [PATCH] Reorganize management commands

---
 netbox/{extras => core}/management/commands/clearcache.py       | 0
 .../{utilities => core}/management/commands/makemigrations.py   | 2 +-
 netbox/{utilities => core}/management/commands/migrate.py       | 2 +-
 netbox/{extras => core}/management/commands/nbshell.py          | 0
 netbox/{extras => core}/management/commands/rqworker.py         | 0
 netbox/utilities/management/__init__.py                         | 0
 .../utilities/{management/commands/__init__.py => migration.py} | 0
 7 files changed, 2 insertions(+), 2 deletions(-)
 rename netbox/{extras => core}/management/commands/clearcache.py (100%)
 rename netbox/{utilities => core}/management/commands/makemigrations.py (95%)
 rename netbox/{utilities => core}/management/commands/migrate.py (77%)
 rename netbox/{extras => core}/management/commands/nbshell.py (100%)
 rename netbox/{extras => core}/management/commands/rqworker.py (100%)
 delete mode 100644 netbox/utilities/management/__init__.py
 rename netbox/utilities/{management/commands/__init__.py => migration.py} (100%)

diff --git a/netbox/extras/management/commands/clearcache.py b/netbox/core/management/commands/clearcache.py
similarity index 100%
rename from netbox/extras/management/commands/clearcache.py
rename to netbox/core/management/commands/clearcache.py
diff --git a/netbox/utilities/management/commands/makemigrations.py b/netbox/core/management/commands/makemigrations.py
similarity index 95%
rename from netbox/utilities/management/commands/makemigrations.py
rename to netbox/core/management/commands/makemigrations.py
index 6710a35e2..089a7cd18 100644
--- a/netbox/utilities/management/commands/makemigrations.py
+++ b/netbox/core/management/commands/makemigrations.py
@@ -4,7 +4,7 @@ from django.core.management.base import CommandError
 from django.core.management.commands.makemigrations import Command as _Command
 from django.db import models
 
-from . import custom_deconstruct
+from utilities.migration import custom_deconstruct
 
 models.Field.deconstruct = custom_deconstruct
 
diff --git a/netbox/utilities/management/commands/migrate.py b/netbox/core/management/commands/migrate.py
similarity index 77%
rename from netbox/utilities/management/commands/migrate.py
rename to netbox/core/management/commands/migrate.py
index 2aa51b713..8d5e45a40 100644
--- a/netbox/utilities/management/commands/migrate.py
+++ b/netbox/core/management/commands/migrate.py
@@ -2,6 +2,6 @@
 from django.core.management.commands.migrate import Command
 from django.db import models
 
-from . import custom_deconstruct
+from utilities.migration import custom_deconstruct
 
 models.Field.deconstruct = custom_deconstruct
diff --git a/netbox/extras/management/commands/nbshell.py b/netbox/core/management/commands/nbshell.py
similarity index 100%
rename from netbox/extras/management/commands/nbshell.py
rename to netbox/core/management/commands/nbshell.py
diff --git a/netbox/extras/management/commands/rqworker.py b/netbox/core/management/commands/rqworker.py
similarity index 100%
rename from netbox/extras/management/commands/rqworker.py
rename to netbox/core/management/commands/rqworker.py
diff --git a/netbox/utilities/management/__init__.py b/netbox/utilities/management/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/netbox/utilities/management/commands/__init__.py b/netbox/utilities/migration.py
similarity index 100%
rename from netbox/utilities/management/commands/__init__.py
rename to netbox/utilities/migration.py