merge: with v3

apps/terminal/migrations/0050_auto_20220606_1745.py

@@ -13,6 +13,10 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='terminal',
             name='type',
-            field=models.CharField(choices=[('koko', 'KoKo'), ('guacamole', 'Guacamole'), ('omnidb', 'OmniDB'), ('xrdp', 'Xrdp'), ('lion', 'Lion'), ('core', 'Core'), ('celery', 'Celery'), ('magnus', 'Magnus'), ('razor', 'Razor')], default='koko', max_length=64, verbose_name='type'),
+            field=models.CharField(choices=[
+                ('koko', 'KoKo'), ('guacamole', 'Guacamole'), ('omnidb', 'OmniDB'),
+                ('xrdp', 'Xrdp'), ('lion', 'Lion'), ('core', 'Core'), ('celery', 'Celery'),
+                ('magnus', 'Magnus'), ('razor', 'Razor'), ('tinker', 'Tinker'),
+            ], default='koko', max_length=64, verbose_name='type'),
         ),
     ]

apps/terminal/migrations/0052_auto_20220713_1417.py

@@ -1,4 +1,4 @@
-# Generated by Django 3.2.12 on 2022-07-13 06:17
+# Generated by Django 3.1.14 on 2022-04-07 09:26
 
 import common.db.fields
 import django.core.validators
@@ -6,7 +6,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('terminal', '0051_sessionsharing_users'),
     ]
@@ -15,11 +14,15 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='endpoint',
             name='oracle_11g_port',
-            field=common.db.fields.PortField(default=15211, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(65535)], verbose_name='Oracle 11g Port'),
+            field=common.db.fields.PortField(default=15211, validators=[
+                django.core.validators.MinValueValidator(0),
+                django.core.validators.MaxValueValidator(65535)], verbose_name='Oracle 11g Port'),
         ),
         migrations.AddField(
             model_name='endpoint',
             name='oracle_12c_port',
-            field=common.db.fields.PortField(default=15212, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(65535)], verbose_name='Oracle 12c Port'),
+            field=common.db.fields.PortField(default=15212, validators=[
+                django.core.validators.MinValueValidator(0),
+                django.core.validators.MaxValueValidator(65535)], verbose_name='Oracle 12c Port'),
         ),
     ]

apps/terminal/migrations/0053_auto_20220830_1244.py

@@ -0,0 +1,32 @@
+# Generated by Django 3.2.13 on 2022-08-30 04:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('terminal', '0052_auto_20220713_1417'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='session',
+            name='protocol',
+            field=models.CharField(db_index=True, default='ssh', max_length=16),
+        ),
+        migrations.RenameField(
+            model_name='session',
+            old_name='system_user',
+            new_name='account',
+        ),
+        migrations.RemoveField(
+            model_name='session',
+            name='system_user_id',
+        ),
+        migrations.AlterField(
+            model_name='session',
+            name='account',
+            field=models.CharField(db_index=True, max_length=128, verbose_name='Account'),
+        ),
+    ]

apps/terminal/migrations/0054_auto_20221027_1125.py

