0.1.3.1 完成平台区域

Accpet · Mar 31, 2018 · 498b0e9 · 498b0e9
1 parent c156d85
commit 498b0e9
Show file tree

Hide file tree

Showing 39 changed files with 321 additions and 628 deletions.
diff --git a/.idea/dataSources/1889c457-df0e-458e-8f3a-179258463762/storage.xml b/.idea/dataSources/1889c457-df0e-458e-8f3a-179258463762/storage.xml
diff --git a/.idea/dataSources/f04c7449-afb0-43f1-bc31-ceddacddcae4/storage.xml b/.idea/dataSources/f04c7449-afb0-43f1-bc31-ceddacddcae4/storage.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/asset/migrations/0001_initial.py b/asset/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0 on 2018-03-19 19:24
+# Generated by Django 2.0.3 on 2018-03-31 14:55
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -15,7 +15,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='asset',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('id', models.AutoField(primary_key=True, serialize=False, verbose_name='id')),
                 ('hostname', models.CharField(max_length=64, unique=True, verbose_name='主机名')),
                 ('network_ip', models.GenericIPAddressField(blank=True, null=True, verbose_name='外网IP')),
                 ('inner_ip', models.GenericIPAddressField(blank=True, null=True, verbose_name='内网IP')),
@@ -24,15 +24,18 @@ class Migration(migrations.Migration):
                 ('memory', models.CharField(blank=True, max_length=64, null=True, verbose_name='内存')),
                 ('disk', models.CharField(blank=True, max_length=256, null=True, verbose_name='硬盘')),
                 ('bandwidth', models.IntegerField(blank=True, default='1', null=True, verbose_name='带宽')),
-                ('platform', models.CharField(choices=[('1', '阿里云'), ('2', 'AWS'), ('3', '其他')], max_length=128, verbose_name='平台')),
-                ('region', models.CharField(choices=[('1', '华北2'), ('2', '香港'), ('3', '东京'), ('4', '其他')], max_length=256, verbose_name='区域')),
-                ('manager', models.CharField(choices=[('1', '何全'), ('2', '其他')], max_length=128, verbose_name='负责人')),
-                ('project', models.CharField(choices=[('1', '项目1'), ('2', '项目2'), ('3', '项目3'), ('其他', '其他')], max_length=128, verbose_name='项目')),
+                ('platform', models.CharField(choices=[('阿里云', '阿里云'), ('AWS', 'AWS'), ('其他', '其他')], max_length=128, verbose_name='平台')),
+                ('region', models.CharField(choices=[('香港', '香港'), ('东京', '东京')], max_length=128, verbose_name='区域')),
+                ('manager', models.CharField(choices=[('何全', '何全'), ('其他', '其他')], max_length=128, verbose_name='负责人')),
+                ('project', models.CharField(choices=[('项目1', '项目1'), ('项目2', '项目2'), ('项目3', '项目3'), ('其他', '其他')], max_length=128, verbose_name='项目')),
                 ('Instance_id', models.CharField(blank=True, max_length=64, null=True, verbose_name='实例ID')),
-                ('ctime', models.DateTimeField(verbose_name='购买时间')),
-                ('utime', models.DateTimeField(verbose_name='到期时间')),
+                ('buy_time', models.DateTimeField(blank=True, null=True, verbose_name='购买时间')),
+                ('expire_time', models.DateTimeField(blank=True, null=True, verbose_name='到期时间')),
                 ('ps', models.CharField(blank=True, max_length=1024, null=True, verbose_name='备注')),
+                ('port', models.IntegerField(blank=True, default='22', null=True, verbose_name='登录端口')),
                 ('is_active', models.BooleanField(default=True, verbose_name='激活')),
+                ('ctime', models.DateTimeField(auto_now_add=True, null=True, verbose_name='创建时间')),
+                ('utime', models.DateTimeField(auto_now=True, null=True, verbose_name='更新时间')),
             ],
             options={
                 'verbose_name': '资产管理',
@@ -42,28 +45,27 @@ class Migration(migrations.Migration):
             },
         ),
         migrations.CreateModel(
-            name='platform',
+            name='asset_user',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=30)),
+                ('hostname', models.CharField(max_length=64, unique=True, verbose_name='名称')),
+                ('username', models.CharField(blank=True, default='root', max_length=64, null=True, verbose_name='用户名')),
+                ('password', models.CharField(blank=True, max_length=256, null=True, verbose_name='密码')),
+                ('private_key', models.FileField(blank=True, null=True, upload_to='upload/privatekey/%Y%m%d68057', verbose_name='私钥')),
+                ('ps', models.CharField(blank=True, max_length=10240, null=True, verbose_name='备注')),
+                ('ctime', models.DateTimeField(auto_now_add=True, null=True, verbose_name='创建时间')),
+                ('utime', models.DateTimeField(auto_now=True, null=True, verbose_name='更新时间')),
             ],
             options={
-                'verbose_name': '云平台管理',
-                'verbose_name_plural': '云平台管理',
-                'db_table': 'platform',
+                'verbose_name': '资产用户',
+                'verbose_name_plural': '资产用户',
+                'db_table': 'asset_user',
+                'permissions': {('read_asset_user', '只读资产用户')},
             },
         ),
-        migrations.CreateModel(
-            name='region',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=40)),
-                ('platforms', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='asset.platform')),
-            ],
-            options={
-                'verbose_name': '云区域管理',
-                'verbose_name_plural': '云区域管理',
-                'db_table': 'region',
-            },
+        migrations.AddField(
+            model_name='asset',
+            name='user',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='asset.asset_user', verbose_name='登录用户'),
         ),
     ]
diff --git a/asset/migrations/0002_auto_20180319_1930.py b/asset/migrations/0002_auto_20180319_1930.py
diff --git a/asset/migrations/0015_auto_20180324_1631.py → asset/migrations/0002_auto_20180331_1456.py b/asset/migrations/0015_auto_20180324_1631.py → asset/migrations/0002_auto_20180331_1456.py
@@ -1,22 +1,18 @@
-# Generated by Django 2.0 on 2018-03-24 16:31
+# Generated by Django 2.0.3 on 2018-03-31 14:56
 
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('asset', '0014_auto_20180324_1631'),
+        ('asset', '0001_initial'),
     ]
 
     operations = [
-        migrations.RemoveField(
-            model_name='asset_user',
-            name='hostname',
-        ),
         migrations.AlterField(
             model_name='asset_user',
             name='private_key',
-            field=models.FileField(blank=True, null=True, upload_to='upload/private_key/%Y%m%d68479', verbose_name='私钥'),
+            field=models.FileField(blank=True, null=True, upload_to='upload/privatekey/%Y%m%d6679', verbose_name='私钥'),
         ),
     ]
diff --git a/asset/migrations/0003_auto_20180320_1733.py b/asset/migrations/0003_auto_20180320_1733.py
diff --git a/asset/migrations/0004_auto_20180320_2108.py b/asset/migrations/0004_auto_20180320_2108.py
diff --git a/asset/migrations/0005_auto_20180320_2129.py b/asset/migrations/0005_auto_20180320_2129.py
diff --git a/asset/migrations/0006_auto_20180320_2229.py b/asset/migrations/0006_auto_20180320_2229.py
diff --git a/asset/migrations/0007_auto_20180323_1431.py b/asset/migrations/0007_auto_20180323_1431.py
diff --git a/asset/migrations/0008_auto_20180323_2223.py b/asset/migrations/0008_auto_20180323_2223.py
diff --git a/asset/migrations/0009_auto_20180324_1600.py b/asset/migrations/0009_auto_20180324_1600.py