diff --git a/uncloud_django_based/uncloud/uncloud/settings.py b/uncloud_django_based/uncloud/uncloud/settings.py index c1eaab2..b525073 100644 --- a/uncloud_django_based/uncloud/uncloud/settings.py +++ b/uncloud_django_based/uncloud/uncloud/settings.py @@ -67,7 +67,7 @@ INSTALLED_APPS = [ 'uncloud_net', 'uncloud_storage', 'uncloud_vm', - 'ungleich_service', + 'uncloud_service', 'opennebula' ] diff --git a/uncloud_django_based/uncloud/uncloud/urls.py b/uncloud_django_based/uncloud/uncloud/urls.py index e65bb4e..00eaf16 100644 --- a/uncloud_django_based/uncloud/uncloud/urls.py +++ b/uncloud_django_based/uncloud/uncloud/urls.py @@ -27,7 +27,7 @@ from uncloud_auth import views as authviews from uncloud_net import views as netviews from uncloud_pay import views as payviews from uncloud_vm import views as vmviews -from ungleich_service import views as serviceviews +from uncloud_service import views as serviceviews router = routers.DefaultRouter() diff --git a/uncloud_django_based/uncloud/ungleich_service/__init__.py b/uncloud_django_based/uncloud/uncloud_service/__init__.py similarity index 100% rename from uncloud_django_based/uncloud/ungleich_service/__init__.py rename to uncloud_django_based/uncloud/uncloud_service/__init__.py diff --git a/uncloud_django_based/uncloud/ungleich_service/admin.py b/uncloud_django_based/uncloud/uncloud_service/admin.py similarity index 100% rename from uncloud_django_based/uncloud/ungleich_service/admin.py rename to uncloud_django_based/uncloud/uncloud_service/admin.py diff --git a/uncloud_django_based/uncloud/ungleich_service/apps.py b/uncloud_django_based/uncloud/uncloud_service/apps.py similarity index 100% rename from uncloud_django_based/uncloud/ungleich_service/apps.py rename to uncloud_django_based/uncloud/uncloud_service/apps.py diff --git a/uncloud_django_based/uncloud/ungleich_service/migrations/0001_initial.py b/uncloud_django_based/uncloud/uncloud_service/migrations/0001_initial.py similarity index 69% rename from uncloud_django_based/uncloud/ungleich_service/migrations/0001_initial.py rename to uncloud_django_based/uncloud/uncloud_service/migrations/0001_initial.py index ea3646d..f0f5535 100644 --- a/uncloud_django_based/uncloud/ungleich_service/migrations/0001_initial.py +++ b/uncloud_django_based/uncloud/uncloud_service/migrations/0001_initial.py @@ -1,6 +1,7 @@ -# Generated by Django 3.0.3 on 2020-03-09 07:57 +# Generated by Django 3.0.5 on 2020-04-13 09:38 from django.conf import settings +import django.contrib.postgres.fields.jsonb from django.db import migrations, models import django.db.models.deletion import uuid @@ -11,8 +12,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('uncloud_vm', '0003_remove_vmhost_vms'), - ('uncloud_pay', '0002_auto_20200305_1524'), + ('uncloud_pay', '0005_auto_20200413_0924'), + ('uncloud_vm', '0010_auto_20200413_0924'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] @@ -20,8 +21,9 @@ class Migration(migrations.Migration): migrations.CreateModel( name='MatrixServiceProduct', 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'), ('ACTIVE', 'Active'), ('DELETED', 'Deleted')], default='PENDING', max_length=32)), + ('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='PENDING', max_length=32)), ('domain', models.CharField(default='domain.tld', max_length=255)), ('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)), diff --git a/uncloud_django_based/uncloud/ungleich_service/migrations/__init__.py b/uncloud_django_based/uncloud/uncloud_service/migrations/__init__.py similarity index 100% rename from uncloud_django_based/uncloud/ungleich_service/migrations/__init__.py rename to uncloud_django_based/uncloud/uncloud_service/migrations/__init__.py diff --git a/uncloud_django_based/uncloud/ungleich_service/models.py b/uncloud_django_based/uncloud/uncloud_service/models.py similarity index 100% rename from uncloud_django_based/uncloud/ungleich_service/models.py rename to uncloud_django_based/uncloud/uncloud_service/models.py diff --git a/uncloud_django_based/uncloud/ungleich_service/serializers.py b/uncloud_django_based/uncloud/uncloud_service/serializers.py similarity index 100% rename from uncloud_django_based/uncloud/ungleich_service/serializers.py rename to uncloud_django_based/uncloud/uncloud_service/serializers.py diff --git a/uncloud_django_based/uncloud/ungleich_service/tests.py b/uncloud_django_based/uncloud/uncloud_service/tests.py similarity index 100% rename from uncloud_django_based/uncloud/ungleich_service/tests.py rename to uncloud_django_based/uncloud/uncloud_service/tests.py diff --git a/uncloud_django_based/uncloud/ungleich_service/views.py b/uncloud_django_based/uncloud/uncloud_service/views.py similarity index 100% rename from uncloud_django_based/uncloud/ungleich_service/views.py rename to uncloud_django_based/uncloud/uncloud_service/views.py diff --git a/uncloud_django_based/uncloud/ungleich_service/migrations/0002_matrixserviceproduct_extra_data.py b/uncloud_django_based/uncloud/ungleich_service/migrations/0002_matrixserviceproduct_extra_data.py deleted file mode 100644 index f755ddb..0000000 --- a/uncloud_django_based/uncloud/ungleich_service/migrations/0002_matrixserviceproduct_extra_data.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.0.3 on 2020-03-21 10:58 - -import django.contrib.postgres.fields.jsonb -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('ungleich_service', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='matrixserviceproduct', - name='extra_data', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, editable=False, null=True), - ), - ] diff --git a/uncloud_django_based/uncloud/ungleich_service/migrations/0003_auto_20200322_1758.py b/uncloud_django_based/uncloud/ungleich_service/migrations/0003_auto_20200322_1758.py deleted file mode 100644 index 73dbd6a..0000000 --- a/uncloud_django_based/uncloud/ungleich_service/migrations/0003_auto_20200322_1758.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.3 on 2020-03-22 17:58 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('ungleich_service', '0002_matrixserviceproduct_extra_data'), - ] - - operations = [ - migrations.AlterField( - model_name='matrixserviceproduct', - name='status', - field=models.CharField(choices=[('PENDING', 'Pending'), ('AWAITING_PAYMENT', 'Awaiting payment'), ('BEING_CREATED', 'Being created'), ('ACTIVE', 'Active'), ('DELETED', 'Deleted'), ('DISABLED', 'Disabled'), ('UNUSABLE', 'Unusable')], default='PENDING', max_length=32), - ), - ] diff --git a/uncloud_django_based/uncloud/ungleich_service/migrations/0004_auto_20200403_1727.py b/uncloud_django_based/uncloud/ungleich_service/migrations/0004_auto_20200403_1727.py deleted file mode 100644 index eed8d33..0000000 --- a/uncloud_django_based/uncloud/ungleich_service/migrations/0004_auto_20200403_1727.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.5 on 2020-04-03 17:27 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('ungleich_service', '0003_auto_20200322_1758'), - ] - - 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='PENDING', max_length=32), - ), - ]