X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=rapp-manager-sme%2Fsrc%2Fmain%2Fjava%2Fcom%2Foransc%2Frappmanager%2Fsme%2Fservice%2FSmeDeployer.java;h=fc42f4d3ea2c0444fb2e548d77e4ca4850da1303;hb=40a82302ff06348e446a2de3c4a552b1ee9bc61b;hp=1760e9cd89d1790ee3ddfd7194c59c60750addae;hpb=cc9f90ef6d725e90cf477ef6b83ec5a2948127b3;p=nonrtric%2Fplt%2Frappmanager.git 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 1760e9c..fc42f4d 100755 --- 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 @@ -21,12 +21,11 @@ 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.rapp.Rapp; -import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; import com.oransc.rappmanager.models.RappDeployer; +import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; +import com.oransc.rappmanager.models.rapp.Rapp; import com.oransc.rappmanager.models.rapp.RappEvent; import com.oransc.rappmanager.models.rappinstance.RappInstance; -import com.oransc.rappmanager.models.cache.RappCacheService; import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine; import com.oransc.rappmanager.sme.invoker.data.APIInvokerEnrolmentDetails; import com.oransc.rappmanager.sme.provider.data.APIProviderEnrolmentDetails; @@ -49,6 +48,7 @@ public class SmeDeployer implements RappDeployer { private final com.oransc.rappmanager.sme.provider.rest.DefaultApiClient providerDefaultApiClient; + private final com.oransc.rappmanager.sme.publishservice.rest.DefaultApiClient publishServiceDefaultApiClient; private final com.oransc.rappmanager.sme.invoker.rest.DefaultApiClient invokerDefaultApiClient; @@ -57,8 +57,6 @@ public class SmeDeployer implements RappDeployer { private final ObjectMapper objectMapper; - private final RappCacheService rappCacheService; - private final RappInstanceStateMachine rappInstanceStateMachine; private String amfRegistrationId; @@ -131,7 +129,7 @@ public class SmeDeployer implements RappDeployer { @Override public boolean deprimeRapp(Rapp rapp) { - //If there is any deprimgng operations + //If there is any depriming operations return true; } @@ -190,7 +188,8 @@ public class SmeDeployer implements RappDeployer { if (providerApiPayload != null) { ServiceAPIDescription serviceAPIDescription = objectMapper.readValue(providerApiPayload, ServiceAPIDescription.class); - serviceAPIDescription.getAefProfiles().forEach(aefProfile -> aefProfile.setAefId(rappInstance.getSme().getAefId())); + serviceAPIDescription.getAefProfiles() + .forEach(aefProfile -> aefProfile.setAefId(rappInstance.getSme().getAefId())); ServiceAPIDescription serviceAPIDescriptionResponse = publishServiceDefaultApiClient.postApfIdServiceApis(rappInstance.getSme().getApfId(), serviceAPIDescription);