@@ -0,0 +1,88 @@
+# Generated by Django 3.2.14 on 2022-10-27 03:25
+
+from django.db import migrations, models
+import django.db.models.deletion
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assets', '0107_auto_20221019_1115'),
+        ('terminal', '0053_auto_20220830_1244'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Applet',
+            fields=[
+                ('created_by', models.CharField(blank=True, max_length=32, null=True, verbose_name='Created by')),
+                ('updated_by', models.CharField(blank=True, max_length=32, null=True, verbose_name='Updated by')),
+                ('date_created', models.DateTimeField(auto_now_add=True, null=True, verbose_name='Date created')),
+                ('date_updated', models.DateTimeField(auto_now=True, verbose_name='Date updated')),
+                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
+                ('name', models.SlugField(max_length=128, unique=True, verbose_name='Name')),
+                ('display_name', models.CharField(max_length=128, verbose_name='Display name')),
+                ('version', models.CharField(max_length=16, verbose_name='Version')),
+                ('author', models.CharField(max_length=128, verbose_name='Author')),
+                ('type', models.CharField(choices=[('general', 'General'), ('web', 'Web')], default='general', max_length=16, verbose_name='Type')),
+                ('is_active', models.BooleanField(default=True, verbose_name='Is active')),
+                ('protocols', models.JSONField(default=list, verbose_name='Protocol')),
+                ('tags', models.JSONField(default=list, verbose_name='Tags')),
+                ('comment', models.TextField(blank=True, default='', verbose_name='Comment')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='AppletHost',
+            fields=[
+                ('host_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='assets.host')),
+                ('date_synced', models.DateTimeField(blank=True, null=True, verbose_name='Date synced')),
+                ('status', models.CharField(max_length=16, verbose_name='Status')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('assets.host',),
+        ),
+        migrations.CreateModel(
+            name='AppletPublication',
+            fields=[
+                ('created_by', models.CharField(blank=True, max_length=32, null=True, verbose_name='Created by')),
+                ('updated_by', models.CharField(blank=True, max_length=32, null=True, verbose_name='Updated by')),
+                ('date_created', models.DateTimeField(auto_now_add=True, null=True, verbose_name='Date created')),
+                ('date_updated', models.DateTimeField(auto_now=True, verbose_name='Date updated')),
+                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
+                ('status', models.CharField(default='', max_length=16, verbose_name='Status')),
+                ('comment', models.TextField(blank=True, default='', verbose_name='Comment')),
+                ('applet', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='terminal.applet', verbose_name='Applet')),
+                ('host', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='terminal.applethost', verbose_name='Host')),
+            ],
+            options={
+                'unique_together': {('applet', 'host')},
+            },
+        ),
+        migrations.CreateModel(
+            name='AppletHostDeployment',
+            fields=[
+                ('created_by', models.CharField(blank=True, max_length=32, null=True, verbose_name='Created by')),
+                ('updated_by', models.CharField(blank=True, max_length=32, null=True, verbose_name='Updated by')),
+                ('date_created', models.DateTimeField(auto_now_add=True, null=True, verbose_name='Date created')),
+                ('date_updated', models.DateTimeField(auto_now=True, verbose_name='Date updated')),
+                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
+                ('status', models.CharField(max_length=16, default='', verbose_name='Status')),
+                ('comment', models.TextField(blank=True, default='', verbose_name='Comment')),
+                ('host', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='terminal.applethost', verbose_name='Hosting')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.AddField(
+            model_name='applethost',
+            name='applets',
+            field=models.ManyToManyField(through='terminal.AppletPublication', to='terminal.Applet', verbose_name='Applet'),
+        ),
+    ]

apps/terminal/migrations/0055_auto_20221031_1848.py

@@ -0,0 +1,49 @@
+# Generated by Django 3.2.14 on 2022-10-31 10:48
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('terminal', '0054_auto_20221027_1125'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='applet',
+            name='hosts',
+            field=models.ManyToManyField(through='terminal.AppletPublication', to='terminal.AppletHost', verbose_name='Hosts'),
+        ),
+        migrations.AddField(
+            model_name='applethost',
+            name='date_inited',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Date inited'),
+        ),
+        migrations.AddField(
+            model_name='applethost',
+            name='inited',
+            field=models.BooleanField(default=False, verbose_name='Inited'),
+        ),
+        migrations.AddField(
+            model_name='applethostdeployment',
+            name='date_finished',
+            field=models.DateTimeField(null=True, verbose_name='Date finished'),
+        ),
+        migrations.AddField(
+            model_name='applethostdeployment',
+            name='date_start',
+            field=models.DateTimeField(db_index=True, null=True, verbose_name='Date start'),
+        ),
+        migrations.AlterField(
+            model_name='appletpublication',
+            name='applet',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='publications', to='terminal.applet', verbose_name='Applet'),
+        ),
+        migrations.AlterField(
+            model_name='appletpublication',
+            name='host',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='publications', to='terminal.applethost', verbose_name='Host'),
+        ),
+    ]

apps/terminal/migrations/0056_auto_20221101_1353.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.14 on 2022-11-01 05:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('terminal', '0055_auto_20221031_1848'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='applethost',
+            name='deploy_options',
+            field=models.JSONField(default=dict, verbose_name='Deploy options'),
+        ),
+        migrations.AddField(
+            model_name='applethostdeployment',
+            name='initial',
+            field=models.BooleanField(default=False, verbose_name='Initial'),
+        ),
+    ]

apps/terminal/migrations/0057_auto_20221102_1941.py

@@ -0,0 +1,24 @@
+# Generated by Django 3.2.14 on 2022-11-02 11:41
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('terminal', '0056_auto_20221101_1353'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='applethost',
+            name='terminal',
+            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='applet_host', to='terminal.terminal', verbose_name='Terminal'),
+        ),
+        migrations.AlterField(
+            model_name='appletpublication',
+            name='status',
+            field=models.CharField(default='ready', max_length=16, verbose_name='Status'),
+        ),
+    ]

apps/terminal/migrations/0058_auto_20221103_1624.py

@@ -0,0 +1,33 @@
+# Generated by Django 3.2.14 on 2022-11-03 08:24
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('terminal', '0057_auto_20221102_1941'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='terminal',
+            options={'permissions': (('view_terminalconfig', 'Can view terminal config'),), 'verbose_name': 'Terminal'},
+        ),
+        migrations.RemoveField(
+            model_name='terminal',
+            name='http_port',
+        ),
+        migrations.RemoveField(
+            model_name='terminal',
+            name='is_accepted',
+        ),
+        migrations.RemoveField(
+            model_name='terminal',
+            name='ssh_port',
+        ),
+        migrations.RemoveField(
+            model_name='applethost',
+            name='status',
+        ),
+    ]

apps/terminal/migrations/0059_applethostdeployment_task.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.14 on 2022-11-15 05:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('terminal', '0058_auto_20221103_1624'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='applethostdeployment',
+            name='task',
+            field=models.UUIDField(null=True, verbose_name='Task'),
+        ),
+    ]

apps/terminal/migrations/0060_alter_applethostdeployment_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.2.14 on 2022-11-18 02:55
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('terminal', '0059_applethostdeployment_task'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='applethostdeployment',
+            options={'ordering': ('-date_start',)},
+        ),
+    ]

apps/terminal/migrations/0061_rename_system_user_command_account.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.14 on 2022-12-05 05:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('terminal', '0060_alter_applethostdeployment_options'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='command',
+            old_name='system_user',
+            new_name='account',
+        ),
+        migrations.AlterField(
+            model_name='command',
+            name='account',
+            field=models.CharField(db_index=True, max_length=64, verbose_name='Account'),
+        ),
+    ]