class TestDataSet(models.Model):
- test_record_id = models.ForeignKey(TestRecord, verbose_name="test record id", help_text="test record id")
+
+ test_record = models.ForeignKey(TestRecord, verbose_name="test record id", help_text="test record id")
+ test_cate = models.ForeignKey(TestCategory, verbose_name="test cate id", help_text="test cate id")
clients = models.IntegerField(verbose_name="clients", help_text="clients of the test dataset")
scale = models.IntegerField(verbose_name="scale", help_text="scale of the test dataset")
std = models.DecimalField(max_digits=16, decimal_places=6, verbose_name="std",help_text="std of the test dataset")
median = models.DecimalField(max_digits=16, decimal_places=6, verbose_name="median",help_text="median of the test dataset")
STATUS_CHOICE = (
- ('-1', 'none'),
- ('1', 'improved'),
- ('2', 'quo'),
- ('3', 'regressive'),
+ (-1, 'none'),
+ (1, 'improved'),
+ (2, 'quo'),
+ (3, 'regressive'),
)
status = models.IntegerField(choices=STATUS_CHOICE, verbose_name="status", help_text="status of this dataset")
percentage = models.DecimalField(max_digits=8, decimal_places=4, verbose_name="percentage",help_text="percentage compared to previous dataset")
linuxInfoRet = None
if linuxInfo.is_valid():
linuxInfoRet = linuxInfo.save()
+ else:
+ msg = 'linuxInfo save error'
+ return Response(msg, status=status.HTTP_202_ACCEPTED)
meta_data = json_data['meta']
metaInfo = MetaInfoSerializer(data=meta_data)
metaInfoRet = None
if metaInfo.is_valid():
metaInfoRet = metaInfo.save()
+ else:
+ msg = 'metaInfo save error'
+ return Response(msg, status=status.HTTP_202_ACCEPTED)
# pg_data = json_data['postgres']
pg_data = {
pgInfoRet = None
if pgInfo.is_valid():
pgInfoRet = pgInfo.save()
+ else:
+ msg = 'pgInfo save error'
+ return Response(msg, status=status.HTTP_202_ACCEPTED)
test_record_data = {
'pg_info': pgInfoRet.id,
testRecordRet = None
if testRecord.is_valid():
testRecordRet = testRecord.save()
+ else:
+ msg = 'testRecord save error'
+ return Response(msg, status=status.HTTP_202_ACCEPTED)
ro = json_data['pgbench']['ro']
# print(type(ro))
for scale, dataset_list in ro.iteritems():
print "ro[%s]=" % scale, dataset_list
for client_num, dataset in dataset_list.iteritems():
- print dataset['std']
+ print 'std is:'+ str(dataset['std'])
+
test_dataset_data = {
'test_record_id': testRecordRet.id,
'clients': client_num,
'scale': scale,
'std': dataset['std'],
'metric': dataset['metric'],
- 'median': dataset['median']
+ 'median': dataset['median'],
# todo status,percentage
+ 'status': 1,
+ 'percentage': 0.062,
+ 'test_cate_id': 1,
}
testDateSet = CreateTestDateSetSerializer(data=test_dataset_data)
testDateSetRet = None
print 'dataset valid'
testDateSetRet = testDateSet.save()
else:
- print testDateSet
+ print(testDateSet.errors)
+ msg = 'testDateSet save error'
+ return Response(msg, status=status.HTTP_202_ACCEPTED)
+
+
- msg = 'upload ok'
- return Response(msg, status=status.HTTP_200_OK)
+ msg = 'upload success'
+ return Response(msg, status=status.HTTP_201_CREATED)
def __str__(self):
return self.user_name
+class Alias(models.Model):
+ name = models.CharField(max_length=32, verbose_name="alias name")
+ is_used = models.BooleanField(default=False,verbose_name="is_used")
class UserMachine(models.Model):
"""
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")
+ alias = models.ForeignKey(Alias, verbose_name="alias", help_text="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")
--- /dev/null
+row_data = [
+ {
+ 'name': 'Cabbage',
+ 'is_used': True
+ },
+]
--- /dev/null
+row_data = [
+ {
+ 'cate_name': 'read only',
+ 'cate_order': 1,
+ },
+ {
+ 'cate_name': 'read write',
+ 'cate_order': 2,
+ },
+]
\ No newline at end of file
+++ /dev/null
-row_data = []
\ No newline at end of file
--- /dev/null
+row_data = [
+ {
+ 'machine_sn': '123456',
+ 'machine_secret': '123456',
+ 'alias': 1,
+ 'os_name': 'Ubuntu',
+ 'os_version': 16,
+ 'comp_name': 'x86',
+ 'comp_version':'64',
+ 'machine_owner_id':1
+ },
+]
--- /dev/null
+row_data = [
+ {
+ 'password': '123456',
+ 'is_superuser': False,
+ 'username': 'maleic',
+ 'first_name': 'Maleic',
+ 'last_name': 'Acid',
+ 'date_joined': '2018-06-14 21:34:51+08',
+ 'email': 'mahongyuan1997@gmail.com',
+ 'is_staff': False,
+ 'is_active': True,
+ 'last_login': '2018-06-14 21:34:51+08',
+ },
+]
\ No newline at end of file
+++ /dev/null
-row_data = [
- {
- 'password': 'Alice123',
- 'is_superuser': False,
- 'username': 'Alice',
- 'email': 'Alice@gmail.com',
- 'is_staff': False,
- 'is_active': False,
- },
- {
- 'password': 'Bob123',
- 'is_superuser': False,
- 'username': 'Bob',
- 'email': 'Bob@gmail.com',
- 'is_staff': False,
- 'is_active': True,
- },
- {
- 'password': 'Noah123',
- 'is_superuser': False,
- 'username': 'Noah',
- 'email': 'Noah@gmail.com',
- 'is_staff': False,
- 'is_active': True,
- }
-]
\ No newline at end of file
--- /dev/null
+import sys
+import os
+
+# Use django's model independently
+pwd = os.path.dirname(os.path.realpath(__file__))
+sys.path.append(pwd+ "../")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pgperffarm.settings")
+
+# Initialize django
+import django
+django.setup()
+
+from apps.users.models import Alias
+from data.alias_data import row_data
+
+for alias_item in row_data:
+ alias = Alias()
+ alias.name = alias_item["name"]
+ alias.is_used = alias_item["is_used"]
+ alias.save()
\ No newline at end of file
import django
django.setup()
-# todo
\ No newline at end of file
+# todo
+from apps.test_records.models import TestCategory
+from data.category_data import row_data
+from django.contrib.auth.hashers import make_password
+
+for test_cate in row_data:
+ cate = TestCategory()
+ cate.cate_name = test_cate["cate_name"]
+ cate.cate_order = test_cate["cate_order"]
+
+ cate.save()
\ No newline at end of file
--- /dev/null
+import sys
+import os
+
+# Use django's model independently
+pwd = os.path.dirname(os.path.realpath(__file__))
+sys.path.append(pwd+ "../")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "PerfFarm.settings")
+
+# Initialize django
+import django
+django.setup()
+
+from apps.user_operation.models import UserMachine
+from data.machine_data import row_data
+from django.contrib.auth.hashers import make_password
+
+for machine_item in row_data:
+ machine = UserMachine()
+
+ machine.machine_sn = machine_item["machine_sn"]
+ machine.machine_secret = machine_item["machine_secret"]
+ machine.alias = machine_item["alias"]
+ machine.os_name = machine_item["os_name"]
+ machine.os_version = machine_item["os_version"]
+ machine.comp_name = machine_item["comp_name"]
+ machine.comp_version = machine_item["comp_version"]
+ machine.machine_owner_id = machine_item["machine_owner_id"]
+
+ machine.save()
\ No newline at end of file
# Use django's model independently
pwd = os.path.dirname(os.path.realpath(__file__))
sys.path.append(pwd+ "../")
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "PerfFarm.settings")
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pgperffarm.settings")
# Initialize django
import django
django.setup()
from apps.users.models import UserProfile
-from db_tools.data.user_date import row_data
+from data.user_data import row_data
from django.contrib.auth.hashers import make_password
for user_deatil in row_data:
projects / pgperffarm.git / commitdiff