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/main/java/org/onap/policy | |
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/main/java/org/onap/policy')
-rw-r--r-- | artifactbroker/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/k8s/K8sArtifactForwarder.java (renamed from artifactbroker/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/XacmlPdpArtifactForwarder.java) | 8 | ||||
-rw-r--r-- | artifactbroker/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/k8s/K8sArtifactForwarderParameterGroup.java (renamed from artifactbroker/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/XacmlPdpArtifactForwarderParameterGroup.java) | 34 |
2 files changed, 21 insertions, 21 deletions
diff --git a/artifactbroker/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/XacmlPdpArtifactForwarder.java b/artifactbroker/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/k8s/K8sArtifactForwarder.java index 4179fc7..d920907 100644 --- a/artifactbroker/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/XacmlPdpArtifactForwarder.java +++ b/artifactbroker/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/k8s/K8sArtifactForwarder.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.distribution.forwarding.xacml.pdp; +package org.onap.policy.distribution.forwarding.k8s; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -61,14 +61,14 @@ import org.onap.sdc.api.notification.IArtifactInfo; /** * Forwards policies to the XACML PDP. */ -public class XacmlPdpArtifactForwarder implements ArtifactForwarder { +public class K8sArtifactForwarder implements ArtifactForwarder { - private static final Logger LOGGER = FlexLogger.getLogger(XacmlPdpArtifactForwarder.class); + private static final Logger LOGGER = FlexLogger.getLogger(K8sArtifactForwarder.class); private static final String BASE_PATH = "http://localhost:8081/v1/rb/definition"; private static final String CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT = "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT"; private Map<String, IArtifactInfo> artifactMap; - private XacmlPdpArtifactForwarderParameterGroup configurationParameters = null; + private K8sArtifactForwarderParameterGroup configurationParameters = null; diff --git a/artifactbroker/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/XacmlPdpArtifactForwarderParameterGroup.java b/artifactbroker/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/k8s/K8sArtifactForwarderParameterGroup.java index d04bb3c..42e8d5a 100644 --- a/artifactbroker/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/XacmlPdpArtifactForwarderParameterGroup.java +++ b/artifactbroker/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/k8s/K8sArtifactForwarderParameterGroup.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.distribution.forwarding.xacml.pdp; +package org.onap.policy.distribution.forwarding.k8s; import org.onap.policy.common.parameters.GroupValidationResult; import org.onap.policy.common.parameters.ValidationStatus; @@ -26,10 +26,10 @@ import org.onap.policy.common.utils.validation.ParameterValidationUtils; import org.onap.policy.distribution.main.parameters.ArtifactForwarderConfigurationParameterGroup; /** - * Holds the parameters for the{@link XacmlPdpArtifactForwarder}. + * Holds the parameters for the{@link K8sArtifactForwarder}. */ -public class XacmlPdpArtifactForwarderParameterGroup extends ArtifactForwarderConfigurationParameterGroup { - public static final String POLICY_FORWARDER_PLUGIN_CLASS = XacmlPdpArtifactForwarder.class.getCanonicalName(); +public class K8sArtifactForwarderParameterGroup extends ArtifactForwarderConfigurationParameterGroup { + public static final String POLICY_FORWARDER_PLUGIN_CLASS = K8sArtifactForwarder.class.getCanonicalName(); private boolean useHttps; private String hostname; @@ -45,7 +45,7 @@ public class XacmlPdpArtifactForwarderParameterGroup extends ArtifactForwarderCo * * @param builder the builder create the instance from */ - private XacmlPdpArtifactForwarderParameterGroup(final XacmlPdpArtifactForwarderParameterGroupBuilder builder) { + private K8sArtifactForwarderParameterGroup(final K8sArtifactForwarderParameterGroupBuilder builder) { this.useHttps = builder.useHttps; this.hostname = builder.hostname; this.port = builder.port; @@ -89,9 +89,9 @@ public class XacmlPdpArtifactForwarderParameterGroup extends ArtifactForwarderCo } /** - * Builder for XacmlPdpArtifactForwarderParameterGroup. + * Builder for K8sArtifactForwarderParameterGroup. */ - public static class XacmlPdpArtifactForwarderParameterGroupBuilder { + public static class K8sArtifactForwarderParameterGroupBuilder { private boolean useHttps = false; private String hostname; private int port; @@ -101,42 +101,42 @@ public class XacmlPdpArtifactForwarderParameterGroup extends ArtifactForwarderCo private boolean isManaged = true; private String pdpGroup; - public XacmlPdpArtifactForwarderParameterGroupBuilder setUseHttps(final boolean useHttps) { + public K8sArtifactForwarderParameterGroupBuilder setUseHttps(final boolean useHttps) { this.useHttps = useHttps; return this; } - public XacmlPdpArtifactForwarderParameterGroupBuilder setHostname(final String hostname) { + public K8sArtifactForwarderParameterGroupBuilder setHostname(final String hostname) { this.hostname = hostname; return this; } - public XacmlPdpArtifactForwarderParameterGroupBuilder setPort(final int port) { + public K8sArtifactForwarderParameterGroupBuilder setPort(final int port) { this.port = port; return this; } - public XacmlPdpArtifactForwarderParameterGroupBuilder setUserName(final String userName) { + public K8sArtifactForwarderParameterGroupBuilder setUserName(final String userName) { this.userName = userName; return this; } - public XacmlPdpArtifactForwarderParameterGroupBuilder setPassword(final String password) { + public K8sArtifactForwarderParameterGroupBuilder setPassword(final String password) { this.password = password; return this; } - public XacmlPdpArtifactForwarderParameterGroupBuilder setClientAuth(final String clientAuth) { + public K8sArtifactForwarderParameterGroupBuilder setClientAuth(final String clientAuth) { this.clientAuth = clientAuth; return this; } - public XacmlPdpArtifactForwarderParameterGroupBuilder setIsManaged(final boolean isManaged) { + public K8sArtifactForwarderParameterGroupBuilder setIsManaged(final boolean isManaged) { this.isManaged = isManaged; return this; } - public XacmlPdpArtifactForwarderParameterGroupBuilder setPdpGroup(final String pdpGroup) { + public K8sArtifactForwarderParameterGroupBuilder setPdpGroup(final String pdpGroup) { this.pdpGroup = pdpGroup; return this; } @@ -144,8 +144,8 @@ public class XacmlPdpArtifactForwarderParameterGroup extends ArtifactForwarderCo /** * Creates a new XacmlPapServletArtifactForwarderParameterGroup instance. */ - public XacmlPdpArtifactForwarderParameterGroup build() { - return new XacmlPdpArtifactForwarderParameterGroup(this); + public K8sArtifactForwarderParameterGroup build() { + return new K8sArtifactForwarderParameterGroup(this); } } |