Improve code coverage in SME

Code cleanup.
Code coverage improved.

Issue-ID: NONRTRIC-929
Signed-off-by: aravind.est <aravindhan.a@est.tech>
Change-Id: Id4db9e48d411457a50bb61fb2594be916a315b4b

diff --git a/rapp-manager-sme/src/main/java/com/oransc/rappmanager/sme/service/SmeDeployer.java b/rapp-manager-sme/src/main/java/com/oransc/rappmanager/sme/service/SmeDeployer.java
index adbf8fe..e1d9943 100755 (executable)
--- a/rapp-manager-sme/src/main/java/com/oransc/rappmanager/sme/service/SmeDeployer.java
+++ b/rapp-manager-sme/src/main/java/com/oransc/rappmanager/sme/service/SmeDeployer.java
@@ -18,7 +18,6 @@
 
 package com.oransc.rappmanager.sme.service;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.oransc.rappmanager.models.RappDeployer;
@@ -89,19 +88,10 @@ public class SmeDeployer implements RappDeployer {
     @Override
     public boolean deployRappInstance(Rapp rapp, RappInstance rappInstance) {
         logger.debug("Deploying SME functions for RappInstance {}", rappInstance.getRappInstanceId());
-        try {
-            boolean deployState =
-                    createProviderDomain(rapp, rappInstance) && createPublishApi(rapp, rappInstance) && createInvoker(
-                            rapp, rappInstance);
-            if (deployState) {
-                rappInstanceStateMachine.sendRappInstanceEvent(rappInstance, RappEvent.SMEDEPLOYED);
-            } else {
-                rappInstance.setReason("Unable to deploy SME");
-                rappInstanceStateMachine.sendRappInstanceEvent(rappInstance, RappEvent.SMEDEPLOYFAILED);
-            }
-            return deployState;
-        } catch (JsonProcessingException e) {
-            logger.warn("Failed to deploy SME functions for Rapp {}", rapp.getName(), e);
+        if (createProviderDomain(rapp, rappInstance) && createPublishApi(rapp, rappInstance) && createInvoker(rapp,
+                rappInstance)) {
+            rappInstanceStateMachine.sendRappInstanceEvent(rappInstance, RappEvent.SMEDEPLOYED);
+            return true;
         }
         rappInstanceStateMachine.sendRappInstanceEvent(rappInstance, RappEvent.SMEDEPLOYFAILED);
         rappInstance.setReason("Unable to deploy SME");
@@ -138,7 +128,7 @@ public class SmeDeployer implements RappDeployer {
         return true;
     }
 
-    boolean createProviderDomain(Rapp rapp, RappInstance rappInstance) throws JsonProcessingException {
+    boolean createProviderDomain(Rapp rapp, RappInstance rappInstance) {
         logger.debug("Creating provider domain for Rapp {}", rapp.getName());
         try {
             String providerDomainPayload =
@@ -185,7 +175,7 @@ public class SmeDeployer implements RappDeployer {
     }
 
 
-    boolean createPublishApi(Rapp rapp, RappInstance rappInstance) throws JsonProcessingException {
+    boolean createPublishApi(Rapp rapp, RappInstance rappInstance) {
         logger.debug("Creating publish api for Rapp {}", rapp.getName());
         try {
             String providerApiPayload =
@@ -214,7 +204,7 @@ public class SmeDeployer implements RappDeployer {
         publishServiceDefaultApiClient.deleteApfIdServiceApisServiceApiId(serviceApiId, apfId);
     }
 
-    boolean createInvoker(Rapp rapp, RappInstance rappInstance) throws JsonProcessingException {
+    boolean createInvoker(Rapp rapp, RappInstance rappInstance) {
         logger.debug("Creating provider domain for Rapp {}", rapp.getName());
         try {
             String invokerPayload = rappCsarConfigurationHandler.getSmeInvokerPayload(rapp, rappInstance.getSme());

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 ffa5457..e1b3752 100755 (executable)
--- 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
@@ -28,12 +28,12 @@ import static org.springframework.test.web.client.response.MockRestResponseCreat
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.oransc.rappmanager.models.rapp.Rapp;
+import com.oransc.rappmanager.models.cache.RappCacheService;
 import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
+import com.oransc.rappmanager.models.rapp.Rapp;
+import com.oransc.rappmanager.models.rapp.RappState;
 import com.oransc.rappmanager.models.rappinstance.RappInstance;
 import com.oransc.rappmanager.models.rappinstance.RappSMEInstance;
-import com.oransc.rappmanager.models.rapp.RappState;
-import com.oransc.rappmanager.models.cache.RappCacheService;
 import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine;
 import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachineConfig;
 import com.oransc.rappmanager.sme.configuration.SmeConfiguration;
@@ -243,7 +243,7 @@ class SmeDeployerTest {
     }
 
     @Test
-    void testCreateInvokerFailure() throws Exception {
+    void testCreateInvokerFailure() {
         UUID rappId = UUID.randomUUID();
         Rapp rapp =
                 Rapp.builder().rappId(rappId).name("").packageName(validRappFile).packageLocation(validCsarFileLocation)
@@ -397,6 +397,12 @@ class SmeDeployerTest {
         assertFalse(undeployRapp);
     }
 
+    @Test
+    void testPrimingAndDeprimingDoesNothing() {
+        assertTrue(smeDeployer.primeRapp(null));
+        assertTrue(smeDeployer.deprimeRapp(null));
+    }
+
     RappInstance getRappInstance() {
         RappSMEInstance rappSMEInstance = new RappSMEInstance();
         rappSMEInstance.setInvokers("invoker-app1");