diff options
author | 2019-04-19 02:10:02 +0800 | |
---|---|---|
committer | 2019-04-19 02:10:02 +0800 | |
commit | ef9c71ab1efce6e60eb5d8c89cf09c5182c48730 (patch) | |
tree | 6cddba6d92283b69954765ec0b00963f3aa8feb8 /artifactbroker/plugins/forwarding-plugins/src/test/java/org | |
parent | e8697face7909927a9ddb418f116c76e3c6d8c8f (diff) |
enable merge sdc client part into Distribution release image
. update the defaultConfig.json file to include sdc client configuration
. update the DistriubtionActivator to enable parse sdc client and k8s plugin
. rename xacml pdp to k8s
. fix distribution run-time issue
Change-Id: If267f5c256b19ebdbe7b7b2869afcf2f570e4b24
Issue-ID: MULTICLOUD-576
Signed-off-by: liboNet <libo.zhu@intel.com>
Diffstat (limited to 'artifactbroker/plugins/forwarding-plugins/src/test/java/org')
-rw-r--r-- | artifactbroker/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/k8s/engine/K8sArtifactForwarderParameterGroupTest.java (renamed from artifactbroker/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/engine/XacmlPdpArtifactForwarderParameterGroupTest.java) | 38 | ||||
-rw-r--r-- | artifactbroker/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/k8s/engine/K8sArtifactForwarderTest.java (renamed from artifactbroker/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/engine/XacmlPdpArtifactForwarderTest.java) | 12 | ||||
-rw-r--r-- | artifactbroker/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/k8s/testclasses/DummyReceptionHandler.java (renamed from artifactbroker/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/testclasses/DummyReceptionHandler.java) | 2 |
3 files changed, 26 insertions, 26 deletions
diff --git a/artifactbroker/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/engine/XacmlPdpArtifactForwarderParameterGroupTest.java b/artifactbroker/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/k8s/engine/K8sArtifactForwarderParameterGroupTest.java index d10ea62..b3525cc 100644 --- a/artifactbroker/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/engine/XacmlPdpArtifactForwarderParameterGroupTest.java +++ b/artifactbroker/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/k8s/engine/K8sArtifactForwarderParameterGroupTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.distribution.forwarding.xacml.pdp.engine; +package org.onap.policy.distribution.forwarding.k8s.engine; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -26,16 +26,16 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.onap.policy.common.parameters.ValidationStatus; -import org.onap.policy.distribution.forwarding.xacml.pdp.XacmlPdpArtifactForwarderParameterGroup; -import org.onap.policy.distribution.forwarding.xacml.pdp.XacmlPdpArtifactForwarderParameterGroup.XacmlPdpArtifactForwarderParameterGroupBuilder; +import org.onap.policy.distribution.forwarding.k8s.K8sArtifactForwarderParameterGroup; +import org.onap.policy.distribution.forwarding.k8s.K8sArtifactForwarderParameterGroup.K8sArtifactForwarderParameterGroupBuilder; -public class XacmlPdpArtifactForwarderParameterGroupTest { +public class K8sArtifactForwarderParameterGroupTest { @Test public void testBuilderAndGetters() { - XacmlPdpArtifactForwarderParameterGroupBuilder builder = - new XacmlPdpArtifactForwarderParameterGroupBuilder(); - XacmlPdpArtifactForwarderParameterGroup configurationParameters = + K8sArtifactForwarderParameterGroupBuilder builder = + new K8sArtifactForwarderParameterGroupBuilder(); + K8sArtifactForwarderParameterGroup configurationParameters = builder.setUseHttps(true).setHostname("10.10.10.10").setPort(1234).setUserName("myUser") .setPassword("myPassword").setClientAuth("myClientAuth").setIsManaged(false).build(); @@ -50,9 +50,9 @@ public class XacmlPdpArtifactForwarderParameterGroupTest { @Test public void testInvalidHostName() { - XacmlPdpArtifactForwarderParameterGroupBuilder builder = - new XacmlPdpArtifactForwarderParameterGroupBuilder(); - XacmlPdpArtifactForwarderParameterGroup configurationParameters = builder.setUseHttps(true).setHostname("") + K8sArtifactForwarderParameterGroupBuilder builder = + new K8sArtifactForwarderParameterGroupBuilder(); + K8sArtifactForwarderParameterGroup configurationParameters = builder.setUseHttps(true).setHostname("") .setPort(1234).setUserName("myUser").setPassword("myPassword").setIsManaged(false).build(); configurationParameters.setName("myConfiguration"); @@ -61,9 +61,9 @@ public class XacmlPdpArtifactForwarderParameterGroupTest { @Test public void testInvalidPort() { - XacmlPdpArtifactForwarderParameterGroupBuilder builder = - new XacmlPdpArtifactForwarderParameterGroupBuilder(); - XacmlPdpArtifactForwarderParameterGroup configurationParameters = + K8sArtifactForwarderParameterGroupBuilder builder = + new K8sArtifactForwarderParameterGroupBuilder(); + K8sArtifactForwarderParameterGroup configurationParameters = builder.setUseHttps(true).setHostname("10.10.10.10").setPort(-1234).setUserName("myUser") .setPassword("myPassword").setIsManaged(false).build(); configurationParameters.setName("myConfiguration"); @@ -73,9 +73,9 @@ public class XacmlPdpArtifactForwarderParameterGroupTest { @Test public void testInvalidUserName() { - XacmlPdpArtifactForwarderParameterGroupBuilder builder = - new XacmlPdpArtifactForwarderParameterGroupBuilder(); - XacmlPdpArtifactForwarderParameterGroup configurationParameters = + K8sArtifactForwarderParameterGroupBuilder builder = + new K8sArtifactForwarderParameterGroupBuilder(); + K8sArtifactForwarderParameterGroup configurationParameters = builder.setUseHttps(true).setHostname("10.10.10.10").setPort(1234).setUserName("") .setPassword("myPassword").setIsManaged(false).build(); configurationParameters.setName("myConfiguration"); @@ -85,9 +85,9 @@ public class XacmlPdpArtifactForwarderParameterGroupTest { @Test public void testInvalidPassword() { - XacmlPdpArtifactForwarderParameterGroupBuilder builder = - new XacmlPdpArtifactForwarderParameterGroupBuilder(); - XacmlPdpArtifactForwarderParameterGroup configurationParameters = + K8sArtifactForwarderParameterGroupBuilder builder = + new K8sArtifactForwarderParameterGroupBuilder(); + K8sArtifactForwarderParameterGroup configurationParameters = builder.setUseHttps(true).setHostname("10.10.10.10").setPort(1234).setUserName("myUser").setPassword("") .setIsManaged(false).build(); configurationParameters.setName("myConfiguration"); diff --git a/artifactbroker/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/engine/XacmlPdpArtifactForwarderTest.java b/artifactbroker/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/k8s/engine/K8sArtifactForwarderTest.java index bad34c5..58c9c69 100644 --- a/artifactbroker/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/engine/XacmlPdpArtifactForwarderTest.java +++ b/artifactbroker/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/k8s/engine/K8sArtifactForwarderTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.distribution.forwarding.xacml.pdp.engine; +package org.onap.policy.distribution.forwarding.k8.engine; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -64,8 +64,8 @@ import org.junit.Test; import org.onap.policy.common.endpoints.event.comm.bus.internal.BusTopicParams; import org.onap.policy.common.parameters.ParameterGroup; import org.onap.policy.common.parameters.ParameterService; -import org.onap.policy.distribution.forwarding.xacml.pdp.XacmlPdpArtifactForwarder; -import org.onap.policy.distribution.forwarding.xacml.pdp.XacmlPdpArtifactForwarderParameterGroup.XacmlPdpArtifactForwarderParameterGroupBuilder; +import org.onap.policy.distribution.forwarding.k8s.K8sArtifactForwarder; +import org.onap.policy.distribution.forwarding.k8s.K8sArtifactForwarderParameterGroup.K8sArtifactForwarderParameterGroupBuilder; import org.onap.policy.distribution.main.PolicyDistributionException; import org.onap.policy.distribution.model.CloudArtifact; import org.onap.policy.distribution.model.GsonUtil; @@ -74,7 +74,7 @@ import org.onap.policy.distribution.model.VfModuleModel; import org.onap.sdc.api.notification.IArtifactInfo; -public class XacmlPdpArtifactForwarderTest { +public class K8sArtifactForwarderTest { private static final BusTopicParams BUS_TOPIC_PARAMS = BusTopicParams.builder().useHttps(false).hostname("myHost") .port(1234).userName("myUser").password("myPassword").managed(true).build(); @@ -89,7 +89,7 @@ public class XacmlPdpArtifactForwarderTest { */ @BeforeClass public static void setUp() { - ParameterGroup parameterGroup = new XacmlPdpArtifactForwarderParameterGroupBuilder() + ParameterGroup parameterGroup = new K8sArtifactForwarderParameterGroupBuilder() .setUseHttps(BUS_TOPIC_PARAMS.isUseHttps()).setHostname(BUS_TOPIC_PARAMS.getHostname()) .setPort(BUS_TOPIC_PARAMS.getPort()).setUserName(BUS_TOPIC_PARAMS.getUserName()) .setPassword(BUS_TOPIC_PARAMS.getPassword()).setClientAuth(CLIENT_AUTH_VALUE) @@ -117,7 +117,7 @@ public class XacmlPdpArtifactForwarderTest { when(httpClientMock.execute(anyObject())).thenReturn(response); - XacmlPdpArtifactForwarder forwarder = new XacmlPdpArtifactForwarder(); + K8sArtifactForwarder forwarder = new K8sArtifactForwarder(); forwarder.configure("xacmlPdpConfiguration"); diff --git a/artifactbroker/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/testclasses/DummyReceptionHandler.java b/artifactbroker/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/k8s/testclasses/DummyReceptionHandler.java index c093481..6996bfd 100644 --- a/artifactbroker/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/testclasses/DummyReceptionHandler.java +++ b/artifactbroker/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/k8s/testclasses/DummyReceptionHandler.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.distribution.forwarding.xacml.pdp.testclasses; +package org.onap.policy.distribution.forwarding.k8s.testclasses; import org.onap.policy.distribution.reception.handling.AbstractReceptionHandler; |