Merge branch 'main' into user/lsh/generalize-file-system (#310)

microsoft · Mar 2, 2023 · 1bd3b42 · 1bd3b42
1 parent 08cd2f3
commit 1bd3b42
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/agent/src/main/java/com/microsoft/hydralab/agent/config/AppConfiguration.java b/agent/src/main/java/com/microsoft/hydralab/agent/config/AppConfiguration.java
@@ -124,8 +124,8 @@ public DeviceManager initDeviceManager(BlobStorageClient deviceLabBlobClient, AD
             }
         }
         deviceManager.setPreAppDir(preAppDir);
-        deviceManager.setPreInstallPolicy(
-                shutdownIfFail ? Const.PreInstallPolicy.SHUTDOWN : Const.PreInstallPolicy.IGNORE);
+        deviceManager.setPreInstallFailurePolicy(
+                shutdownIfFail ? Const.PreInstallFailurePolicy.SHUTDOWN : Const.PreInstallFailurePolicy.IGNORE);
         deviceManager.setDeviceStatusListenerManager(deviceStatusListenerManager);
         deviceManager.setTestBaseDirUrlMapping(AppOptions.TEST_CASE_RESULT_STORAGE_MAPPING_REL_PATH);
         File deviceLogBaseDir = new File(appOptions.getDeviceLogStorageLocation());

diff --git a/common/src/main/java/com/microsoft/hydralab/common/management/DeviceManager.java b/common/src/main/java/com/microsoft/hydralab/common/management/DeviceManager.java
@@ -42,14 +42,14 @@ public abstract class DeviceManager {
     protected BlobStorageClient blobStorageClient;
     protected File testBaseDir;
     protected File preAppDir;
-    protected String preInstallPolicy;
+    protected String preInstallFailurePolicy;
 
-    public String getPreInstallPolicy() {
-        return preInstallPolicy;
+    public String getPreInstallFailurePolicy() {
+        return preInstallFailurePolicy;
     }
 
-    public void setPreInstallPolicy(String preInstallPolicy) {
-        this.preInstallPolicy = preInstallPolicy;
+    public void setPreInstallFailurePolicy(String preInstallFailurePolicy) {
+        this.preInstallFailurePolicy = preInstallFailurePolicy;
     }
 
     protected String testBaseDirUrlMapping;

diff --git a/.../main/java/com/microsoft/hydralab/common/management/listener/impl/PreInstallListener.java b/.../main/java/com/microsoft/hydralab/common/management/listener/impl/PreInstallListener.java
@@ -47,7 +47,7 @@ public void onDeviceConnected(DeviceInfo deviceInfo) {
             } catch (Exception e) {
                 String errorMessage = String.format("Pre-Install %s failed", appFile.getAbsolutePath());
                 classLogger.error(errorMessage, e);
-                if (Const.PreInstallPolicy.SHUTDOWN.equals(deviceManager.getPreInstallPolicy())) {
+                if (Const.PreInstallFailurePolicy.SHUTDOWN.equals(deviceManager.getPreInstallFailurePolicy())) {
                     throw new HydraLabRuntimeException(HttpStatus.INTERNAL_SERVER_ERROR.value(), errorMessage, e);
                 }
             }

diff --git a/common/src/main/java/com/microsoft/hydralab/common/util/Const.java b/common/src/main/java/com/microsoft/hydralab/common/util/Const.java
@@ -136,7 +136,7 @@ interface AuthComponent {
         String AUTHORITY = "AUTHORITY";
     }
 
-    interface PreInstallPolicy{
+    interface PreInstallFailurePolicy {
         String SHUTDOWN = "SHUTDOWN";
         String IGNORE = "IGNORE";
     }