aboutsummaryrefslogtreecommitdiffstats
path: root/vid-app-common
diff options
context:
space:
mode:
Diffstat (limited to 'vid-app-common')
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/aai/PombaClientImpl.java11
-rw-r--r--vid-app-common/src/test/java/org/onap/vid/aai/PombaClientImplTest.java93
-rw-r--r--vid-app-common/src/test/resources/pomba_request.json18
3 files changed, 117 insertions, 5 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/PombaClientImpl.java b/vid-app-common/src/main/java/org/onap/vid/aai/PombaClientImpl.java
index 000628d8a..15fda829c 100644
--- a/vid-app-common/src/main/java/org/onap/vid/aai/PombaClientImpl.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/PombaClientImpl.java
@@ -1,13 +1,13 @@
+
package org.onap.vid.aai;
import com.fasterxml.jackson.databind.ObjectMapper;
+import javax.servlet.ServletContext;
import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.onap.portalsdk.core.util.SystemProperties;
import org.onap.vid.model.PombaInstance.PombaRequest;
+import org.onap.vid.utils.SystemPropertiesWrapper;
import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.ServletContext;
-
public class PombaClientImpl implements PombaClientInterface {
protected String fromAppId = "VidAaiController";
@@ -19,13 +19,14 @@ public class PombaClientImpl implements PombaClientInterface {
@Autowired
PombaRestInterface pombaRestInterface;
+ @Autowired
+ SystemPropertiesWrapper systemPropertiesWrapper;
@Override
public void verify(PombaRequest request) {
String methodName = "doAaiPost";
logger.debug(EELFLoggerDelegate.debugLogger, methodName + " start");
- String uri = SystemProperties.getProperty("pomba.server.url");
-
+ String uri = systemPropertiesWrapper.getProperty("pomba.server.url");
try {
pombaRestInterface.RestPost(fromAppId, uri, new ObjectMapper().writeValueAsString(request));
diff --git a/vid-app-common/src/test/java/org/onap/vid/aai/PombaClientImplTest.java b/vid-app-common/src/test/java/org/onap/vid/aai/PombaClientImplTest.java
new file mode 100644
index 000000000..b1c4139b7
--- /dev/null
+++ b/vid-app-common/src/test/java/org/onap/vid/aai/PombaClientImplTest.java
@@ -0,0 +1,93 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Modifications Copyright 2019 Nokia
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.vid.aai;
+
+import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.then;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.Lists;
+import java.io.IOException;
+import java.net.URL;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.onap.vid.model.PombaInstance.PombaRequest;
+import org.onap.vid.model.PombaInstance.ServiceInstance;
+import org.onap.vid.utils.SystemPropertiesWrapper;
+
+@RunWith(MockitoJUnitRunner.class)
+public class PombaClientImplTest {
+
+ @Mock
+ private SystemPropertiesWrapper systemPropertiesWrapper;
+ @Mock
+ private PombaRestInterface pombaRestInterface;
+ @InjectMocks
+ private PombaClientImpl pombaClient;
+
+ @Test
+ public void should_doHttpPost_withGivenPombaRequest() throws IOException {
+ //Given
+ String expectedUrl = "http://localhost/dummyUrl";
+ given(systemPropertiesWrapper.getProperty("pomba.server.url")).willReturn(expectedUrl);
+ String expectedPayload = readExpectedPombaJsonRequest();
+ PombaRequest pombaRequest = createPombaRequest();
+
+ //When
+ pombaClient.verify(pombaRequest);
+
+ //Then
+ then(pombaRestInterface).should().RestPost("VidAaiController", expectedUrl, expectedPayload);
+ }
+
+ private String readExpectedPombaJsonRequest() throws IOException {
+ URL url = PombaClientImplTest.class.getClassLoader().getResource("pomba_request.json");
+ PombaRequest expectedPombaRequest = new ObjectMapper().readValue(url, PombaRequest.class);
+ return new ObjectMapper().writeValueAsString(expectedPombaRequest);
+ }
+
+ private PombaRequest createPombaRequest() {
+ ServiceInstance serviceInstance1 = createServiceInstance("serviceType1", "serviceInstanceId1", "customerId1",
+ "modelVersion1", "modelInvariantId1");
+ ServiceInstance serviceInstance2 = createServiceInstance("serviceType2", "serviceInstanceId2", "customerId2",
+ "modelVersion2", "modelInvariantId2");
+
+ PombaRequest pombaRequest = new PombaRequest();
+ pombaRequest.serviceInstanceList = Lists.newArrayList(serviceInstance1, serviceInstance2);
+ return pombaRequest;
+ }
+
+ private ServiceInstance createServiceInstance(String serviceType, String serviceInstanceId, String customerId,
+ String modelVersionId, String modelInvariantId) {
+ ServiceInstance serviceInstance = new ServiceInstance();
+ serviceInstance.serviceType = serviceType;
+ serviceInstance.serviceInstanceId = serviceInstanceId;
+ serviceInstance.customerId = customerId;
+ serviceInstance.modelInvariantId = modelInvariantId;
+ serviceInstance.modelVersionId = modelVersionId;
+ return serviceInstance;
+ }
+
+} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/pomba_request.json b/vid-app-common/src/test/resources/pomba_request.json
new file mode 100644
index 000000000..3d873bff8
--- /dev/null
+++ b/vid-app-common/src/test/resources/pomba_request.json
@@ -0,0 +1,18 @@
+{
+ "serviceInstanceList": [
+ {
+ "serviceInstanceId": "serviceInstanceId1",
+ "modelVersionId": "modelVersion1",
+ "modelInvariantId": "modelInvariantId1",
+ "customerId": "customerId1",
+ "serviceType": "serviceType1"
+ },
+ {
+ "serviceInstanceId": "serviceInstanceId2",
+ "modelVersionId": "modelVersion2",
+ "modelInvariantId": "modelInvariantId2",
+ "customerId": "customerId2",
+ "serviceType": "serviceType2"
+ }
+ ]
+} \ No newline at end of file