Merge remote-tracking branch 'origin/fnux-stable'

Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>

uncloud/uncloud_vm/migrations/0005_auto_20200227_1230.py

@@ -16,17 +16,6 @@ class Migration(migrations.Migration):
             model_name='vmsnapshotproduct',
             name='vm_uuid',
         ),
-        migrations.AddField(
-            model_name='vmproduct',
-            name='order',
-            field=models.ForeignKey(default=0, editable=False, on_delete=django.db.models.deletion.CASCADE, to='uncloud_pay.Order'),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='vmproduct',
-            name='status',
-            field=models.CharField(choices=[('pending', 'Pending'), ('being_created', 'Being created'), ('active', 'Active'), ('deleted', 'Deleted')], default='pending', max_length=256),
-        ),
         migrations.AddField(
             model_name='vmsnapshotproduct',
             name='vm',

uncloud/uncloud_vm/migrations/0005_auto_20200227_1532.py

@@ -0,0 +1,25 @@
+# Generated by Django 3.0.3 on 2020-02-27 15:32
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('uncloud_pay', '0004_auto_20200227_1532'),
+        ('uncloud_vm', '0004_vmsnapshotproduct'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='vmproduct',
+            name='order',
+            field=models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, to='uncloud_pay.Order'),
+        ),
+        migrations.AlterField(
+            model_name='vmsnapshotproduct',
+            name='order',
+            field=models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, to='uncloud_pay.Order'),
+        ),
+    ]

uncloud/uncloud_vm/migrations/0006_merge_20200228_1303.py

@@ -0,0 +1,14 @@
+# Generated by Django 3.0.3 on 2020-02-28 13:03
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('uncloud_vm', '0005_auto_20200227_1532'),
+        ('uncloud_vm', '0005_auto_20200227_1230'),
+    ]
+
+    operations = [
+    ]

uncloud/uncloud_vm/migrations/0007_auto_20200228_1344.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.0.3 on 2020-02-28 13:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('uncloud_vm', '0006_merge_20200228_1303'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='vmnetworkcard',
+            name='ip_address',
+            field=models.GenericIPAddressField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='vmproduct',
+            name='status',
+            field=models.CharField(choices=[('pending', 'Pending'), ('being_created', 'Being created'), ('active', 'Active'), ('deleted', 'Deleted')], default='pending', max_length=256),
+        ),
+    ]

uncloud/uncloud_vm/migrations/0008_vmproduct_name.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.3 on 2020-02-28 14:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('uncloud_vm', '0007_auto_20200228_1344'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='vmproduct',
+            name='name',
+            field=models.CharField(blank=True, max_length=32),
+        ),
+    ]

uncloud/uncloud_vm/migrations/0009_auto_20200228_1416.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.3 on 2020-02-28 14:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('uncloud_vm', '0008_vmproduct_name'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='vmproduct',
+            name='name',
+            field=models.CharField(max_length=32),
+        ),
+    ]