Merge "Correct the URLs in swagger"
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/pnf/aai/AaiConnectionImpl.java b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/pnf/aai/AaiConnectionImpl.java
index 8bba435..d57e487 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/pnf/aai/AaiConnectionImpl.java
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/pnf/aai/AaiConnectionImpl.java
@@ -21,7 +21,6 @@
package org.onap.so.bpmn.infrastructure.pnf.aai;
import java.util.Optional;
-import java.util.UUID;
import org.onap.aai.domain.yang.Pnf;
import org.onap.so.bpmn.infrastructure.pnf.implementation.AaiConnection;
import org.onap.so.client.aai.AAIRestClientImpl;
@@ -33,12 +32,12 @@
@Override
public Optional<Pnf> getEntryFor(String correlationId) {
AAIRestClientImpl restClient = new AAIRestClientImpl();
- return restClient.getPnfByName(correlationId, UUID.randomUUID().toString());
+ return restClient.getPnfByName(correlationId);
}
@Override
public void createEntry(String correlationId, Pnf entry) {
AAIRestClientImpl restClient = new AAIRestClientImpl();
- restClient.createPnf(correlationId, UUID.randomUUID().toString(), entry);
+ restClient.createPnf(correlationId, entry);
}
}
diff --git a/common/src/main/java/org/onap/so/client/aai/AAIRestClientI.java b/common/src/main/java/org/onap/so/client/aai/AAIRestClientI.java
index 785c82b..62d7d56 100644
--- a/common/src/main/java/org/onap/so/client/aai/AAIRestClientI.java
+++ b/common/src/main/java/org/onap/so/client/aai/AAIRestClientI.java
@@ -31,11 +31,11 @@
List<Pserver> getPhysicalServerByVnfId(String vnfId) throws IOException;
- void updateMaintenceFlagVnfId(String vnfId, boolean inMaint) throws Exception;
+ void updateMaintenceFlagVnfId(String vnfId, boolean inMaint);
GenericVnf getVnfByName(String vnfId);
- Optional<Pnf> getPnfByName(String pnfId, String transactionLoggingUuid) throws Exception;
+ Optional<Pnf> getPnfByName(String pnfId);
- void createPnf(String pnfId, String transactionLoggingUuid, Pnf pnf) throws IOException;
+ void createPnf(String pnfId, Pnf pnf);
}
diff --git a/common/src/main/java/org/onap/so/client/aai/AAIRestClientImpl.java b/common/src/main/java/org/onap/so/client/aai/AAIRestClientImpl.java
index 1c02409..b2c7fcc 100644
--- a/common/src/main/java/org/onap/so/client/aai/AAIRestClientImpl.java
+++ b/common/src/main/java/org/onap/so/client/aai/AAIRestClientImpl.java
@@ -80,7 +80,7 @@
}
@Override
- public Optional<Pnf> getPnfByName(String pnfId, String transactionLoggingUuid) {
+ public Optional<Pnf> getPnfByName(String pnfId) {
Response response = new AAIResourcesClient()
.getFullResponse(AAIUriFactory.createResourceUri(AAIObjectType.PNF, pnfId));
if (response.getStatus() != 200) {
@@ -91,7 +91,7 @@
}
@Override
- public void createPnf(String pnfId, String transactionLoggingUuid, Pnf pnf) {
+ public void createPnf(String pnfId, Pnf pnf) {
new AAIResourcesClient()
.createIfNotExists(AAIUriFactory.createResourceUri(AAIObjectType.PNF, pnfId), Optional.of(pnf));
}