X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=bpmn%2Fso-bpmn-tasks%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fso%2Fclient%2Forchestration%2FAAIPnfResources.java;fp=bpmn%2Fso-bpmn-tasks%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fso%2Fclient%2Forchestration%2FAAIPnfResources.java;h=d042fd68d42676922443b6d5209875c834c92805;hb=50e4c2f980f8ca2c6e1fc07e6e9b5ef773f98249;hp=acfca5d55aa72dab3cf76081f6bc8a72748b83b7;hpb=7d2e0ab737e76d4fe2d839181e49b4cbf6ff2b10;p=so.git diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/AAIPnfResources.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/AAIPnfResources.java index acfca5d55a..d042fd68d4 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/AAIPnfResources.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/AAIPnfResources.java @@ -62,8 +62,15 @@ public class AAIPnfResources { public void updateOrchestrationStatusPnf(Pnf pnf, OrchestrationStatus orchestrationStatus) { AAIResourceUri pnfURI = AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.network().pnf(pnf.getPnfName())); - Pnf pnfCopy = pnf.shallowCopyId(); + if (orchestrationStatus.equals(OrchestrationStatus.REGISTER) + || orchestrationStatus.equals(OrchestrationStatus.REGISTERED)) { + pnf.setInMaint(true); + pnfCopy.setInMaint(true); + } else { + pnf.setInMaint(false); + pnfCopy.setInMaint(false); + } pnf.setOrchestrationStatus(orchestrationStatus); pnfCopy.setOrchestrationStatus(orchestrationStatus); @@ -93,6 +100,30 @@ public class AAIPnfResources { injectionHelper.getAaiClient().delete(pnfURI); } + public void updateObjectPnf(Pnf pnf) { + Optional pnfFromAai = + injectionHelper.getAaiClient().get(org.onap.aai.domain.yang.Pnf.class, + AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.network().pnf(pnf.getPnfName()))); + logger.info("***in updateObjectPnf getPnfName====> {} ", pnfFromAai.get().getPnfName()); + injectionHelper.getAaiClient().update( + AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.network().pnf(pnf.getPnfName())), + aaiObjectMapper.mapPnf((pnf))); + } + + /** + * Check inMaint flag value of PNF from AAI using pnfName + * + * @param pnfName - pnf-id required pnf + * @return inMaint flag value + */ + public boolean checkInMaintFlag(String pnfName) { + org.onap.aai.domain.yang.Pnf pnf = injectionHelper.getAaiClient() + .get(org.onap.aai.domain.yang.Pnf.class, + AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.network().pnf(pnfName))) + .orElse(new org.onap.aai.domain.yang.Pnf()); + return pnf.isInMaint(); + } + private void updatePnfFields(Pnf pnf, org.onap.aai.domain.yang.Pnf pnfFromAai) { if (pnf.getModelInfoPnf() != null && StringUtils.isNotBlank(pnf.getModelInfoPnf().getModelCustomizationUuid())) {