diff options
Diffstat (limited to 'appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp')
8 files changed, 40 insertions, 40 deletions
diff --git a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/DAOServiceMock.java b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/DAOServiceMock.java index 3e2411da8..379e164b5 100644 --- a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/DAOServiceMock.java +++ b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/DAOServiceMock.java @@ -22,14 +22,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.netconf.impl; +package org.onap.appc.dg.netconf.impl; import java.util.HashMap; -import org.openecomp.appc.adapter.netconf.ConnectionDetails; -import org.openecomp.appc.adapter.netconf.NetconfConnectionDetails; -import org.openecomp.appc.adapter.netconf.NetconfDataAccessService; -import org.openecomp.appc.adapter.netconf.exception.DataAccessException; +import org.onap.appc.adapter.netconf.ConnectionDetails; +import org.onap.appc.adapter.netconf.NetconfConnectionDetails; +import org.onap.appc.adapter.netconf.NetconfDataAccessService; +import org.onap.appc.adapter.netconf.exception.DataAccessException; import org.onap.ccsdk.sli.core.dblib.DbLibService; class DAOServiceMock implements NetconfDataAccessService { diff --git a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/MockOperationalStateValidatorImpl.java b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/MockOperationalStateValidatorImpl.java index 19e6d035a..802fe15e0 100644 --- a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/MockOperationalStateValidatorImpl.java +++ b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/MockOperationalStateValidatorImpl.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.netconf.impl; +package org.onap.appc.dg.netconf.impl; -import org.openecomp.appc.adapter.netconf.OperationalStateValidator; -import org.openecomp.appc.adapter.netconf.VnfType; -import org.openecomp.appc.exceptions.APPCException; +import org.onap.appc.adapter.netconf.OperationalStateValidator; +import org.onap.appc.adapter.netconf.VnfType; +import org.onap.appc.exceptions.APPCException; public class MockOperationalStateValidatorImpl implements OperationalStateValidator { diff --git a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientFactoryMock.java b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientFactoryMock.java index 1af12c7bd..f61d188d9 100644 --- a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientFactoryMock.java +++ b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientFactoryMock.java @@ -22,13 +22,13 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.netconf.impl; +package org.onap.appc.dg.netconf.impl; -import org.openecomp.appc.adapter.netconf.NetconfClient; -import org.openecomp.appc.adapter.netconf.NetconfClientFactory; -import org.openecomp.appc.adapter.netconf.NetconfClientType; -import org.openecomp.appc.adapter.netconf.jsch.NetconfClientJsch; -import org.openecomp.appc.adapter.netconf.odlconnector.NetconfClientRestconfImpl; +import org.onap.appc.adapter.netconf.NetconfClient; +import org.onap.appc.adapter.netconf.NetconfClientFactory; +import org.onap.appc.adapter.netconf.NetconfClientType; +import org.onap.appc.adapter.netconf.jsch.NetconfClientJsch; +import org.onap.appc.adapter.netconf.odlconnector.NetconfClientRestconfImpl; public class NetconfClientFactoryMock extends NetconfClientFactory { diff --git a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientJschMock.java b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientJschMock.java index 301eafd6b..82361a95e 100644 --- a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientJschMock.java +++ b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientJschMock.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.netconf.impl; +package org.onap.appc.dg.netconf.impl; -import org.openecomp.appc.adapter.netconf.NetconfClient; -import org.openecomp.appc.adapter.netconf.NetconfConnectionDetails; -import org.openecomp.appc.exceptions.APPCException; +import org.onap.appc.adapter.netconf.NetconfClient; +import org.onap.appc.adapter.netconf.NetconfConnectionDetails; +import org.onap.appc.exceptions.APPCException; public class NetconfClientJschMock implements NetconfClient { diff --git a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientPluginImplTest.java b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientPluginImplTest.java index 845d4f288..0becff701 100644 --- a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientPluginImplTest.java +++ b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientPluginImplTest.java @@ -22,9 +22,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.netconf.impl; +package org.onap.appc.dg.netconf.impl; -import org.openecomp.appc.exceptions.APPCException; +import org.onap.appc.exceptions.APPCException; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; @@ -32,9 +32,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Matchers; import org.mockito.Mockito; -import org.openecomp.appc.adapter.netconf.*; -import org.openecomp.appc.adapter.netconf.util.Constants; -import org.openecomp.appc.dg.netconf.impl.NetconfClientPluginImpl; +import org.onap.appc.adapter.netconf.*; +import org.onap.appc.adapter.netconf.util.Constants; +import org.onap.appc.dg.netconf.impl.NetconfClientPluginImpl; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -90,7 +90,7 @@ public class NetconfClientPluginImplTest { 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:openecomp:appc:Test\">\n" + + " <ManagedElement xmlns=\"urn:org:onap:appc:Test\">\n" + " <VnfFunction xmlns=\"urn:org:openecomop:appc:Test\">\n" + " <ProcessorManagement>\n" + " <MatedPair>\n" + diff --git a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfDBPluginImplTest.java b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfDBPluginImplTest.java index f01a462f1..5137b904b 100644 --- a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfDBPluginImplTest.java +++ b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfDBPluginImplTest.java @@ -22,16 +22,16 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.netconf.impl; +package org.onap.appc.dg.netconf.impl; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.*; -import org.openecomp.appc.adapter.netconf.ConnectionDetails; -import org.openecomp.appc.adapter.netconf.NetconfConnectionDetails; -import org.openecomp.appc.adapter.netconf.NetconfDataAccessService; -import org.openecomp.appc.adapter.netconf.exception.DataAccessException; -import org.openecomp.appc.dg.netconf.impl.NetconfDBPluginImpl; -import org.openecomp.appc.exceptions.APPCException; +import org.onap.appc.adapter.netconf.ConnectionDetails; +import org.onap.appc.adapter.netconf.NetconfConnectionDetails; +import org.onap.appc.adapter.netconf.NetconfDataAccessService; +import org.onap.appc.adapter.netconf.exception.DataAccessException; +import org.onap.appc.dg.netconf.impl.NetconfDBPluginImpl; +import org.onap.appc.exceptions.APPCException; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import java.io.IOException; @@ -66,7 +66,7 @@ public class NetconfDBPluginImplTest { public void testRetrieveDSConfiguration() throws Exception { init(); params = new HashMap<>(); - params.put("org.openecomp.appc.vftype", "VNF"); + params.put("org.onap.appc.vftype", "VNF"); params.put("configuration-file-name", "VnfGetRunningConfig"); SvcLogicContext ctx = new SvcLogicContext(); netconfDBPlugin.retrieveDSConfiguration(params, ctx); @@ -86,7 +86,7 @@ public class NetconfDBPluginImplTest { try { netconfDBPlugin.retrieveDSConfiguration(params, ctx); } catch (DataAccessException e) { - //Assert.assertNotNull(ctx.getAttribute("org.openecomp.appc.dg.error")); + //Assert.assertNotNull(ctx.getAttribute("org.onap.appc.dg.error")); Assert.assertNull(ctx.getAttribute("file-content")); } @@ -161,7 +161,7 @@ public class NetconfDBPluginImplTest { public void testRetrieveConnectionDetails() throws Exception { init(); params = new HashMap<>(); - params.put("org.openecomp.appc.vftype", "VNF"); + params.put("org.onap.appc.vftype", "VNF"); params.put("vnf-host-ip-address", host1); SvcLogicContext ctx = new SvcLogicContext(); netconfDBPlugin.retrieveConnectionDetails(params, ctx); @@ -173,7 +173,7 @@ public class NetconfDBPluginImplTest { public void testRetrieveConnectionDetailsNegativeJsonProcessingException() throws Exception { init(); params = new HashMap<>(); - params.put("org.openecomp.appc.vftype", "MOCK"); + params.put("org.onap.appc.vftype", "MOCK"); params.put("vnf-host-ip-address", host1); SvcLogicContext ctx = new SvcLogicContext(); @@ -192,7 +192,7 @@ public class NetconfDBPluginImplTest { public void testRetrieveConnectionDetailsNegativeMissingConfiguration() throws Exception { init(); params = new HashMap<>(); - params.put("org.openecomp.appc.vftype", "VNF"); + params.put("org.onap.appc.vftype", "VNF"); params.put("vnf-host-ip-address", host1); SvcLogicContext ctx = new SvcLogicContext(); substituteMapper(true); diff --git a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/ObjectMapperMock.java b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/ObjectMapperMock.java index c5168e253..cacc15eae 100644 --- a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/ObjectMapperMock.java +++ b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/ObjectMapperMock.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.netconf.impl; +package org.onap.appc.dg.netconf.impl; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/OperationStateValidatorFactoryMock.java b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/OperationStateValidatorFactoryMock.java index 24b0323dd..2194fc14c 100644 --- a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/OperationStateValidatorFactoryMock.java +++ b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/OperationStateValidatorFactoryMock.java @@ -22,10 +22,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.netconf.impl; +package org.onap.appc.dg.netconf.impl; import org.apache.commons.lang3.NotImplementedException; -import org.openecomp.appc.adapter.netconf.*; +import org.onap.appc.adapter.netconf.*; public class OperationStateValidatorFactoryMock extends OperationalStateValidatorFactory { |