From 93fc6343de11bde4de4e7533241123a7dcc83e70 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Thu, 2 Aug 2018 16:40:41 -0400 Subject: rename rule template from beijing to casablanca Changed assertTrue to assertEquals in CasablancaFeatureTest. Change-Id: I3bec009ddde2f10468575b4b7bf9c08c24748aae Issue-ID: POLICY-955 Signed-off-by: Jim Hahn --- controlloop/common/controller-beijing/.gitignore | 1 - controlloop/common/controller-beijing/pom.xml | 222 ----------------- .../src/main/resources/META-INF/kmodule.xml | 25 -- .../common/controller-casablanca/.gitignore | 1 + controlloop/common/controller-casablanca/pom.xml | 222 +++++++++++++++++ .../src/main/resources/META-INF/kmodule.xml | 25 ++ .../common/feature-controlloop-beijing/pom.xml | 270 --------------------- .../src/assembly/assemble_zip.xml | 75 ------ .../feature/config/beijing-controller.properties | 75 ------ .../feature/beijing/BeijingFeature.java | 48 ---- ...p.policy.drools.features.PolicyEngineFeatureAPI | 1 - .../feature/beijing/BeijingFeatureTest.java | 32 --- .../common/feature-controlloop-casablanca/pom.xml | 270 +++++++++++++++++++++ .../src/assembly/assemble_zip.xml | 75 ++++++ .../config/casablanca-controller.properties | 75 ++++++ .../feature/casablanca/CasablancaFeature.java | 48 ++++ ...p.policy.drools.features.PolicyEngineFeatureAPI | 1 + .../feature/casablanca/CasablancaFeatureTest.java | 30 +++ controlloop/common/pom.xml | 4 +- 19 files changed, 749 insertions(+), 751 deletions(-) delete mode 100644 controlloop/common/controller-beijing/.gitignore delete mode 100644 controlloop/common/controller-beijing/pom.xml delete mode 100644 controlloop/common/controller-beijing/src/main/resources/META-INF/kmodule.xml create mode 100644 controlloop/common/controller-casablanca/.gitignore create mode 100644 controlloop/common/controller-casablanca/pom.xml create mode 100644 controlloop/common/controller-casablanca/src/main/resources/META-INF/kmodule.xml delete mode 100644 controlloop/common/feature-controlloop-beijing/pom.xml delete mode 100644 controlloop/common/feature-controlloop-beijing/src/assembly/assemble_zip.xml delete mode 100644 controlloop/common/feature-controlloop-beijing/src/main/feature/config/beijing-controller.properties delete mode 100644 controlloop/common/feature-controlloop-beijing/src/main/java/org/onap/policy/drools/apps/controlloop/feature/beijing/BeijingFeature.java delete mode 100644 controlloop/common/feature-controlloop-beijing/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyEngineFeatureAPI delete mode 100644 controlloop/common/feature-controlloop-beijing/src/test/java/org/onap/policy/drools/apps/controlloop/feature/beijing/BeijingFeatureTest.java create mode 100644 controlloop/common/feature-controlloop-casablanca/pom.xml create mode 100644 controlloop/common/feature-controlloop-casablanca/src/assembly/assemble_zip.xml create mode 100644 controlloop/common/feature-controlloop-casablanca/src/main/feature/config/casablanca-controller.properties create mode 100644 controlloop/common/feature-controlloop-casablanca/src/main/java/org/onap/policy/drools/apps/controlloop/feature/casablanca/CasablancaFeature.java create mode 100644 controlloop/common/feature-controlloop-casablanca/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyEngineFeatureAPI create mode 100644 controlloop/common/feature-controlloop-casablanca/src/test/java/org/onap/policy/drools/apps/controlloop/feature/casablanca/CasablancaFeatureTest.java (limited to 'controlloop/common') diff --git a/controlloop/common/controller-beijing/.gitignore b/controlloop/common/controller-beijing/.gitignore deleted file mode 100644 index 2e1b1149f..000000000 --- a/controlloop/common/controller-beijing/.gitignore +++ /dev/null @@ -1 +0,0 @@ -src/main/resources/beijing.drl diff --git a/controlloop/common/controller-beijing/pom.xml b/controlloop/common/controller-beijing/pom.xml deleted file mode 100644 index 7fe97a994..000000000 --- a/controlloop/common/controller-beijing/pom.xml +++ /dev/null @@ -1,222 +0,0 @@ - - - - - 4.0.0 - - - org.onap.policy.drools-applications.controlloop.common - common - 1.3.0-SNAPSHOT - - - controller-beijing - kjar - - ${project.artifactId} - Beijing Experimental Controller - - - 1.8 - 1.8 - - - - - - org.kie - kie-maven-plugin - 6.5.0.Final - true - - - - com.coderplus.maven.plugins - copy-rename-maven-plugin - 1.0.1 - - - copy-drl - generate-resources - - copy - - - - ../../templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl - - src/main/resources/beijing.drl - - - - - - - - - - - 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} - - - org.onap.policy.drools-applications.controlloop.common.actors - actor.appc - ${project.version} - - - org.onap.policy.drools-applications.controlloop.common.actors - actor.appclcm - ${project.version} - - - org.onap.policy.drools-applications.controlloop.common.actors - actor.so - ${project.version} - - - org.onap.policy.drools-applications.controlloop.common.actors - actor.vfc - ${project.version} - - - org.onap.policy.drools-applications.controlloop.common - policy-yaml - ${project.version} - - - com.att.research.xacml - xacml-pdp - 1.0.1 - - - - commons-collections - commons-collections - - - - - org.onap.policy.drools-pdp - policy-management - ${project.version} - provided - true - - - - - - - only-eclipse - - - m2e.version - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.kie - kie-maven-plugin - 6.5.0.Final - - build - - - - - - - - - - - - - - - - diff --git a/controlloop/common/controller-beijing/src/main/resources/META-INF/kmodule.xml b/controlloop/common/controller-beijing/src/main/resources/META-INF/kmodule.xml deleted file mode 100644 index fb96d70fd..000000000 --- a/controlloop/common/controller-beijing/src/main/resources/META-INF/kmodule.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - diff --git a/controlloop/common/controller-casablanca/.gitignore b/controlloop/common/controller-casablanca/.gitignore new file mode 100644 index 000000000..f4e96567c --- /dev/null +++ b/controlloop/common/controller-casablanca/.gitignore @@ -0,0 +1 @@ +src/main/resources/casablanca.drl diff --git a/controlloop/common/controller-casablanca/pom.xml b/controlloop/common/controller-casablanca/pom.xml new file mode 100644 index 000000000..deeb5b346 --- /dev/null +++ b/controlloop/common/controller-casablanca/pom.xml @@ -0,0 +1,222 @@ + + + + + 4.0.0 + + + org.onap.policy.drools-applications.controlloop.common + common + 1.3.0-SNAPSHOT + + + controller-casablanca + kjar + + ${project.artifactId} + Casablanca Experimental Controller + + + 1.8 + 1.8 + + + + + + org.kie + kie-maven-plugin + 6.5.0.Final + true + + + + com.coderplus.maven.plugins + copy-rename-maven-plugin + 1.0.1 + + + copy-drl + generate-resources + + copy + + + + ../../templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl + + src/main/resources/casablanca.drl + + + + + + + + + + + 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} + + + org.onap.policy.drools-applications.controlloop.common.actors + actor.appc + ${project.version} + + + org.onap.policy.drools-applications.controlloop.common.actors + actor.appclcm + ${project.version} + + + org.onap.policy.drools-applications.controlloop.common.actors + actor.so + ${project.version} + + + org.onap.policy.drools-applications.controlloop.common.actors + actor.vfc + ${project.version} + + + org.onap.policy.drools-applications.controlloop.common + policy-yaml + ${project.version} + + + com.att.research.xacml + xacml-pdp + 1.0.1 + + + + commons-collections + commons-collections + + + + + org.onap.policy.drools-pdp + policy-management + ${project.version} + provided + true + + + + + + + only-eclipse + + + m2e.version + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.kie + kie-maven-plugin + 6.5.0.Final + + build + + + + + + + + + + + + + + + + diff --git a/controlloop/common/controller-casablanca/src/main/resources/META-INF/kmodule.xml b/controlloop/common/controller-casablanca/src/main/resources/META-INF/kmodule.xml new file mode 100644 index 000000000..3c2030da9 --- /dev/null +++ b/controlloop/common/controller-casablanca/src/main/resources/META-INF/kmodule.xml @@ -0,0 +1,25 @@ + + + + + + + diff --git a/controlloop/common/feature-controlloop-beijing/pom.xml b/controlloop/common/feature-controlloop-beijing/pom.xml deleted file mode 100644 index 33aca1772..000000000 --- a/controlloop/common/feature-controlloop-beijing/pom.xml +++ /dev/null @@ -1,270 +0,0 @@ - - - - 4.0.0 - - - org.onap.policy.drools-applications.controlloop.common - common - 1.3.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 deleted file mode 100644 index f549cfc91..000000000 --- a/controlloop/common/feature-controlloop-beijing/src/assembly/assemble_zip.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - 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 deleted file mode 100644 index 787e90f0c..000000000 --- a/controlloop/common/feature-controlloop-beijing/src/main/feature/config/beijing-controller.properties +++ /dev/null @@ -1,75 +0,0 @@ -### -# ============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}}.consumerGroup=${{DCAE_CONSUMER_GROUP}} -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 deleted file mode 100644 index 6f2a03c77..000000000 --- a/controlloop/common/feature-controlloop-beijing/src/main/java/org/onap/policy/drools/apps/controlloop/feature/beijing/BeijingFeature.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * ============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 deleted file mode 100644 index 93439489c..000000000 --- a/controlloop/common/feature-controlloop-beijing/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyEngineFeatureAPI +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 66e5a3e02..000000000 --- a/controlloop/common/feature-controlloop-beijing/src/test/java/org/onap/policy/drools/apps/controlloop/feature/beijing/BeijingFeatureTest.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * ============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); - } -} diff --git a/controlloop/common/feature-controlloop-casablanca/pom.xml b/controlloop/common/feature-controlloop-casablanca/pom.xml new file mode 100644 index 000000000..dd60243c0 --- /dev/null +++ b/controlloop/common/feature-controlloop-casablanca/pom.xml @@ -0,0 +1,270 @@ + + + + 4.0.0 + + + org.onap.policy.drools-applications.controlloop.common + common + 1.3.0-SNAPSHOT + + + feature-controlloop-casablanca + + + Load Experimental Casablanca 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-casablanca/src/assembly/assemble_zip.xml b/controlloop/common/feature-controlloop-casablanca/src/assembly/assemble_zip.xml new file mode 100644 index 000000000..7cb637918 --- /dev/null +++ b/controlloop/common/feature-controlloop-casablanca/src/assembly/assemble_zip.xml @@ -0,0 +1,75 @@ + + + + + + feature-controlloop-casablanca-package + + zip + + + false + + + + target + lib/feature + + feature-controlloop-casablanca-${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-casablanca/src/main/feature/config/casablanca-controller.properties b/controlloop/common/feature-controlloop-casablanca/src/main/feature/config/casablanca-controller.properties new file mode 100644 index 000000000..5d1a0a3c6 --- /dev/null +++ b/controlloop/common/feature-controlloop-casablanca/src/main/feature/config/casablanca-controller.properties @@ -0,0 +1,75 @@ +### +# ============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=casablanca + +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}}.consumerGroup=${{DCAE_CONSUMER_GROUP}} +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-casablanca +rules.version=${project.version} diff --git a/controlloop/common/feature-controlloop-casablanca/src/main/java/org/onap/policy/drools/apps/controlloop/feature/casablanca/CasablancaFeature.java b/controlloop/common/feature-controlloop-casablanca/src/main/java/org/onap/policy/drools/apps/controlloop/feature/casablanca/CasablancaFeature.java new file mode 100644 index 000000000..79bef2326 --- /dev/null +++ b/controlloop/common/feature-controlloop-casablanca/src/main/java/org/onap/policy/drools/apps/controlloop/feature/casablanca/CasablancaFeature.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.casablanca; + +import org.onap.policy.drools.features.PolicyEngineFeatureAPI; + +/** + * Casablanca installation as a feature saves time + * loading the Casablanca 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 CasablancaFeature implements PolicyEngineFeatureAPI { + + public static final int SEQNO = 1000; + + @Override + public int getSequenceNumber() { + return SEQNO; + } + +} diff --git a/controlloop/common/feature-controlloop-casablanca/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyEngineFeatureAPI b/controlloop/common/feature-controlloop-casablanca/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyEngineFeatureAPI new file mode 100644 index 000000000..5252ca115 --- /dev/null +++ b/controlloop/common/feature-controlloop-casablanca/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyEngineFeatureAPI @@ -0,0 +1 @@ +org.onap.policy.drools.apps.controlloop.feature.casablanca.CasablancaFeature diff --git a/controlloop/common/feature-controlloop-casablanca/src/test/java/org/onap/policy/drools/apps/controlloop/feature/casablanca/CasablancaFeatureTest.java b/controlloop/common/feature-controlloop-casablanca/src/test/java/org/onap/policy/drools/apps/controlloop/feature/casablanca/CasablancaFeatureTest.java new file mode 100644 index 000000000..8960603ae --- /dev/null +++ b/controlloop/common/feature-controlloop-casablanca/src/test/java/org/onap/policy/drools/apps/controlloop/feature/casablanca/CasablancaFeatureTest.java @@ -0,0 +1,30 @@ +/* + * ============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.casablanca; + +import static org.junit.Assert.assertEquals; + +public class CasablancaFeatureTest { + + @org.junit.Test + public void getSequenceNumber() { + assertEquals(CasablancaFeature.SEQNO, new CasablancaFeature().getSequenceNumber()); + } +} diff --git a/controlloop/common/pom.xml b/controlloop/common/pom.xml index ae318d626..5e3b3de37 100644 --- a/controlloop/common/pom.xml +++ b/controlloop/common/pom.xml @@ -39,11 +39,11 @@ model-impl policy-yaml simulators - controller-beijing + controller-casablanca feature-controlloop-utils feature-controlloop-trans feature-controlloop-amsterdam - feature-controlloop-beijing + feature-controlloop-casablanca msb -- cgit 1.2.3-korg