Changes for new odl version

Changes required to update to latest opendaylight
version. Some powermock tests have been temporarily
removed due to an powermock incompatibility. They
will be fixed and re-added.

Change-Id: I418d44913fcd42423d2d9bd37b189f6301eaab81
Signed-off-by: Patrick Brady <patrick.brady@att.com>
Issue-ID: APPC-1370

8 files changed, 11 insertions, 819 deletions

diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/test/java/org/onap/appc/dg/dependencymanager/impl/DependencyManagerImplTest.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/test/java/org/onap/appc/dg/dependencymanager/impl/DependencyManagerImplTest.java
deleted file mode 100644
index e0214b1d5..000000000
--- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/test/java/org/onap/appc/dg/dependencymanager/impl/DependencyManagerImplTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * 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.appc.dg.dependencymanager.impl;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.onap.appc.cache.MetadataCache;
-import org.onap.appc.cache.impl.MetadataCacheFactory;
-import org.onap.appc.cache.impl.MetadataCacheImpl;
-import org.onap.appc.dg.dependencymanager.DependencyManager;
-import org.onap.appc.dg.objects.DependencyTypes;
-import org.onap.appc.dg.objects.VnfcDependencyModel;
-import org.onap.appc.metadata.objects.DependencyModelIdentifier;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(MetadataCacheFactory.class)
-public class DependencyManagerImplTest {
-
-    private MetadataCacheFactory metadataCacheFactory = Mockito.mock(MetadataCacheFactory.class);
-    private MetadataCache<DependencyModelIdentifier,VnfcDependencyModel> cache;
-
-    @Before
-    public void setup() {
-        PowerMockito.mockStatic(MetadataCacheFactory.class);
-        PowerMockito.when(MetadataCacheFactory.getInstance()).thenReturn(metadataCacheFactory);
-        cache = (MetadataCacheImpl<DependencyModelIdentifier,VnfcDependencyModel>) Mockito.mock(MetadataCacheImpl.class);
-        PowerMockito.when(metadataCacheFactory.getMetadataCache()).thenReturn(cache);
-    }
-
-    @Test
-    public void testDependencyManager() throws Exception {
-        DependencyManager dmImpl = DependencyModelFactory.createDependencyManager();
-        DependencyModelIdentifier modelIdentifier = new DependencyModelIdentifier("VNF_TYPE", "CATALOG_VERSION");
-        DependencyTypes dependencyType = DependencyTypes.findByString("resource");
-        Mockito.when(cache.getObject(Mockito.any(DependencyModelIdentifier.class))).thenReturn(new VnfcDependencyModel(null));
-        dmImpl.getVnfcDependencyModel(modelIdentifier, dependencyType);
-    }
-
-}
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/pom.xml b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/pom.xml
index 09783a98a..6939fe4ce 100644
--- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/pom.xml
@@ -84,14 +84,6 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-util</artifactId>
         </dependency>
         <dependency>
