Update SgxDriverMode imports

Author: jbern0rd

src/main/java/com/iexec/worker/compute/app/AppComputeService.java

@@ -17,11 +17,11 @@
 package com.iexec.worker.compute.app;
 
 import com.iexec.common.replicate.ReplicateStatusCause;
-import com.iexec.common.sgx.SgxDriverMode;
 import com.iexec.common.utils.IexecEnvUtils;
 import com.iexec.commons.containers.DockerRunFinalStatus;
 import com.iexec.commons.containers.DockerRunRequest;
 import com.iexec.commons.containers.DockerRunResponse;
+import com.iexec.commons.containers.SgxDriverMode;
 import com.iexec.commons.poco.task.TaskDescription;
 import com.iexec.sms.api.TeeSessionGenerationResponse;
 import com.iexec.worker.config.WorkerConfigurationService;

src/main/java/com/iexec/worker/sgx/SgxService.java

@@ -17,11 +17,11 @@
 package com.iexec.worker.sgx;
 
 import com.github.dockerjava.api.model.Device;
-import com.iexec.common.sgx.SgxDriverMode;
-import com.iexec.common.utils.SgxUtils;
 import com.iexec.commons.containers.DockerRunFinalStatus;
 import com.iexec.commons.containers.DockerRunRequest;
 import com.iexec.commons.containers.DockerRunResponse;
+import com.iexec.commons.containers.SgxDriverMode;
+import com.iexec.commons.containers.SgxUtils;
 import com.iexec.worker.config.WorkerConfigurationService;
 import com.iexec.worker.docker.DockerService;
 import lombok.extern.slf4j.Slf4j;
