summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/org/openslx/dozmod/util/ContainerUtils.java
diff options
context:
space:
mode:
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/util/ContainerUtils.java')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/util/ContainerUtils.java30
1 files changed, 15 insertions, 15 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ContainerUtils.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ContainerUtils.java
index 54400439..d6836c8d 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ContainerUtils.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ContainerUtils.java
@@ -60,32 +60,32 @@ public class ContainerUtils {
return false;
}
+ public static boolean isDataContainer(ImageSummaryRead image) {
+
+ ContainerDefinition containerDefinition = getContainerDefinition(Session.getSatelliteToken(), image.getLatestVersionId());
+ if (containerDefinition.getContainerMeta().getImageType() == ContainerMeta.ContainerImageType.DATA) {
+ return true;
+ }
+ return false;
+ }
+
public static List<ImageSummaryRead> getDataContainerImages() {
String satelliteToken = Session.getSatelliteToken();
List<ImageSummaryRead> images = ImageCache.get(true);
List<ImageSummaryRead> dataContainerImages = new ArrayList<>();
for (ImageSummaryRead image : images) {
if (image.getVirtId().equals(TConst.VIRT_DOCKER)) {
- try {
- byte[] rawVirtConfig;
- ByteBuffer byteBuffer = ThriftManager.getSatClient().getImageVersionVirtConfig(satelliteToken,
- image.getLatestVersionId());
- rawVirtConfig = ThriftUtil.unwrapByteBuffer(byteBuffer);
- ContainerDefinition containerDefinition = ContainerDefinition.fromByteArray(rawVirtConfig);
- if (containerDefinition.getContainerMeta().getImageType() == ContainerMeta.ContainerImageType.DATA)
- dataContainerImages.add(image);
-
- } catch (TException e) {
- // LOGGER.error("Failed to retrieve virtualizer config for image version " + "'"
- // + image.getLatestVersionId() + ", see trace: ", e);
- }
+
+ ContainerDefinition containerDefinition = getContainerDefinition(satelliteToken, image.getLatestVersionId());
+ if (containerDefinition.getContainerMeta().getImageType() == ContainerMeta.ContainerImageType.DATA)
+ dataContainerImages.add(image);
}
}
return dataContainerImages;
}
- public static void showWarning(Component c, Logger logger) {
- Gui.showMessageBox(c, I18n.WINDOW.getString("LectureDetails.Message.error.containerLinkedWithLecture"),
+ public static void showWarning(Component c, String message, Logger logger) {
+ Gui.showMessageBox(c, message,
MessageType.WARNING, logger, null);
}