From 3da226dce33a4e8cb6bfb33545480beb8529a619 Mon Sep 17 00:00:00 2001 From: Paarhati Ozkasgarli Date: Sun, 4 Dec 2016 14:11:25 +0000 Subject: [PATCH] Improvment on Provider Some model improvment on provider Change-Id: Id55e7cd982494554b3391a43a1061e68072248d5 Signed-off-by: Paarhati Ozkasgarli --- .../migrations/0004_auto_20161204_1157.py | 21 ++++++ .../migrations/0005_auto_20161204_1208.py | 25 +++++++ .../migrations/0006_auto_20161204_1212.py | 20 +++++ .../migrations/0007_auto_20161204_1217.py | 20 +++++ .../migrations/0008_auto_20161204_1230.py | 21 ++++++ provider/models.py | 70 +++++++++--------- static/provider-logo/aws_logo_web_300px.png | Bin 0 -> 6165 bytes 7 files changed, 140 insertions(+), 37 deletions(-) create mode 100644 provider/migrations/0004_auto_20161204_1157.py create mode 100644 provider/migrations/0005_auto_20161204_1208.py create mode 100644 provider/migrations/0006_auto_20161204_1212.py create mode 100644 provider/migrations/0007_auto_20161204_1217.py create mode 100644 provider/migrations/0008_auto_20161204_1230.py create mode 100644 static/provider-logo/aws_logo_web_300px.png diff --git a/provider/migrations/0004_auto_20161204_1157.py b/provider/migrations/0004_auto_20161204_1157.py new file mode 100644 index 0000000..0117b64 --- /dev/null +++ b/provider/migrations/0004_auto_20161204_1157.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.3 on 2016-12-04 11:57 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('provider', '0003_type'), + ] + + operations = [ + migrations.AlterField( + model_name='provider', + name='provider', + field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='provider.Type'), + ), + ] diff --git a/provider/migrations/0005_auto_20161204_1208.py b/provider/migrations/0005_auto_20161204_1208.py new file mode 100644 index 0000000..2f0f3d0 --- /dev/null +++ b/provider/migrations/0005_auto_20161204_1208.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.3 on 2016-12-04 12:08 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('provider', '0004_auto_20161204_1157'), + ] + + operations = [ + migrations.AlterField( + model_name='provider', + name='region', + field=models.CharField(db_index=True, max_length=255), + ), + migrations.AlterField( + model_name='provider', + name='username', + field=models.CharField(db_index=True, max_length=255), + ), + ] diff --git a/provider/migrations/0006_auto_20161204_1212.py b/provider/migrations/0006_auto_20161204_1212.py new file mode 100644 index 0000000..1e62988 --- /dev/null +++ b/provider/migrations/0006_auto_20161204_1212.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.3 on 2016-12-04 12:12 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('provider', '0005_auto_20161204_1208'), + ] + + operations = [ + migrations.AlterField( + model_name='type', + name='name', + field=models.CharField(db_index=True, max_length=255), + ), + ] diff --git a/provider/migrations/0007_auto_20161204_1217.py b/provider/migrations/0007_auto_20161204_1217.py new file mode 100644 index 0000000..a7353c3 --- /dev/null +++ b/provider/migrations/0007_auto_20161204_1217.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.3 on 2016-12-04 12:17 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('provider', '0006_auto_20161204_1212'), + ] + + operations = [ + migrations.AlterField( + model_name='type', + name='name', + field=models.CharField(db_index=True, max_length=255, unique=True), + ), + ] diff --git a/provider/migrations/0008_auto_20161204_1230.py b/provider/migrations/0008_auto_20161204_1230.py new file mode 100644 index 0000000..7f47cc0 --- /dev/null +++ b/provider/migrations/0008_auto_20161204_1230.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.3 on 2016-12-04 12:30 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('provider', '0007_auto_20161204_1217'), + ] + + operations = [ + migrations.AlterField( + model_name='provider', + name='provider', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='provider.Type'), + ), + ] diff --git a/provider/models.py b/provider/models.py index f1f1f8c..3042643 100644 --- a/provider/models.py +++ b/provider/models.py @@ -2,42 +2,6 @@ from __future__ import unicode_literals from django.db import models - -class Provider(models.Model): - id = models.AutoField(primary_key=True) - provider = models.CharField(max_length=64) - name = models.CharField( - max_length=255, - unique=True, - db_index=True - ) - region = models.CharField( - max_length=255, - unique=True, - db_index=True - ) - project_id = models.CharField( - max_length=255, - db_index=True - ) - default_role = models.CharField(max_length=255) - default_domain_id = models.CharField(max_length=255) - username = models.CharField( - max_length=255, - unique=True, - db_index=True - ) - password = models.CharField(max_length=255) - api_version = models.CharField(max_length=255) - url = models.TextField() - created_at = models.DateField() - enabled = models.BooleanField(default=True) - validated = models.BooleanField(default=False) - - def __unicode__(self): - return self.name - - class Type(models.Model): types = ( ('1', 'Public Cloud Provider'), @@ -49,7 +13,7 @@ class Type(models.Model): name = models.CharField( max_length=255, unique=True, - db_index=True + db_index=True, ) type = models.CharField( max_length=1, @@ -60,3 +24,35 @@ class Type(models.Model): def __unicode__(self): return self.name +class Provider(models.Model): + id = models.AutoField(primary_key=True) + provider = models.ForeignKey(Type) + name = models.CharField( + max_length=255, + unique=True, + db_index=True, + ) + region = models.CharField( + max_length=255, + db_index=True, + ) + project_id = models.CharField( + max_length=255, + db_index=True, + ) + default_role = models.CharField(max_length=255) + default_domain_id = models.CharField(max_length=255) + username = models.CharField( + max_length=255, + db_index=True, + ) + password = models.CharField(max_length=255) + api_version = models.CharField(max_length=255) + url = models.TextField() + created_at = models.DateField() + enabled = models.BooleanField(default=True) + validated = models.BooleanField(default=False) + + def __unicode__(self): + return self.name + diff --git a/static/provider-logo/aws_logo_web_300px.png b/static/provider-logo/aws_logo_web_300px.png new file mode 100644 index 0000000000000000000000000000000000000000..ca57e1ced9313c485c2a155e3ce78d20e786d3b1 GIT binary patch literal 6165 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 literal 0 HcmV?d00001