From 972fd705a0b5a3befcab0a59bc55badfddc1416b Mon Sep 17 00:00:00 2001 From: Jorge Hernandez Date: Mon, 2 Apr 2018 17:23:47 -0500 Subject: installation enhancements The following changes aim to have a quicker start of the drools container: 1. For both amsterdam (and the experimental beijing) controllers dependencies are pre-installed, so the loading of 3rd party dependencies are faster. 2. Further enhancements in installation. 3. Make sure that the naming of the generated control loop artifacts have a "control loop" label associated with it, so in the future, if other applications are added (non control loop related) do not conflict and is clear. Change-Id: Iecb84d186fcc34069aa5c4a175a8a4521b38499d Issue-ID: POLICY-534 Signed-off-by: Jorge Hernandez --- .../common/feature-controlloop-beijing/pom.xml | 270 +++++++++++++++++++++ .../src/assembly/assemble_zip.xml | 75 ++++++ .../feature/config/beijing-controller.properties | 74 ++++++ .../feature/beijing/BeijingFeature.java | 48 ++++ ...p.policy.drools.features.PolicyEngineFeatureAPI | 1 + .../feature/beijing/BeijingFeatureTest.java | 32 +++ 6 files changed, 500 insertions(+) create mode 100644 controlloop/common/feature-controlloop-beijing/pom.xml create mode 100644 controlloop/common/feature-controlloop-beijing/src/assembly/assemble_zip.xml create mode 100644 controlloop/common/feature-controlloop-beijing/src/main/feature/config/beijing-controller.properties create mode 100644 controlloop/common/feature-controlloop-beijing/src/main/java/org/onap/policy/drools/apps/controlloop/feature/beijing/BeijingFeature.java create mode 100644 controlloop/common/feature-controlloop-beijing/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyEngineFeatureAPI create mode 100644 controlloop/common/feature-controlloop-beijing/src/test/java/org/onap/policy/drools/apps/controlloop/feature/beijing/BeijingFeatureTest.java (limited to 'controlloop/common/feature-controlloop-beijing') diff --git a/controlloop/common/feature-controlloop-beijing/pom.xml b/controlloop/common/feature-controlloop-beijing/pom.xml new file mode 100644 index 000000000..0e53e8d1a --- /dev/null +++ b/controlloop/common/feature-controlloop-beijing/pom.xml @@ -0,0 +1,270 @@ + + + + 4.0.0 + + + org.onap.policy.drools-applications.controlloop.common + common + 1.2.0-SNAPSHOT + + + feature-controlloop-beijing + + + Load Experimental Beijing Control Loop Use Cases Controller as a feature. + + + + 1.8 + 1.8 + + + + + + src/main/feature + true + + + + + maven-assembly-plugin + 2.6 + + + zipfile + + single + + package + + true + ${project.artifactId}-${project.version} + + src/assembly/assemble_zip.xml + + false + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + copy-dependencies + + copy-dependencies + + prepare-package + + ${project.build.directory}/assembly/lib + false + true + true + false + false + false + runtime + false + + + + + + + + + + org.onap.policy.drools-applications.controlloop.common.model-impl + events + ${project.version} + + + org.onap.policy.drools-applications.controlloop.common.model-impl + appc + ${project.version} + + + org.onap.policy.drools-applications.controlloop.common.model-impl + appclcm + ${project.version} + + + org.onap.policy.drools-applications.controlloop.common.model-impl + vfc + ${project.version} + + + org.onap.policy.drools-applications.controlloop.common.model-impl + so + ${project.version} + + + org.onap.policy.drools-applications.controlloop.common.model-impl + aai + ${project.version} + + + org.onap.policy.drools-applications.controlloop.common.model-impl + sdc + ${project.version} + + + org.onap.policy.drools-applications.controlloop.common.model-impl + trafficgenerator + ${project.version} + + + org.onap.policy.drools-applications.controlloop.common + eventmanager + ${project.version} + + + org.onap.policy.drools-applications.controlloop.common + guard + ${project.version} + + + org.onap.policy.drools-applications.controlloop.common.actors + actorServiceProvider + ${project.version} + + + guava + com.google.guava + + + + + org.onap.policy.drools-applications.controlloop.common.actors + actor.appc + ${project.version} + + + guava + com.google.guava + + + + + org.onap.policy.drools-applications.controlloop.common.actors + actor.appclcm + ${project.version} + + + guava + com.google.guava + + + + + org.onap.policy.drools-applications.controlloop.common.actors + actor.so + ${project.version} + + + guava + com.google.guava + + + + + org.onap.policy.drools-applications.controlloop.common.actors + actor.vfc + ${project.version} + + + guava + com.google.guava + + + + + org.onap.policy.drools-applications.controlloop.common + policy-yaml + ${project.version} + + + guava + com.google.guava + + + snakeyaml + org.yaml + + + + + com.att.research.xacml + xacml-pdp + 1.0.1 + + + commons-codec + commons-codec + + + commons-logging + commons-logging + + + guava + com.google.guava + + + commons-lang3 + org.apache.commons + + + jackson-databind + com.fasterxml.jackson.core + + + commons-collections + commons-collections + + + commons-lang + commons-lang + + + + + org.onap.policy.drools-pdp + policy-management + ${project.version} + provided + true + + + junit + junit + 4.12 + test + + + diff --git a/controlloop/common/feature-controlloop-beijing/src/assembly/assemble_zip.xml b/controlloop/common/feature-controlloop-beijing/src/assembly/assemble_zip.xml new file mode 100644 index 000000000..f549cfc91 --- /dev/null +++ b/controlloop/common/feature-controlloop-beijing/src/assembly/assemble_zip.xml @@ -0,0 +1,75 @@ + + + + + + feature-controlloop-beijing-package + + zip + + + false + + + + target + lib/feature + + feature-controlloop-beijing-${project.version}.jar + + + + target/assembly/lib + lib/dependencies + + *.jar + + + + target/classes/config + config + 0644 + + + + src/main/feature/bin + bin + 0755 + + + + src/main/feature/db + db + 0744 + + + + src/main/feature/install + install + 0755 + + + + + diff --git a/controlloop/common/feature-controlloop-beijing/src/main/feature/config/beijing-controller.properties b/controlloop/common/feature-controlloop-beijing/src/main/feature/config/beijing-controller.properties new file mode 100644 index 000000000..a1126a09a --- /dev/null +++ b/controlloop/common/feature-controlloop-beijing/src/main/feature/config/beijing-controller.properties @@ -0,0 +1,74 @@ +### +# ============LICENSE_START======================================================= +# ONAP +# ================================================================================ +# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# 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========================================================= +### + +controller.name=beijing + +ueb.source.topics=${{PDPD_CONFIGURATION_TOPIC}},${{DCAE_TOPIC}},APPC-CL,APPC-LCM-WRITE + +ueb.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.servers=${{PDPD_CONFIGURATION_SERVERS}} +ueb.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.apiKey= +ueb.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.apiSecret= +ueb.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.events=org.onap.policy.controlloop.params.ControlLoopParams +ueb.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.events.org.onap.policy.controlloop.params.ControlLoopParams.filter=closedLoopControlName=.*,controlLoopYaml=.* + +ueb.source.topics.${{DCAE_TOPIC}}.servers=${{DCAE_SERVERS}} +ueb.source.topics.${{DCAE_TOPIC}}.apiKey= +ueb.source.topics.${{DCAE_TOPIC}}.apiSecret= +ueb.source.topics.${{DCAE_TOPIC}}.events=org.onap.policy.controlloop.VirtualControlLoopEvent +ueb.source.topics.${{DCAE_TOPIC}}.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=closedLoopEventStatus=.* +ueb.source.topics.${{DCAE_TOPIC}}.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gson + +ueb.source.topics.APPC-CL.servers=${{DMAAP_SERVERS}} +ueb.source.topics.APPC-CL.apiKey= +ueb.source.topics.APPC-CL.apiSecret= +ueb.source.topics.APPC-CL.events=org.onap.policy.appc.Response +ueb.source.topics.APPC-CL.events.org.onap.policy.appc.Response.filter=CommonHeader\=.*,Status\=.* +ueb.source.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty + +ueb.source.topics.APPC-LCM-WRITE.servers=${{DMAAP_SERVERS}} +ueb.source.topics.APPC-LCM-WRITE.apiKey= +ueb.source.topics.APPC-LCM-WRITE.apiSecret= +ueb.source.topics.APPC-LCM-WRITE.events=org.onap.policy.appclcm.LCMResponseWrapper +ueb.source.topics.APPC-LCM-WRITE.events.org.onap.policy.appclcm.LCMResponseWrapper.filter=type\=response +ueb.source.topics.APPC-LCM-WRITE.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson + +ueb.sink.topics=APPC-CL,APPC-LCM-READ,POLICY-CL-MGT + +ueb.sink.topics.APPC-CL.servers=${{DMAAP_SERVERS}} +ueb.sink.topics.APPC-CL.apiKey= +ueb.sink.topics.APPC-CL.apiSecret= +ueb.sink.topics.APPC-CL.events=org.onap.policy.appc.Request +ueb.sink.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty + +ueb.sink.topics.APPC-LCM-READ.servers=${{DMAAP_SERVERS}} +ueb.sink.topics.APPC-LCM-READ.apiKey= +ueb.sink.topics.APPC-LCM-READ.apiSecret= +ueb.sink.topics.APPC-LCM-READ.events=org.onap.policy.appclcm.LCMRequestWrapper +ueb.sink.topics.APPC-LCM-READ.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson + +ueb.sink.topics.POLICY-CL-MGT.servers=${{DMAAP_SERVERS}} +ueb.sink.topics.POLICY-CL-MGT.apiKey= +ueb.sink.topics.POLICY-CL-MGT.apiSecret= +ueb.sink.topics.POLICY-CL-MGT.events=org.onap.policy.controlloop.VirtualControlLoopNotification +ueb.sink.topics.POLICY-CL-MGT.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty + +rules.groupId=${project.groupId} +rules.artifactId=controller-beijing +rules.version=${project.version} diff --git a/controlloop/common/feature-controlloop-beijing/src/main/java/org/onap/policy/drools/apps/controlloop/feature/beijing/BeijingFeature.java b/controlloop/common/feature-controlloop-beijing/src/main/java/org/onap/policy/drools/apps/controlloop/feature/beijing/BeijingFeature.java new file mode 100644 index 000000000..6f2a03c77 --- /dev/null +++ b/controlloop/common/feature-controlloop-beijing/src/main/java/org/onap/policy/drools/apps/controlloop/feature/beijing/BeijingFeature.java @@ -0,0 +1,48 @@ +/* + * ============LICENSE_START======================================================= + * ONAP + * ================================================================================ + * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.policy.drools.apps.controlloop.feature.beijing; + +import org.onap.policy.drools.features.PolicyEngineFeatureAPI; + +/** + * Beijing installation as a feature saves time + * loading the Beijing controller at runtime over the + * usual installation from nexus. It also reduces + * potential for errors in the pom.xml generated in + * the brmsgw side. + * + * There is no impact on other components as the brmsgw + * etc .. they will continue operating as usual. + * + * This class will be expanded in the future for additional + * functionality + * + */ +public class BeijingFeature implements PolicyEngineFeatureAPI { + + public static final int SEQNO = 1000; + + @Override + public int getSequenceNumber() { + return SEQNO; + } + +} diff --git a/controlloop/common/feature-controlloop-beijing/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyEngineFeatureAPI b/controlloop/common/feature-controlloop-beijing/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyEngineFeatureAPI new file mode 100644 index 000000000..93439489c --- /dev/null +++ b/controlloop/common/feature-controlloop-beijing/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyEngineFeatureAPI @@ -0,0 +1 @@ +org.onap.policy.drools.apps.controlloop.feature.beijing.BeijingFeature diff --git a/controlloop/common/feature-controlloop-beijing/src/test/java/org/onap/policy/drools/apps/controlloop/feature/beijing/BeijingFeatureTest.java b/controlloop/common/feature-controlloop-beijing/src/test/java/org/onap/policy/drools/apps/controlloop/feature/beijing/BeijingFeatureTest.java new file mode 100644 index 000000000..66e5a3e02 --- /dev/null +++ b/controlloop/common/feature-controlloop-beijing/src/test/java/org/onap/policy/drools/apps/controlloop/feature/beijing/BeijingFeatureTest.java @@ -0,0 +1,32 @@ +/* + * ============LICENSE_START======================================================= + * ONAP + * ================================================================================ + * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.policy.drools.apps.controlloop.feature.beijing; + +import static org.junit.Assert.*; + +import org.onap.policy.drools.apps.controlloop.feature.beijing.BeijingFeature; + +public class BeijingFeatureTest { + + @org.junit.Test + public void getSequenceNumber() { + assertTrue(new BeijingFeature().getSequenceNumber() == BeijingFeature.SEQNO); + } +} -- cgit 1.2.3-korg