Migrate to django 2.2.4

The django.core.urlresolvers module is removed in favor of its new location, django.urls.
The on_delete argument for ForeignKey and OneToOneField is required in models and migrations.

accounts/migrations/0001_initial.py

@@ -1,5 +1,6 @@
 from django.db import models, migrations
 from django.conf import settings
+from django.db.models import CASCADE
 
 
 class Migration(migrations.Migration):
@@ -16,8 +17,8 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('is_change', models.BooleanField(default=False)),
                 ('is_delete', models.BooleanField(default=False)),
-                ('instance', models.ForeignKey(to='instances.Instance')),
-                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+                ('instance', models.ForeignKey(to='instances.Instance', on_delete=CASCADE)),
+                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=CASCADE)),
             ],
             options={
             },

accounts/migrations/0003_usersshkey.py

@@ -1,5 +1,6 @@
 from django.db import models, migrations
 from django.conf import settings
+from django.db.models import CASCADE
 
 
 class Migration(migrations.Migration):
@@ -16,7 +17,7 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('keyname', models.CharField(max_length=25)),
                 ('keypublic', models.CharField(max_length=500)),
-                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=CASCADE)),
             ],
         ),
     ]

accounts/migrations/0004_userattributes.py

@@ -1,5 +1,6 @@
 from django.db import models, migrations
 from django.conf import settings
+from django.db.models import CASCADE
 
 
 class Migration(migrations.Migration):
@@ -17,7 +18,7 @@ class Migration(migrations.Migration):
                 ('max_instances', models.IntegerField(default=0)),
                 ('max_cpus', models.IntegerField(default=0)),
                 ('max_memory', models.IntegerField(default=0)),
-                ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL)),
+                ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL, on_delete=CASCADE)),
             ],
         ),
     ]

accounts/migrations/0015_auto_20180808_1449.py

@@ -1,6 +1,6 @@
 from django.conf import settings
 from django.db import migrations, models
-import django.db.models.deletion
+from django.db.models import DO_NOTHING
 
 
 class Migration(migrations.Migration):
@@ -13,6 +13,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='usersshkey',
             name='user',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to=settings.AUTH_USER_MODEL),
+            field=models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=DO_NOTHING),
         ),
     ]

accounts/views.py

@@ -1,6 +1,6 @@
 from django.shortcuts import render
 from django.http import HttpResponseRedirect
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from django.contrib.auth.models import User
 from django.contrib.auth.decorators import login_required

computes/views.py

@@ -1,7 +1,7 @@
 import json
 from django.utils import timezone
 from django.http import HttpResponse, HttpResponseRedirect
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.shortcuts import render, get_object_or_404
 from django.contrib.auth.decorators import login_required
 from computes.models import Compute

conf/requirements.txt

@@ -1,7 +1,6 @@
-Django==1.11.21
+Django==2.2.4
 websockify==0.8.0
 gunicorn==19.9.0
 lxml==4.2.5
 libvirt-python==5.3.0
 pytz
-rwlock

create/views.py

@@ -1,7 +1,7 @@
 from django.shortcuts import render, get_object_or_404
 from django.http import HttpResponseRedirect
 from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.contrib.auth.decorators import login_required
 from computes.models import Compute
 from create.models import Flavor

instances/views.py

@@ -8,7 +8,7 @@ import string
 import random
 from bisect import insort
 from django.http import HttpResponse, HttpResponseRedirect
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.shortcuts import render, get_object_or_404
 from django.utils.translation import ugettext_lazy as _
 from django.contrib.auth.decorators import login_required

interfaces/views.py

@@ -1,6 +1,6 @@
 from django.shortcuts import render, get_object_or_404
 from django.http import HttpResponseRedirect
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.contrib.auth.decorators import login_required
 from computes.models import Compute
 from interfaces.forms import AddInterface

logs/views.py

@@ -1,6 +1,6 @@
 from django.shortcuts import render
 from django.http import HttpResponse, HttpResponseRedirect
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.contrib.auth.decorators import login_required
 from instances.models import Instance
 from logs.models import Logs

networks/views.py

@@ -1,7 +1,7 @@
 from django.shortcuts import render, get_object_or_404
 from django.http import HttpResponseRedirect
 from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.contrib.auth.decorators import login_required
 from computes.models import Compute
 from networks.forms import AddNetPool

nwfilters/views.py

@@ -2,7 +2,7 @@ from django.shortcuts import render
 from django.http import HttpResponseRedirect
 from django.shortcuts import render, get_object_or_404
 from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.contrib.auth.decorators import login_required
 from computes.models import Compute
 from vrtManager import util

secrets/views.py

@@ -1,6 +1,6 @@
 from django.shortcuts import render, get_object_or_404
 from django.http import HttpResponseRedirect
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.contrib.auth.decorators import login_required
 from computes.models import Compute
 from secrets.forms import AddSecret

storages/views.py

@@ -1,7 +1,7 @@
 from django.shortcuts import render, get_object_or_404
 from django.http import HttpResponseRedirect, HttpResponse
 from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.contrib.auth.decorators import login_required
 from computes.models import Compute
 from storages.forms import AddStgPool, AddImage, CloneImage

webvirtcloud/settings.py.template

@@ -47,7 +47,6 @@ MIDDLEWARE_CLASSES = (
 AUTHENTICATION_BACKENDS = (
     'django.contrib.auth.backends.ModelBackend',
     #'django.contrib.auth.backends.RemoteUserBackend',
-    #'accounts.backends.MyRemoteUserBackend',
 )
 
 LOGIN_URL = '/accounts/login'