diff options
Diffstat (limited to 'common/src')
5 files changed, 15 insertions, 15 deletions
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 831e43841a..52f15c45c4 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 @@ -33,7 +33,7 @@ public interface AAIRestClientI { void updateMaintenceFlagVnfId(String vnfId, boolean inMaint, String transactionLoggingUuid) throws Exception; - GenericVnf getVnfByName(String vnfId, String transactionLoggingUuid) throws Exception; + GenericVnf getVnfByName(String vnfId); Optional<Pnf> getPnfByName(String pnfId, String transactionLoggingUuid) throws Exception; 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 bcc7d8ba16..813421ff80 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 @@ -75,7 +75,7 @@ public class AAIRestClientImpl implements AAIRestClientI { } @Override - public GenericVnf getVnfByName(String vnfId, String transactionLoggingUuid) { + public GenericVnf getVnfByName(String vnfId) { return new AAIResourcesClient(ENDPOINT_VERSION) .get(GenericVnf.class, AAIUriFactory.createResourceUri(AAIObjectType.GENERIC_VNF, vnfId)).orElse(null); } diff --git a/common/src/main/java/org/onap/so/client/aai/AAIValidator.java b/common/src/main/java/org/onap/so/client/aai/AAIValidator.java index bf6485a631..18252d548b 100644 --- a/common/src/main/java/org/onap/so/client/aai/AAIValidator.java +++ b/common/src/main/java/org/onap/so/client/aai/AAIValidator.java @@ -24,9 +24,9 @@ import java.io.IOException; public interface AAIValidator { - boolean isPhysicalServerLocked(String hostName, String transactionLoggingUuid) throws IOException; + boolean isPhysicalServerLocked(String hostName) throws IOException; - boolean isVNFLocked(String vnfId, String transactionLoggingUuid) throws IOException, Exception; + boolean isVNFLocked(String vnfId); }
\ No newline at end of file diff --git a/common/src/main/java/org/onap/so/client/aai/AAIValidatorImpl.java b/common/src/main/java/org/onap/so/client/aai/AAIValidatorImpl.java index e416da172c..6ece8a2620 100644 --- a/common/src/main/java/org/onap/so/client/aai/AAIValidatorImpl.java +++ b/common/src/main/java/org/onap/so/client/aai/AAIValidatorImpl.java @@ -46,7 +46,7 @@ public class AAIValidatorImpl implements AAIValidator { } @Override - public boolean isPhysicalServerLocked(String vnfId, String transactionLoggingUuid) throws IOException { + public boolean isPhysicalServerLocked(String vnfId) throws IOException { List<Pserver> pservers; boolean isLocked = false; pservers = client.getPhysicalServerByVnfId(vnfId); @@ -58,9 +58,9 @@ public class AAIValidatorImpl implements AAIValidator { } @Override - public boolean isVNFLocked(String vnfId, String transactionLoggingUuid) throws Exception { + public boolean isVNFLocked(String vnfId) { boolean isLocked = false; - GenericVnf genericVnf = client.getVnfByName(vnfId, transactionLoggingUuid); + GenericVnf genericVnf = client.getVnfByName(vnfId); if (genericVnf.isInMaint()) isLocked = true; diff --git a/common/src/test/java/org/onap/so/client/aai/AAIValidatorTest.java b/common/src/test/java/org/onap/so/client/aai/AAIValidatorTest.java index 63c7290065..f32633122d 100644 --- a/common/src/test/java/org/onap/so/client/aai/AAIValidatorTest.java +++ b/common/src/test/java/org/onap/so/client/aai/AAIValidatorTest.java @@ -66,28 +66,28 @@ public class AAIValidatorTest { @Test public void test_IsPhysicalServerLocked_True() throws IOException{ when(client.getPhysicalServerByVnfId(vnfName)).thenReturn(getPservers(true)); - boolean locked = validator.isPhysicalServerLocked(vnfName, uuid); + boolean locked = validator.isPhysicalServerLocked(vnfName); assertEquals(true, locked); } @Test public void test_IsPhysicalServerLocked_False() throws IOException { when(client.getPhysicalServerByVnfId(vnfName)).thenReturn(getPservers(false)); - boolean locked = validator.isPhysicalServerLocked(vnfName, uuid); + boolean locked = validator.isPhysicalServerLocked(vnfName); assertEquals(false, locked); } @Test - public void test_IsVNFLocked_False() throws Exception{ - when(client.getVnfByName(vnfName,uuid)).thenReturn(createGenericVnfs(false)); - boolean locked = validator.isVNFLocked(vnfName, uuid); + public void test_IsVNFLocked_False() { + when(client.getVnfByName(vnfName)).thenReturn(createGenericVnfs(false)); + boolean locked = validator.isVNFLocked(vnfName); assertEquals(false, locked); } @Test - public void test_IsVNFLocked_True() throws Exception{ - when(client.getVnfByName(vnfName,uuid)).thenReturn(createGenericVnfs(true)); - boolean locked = validator.isVNFLocked(vnfName, uuid); + public void test_IsVNFLocked_True() { + when(client.getVnfByName(vnfName)).thenReturn(createGenericVnfs(true)); + boolean locked = validator.isVNFLocked(vnfName); assertEquals(true,locked ); } } |