@@ -100,19 +92,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-broker-impl</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-broker-impl</artifactId>
-            <classifier>tests</classifier>
-            <version>${odl.mdsal.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
             <version>${apache.httpcomponents.version}</version>
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/provider/MdsalStoreProvider.java b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/provider/MdsalStoreProvider.java
index 545bd32a9..e362f0a8b 100644
--- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/provider/MdsalStoreProvider.java
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/provider/MdsalStoreProvider.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Copyright (C) 2017 Amdocs
  * ================================================================================
@@ -29,14 +29,13 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 import org.onap.appc.Constants;
 import org.onap.appc.mdsal.MDSALStore;
 import org.onap.appc.mdsal.impl.MDSALStoreFactory;
 import org.onap.appc.mdsal.objects.BundleInfo;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
+import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
 import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
 import org.opendaylight.yang.gen.v1.org.onap.appc.mdsal.store.rev170925.MdsalStoreService;
 import org.opendaylight.yang.gen.v1.org.onap.appc.mdsal.store.rev170925.StoreYangInput;
@@ -49,19 +48,20 @@ import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 
 public class MdsalStoreProvider implements MdsalStoreService ,AutoCloseable{
 
     protected DataBroker dataBroker;
     protected RpcProviderRegistry rpcRegistry;
-    protected NotificationProviderService notificationService;
+    protected NotificationPublishService notificationService;
 
     protected BindingAwareBroker.RpcRegistration<MdsalStoreService> rpcRegistration;
     private final EELFLogger log = EELFManager.getInstance().getLogger(MdsalStoreProvider.class);
     private final ExecutorService executor;
     private final static String APP_NAME = "MdsalStoreProvider";
 
-    public MdsalStoreProvider(DataBroker dataBroker2, NotificationProviderService notificationProviderService
+    public MdsalStoreProvider(DataBroker dataBroker2, NotificationPublishService notificationProviderService
             , RpcProviderRegistry rpcRegistry2){
         log.info("Creating provider for " + APP_NAME);
         executor = Executors.newFixedThreadPool(1);
@@ -90,7 +90,7 @@ public class MdsalStoreProvider implements MdsalStoreService ,AutoCloseable{
     }
 
     @Override
-    public Future<RpcResult<StoreYangOutput>> storeYang(StoreYangInput input) {
+    public ListenableFuture<RpcResult<StoreYangOutput>> storeYang(StoreYangInput input) {
         Status status = null;
         String message = null;
         try{
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/resources/org/opendaylight/blueprint/dg-mdsal-blueprint.xml b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/resources/org/opendaylight/blueprint/dg-mdsal-blueprint.xml
index fa841a638..382e2d8cd 100644
--- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/resources/org/opendaylight/blueprint/dg-mdsal-blueprint.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/resources/org/opendaylight/blueprint/dg-mdsal-blueprint.xml
@@ -42,4 +42,4 @@
 
     <odl:rpc-implementation ref="mdsal-store"/>
 
-</blueprint>
+</blueprint>
\ No newline at end of file
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/test/java/org/onap/appc/mdsal/MDSALStoreTest.java b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/test/java/org/onap/appc/mdsal/MDSALStoreTest.java
deleted file mode 100644
index 2229eff9d..000000000
--- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/test/java/org/onap/appc/mdsal/MDSALStoreTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * ================================================================================
- * Modifications (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.appc.mdsal;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.onap.appc.mdsal.exception.MDSALStoreException;
-import org.onap.appc.mdsal.impl.MDSALStoreFactory;
-import org.onap.appc.mdsal.impl.MDSALStoreImpl;
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-import org.onap.appc.mdsal.operation.ConfigOperationRequestFormatter;
-import org.onap.appc.rest.client.RestClientInvoker;
-import org.osgi.framework.*;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.net.URL;
-
-/**
- * MDSALStore Tests
- */
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({FrameworkUtil.class,BundleContext.class,ServiceReference.class,
-        BundleReference.class,Bundle.class,Filter.class,BundleListener.class,InvalidSyntaxException.class,
-        BundleException.class,FrameworkListener.class,ServiceRegistration.class,ServiceListener.class,
-        Version.class})
-public class MDSALStoreTest {
-
-    private final EELFLogger logger = EELFManager.getInstance().getLogger(MDSALStoreTest.class);
-    private RestClientInvoker client = Mockito.mock(RestClientInvoker.class);
-    private ConfigOperationRequestFormatter requestFormatter = new ConfigOperationRequestFormatter();
-    private ObjectMapper mapper = new ObjectMapper();
-    MDSALStoreImpl store;
-
-    @Before
-    public void init() throws Exception{
-        PowerMockito.whenNew(RestClientInvoker.class).withArguments(Mockito.any(URL.class)).thenReturn(client);
-        store = (MDSALStoreImpl) MDSALStoreFactory.createMDSALStore();
-    }
-
-    @Ignore
-    public void testYangInput() throws MDSALStoreException {
-        store.storeYangModuleOnLeader("module test { }", "Name");
-    }
-
-}
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/test/java/org/onap/appc/mdsal/provider/MdsalStoreProviderTest.java b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/test/java/org/onap/appc/mdsal/provider/MdsalStoreProviderTest.java
index 2f0e4936a..c6fc25c4d 100644
--- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/test/java/org/onap/appc/mdsal/provider/MdsalStoreProviderTest.java
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/test/java/org/onap/appc/mdsal/provider/MdsalStoreProviderTest.java
@@ -28,8 +28,8 @@ import org.onap.appc.mdsal.MDSALStore;
 import org.onap.appc.mdsal.impl.MDSALStoreFactory;
 import org.onap.appc.mdsal.impl.MDSALStoreImpl;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
 import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
 import org.opendaylight.yang.gen.v1.org.onap.appc.mdsal.store.rev170925.MdsalStoreService;
 import org.opendaylight.yang.gen.v1.org.onap.appc.mdsal.store.rev170925.StoreYangInput;
@@ -46,7 +46,7 @@ public class MdsalStoreProviderTest {
 
     private DataBroker dataBroker = Mockito.mock(DataBroker.class);
     private RpcProviderRegistry rpcRegistry = Mockito.mock(RpcProviderRegistry.class);
-    private NotificationProviderService notificationService = Mockito.mock(NotificationProviderService.class);
+    private NotificationPublishService notificationService = Mockito.mock(NotificationPublishService.class);
 
     @Test
     public void testClose() throws Exception {
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-model/pom.xml b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-model/pom.xml
index f8ddd05da..bcdc3b45b 100644
--- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-model/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-model/pom.xml
@@ -94,11 +94,11 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-inet-types</artifactId>
+      <artifactId>ietf-inet-types-2013-07-15</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-yang-types</artifactId>
+      <artifactId>ietf-yang-types-20130715</artifactId>
     </dependency>
     <dependency>
         <groupId>org.opendaylight.controller</groupId>
diff --git a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/onap/appc/dg/netconf/impl/NetconfClientPluginImplTest.java b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/onap/appc/dg/netconf/impl/NetconfClientPluginImplTest.java
deleted file mode 100644
index 9e2384e91..000000000
--- a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/onap/appc/dg/netconf/impl/NetconfClientPluginImplTest.java
+++ /dev/null
@@ -1,650 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * ================================================================================
- * Modifications (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.appc.dg.netconf.impl;
-
-import org.onap.appc.exceptions.APPCException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Matchers;
-import org.mockito.Mockito;
-import org.onap.appc.adapter.netconf.util.Constants;
-import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
-import org.onap.appc.adapter.netconf.ConnectionDetails;
-import org.onap.appc.adapter.netconf.NetconfClientFactory;
-import org.onap.appc.adapter.netconf.NetconfClientType;
-import org.onap.appc.adapter.netconf.NetconfConnectionDetails;
-import org.onap.appc.adapter.netconf.NetconfDataAccessService;
-import org.onap.appc.adapter.netconf.OperationalStateValidatorFactory;
-import org.onap.appc.adapter.netconf.VnfType;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.ServiceReference;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.lang.reflect.Field;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.powermock.api.mockito.PowerMockito.when;
-
-
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({OperationalStateValidatorFactory.class, FrameworkUtil.class, ObjectMapper.class})
-
-public class NetconfClientPluginImplTest {
-    private NetconfClientPluginImpl netconfClientPlugin;
-    private NetconfDataAccessService dao;
-    private NetconfClientFactory clientFactory;
-    private Map<String, String> params;
-
-    private final BundleContext bundleContext = Mockito.mock(BundleContext.class);
-    private final Bundle bundleService = Mockito.mock(Bundle.class);
-    private final ServiceReference sref1 = Mockito.mock(ServiceReference.class);
-    private final ServiceReference sref2 = Mockito.mock(ServiceReference.class);
-    private final ServiceReference sref3 = Mockito.mock(ServiceReference.class);
-    private static final String DG_OUTPUT_STATUS_MESSAGE = "output.status.message";
-
-
-    String host = "http://www.test.com";
-    String host1 = "http://www.test1.com";
-    String vnfType = "VNF";
-    int port = 8080;
-    String username = "test";
-    String password = "test";
-    String connectionDetails = "{\"host\":\"" + host + "\",\"port\":" + port + ",\"username\":\"" + username + "\",\"password\":\"" + password + "\",\"capabilities\":null,\"additionalProperties\":null}";
-    String fileContent = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-            "<rpc message-id=\"101\" xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n" +
-            "\t<get-config>\n" +
-            "\t\t<source>\n" +
-            "\t\t\t<running/>\n" +
-            "\t\t </source>\n" +
-            "\t</get-config>\n" +
-            "</rpc>'";
-    String operationalState = "<rpc message-id=\"101\" xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n" +
-            "       <get>\n" +
-            "              <filter>\n" +
-            "                     <ManagedElement xmlns=\"urn:org:onap:appc:Test\">\n" +
-            "                           <VnfFunction xmlns=\"urn:org:openecomop:appc:Test\">\n" +
-            "                                  <ProcessorManagement>\n" +
-            "                                         <MatedPair>\n" +
-            "                                                <operationalState/>\n" +
-            "                                                <PayloadProcessor>\n" +
-            "                                                       <operationalState/>\n" +
-            "                                                </PayloadProcessor>\n" +
-            "                                         </MatedPair>\n" +
-            "                                         <SystemController>\n" +
-            "                                                <operationalState/>\n" +
-            "                                         </SystemController>\n" +
-            "                                  </ProcessorManagement>\n" +
-            "                           </VnfFunction>\n" +
-            "                     </ManagedElement>\n" +
-            "              </filter>\n" +
-            "       </get>\n" +
-            "</rpc>\n";
-
-
-    @Before
-    public void setUp() throws NoSuchFieldException, IllegalAccessException {
-        clientFactory = new NetconfClientFactoryMock();
-    }
-
-
-    @Test
-    public void testConfigure() throws Exception {
-        shortInit();
-        SvcLogicContext ctx = new SvcLogicContext();
-
-        params = new HashMap<>();
-        params.put(Constants.CONNECTION_DETAILS_FIELD_NAME, connectionDetails);
-        params.put(Constants.FILE_CONTENT_FIELD_NAME, fileContent);
-
-        netconfClientPlugin.configure(params, ctx);
-
-        NetconfClientJschMock client = (NetconfClientJschMock) clientFactory.getNetconfClient(NetconfClientType.SSH);
-
-        try {
-            Assert.assertEquals("wrong configuration", fileContent, client.getConf());
-            Assert.assertEquals("wrong host", host, client.getLastConnectionDetails().getHost());
-            Assert.assertEquals("wrong port", port, client.getLastConnectionDetails().getPort());
-            Assert.assertEquals("wrong username", username, client.getLastConnectionDetails().getUsername());
-            Assert.assertEquals("wrong password", password, client.getLastConnectionDetails().getPassword());
-            Assert.assertFalse(client.isConnection());
-        } catch (Exception e) {
-            Assert.fail("failed with because of " + e.getCause());
-        }
-    }
-
-
-    @Test
-    public void testConfigureNegativeIOException() throws Exception {
-        shortInit();
-        SvcLogicContext ctx = new SvcLogicContext();
-
-        params = new HashMap<>();
-        params.put(Constants.CONNECTION_DETAILS_FIELD_NAME, "{" + connectionDetails);
-        params.put(Constants.FILE_CONTENT_FIELD_NAME, fileContent);
-        NetconfClientJschMock client = (NetconfClientJschMock) clientFactory.getNetconfClient(NetconfClientType.SSH);
-
-        try {
-            netconfClientPlugin.configure(params, ctx);
-            Assert.assertTrue(false);
-        } catch (APPCException e) {
-            Assert.assertNull(client.getLastConnectionDetails());
-            Assert.assertNull(client.getConf());
-        }
-
-    }
-
-    @Test
-    public void testOperationStateValidation() throws Exception {
-        shortInit();
-        SvcLogicContext ctx = new SvcLogicContext();
-        DAOServiceMock daoServiceMock = (DAOServiceMock) dao;
-        daoServiceMock.setConfigFile(fileContent);
-
-        NetconfClientJschMock client = (NetconfClientJschMock) clientFactory.getNetconfClient(NetconfClientType.SSH);
-        client.setAnswer(operationalState);
-
-        params = new HashMap<>();
-        params.put(Constants.VNF_TYPE_FIELD_NAME, vnfType);
-        params.put(Constants.VNF_HOST_IP_ADDRESS_FIELD_NAME, host1);
-        params.put(Constants.CONNECTION_DETAILS_FIELD_NAME, connectionDetails);
-        MockOperationalStateValidatorImpl validatorMock = new MockOperationalStateValidatorImpl();
-        validatorMock.setConfigurationFileName("VnfGetRunningConfig");
-
-        PowerMockito.mockStatic(OperationalStateValidatorFactory.class);
-        when(OperationalStateValidatorFactory.getOperationalStateValidator(Matchers.any(VnfType.class))).thenReturn(validatorMock);
-
-        netconfClientPlugin.operationStateValidation(params, ctx);
-
-        Assert.assertTrue("validation process failed", validatorMock.isValidated());
-        Assert.assertEquals(fileContent, client.getLastMessage());
-    }
-
-    @Test
-    public void testOperationStateValidationNegativeJsonProcessingNullIllegalStateException() throws Exception {
-        shortInit();
-        SvcLogicContext ctx = new SvcLogicContext();
-        DAOServiceMock daoServiceMock = (DAOServiceMock) dao;
-        daoServiceMock.setConfigFile(fileContent);
-
-        NetconfClientJschMock client = (NetconfClientJschMock) clientFactory.getNetconfClient(NetconfClientType.SSH);
-        client.setAnswer(operationalState);
-
-        params = new HashMap<>();
-        params.put(Constants.VNF_TYPE_FIELD_NAME, vnfType);
-        params.put(Constants.VNF_HOST_IP_ADDRESS_FIELD_NAME, host1);
-        params.put(Constants.CONNECTION_DETAILS_FIELD_NAME, connectionDetails);
-        MockOperationalStateValidatorImpl validatorMock = new MockOperationalStateValidatorImpl();
-        validatorMock.setConfigurationFileName("VnfGetRunningConfig");
-
-        PowerMockito.mockStatic(OperationalStateValidatorFactory.class);
-        when(OperationalStateValidatorFactory.getOperationalStateValidator(Matchers.any(VnfType.class))).thenReturn(validatorMock);
-        substituteMapper(true);
-
-        try {
-            netconfClientPlugin.operationStateValidation(params, ctx);
-            substituteMapper(false);
-        } catch (APPCException e) {
-            substituteMapper(false);
-            Assert.assertNotNull(ctx.getAttribute(DG_OUTPUT_STATUS_MESSAGE));
-            Assert.assertFalse(validatorMock.isValidated());
-            Assert.assertNull(client.getLastMessage());
-        }
-    }
-
-    @Test
-    public void testOperationStateValidationNegativeConnectionDetailsAreNullNullPointerException() throws Exception {
-        shortInit();
-        SvcLogicContext ctx = new SvcLogicContext();
-        DAOServiceMock daoServiceMock = (DAOServiceMock) dao;
-        daoServiceMock.setConfigFile(fileContent);
-
-        NetconfClientJschMock client = (NetconfClientJschMock) clientFactory.getNetconfClient(NetconfClientType.SSH);
-        client.setAnswer(operationalState);
-
-        params = new HashMap<>();
-        params.put(Constants.VNF_TYPE_FIELD_NAME, vnfType);
-        params.put(Constants.VNF_HOST_IP_ADDRESS_FIELD_NAME, host1);
-        params.put(Constants.CONNECTION_DETAILS_FIELD_NAME, null);
-        MockOperationalStateValidatorImpl validatorMock = new MockOperationalStateValidatorImpl();
-        validatorMock.setConfigurationFileName("VnfGetRunningConfig");
-
-        PowerMockito.mockStatic(OperationalStateValidatorFactory.class);
-        when(OperationalStateValidatorFactory.getOperationalStateValidator(Matchers.any(VnfType.class))).thenReturn(validatorMock);
-        ObjectMapper mapper = PowerMockito.mock(ObjectMapper.class);
-        final NetconfConnectionDetails netconfConnectionDetails = null;
-        when(mapper.readValue(Matchers.anyString(), Matchers.any(Class.class))).thenReturn(netconfConnectionDetails);
-
-        try {
-            netconfClientPlugin.operationStateValidation(params, ctx);
-            Assert.assertTrue(false);
-        } catch (APPCException e) {
-            Assert.assertNotNull(ctx.getAttribute(DG_OUTPUT_STATUS_MESSAGE));
-            Assert.assertFalse("validation process failed", validatorMock.isValidated());
-        }
-    }
-
-
-    @Test
-    public void testOperationStateValidationNegativeAppcException() throws Exception {
-        shortInit();
-        SvcLogicContext ctx = new SvcLogicContext();
-        DAOServiceMock daoServiceMock = (DAOServiceMock) dao;
-        daoServiceMock.setConfigFile(fileContent);
-
-        NetconfClientJschMock client = (NetconfClientJschMock) clientFactory.getNetconfClient(NetconfClientType.SSH);
-        client.setAnswer("wrong");
-
-        params = new HashMap<>();
-        params.put(Constants.VNF_TYPE_FIELD_NAME, vnfType);
-        params.put(Constants.VNF_HOST_IP_ADDRESS_FIELD_NAME, host1);
-        params.put(Constants.CONNECTION_DETAILS_FIELD_NAME, connectionDetails);
-        MockOperationalStateValidatorImpl validatorMock = new MockOperationalStateValidatorImpl();
-        validatorMock.setConfigurationFileName("VnfGetRunningConfig");
-
-        PowerMockito.mockStatic(OperationalStateValidatorFactory.class);
-        when(OperationalStateValidatorFactory.getOperationalStateValidator(Matchers.any(VnfType.class))).thenReturn(validatorMock);
-
-        try {
-            netconfClientPlugin.operationStateValidation(params, ctx);
-            Assert.assertTrue(false);
-        } catch (APPCException e) {
-            Assert.assertNotNull(ctx.getAttribute(DG_OUTPUT_STATUS_MESSAGE));
-            Assert.assertFalse("validation process failed", validatorMock.isValidated());
-        }
-    }
-
-
-    @Test
-    public void testOperationStateValidatioConnectionDetailsInParamsAreEmpty() throws Exception {
-        shortInit();
-        SvcLogicContext ctx = new SvcLogicContext();
-        DAOServiceMock daoServiceMock = (DAOServiceMock) dao;
-        daoServiceMock.setConfigFile(fileContent);
-
-        NetconfClientJschMock client = (NetconfClientJschMock) clientFactory.getNetconfClient(NetconfClientType.SSH);
-        client.setAnswer(operationalState);
-        ((DAOServiceMock) dao).setConnection(getConnectionDetails());
-
-        params = new HashMap<>();
-        params.put(Constants.VNF_TYPE_FIELD_NAME, vnfType);
-        params.put(Constants.VNF_HOST_IP_ADDRESS_FIELD_NAME, host1);
-        params.put(Constants.CONNECTION_DETAILS_FIELD_NAME, "");
-        MockOperationalStateValidatorImpl validatorMock = new MockOperationalStateValidatorImpl();
-        validatorMock.setConfigurationFileName("VnfGetRunningConfig");
-
-        PowerMockito.mockStatic(OperationalStateValidatorFactory.class);
-        when(OperationalStateValidatorFactory.getOperationalStateValidator(Matchers.any(VnfType.class))).thenReturn(validatorMock);
-
-        netconfClientPlugin.operationStateValidation(params, ctx);
-
-        Assert.assertTrue("validation process failed", validatorMock.isValidated());
-        Assert.assertEquals(fileContent, client.getLastMessage());
-    }
-
-    @Test
-    public void testOperationStateValidatioConnectionDetailsInParamsAreNull() throws Exception {
-        shortInit();
-        SvcLogicContext ctx = new SvcLogicContext();
-        DAOServiceMock daoServiceMock = (DAOServiceMock) dao;
-        daoServiceMock.setConfigFile(fileContent);
-
-        NetconfClientJschMock client = (NetconfClientJschMock) clientFactory.getNetconfClient(NetconfClientType.SSH);
-        client.setAnswer(operationalState);
-        ((DAOServiceMock) dao).setConnection(getConnectionDetails());
-
-        params = new HashMap<>();
-        params.put(Constants.VNF_TYPE_FIELD_NAME, vnfType);
-        params.put(Constants.VNF_HOST_IP_ADDRESS_FIELD_NAME, host1);
-        params.put(Constants.CONNECTION_DETAILS_FIELD_NAME, null);
-        MockOperationalStateValidatorImpl validatorMock = new MockOperationalStateValidatorImpl();
-        validatorMock.setConfigurationFileName("VnfGetRunningConfig");
-
-        PowerMockito.mockStatic(OperationalStateValidatorFactory.class);
-        when(OperationalStateValidatorFactory.getOperationalStateValidator(Matchers.any(VnfType.class))).thenReturn(validatorMock);
-
-        netconfClientPlugin.operationStateValidation(params, ctx);
-
-        Assert.assertTrue("validation process failed", validatorMock.isValidated());
-        Assert.assertEquals(fileContent, client.getLastMessage());
-    }
-
-
-    @Test
-    public void testBackupConfiguration() throws Exception {
-        shortInit();
-        SvcLogicContext ctx = new SvcLogicContext();
-        params = new HashMap<>();
-        params.put(Constants.CONNECTION_DETAILS_FIELD_NAME, connectionDetails);
-        NetconfClientJschMock client = (NetconfClientJschMock) clientFactory.getNetconfClient(NetconfClientType.SSH);
-        client.setConf(fileContent);
-        netconfClientPlugin.backupConfiguration(params, ctx);
-
-        DAOServiceMock mockdao = (DAOServiceMock) dao;
-        DateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd");
-        Date date = new Date();
-        String creationDateExpected = dateFormat.format(date);
-        String creationDateActual = mockdao.getBackupConf().get("creationDate").substring(0, 10);
-
-        Assert.assertEquals("wrong configuration in db", fileContent, mockdao.getBackupConf().get("logText"));
-        Assert.assertEquals(creationDateExpected, creationDateActual);
-    }
-
-    @Test
-    public void testBackupConfigurationNegativeDgErrorFieldName() throws Exception {
-        shortInit();
-        SvcLogicContext ctx = new SvcLogicContext();
-        params = new HashMap<>();
-        params.put(Constants.CONNECTION_DETAILS_FIELD_NAME, "{" + connectionDetails);
-        NetconfClientJschMock client = (NetconfClientJschMock) clientFactory.getNetconfClient(NetconfClientType.SSH);
-        client.setConf(fileContent);
-        try {
-            netconfClientPlugin.backupConfiguration(params, ctx);
-            Assert.assertTrue(false);
-        } catch (APPCException e) {
-            Assert.assertNotNull(ctx.getAttribute(DG_OUTPUT_STATUS_MESSAGE));
-            DAOServiceMock mockdao = (DAOServiceMock) dao;
-            Assert.assertNull(mockdao.getBackupConf());
-        }
-    }
-
-    @Test
-    public void testGetConfig() throws Exception {
-        fullInit();
-        String entity = "123";
-
-        SvcLogicContext ctx = new SvcLogicContext();
-        ctx.setAttribute("entity", entity);
-
-        params = new HashMap<>();
-        params.put("conf-id", "current");
-        params.put(Constants.CONNECTION_DETAILS_FIELD_NAME, connectionDetails);
-        NetconfClientJschMock client = (NetconfClientJschMock) clientFactory.getNetconfClient(NetconfClientType.SSH);
-        client.setConf(fileContent);
-
-        netconfClientPlugin.getConfig(params, ctx);
-
-        Assert.assertEquals("Success", ctx.getAttribute("getConfig_Result"));
-        Assert.assertEquals(fileContent, ctx.getAttribute("fullConfig"));
-        Assert.assertNotNull(ctx.getAttribute(entity + ".Configuration"));
-        Assert.assertEquals(fileContent, ctx.getAttribute(entity + ".Configuration"));
-    }
-
-
-    @Test
-    public void testGetConfigNegativeConfigurationNull() throws Exception {
-        fullInit();
-        String entity = "123";
-
-        SvcLogicContext ctx = new SvcLogicContext();
-        ctx.setAttribute("entity", entity);
-
-        params = new HashMap<>();
-        params.put("conf-id", "current");
-        params.put(Constants.CONNECTION_DETAILS_FIELD_NAME, connectionDetails);
-
-        netconfClientPlugin.getConfig(params, ctx);
-
-        Assert.assertEquals("failure", ctx.getAttribute("getConfig_Result"));
-        Assert.assertNull(ctx.getAttribute("fullConfig"));
-        Assert.assertNull(ctx.getAttribute(entity + ".Configuration"));
-        Assert.assertNull(ctx.getAttribute(entity + ".Configuration"));
-    }
-
-
-    @Test
-    public void testGetConfigNegativeNotSupportedConfId() throws Exception {
-        fullInit();
-        String entity = "123";
-        SvcLogicContext ctx = new SvcLogicContext();
-        ctx.setAttribute("entity", entity);
-
-        params = new HashMap<>();
-        params.put("conf-id", "current1");
-        params.put(Constants.CONNECTION_DETAILS_FIELD_NAME, connectionDetails);
-
-        netconfClientPlugin.getConfig(params, ctx);
-
-        Assert.assertNull(ctx.getAttribute("getConfig_Result"));
-        Assert.assertNull(ctx.getAttribute("fullConfig"));
-        Assert.assertNull(ctx.getAttribute(entity + ".Configuration"));
-        Assert.assertNull(ctx.getAttribute(entity + ".Configuration"));
-    }
-
-    @Test
-    public void testGetConfigNegativeWronjJsonConnectionDetailsException() throws Exception {
-        fullInit();
-        String entity = "123";
-
-        SvcLogicContext ctx = new SvcLogicContext();
-        ctx.setAttribute("entity", entity);
-
-        params = new HashMap<>();
-        params.put("conf-id", "current");
-        params.put(Constants.CONNECTION_DETAILS_FIELD_NAME, "{" + connectionDetails);
-
-        try {
-            netconfClientPlugin.getConfig(params, ctx);
-            Assert.assertTrue(false);
-        } catch (APPCException e) {
-            Assert.assertEquals("failure", ctx.getAttribute("getConfig_Result"));
-            Assert.assertNull(ctx.getAttribute("fullConfig"));
-            Assert.assertNull(ctx.getAttribute(entity + ".Configuration"));
-            Assert.assertNull(ctx.getAttribute(entity + ".Configuration"));
-            Assert.assertNotNull(ctx.getAttribute(DG_OUTPUT_STATUS_MESSAGE));
-        }
-    }
-
-    @Test
-    public void testGetRunningConfig() throws Exception {
-        fullInit();
-        SvcLogicContext ctx = new SvcLogicContext();
-        params = new HashMap<>();
-        params.put("host-ip-address", host);
-        params.put("user-name", username);
-        params.put("password", password);
-        params.put("port-number", String.valueOf(port));
-
-        NetconfClientJschMock client = (NetconfClientJschMock) clientFactory.getNetconfClient(NetconfClientType.SSH);
-        client.setConf(fileContent);
-
-        netconfClientPlugin.getRunningConfig(params, ctx);
-
-        Assert.assertEquals("Success", ctx.getAttribute("getRunningConfig_Result"));
-        Assert.assertEquals(fileContent, ctx.getAttribute("running-config"));
-        Assert.assertEquals("success", ctx.getStatus());
-    }
-
-    @Test
-    public void testGetRunningConfigWithoutPortNumberDgErrorFieldNameException() throws Exception {
-        fullInit();
-        SvcLogicContext ctx = new SvcLogicContext();
-        params = new HashMap<>();
-        params.put("host-ip-address", host);
-        params.put("user-name", username);
-        params.put("password", password);
-
-        NetconfClientJschMock client = (NetconfClientJschMock) clientFactory.getNetconfClient(NetconfClientType.SSH);
-        client.setConf(fileContent);
-
-        try {
-            netconfClientPlugin.getRunningConfig(params, ctx);
-            Assert.assertTrue(false);
-        } catch (APPCException e) {
-            Assert.assertEquals("failure", ctx.getAttribute("getRunningConfig_Result"));
-            Assert.assertNull(ctx.getAttribute("running-config"));
-            Assert.assertNotNull(ctx.getAttribute(DG_OUTPUT_STATUS_MESSAGE));
-        }
-    }
-
-    @Test
-    public void testGetRunningConfigNegativeConfigurationNull() throws Exception {
-        fullInit();
-        SvcLogicContext ctx = new SvcLogicContext();
-        params = new HashMap<>();
-        params.put("host-ip-address", host);
-        params.put("user-name", username);
-        params.put("password", password);
-        params.put("port-number", String.valueOf(port));
-
-        netconfClientPlugin.getRunningConfig(params, ctx);
-
-        Assert.assertEquals("failure", ctx.getAttribute("getRunningConfig_Result"));
-        Assert.assertNull(ctx.getAttribute("running-config"));
-    }
-
-    @Test
-    public void testValidateMandatoryParamNegativeEmptyParamValue() throws Exception {
-        shortInit();
-        String paramName = "test";
-        String paramValue = "";
-
-        try {
-            netconfClientPlugin.validateMandatoryParam(paramName, paramValue);
-            Assert.assertTrue(false);
-        } catch (Exception e) {
-            Assert.assertTrue(true);
-        }
-    }
-
-    @Test
-    public void testRetrieveConnectionDetails() throws Exception {
-        shortInit();
-        DAOServiceMock daoServiceMock = (DAOServiceMock) dao;
-        daoServiceMock.setConfigFile(fileContent);
-        ConnectionDetails connectionDetails1 = getConnectionDetails();
-        daoServiceMock.setConnection(connectionDetails1);
-
-        NetconfConnectionDetails connectionDetailsActual = netconfClientPlugin.retrieveConnectionDetails(VnfType.VNF);
-
-        Assert.assertEquals("wrong host", connectionDetails1.getHost(), connectionDetailsActual.getHost());
-        Assert.assertEquals("wrong password", connectionDetails1.getPassword(), connectionDetailsActual.getPassword());
-        Assert.assertEquals("wrong port", connectionDetails1.getPort(), connectionDetailsActual.getPort());
-        Assert.assertEquals("wrong usename", connectionDetails1.getUsername(), connectionDetailsActual.getUsername());
-    }
-
-
-    @Test
-    public void testRetrieveConnectionDetailsNegativeMissingConfiguration() throws Exception {
-        shortInit();
-        DAOServiceMock daoServiceMock = (DAOServiceMock) dao;
-        daoServiceMock.setConfigFile(fileContent);
-        ConnectionDetails connectionDetails1 = getConnectionDetails();
-        daoServiceMock.setConnection(connectionDetails1);
-
-        NetconfConnectionDetails connectionDetailsActual = null;
-        try {
-            connectionDetailsActual = netconfClientPlugin.retrieveConnectionDetails(VnfType.MOCK);
-            Assert.assertTrue(false);
-        } catch (APPCException e) {
-            Assert.assertNull(connectionDetailsActual);
-        }
-    }
-
-    @Test
-    public void testRetrieveConfigurationFileContent() throws Exception {
-        shortInit();
-
-        DAOServiceMock daoServiceMock = (DAOServiceMock) dao;
-        daoServiceMock.setConfigFile(fileContent);
-
-        Assert.assertEquals("wrong config in a database", fileContent, netconfClientPlugin.retrieveConfigurationFileContent("VnfGetRunningConfig"));
-    }
-
-    private ConnectionDetails getConnectionDetails() {
-        ConnectionDetails connectionDetails = new ConnectionDetails();
-        connectionDetails.setPassword(password);
-        connectionDetails.setPort(port);
-        connectionDetails.setUsername(username);
-        connectionDetails.setHost(host);
-        return connectionDetails;
-    }
-
-
-    private void initDao() throws NoSuchFieldException, IllegalAccessException {
-        dao = new DAOServiceMock();
-        PowerMockito.mockStatic(FrameworkUtil.class);
-        when(FrameworkUtil.getBundle(Matchers.any(Class.class))).thenReturn(bundleService);
-        when(bundleService.getBundleContext()).thenReturn(bundleContext);
-        when(bundleContext.getServiceReference(NetconfDataAccessService.class)).thenReturn(sref1);
-        when(bundleContext.getService(sref1)).thenReturn(dao);
-    }
-
-    private void fullInit() throws NoSuchFieldException, IllegalAccessException {
-        initClientFactory();
-        initClientFactory2();
-        initDao();
-        netconfClientPlugin = new NetconfClientPluginImpl();
-        netconfClientPlugin.setDao(this.dao);
-    }
-
-    private void shortInit() throws NoSuchFieldException, IllegalAccessException {
-        initClientFactory();
-        initDao();
-        netconfClientPlugin = new NetconfClientPluginImpl();
-        netconfClientPlugin.setDao(this.dao);
-    }
-
-    private void initClientFactory() throws NoSuchFieldException, IllegalAccessException {
-        PowerMockito.mockStatic(FrameworkUtil.class);
-        when(FrameworkUtil.getBundle(Matchers.any(Class.class))).thenReturn(bundleService);
-        when(bundleService.getBundleContext()).thenReturn(bundleContext);
-        when(bundleContext.getServiceReference(NetconfClientFactory.class)).thenReturn(sref2);
-        when(bundleContext.getService(sref2)).thenReturn(clientFactory);
-    }
-
-    private void initClientFactory2() {
-        PowerMockito.mockStatic(FrameworkUtil.class);
-        when(FrameworkUtil.getBundle(Matchers.any(Class.class))).thenReturn(bundleService);
-        when(bundleService.getBundleContext()).thenReturn(bundleContext);
-        when(bundleContext.getServiceReference(Matchers.anyString())).thenReturn(sref3);
-        when(bundleContext.getService(sref3)).thenReturn(clientFactory);
-    }
-
-    private void substituteMapper(boolean command) throws NoSuchFieldException, IllegalAccessException {
-        ObjectMapper mapper = new ObjectMapperMock();
-        ObjectMapper mapper2 = new ObjectMapper();
-        Field field = NetconfClientPluginImpl.class.getDeclaredField("mapper");
-        field.setAccessible(true);
-        if (command) {
-            field.set(netconfClientPlugin, mapper);
-        } else {
-            field.set(netconfClientPlugin, mapper2);
-        }
-    }
-
-}