@@ -51,7 +51,7 @@ public SgxService(
             WorkerConfigurationService workerConfigService,
             ApplicationContext context,
             DockerService dockerService,
-            @Value("${tee.sgx.driver-mode}") SgxDriverMode sgxDriverMode
+            @Value("${tee.sgx.driver-mode:NONE}") SgxDriverMode sgxDriverMode
     ) {
         this.workerConfigService = workerConfigService;
         this.context = context;

src/test/java/com/iexec/worker/compute/app/AppComputeServiceTests.java

@@ -16,12 +16,12 @@
 
 package com.iexec.worker.compute.app;
 
-import com.iexec.common.sgx.SgxDriverMode;
 import com.iexec.common.utils.IexecEnvUtils;
 import com.iexec.common.utils.IexecFileHelper;
 import com.iexec.commons.containers.DockerRunFinalStatus;
 import com.iexec.commons.containers.DockerRunRequest;
 import com.iexec.commons.containers.DockerRunResponse;
+import com.iexec.commons.containers.SgxDriverMode;
 import com.iexec.commons.poco.task.TaskDescription;
 import com.iexec.commons.poco.tee.TeeEnclaveConfiguration;
 import com.iexec.sms.api.TeeSessionGenerationResponse;

src/test/java/com/iexec/worker/compute/post/PostComputeServiceTests.java

@@ -17,12 +17,12 @@
 package com.iexec.worker.compute.post;
 
 import com.iexec.common.replicate.ReplicateStatusCause;
-import com.iexec.common.sgx.SgxDriverMode;
 import com.iexec.common.utils.FileHelper;
 import com.iexec.common.utils.IexecFileHelper;
 import com.iexec.commons.containers.DockerRunFinalStatus;
 import com.iexec.commons.containers.DockerRunRequest;
 import com.iexec.commons.containers.DockerRunResponse;
+import com.iexec.commons.containers.SgxDriverMode;
 import com.iexec.commons.containers.client.DockerClientInstance;
 import com.iexec.commons.poco.task.TaskDescription;
 import com.iexec.sms.api.TeeSessionGenerationResponse;

src/test/java/com/iexec/worker/compute/pre/PreComputeServiceTests.java

@@ -17,10 +17,10 @@
 package com.iexec.worker.compute.pre;
 
 import com.iexec.common.replicate.ReplicateStatusCause;
-import com.iexec.common.sgx.SgxDriverMode;
 import com.iexec.commons.containers.DockerRunFinalStatus;
 import com.iexec.commons.containers.DockerRunRequest;
 import com.iexec.commons.containers.DockerRunResponse;
+import com.iexec.commons.containers.SgxDriverMode;
 import com.iexec.commons.containers.client.DockerClientInstance;
 import com.iexec.commons.poco.chain.WorkerpoolAuthorization;
 import com.iexec.commons.poco.task.TaskDescription;

src/test/java/com/iexec/worker/tee/scone/LasServiceTests.java

@@ -1,9 +1,9 @@
 package com.iexec.worker.tee.scone;
 
-import com.iexec.common.sgx.SgxDriverMode;
 import com.iexec.commons.containers.DockerRunFinalStatus;
 import com.iexec.commons.containers.DockerRunRequest;
 import com.iexec.commons.containers.DockerRunResponse;
+import com.iexec.commons.containers.SgxDriverMode;
 import com.iexec.commons.containers.client.DockerClientInstance;
 import com.iexec.worker.config.WorkerConfigurationService;
 import com.iexec.worker.docker.DockerService;
@@ -25,8 +25,8 @@ class LasServiceTests {
     private static final String CONTAINER_NAME = "iexec-las";
     private static final String REGISTRY_NAME = "registryName";
     private static final String IMAGE_URI = REGISTRY_NAME +"/some/image/name:x.y";
-    public static final String REGISTRY_USERNAME = "registryUsername";
-    public static final String REGISTRY_PASSWORD = "registryPassword";
+    private static final String REGISTRY_USERNAME = "registryUsername";
+    private static final String REGISTRY_PASSWORD = "registryPassword";
 
     @Captor
     ArgumentCaptor<DockerRunRequest> dockerRunRequestArgumentCaptor;
@@ -62,6 +62,7 @@ void init() throws Exception {
         when(dockerService.getClient()).thenReturn(dockerClientInstanceMock);
         when(dockerService.getClient(REGISTRY_NAME, REGISTRY_USERNAME, REGISTRY_PASSWORD))
                 .thenReturn(dockerClientInstanceMock);
+        when(sgxService.getSgxDriverMode()).thenReturn(SgxDriverMode.NATIVE);
     }
 
     // region start
@@ -70,7 +71,6 @@ void shouldStartLasService() {
         when(dockerClientInstanceMock.pullImage(IMAGE_URI)).thenReturn(true);
         when(dockerService.run(any()))
                 .thenReturn(DockerRunResponse.builder().finalStatus(DockerRunFinalStatus.SUCCESS).build());
-        when(sgxService.getSgxDriverMode()).thenReturn(SgxDriverMode.LEGACY);
 
         assertTrue(lasService.start());
         verify(dockerService).run(dockerRunRequestArgumentCaptor.capture());
@@ -79,7 +79,7 @@ void shouldStartLasService() {
                 DockerRunRequest.builder()
                         .containerName(CONTAINER_NAME)
                         .imageUri(IMAGE_URI)
-                        .sgxDriverMode(SgxDriverMode.LEGACY)
+                        .sgxDriverMode(SgxDriverMode.NATIVE)
                         .maxExecutionTime(0)
                         .build()
         );
@@ -91,7 +91,6 @@ void shouldStartLasServiceOnlyOnce() throws Exception {
         when(dockerClientInstanceMock.pullImage(IMAGE_URI)).thenReturn(true);
         when(dockerService.run(any()))
                 .thenReturn(DockerRunResponse.builder().finalStatus(DockerRunFinalStatus.SUCCESS).build());
-        when(sgxService.getSgxDriverMode()).thenReturn(SgxDriverMode.LEGACY);
 
         assertTrue(lasService.start());
         assertTrue(lasService.start());