import com.oransc.rappmanager.models.RappDeployer;
import com.oransc.rappmanager.models.cache.RappCacheService;
import com.oransc.rappmanager.models.exception.RappHandlerException;
+import com.oransc.rappmanager.models.exception.RappValidationException;
import com.oransc.rappmanager.models.rapp.Rapp;
import com.oransc.rappmanager.models.rapp.RappEvent;
import com.oransc.rappmanager.models.rapp.RappState;
if (rapp.getState().equals(RappState.COMMISSIONED)) {
rapp.setState(RappState.PRIMING);
rapp.setReason(null);
- //Configuring the deployment artifact needs to be done before starting the priming with other components
- //If there are additional conditions needs to be checked before priming, This needs handled as part of pre-priming stage.
- if (deploymentArtifactsService.configureDeploymentArtifacts(rapp) && rappDeployers.parallelStream()
- .allMatch(
- rappDeployer -> rappDeployer.primeRapp(
- rapp))) {
- rapp.setState(RappState.PRIMED);
- return ResponseEntity.ok().build();
+ try {
+ //Configuring the deployment artifact needs to be done before starting the priming with other components
+ //If there are additional conditions needs to be checked before priming, This needs handled as part of pre-priming stage.
+ if (deploymentArtifactsService.configureDeploymentArtifacts(rapp) && rappDeployers.parallelStream()
+ .allMatch(
+ rappDeployer -> rappDeployer.primeRapp(
+ rapp))) {
+ rapp.setState(RappState.PRIMED);
+ return ResponseEntity.ok().build();
+ }
+ } catch (RappValidationException e) {
+ rapp.setState(RappState.COMMISSIONED);
+ throw e;
}
rapp.setState(RappState.COMMISSIONED);
throw new RappHandlerException(HttpStatus.BAD_GATEWAY, rapp.getReason());
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.when;
import com.oransc.rappmanager.acm.service.AcmDeployer;
import com.oransc.rappmanager.dme.service.DmeDeployer;
import com.oransc.rappmanager.models.exception.RappHandlerException;
+import com.oransc.rappmanager.models.exception.RappValidationException;
import com.oransc.rappmanager.models.rapp.Rapp;
import com.oransc.rappmanager.models.rapp.RappState;
import com.oransc.rappmanager.models.rappinstance.RappInstance;
assertEquals(RappState.COMMISSIONED, rapp.getState());
}
+ @Test
+ void testPrimeRappHelmUploadFailure() {
+ Rapp rapp = Rapp.builder().rappId(UUID.randomUUID()).name("").packageName(validRappFile)
+ .packageLocation(validCsarFileLocation).state(RappState.COMMISSIONED).build();
+ doThrow(new RappValidationException("")).when(deploymentArtifactsService).configureDeploymentArtifacts(any());
+ when(acmDeployer.primeRapp(any())).thenReturn(true);
+ when(dmeDeployer.primeRapp(any())).thenReturn(false);
+ RappValidationException rappValidationException =
+ assertThrows(RappValidationException.class, () -> rappService.primeRapp(rapp));
+ assertEquals(HttpStatus.BAD_REQUEST, rappValidationException.getStatusCode());
+ assertEquals(RappState.COMMISSIONED, rapp.getState());
+ }
+
@Test
void testPrimeRappDeployArtifactFailure() {
Rapp rapp = Rapp.builder().rappId(UUID.randomUUID()).name("").packageName(validRappFile)