Merge branch 'opennebula-integration' into vm_bill

hosting/migrations/0028_managevm_userhostingkey.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2017-04-29 18:28
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('hosting', '0027_auto_20160711_0210'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ManageVM',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+            ],
+            options={
+                'managed': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='UserHostingKey',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('public_key', models.TextField()),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

hosting/migrations/0029_userhostingkey_created_at.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2017-04-30 19:04
+from __future__ import unicode_literals
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hosting', '0028_managevm_userhostingkey'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userhostingkey',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, default=datetime.datetime(2017, 4, 30, 19, 4, 20, 780173, tzinfo=utc)),
+            preserve_default=False,
+        ),
+    ]

hosting/migrations/0030_userhostingkey_name.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2017-04-30 19:09
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hosting', '0029_userhostingkey_created_at'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userhostingkey',
+            name='name',
+            field=models.CharField(default='', max_length=100),
+            preserve_default=False,
+        ),
+    ]

hosting/migrations/0031_auto_20170503_0554.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2017-05-03 05:54
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hosting', '0030_userhostingkey_name'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='virtualmachinetype',
+            name='hosting_company',
+        ),
+        migrations.RemoveField(
+            model_name='virtualmachinetype',
+            name='location',
+        ),
+    ]

hosting/migrations/0032_auto_20170504_0315.py

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2017-05-04 03:15
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hosting', '0031_auto_20170503_0554'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='virtualmachinetype',
+            name='cores',
+            field=models.IntegerField(default=0),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='virtualmachinetype',
+            name='disk_size',
+            field=models.IntegerField(default=0),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='virtualmachinetype',
+            name='memory',
+            field=models.IntegerField(default=0),
+            preserve_default=False,
+        ),
+    ]

hosting/migrations/0033_virtualmachinetype_configuration.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2017-05-04 03:23
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hosting', '0032_auto_20170504_0315'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='virtualmachinetype',
+            name='configuration',
+            field=models.CharField(choices=[('debian', 'Debian 8'), ('ubuntu', 'Ubuntu 16.06'), ('devuan', 'Devuan 1'), ('centos', 'CentOS 7')], default='ubuntu', max_length=10),
+        ),
+    ]

hosting/migrations/0034_auto_20170504_0331.py

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2017-05-04 03:31
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hosting', '0033_virtualmachinetype_configuration'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='virtualmachinetype',
+            name='configuration',
+        ),
+        migrations.AlterField(
+            model_name='virtualmachineplan',
+            name='configuration',
+            field=models.CharField(choices=[('debian', 'Debian 8'), ('ubuntu', 'Ubuntu 16.06'), ('devuan', 'Devuan 1'), ('centos', 'CentOS 7')], max_length=20),
+        ),
+        migrations.AlterField(
+            model_name='virtualmachineplan',
+            name='vm_type',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='hosting.VirtualMachineType'),
+        ),
+    ]

hosting/migrations/0035_virtualmachineplan_opennebula_id.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2017-05-06 23:02
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hosting', '0034_auto_20170504_0331'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='virtualmachineplan',
+            name='opennebula_id',
+            field=models.IntegerField(default=0),
+            preserve_default=False,
+        ),
+    ]

hosting/migrations/0036_auto_20170506_2312.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2017-05-06 23:12
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hosting', '0035_virtualmachineplan_opennebula_id'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='virtualmachineplan',
+            name='opennebula_id',
+            field=models.IntegerField(null=True),
+        ),
+    ]