Merge pull request rockstor#2690 from phillxnet/2625-Provisional-Djan…

…go-2.2-LTS-update

Provisional Django 2.2 LTS update rockstor#2625

pyproject.toml

@@ -60,7 +60,7 @@ generate-setup-file = false
 python = ">= 3.6, < 3.9"
 
 # [tool.poetry.group.django.dependencies]
-django = "==1.11.29"
+django = "~2.2"
 django-oauth-toolkit = "==1.1.2"
 djangorestframework = "==3.9.3"
 django-pipeline = "==1.7.0" # last version listed with Python 3.6 and Django 1.11 compatibility

src/rockstor/smart_manager/tests/test_snmp.py

@@ -30,7 +30,7 @@
 
 
 class SNMPTests(APITestCase):
-    multi_db = True
+    databases = '__all__'
     # TODO Requires command to reproduce minimal fixture:
     #  "services.json" fixture requires only the smart_manager.service model.
     fixtures = ["test_api.json", "services.json"]

src/rockstor/smart_manager/tests/test_task_scheduler.py

@@ -38,7 +38,7 @@ class TaskSchedulerTests(APITestCase):
     # src/rockstor/storageadmin/fixtures/test_pool_scrub_balance_minimal.json
     #
     # ./bin/test -v 2 -p test_task_scheduler.py
-    multi_db = True
+    databases = '__all__'
     fixtures = ["scheduled_tasks.json"]
     BASE_URL = "/api/sm/tasks"
 

src/rockstor/storageadmin/migrations/0018_auto_20231009_1827.py

@@ -0,0 +1,17 @@
+# Generated by Django 2.2.28 on 2023-10-09 17:27
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('storageadmin', '0017_auto_20230810_1141'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='disk',
+            options={'base_manager_name': 'attached'},
+        ),
+    ]

src/rockstor/storageadmin/tests/test_appliances.py

@@ -32,6 +32,7 @@ class AppliancesTests(APITestMixin):
     fixtures = ["test_api.json", "test_appliances.json"]
     BASE_URL = "/api/appliances"
     client = APIClient()
+    databases = '__all__'
 
     @classmethod
     def setUpClass(cls):

src/rockstor/storageadmin/tests/test_shares.py

@@ -61,7 +61,7 @@
 
 
 class ShareTests(APITestMixin):
-    multi_db = True
+    databases = '__all__'
     fixtures = ["test_api.json", "test_shares.json", "test_shares-services.json"]
     BASE_URL = "/api/shares"