summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2018-12-11 10:45:27 +0100
committerSimon Rettberg2018-12-11 10:45:27 +0100
commitde1ebf3786141018e5207955ecf6a837d016e090 (patch)
tree659d1aa067115ee2ae3edf36538c74190d1ccdac
parentRedesign preset* handling to aim for backwards compat (diff)
downloadmaster-sync-shared-de1ebf3786141018e5207955ecf6a837d016e090.tar.gz
master-sync-shared-de1ebf3786141018e5207955ecf6a837d016e090.tar.xz
master-sync-shared-de1ebf3786141018e5207955ecf6a837d016e090.zip
Partially Revert "Update to RPC version 5, break compat"
Only increase MIN_VERSION to 4... This reverts commit f01a417c81a63b809ef788107c391f75c26ff99d.
-rw-r--r--src/main/java/org/openslx/sat/thrift/version/Feature.java29
-rw-r--r--src/main/java/org/openslx/sat/thrift/version/Version.java4
2 files changed, 31 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/sat/thrift/version/Feature.java b/src/main/java/org/openslx/sat/thrift/version/Feature.java
index 3c40b3e..e06c78a 100644
--- a/src/main/java/org/openslx/sat/thrift/version/Feature.java
+++ b/src/main/java/org/openslx/sat/thrift/version/Feature.java
@@ -1,5 +1,34 @@
package org.openslx.sat.thrift.version;
public enum Feature {
+
+ /**
+ * Server can properly extend the expiration time of an image version that
+ * is already expired, but has not been deleted yet. (Early versions of dmsd
+ * did not handle this case properly.)
+ */
+ EXTEND_EXPIRED_VM,
+
+ /**
+ * Server supports configuring network shares for individual lectures. Whether
+ * these will function on the clients further depends on the minilinux version!
+ */
+ NETWORK_SHARES,
+
+ /**
+ * Server supports multiple hypervisors which requires special handling since
+ * multiple components needs to be compatible to fully support them.
+ */
+ MULTIPLE_HYPERVISORS,
+
+ /**
+ * Server supports copying existing blocks server side.
+ */
+ SERVER_SIDE_COPY,
+
+ /**
+ * Server supports filtering lectures by LDAP/AD attributes
+ */
+ LECTURE_FILTER_LDAP,
}
diff --git a/src/main/java/org/openslx/sat/thrift/version/Version.java b/src/main/java/org/openslx/sat/thrift/version/Version.java
index 404a01b..16e00f8 100644
--- a/src/main/java/org/openslx/sat/thrift/version/Version.java
+++ b/src/main/java/org/openslx/sat/thrift/version/Version.java
@@ -8,8 +8,8 @@ package org.openslx.sat.thrift.version;
*/
public class Version {
- public static final long MIN_VERSION = 5;
+ public static final long MIN_VERSION = 2;
- public static final long VERSION = 5;
+ public static final long VERSION = 4;
}