From cf5c2c886f65e61870b951546258949e3a4030f8 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 4 Sep 2015 15:50:33 +0200
Subject: [server] mailtest RPC methods, bugfixes to nanohttpd

---
 dozentenmodulserver/setup/sat-01-schema.sql   |  6 ++++--
 dozentenmodulserver/setup/sat-01-testdata.sql | 14 ++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'dozentenmodulserver/setup')

diff --git a/dozentenmodulserver/setup/sat-01-schema.sql b/dozentenmodulserver/setup/sat-01-schema.sql
index b0966e73..d44b0ed2 100644
--- a/dozentenmodulserver/setup/sat-01-schema.sql
+++ b/dozentenmodulserver/setup/sat-01-schema.sql
@@ -136,8 +136,10 @@ CREATE TABLE IF NOT EXISTS `lecturepermission` (
 
 CREATE TABLE IF NOT EXISTS `operatingsystem` (
   `osid` int(11) NOT NULL COMMENT 'Defined on the master server, so no auto_increment!',
-  `displayname` varchar(100) NOT NULL,
-  `architecture` varchar(14) NOT NULL,
+  `displayname` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `architecture` varchar(14) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `maxmem` int(11) NOT NULL,
+  `maxcpu` int(11) NOT NULL,
   PRIMARY KEY (`osid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
diff --git a/dozentenmodulserver/setup/sat-01-testdata.sql b/dozentenmodulserver/setup/sat-01-testdata.sql
index 4817f401..f01c7024 100644
--- a/dozentenmodulserver/setup/sat-01-testdata.sql
+++ b/dozentenmodulserver/setup/sat-01-testdata.sql
@@ -8,8 +8,18 @@ SET time_zone = "+00:00";
 
 USE `sat`;
 
-INSERT INTO `operatingsystem` (`osid`, `displayname`, `architecture`) VALUES
-(1,'Windows 7 (64 Bit)','AMD64'),(2,'Windows 8 (32 Bit)','x86'),(3,'Windows 8 (64 Bit)','AMD64'),(4,'Ubuntu (32 Bit)','x86'),(5,'Ubuntu (64 Bit)','AMD64'),(6,'OpenSUSE (32 Bit)','x86'),(7,'OpenSUSE (64 Bit)','AMD64'),(8,'Other Linux (32 Bit)','x86'),(9,'Other Linux (64 Bit)','AMD64'),(10,'Windows 7 (32 Bit)','x86');
+INSERT INTO `operatingsystem` (`osid`, `displayname`, `architecture`, `maxmem`, `maxcpu`) VALUES
+(1, 'Windows 7 (64 Bit)', 'AMD64', 196608, 256),
+(2, 'Windows 8 (32 Bit)', 'x86', 4096, 32),
+(3, 'Windows 8 (64 Bit)', 'AMD64', 131072, 256),
+(4, 'Ubuntu (32 Bit)', 'x86', 0, 0),
+(5, 'Ubuntu (64 Bit)', 'AMD64', 0, 0),
+(6, 'OpenSUSE (32 Bit)', 'x86', 0, 0),
+(7, 'OpenSUSE (64 Bit)', 'AMD64', 0, 0),
+(8, 'Other Linux (32 Bit)', 'x86', 0, 0),
+(9, 'Other Linux (64 Bit)', 'AMD64', 0, 0),
+(10, 'Windows 7 (32 Bit)', 'x86', 4096, 32),
+(11, 'Windows 2000 Professional', 'x86', 4096, 4);
 
 INSERT INTO `virtualizer` (`virtid`, `virtname`) VALUES
 ('vmware', 'VMware');
-- 
cgit v1.2.3-55-g7522