X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=rapp-manager-sme%2Fsrc%2Ftest%2Fjava%2Fcom%2Foransc%2Frappmanager%2Fsme%2Fservice%2FSmeDeployerTest.java;h=53d5b5d03df05936a76df067bdf32a59394e9835;hb=65e1da472f81364372b6c5eccb60b1bcf2ef3976;hp=4574adaaa816db2bcab8c424db09cbaa845fd4eb;hpb=f14562f10f7dd6ed770f2d1232add6b24eb85b91;p=nonrtric%2Fplt%2Frappmanager.git

diff --git a/rapp-manager-sme/src/test/java/com/oransc/rappmanager/sme/service/SmeDeployerTest.java b/rapp-manager-sme/src/test/java/com/oransc/rappmanager/sme/service/SmeDeployerTest.java
index 4574ada..53d5b5d 100755
--- a/rapp-manager-sme/src/test/java/com/oransc/rappmanager/sme/service/SmeDeployerTest.java
+++ b/rapp-manager-sme/src/test/java/com/oransc/rappmanager/sme/service/SmeDeployerTest.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START======================================================================
  * Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved.
  * ===============================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -158,7 +159,7 @@ class SmeDeployerTest {
     }
 
     @Test
-    void testCreateProviderDomainFailure() throws Exception {
+    void testCreateProviderDomainFailure() {
         UUID rappId = UUID.randomUUID();
         Rapp rapp =
                 Rapp.builder().rappId(rappId).name("").packageName(validRappFile).packageLocation(validCsarFileLocation)
@@ -201,7 +202,7 @@ class SmeDeployerTest {
 
 
     @Test
-    void testCreatePublishApiFailure() throws Exception {
+    void testCreatePublishApiFailure() {
         UUID rappId = UUID.randomUUID();
         UUID apfId = UUID.randomUUID();
         Rapp rapp =
@@ -298,7 +299,55 @@ class SmeDeployerTest {
     }
 
     @Test
-    void testDeployRappInstanceWithoutSme() throws Exception {
+    void testDeployRappInstanceNoInvoker() throws Exception {
+        UUID rappId = UUID.randomUUID();
+        APIProviderEnrolmentDetails apiProviderEnrolmentDetails = getProviderDomainApiEnrollmentDetails();
+        APIProviderFunctionDetails apfProviderFunctionDetails = apiProviderEnrolmentDetails.getApiProvFuncs().stream()
+                                                                        .filter(apiProviderFunctionDetails -> apiProviderFunctionDetails.getApiProvFuncRole()
+                                                                                                                      .equals(ApiProviderFuncRole.APF))
+                                                                        .findFirst().get();
+        Rapp rapp =
+                Rapp.builder().rappId(rappId).name("").packageName(validRappFile).packageLocation(validCsarFileLocation)
+                        .state(RappState.COMMISSIONED).build();
+        mockServer.expect(ExpectedCount.once(), requestTo(URI_PROVIDER_REGISTRATIONS))
+                .andExpect(method(HttpMethod.POST)).andRespond(
+                        withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON)
+                                .body(objectMapper.writeValueAsString(apiProviderEnrolmentDetails)));
+        ServiceAPIDescription serviceAPIDescription = getServiceApiDescription();
+        mockServer.expect(ExpectedCount.once(),
+                        requestTo(String.format(URI_PUBLISH_APIS, apfProviderFunctionDetails.getApiProvFuncId())))
+                .andExpect(method(HttpMethod.POST)).andRespond(
+                        withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON)
+                                .body(objectMapper.writeValueAsString(serviceAPIDescription)));
+        RappInstance rappInstance = getRappInstance();
+        rappInstance.getSme().setInvokers(null);
+        rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
+        boolean deployRapp = smeDeployer.deployRappInstance(rapp, rappInstance);
+        mockServer.verify();
+        assertTrue(deployRapp);
+    }
+
+    @Test
+    void testDeployRappInstanceNoProvider() throws Exception {
+        UUID rappId = UUID.randomUUID();
+        Rapp rapp =
+                Rapp.builder().rappId(rappId).name("").packageName(validRappFile).packageLocation(validCsarFileLocation)
+                        .state(RappState.COMMISSIONED).build();
+        APIInvokerEnrolmentDetails apiInvokerEnrolmentDetails = getApiInvokerEnrollmentDetails();
+        mockServer.expect(ExpectedCount.once(), requestTo(URI_INVOKERS)).andExpect(method(HttpMethod.POST)).andRespond(
+                withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON)
+                        .body(objectMapper.writeValueAsString(apiInvokerEnrolmentDetails)));
+        RappInstance rappInstance = getRappInstance();
+        rappInstance.getSme().setProviderFunction(null);
+        rappInstance.getSme().setServiceApis(null);
+        rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
+        boolean deployRapp = smeDeployer.deployRappInstance(rapp, rappInstance);
+        mockServer.verify();
+        assertTrue(deployRapp);
+    }
+
+    @Test
+    void testDeployRappInstanceWithoutSme() {
         UUID rappId = UUID.randomUUID();
         Rapp rapp =
                 Rapp.builder().rappId(rappId).name("").packageName(validRappFile).packageLocation(validCsarFileLocation)
@@ -374,6 +423,58 @@ class SmeDeployerTest {
         assertTrue(undeployRapp);
     }
 
+    @Test
+    void testUndeployRappInstanceNoInvokers() {
+        UUID rappId = UUID.randomUUID();
+        UUID apfId = UUID.randomUUID();
+        List<String> serviceApis = List.of(String.valueOf(UUID.randomUUID()), String.valueOf(UUID.randomUUID()));
+        Map<String, String> providerFuncs = Map.of(String.valueOf(UUID.randomUUID()), String.valueOf(UUID.randomUUID()),
+                String.valueOf(UUID.randomUUID()), String.valueOf(UUID.randomUUID()));
+        Rapp rapp = Rapp.builder().rappId(rappId).name(rappId.toString()).packageName(validRappFile)
+                            .packageLocation(validCsarFileLocation).state(RappState.COMMISSIONED).build();
+        mockServer.expect(ExpectedCount.once(), requestTo(String.format(URI_PUBLISH_API, apfId, serviceApis.get(0))))
+                .andExpect(method(HttpMethod.DELETE)).andRespond(withStatus(HttpStatus.NO_CONTENT));
+        mockServer.expect(ExpectedCount.once(), requestTo(String.format(URI_PUBLISH_API, apfId, serviceApis.get(1))))
+                .andExpect(method(HttpMethod.DELETE)).andRespond(withStatus(HttpStatus.NO_CONTENT));
+        mockServer.expect(ExpectedCount.once(),
+                        requestTo(String.format(URI_PROVIDER_REGISTRATION, providerFuncs.values().toArray()[0])))
+                .andExpect(method(HttpMethod.DELETE)).andRespond(withStatus(HttpStatus.NO_CONTENT));
+        mockServer.expect(ExpectedCount.once(),
+                        requestTo(String.format(URI_PROVIDER_REGISTRATION, providerFuncs.values().toArray()[1])))
+                .andExpect(method(HttpMethod.DELETE)).andRespond(withStatus(HttpStatus.NO_CONTENT));
+        RappInstance rappInstance = getRappInstance();
+        rappInstance.getSme().setApfId(String.valueOf(apfId));
+        rappInstance.getSme().setProviderFunctionIds(providerFuncs.values().stream().toList());
+        rappInstance.getSme().setServiceApiIds(serviceApis);
+        rappInstance.getSme().setInvokerIds(null);
+        rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
+        boolean undeployRapp = smeDeployer.undeployRappInstance(rapp, rappInstance);
+        mockServer.verify();
+        assertTrue(undeployRapp);
+    }
+
+    @Test
+    void testUndeployRappInstanceNoProviders() {
+        UUID rappId = UUID.randomUUID();
+        UUID apfId = UUID.randomUUID();
+        List<String> invokers = List.of(String.valueOf(UUID.randomUUID()), String.valueOf(UUID.randomUUID()));
+        Rapp rapp = Rapp.builder().rappId(rappId).name(rappId.toString()).packageName(validRappFile)
+                            .packageLocation(validCsarFileLocation).state(RappState.COMMISSIONED).build();
+        mockServer.expect(ExpectedCount.once(), requestTo(String.format(URI_INVOKER, invokers.get(0))))
+                .andExpect(method(HttpMethod.DELETE)).andRespond(withStatus(HttpStatus.NO_CONTENT));
+        mockServer.expect(ExpectedCount.once(), requestTo(String.format(URI_INVOKER, invokers.get(1))))
+                .andExpect(method(HttpMethod.DELETE)).andRespond(withStatus(HttpStatus.NO_CONTENT));
+        RappInstance rappInstance = getRappInstance();
+        rappInstance.getSme().setApfId(String.valueOf(apfId));
+        rappInstance.getSme().setProviderFunctionIds(null);
+        rappInstance.getSme().setServiceApiIds(null);
+        rappInstance.getSme().setInvokerIds(invokers);
+        rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
+        boolean undeployRapp = smeDeployer.undeployRappInstance(rapp, rappInstance);
+        mockServer.verify();
+        assertTrue(undeployRapp);
+    }
+
     @Test
     void testUndeployRappInstanceWithoutSme() {
         UUID rappId = UUID.randomUUID();