diff options
author | Hongyuan Ma | 2018-05-17 13:15:58 +0000 |
---|---|---|
committer | Hongyuan Ma | 2018-05-17 13:15:58 +0000 |
commit | 3ea46001abbaa507355c72b892a317ebf45f804f (patch) | |
tree | cdc2f84bd411f1a237324ece3b81f87ddf633759 | |
parent | 7b741477c3b2b3e48a2ac18243f416de470adbee (diff) |
Fix reference issues
-rw-r--r-- | web/apps/test/__init__.py (renamed from web/apps/tests/__init__.py) | 0 | ||||
-rw-r--r-- | web/apps/test/admin.py | 6 | ||||
-rw-r--r-- | web/apps/test/apps.py (renamed from web/apps/tests/apps.py) | 4 | ||||
-rw-r--r-- | web/apps/test/models.py | 61 | ||||
-rw-r--r-- | web/apps/test/tests.py | 6 | ||||
-rw-r--r-- | web/apps/test/views.py | 6 | ||||
-rw-r--r-- | web/apps/tests/admin.py | 3 | ||||
-rw-r--r-- | web/apps/tests/models.py | 99 | ||||
-rw-r--r-- | web/apps/tests/tests.py | 3 | ||||
-rw-r--r-- | web/apps/tests/views.py | 3 | ||||
-rw-r--r-- | web/apps/user_operation/admin.py | 3 | ||||
-rw-r--r-- | web/apps/user_operation/apps.py | 3 | ||||
-rw-r--r-- | web/apps/user_operation/models.py | 64 | ||||
-rw-r--r-- | web/apps/user_operation/tests.py | 3 | ||||
-rw-r--r-- | web/apps/user_operation/views.py | 3 | ||||
-rw-r--r-- | web/apps/users/admin.py | 3 | ||||
-rw-r--r-- | web/apps/users/apps.py | 5 | ||||
-rw-r--r-- | web/apps/users/models.py | 24 | ||||
-rw-r--r-- | web/apps/users/serializers.py | 8 | ||||
-rw-r--r-- | web/apps/users/tests.py | 3 | ||||
-rw-r--r-- | web/apps/users/views.py | 22 | ||||
-rw-r--r-- | web/db_tools/import_category_data.py | 1 | ||||
-rw-r--r-- | web/pgperffarm/settings.py | 12 |
23 files changed, 169 insertions, 176 deletions
diff --git a/web/apps/tests/__init__.py b/web/apps/test/__init__.py index e69de29..e69de29 100644 --- a/web/apps/tests/__init__.py +++ b/web/apps/test/__init__.py diff --git a/web/apps/test/admin.py b/web/apps/test/admin.py new file mode 100644 index 0000000..13be29d --- /dev/null +++ b/web/apps/test/admin.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.contrib import admin + +# Register your models here. diff --git a/web/apps/tests/apps.py b/web/apps/test/apps.py index d2a644c..e8ea9da 100644 --- a/web/apps/tests/apps.py +++ b/web/apps/test/apps.py @@ -1,6 +1,8 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + from django.apps import AppConfig class TestsConfig(AppConfig): name = 'tests' - diff --git a/web/apps/test/models.py b/web/apps/test/models.py new file mode 100644 index 0000000..8789ed3 --- /dev/null +++ b/web/apps/test/models.py @@ -0,0 +1,61 @@ +from datetime import datetime + +from django.db import models + +# Create your models here. +from users.models import UserProfile, UserMachine + + +class TestBranch(models.Model): + """ + test brand + """ + branch_name = models.CharField(max_length=128, verbose_name="branch name", help_text="branch name") + add_time = models.DateTimeField(default=datetime.now, verbose_name="branch added time", + help_text="branch added time") + + class Meta: + verbose_name = "test branch" + verbose_name_plural = "test branch" + + def __str__(self): + return self.branch_name + + +class TestCategory(models.Model): + """ + tests category + """ + cate_name = models.CharField(max_length=64, verbose_name="cate name", help_text="cate name") + # cate_parent = models.ForeignKey("self", verbose_name="parent category", related_name="sub_cat", help_text="parent category") + cate_order = models.IntegerField(verbose_name="cate order", help_text="order in the current level") + add_time = models.DateTimeField(default=datetime.now, verbose_name="add time", help_text="category added time") + + class Meta: + verbose_name = "tests category" + verbose_name_plural = "tests category" + + def __str__(self): + return self.cate_name + + +class Test(models.Model): + """ + tests + """ + test_name = models.CharField(max_length=128, verbose_name="test name", help_text="test name") + test_desc = models.TextField(verbose_name="test desc", help_text="test desc") + test_branch_id = models.ForeignKey(TestBranch, verbose_name="test category", help_text="test category") + test_cate_id = models.ForeignKey(TestCategory, verbose_name="test category", help_text="test category") + # test_item_id = models.CharField(max_length=32, unique=True, verbose_name="test sn", help_text="test sn") + test_owner = models.ForeignKey(UserProfile, verbose_name="test owner", help_text="person who add this test item") + test_machine_id = models.ForeignKey(UserMachine, verbose_name="test owner", + help_text="person who add this test item") + add_time = models.DateTimeField(default=datetime.now, verbose_name="test added time") + + class Meta: + verbose_name = "tests" + verbose_name_plural = "tests" + + def __str__(self): + return self.test_name diff --git a/web/apps/test/tests.py b/web/apps/test/tests.py new file mode 100644 index 0000000..5982e6b --- /dev/null +++ b/web/apps/test/tests.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.test import TestCase + +# Create your tests here. diff --git a/web/apps/test/views.py b/web/apps/test/views.py new file mode 100644 index 0000000..e784a0b --- /dev/null +++ b/web/apps/test/views.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.shortcuts import render + +# Create your views here. diff --git a/web/apps/tests/admin.py b/web/apps/tests/admin.py deleted file mode 100644 index 8c38f3f..0000000 --- a/web/apps/tests/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/web/apps/tests/models.py b/web/apps/tests/models.py deleted file mode 100644 index 4111f0f..0000000 --- a/web/apps/tests/models.py +++ /dev/null @@ -1,99 +0,0 @@ -from datetime import datetime - -from django.db import models -from apps.users.models import UserProfile -from apps.user_operation.models import UserMachine - -# Create your models here. -class TestBranch(models.Model): - """ - test brand - """ - branch_name = models.CharField(max_length=128, verbose_name="branch name", help_text="branch name") - add_time = models.DateTimeField(default=datetime.now, verbose_name="branch added time", help_text="branch added time") - - class Meta: - verbose_name = "test branch" - verbose_name_plural = "test branch" - - def __str__(self): - return self.branch_name - -class TestCategory(models.Model): - """ - tests category - """ - cate_name = models.CharField(max_length=64, verbose_name="cate name", help_text="cate name") - # cate_parent = models.ForeignKey("self", verbose_name="parent category", related_name="sub_cat", help_text="parent category") - cate_order = models.IntegerField(verbose_name="cate order", help_text="order in the current level") - add_time = models.DateTimeField(default=datetime.now, verbose_name="add time", help_text="category added time") - - class Meta: - verbose_name = "tests category" - verbose_name_plural = "tests category" - - def __str__(self): - return self.cate_name - -class Test(models.Model): - """ - tests - """ - test_name = models.CharField(max_length=128, verbose_name="test name", help_text="test name") - test_desc = models.TextField(verbose_name="test desc", help_text="test desc") - test_branch_id= models.ForeignKey(TestBranch, verbose_name="test category", help_text="test category") - test_cate_id= models.ForeignKey(TestCategory, verbose_name="test category", help_text="test category") - # test_item_id = models.CharField(max_length=32, unique=True, verbose_name="test sn", help_text="test sn") - test_owner = models.ForeignKey(UserProfile ,verbose_name="test owner", help_text="person who add this test item") - test_machine_id = models.ForeignKey(UserProfile ,verbose_name="test owner", help_text="person who add this test item") - add_time = models.DateTimeField(default=datetime.now, verbose_name="test added time") - - class Meta: - verbose_name = "tests" - verbose_name_plural = "tests" - - def __str__(self): - return self.test_name - - -class TestResult(models.Model): - """ - test result sample: - - "latency": -1, - "scale": "10", - "end": 1526184453.133798, - "clients": "2", - "start": 1526184333.102856, - "run": 0, - "threads": "2", - "mode": "simple", - "duration": "120", - "tps": "369.666116", - "read-only": false - - """ - - test_id = models.ForeignKey(Test, verbose_name="test sn", help_text="test sn") - latency = models.IntegerField(verbose_name="latency", help_text="latency of the test result") - scale = models.IntegerField(verbose_name="scale", help_text="scale of the test result") - end = models.DecimalField(max_digits=16, decimal_places=6, verbose_name="end", help_text="endtime of the test result") - clients = models.IntegerField(verbose_name="clients", help_text="clients of the test result") - start = models.DecimalField(max_digits=16, decimal_places=6, verbose_name="start", help_text="starttime of the test result") - run = models.IntegerField(verbose_name="run", help_text="run number") - threads = models.IntegerField(verbose_name="threads", help_text="threads of the test result") - - MODE_CHOICE = ( - (1, 'simple') - ) - mode = models.IntegerField(choices=MODE_CHOICE, verbose_name="mode", help_text="test mode") - add_time = models.DateTimeField(default=datetime.now, verbose_name="test result added time") - - class Meta: - verbose_name = "test result" - verbose_name_plural = "test result" - - - - - diff --git a/web/apps/tests/tests.py b/web/apps/tests/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/web/apps/tests/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/web/apps/tests/views.py b/web/apps/tests/views.py deleted file mode 100644 index 91ea44a..0000000 --- a/web/apps/tests/views.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.shortcuts import render - -# Create your views here. diff --git a/web/apps/user_operation/admin.py b/web/apps/user_operation/admin.py index 8c38f3f..13be29d 100644 --- a/web/apps/user_operation/admin.py +++ b/web/apps/user_operation/admin.py @@ -1,3 +1,6 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + from django.contrib import admin # Register your models here. diff --git a/web/apps/user_operation/apps.py b/web/apps/user_operation/apps.py index 1411ac8..ff65d1a 100644 --- a/web/apps/user_operation/apps.py +++ b/web/apps/user_operation/apps.py @@ -1,3 +1,6 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + from django.apps import AppConfig diff --git a/web/apps/user_operation/models.py b/web/apps/user_operation/models.py index 019fac2..da65846 100644 --- a/web/apps/user_operation/models.py +++ b/web/apps/user_operation/models.py @@ -1,45 +1,47 @@ from datetime import datetime from django.db import models -from tests.models import Tests,TestBranch -from users.models import UserProfile -# Create your models here. - -class UserMachine(models.Model): - """ - user machine - """ - machine_sn = models.CharField(max_length=16, verbose_name="machine sn") - machine_secret = models.CharField(max_length=32, verbose_name="machine secret") - machine_owner = models.ForeignKey(UserProfile) - alias = models.CharField(max_length=16, verbose_name="alias") - os_name = models.CharField(max_length=32, verbose_name="operation system name") - os_version = models.CharField(max_length=32, verbose_name="operation system version") - comp_name = models.CharField(max_length=32, verbose_name="compiler name") - comp_version = models.CharField(max_length=32, verbose_name="compiler version") - add_time = models.DateTimeField(default=datetime.now, verbose_name="machine added time") +from users.models import UserMachine +from test.models import Test, TestBranch - class Meta: - verbose_name = "user machines" - verbose_name_plural = "user machines" +# Create your models here. - def __str__(self): - return self.machine_sn class TestResult(models.Model): """ - test result + test result sample: + + "latency": -1, + "scale": "10", + "end": 1526184453.133798, + "clients": "2", + "start": 1526184333.102856, + "run": 0, + "threads": "2", + "mode": "simple", + "duration": "120", + "tps": "369.666116", + "read-only": false + """ - test = models.ForeignKey(Tests) - machine = models.ForeignKey(UserMachine) - pg_config = models.TextField(verbose_name="postgresql config", help_text="postgresql config") - os_config = models.TextField(verbose_name="os config", help_text="os config") - result_desc = models.TextField(verbose_name="test result", help_text="test result") - test_branch = models.ForeignKey(TestBranch, verbose_name="test branch", help_text="branch of this test") - test_time = models.DateTimeField(verbose_name="test time") + test_item = models.ForeignKey(Test, verbose_name="test item", help_text="test item") + latency = models.IntegerField(verbose_name="latency", help_text="latency of the test result") + scale = models.IntegerField(verbose_name="scale", help_text="scale of the test result") + end = models.DecimalField(max_digits=16, decimal_places=6, verbose_name="end", + help_text="endtime of the test result") + clients = models.IntegerField(verbose_name="clients", help_text="clients of the test result") + start = models.DecimalField(max_digits=16, decimal_places=6, verbose_name="start", + help_text="starttime of the test result") + run = models.IntegerField(verbose_name="run", help_text="run number") + threads = models.IntegerField(verbose_name="threads", help_text="threads of the test result") + + MODE_CHOICE = ( + ('1', 'simple'), + ) + mode = models.IntegerField(choices=MODE_CHOICE, verbose_name="mode", help_text="test mode") + add_time = models.DateTimeField(default=datetime.now, verbose_name="test result added time") class Meta: verbose_name = "test result" verbose_name_plural = "test result" - diff --git a/web/apps/user_operation/tests.py b/web/apps/user_operation/tests.py index 7ce503c..5982e6b 100644 --- a/web/apps/user_operation/tests.py +++ b/web/apps/user_operation/tests.py @@ -1,3 +1,6 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + from django.test import TestCase # Create your tests here. diff --git a/web/apps/user_operation/views.py b/web/apps/user_operation/views.py index 91ea44a..e784a0b 100644 --- a/web/apps/user_operation/views.py +++ b/web/apps/user_operation/views.py @@ -1,3 +1,6 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + from django.shortcuts import render # Create your views here. diff --git a/web/apps/users/admin.py b/web/apps/users/admin.py index 8c38f3f..13be29d 100644 --- a/web/apps/users/admin.py +++ b/web/apps/users/admin.py @@ -1,3 +1,6 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + from django.contrib import admin # Register your models here. diff --git a/web/apps/users/apps.py b/web/apps/users/apps.py index e551ce4..2519897 100644 --- a/web/apps/users/apps.py +++ b/web/apps/users/apps.py @@ -1,5 +1,8 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + from django.apps import AppConfig class UsersConfig(AppConfig): - name = 'apps.users' + name = 'users' diff --git a/web/apps/users/models.py b/web/apps/users/models.py index 58b9914..49657aa 100644 --- a/web/apps/users/models.py +++ b/web/apps/users/models.py @@ -3,11 +3,14 @@ from datetime import datetime from django.db import models from django.contrib.auth.models import AbstractUser + # Create your models here. + class UserProfile(AbstractUser): """ user """ + # first_name = None # last_name = None # user_name = models.CharField(max_length=64, verbose_name="name") @@ -21,3 +24,24 @@ class UserProfile(AbstractUser): def __str__(self): return self.user_name + +class UserMachine(models.Model): + """ + user machine + """ + machine_sn = models.CharField(max_length=16, verbose_name="machine sn") + machine_secret = models.CharField(max_length=32, verbose_name="machine secret") + machine_owner = models.ForeignKey(UserProfile) + alias = models.CharField(max_length=16, verbose_name="alias") + os_name = models.CharField(max_length=32, verbose_name="operation system name") + os_version = models.CharField(max_length=32, verbose_name="operation system version") + comp_name = models.CharField(max_length=32, verbose_name="compiler name") + comp_version = models.CharField(max_length=32, verbose_name="compiler version") + add_time = models.DateTimeField(default=datetime.now, verbose_name="machine added time") + + class Meta: + verbose_name = "user machines" + verbose_name_plural = "user machines" + + def __str__(self): + return self.machine_sn diff --git a/web/apps/users/serializers.py b/web/apps/users/serializers.py deleted file mode 100644 index 2005d5a..0000000 --- a/web/apps/users/serializers.py +++ /dev/null @@ -1,8 +0,0 @@ -from rest_framework import serializers - -from .models import UserProfile - -class UserProfileSerializer(serializers.ModelSerializer): - class Meta: - model = UserProfile - fields = "__all__"
\ No newline at end of file diff --git a/web/apps/users/tests.py b/web/apps/users/tests.py index 7ce503c..5982e6b 100644 --- a/web/apps/users/tests.py +++ b/web/apps/users/tests.py @@ -1,3 +1,6 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + from django.test import TestCase # Create your tests here. diff --git a/web/apps/users/views.py b/web/apps/users/views.py index 638b63d..e784a0b 100644 --- a/web/apps/users/views.py +++ b/web/apps/users/views.py @@ -1,22 +1,6 @@ -from django.shortcuts import render -from .serializers import UserProfileSerializer -from rest_framework.views import APIView -from rest_framework.response import Response -from rest_framework import mixins -from rest_framework import generics -from rest_framework.pagination import PageNumberPagination +# -*- coding: utf-8 -*- +from __future__ import unicode_literals -from rest_framework import viewsets -from .models import UserProfile +from django.shortcuts import render # Create your views here. -class UserProfilePagination(PageNumberPagination): - page_size = 10 - page_size_query_param = 'page_size' - page_query_param = 'p' - max_page_size = 100 - -class UserProfileListViewSet(mixins.ListModelMixin, viewsets.GenericViewSet): - queryset = UserProfile.objects.all() - serializer_class = UserProfileSerializer - pagination_class = UserProfilePagination
\ No newline at end of file diff --git a/web/db_tools/import_category_data.py b/web/db_tools/import_category_data.py index 51e4730..33e09a7 100644 --- a/web/db_tools/import_category_data.py +++ b/web/db_tools/import_category_data.py @@ -10,5 +10,4 @@ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "PerfFarm.settings") import django django.setup() -from tests.models import TestsCategory # todo
\ No newline at end of file diff --git a/web/pgperffarm/settings.py b/web/pgperffarm/settings.py index aada705..872ddb7 100644 --- a/web/pgperffarm/settings.py +++ b/web/pgperffarm/settings.py @@ -34,7 +34,6 @@ DEBUG = True ALLOWED_HOSTS = [] - # Application definition INSTALLED_APPS = ( @@ -46,9 +45,9 @@ INSTALLED_APPS = ( 'django.contrib.staticfiles', 'django_gravatar', 'rest_framework', - 'apps.tests.apps.TestsConfig', - 'apps.user_operation.apps.UserOperationConfig', - 'apps.users.apps.UsersConfig' + 'users', + 'test', + 'user_operation' ) MIDDLEWARE_CLASSES = ( @@ -82,7 +81,6 @@ TEMPLATES = [ WSGI_APPLICATION = 'pgperffarm.wsgi.application' - # Database # https://docs.djangoproject.com/en/1.8/ref/settings/#databases @@ -107,7 +105,6 @@ USE_L10N = True USE_TZ = True - # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/1.8/howto/static-files/ @@ -118,5 +115,6 @@ STATICFILES_DIRS = [ ] AUTHENTICATION_BACKENDS = ( - 'pgperffarm.auth.AuthBackend', + 'pgperffarm.auth.AuthBackend', ) +AUTH_USER_MODEL = 'users.UserProfile'
\ No newline at end of file |