import com.fasterxml.jackson.databind.ObjectMapper;
import com.oransc.rappmanager.acm.service.AcmDeployer;
+import com.oransc.rappmanager.dme.service.DmeDeployer;
+import com.oransc.rappmanager.models.cache.RappCacheService;
import com.oransc.rappmanager.models.rapp.PrimeOrder;
import com.oransc.rappmanager.models.rapp.Rapp;
import com.oransc.rappmanager.models.rapp.RappPrimeOrder;
import com.oransc.rappmanager.models.rapp.RappState;
-import com.oransc.rappmanager.models.cache.RappCacheService;
import com.oransc.rappmanager.sme.service.SmeLifecycleManager;
import java.io.File;
import java.io.FileInputStream;
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@AutoConfigureMockMvc
-public class RappControllerTest {
+class RappControllerTest {
@Autowired
private MockMvc mockMvc;
@MockBean
AcmDeployer acmDeployer;
+ @MockBean
+ DmeDeployer dmeDeployer;
+
@MockBean
SmeLifecycleManager smeLifecycleManager;
@Test
void testGetInvalidRapp() throws Exception {
mockMvc.perform(MockMvcRequestBuilders.get("/rapps/{rapp_id}", UUID.randomUUID()))
- .andExpect(status().isBadRequest());
+ .andExpect(status().isNotFound());
}
@Test
.packageLocation(validCsarFileLocation).state(RappState.COMMISSIONED).build();
rappCacheService.putRapp(rapp);
when(acmDeployer.primeRapp(any())).thenReturn(true);
+ when(dmeDeployer.primeRapp(any())).thenReturn(true);
RappPrimeOrder rappPrimeOrder = new RappPrimeOrder();
rappPrimeOrder.setPrimeOrder(PrimeOrder.PRIME);
mockMvc.perform(MockMvcRequestBuilders.put("/rapps/{rapp_id}", rappId).contentType(MediaType.APPLICATION_JSON)
.packageLocation(validCsarFileLocation).state(RappState.PRIMED).build();
rappCacheService.putRapp(rapp);
when(acmDeployer.deprimeRapp(any())).thenReturn(true);
+ when(dmeDeployer.deprimeRapp(any())).thenReturn(true);
RappPrimeOrder rappPrimeOrder = new RappPrimeOrder();
rappPrimeOrder.setPrimeOrder(PrimeOrder.DEPRIME);
mockMvc.perform(MockMvcRequestBuilders.put("/rapps/{rapp_id}", rappId).contentType(MediaType.APPLICATION_JSON)