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>

2 files changed, 8 insertions, 8 deletions

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