diff options
Diffstat (limited to 'blueprints-processor/adaptors/rest-adaptor-provider/src/test')
5 files changed, 168 insertions, 128 deletions
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java index e698567a0..6c7f114eb 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java @@ -1,15 +1,18 @@ /*
* Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
*
- * 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
+ * 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.
+ * 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.
*/
package org.onap.ccsdk.config.rest.adaptor.service;
@@ -24,30 +27,30 @@ import org.junit.Before; import org.junit.Test;
public class AbstractConfigRestClientAdapterTest {
-
+
Map<String, String> properties = new HashMap<>();
-
+
@Before
public void setup() throws Exception {
String propertyfile = "src/test/resources/config-rest-adaptor.properties";
-
+
Properties restProperties = new Properties();
restProperties.load(new FileInputStream(propertyfile));
-
+
properties.putAll(restProperties.entrySet().stream()
.collect(Collectors.toMap(e -> e.getKey().toString(), e -> e.getValue().toString())));
}
-
+
@Test
public void testInitGenericRestClient() throws Exception {
ConfigRestClientServiceAdapter genericRestClient = new GenericRestClientAdapterImpl(properties, "modelservice");
Assert.assertNotNull(genericRestClient);
}
-
+
@Test
public void testInitSSLClient() throws Exception {
ConfigRestClientServiceAdapter sslClient = new SSLRestClientAdapterImpl(properties, "aai");
Assert.assertNotNull(sslClient);
}
-
+
}
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/GenericRestClientServiceTest.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/GenericRestClientServiceTest.java index 65a90429d..7e7f52261 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/GenericRestClientServiceTest.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/GenericRestClientServiceTest.java @@ -1,15 +1,18 @@ /*
* Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
*
- * 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
+ * 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.
+ * 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.
*/
package org.onap.ccsdk.config.rest.adaptor.service;
@@ -22,7 +25,6 @@ import org.junit.Before; import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Matchers;
-import org.mockito.Mockito;
import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -37,80 +39,80 @@ import org.springframework.web.client.RestTemplate; @PowerMockIgnore("javax.net.ssl.*")
@PrepareForTest({AbstractConfigRestClientAdapter.class})
public class GenericRestClientServiceTest {
-
+
ConfigRestAdaptorService configRestAdaptorService;
-
+
RestTemplate mockRestTemplate = mock(RestTemplate.class);
-
+
String path = "path";
-
+
@Before
public void before() throws Exception {
whenNew(RestTemplate.class).withAnyArguments().thenReturn(mockRestTemplate);
-
+
String propertyDir = "src/test/resources";
configRestAdaptorService = new ConfigRestAdaptorServiceImpl(propertyDir);
}
-
+
@Test
public void testGetResource() throws Exception {
String responseBody = "sampleBodyString";
ResponseEntity<Object> response = new ResponseEntity<Object>(responseBody, HttpStatus.OK);
when(mockRestTemplate.exchange(Matchers.endsWith(path), Matchers.eq(HttpMethod.GET), Matchers.any(),
Matchers.any(Class.class))).thenReturn(response);
-
+
String body = configRestAdaptorService.getResource("modelservice", path, String.class);
-
+
Assert.assertEquals(responseBody, body);
}
-
+
@Test
public void testPostResource() throws Exception {
String responseBody = "sampleBodyString";
ResponseEntity<Object> response = new ResponseEntity<Object>(responseBody, HttpStatus.OK);
when(mockRestTemplate.exchange(Matchers.endsWith(path), Matchers.eq(HttpMethod.POST), Matchers.any(),
Matchers.any(Class.class))).thenReturn(response);
-
+
String body = configRestAdaptorService.postResource("modelservice", path, null, String.class);
-
+
Assert.assertEquals(responseBody, body);
}
-
+
@Test
public void testExchange() throws Exception {
String responseBody = "sampleBodyString";
ResponseEntity<Object> response = new ResponseEntity<Object>(responseBody, HttpStatus.OK);
when(mockRestTemplate.exchange(Matchers.endsWith(path), Matchers.eq(HttpMethod.GET), Matchers.any(),
Matchers.any(Class.class))).thenReturn(response);
-
+
String body = configRestAdaptorService.exchangeResource("modelservice", path, null, String.class, "GET");
-
+
Assert.assertEquals(responseBody, body);
}
-
+
@Test(expected = ConfigRestAdaptorException.class)
public void testGetResourceError() throws Exception {
ResponseEntity<Object> response = new ResponseEntity<Object>("", HttpStatus.INTERNAL_SERVER_ERROR);
when(mockRestTemplate.getForEntity(Matchers.endsWith(path), Matchers.any())).thenReturn(response);
-
+
configRestAdaptorService.getResource("modelservice", path, String.class);
}
-
+
@Test(expected = ConfigRestAdaptorException.class)
public void testPostResourceError() throws Exception {
ResponseEntity<Object> response = new ResponseEntity<Object>("", HttpStatus.INTERNAL_SERVER_ERROR);
when(mockRestTemplate.postForEntity(Matchers.endsWith(path), Matchers.anyObject(), Matchers.any()))
.thenReturn(response);
-
+
configRestAdaptorService.postResource("modelservice", path, null, String.class);
}
-
+
@Test(expected = ConfigRestAdaptorException.class)
public void testExchangeError() throws Exception {
ResponseEntity<Object> response = new ResponseEntity<Object>("", HttpStatus.INTERNAL_SERVER_ERROR);
when(mockRestTemplate.exchange(Matchers.endsWith(path), Matchers.eq(HttpMethod.GET), Matchers.any(),
Matchers.any(Class.class))).thenReturn(response);
-
+
configRestAdaptorService.exchangeResource("modelservice", path, null, String.class, "GET");
}
}
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/SSLClientServiceTest.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/SSLClientServiceTest.java index 4592de819..a5e757213 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/SSLClientServiceTest.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/SSLClientServiceTest.java @@ -1,15 +1,18 @@ /*
* Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
*
- * 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
+ * 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.
+ * 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.
*/
package org.onap.ccsdk.config.rest.adaptor.service;
@@ -22,7 +25,6 @@ import org.junit.Before; import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Matchers;
-import org.mockito.Mockito;
import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -37,80 +39,80 @@ import org.springframework.web.client.RestTemplate; @PowerMockIgnore("javax.net.ssl.*")
@PrepareForTest({AbstractConfigRestClientAdapter.class})
public class SSLClientServiceTest {
-
+
ConfigRestAdaptorService configRestAdaptorService;
-
+
RestTemplate mockRestTemplate = mock(RestTemplate.class);
-
+
String path = "path";
-
+
@Before
public void before() throws Exception {
whenNew(RestTemplate.class).withAnyArguments().thenReturn(mockRestTemplate);
-
+
String propertyDir = "src/test/resources";
configRestAdaptorService = new ConfigRestAdaptorServiceImpl(propertyDir);
}
-
+
@Test
public void testGetResource() throws Exception {
String responseBody = "sampleBodyString";
ResponseEntity<Object> response = new ResponseEntity<Object>(responseBody, HttpStatus.OK);
when(mockRestTemplate.exchange(Matchers.endsWith(path), Matchers.eq(HttpMethod.GET), Matchers.any(),
Matchers.any(Class.class))).thenReturn(response);
-
+
String body = configRestAdaptorService.getResource("aai", path, String.class);
-
+
Assert.assertEquals(responseBody, body);
}
-
+
@Test
public void testPostResource() throws Exception {
String responseBody = "sampleBodyString";
ResponseEntity<Object> response = new ResponseEntity<Object>(responseBody, HttpStatus.OK);
when(mockRestTemplate.exchange(Matchers.endsWith(path), Matchers.eq(HttpMethod.POST), Matchers.any(),
Matchers.any(Class.class))).thenReturn(response);
-
+
String body = configRestAdaptorService.postResource("aai", path, null, String.class);
-
+
Assert.assertEquals(responseBody, body);
}
-
+
@Test
public void testExchange() throws Exception {
String responseBody = "sampleBodyString";
ResponseEntity<Object> response = new ResponseEntity<Object>(responseBody, HttpStatus.OK);
when(mockRestTemplate.exchange(Matchers.endsWith(path), Matchers.eq(HttpMethod.GET), Matchers.any(),
Matchers.any(Class.class))).thenReturn(response);
-
+
String body = configRestAdaptorService.exchangeResource("aai", path, null, String.class, "GET");
-
+
Assert.assertEquals(responseBody, body);
}
-
+
@Test(expected = ConfigRestAdaptorException.class)
public void testGetResourceError() throws Exception {
ResponseEntity<Object> response = new ResponseEntity<Object>("", HttpStatus.INTERNAL_SERVER_ERROR);
when(mockRestTemplate.getForEntity(Matchers.endsWith(path), Matchers.any())).thenReturn(response);
-
+
configRestAdaptorService.getResource("aai", path, String.class);
}
-
+
@Test(expected = ConfigRestAdaptorException.class)
public void testPostResourceError() throws Exception {
ResponseEntity<Object> response = new ResponseEntity<Object>("", HttpStatus.INTERNAL_SERVER_ERROR);
when(mockRestTemplate.postForEntity(Matchers.endsWith(path), Matchers.anyObject(), Matchers.any()))
.thenReturn(response);
-
+
configRestAdaptorService.postResource("aai", path, null, String.class);
}
-
+
@Test(expected = ConfigRestAdaptorException.class)
public void testExchangeError() throws Exception {
ResponseEntity<Object> response = new ResponseEntity<Object>("", HttpStatus.INTERNAL_SERVER_ERROR);
when(mockRestTemplate.exchange(Matchers.endsWith(path), Matchers.eq(HttpMethod.GET), Matchers.any(),
Matchers.any(Class.class))).thenReturn(response);
-
+
configRestAdaptorService.exchangeResource("aai", path, null, String.class, "GET");
}
}
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/utils/RestTemplateFactoryTest.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/utils/RestTemplateFactoryTest.java index a01630d62..e1d0268e1 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/utils/RestTemplateFactoryTest.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/utils/RestTemplateFactoryTest.java @@ -1,32 +1,49 @@ -package org.onap.ccsdk.config.rest.adaptor.utils; - -import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants; -import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException; -import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorServiceImpl; - -@SuppressWarnings("squid:S2187") -public class RestTemplateFactoryTest { - - public static void main(String[] args) { - - String propertyFile = RestTemplateFactoryTest.class.getClassLoader().getResource(".").getPath(); - System.out.println(" Property : " + propertyFile); - - try { - ConfigRestAdaptorServiceImpl configRestAdaptorServiceImpl = new ConfigRestAdaptorServiceImpl(propertyFile); - String restconfResponse = genericRestGetMDSALOperation(args, configRestAdaptorServiceImpl); - System.out.println("RestTemplateFactoryTest.main Completed with response :" + restconfResponse); - } catch (ConfigRestAdaptorException e) { - e.printStackTrace(); - } - } - - public static String genericRestGetMDSALOperation(String[] args, - ConfigRestAdaptorServiceImpl configRestAdaptorServiceImpl) throws ConfigRestAdaptorException { - String path = "config/Dummy-API:services/service-list/dummy-1234"; - String restconfResponse = configRestAdaptorServiceImpl.getResource(ConfigRestAdaptorConstants.SELECTOR_RESTCONF, - path, String.class); - return restconfResponse; - } - -} +/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
+ *
+ * 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.
+ */
+
+package org.onap.ccsdk.config.rest.adaptor.utils;
+
+import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;
+import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorServiceImpl;
+
+@SuppressWarnings("squid:S2187")
+public class RestTemplateFactoryTest {
+
+ public static void main(String[] args) {
+
+ String propertyFile = RestTemplateFactoryTest.class.getClassLoader().getResource(".").getPath();
+ System.out.println(" Property : " + propertyFile);
+
+ try {
+ ConfigRestAdaptorServiceImpl configRestAdaptorServiceImpl = new ConfigRestAdaptorServiceImpl(propertyFile);
+ String restconfResponse = genericRestGetMDSALOperation(args, configRestAdaptorServiceImpl);
+ System.out.println("RestTemplateFactoryTest.main Completed with response :" + restconfResponse);
+ } catch (ConfigRestAdaptorException e) {
+ e.printStackTrace();
+ }
+ }
+
+ public static String genericRestGetMDSALOperation(String[] args,
+ ConfigRestAdaptorServiceImpl configRestAdaptorServiceImpl) throws ConfigRestAdaptorException {
+ String path = "config/Dummy-API:services/service-list/dummy-1234";
+ String restconfResponse = configRestAdaptorServiceImpl.getResource(ConfigRestAdaptorConstants.SELECTOR_RESTCONF,
+ path, String.class);
+ return restconfResponse;
+ }
+
+}
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/config-rest-adaptor.properties b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/config-rest-adaptor.properties index 725e48429..4527e8977 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/config-rest-adaptor.properties +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/config-rest-adaptor.properties @@ -1,29 +1,45 @@ -# -# Configuration file for SDNC Controller Module -# - -org.onap.ccsdk.config.rest.adaptors.envtype=solo - -# Config Generator Microservices -org.onap.ccsdk.config.rest.adaptors.modelservice.type=generic -org.onap.ccsdk.config.rest.adaptors.modelservice.enable=true -org.onap.ccsdk.config.rest.adaptors.modelservice.url=http://localhost:8080/configgenerator/service/ -org.onap.ccsdk.config.rest.adaptors.modelservice.user=admin -org.onap.ccsdk.config.rest.adaptors.modelservice.passwd=admin - -# Generic RESTCONF Adaptor -org.onap.ccsdk.config.rest.adaptors.restconf.type=generic -org.onap.ccsdk.config.rest.adaptors.restconf.enable=true -org.onap.ccsdk.config.rest.adaptors.restconf.user=admin -org.onap.ccsdk.config.rest.adaptors.restconf.passwd=admin -org.onap.ccsdk.config.rest.adaptors.restconf.url=http://localhost:8181/restconf/ - -# SSL AAI Adaptor -org.onap.ccsdk.config.rest.adaptors.aai.propertyfile=aai.properties -org.onap.ccsdk.config.rest.adaptors.aai.type=ssl -org.onap.ccsdk.config.rest.adaptors.aai.enable=true -org.onap.ccsdk.config.rest.adaptors.aai.url=https://localhost:8443/onap-aai/ -org.onap.ccsdk.config.rest.adaptors.aai.ssl.trust=src/test/resources/truststore.client.jks -org.onap.ccsdk.config.rest.adaptors.aai.ssl.trust.psswd=changeme -org.onap.ccsdk.config.rest.adaptors.aai.ssl.key=src/test/resources/keystore.client.p12 -org.onap.ccsdk.config.rest.adaptors.aai.ssl.key.psswd=changeme +###
+# Copyright © 2017-2018 AT&T Intellectual Property.
+# Modifications Copyright © 2018 IBM.
+#
+# 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.
+###
+#
+# Configuration file for SDNC Controller Module
+#
+
+org.onap.ccsdk.config.rest.adaptors.envtype=solo
+
+# Config Generator Microservices
+org.onap.ccsdk.config.rest.adaptors.modelservice.type=generic
+org.onap.ccsdk.config.rest.adaptors.modelservice.enable=true
+org.onap.ccsdk.config.rest.adaptors.modelservice.url=http://localhost:8080/configgenerator/service/
+org.onap.ccsdk.config.rest.adaptors.modelservice.user=admin
+org.onap.ccsdk.config.rest.adaptors.modelservice.passwd=admin
+
+# Generic RESTCONF Adaptor
+org.onap.ccsdk.config.rest.adaptors.restconf.type=generic
+org.onap.ccsdk.config.rest.adaptors.restconf.enable=true
+org.onap.ccsdk.config.rest.adaptors.restconf.user=admin
+org.onap.ccsdk.config.rest.adaptors.restconf.passwd=admin
+org.onap.ccsdk.config.rest.adaptors.restconf.url=http://localhost:8181/restconf/
+
+# SSL AAI Adaptor
+org.onap.ccsdk.config.rest.adaptors.aai.propertyfile=aai.properties
+org.onap.ccsdk.config.rest.adaptors.aai.type=ssl
+org.onap.ccsdk.config.rest.adaptors.aai.enable=true
+org.onap.ccsdk.config.rest.adaptors.aai.url=https://localhost:8443/onap-aai/
+org.onap.ccsdk.config.rest.adaptors.aai.ssl.trust=src/test/resources/truststore.client.jks
+org.onap.ccsdk.config.rest.adaptors.aai.ssl.trust.psswd=changeme
+org.onap.ccsdk.config.rest.adaptors.aai.ssl.key=src/test/resources/keystore.client.p12
+org.onap.ccsdk.config.rest.adaptors.aai.ssl.key.psswd=changeme
|