diff options
author | Jim Hahn <jrh3@att.com> | 2018-08-02 16:40:41 -0400 |
---|---|---|
committer | Jim Hahn <jrh3@att.com> | 2018-08-03 13:39:58 -0400 |
commit | 93fc6343de11bde4de4e7533241123a7dcc83e70 (patch) | |
tree | e807011b797639deb5a8a20df085433abdcadd9e | |
parent | 6a9ba373f3eb85e160dc30a54c4d82cff8542a36 (diff) |
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 <jrh3@att.com>
-rw-r--r-- | controlloop/common/controller-beijing/.gitignore | 1 | ||||
-rw-r--r-- | controlloop/common/controller-casablanca/.gitignore | 1 | ||||
-rw-r--r-- | controlloop/common/controller-casablanca/pom.xml (renamed from controlloop/common/controller-beijing/pom.xml) | 8 | ||||
-rw-r--r-- | controlloop/common/controller-casablanca/src/main/resources/META-INF/kmodule.xml (renamed from controlloop/common/controller-beijing/src/main/resources/META-INF/kmodule.xml) | 2 | ||||
-rw-r--r-- | controlloop/common/feature-controlloop-beijing/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyEngineFeatureAPI | 1 | ||||
-rw-r--r-- | controlloop/common/feature-controlloop-casablanca/pom.xml (renamed from controlloop/common/feature-controlloop-beijing/pom.xml) | 4 | ||||
-rw-r--r-- | controlloop/common/feature-controlloop-casablanca/src/assembly/assemble_zip.xml (renamed from controlloop/common/feature-controlloop-beijing/src/assembly/assemble_zip.xml) | 4 | ||||
-rw-r--r-- | controlloop/common/feature-controlloop-casablanca/src/main/feature/config/casablanca-controller.properties (renamed from controlloop/common/feature-controlloop-beijing/src/main/feature/config/beijing-controller.properties) | 4 | ||||
-rw-r--r-- | controlloop/common/feature-controlloop-casablanca/src/main/java/org/onap/policy/drools/apps/controlloop/feature/casablanca/CasablancaFeature.java (renamed from controlloop/common/feature-controlloop-beijing/src/main/java/org/onap/policy/drools/apps/controlloop/feature/beijing/BeijingFeature.java) | 8 | ||||
-rw-r--r-- | controlloop/common/feature-controlloop-casablanca/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyEngineFeatureAPI | 1 | ||||
-rw-r--r-- | controlloop/common/feature-controlloop-casablanca/src/test/java/org/onap/policy/drools/apps/controlloop/feature/casablanca/CasablancaFeatureTest.java (renamed from controlloop/common/feature-controlloop-beijing/src/test/java/org/onap/policy/drools/apps/controlloop/feature/beijing/BeijingFeatureTest.java) | 10 | ||||
-rw-r--r-- | controlloop/common/pom.xml | 4 | ||||
-rw-r--r-- | controlloop/packages/apps-controlloop/pom.xml | 2 | ||||
-rw-r--r-- | controlloop/packages/apps-controlloop/src/files/apps-controlloop-installer | 2 | ||||
-rw-r--r-- | controlloop/packages/basex-controlloop/src/files/bin/create-cl-casablanca (renamed from controlloop/packages/basex-controlloop/src/files/bin/create-cl-beijing) | 14 | ||||
-rw-r--r-- | controlloop/packages/basex-controlloop/src/files/bin/push-policies-casablanca (renamed from controlloop/packages/basex-controlloop/src/files/bin/push-policies-beijing) | 2 | ||||
-rw-r--r-- | controlloop/templates/archetype-cl-casablanca/pom.xml (renamed from controlloop/templates/archetype-cl-beijing/pom.xml) | 4 | ||||
-rw-r--r-- | controlloop/templates/archetype-cl-casablanca/src/main/resources/META-INF/maven/archetype-metadata.xml (renamed from controlloop/templates/archetype-cl-beijing/src/main/resources/META-INF/maven/archetype-metadata.xml) | 0 | ||||
-rw-r--r-- | controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/pom.xml (renamed from controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/pom.xml) | 2 | ||||
-rw-r--r-- | controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/VoLTE.yaml (renamed from controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/VoLTE.yaml) | 0 | ||||
-rw-r--r-- | controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties (renamed from controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties) | 0 | ||||
-rw-r--r-- | controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.rest.json (renamed from controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.rest.json) | 0 | ||||
-rw-r--r-- | controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/appc.lcm.success.json (renamed from controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/appc.lcm.success.json) | 0 | ||||
-rw-r--r-- | controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/appc.legacy.success.json (renamed from controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/appc.legacy.success.json) | 0 | ||||
-rw-r--r-- | controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.abatement.json (renamed from controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.abatement.json) | 0 | ||||
-rw-r--r-- | controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.onset.json (renamed from controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.onset.json) | 0 | ||||
-rw-r--r-- | controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vdns.onset.json (renamed from controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.vdns.onset.json) | 0 | ||||
-rw-r--r-- | controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vfw.onset.json (renamed from controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.vfw.onset.json) | 0 | ||||
-rw-r--r-- | controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.volte.onset.json (renamed from controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.volte.onset.json) | 0 | ||||
-rw-r--r-- | controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/so.success.json (renamed from controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/so.success.json) | 0 | ||||
-rw-r--r-- | controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vCPE.yaml (renamed from controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vCPE.yaml) | 0 | ||||
-rw-r--r-- | controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vDNS.yaml (renamed from controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vDNS.yaml) | 0 | ||||
-rw-r--r-- | controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vFW.yaml (renamed from controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vFW.yaml) | 0 | ||||
-rw-r--r-- | controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vcpe.brmsgw.params.json (renamed from controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vcpe.brmsgw.params.json) | 0 | ||||
-rw-r--r-- | controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vdns.brmsgw.params.json (renamed from controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vdns.brmsgw.params.json) | 0 | ||||
-rw-r--r-- | controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vfw.brmsgw.params.json (renamed from controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vfw.brmsgw.params.json) | 0 | ||||
-rw-r--r-- | controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/volte.brmsgw.params.json (renamed from controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/volte.brmsgw.params.json) | 0 | ||||
-rw-r--r-- | controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/resources/META-INF/kmodule.xml (renamed from controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/resources/META-INF/kmodule.xml) | 2 | ||||
-rw-r--r-- | controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl (renamed from controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl) | 0 | ||||
-rw-r--r-- | controlloop/templates/archetype-cl-casablanca/src/test/resources/projects/basic/archetype.properties (renamed from controlloop/templates/archetype-cl-beijing/src/test/resources/projects/basic/archetype.properties) | 0 | ||||
-rw-r--r-- | controlloop/templates/pom.xml | 2 |
41 files changed, 38 insertions, 40 deletions
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-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-beijing/pom.xml b/controlloop/common/controller-casablanca/pom.xml index 7fe97a994..deeb5b346 100644 --- a/controlloop/common/controller-beijing/pom.xml +++ b/controlloop/common/controller-casablanca/pom.xml @@ -29,11 +29,11 @@ <version>1.3.0-SNAPSHOT</version> </parent> - <artifactId>controller-beijing</artifactId> + <artifactId>controller-casablanca</artifactId> <packaging>kjar</packaging> <name>${project.artifactId}</name> - <description>Beijing Experimental Controller</description> + <description>Casablanca Experimental Controller</description> <properties> <maven.compiler.source>1.8</maven.compiler.source> @@ -62,9 +62,9 @@ </goals> <configuration> <sourceFile> - ../../templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl + ../../templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl </sourceFile> - <destinationFile>src/main/resources/beijing.drl</destinationFile> + <destinationFile>src/main/resources/casablanca.drl</destinationFile> </configuration> </execution> </executions> diff --git a/controlloop/common/controller-beijing/src/main/resources/META-INF/kmodule.xml b/controlloop/common/controller-casablanca/src/main/resources/META-INF/kmodule.xml index fb96d70fd..3c2030da9 100644 --- a/controlloop/common/controller-beijing/src/main/resources/META-INF/kmodule.xml +++ b/controlloop/common/controller-casablanca/src/main/resources/META-INF/kmodule.xml @@ -20,6 +20,6 @@ --> <kmodule xmlns="http://jboss.org/kie/6.0.0/kmodule"> <kbase name="rules"> - <ksession name="beijing"/> + <ksession name="casablanca"/> </kbase> </kmodule> 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/pom.xml b/controlloop/common/feature-controlloop-casablanca/pom.xml index 33aca1772..dd60243c0 100644 --- a/controlloop/common/feature-controlloop-beijing/pom.xml +++ b/controlloop/common/feature-controlloop-casablanca/pom.xml @@ -28,10 +28,10 @@ <version>1.3.0-SNAPSHOT</version> </parent> - <artifactId>feature-controlloop-beijing</artifactId> + <artifactId>feature-controlloop-casablanca</artifactId> <description> - Load Experimental Beijing Control Loop Use Cases Controller as a feature. + Load Experimental Casablanca Control Loop Use Cases Controller as a feature. </description> <properties> diff --git a/controlloop/common/feature-controlloop-beijing/src/assembly/assemble_zip.xml b/controlloop/common/feature-controlloop-casablanca/src/assembly/assemble_zip.xml index f549cfc91..7cb637918 100644 --- a/controlloop/common/feature-controlloop-beijing/src/assembly/assemble_zip.xml +++ b/controlloop/common/feature-controlloop-casablanca/src/assembly/assemble_zip.xml @@ -24,7 +24,7 @@ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> - <id>feature-controlloop-beijing-package</id> + <id>feature-controlloop-casablanca-package</id> <formats> <format>zip</format> </formats> @@ -36,7 +36,7 @@ <directory>target</directory> <outputDirectory>lib/feature</outputDirectory> <includes> - <include>feature-controlloop-beijing-${project.version}.jar</include> + <include>feature-controlloop-casablanca-${project.version}.jar</include> </includes> </fileSet> <fileSet> diff --git a/controlloop/common/feature-controlloop-beijing/src/main/feature/config/beijing-controller.properties b/controlloop/common/feature-controlloop-casablanca/src/main/feature/config/casablanca-controller.properties index 787e90f0c..5d1a0a3c6 100644 --- a/controlloop/common/feature-controlloop-beijing/src/main/feature/config/beijing-controller.properties +++ b/controlloop/common/feature-controlloop-casablanca/src/main/feature/config/casablanca-controller.properties @@ -18,7 +18,7 @@ # ============LICENSE_END========================================================= ### -controller.name=beijing +controller.name=casablanca ueb.source.topics=${{PDPD_CONFIGURATION_TOPIC}},${{DCAE_TOPIC}},APPC-CL,APPC-LCM-WRITE @@ -71,5 +71,5 @@ ueb.sink.topics.POLICY-CL-MGT.events=org.onap.policy.controlloop.VirtualControlL 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.artifactId=controller-casablanca 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-casablanca/src/main/java/org/onap/policy/drools/apps/controlloop/feature/casablanca/CasablancaFeature.java index 6f2a03c77..79bef2326 100644 --- a/controlloop/common/feature-controlloop-beijing/src/main/java/org/onap/policy/drools/apps/controlloop/feature/beijing/BeijingFeature.java +++ b/controlloop/common/feature-controlloop-casablanca/src/main/java/org/onap/policy/drools/apps/controlloop/feature/casablanca/CasablancaFeature.java @@ -18,13 +18,13 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.drools.apps.controlloop.feature.beijing; +package org.onap.policy.drools.apps.controlloop.feature.casablanca; import org.onap.policy.drools.features.PolicyEngineFeatureAPI; /** - * Beijing installation as a feature saves time - * loading the Beijing controller at runtime over the + * 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. @@ -36,7 +36,7 @@ import org.onap.policy.drools.features.PolicyEngineFeatureAPI; * functionality * */ -public class BeijingFeature implements PolicyEngineFeatureAPI { +public class CasablancaFeature implements PolicyEngineFeatureAPI { public static final int SEQNO = 1000; 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-beijing/src/test/java/org/onap/policy/drools/apps/controlloop/feature/beijing/BeijingFeatureTest.java b/controlloop/common/feature-controlloop-casablanca/src/test/java/org/onap/policy/drools/apps/controlloop/feature/casablanca/CasablancaFeatureTest.java index 66e5a3e02..8960603ae 100644 --- a/controlloop/common/feature-controlloop-beijing/src/test/java/org/onap/policy/drools/apps/controlloop/feature/beijing/BeijingFeatureTest.java +++ b/controlloop/common/feature-controlloop-casablanca/src/test/java/org/onap/policy/drools/apps/controlloop/feature/casablanca/CasablancaFeatureTest.java @@ -17,16 +17,14 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.policy.drools.apps.controlloop.feature.beijing; +package org.onap.policy.drools.apps.controlloop.feature.casablanca; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; -import org.onap.policy.drools.apps.controlloop.feature.beijing.BeijingFeature; - -public class BeijingFeatureTest { +public class CasablancaFeatureTest { @org.junit.Test public void getSequenceNumber() { - assertTrue(new BeijingFeature().getSequenceNumber() == BeijingFeature.SEQNO); + 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 @@ <module>model-impl</module> <module>policy-yaml</module> <module>simulators</module> - <module>controller-beijing</module> + <module>controller-casablanca</module> <module>feature-controlloop-utils</module> <module>feature-controlloop-trans</module> <module>feature-controlloop-amsterdam</module> - <module>feature-controlloop-beijing</module> + <module>feature-controlloop-casablanca</module> <module>msb</module> </modules> diff --git a/controlloop/packages/apps-controlloop/pom.xml b/controlloop/packages/apps-controlloop/pom.xml index d345d8f5f..9773ee6f6 100644 --- a/controlloop/packages/apps-controlloop/pom.xml +++ b/controlloop/packages/apps-controlloop/pom.xml @@ -90,7 +90,7 @@ </dependency> <dependency> <groupId>org.onap.policy.drools-applications.controlloop.common</groupId> - <artifactId>feature-controlloop-beijing</artifactId> + <artifactId>feature-controlloop-casablanca</artifactId> <version>${project.version}</version> <type>zip</type> </dependency> diff --git a/controlloop/packages/apps-controlloop/src/files/apps-controlloop-installer b/controlloop/packages/apps-controlloop/src/files/apps-controlloop-installer index b50f6efea..4d75ec8e3 100644 --- a/controlloop/packages/apps-controlloop/src/files/apps-controlloop-installer +++ b/controlloop/packages/apps-controlloop/src/files/apps-controlloop-installer @@ -37,7 +37,7 @@ source ${POLICY_HOME}/etc/build.info features install controlloop-trans features install controlloop-amsterdam -features install controlloop-beijing +features install controlloop-casablanca features enable controlloop-trans features enable controlloop-amsterdam diff --git a/controlloop/packages/basex-controlloop/src/files/bin/create-cl-beijing b/controlloop/packages/basex-controlloop/src/files/bin/create-cl-casablanca index 6972fd0fb..d32657444 100644 --- a/controlloop/packages/basex-controlloop/src/files/bin/create-cl-beijing +++ b/controlloop/packages/basex-controlloop/src/files/bin/create-cl-casablanca @@ -25,14 +25,14 @@ source "${POLICY_HOME}"/etc/build.info -echo "Control Loop CLI Generator for R2 Beijing Release" +echo "Control Loop CLI Generator for R2 Casablanca Release" echo "---------------------------------------------------" echo -GROUP_ID="org.onap.policy.rules.beijing" -ARTIFACT_ID="beijing" +GROUP_ID="org.onap.policy.rules.casablanca" +ARTIFACT_ID="casablanca" VERSION="${version:-1.2.0}" -PACKAGE="org.onap.policy.rules.beijing" +PACKAGE="org.onap.policy.rules.casablanca" # vCPE Policy Parameters VCPE_CONTROL_LOOP_NAME="ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e" @@ -55,7 +55,7 @@ VOLTE_POLICY_NAME="volte" VOLTE_CONTROL_LOOP_YAML="controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-VOLTE-2179b738-fd36-4843-a71a-a8c24c70c55b%0D%0A++trigger_policy%3A+unique-policy-id-1-restart%0D%0A++timeout%3A+3600%0D%0A++abatement%3A+false%0D%0A+%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-1-restart%0D%0A++++name%3A+Restart+the+VM%0D%0A++++description%3A%0D%0A++++actor%3A+VFC%0D%0A++++recipe%3A+Restart%0D%0A++++target%3A%0D%0A++++++type%3A+VM%0D%0A++++retry%3A+3%0D%0A++++timeout%3A+1200%0D%0A++++success%3A+final_success%0D%0A++++failure%3A+final_failure%0D%0A++++failure_timeout%3A+final_failure_timeout%0D%0A++++failure_retries%3A+final_failure_retries%0D%0A++++failure_exception%3A+final_failure_exception%0D%0A++++failure_guard%3A+final_failure_guard" # Generic Scope and Version -POLICY_SCOPE="beijing" +POLICY_SCOPE="casablanca" POLICY_VERSION="v0.0.1" BRMSGW_TOPIC="BRMSGW-POLICY" @@ -196,7 +196,7 @@ if [ ! -w "${DIR_TMP}" ]; then fi ARCHETYPE_GROUP_ID="org.onap.policy.drools-applications.controlloop.templates" -ARCHETYPE_ARTIFACT_ID="archetype-cl-beijing" +ARCHETYPE_ARTIFACT_ID="archetype-cl-casablanca" ARCHETYPE_VERSION="${VERSION}" if [ -d "${DIR_TMP}/${ARTIFACT_ID}/" ]; then @@ -310,7 +310,7 @@ echo "1. copy ${DIR_TMP}/${ARTIFACT_ID}/${ARTIFACT_ID}-controller.properties und echo " and restart the pdp-d (policy stop; policy start)" echo "2. cd ${DIR_TMP}/${ARTIFACT_ID}/; rest-add-controller ${ARTIFACT_ID}" echo -echo "Once this Control Loop is deployed, you can run the push-policies-beijing script" +echo "Once this Control Loop is deployed, you can run the push-policies-casablanca script" echo "to automatically insert the policies for all use cases supported in this release" echo ) diff --git a/controlloop/packages/basex-controlloop/src/files/bin/push-policies-beijing b/controlloop/packages/basex-controlloop/src/files/bin/push-policies-casablanca index 92259790a..685deb1c3 100644 --- a/controlloop/packages/basex-controlloop/src/files/bin/push-policies-beijing +++ b/controlloop/packages/basex-controlloop/src/files/bin/push-policies-casablanca @@ -119,4 +119,4 @@ echo "Policy insertions completed." echo echo "The working memory is now: " -curl --silent --user @1b3rt:31nst31n -X GET http://localhost:9696/policy/pdp/engine/controllers/${CONTROLLER_NAME}/drools/facts/beijing | python -m json.tool +curl --silent --user @1b3rt:31nst31n -X GET http://localhost:9696/policy/pdp/engine/controllers/${CONTROLLER_NAME}/drools/facts/casablanca | python -m json.tool diff --git a/controlloop/templates/archetype-cl-beijing/pom.xml b/controlloop/templates/archetype-cl-casablanca/pom.xml index e98eab18c..dd9ef5abe 100644 --- a/controlloop/templates/archetype-cl-beijing/pom.xml +++ b/controlloop/templates/archetype-cl-casablanca/pom.xml @@ -30,10 +30,10 @@ <version>1.3.0-SNAPSHOT</version> </parent> - <artifactId>archetype-cl-beijing</artifactId> + <artifactId>archetype-cl-casablanca</artifactId> <name>${project.artifactId}</name> - <description>Archetype to generate a yaml based control loop for ONAP Beijing release</description> + <description>Archetype to generate a yaml based control loop for ONAP Casablanca release</description> <build> <extensions> diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/META-INF/maven/archetype-metadata.xml b/controlloop/templates/archetype-cl-casablanca/src/main/resources/META-INF/maven/archetype-metadata.xml index 2acec10dd..2acec10dd 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/META-INF/maven/archetype-metadata.xml diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/pom.xml b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/pom.xml index fae94aecb..1fc31bae2 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/pom.xml +++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/pom.xml @@ -29,7 +29,7 @@ <packaging>kjar</packaging> <name>${artifactId}</name> - <description>Control Loop Beijing Release Rules</description> + <description>Control Loop Casablanca Release Rules</description> <properties> <maven.compiler.source>1.8</maven.compiler.source> diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/VoLTE.yaml b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/VoLTE.yaml index 03001520b..03001520b 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/VoLTE.yaml +++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/VoLTE.yaml diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties index 390a946fe..390a946fe 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties +++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.rest.json b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.rest.json index 148e35562..148e35562 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.rest.json +++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.rest.json diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/appc.lcm.success.json b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/appc.lcm.success.json index 985685000..985685000 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/appc.lcm.success.json +++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/appc.lcm.success.json diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/appc.legacy.success.json b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/appc.legacy.success.json index 2c6570d03..2c6570d03 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/appc.legacy.success.json +++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/appc.legacy.success.json diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.abatement.json b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.abatement.json index 3d6dc4ae1..3d6dc4ae1 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.abatement.json +++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.abatement.json diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.onset.json b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.onset.json index 98403b034..98403b034 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.onset.json +++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.onset.json diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.vdns.onset.json b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vdns.onset.json index 80730e9e3..80730e9e3 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.vdns.onset.json +++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vdns.onset.json diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.vfw.onset.json b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vfw.onset.json index 0aa0effa6..0aa0effa6 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.vfw.onset.json +++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vfw.onset.json diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.volte.onset.json b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.volte.onset.json index 2cf28fb3f..2cf28fb3f 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.volte.onset.json +++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.volte.onset.json diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/so.success.json b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/so.success.json index 8f3387e4d..8f3387e4d 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/so.success.json +++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/so.success.json diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vCPE.yaml b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vCPE.yaml index 2838b6127..2838b6127 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vCPE.yaml +++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vCPE.yaml diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vDNS.yaml b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vDNS.yaml index d4ed17396..d4ed17396 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vDNS.yaml +++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vDNS.yaml diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vFW.yaml b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vFW.yaml index dcbdf5459..dcbdf5459 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vFW.yaml +++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vFW.yaml diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vcpe.brmsgw.params.json b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vcpe.brmsgw.params.json index 6b0ebd227..6b0ebd227 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vcpe.brmsgw.params.json +++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vcpe.brmsgw.params.json diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vdns.brmsgw.params.json b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vdns.brmsgw.params.json index 744723c87..744723c87 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vdns.brmsgw.params.json +++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vdns.brmsgw.params.json diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vfw.brmsgw.params.json b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vfw.brmsgw.params.json index 353c19c59..353c19c59 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vfw.brmsgw.params.json +++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vfw.brmsgw.params.json diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/volte.brmsgw.params.json b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/volte.brmsgw.params.json index c20b25adc..c20b25adc 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/volte.brmsgw.params.json +++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/volte.brmsgw.params.json diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/resources/META-INF/kmodule.xml b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/resources/META-INF/kmodule.xml index 0e6660e5c..d30e3c525 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/resources/META-INF/kmodule.xml +++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/resources/META-INF/kmodule.xml @@ -24,6 +24,6 @@ <kmodule xmlns="http://jboss.org/kie/6.0.0/kmodule"> <kbase name="rules"> - <ksession name="beijing"/> + <ksession name="casablanca"/> </kbase> </kmodule> diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl index 7e0d7e1a0..7e0d7e1a0 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl +++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl diff --git a/controlloop/templates/archetype-cl-beijing/src/test/resources/projects/basic/archetype.properties b/controlloop/templates/archetype-cl-casablanca/src/test/resources/projects/basic/archetype.properties index 8cc10c97c..8cc10c97c 100644 --- a/controlloop/templates/archetype-cl-beijing/src/test/resources/projects/basic/archetype.properties +++ b/controlloop/templates/archetype-cl-casablanca/src/test/resources/projects/basic/archetype.properties diff --git a/controlloop/templates/pom.xml b/controlloop/templates/pom.xml index a614ade0b..10a4a24d2 100644 --- a/controlloop/templates/pom.xml +++ b/controlloop/templates/pom.xml @@ -35,7 +35,7 @@ <modules> <module>template.demo</module> <module>archetype-cl-amsterdam</module> - <module>archetype-cl-beijing</module> + <module>archetype-cl-casablanca</module> </modules> |