summaryrefslogtreecommitdiffstats
path: root/adaptors/netconf-adaptor
diff options
context:
space:
mode:
Diffstat (limited to 'adaptors/netconf-adaptor')
-rw-r--r--adaptors/netconf-adaptor/netconf-adaptor-bundle/pom.xml2
-rw-r--r--adaptors/netconf-adaptor/netconf-adaptor-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/netconf/odlconnector/NetconfClientRestconfImpl.java495
-rw-r--r--adaptors/netconf-adaptor/netconf-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/netconf/NetconfConnectionDetailsTest.java235
-rw-r--r--adaptors/netconf-adaptor/netconf-adaptor-installer/pom.xml2
-rw-r--r--adaptors/netconf-adaptor/pom.xml2
5 files changed, 369 insertions, 367 deletions
diff --git a/adaptors/netconf-adaptor/netconf-adaptor-bundle/pom.xml b/adaptors/netconf-adaptor/netconf-adaptor-bundle/pom.xml
index bb712583a..103fe7798 100644
--- a/adaptors/netconf-adaptor/netconf-adaptor-bundle/pom.xml
+++ b/adaptors/netconf-adaptor/netconf-adaptor-bundle/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.3.3</version>
+ <version>2.4.1</version>
<relativePath/>
</parent>
diff --git a/adaptors/netconf-adaptor/netconf-adaptor-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/netconf/odlconnector/NetconfClientRestconfImpl.java b/adaptors/netconf-adaptor/netconf-adaptor-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/netconf/odlconnector/NetconfClientRestconfImpl.java
index 41590edce..714867148 100644
--- a/adaptors/netconf-adaptor/netconf-adaptor-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/netconf/odlconnector/NetconfClientRestconfImpl.java
+++ b/adaptors/netconf-adaptor/netconf-adaptor-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/netconf/odlconnector/NetconfClientRestconfImpl.java
@@ -1,246 +1,249 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * ================================================================================
- * Modifications Copyright (C) 2019 Ericsson
- * =============================================================================
- * 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.ccsdk.sli.adaptors.netconf.odlconnector;
-
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-import java.util.Properties;
-import org.apache.http.HttpStatus;
-import org.onap.ccsdk.sli.adaptors.netconf.HttpClient;
-import org.onap.ccsdk.sli.adaptors.netconf.NetconfAdaptorConstants;
-import org.onap.ccsdk.sli.adaptors.netconf.NetconfClient;
-import org.onap.ccsdk.sli.adaptors.netconf.NetconfClientRestconf;
-import org.onap.ccsdk.sli.adaptors.netconf.NetconfConnectionDetails;
-import org.onap.ccsdk.sli.core.sli.SvcLogicException;
-
-public class NetconfClientRestconfImpl implements NetconfClient, NetconfClientRestconf {
-
- private final EELFLogger logger = EELFManager.getInstance().getLogger(NetconfClientRestconfImpl.class);
-
- private NetconfConnectionDetails connectionDetails;
- private final String appFormat = "application/json";
-
- public NetconfClientRestconfImpl(){
- //constructor
- }
-
- //restconf client impl
-
- @SuppressWarnings("deprecation")
- @Override
- public void configure(String configuration, String deviceMountPointName, String moduleName, String nodeName) throws SvcLogicException {
-
- logger.info("Configuring device " + deviceMountPointName + " with configuration " + configuration);
-
- int httpCode = HttpClient.putMethod(NetconfAdaptorConstants.PROTOCOL, NetconfAdaptorConstants.CONTROLLER_IP, NetconfAdaptorConstants.CONTROLLER_PORT,
- getModuleConfigurePath(deviceMountPointName, moduleName, nodeName), configuration, appFormat);
-
- if (httpCode != HttpStatus.SC_OK) {
- logger.error("Configuration request failed. throwing Exception !");
- throw new SvcLogicException("Error configuring node :" + nodeName + ", of Module :" + moduleName +
- ", in device :" + deviceMountPointName);
- }
- }
-
- @Override
- public void connect(String deviceMountPointName, String payload) throws SvcLogicException{
-
- logger.info("Connecting device " + deviceMountPointName);
-
- int httpCode = HttpClient.postMethod(NetconfAdaptorConstants.PROTOCOL, NetconfAdaptorConstants.CONTROLLER_IP, NetconfAdaptorConstants.CONTROLLER_PORT,
- getConnectPath(), payload, appFormat);
-
- if(httpCode != HttpStatus.SC_NO_CONTENT){
- logger.error("Connect request failed with code " + httpCode + ". throwing Exception !");
- throw new SvcLogicException("Error connecting device :" + deviceMountPointName);
- }
- }
-
- @Override
- public boolean checkConnection(String deviceMountPointName) throws SvcLogicException {
- logger.info("Checking device " + deviceMountPointName + " connectivity");
-
- String result = HttpClient.getMethod(NetconfAdaptorConstants.PROTOCOL, NetconfAdaptorConstants.CONTROLLER_IP,
- NetconfAdaptorConstants.CONTROLLER_PORT, getCheckConnectivityPath(deviceMountPointName), appFormat);
-
- return result != null;
- }
-
- @Override
- public void disconnect(String deviceMountPointName) throws SvcLogicException {
- logger.info("Disconnecting " + deviceMountPointName);
-
- int httpCode = HttpClient.deleteMethod(NetconfAdaptorConstants.PROTOCOL, NetconfAdaptorConstants.CONTROLLER_IP, NetconfAdaptorConstants.CONTROLLER_PORT,
- getDisconnectPath(deviceMountPointName), appFormat);
-
- if(httpCode != HttpStatus.SC_OK){
- logger.error("Disconnection of device " + deviceMountPointName + " failed!");
- throw new SvcLogicException("Disconnection of device " + deviceMountPointName + " failed!");
- }
- }
-
- @Override
- public String getConfiguration(String deviceMountPointName, String moduleName, String nodeName) throws SvcLogicException{
- logger.info("Getting configuration of device " + deviceMountPointName);
-
- String result = HttpClient.getMethod(NetconfAdaptorConstants.PROTOCOL, NetconfAdaptorConstants.CONTROLLER_IP, NetconfAdaptorConstants.CONTROLLER_PORT,
- getModuleConfigurePath(deviceMountPointName, moduleName, nodeName), appFormat);
-
- if (result == null) {
- logger.error("Configuration request failed. throwing Exception !");
- throw new SvcLogicException("Error getting configuration of node :" + nodeName + ", of Module :" + moduleName +
- ", in device :" + deviceMountPointName);
- }
-
- return result;
- }
-
- //netconf client impl
-
- @Override
- public void connect(NetconfConnectionDetails connectionDetails) throws SvcLogicException {
- if(connectionDetails == null){
- throw new SvcLogicException("Invalid connection details - null value");
- }
- this.connectionDetails = connectionDetails;
- this.connect(connectionDetails.getHost(), getPayload());
- }
-
- @Override
- public String exchangeMessage(String message) throws SvcLogicException {
- // TODO implement
- return null;
- }
-
- @Override
- public void configure(String configuration) throws SvcLogicException {
- if(connectionDetails == null){
- throw new SvcLogicException("Invalid connection details - null value");
- }
-
- Properties props = connectionDetails.getAdditionalProperties();
- if(props == null || !props.containsKey("module.name") || !props.containsKey("node.name")) {
- throw new SvcLogicException("Invalid properties!");
- }
-
- String moduleName = props.getProperty("module.name");
- String nodeName = props.getProperty("node.name");
- String deviceMountPointName = connectionDetails.getHost();
-
- int httpCode = HttpClient.putMethod(NetconfAdaptorConstants.PROTOCOL, NetconfAdaptorConstants.CONTROLLER_IP, NetconfAdaptorConstants.CONTROLLER_PORT,
- getModuleConfigurePath(deviceMountPointName, moduleName, nodeName), configuration, "application/xml");
-
- if (httpCode != HttpStatus.SC_OK) {
- logger.error("Configuration request failed. throwing Exception !");
- throw new SvcLogicException("Error configuring node :" + nodeName + ", of Module :" + moduleName +
- ", in device :" + deviceMountPointName);
- }
- }
-
- @Override
- public String getConfiguration() throws SvcLogicException {
- if(connectionDetails == null){
- throw new SvcLogicException("Invalid connection details - null value");
- }
-
- Properties props = connectionDetails.getAdditionalProperties();
- if(props == null || !props.containsKey("module.name") || !props.containsKey("node.name")) {
- throw new SvcLogicException("Invalid properties!");
- }
-
- return this.getConfiguration(connectionDetails.getHost(), props.getProperty("module.name"),
- props.getProperty("node.name"));
- }
-
- @Override
- public void disconnect() throws SvcLogicException {
- if(connectionDetails == null){
- throw new SvcLogicException("Invalid connection details - null value");
- }
- this.disconnect(connectionDetails.getHost());
- }
-
- //private methods
- private String getModuleConfigurePath(String deviceMountPointName, String moduleName, String nodeName){
-
- String deviceSpecificPath = deviceMountPointName + "/yang-ext:mount/" + moduleName + ":" + nodeName;
-
- return NetconfAdaptorConstants.CONFIGURE_PATH + deviceSpecificPath;
- }
-
- private String getConnectPath(){
-
- return NetconfAdaptorConstants.CONNECT_PATH;
- }
-
- private String getCheckConnectivityPath(String deviceMountPointName) {
- return NetconfAdaptorConstants.CHECK_CONNECTION_PATH + deviceMountPointName;
- }
-
- private String getDisconnectPath(String deviceMountPointName) {
- return NetconfAdaptorConstants.DISCONNECT_PATH + deviceMountPointName;
- }
-
- private String getPayload() {
- return "{\n" +
- " \"config:module\":\n" +
- " {\n" +
- " \"type\":\"odl-sal-netconf-connector-cfg:sal-netconf-connector\",\n" +
- " \"netconf-northbound-ssh\\odl-sal-netconf-connector-cfg:name\":"+connectionDetails.getHost()+",\n" +
- " \"odl-sal-netconf-connector-cfg:address\":"+connectionDetails.getHost()+",\n" +
- " \"odl-sal-netconf-connector-cfg:port\":"+connectionDetails.getPort()+",\n" +
- " \"odl-sal-netconf-connector-cfg:username\":"+connectionDetails.getUsername()+",\n" +
- " \"odl-sal-netconf-connector-cfg:password\":"+connectionDetails.getPassword()+",\n" +
- " \"tcp-only\":\"false\",\n" +
- " \"odl-sal-netconf-connector-cfg:event-executor\":\n" +
- " {\n" +
- " \"type\":\"netty:netty-event-executor\",\n" +
- " \"name\":\"global-event-executor\"\n" +
- " },\n" +
- " \"odl-sal-netconf-connector-cfg:binding-registry\":\n" +
- " {\n" +
- " \"type\":\"opendaylight-md-sal-binding:binding-broker-osgi-registry\",\n" +
- " \"name\":\"binding-osgi-broker\"\n" +
- " },\n" +
- " \"odl-sal-netconf-connector-cfg:dom-registry\":\n" +
- " {\n" +
- " \"type\":\"opendaylight-md-sal-dom:dom-broker-osgi-registry\",\n" +
- " \"name\":\"dom-broker\"\n" +
- " },\n" +
- " \"odl-sal-netconf-connector-cfg:client-dispatcher\":\n" +
- " {\n" +
- " \"type\":\"odl-netconf-cfg:netconf-client-dispatcher\",\n" +
- " \"name\":\"global-netconf-dispatcher\"\n" +
- " },\n" +
- " \"odl-sal-netconf-connector-cfg:processing-executor\":\n" +
- " {\n" +
- " \"type\":\"threadpool:threadpool\",\n" +
- " \"name\":\"global-netconf-processing-executor\"\n" +
- " }\n" +
- " }\n" +
- "}";
- }
-}
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * ================================================================================
+ * Modifications Copyright (C) 2019 Ericsson
+ * =============================================================================
+ * Modifications Copyright (C) 2022 Samsung Electronics
+ * =============================================================================
+ * 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.ccsdk.sli.adaptors.netconf.odlconnector;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import java.util.Properties;
+import org.apache.http.HttpStatus;
+import org.onap.ccsdk.sli.adaptors.netconf.HttpClient;
+import org.onap.ccsdk.sli.adaptors.netconf.NetconfAdaptorConstants;
+import org.onap.ccsdk.sli.adaptors.netconf.NetconfClient;
+import org.onap.ccsdk.sli.adaptors.netconf.NetconfClientRestconf;
+import org.onap.ccsdk.sli.adaptors.netconf.NetconfConnectionDetails;
+import org.onap.ccsdk.sli.core.sli.SvcLogicException;
+
+public class NetconfClientRestconfImpl implements NetconfClient, NetconfClientRestconf {
+
+ private final EELFLogger logger = EELFManager.getInstance().getLogger(NetconfClientRestconfImpl.class);
+
+ private NetconfConnectionDetails connectionDetails;
+ private final String appFormat = "application/json";
+
+ public NetconfClientRestconfImpl(){
+ //constructor
+ }
+
+ //restconf client impl
+
+ @SuppressWarnings("deprecation")
+ @Override
+ public void configure(String configuration, String deviceMountPointName, String moduleName, String nodeName) throws SvcLogicException {
+
+ logger.info("Configuring device " + deviceMountPointName + " with configuration " + configuration);
+
+ int httpCode = HttpClient.putMethod(NetconfAdaptorConstants.PROTOCOL, NetconfAdaptorConstants.CONTROLLER_IP, NetconfAdaptorConstants.CONTROLLER_PORT,
+ getModuleConfigurePath(deviceMountPointName, moduleName, nodeName), configuration, appFormat);
+
+ if (httpCode != HttpStatus.SC_OK) {
+ logger.error("Configuration request failed. throwing Exception !");
+ throw new SvcLogicException("Error configuring node :" + nodeName + ", of Module :" + moduleName +
+ ", in device :" + deviceMountPointName);
+ }
+ }
+
+ @Override
+ public void connect(String deviceMountPointName, String payload) throws SvcLogicException{
+
+ logger.info("Connecting device " + deviceMountPointName);
+
+ int httpCode = HttpClient.postMethod(NetconfAdaptorConstants.PROTOCOL, NetconfAdaptorConstants.CONTROLLER_IP, NetconfAdaptorConstants.CONTROLLER_PORT,
+ getConnectPath(), payload, appFormat);
+
+ if(httpCode != HttpStatus.SC_NO_CONTENT){
+ logger.error("Connect request failed with code " + httpCode + ". throwing Exception !");
+ throw new SvcLogicException("Error connecting device :" + deviceMountPointName);
+ }
+ }
+
+ @Override
+ public boolean checkConnection(String deviceMountPointName) throws SvcLogicException {
+ logger.info("Checking device " + deviceMountPointName + " connectivity");
+
+ String result = HttpClient.getMethod(NetconfAdaptorConstants.PROTOCOL, NetconfAdaptorConstants.CONTROLLER_IP,
+ NetconfAdaptorConstants.CONTROLLER_PORT, getCheckConnectivityPath(deviceMountPointName), appFormat);
+
+ return result != null;
+ }
+
+ @Override
+ public void disconnect(String deviceMountPointName) throws SvcLogicException {
+ logger.info("Disconnecting " + deviceMountPointName);
+
+ int httpCode = HttpClient.deleteMethod(NetconfAdaptorConstants.PROTOCOL, NetconfAdaptorConstants.CONTROLLER_IP, NetconfAdaptorConstants.CONTROLLER_PORT,
+ getDisconnectPath(deviceMountPointName), appFormat);
+
+ if(httpCode != HttpStatus.SC_OK){
+ logger.error("Disconnection of device " + deviceMountPointName + " failed!");
+ throw new SvcLogicException("Disconnection of device " + deviceMountPointName + " failed!");
+ }
+ }
+
+ @Override
+ public String getConfiguration(String deviceMountPointName, String moduleName, String nodeName) throws SvcLogicException{
+ logger.info("Getting configuration of device " + deviceMountPointName);
+
+ String result = HttpClient.getMethod(NetconfAdaptorConstants.PROTOCOL, NetconfAdaptorConstants.CONTROLLER_IP, NetconfAdaptorConstants.CONTROLLER_PORT,
+ getModuleConfigurePath(deviceMountPointName, moduleName, nodeName), appFormat);
+
+ if (result == null) {
+ logger.error("Configuration request failed. throwing Exception !");
+ throw new SvcLogicException("Error getting configuration of node :" + nodeName + ", of Module :" + moduleName +
+ ", in device :" + deviceMountPointName);
+ }
+
+ return result;
+ }
+
+ //netconf client impl
+
+ @Override
+ public void connect(NetconfConnectionDetails connectionDetails) throws SvcLogicException {
+ if(connectionDetails == null){
+ throw new SvcLogicException("Invalid connection details - null value");
+ }
+ this.connectionDetails = connectionDetails;
+ this.connect(connectionDetails.getHost(), getPayload());
+ }
+
+ @Override
+ public String exchangeMessage(String message) throws SvcLogicException {
+ // TODO implement
+ return null;
+ }
+
+ @Override
+ public void configure(String configuration) throws SvcLogicException {
+ if(connectionDetails == null){
+ throw new SvcLogicException("Invalid connection details - null value");
+ }
+
+ Properties props = connectionDetails.getAdditionalProperties();
+ if(props == null || !props.containsKey("module.name") || !props.containsKey("node.name")) {
+ throw new SvcLogicException("Invalid properties!");
+ }
+
+ String moduleName = props.getProperty("module.name");
+ String nodeName = props.getProperty("node.name");
+ String deviceMountPointName = connectionDetails.getHost();
+
+ int httpCode = HttpClient.putMethod(NetconfAdaptorConstants.PROTOCOL, NetconfAdaptorConstants.CONTROLLER_IP, NetconfAdaptorConstants.CONTROLLER_PORT,
+ getModuleConfigurePath(deviceMountPointName, moduleName, nodeName), configuration, "application/xml");
+
+ if (httpCode != HttpStatus.SC_OK) {
+ logger.error("Configuration request failed. throwing Exception !");
+ throw new SvcLogicException("Error configuring node :" + nodeName + ", of Module :" + moduleName +
+ ", in device :" + deviceMountPointName);
+ }
+ }
+
+ @Override
+ public String getConfiguration() throws SvcLogicException {
+ if(connectionDetails == null){
+ throw new SvcLogicException("Invalid connection details - null value");
+ }
+
+ Properties props = connectionDetails.getAdditionalProperties();
+ if(props == null || !props.containsKey("module.name") || !props.containsKey("node.name")) {
+ throw new SvcLogicException("Invalid properties!");
+ }
+
+ return this.getConfiguration(connectionDetails.getHost(), props.getProperty("module.name"),
+ props.getProperty("node.name"));
+ }
+
+ @Override
+ public void disconnect() throws SvcLogicException {
+ if(connectionDetails == null){
+ throw new SvcLogicException("Invalid connection details - null value");
+ }
+ this.disconnect(connectionDetails.getHost());
+ }
+
+ //private methods
+ private String getModuleConfigurePath(String deviceMountPointName, String moduleName, String nodeName){
+
+ String deviceSpecificPath = deviceMountPointName + "/yang-ext:mount/" + moduleName + ":" + nodeName;
+
+ return NetconfAdaptorConstants.CONFIGURE_PATH + deviceSpecificPath;
+ }
+
+ private String getConnectPath(){
+
+ return NetconfAdaptorConstants.CONNECT_PATH;
+ }
+
+ private String getCheckConnectivityPath(String deviceMountPointName) {
+ return NetconfAdaptorConstants.CHECK_CONNECTION_PATH + deviceMountPointName;
+ }
+
+ private String getDisconnectPath(String deviceMountPointName) {
+ return NetconfAdaptorConstants.DISCONNECT_PATH + deviceMountPointName;
+ }
+
+ private static final String newLineConst = " {\n";
+ private String getPayload() {
+ return "{\n" +
+ " \"config:module\":\n" +
+ " {\n" +
+ " \"type\":\"odl-sal-netconf-connector-cfg:sal-netconf-connector\",\n" +
+ " \"netconf-northbound-ssh\\odl-sal-netconf-connector-cfg:name\":"+connectionDetails.getHost()+",\n" +
+ " \"odl-sal-netconf-connector-cfg:address\":"+connectionDetails.getHost()+",\n" +
+ " \"odl-sal-netconf-connector-cfg:port\":"+connectionDetails.getPort()+",\n" +
+ " \"odl-sal-netconf-connector-cfg:username\":"+connectionDetails.getUsername()+",\n" +
+ " \"odl-sal-netconf-connector-cfg:password\":"+connectionDetails.getPassword()+",\n" +
+ " \"tcp-only\":\"false\",\n" +
+ " \"odl-sal-netconf-connector-cfg:event-executor\":\n" +
+ newLineConst +
+ " \"type\":\"netty:netty-event-executor\",\n" +
+ " \"name\":\"global-event-executor\"\n" +
+ " },\n" +
+ " \"odl-sal-netconf-connector-cfg:binding-registry\":\n" +
+ newLineConst +
+ " \"type\":\"opendaylight-md-sal-binding:binding-broker-osgi-registry\",\n" +
+ " \"name\":\"binding-osgi-broker\"\n" +
+ " },\n" +
+ " \"odl-sal-netconf-connector-cfg:dom-registry\":\n" +
+ newLineConst +
+ " \"type\":\"opendaylight-md-sal-dom:dom-broker-osgi-registry\",\n" +
+ " \"name\":\"dom-broker\"\n" +
+ " },\n" +
+ " \"odl-sal-netconf-connector-cfg:client-dispatcher\":\n" +
+ newLineConst +
+ " \"type\":\"odl-netconf-cfg:netconf-client-dispatcher\",\n" +
+ " \"name\":\"global-netconf-dispatcher\"\n" +
+ " },\n" +
+ " \"odl-sal-netconf-connector-cfg:processing-executor\":\n" +
+ newLineConst+
+ " \"type\":\"threadpool:threadpool\",\n" +
+ " \"name\":\"global-netconf-processing-executor\"\n" +
+ " }\n" +
+ " }\n" +
+ "}";
+ }
+}
diff --git a/adaptors/netconf-adaptor/netconf-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/netconf/NetconfConnectionDetailsTest.java b/adaptors/netconf-adaptor/netconf-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/netconf/NetconfConnectionDetailsTest.java
index 2d0bea92c..544b149b4 100644
--- a/adaptors/netconf-adaptor/netconf-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/netconf/NetconfConnectionDetailsTest.java
+++ b/adaptors/netconf-adaptor/netconf-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/netconf/NetconfConnectionDetailsTest.java
@@ -1,118 +1,117 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : APPC
-* ================================================================================
-* Copyright 2018 TechMahindra
-* ================================================================================
-* Modifications Copyright (C) 2019 Ericsson
-*=================================================================================
-* 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.ccsdk.sli.adaptors.netconf;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class NetconfConnectionDetailsTest {
- private NetconfConnectionDetails netconfConnectionDetails;
- private List<String> capabilities;
- private Properties additionalProperties;
-
- @Before
- public void SetUp() {
- netconfConnectionDetails = new NetconfConnectionDetails();
- }
-
- @Test
- public void testGetHost() {
- netconfConnectionDetails.setHost("host1");
- Assert.assertNotNull(netconfConnectionDetails.getHost());
- Assert.assertEquals("host1", netconfConnectionDetails.getHost());
- }
-
- @Test
- public void testGetPort() {
- netconfConnectionDetails.setPort(123);
- Assert.assertNotNull(netconfConnectionDetails.getPort());
- Assert.assertEquals(123, netconfConnectionDetails.getPort());
- }
-
- @Test
- public void testGetUsername() {
- netconfConnectionDetails.setUsername("ABC");
- Assert.assertNotNull(netconfConnectionDetails.getUsername());
- Assert.assertEquals("ABC", netconfConnectionDetails.getUsername());
- }
-
- @Test
- public void testGetPassword() {
- netconfConnectionDetails.setPassword("pass1");
- Assert.assertNotNull(netconfConnectionDetails.getPassword());
- Assert.assertEquals("pass1", netconfConnectionDetails.getPassword());
- }
-
- @Test
- public void testNullCapabilities() {
- capabilities = new ArrayList<String>();
- Assert.assertNull(netconfConnectionDetails.getCapabilities());
- }
-
- @Test
- public void testCapabilitiesWithValues() {
- capabilities = new ArrayList<String>();
- capabilities.add("capabilities1");
- capabilities.add("capabilities2");
- netconfConnectionDetails.setCapabilities(capabilities);
- Assert.assertTrue(capabilities.contains("capabilities2"));
- }
-
- @Test
- public void testCapabilities_Size() {
- capabilities = new ArrayList<String>();
- capabilities.add("capabilities1");
- capabilities.add("capabilities2");
- netconfConnectionDetails.setCapabilities(capabilities);
- Assert.assertEquals(2, capabilities.size());
- }
-
- @Test
- public void testAdditionalProperties() {
- additionalProperties = new Properties();
- Assert.assertNull(netconfConnectionDetails.getAdditionalProperties());
- }
-
- @Test
- public void testAdditionalPropertiesWithValues() {
- additionalProperties = new Properties();
- additionalProperties.put("A", "a");
- additionalProperties.put("B", "b");
- netconfConnectionDetails.setAdditionalProperties(additionalProperties);
- Assert.assertEquals("a", netconfConnectionDetails.getAdditionalProperties().get("A"));
- }
-
- @Test
- public void testAdditionalProperties_Size() {
- additionalProperties = new Properties();
- additionalProperties.put("A", "a");
- additionalProperties.put("B", "b");
- additionalProperties.put("C", "c");
- netconfConnectionDetails.setAdditionalProperties(additionalProperties);
- Assert.assertNotNull(netconfConnectionDetails.getAdditionalProperties());
- Assert.assertEquals(3, additionalProperties.size());
- }
-}
+/*
+* ============LICENSE_START=======================================================
+* ONAP : APPC
+* ================================================================================
+* Copyright 2018 TechMahindra
+* ================================================================================
+* Modifications Copyright (C) 2019 Ericsson
+*=================================================================================
+* 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.ccsdk.sli.adaptors.netconf;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class NetconfConnectionDetailsTest {
+ private NetconfConnectionDetails netconfConnectionDetails;
+ private List<String> capabilities;
+ private Properties additionalProperties;
+
+ @Before
+ public void SetUp() {
+ netconfConnectionDetails = new NetconfConnectionDetails();
+ }
+
+ @Test
+ public void testGetHost() {
+ netconfConnectionDetails.setHost("host1");
+ Assert.assertNotNull(netconfConnectionDetails.getHost());
+ Assert.assertEquals("host1", netconfConnectionDetails.getHost());
+ }
+
+ @Test
+ public void testGetPort() {
+ netconfConnectionDetails.setPort(123);
+ Assert.assertEquals(123, netconfConnectionDetails.getPort());
+ }
+
+ @Test
+ public void testGetUsername() {
+ netconfConnectionDetails.setUsername("ABC");
+ Assert.assertNotNull(netconfConnectionDetails.getUsername());
+ Assert.assertEquals("ABC", netconfConnectionDetails.getUsername());
+ }
+
+ @Test
+ public void testGetPassword() {
+ netconfConnectionDetails.setPassword("pass1");
+ Assert.assertNotNull(netconfConnectionDetails.getPassword());
+ Assert.assertEquals("pass1", netconfConnectionDetails.getPassword());
+ }
+
+ @Test
+ public void testNullCapabilities() {
+ capabilities = new ArrayList<String>();
+ Assert.assertNull(netconfConnectionDetails.getCapabilities());
+ }
+
+ @Test
+ public void testCapabilitiesWithValues() {
+ capabilities = new ArrayList<String>();
+ capabilities.add("capabilities1");
+ capabilities.add("capabilities2");
+ netconfConnectionDetails.setCapabilities(capabilities);
+ Assert.assertTrue(capabilities.contains("capabilities2"));
+ }
+
+ @Test
+ public void testCapabilities_Size() {
+ capabilities = new ArrayList<String>();
+ capabilities.add("capabilities1");
+ capabilities.add("capabilities2");
+ netconfConnectionDetails.setCapabilities(capabilities);
+ Assert.assertEquals(2, capabilities.size());
+ }
+
+ @Test
+ public void testAdditionalProperties() {
+ additionalProperties = new Properties();
+ Assert.assertNull(netconfConnectionDetails.getAdditionalProperties());
+ }
+
+ @Test
+ public void testAdditionalPropertiesWithValues() {
+ additionalProperties = new Properties();
+ additionalProperties.put("A", "a");
+ additionalProperties.put("B", "b");
+ netconfConnectionDetails.setAdditionalProperties(additionalProperties);
+ Assert.assertEquals("a", netconfConnectionDetails.getAdditionalProperties().get("A"));
+ }
+
+ @Test
+ public void testAdditionalProperties_Size() {
+ additionalProperties = new Properties();
+ additionalProperties.put("A", "a");
+ additionalProperties.put("B", "b");
+ additionalProperties.put("C", "c");
+ netconfConnectionDetails.setAdditionalProperties(additionalProperties);
+ Assert.assertNotNull(netconfConnectionDetails.getAdditionalProperties());
+ Assert.assertEquals(3, additionalProperties.size());
+ }
+}
diff --git a/adaptors/netconf-adaptor/netconf-adaptor-installer/pom.xml b/adaptors/netconf-adaptor/netconf-adaptor-installer/pom.xml
index 0a261d70c..e1e9f1d09 100644
--- a/adaptors/netconf-adaptor/netconf-adaptor-installer/pom.xml
+++ b/adaptors/netconf-adaptor/netconf-adaptor-installer/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.3.3</version>
+ <version>2.4.1</version>
<relativePath/>
</parent>
diff --git a/adaptors/netconf-adaptor/pom.xml b/adaptors/netconf-adaptor/pom.xml
index be2b11b67..f5bb78891 100644
--- a/adaptors/netconf-adaptor/pom.xml
+++ b/adaptors/netconf-adaptor/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.3.3</version>
+ <version>2.4.1</version>
<relativePath/>
</parent>