Sync migrations after rebase

uncloud_django_based/uncloud/uncloud_pay/migrations/0005_auto_20200417_0551.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.0.5 on 2020-04-17 05:51
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('uncloud_pay', '0004_auto_20200409_1225'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='order',
-            name='recurring_period',
-            field=models.CharField(choices=[('ONCE', 'Onetime'), ('YEAR', 'Per Year'), ('MONTH', 'Per Month'), ('WEEK', 'Per Week'), ('DAY', 'Per Day'), ('HOUR', 'Per Hour'), ('MINUTE', 'Per Minute'), ('SECOND', 'Per Second')], default='MONTH', max_length=32),
-        ),
-    ]

uncloud_django_based/uncloud/uncloud_service/migrations/0002_auto_20200418_0641.py

@@ -0,0 +1,41 @@
+# Generated by Django 3.0.5 on 2020-04-18 06:41
+
+from django.conf import settings
+import django.contrib.postgres.fields.jsonb
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('uncloud_pay', '0005_auto_20200413_0924'),
+        ('uncloud_service', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='matrixserviceproduct',
+            name='status',
+            field=models.CharField(choices=[('PENDING', 'Pending'), ('AWAITING_PAYMENT', 'Awaiting payment'), ('BEING_CREATED', 'Being created'), ('SCHEDULED', 'Scheduled'), ('ACTIVE', 'Active'), ('MODIFYING', 'Modifying'), ('DELETED', 'Deleted'), ('DISABLED', 'Disabled'), ('UNUSABLE', 'Unusable')], default='AWAITING_PAYMENT', max_length=32),
+        ),
+        migrations.CreateModel(
+            name='GenericServiceProduct',
+            fields=[
+                ('extra_data', django.contrib.postgres.fields.jsonb.JSONField(blank=True, editable=False, null=True)),
+                ('uuid', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+                ('status', models.CharField(choices=[('PENDING', 'Pending'), ('AWAITING_PAYMENT', 'Awaiting payment'), ('BEING_CREATED', 'Being created'), ('SCHEDULED', 'Scheduled'), ('ACTIVE', 'Active'), ('MODIFYING', 'Modifying'), ('DELETED', 'Deleted'), ('DISABLED', 'Disabled'), ('UNUSABLE', 'Unusable')], default='AWAITING_PAYMENT', max_length=32)),
+                ('custom_description', models.TextField()),
+                ('custom_recurring_price', models.DecimalField(decimal_places=2, default=0.0, max_digits=10, validators=[django.core.validators.MinValueValidator(0)])),
+                ('custom_one_time_price', models.DecimalField(decimal_places=2, default=0.0, max_digits=10, validators=[django.core.validators.MinValueValidator(0)])),
+                ('order', models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, to='uncloud_pay.Order')),
+                ('owner', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

uncloud_django_based/uncloud/uncloud_vm/migrations/0004_vmproduct_primary_disk.py

@@ -7,7 +7,7 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('uncloud_vm', '0003_remove_vmhost_vms'),
+        ('uncloud_vm', '0004_remove_vmproduct_vmid'),
     ]
 
     operations = [

uncloud_django_based/uncloud/uncloud_vm/migrations/0011_merge_20200418_0641.py

@@ -0,0 +1,14 @@
+# Generated by Django 3.0.5 on 2020-04-18 06:41
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('uncloud_vm', '0009_auto_20200417_0551'),
+        ('uncloud_vm', '0010_auto_20200413_0924'),
+    ]
+
+    operations = [
+    ]

uncloud_django_based/uncloud/uncloud_vm/migrations/0012_auto_20200418_0641.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.5 on 2020-04-18 06:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('uncloud_vm', '0011_merge_20200418_0641'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='vmdiskproduct',
+            name='status',
+            field=models.CharField(choices=[('PENDING', 'Pending'), ('AWAITING_PAYMENT', 'Awaiting payment'), ('BEING_CREATED', 'Being created'), ('SCHEDULED', 'Scheduled'), ('ACTIVE', 'Active'), ('MODIFYING', 'Modifying'), ('DELETED', 'Deleted'), ('DISABLED', 'Disabled'), ('UNUSABLE', 'Unusable')], default='AWAITING_PAYMENT', max_length=32),
+        ),
+    ]